~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -12,9 +12,11 @@
12	12	import com.jme.math.Vector3f;
13	13	import com.jme.renderer.ColorRGBA;
14	14
	15	+import grafeme.ui.*;
15	16	//import buoy.widget.BFileChooser;
16	17
17	18	class GroupEditor extends ObjEditor implements //iParse, //iCallBack,
	19	+ Grafreed.iResourceCallBack,
18	20	ObjectUI,
19	21	Runnable,
20	22	ActionListener,
..	..	@@ -22,6 +24,351 @@
22	24	DragGestureListener, DragSourceListener, DropTargetListener,
23	25	ItemListener // ListSelectionListener
24	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);
	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", "rgb", 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	+ //cameraView.envyoff = false;
	334	+ group.skyboxname = skybox;
	335	+ group.skyboxext = "jpg";
	336	+ cameraView.repaint();
	337	+ }
	338	+
	339	+ public void CreateSkyboxPanel(cGridBag skyboxPanel)
	340	+ {
	341	+ JTabbedPane skyboxpane = new JTabbedPane();
	342	+
	343	+ AddSkyboxTab0(skyboxpane);
	344	+ AddSkyboxTab1(skyboxpane);
	345	+ AddSkyboxTab2(skyboxpane);
	346	+ AddSkyboxTab3(skyboxpane);
	347	+
	348	+ skyboxPanel.add(skyboxpane);
	349	+ }
	350	+
	351	+ public void ChangeTexture(String texture)
	352	+ {
	353	+ for (int i=0; i<group.selection.size(); i++)
	354	+ {
	355	+ Object3D obj = group.selection.get(i);
	356	+ obj.SetPigmentTexture("@" + texture);
	357	+ }
	358	+
	359	+ refreshContents();
	360	+ }
	361	+
	362	+ public void Show3DView()
	363	+ {
	364	+ // bug
	365	+ //gridPanel.setDividerLocation(1.0);
	366	+ //bigPanel.setDividerLocation(0.0);
	367	+ bigThree.ClearUI();
	368	+ bigThree.add(centralPanel);
	369	+ bigThree.FlushUI();
	370	+ }
	371	+
25	372	//ObjEditor objEditor;
26	373	public void closeUI2()
27	374	{
..	..	@@ -59,6 +406,12 @@
59	406	this.copy = this.group = group;
60	407	//selectees = this.group.selectees;
61	408
	409	+ if (copy.versionlist == null)
	410	+ {
	411	+ copy.versionlist = new Object3D[100];
	412	+ copy.versionindex = -1;
	413	+ }
	414	+
62	415	if(ui)
63	416	SetupUI(objEditor);
64	417	}
..	..	@@ -73,16 +426,28 @@
73	426	this.copy = this.group = copy;
74	427	//selectees = this.group.selectees;
75	428
76		- SetupMenu2(objEditor);
	429	+ SetupMenu2(this); //objEditor);
77	430	SetupUI2(objEditor);
78	431	objEditor.SetupUI(true);
79	432	SetupViews(objEditor);
80	433
81	434	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
	435	+
	436	+ if (copy.versionlist == null)
	437	+ {
	438	+ copy.versionlist = new Object3D[100];
	439	+ copy.versionindex = -1;
	440	+
	441	+ Save(true);
	442	+ }
82	443	}
83	444
84	445	void CloneSelection(boolean supports)
85	446	{
	447	+ if (Globals.REPLACEONMAKE)
	448	+ Save();
	449	+ boolean keep = Globals.REPLACEONMAKE;
	450	+ Globals.REPLACEONMAKE = false;
86	451	// Object3D keep = GrafreeD.clipboard;
87	452	//Object3D obj;
88	453	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -93,18 +458,19 @@
93	458
94	459	makeSomething(clone, i==group.selection.size()-1);
95	460	}
	461	+ Globals.REPLACEONMAKE = keep;
96	462	}
97	463
98	464	void CloneClipboard(boolean supports)
99	465	{
100		- assert(GrafreeD.clipboard.parent == null);
101		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
102		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
103		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
104		- makeSomething(CloneObject(GrafreeD.clipboard.get(0), false));
	466	+ assert(Grafreed.clipboard.parent == null);
	467	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	468	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	469	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	470	+ makeSomething(CloneObject(Grafreed.clipboard.get(0), false));
105	471	else
106		- makeSomething(CloneObject(GrafreeD.clipboard, false));
107		- GrafreeD.clipboard.get(0).parent = keepparent;
	472	+ makeSomething(CloneObject(Grafreed.clipboard, false));
	473	+ Grafreed.clipboard.get(0).parent = keepparent;
108	474	}
109	475
110	476	static Object3D CloneObject(Object3D obj, boolean supports)
..	..	@@ -118,7 +484,7 @@
118	484	// obj.support = null;
119	485	if (!supports)
120	486	obj.SaveSupports();
121		- Object3D clone = (Object3D)GrafreeD.clone(obj);
	487	+ Object3D clone = (Object3D)Grafreed.clone(obj);
122	488	obj.parent = parent;
123	489	// obj.support = support;
124	490	// clone.support = support; // aout 2013
..	..	@@ -147,30 +513,29 @@
147	513
148	514	//JTextField nameField;
149	515
150		- void SetupMenu2(ObjEditor oe)
	516	+ void SetupMenu2(GroupEditor oe)
151	517	{
152		- oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
153		- //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
154		- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
155		- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
156		- oe.cameraMenu.add("-");
157		- openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
158		- openWindowItem.addActionListener(this);
159		- editLeafItem.addActionListener(this);
160		- lookAtItem.addActionListener(this);
161		- //lookFromItem.addActinoListener(this);
162		- //switchItem.addActionListener(this);
	518	+ oe.jTree = new cTree();
	519	+
163	520	Menu menu;
164	521	oe.menuBar.add(menu = new Menu("Edit"));
165	522	//editItem = menu.add(new MenuItem("Edit"));
166	523	//editItem.addActionListener(this);
167		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	524	+
	525	+// undoItem = menu.add(new MenuItem("Undo"));
	526	+// undoItem.addActionListener(this);
	527	+// redoItem = menu.add(new MenuItem("Redo"));
	528	+// redoItem.addActionListener(this);
	529	+// menu.add("-");
	530	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
168	531	duplicateItem.addActionListener(this);
169		- menu.add("-");
170	532	cloneItem = menu.add(new MenuItem("Clone"));
171	533	cloneItem.addActionListener(this);
	534	+ if (Globals.ADVANCED)
	535	+ {
172	536	cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
173	537	cloneSupportItem.addActionListener(this);
	538	+ }
174	539	menu.add("-");
175	540	cutItem = menu.add(new MenuItem("Cut"));
176	541	cutItem.addActionListener(this);
..	..	@@ -178,27 +543,123 @@
178	543	copyItem.addActionListener(this);
179	544	pasteItem = menu.add(new MenuItem("Paste"));
180	545	pasteItem.addActionListener(this);
	546	+
	547	+ menu.add("-");
	548	+ pasteIntoItem = menu.add(new MenuItem("Paste into"));
	549	+ pasteIntoItem.addActionListener(this);
181	550	pasteLinkItem = menu.add(new MenuItem("Paste link"));
182	551	pasteLinkItem.addActionListener(this);
183	552	pasteCloneItem = menu.add(new MenuItem("Paste clone"));
184	553	pasteCloneItem.addActionListener(this);
185	554	// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
186	555	// pasteExpandItem.addActionListener(this);
187		- clearItem = menu.add(new MenuItem("Clear"));
188		- clearItem.addActionListener(this);
	556	+ menu.add("-");
	557	+ deleteItem = menu.add(new MenuItem("Delete"));
	558	+ deleteItem.addActionListener(this);
	559	+
	560	+ if (Globals.ADVANCED)
	561	+ {
	562	+ // Deletes the cameras...
189	563	clearAllItem = menu.add(new MenuItem("Clear All"));
190	564	clearAllItem.addActionListener(this);
	565	+ }
	566	+
	567	+ menuBar.add(cameraMenu = new Menu("View"));
	568	+ //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
	569	+ //zBufferItem.addActionListener(this);
	570	+ //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
	571	+ //normalLensItem.addActionListener(this);
	572	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	573	+ restoreCameraItem.addActionListener(this);
	574	+
	575	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	576	+// toggleFullScreenItem.addItemListener(this);
	577	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	578	+// cameraMenu.add("-");
	579	+//
	580	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	581	+// toggleTextureItem.addItemListener(this);
	582	+// toggleTextureItem.setState(CameraPane.textureon);
	583	+//
	584	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	585	+// toggleSwitchItem.addItemListener(this);
	586	+// toggleSwitchItem.setState(CameraPane.SWITCH);
	587	+
	588	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
	589	+ toggleHandleItem.addItemListener(this);
	590	+ toggleHandleItem.setState(CameraPane.HANDLES);
	591	+
	592	+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
	593	+ togglePaintItem.addItemListener(this);
	594	+ togglePaintItem.setState(CameraPane.PAINTMODE);
	595	+
	596	+ if (Globals.ADVANCED)
	597	+ {
	598	+ cameraMenu.add("-");
	599	+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
	600	+ toggleLiveItem.addItemListener(this);
	601	+ toggleLiveItem.setState(Globals.isLIVE());
191	602
	603	+ cameraMenu.add(stepItem = new MenuItem("Step"));
	604	+ stepItem.addActionListener(this);
	605	+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
	606	+ // toggleDLItem.addItemListener(this);
	607	+ // toggleDLItem.setState(false);
	608	+
	609	+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
	610	+ toggleRenderItem.addItemListener(this);
	611	+ toggleRenderItem.setState(!CameraPane.frozen);
	612	+
	613	+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
	614	+ toggleDebugItem.addItemListener(this);
	615	+ toggleDebugItem.setState(Globals.DEBUG);
	616	+
	617	+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
	618	+ toggleFrustumItem.addItemListener(this);
	619	+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
	620	+
	621	+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
	622	+ toggleFootContactItem.addItemListener(this);
	623	+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
	624	+
	625	+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
	626	+ toggleTimelineItem.addItemListener(this);
	627	+ }
	628	+
	629	+// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
	630	+// toggleRootItem.addItemListener(this);
	631	+// toggleRootItem.setState(false);
	632	+// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
	633	+// animationItem.addItemListener(this);
	634	+// animationItem.setState(CameraPane.ANIMATION);
	635	+ cameraMenu.add("-");
	636	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
	637	+ editCameraItem.addActionListener(this);
	638	+
	639	+ if (Globals.ADVANCED)
	640	+ {
	641	+ oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
	642	+ //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
	643	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
	644	+ editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
	645	+ oe.cameraMenu.add("-");
	646	+ openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
	647	+ openWindowItem.addActionListener(this);
	648	+ editLeafItem.addActionListener(this);
	649	+ lookAtItem.addActionListener(this);
	650	+ //lookFromItem.addActinoListener(this);
	651	+ //switchViewItem.addActionListener(this);
	652	+ }
	653	+
192	654	oe.menuBar.add(menu = new Menu("Setting"));
193		- resetMeshItem = menu.add(new MenuItem("Reset All"));
194		- resetMeshItem.addActionListener(this);
195		- stepAllItem = menu.add(new MenuItem("Step All"));
196		- stepAllItem.addActionListener(this);
	655	+ if (Globals.ADVANCED)
	656	+ {
197	657	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
198	658	revertMeshItem.addActionListener(this);
199	659	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
200	660	resetreferencesItem.addActionListener(this);
201	661	menu.add("-");
	662	+ }
202	663	overwriteGeoItem = menu.add(new MenuItem("Overwrite Geometry"));
203	664	overwriteGeoItem.addActionListener(this);
204	665	overwriteMatItem = menu.add(new MenuItem("Overwrite Material"));
..	..	@@ -210,79 +671,104 @@
210	671	overwriteUVItem = menu.add(new MenuItem("Overwrite UV"));
211	672	overwriteUVItem.addActionListener(this);
212	673	menu.add("-");
	674	+ if (Globals.ADVANCED)
	675	+ {
213	676	generateMeshItem = menu.add(new MenuItem("Generate Meshes"));
214	677	generateMeshItem.addActionListener(this);
215	678	poseMeshItem = menu.add(new MenuItem("Set Pose Meshes"));
216	679	poseMeshItem.addActionListener(this);
217	680	menu.add("-");
	681	+ }
218	682	resetsupportItem = menu.add(new MenuItem("Reset support"));
219	683	resetsupportItem.addActionListener(this);
220	684	linkverticesItem = menu.add(new MenuItem("Link to Support"));
221	685	linkverticesItem.addActionListener(this);
222	686	relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
223	687	relinkverticesItem.addActionListener(this);
	688	+
	689	+ if (Globals.ADVANCED)
	690	+ {
224	691	setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
225	692	setMasterItem.addActionListener(this);
	693	+ }
226	694
227	695	oe.menuBar.add(menu = new Menu("Group"));
228		- grabItem = menu.add(new MenuItem("Grab"));
229		- grabItem.addActionListener(this);
	696	+// grabItem = menu.add(new MenuItem("Grab"));
	697	+// grabItem.addActionListener(this);
230	698	backItem = menu.add(new MenuItem("Back"));
231	699	backItem.addActionListener(this);
232	700	frontItem = menu.add(new MenuItem("Front"));
233	701	frontItem.addActionListener(this);
234		- compositeItem = menu.add(new MenuItem("Composite"));
235		- compositeItem.addActionListener(this);
236		- hideItem = menu.add(new MenuItem("Hide"));
	702	+// compositeItem = menu.add(new MenuItem("Composite"));
	703	+// compositeItem.addActionListener(this);
	704	+
	705	+ if (Globals.ADVANCED)
	706	+ {
	707	+ hideItem = menu.add(new MenuItem("Hidden Group"));
237	708	hideItem.addActionListener(this);
	709	+ }
238	710	ungroupItem = menu.add(new MenuItem("Ungroup"));
239	711	ungroupItem.addActionListener(this);
240		- menu.add("-");
241		- randomItem = menu.add(new MenuItem("Random"));
242		- randomItem.addActionListener(this);
243		- physicsItem = menu.add(new MenuItem("Physics"));
244		- physicsItem.addActionListener(this);
245		- frameselectorItem = menu.add(new MenuItem("Frame Selector"));
246		- frameselectorItem.addActionListener(this);
	712	+
	713	+// menu.add("-");
	714	+//
	715	+// switchItem = menu.add(new MenuItem("Switch node"));
	716	+// switchItem.addActionListener(this);
	717	+ if (Globals.ADVANCED)
	718	+ {
247	719	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
248	720	switchGeoItem.addActionListener(this);
249	721	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
250	722	switchTransfoItem.addActionListener(this);
251		- morphItem = menu.add(new MenuItem("Morph"));
	723	+ morphItem = menu.add(new MenuItem("Morph Group"));
252	724	morphItem.addActionListener(this);
	725	+
	726	+ menu.add("-");
	727	+ physicsItem = menu.add(new MenuItem("Physics"));
	728	+ physicsItem.addActionListener(this);
	729	+ frameselectorItem = menu.add(new MenuItem("Frame Selector"));
	730	+ frameselectorItem.addActionListener(this);
253	731	scriptNodeItem = menu.add(new MenuItem("Script Node"));
254	732	scriptNodeItem.addActionListener(this);
255		- cameraItem = menu.add(new MenuItem("Camera"));
256		- cameraItem.addActionListener(this);
	733	+ }
257	734
258	735	oe.menuBar.add(menu = new Menu("Object"));
259		- textureItem = menu.add(new MenuItem("Texture"));
260		- textureItem.addActionListener(this);
	736	+// textureItem = menu.add(new MenuItem("Texture"));
	737	+// textureItem.addActionListener(this);
261	738	billboardItem = menu.add(new MenuItem("Billboard"));
262	739	billboardItem.addActionListener(this);
263	740	csgItem = menu.add(new MenuItem("CSG"));
264	741	csgItem.addActionListener(this);
265		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	742	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
266	743	shadowXItem.addActionListener(this);
267		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	744	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
268	745	shadowYItem.addActionListener(this);
269		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	746	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
270	747	shadowZItem.addActionListener(this);
	748	+ attributeItem = menu.add(new MenuItem("Attribute"));
	749	+ attributeItem.addActionListener(this);
	750	+
	751	+ if (Globals.ADVANCED)
	752	+ {
	753	+ menu.add("-");
271	754	linkerItem = menu.add(new MenuItem("Linker"));
272	755	linkerItem.addActionListener(this);
273	756	templateItem = menu.add(new MenuItem("Template"));
274	757	templateItem.addActionListener(this);
275		- attributeItem = menu.add(new MenuItem("Attribute"));
276		- attributeItem.addActionListener(this);
277	758	pointflowItem = menu.add(new MenuItem("Point Flow"));
278	759	pointflowItem.addActionListener(this);
	760	+ }
279	761	menu.add("-");
280	762	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
281	763	resetTransformItem.addActionListener(this);
282	764	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
283	765	resetCentroidItem.addActionListener(this);
284		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
285		- transformgeometryItem.addActionListener(this);
	766	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	767	+ resetCentroidXZItem.addActionListener(this);
	768	+ transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
	769	+ transformGeometryItem.addActionListener(this);
	770	+ transformChildrenItem = menu.add(new MenuItem("Transform Children"));
	771	+ transformChildrenItem.addActionListener(this);
286	772
287	773	oe.menuBar.add(menu = new Menu("Geometry"));
288	774	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -293,8 +779,11 @@
293	779	genNormalsCADItem.addActionListener(this);
294	780	genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
295	781	genNormalsMESHItem.addActionListener(this);
296		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	782	+ if (Globals.ADVANCED)
	783	+ {
	784	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
297	785	genNormalsMINEItem.addActionListener(this);
	786	+ }
298	787	stripifyItem = menu.add(new MenuItem("Stripify"));
299	788	stripifyItem.addActionListener(this);
300	789	unstripifyItem = menu.add(new MenuItem("Unstripify"));
..	..	@@ -316,23 +805,34 @@
316	805	reduce34MeshItem.addActionListener(this);
317	806	increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
318	807	increaseMeshItem.addActionListener(this);
319		- smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
320		- smoothMeshItem.addActionListener(this);
321	808	clipMeshItem = menu.add(new MenuItem("Clip mesh"));
322	809	clipMeshItem.addActionListener(this);
	810	+
	811	+ if (Globals.ADVANCED)
	812	+ {
	813	+ smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
	814	+ smoothMeshItem.addActionListener(this);
	815	+ }
323	816
324	817	oe.menuBar.add(menu = new Menu("Attributes"));
325	818	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
326	819	clearMaterialsItem.addActionListener(this);
	820	+ resetAllItem = menu.add(new MenuItem("Reset All"));
	821	+ resetAllItem.addActionListener(this);
	822	+ stepAllItem = menu.add(new MenuItem("Step All"));
	823	+ stepAllItem.addActionListener(this);
327	824	menu.add("-");
328	825	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
329	826	liveleavesItem.addActionListener(this);
330	827	unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
331	828	unliveleavesItem.addActionListener(this);
	829	+ if (Globals.ADVANCED)
	830	+ {
332	831	supportleavesItem = menu.add(new MenuItem("Support Leaves"));
333	832	supportleavesItem.addActionListener(this);
334	833	unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
335	834	unsupportleavesItem.addActionListener(this);
	835	+ }
336	836	hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
337	837	hideleavesItem.addActionListener(this);
338	838	showleavesItem = menu.add(new MenuItem("Show Leaves"));
..	..	@@ -341,6 +841,14 @@
341	841	markleavesItem.addActionListener(this);
342	842	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
343	843	unmarkleavesItem.addActionListener(this);
	844	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	845	+ rewindleavesItem.addActionListener(this);
	846	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	847	+ unrewindleavesItem.addActionListener(this);
	848	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	849	+ randomleavesItem.addActionListener(this);
	850	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	851	+ unrandomleavesItem.addActionListener(this);
344	852	menu.add("-");
345	853	flipVItem = menu.add(new MenuItem("Flip V"));
346	854	flipVItem.addActionListener(this);
..	..	@@ -366,53 +874,126 @@
366	874	attachBumpItem.addActionListener(this);
367	875	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
368	876	pigmentBumpItem.addActionListener(this);
	877	+ //embedTexturesItem
369	878	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
370	879	detachPigmentItem.addActionListener(this);
371	880	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
372	881	detachBumpItem.addActionListener(this);
	882	+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
	883	+ embedTexturesItem.addActionListener(this);
	884	+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
	885	+ deEmbedTexturesItem.addActionListener(this);
373	886	menu.add("-");
374	887	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
375	888	sortbysizeItem.addActionListener(this);
376	889	sortbynameItem = menu.add(new MenuItem("Sort by name"));
377	890	sortbynameItem.addActionListener(this);
378	891	menu.add("-");
	892	+ shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
	893	+ shareGeometriesItem.addActionListener(this);
	894	+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
	895	+ mergeGeometriesItem.addActionListener(this);
	896	+ if (Globals.ADVANCED)
	897	+ {
	898	+ // Pretty much the same as duplicate and clone.
379	899	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
380	900	extractGeometriesItem.addActionListener(this);
381	901	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
382	902	cloneGeometriesItem.addActionListener(this);
383		- shareGeometriesItem = menu.add(new MenuItem("Share Geometry"));
384		- shareGeometriesItem.addActionListener(this);
385		- mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
386		- mergeGeometriesItem.addActionListener(this);
	903	+ }
387	904
388	905	oe.menuBar.add(menu = new Menu("Insert"));
389	906	buildCreateMenu(menu);
390	907
391		-
392		- oe.menuBar.add(menu = new Menu("Include"));
393		- importGFDItem = menu.add(new MenuItem("GrafreeD Object..."));
394		- importGFDItem.addActionListener(this);
395		- importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D Object..."));
396		- importVRMLX3DItem.addActionListener(this);
397		- importOBJItem = menu.add(new MenuItem("OBJ Object..."));
398		- importOBJItem.addActionListener(this);
399		- import3DSItem = menu.add(new MenuItem("3DS Object..."));
400		- import3DSItem.addActionListener(this);
401		-
402	908	oe.menuBar.add(menu = new Menu("Tools"));
403	909	buildToolsMenu(menu);
404	910	}
405	911
	912	+ JTabbedPane resourcecontainer;
	913	+ cGridBag currenttab;
	914	+ boolean added; // patch for jar
	915	+
	916	+ int tabcount = 0;
	917	+ int colcount = 0;
	918	+ int rowcount = 0;
	919	+ int texturecount = 0;
	920	+
	921	+ int columns = 5;
	922	+ int rows = 7;
	923	+
	924	+ public void ResourceCallBack(String[] path)
	925	+ {
	926	+// for (int i = 0; i < path.length; i++)
	927	+// System.out.print(path[i] + "/");
	928	+// System.out.println();
	929	+
	930	+ if (//rowcount == 0 \|\|
	931	+ path.length == 1)
	932	+ {
	933	+ currenttab = new cGridBag();
	934	+ added = false;
	935	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	936	+ currenttab.setName(tabname);
	937	+ rowcount = 1;
	938	+ colcount = 0;
	939	+ texturecount = 0;
	940	+ }
	941	+
	942	+ if (path.length > 2 && path[2].toLowerCase().endsWith(".jpg"))
	943	+ {
	944	+ if (!added)
	945	+ {
	946	+ added = true;
	947	+ resourcecontainer.add(currenttab);
	948	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	949	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
	950	+ }
	951	+
	952	+ AddTextureButton(path[0], path[1], path[2], texturecount++, currenttab);
	953	+
	954	+ if (++colcount >= columns)
	955	+ {
	956	+ colcount = 0;
	957	+ currenttab.Return();
	958	+
	959	+ if (rowcount++ >= rows)
	960	+ {
	961	+ rowcount = 0;
	962	+ }
	963	+ }
	964	+ }
	965	+ else
	966	+ {
	967	+// if (!path[path.length-1].equals("icons"))
	968	+// resourcecontainer.Return();
	969	+ }
	970	+ }
	971	+
	972	+ void CreateTexturePanel(cGridBag container)
	973	+ {
	974	+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
	975	+ container.add(resourcecontainer);
	976	+
	977	+ Grafreed.ParseResources("textures", this);
	978	+ }
	979	+
406	980	void SetupUI2(ObjEditor oe)
407	981	{
	982	+ // June 2019
	983	+ if (oe == null)
	984	+ {
	985	+ //super.SetupUI2(this);
	986	+ //return;
	987	+ }
	988	+
	989	+ if (copy != group)
	990	+ {
	991	+ //super.SetupUI2(this);
	992	+ }
	993	+
408	994	//new Exception().printStackTrace();
409	995
410	996	oe.radioPanel = new JPanel(new GridBagLayout());
411		- oe.aConstraints.weightx = 1;
412		- oe.aConstraints.weighty = 0;
413		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
414		- oe.aConstraints.gridwidth = 100;
415		- oe.aConstraints.gridheight = 1;
416	997	// oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
417	998
418	999	oe.buttonGroup = new ButtonGroup();
..	..	@@ -433,153 +1014,263 @@
433	1014	oe.radioPanel.add(dummyButton);
434	1015	oe.buttonGroup.add(dummyButton);
435	1016	*/
436		- aConstraints.gridy += 1;
437		- oe.aConstraints.gridwidth = 1;
438		- oe.aConstraints.gridx = 0;
	1017	+ cGridBag copyOptionsPanel = new cGridBag();
	1018	+
	1019	+ copyOptionsPanel.preferredHeight = 2;
439	1020
440		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", CameraPane.isLIVE()), oe.aConstraints);
	1021	+ //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
	1022	+
	1023	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1024	+ //minButton.setToolTipText("Minimize window");
	1025	+ //minButton.addActionListener(this);
	1026	+
	1027	+ if (Globals.ADVANCED)
	1028	+ {
	1029	+ oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1030	+ maxButton.setToolTipText("Maximize window");
	1031	+ maxButton.addActionListener(this);
	1032	+ }
	1033	+
	1034	+ cButton gcButton;
	1035	+
	1036	+ oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1037	+ gcButton.setToolTipText("Garbage collect");
	1038	+ gcButton.addActionListener(new ActionListener()
	1039	+ {
	1040	+ public void actionPerformed(ActionEvent e)
	1041	+ {
	1042	+ System.gc();
	1043	+ }
	1044	+ });
	1045	+
	1046	+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1047	+ collapseButton.setToolTipText("Collapse toolbar");
	1048	+ collapseButton.addActionListener(this);
	1049	+
	1050	+ oe.toolbarPanel.add(maximize3DButton = GetButton("", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1051	+ maximize3DButton.setToolTipText("Maximize 3D view");
	1052	+ maximize3DButton.addActionListener(this);
	1053	+
	1054	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1055	+ twoButton.setToolTipText("Show 3D view only");
	1056	+ twoButton.addActionListener(this);
	1057	+ this.fullscreenLayout = twoButton;
	1058	+
	1059	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1060	+ threeButton.setToolTipText("Show controls and 3D view");
	1061	+ threeButton.addActionListener(this);
	1062	+ if (Globals.ADVANCED)
	1063	+ {
	1064	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1065	+ sixButton.setToolTipText("Show 3D view and controls");
	1066	+ sixButton.addActionListener(this);
	1067	+ }
	1068	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1069	+// sevenButton.setToolTipText("3-column layout");
	1070	+// sevenButton.addActionListener(this);
	1071	+ //
	1072	+
	1073	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1074	+ fullButton.setToolTipText("Full-screen window");
	1075	+ fullButton.addActionListener(this);
	1076	+
	1077	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1078	+ screenfitButton.setToolTipText("Screen fit");
	1079	+ screenfitButton.addActionListener(this);
	1080	+
	1081	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1082	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	1083	+ restoreCameraButton.addActionListener(this);
	1084	+
	1085	+ copyOptionsPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1086	+ saveVersionButton.setToolTipText("Duplicate current version");
	1087	+ saveVersionButton.addActionListener(this);
	1088	+
	1089	+ copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1090	+ deleteVersionButton.setToolTipText("Delete current version");
	1091	+ deleteVersionButton.addActionListener(this);
	1092	+
	1093	+ copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1094	+ previousVersionButton.setToolTipText("Previous version");
	1095	+ previousVersionButton.addActionListener(this);
	1096	+ previousVersionButton.setEnabled(false);
	1097	+
	1098	+ cGridBag updown = new cGridBag().setVertical(true);
	1099	+ updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1100	+ restoreButton.setToolTipText("Undo (restore current version)");
	1101	+ restoreButton.addActionListener(this);
	1102	+ //restoreButton.setEnabled(false);
	1103	+
	1104	+ updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1105	+ replaceButton.setToolTipText("Save (replace current version)");
	1106	+ replaceButton.addActionListener(this);
	1107	+ //replaceButton.setEnabled(false);
	1108	+
	1109	+ copyOptionsPanel.add(updown);
	1110	+
	1111	+ copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1112	+ nextVersionButton.setToolTipText("Next version");
	1113	+ nextVersionButton.addActionListener(this);
	1114	+ nextVersionButton.setEnabled(false);
	1115	+
	1116	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1117	+ oneStepButton.setToolTipText("Animate one step forward");
	1118	+ oneStepButton.addActionListener(this);
	1119	+
	1120	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	1121	+ liveCB.setToolTipText("Enable animation");
441	1122	liveCB.addItemListener(this);
442	1123
443		- oe.aConstraints.gridx += 1;
444		- oe.toolbarPanel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT), oe.aConstraints);
445		- supportCB.addItemListener(this);
446		-
447		- // oe.aConstraints.gridx += 1;
448		- // oe.toolbarPanel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), oe.aConstraints);
449		- // localCB.addItemListener(this);
450		-
451		- oe.aConstraints.gridx += 1;
452		- oe.toolbarPanel.add(crowdCB = new cCheckBox("Crowd", CameraPane.CROWD), oe.aConstraints);
453		- crowdCB.addItemListener(this);
454		-
455		- oe.aConstraints.gridx += 1;
456		- oe.toolbarPanel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA), oe.aConstraints);
457		- smoothCB.addItemListener(this);
458		-
459		- oe.aConstraints.gridx += 1;
460		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST), oe.aConstraints);
	1124	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
	1125	+ fastCB.setToolTipText("Fast mode");
461	1126	fastCB.addItemListener(this);
462		- oe.aConstraints.gridx += 1;
463		- oe.toolbarPanel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE), oe.aConstraints);
464		- slowCB.addItemListener(this);
465		- oe.aConstraints.gridx += 1;
466		- oe.toolbarPanel.add(boxCB = new cCheckBox("Box", CameraPane.FAST), oe.aConstraints);
467		- boxCB.addItemListener(this);
	1127	+
	1128	+ //oe.toolboxPanel.Return();
	1129	+
	1130	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	1131	+// trackCB.setToolTipText("Enable tracking");
	1132	+// trackCB.addItemListener(this);
468	1133
469		-// oe.aConstraints.gridx += 1;
470		-// oe.toolbarPanel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), oe.aConstraints);
471		-// speakerMocapCB.addItemListener(this);
472		-
473		- if (false)
474		- {
475		- // handled in scripts
476		- oe.aConstraints.gridx += 1;
477		- oe.toolbarPanel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA), oe.aConstraints);
478		- speakerCameraCB.addItemListener(this);
479		-
480		- oe.aConstraints.gridx += 1;
481		- oe.toolbarPanel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS), oe.aConstraints);
482		- speakerFocusCB.addItemListener(this);
483		-
484		- oe.aConstraints.gridx += 1;
485		- oe.toolbarPanel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS), oe.aConstraints);
486		- smoothfocusCB.addItemListener(this);
487		- }
488		-
489		-//oe.aConstraints.gridx += 1;
490		-//oe.toolbarPanel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), oe.aConstraints);
491		-// debugCB.addItemListener(this);
492		-
493		- oe.aConstraints.gridx += 1;
494		- oe.toolbarPanel.add(oeilCB = new cCheckBox("O", CameraPane.OEIL), oe.aConstraints);
495		- oeilCB.addItemListener(this);
496		-
497		- oe.aConstraints.gridx += 1;
498		- oe.toolbarPanel.add(lookAtCB = new cCheckBox("T", CameraPane.LOOKAT), oe.aConstraints);
499		- lookAtCB.addItemListener(this);
500		-
501		- oe.aConstraints.gridx += 1;
502		- oe.toolbarPanel.add(trackCB = new cCheckBox(":", CameraPane.TRACK), oe.aConstraints);
503		- trackCB.addItemListener(this);
504		-
505		- oe.aConstraints.gridx += 1;
506		- oe.toolbarPanel.add(screenfitButton = new cButton("@ ")); //, oe.aConstraints);
507		- screenfitButton.addActionListener(this);
508		- oe.aConstraints.gridx += 1;
509	1134	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
510	1135	// screenfitpointButton.addActionListener(this);
511		-// oe.aConstraints.gridx += 1;
512		- oe.toolbarPanel.add(snapobjectButton = new cButton(" O+ ")); //, oe.aConstraints);
513		- snapobjectButton.addActionListener(this);
514		- oe.aConstraints.gridx += 1;
515	1136
516		- //aConstraints.gridx = 0;
517		- //aConstraints.gridy += 1;
518		- oe.aConstraints.weighty = 0;
519		- oe.aConstraints.gridwidth = 1;
520		-
521		- oe.toolbarPanel.add(flashSelectionButton = new cButton(" ? ")); //, oe.aConstraints);
522		- flashSelectionButton.addActionListener(this);
523		-
524		- oe.toolbarPanel.add(new cButton(" ", false));
525		-
526		- oe.aConstraints.gridx += 1;
527		- oe.aConstraints.weighty = 0;
528		- oe.aConstraints.gridwidth = 1;
529		-
530		- //
531		- oe.toolbarPanel.add(twoButton = new cButton(" \|+\| ")); //, oe.aConstraints);
532		- twoButton.addActionListener(this);
533		- oe.toolbarPanel.add(fourButton = new cButton("+\|\| ")); //, oe.aConstraints);
	1137	+ if (Globals.ADVANCED)
	1138	+ {
	1139	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1140	+ snapobjectButton.addActionListener(this);
	1141	+ snapobjectButton.setToolTipText("Snap Object");
	1142	+
	1143	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
534	1144	fourButton.addActionListener(this);
535		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\| ")); //, oe.aConstraints);
536		- sixButton.addActionListener(this);
537		- oe.toolbarPanel.add(threeButton = new cButton(" \|+\|+")); //, oe.aConstraints);
538		- threeButton.addActionListener(this);
539		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+")); //, oe.aConstraints);
540		- sevenButton.addActionListener(this);
541		- //
	1145	+ fourButton.setToolTipText("Show control panel only");
	1146	+ }
542	1147
543		- oe.toolbarPanel.add(rootButton = new cButton(" o o o E ")); //, oe.aConstraints);
	1148	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
	1149	+
	1150	+
	1151	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1152	+ rootButton.setToolTipText("Open selection in new tab");
544	1153	rootButton.addActionListener(this);
545		- oe.aConstraints.gridx += 1;
546		- oe.toolbarPanel.add(closeButton = new cButton(" X ")); //, oe.aConstraints);
	1154	+
	1155	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1156	+ closeButton.setToolTipText("Close tab");
547	1157	closeButton.addActionListener(this);
548	1158	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
549	1159	//clearButton.addActionListener(this);
550		- oe.aConstraints.gridx += 1;
551		-
552		- oe.aConstraints.gridx = 1; //
553		- oe.treePanel.add(editButton = new cButton("+"), oe.aConstraints);
554		- editButton.addActionListener(this);
555		- oe.aConstraints.gridx += 1;
556		- oe.aConstraints.weighty = 0;
557		- oe.aConstraints.gridwidth = 1;
558	1160
559		- oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
	1161	+ cGridBag row1 = new cGridBag();
	1162	+
	1163	+ // INSERT
	1164	+ row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1165	+ gridButton.setToolTipText("Create grid");
	1166	+ gridButton.addActionListener(this);
	1167	+
	1168	+ row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1169	+ boxButton.setToolTipText("Create box");
	1170	+ boxButton.addActionListener(this);
	1171	+
	1172	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1173	+ sphereButton.setToolTipText("Create sphere");
	1174	+ sphereButton.addActionListener(this);
	1175	+
	1176	+ row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1177	+ coneButton.setToolTipText("Create cone");
	1178	+ coneButton.addActionListener(this);
	1179	+
	1180	+ row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1181	+ torusButton.setToolTipText("Create torus");
	1182	+ torusButton.addActionListener(this);
	1183	+
	1184	+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1185	+ superButton.setToolTipText("Create superellipsoid");
	1186	+ superButton.addActionListener(this);
	1187	+
	1188	+ if (Globals.ADVANCED)
	1189	+ {
	1190	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1191	+ kleinButton.setToolTipText("Create Klein bottle");
	1192	+ kleinButton.addActionListener(this);
	1193	+ }
	1194	+
	1195	+ row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1196	+ particlesButton.setToolTipText("Create particle system");
	1197	+ particlesButton.addActionListener(this);
	1198	+
	1199	+ oe.toolboxPanel.add(row1);
	1200	+
	1201	+ cGridBag row2 = new cGridBag();
	1202	+
	1203	+ row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1204	+ groupButton.setToolTipText("Create group");
	1205	+ groupButton.addActionListener(this);
	1206	+
	1207	+ row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1208	+ compositeButton.setToolTipText("Create composite");
	1209	+ compositeButton.addActionListener(this);
	1210	+
	1211	+ row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1212	+ switchButton.setToolTipText("Create item switcher");
	1213	+ switchButton.addActionListener(this);
	1214	+
	1215	+ row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1216	+ loopButton.setToolTipText("Create loop");
	1217	+ loopButton.addActionListener(this);
	1218	+
	1219	+ row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1220	+ textureButton.setToolTipText("Create texture");
	1221	+ textureButton.addActionListener(this);
	1222	+
	1223	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1224	+ overlayButton.setToolTipText("Create overlay");
	1225	+ overlayButton.addActionListener(this);
	1226	+
	1227	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1228	+ lightButton.setToolTipText("Create light");
	1229	+ lightButton.addActionListener(this);
	1230	+
	1231	+ oe.toolboxPanel.add(row2);
	1232	+
	1233	+ cGridBag textures = new cGridBag();
	1234	+
	1235	+ CreateTexturePanel(textures);
	1236	+
	1237	+ oe.toolboxPanel.add(textures);
	1238	+
	1239	+ textures.preferredHeight = 100;
	1240	+
	1241	+ CreateSkyboxPanel(oe.skyboxPanel);
	1242	+
	1243	+ // EDIT panel
	1244	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1245	+ editButton.setToolTipText("Pin selection controls");
	1246	+ editButton.addActionListener(this);
	1247	+
	1248	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1249	+ uneditButton.setToolTipText("Unpin and remove selection controls");
560	1250	uneditButton.addActionListener(this);
561	1251
562		- oe.aConstraints.gridx += 1;
563		- oe.aConstraints.weighty = 0;
564		- oe.aConstraints.gridwidth = 1;
565		-
566		- oe.treePanel.add(clearPanelButton = new cButton("C"), oe.aConstraints);
567		- clearPanelButton.addActionListener(this);
568		-
569		- oe.aConstraints.gridx += 1;
570		- oe.aConstraints.weighty = 0;
571		- oe.aConstraints.gridwidth = 1;
572		-
573		- oe.treePanel.add(allParamsButton = new cButton("A"), oe.aConstraints);
	1252	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	1253	+ allParamsButton.setToolTipText("Show all controls");
574	1254	allParamsButton.addActionListener(this);
575	1255
576		- oe.aConstraints.gridx += 1;
577		- oe.aConstraints.weighty = 0;
578		- oe.aConstraints.gridwidth = 1;
579		-
580		- oe.treePanel.add(unselectButton = new cButton("U"), oe.aConstraints);
581		- unselectButton.addActionListener(this);
	1256	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1257	+ clearPanelButton.setToolTipText("Clear all controls");
	1258	+ clearPanelButton.addActionListener(this);
582	1259
	1260	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1261	+ //unselectButton.setToolTipText("Unselect");
	1262	+ //unselectButton.addActionListener(this);
	1263	+
	1264	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1265	+ flashSelectionButton.setToolTipText("Highlight selection");
	1266	+ flashSelectionButton.addActionListener(this);
	1267	+
	1268	+ editCommandsPanel.preferredHeight = 1;
	1269	+
	1270	+ SetPinStates(false);
	1271	+// oe.treePanel.add(commandsPanel);
	1272	+// oe.treePanel.Return();
	1273	+
583	1274	// oe.aConstraints.gridx += 1;
584	1275	// oe.aConstraints.weighty = 0;
585	1276	// oe.aConstraints.gridwidth = 1;
..	..	@@ -591,47 +1282,32 @@
591	1282	// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
592	1283	// gcButton.addActionListener(this);
593	1284
594		- oe.aConstraints.gridx = 0;
595		- oe.aConstraints.gridy += 1;
596		-
597		- //ctrlPanel.add(objList = new List(5, true));
598		- oe.aConstraints.gridwidth = 100;
599		- // oe.aConstraints.gridheight = 100;
600		- oe.aConstraints.fill = GridBagConstraints.BOTH; // HORIZONTAL;
601		- oe.aConstraints.gridheight = 1;
602		- oe.aConstraints.weighty = 0.5;
603		- oe.aConstraints.gridx = 0;
604		- JScrollPane jSP;
	1285	+ cGridBag jSPPanel = new cGridBag();
	1286	+
	1287	+ JScrollPane jSP;
605	1288	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
606		- oe.treePanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null)), oe.aConstraints);
	1289	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
607	1290	ResetModel();
608		- oe.aConstraints.weighty = 0.5;
609		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
610		- oe.aConstraints.gridy += 1;
611		- oe.aConstraints.gridwidth = 1;
612		-
613		- oe.aConstraints.weighty = 0;
614		- oe.aConstraints.gridwidth = 2;
615		-
616		- oe.treePanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0), oe.aConstraints);
617		- colorCB.addItemListener(this);
618		- oe.aConstraints.gridx += 2;
619		- oe.treePanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0), oe.aConstraints);
620		- materialCB.addItemListener(this);
621		- oe.aConstraints.gridx += 2;
622		- oe.treePanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0), oe.aConstraints);
623		- textureCB.addItemListener(this);
624		-
625		- oe.aConstraints.gridx = 0;
626		- oe.aConstraints.gridy += 1;
627	1291
	1292	+ oe.treePanel.add(jSPPanel);
	1293	+ oe.treePanel.Return();
	1294	+
	1295	+ oe.treePanel.add(copyOptionsPanel);
	1296	+ oe.treePanel.Return();
	1297	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1298	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	1299	+ sliderPane.preferredHeight = 1;
	1300	+
	1301	+// mainPanel.setDividerLocation(0.1); //1.0);
	1302	+ mainPanel.setResizeWeight(0.4);
	1303	+
628	1304	//jList.addListSelectionListener(this);
629	1305	oe.jTree.addTreeSelectionListener(this);
630	1306	//jTree.setRootVisible(false);
631	1307	//jTree.setEditable(true);
632	1308	oe.jTree.setDragEnabled(true);
633	1309	//jTree.setPreferredSize(new Dimension(10,10));
634		- jSP.setPreferredSize(new Dimension(100,200));
	1310	+ //jSP.setPreferredSize(new Dimension(100,200));
635	1311
636	1312	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
637	1313
..	..	@@ -643,23 +1319,163 @@
643	1319	dgr.addDragGestureListener(this);
644	1320	}catch(Exception e) {}
645	1321	*/
646		- radio.layout = sevenButton;
	1322	+ radio.layout = threeButton; // sixButton;
647	1323	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
648	1324	}
	1325	+
	1326	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
	1327	+ {
	1328	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	1329	+ colorCB.setToolTipText("Copy color when dropped");
	1330	+ colorCB.addItemListener(this);
	1331	+
	1332	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	1333	+ materialCB.setToolTipText("Copy material when dropped");
	1334	+ materialCB.addItemListener(this);
	1335	+
	1336	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	1337	+ textureCB.setToolTipText("Copy texture when dropped");
	1338	+ textureCB.addItemListener(this);
	1339	+
	1340	+ panel.Return();
	1341	+
	1342	+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
	1343	+ boxCB.setToolTipText("Display bounding boxes");
	1344	+ boxCB.addItemListener(this);
	1345	+
	1346	+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
	1347	+ zoomBoxCB.setToolTipText("Display only for wheel");
	1348	+ zoomBoxCB.addItemListener(this);
	1349	+
	1350	+ if (true) // Globals.ADVANCED)
	1351	+ {
	1352	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	1353	+// supportCB.setToolTipText("Enable rigging");
	1354	+// supportCB.addItemListener(this);
	1355	+
	1356	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	1357	+ freezeCB.setToolTipText("Fast moving camera");
	1358	+ freezeCB.addItemListener(this);
	1359	+
	1360	+ // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
	1361	+ // localCB.addItemListener(this);
	1362	+
	1363	+ panel.Return();
	1364	+
	1365	+ panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
	1366	+ crowdCB.setToolTipText("Used for crowds");
	1367	+ crowdCB.addItemListener(this);
	1368	+
	1369	+ panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
	1370	+ smoothCB.setToolTipText("Snapping delay");
	1371	+ smoothCB.addItemListener(this);
	1372	+
	1373	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1374	+// slowCB.setToolTipText("Smooth interpolation");
	1375	+// slowCB.addItemListener(this);
	1376	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1377	+ minshaderCB.setToolTipText("Minimal fast shader");
	1378	+ minshaderCB.addItemListener(this);
	1379	+
	1380	+// constraints.gridy += 1;
	1381	+// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
	1382	+// speakerMocapCB.addItemListener(this);
	1383	+
	1384	+ panel.Return();
	1385	+
	1386	+ if (false)
	1387	+ {
	1388	+ // handled in scripts
	1389	+ //constraints.gridy += 1;
	1390	+ panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
	1391	+ speakerCameraCB.addItemListener(this);
	1392	+
	1393	+ //constraints.gridy += 1;
	1394	+ panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
	1395	+ speakerFocusCB.addItemListener(this);
	1396	+
	1397	+ //constraints.gridy += 1;
	1398	+ panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
	1399	+ smoothfocusCB.addItemListener(this);
	1400	+ panel.Return();
	1401	+ }
	1402	+
	1403	+//constraints.gridx += 1;
	1404	+//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
	1405	+// debugCB.addItemListener(this);
	1406	+
	1407	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	1408	+ trackCB.setToolTipText("Enable tracking target");
	1409	+ trackCB.addItemListener(this);
	1410	+
	1411	+ panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	1412	+ oeilCB.setToolTipText("Move camera when tracking");
	1413	+ oeilCB.addItemListener(this);
	1414	+
	1415	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	1416	+ shadowCB.setToolTipText("When live compute shadows");
	1417	+ shadowCB.addItemListener(this);
	1418	+
	1419	+ panel.Return();
	1420	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	1421	+ toggleTextureCB.setToolTipText("Load textures");
	1422	+ toggleTextureCB.addItemListener(this);
	1423	+
	1424	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	1425	+ toggleSwitchCB.setToolTipText("Choose a single item");
	1426	+ toggleSwitchCB.addItemListener(this);
	1427	+
	1428	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1429	+ autokeepCB.setToolTipText("On structure change");
	1430	+ autokeepCB.addItemListener(this);
	1431	+
	1432	+ panel.Return();
	1433	+ if (Globals.ADVANCED)
	1434	+ {
	1435	+ panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
	1436	+ lookAtCB.setToolTipText("Look-at target");
	1437	+ lookAtCB.addItemListener(this);
	1438	+ }
	1439	+
	1440	+ }
	1441	+
	1442	+ cGridBag fill = new cGridBag();
	1443	+ fill.preferredHeight = 200;
	1444	+ cGridBag fill2 = new cGridBag();
	1445	+ fill2.preferredHeight = 200;
	1446	+ cGridBag fill3 = new cGridBag();
	1447	+ fill3.preferredHeight = 200;
	1448	+
	1449	+ panel.add(fill);
	1450	+ panel.add(fill2);
	1451	+ panel.add(fill3);
	1452	+
	1453	+ }
649	1454
650	1455	void EditObject(Object3D obj)
651	1456	{
652		- cRadio dummyButton = new cRadio(obj.name);
653		- dummyButton.SetObject(obj);
654		- dummyButton.layout = sevenButton;
655		- dummyButton.SetCamera(cameraView.renderCamera, false);
656		- dummyButton.addActionListener(this);
657		- radioPanel.add(dummyButton);
658		- buttonGroup.add(dummyButton);
659		- dummyButton.doClick();
	1457	+ cRadio radioButton = new cRadio(obj.name);
	1458	+
	1459	+ // June 2019. Patch to avoid bug with transparency.
	1460	+ radioButton.hadMaterial = obj.material != null;
	1461	+ if (!radioButton.hadMaterial)
	1462	+ {
	1463	+ obj.material = new cMaterial();
	1464	+ }
	1465	+
	1466	+ radioButton.SetObject(obj);
	1467	+ radioButton.layout = threeButton; // sixButton;
	1468	+ radioButton.SetCamera(cameraView.renderCamera, false);
	1469	+ radioButton.addActionListener(this);
	1470	+ radioPanel.add(radioButton);
	1471	+ buttonGroup.add(radioButton);
	1472	+ radioButton.doClick();
660	1473	}
	1474	+
661	1475	void SetupViews(ObjEditor oe)
662	1476	{
	1477	+ theFrame = this;
	1478	+
663	1479	oe.SetupViews();
664	1480
665	1481	System.out.println("SetupViews");
..	..	@@ -668,22 +1484,30 @@
668	1484	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
669	1485	}
670	1486
671		- JCheckBox liveCB;
672		- JCheckBox supportCB;
673		- JCheckBox localCB;
674		- JCheckBox crowdCB;
675		- JCheckBox smoothCB;
676		- JCheckBox fastCB;
677		- JCheckBox slowCB;
678		- JCheckBox boxCB;
679		- JCheckBox trackCB;
680		- JCheckBox smoothfocusCB;
	1487	+ cToggleButton liveCB;
	1488	+ cCheckBox supportCB;
	1489	+ cCheckBox localCB;
	1490	+ cCheckBox crowdCB;
	1491	+ cCheckBox smoothCB;
	1492	+ cCheckBox minshaderCB;
	1493	+
	1494	+ cToggleButton fastCB;
	1495	+ cCheckBox slowCB;
	1496	+ cCheckBox boxCB;
	1497	+ cCheckBox zoomBoxCB;
	1498	+ cCheckBox freezeCB;
	1499	+ //cToggleButton trackCB;
	1500	+ cCheckBox trackCB;
	1501	+ cCheckBox smoothfocusCB;
681	1502	// JCheckBox speakerMocapCB;
682		- JCheckBox speakerCameraCB;
683		- JCheckBox speakerFocusCB;
684		- JCheckBox debugCB;
685		- JCheckBox oeilCB;
686		- JCheckBox lookAtCB;
	1503	+ cCheckBox speakerCameraCB;
	1504	+ cCheckBox speakerFocusCB;
	1505	+ cCheckBox debugCB;
	1506	+
	1507	+ cCheckBox oeilCB;
	1508	+ cCheckBox shadowCB;
	1509	+ cCheckBox autokeepCB;
	1510	+ cCheckBox lookAtCB;
687	1511
688	1512	// static int COLOR = 1;
689	1513	// static int MATERIAL = 2;
..	..	@@ -691,9 +1515,9 @@
691	1515
692	1516	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
693	1517
694		- JCheckBox colorCB;
695		- JCheckBox materialCB;
696		- JCheckBox textureCB;
	1518	+ cCheckBox colorCB;
	1519	+ cCheckBox materialCB;
	1520	+ cCheckBox textureCB;
697	1521
698	1522	public void itemStateChanged(ItemEvent e)
699	1523	{
..	..	@@ -721,6 +1545,7 @@
721	1545	} else if(e.getSource() == liveCB)
722	1546	{
723	1547	cameraView.ToggleLive();
	1548	+ refreshContents(false);
724	1549	}
725	1550	else if(e.getSource() == supportCB)
726	1551	{
..	..	@@ -736,6 +1561,12 @@
736	1561	{
737	1562	cameraView.ToggleInertia();
738	1563	cameraView.repaint();
	1564	+ }
	1565	+ else if(e.getSource() == minshaderCB)
	1566	+ {
	1567	+ Globals.MINSHADER ^= true;
	1568	+ cameraView.programInitialized = false;
	1569	+ cameraView.repaint();
739	1570	}
740	1571	else if(e.getSource() == localCB)
741	1572	{
..	..	@@ -755,6 +1586,10 @@
755	1586	Recompile();
756	1587	cameraView.repaint();
757	1588	// refreshContents();
	1589	+ }
	1590	+ else if(e.getSource() == zoomBoxCB)
	1591	+ {
	1592	+ cameraView.ToggleZoomBoxMode();
758	1593	}
759	1594	else if(e.getSource() == smoothfocusCB)
760	1595	{
..	..	@@ -781,6 +1616,18 @@
781	1616	{
782	1617	cameraView.ToggleOeil();
783	1618	}
	1619	+ else if(e.getSource() == shadowCB)
	1620	+ {
	1621	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1622	+ }
	1623	+ else if(e.getSource() == freezeCB)
	1624	+ {
	1625	+ Globals.FREEZEONMOVE ^= true;
	1626	+ }
	1627	+ else if(e.getSource() == autokeepCB)
	1628	+ {
	1629	+ Globals.REPLACEONMAKE ^= true;
	1630	+ }
784	1631	else if(e.getSource() == lookAtCB)
785	1632	{
786	1633	cameraView.ToggleLookAt();
..	..	@@ -797,7 +1644,8 @@
797	1644
798	1645	/**/
799	1646	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
800		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1647	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1648	+ TreePath path = objEditor.jTree.getSelectionPath();
801	1649	if ((path == null) \|\| (path.getPathCount() <= 1)) {
802	1650	// We can't move the root node or an empty selection
803	1651	return;
..	..	@@ -860,8 +1708,6 @@
860	1708	}
861	1709	}
862	1710
863		- String string = (String) object;
864		-
865	1711	System.out.println("Transfer = " + object + "; drop : " + target);
866	1712	// if( object instanceof java.io.File[])
867	1713	// {
..	..	@@ -869,7 +1715,11 @@
869	1715	// objEditor.DropFile((java.io.File[]) object, true);
870	1716	// return;
871	1717	// }
872		- if (string.charAt(0) == '/')
	1718	+
	1719	+ String string = object.toString();
	1720	+
	1721	+ // File path for Mac and Windows
	1722	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
873	1723	{
874	1724	// file(s)
875	1725	String[] names = string.split("\n");
..	..	@@ -896,7 +1746,7 @@
896	1746
897	1747	flashIt = false;
898	1748	CameraPane pane = (CameraPane) target;
899		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1749	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
900	1750	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
901	1751
902	1752	if (group.selection.size() == 1)
..	..	@@ -912,23 +1762,33 @@
912	1762
913	1763	assert target == objEditor.jTree;
914	1764	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1765	+ Object3D destinationLeaf;
915	1766	try {
916		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1767	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
917	1768	} catch (Exception e) {
918	1769	System.out.println("destinationPath : " + destinationPath);
919	1770	return;
920	1771	}
921	1772
922		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1773	+ for (int i=group.selection.size(); --i>=0;)
923	1774	{
	1775	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1776	+
	1777	+ // Cannot move into itself
	1778	+ if (child == destinationLeaf)
	1779	+ return;
	1780	+ }
	1781	+
	1782	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1783	+// {
924	1784	loadClipboard(true);
925	1785	objEditor.jTree.setSelectionPath(destinationPath);
926		- pasteInto(false);
927		- } else {
928		- loadClipboard(false);
929		- objEditor.jTree.setSelectionPath(destinationPath);
930		- pasteInto(false); // true); // ???
931		- }
	1786	+ pasteInto(false, false);
	1787	+// } else {
	1788	+// loadClipboard(false);
	1789	+// objEditor.jTree.setSelectionPath(destinationPath);
	1790	+// pasteInto(false, false); // true); // ???
	1791	+// }
932	1792	}
933	1793	public void dropActionChanged(DropTargetDragEvent dtde)
934	1794	// Called if the user has modified the current drop gesture
..	..	@@ -984,7 +1844,12 @@
984	1844	TreePath path;
985	1845
986	1846	public TransferableTreePath(TreePath tp) {
987		- path = tp;
	1847	+ Object[] objs = new Object[tp.getPathCount()];
	1848	+ for (int i=0; i<objs.length; i++)
	1849	+ {
	1850	+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
	1851	+ }
	1852	+ path = new TreePath(objs);
988	1853	}
989	1854
990	1855	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -1033,85 +1898,107 @@
1033	1898	{
1034	1899	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1035	1900	//heightFieldItem.addActionListener(this);
1036		- gridItem = menu.add(new MenuItem("Grid"));
1037		- gridItem.addActionListener(this);
1038		- rectoidItem = menu.add(new MenuItem("Box"));
1039		- rectoidItem.addActionListener(this);
1040		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1041		- ellipsoidItem.addActionListener(this);
1042		- coneItem = menu.add(new MenuItem("Cone"));
1043		- coneItem.addActionListener(this);
1044		- torusItem = menu.add(new MenuItem("Torus"));
1045		- torusItem.addActionListener(this);
1046		- superItem = menu.add(new MenuItem("Superellipsoid"));
1047		- superItem.addActionListener(this);
	1901	+// gridItem = menu.add(new MenuItem("Grid"));
	1902	+// gridItem.addActionListener(this);
	1903	+// rectoidItem = menu.add(new MenuItem("Box"));
	1904	+// rectoidItem.addActionListener(this);
	1905	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1906	+// ellipsoidItem.addActionListener(this);
	1907	+// coneItem = menu.add(new MenuItem("Cone"));
	1908	+// coneItem.addActionListener(this);
	1909	+// torusItem = menu.add(new MenuItem("Torus"));
	1910	+// torusItem.addActionListener(this);
	1911	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1912	+// superItem.addActionListener(this);
	1913	+
	1914	+ cameraItem = menu.add(new MenuItem("Camera"));
	1915	+ cameraItem.addActionListener(this);
	1916	+
	1917	+ if (!Globals.ADVANCED)
	1918	+ {
1048	1919	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1049	1920	kleinItem.addActionListener(this);
1050		- particleItem = menu.add(new MenuItem("Particle system"));
1051		- particleItem.addActionListener(this);
	1921	+ }
	1922	+
	1923	+// particleItem = menu.add(new MenuItem("Particle system"));
	1924	+// particleItem.addActionListener(this);
	1925	+ if (Globals.ADVANCED)
	1926	+ {
1052	1927	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1053	1928	ragdollItem.addActionListener(this);
1054	1929	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1055	1930	ragdoll2Item.addActionListener(this);
	1931	+ }
1056	1932	menu.add("-");
1057		- meshItem = menu.add(new MenuItem("Mesh"));
	1933	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1058	1934	meshItem.addActionListener(this);
1059	1935	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1060	1936	// meshGroupItem.addActionListener(this);
	1937	+ if (Globals.ADVANCED)
	1938	+ {
1061	1939	springItem = menu.add(new MenuItem("Spring"));
1062	1940	springItem.addActionListener(this);
1063	1941	flagItem = menu.add(new MenuItem("Flag"));
1064	1942	flagItem.addActionListener(this);
1065		- bezierItem = menu.add(new MenuItem("Patch"));
1066		- bezierItem.addActionListener(this);
1067		- checkerItem = menu.add(new MenuItem("Checker"));
1068		- checkerItem.addActionListener(this);
1069	1943	blobItem = menu.add(new MenuItem("Blob"));
1070	1944	blobItem.addActionListener(this);
1071	1945	latheItem = menu.add(new MenuItem("Lathe"));
1072	1946	latheItem.addActionListener(this);
1073		- lightItem = menu.add(new MenuItem("Light"));
1074		- lightItem.addActionListener(this);
	1947	+ }
	1948	+ bezierItem = menu.add(new MenuItem("Bezier Patch"));
	1949	+ bezierItem.addActionListener(this);
	1950	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1951	+// overlayItem.addActionListener(this);
	1952	+// lightItem = menu.add(new MenuItem("Light"));
	1953	+// lightItem.addActionListener(this);
1075	1954	menu.add("-");
1076	1955	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1077	1956	//superLoopItem.addActionListener(this);
1078		- loopItem = menu.add(new MenuItem("Loop"));
1079		- loopItem.addActionListener(this);
	1957	+// loopItem = menu.add(new MenuItem("Loop"));
	1958	+// loopItem.addActionListener(this);
1080	1959	doubleItem = menu.add(new MenuItem("Fork"));
1081	1960	doubleItem.addActionListener(this);
	1961	+ if (Globals.ADVANCED)
	1962	+ {
1082	1963	tripleItem = menu.add(new MenuItem("Trident"));
1083	1964	tripleItem.addActionListener(this);
	1965	+ }
1084	1966	}
1085	1967
1086	1968	void buildToolsMenu(Menu menu)
1087	1969	{
1088	1970	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1089	1971	animationItem.addItemListener(this);
1090		- animationItem.setState(CameraPane.ANIMATION);
	1972	+ animationItem.setState(Globals.ANIMATION);
	1973	+
	1974	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1975	+ archiveItem.addActionListener(this);
1091	1976
1092	1977	menu.add("-");
1093	1978	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1094	1979	parseverticesItem.addActionListener(this);
1095	1980	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1096	1981	textureFieldItem.addActionListener(this);
1097		- alignItem = menu.add(new MenuItem("Align"));
	1982	+ alignItem = menu.add(new MenuItem("Align Objects"));
1098	1983	alignItem.addActionListener(this);
1099		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1100		- mirrorItem.addActionListener(this);
1101	1984	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1102	1985	reduceMorphItem.addActionListener(this);
1103	1986	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1104	1987	reduce34MorphItem.addActionListener(this);
1105		-
1106		- menu.add(computeAOItem = new MenuItem("Compute AO"));
1107		- computeAOItem.addActionListener(this);
1108	1988	menu.add("-");
1109		-
1110	1989	menu.add(memoryItem = new MenuItem("Memory Usage"));
1111	1990	memoryItem.addActionListener(this);
	1991	+ menu.add(computeAOItem = new MenuItem("Compute AO"));
	1992	+ computeAOItem.addActionListener(this);
	1993	+
	1994	+ if (Globals.ADVANCED)
	1995	+ {
	1996	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	1997	+ mirrorItem.addActionListener(this);
	1998	+ menu.add("-");
1112	1999	menu.add(analyzeItem = new MenuItem("Analyze"));
1113	2000	analyzeItem.addActionListener(this);
1114		- menu.add(dumpItem = new MenuItem("Dump"));
	2001	+ menu.add(dumpItem = new MenuItem("Print"));
1115	2002	dumpItem.addActionListener(this);
1116	2003	// menu.add(pathItem = new MenuItem("From-to path"));
1117	2004	// pathItem.addActionListener(this);
..	..	@@ -1120,6 +2007,8 @@
1120	2007	resetParentItem.addActionListener(this);
1121	2008	repairParentItem = menu.add(new MenuItem("Repair Parent"));
1122	2009	repairParentItem.addActionListener(this);
	2010	+ repairShadowItem = menu.add(new MenuItem("Repair Shadow"));
	2011	+ repairShadowItem.addActionListener(this);
1123	2012	menu.add(invariantsItem = new MenuItem("Invariants"));
1124	2013	invariantsItem.addActionListener(this);
1125	2014	menu.add(recompileItem = new MenuItem("Recompile"));
..	..	@@ -1127,6 +2016,7 @@
1127	2016	menu.add("-");
1128	2017	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1129	2018	editScriptItem.addActionListener(this);
	2019	+ }
1130	2020	}
1131	2021
1132	2022	void ScreenFit()
..	..	@@ -1249,9 +2139,34 @@
1249	2139	shadow.material = new cMaterial(obj.material);
1250	2140	shadow.material.diffuse = 0.0001f;
1251	2141	shadow.material.specular = 0.0001f;
	2142	+ //shadow.projectedVertices[1].x = 300;
1252	2143
1253	2144	makeSomething(shadow);
1254	2145	}
	2146	+
	2147	+ private void ClearUnpinned()
	2148	+ {
	2149	+ //for (Object3D obj : listUI)
	2150	+ for (int i=listUI.size(); --i>=0;)
	2151	+ {
	2152	+ Object3D obj = listUI.elementAt(i);
	2153	+ if (!obj.pinned)
	2154	+ {
	2155	+ obj.CloseUI();
	2156	+ listUI.remove(i);
	2157	+ }
	2158	+ }
	2159	+ }
	2160	+
	2161	+ private void EditElement(Object3D elem, boolean newWindow)
	2162	+ {
	2163	+ // if (!(elem instanceof Composite))
	2164	+ // newWindow = false;
	2165	+ listUI.add(elem);
	2166	+ elem.openEditWindow(this, newWindow); //, false);
	2167	+ System.out.println("edit : " + elem);
	2168	+ elem.editWindow.refreshContents(true); // ? new
	2169	+ }
1255	2170
1256	2171	/**
1257	2172	* applyExample
..	..	@@ -1455,9 +2370,9 @@
1455	2370
1456	2371	void Overwrite(int mask)
1457	2372	{
1458		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2373	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1459	2374	{
1460		- Object3D content = GrafreeD.clipboard.get(0);
	2375	+ Object3D content = Grafreed.clipboard.get(0);
1461	2376
1462	2377	if (content instanceof cGroup && ((cGroup)content).transientlink )
1463	2378	content = ((cGroup)content).get(0);
..	..	@@ -1480,6 +2395,7 @@
1480	2395	//
1481	2396	public void actionPerformed(ActionEvent event) // , Object arg)
1482	2397	{
	2398	+ Object source = event.getSource();
1483	2399	/*
1484	2400	if (event.getSource() == nameField)
1485	2401	{
..	..	@@ -1491,11 +2407,11 @@
1491	2407	}
1492	2408	else
1493	2409	*/
1494		- if (event.getSource() == lookAtItem \|\| event.getSource() == lookFromItem)
	2410	+ if (source == lookAtItem \|\| source == lookFromItem)
1495	2411	{
1496	2412	ScreenFit();
1497	2413	} else
1498		- if (event.getSource() == switchItem)
	2414	+ if (source == switchViewItem)
1499	2415	{
1500	2416	cVector v1 = new cVector();
1501	2417	cVector v2 = new cVector();
..	..	@@ -1504,11 +2420,11 @@
1504	2420	objEditor.cameraView.renderCamera.setAim(v2, v1);
1505	2421	objEditor.cameraView.repaint();
1506	2422	} else
1507		- if (event.getSource() == rectoidItem)
	2423	+ if (source == rectoidItem \|\| source == boxButton)
1508	2424	{
1509	2425	makeSomething(new Box());
1510	2426	} else
1511		- if (event.getSource() == particleItem)
	2427	+ if (source == particleItem \|\| source == particlesButton)
1512	2428	{
1513	2429	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1514	2430	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1529,9 +2445,9 @@
1529	2445	applyExample(particleGeom, "SMOKE");
1530	2446	makeSomething(particleGeom);
1531	2447	} else
1532		- if (event.getSource() == ragdollItem \|\| event.getSource() == ragdoll2Item)
	2448	+ if (source == ragdollItem \|\| source == ragdoll2Item)
1533	2449	{
1534		- GenericJoint ragdoll = new GenericJoint(event.getSource() == ragdollItem);
	2450	+ GenericJoint ragdoll = new GenericJoint(source == ragdollItem);
1535	2451
1536	2452	ragdoll.toParent = LA.newMatrix();
1537	2453	ragdoll.fromParent = LA.newMatrix();
..	..	@@ -1549,7 +2465,7 @@
1549	2465	} else
1550	2466	/*
1551	2467	*/
1552		- if (event.getSource() == heightFieldItem)
	2468	+ if (source == heightFieldItem)
1553	2469	{
1554	2470	Object3D obj = new Object3D();
1555	2471
..	..	@@ -1587,31 +2503,31 @@
1587	2503
1588	2504	makeSomething(obj);
1589	2505	} else
1590		- if (event.getSource() == gridItem)
	2506	+ if (source == gridItem \|\| source == gridButton)
1591	2507	{
1592	2508	makeSomething(new Grid());
1593	2509	} else
1594		- if (event.getSource() == ellipsoidItem)
	2510	+ if (source == ellipsoidItem \|\| source == sphereButton)
1595	2511	{
1596	2512	makeSomething(new Sphere());
1597	2513	} else
1598		- if (event.getSource() == coneItem)
	2514	+ if (source == coneItem \|\| source == coneButton)
1599	2515	{
1600	2516	makeSomething(new Cone());
1601	2517	} else
1602		- if (event.getSource() == torusItem)
	2518	+ if (source == torusItem \|\| source == torusButton)
1603	2519	{
1604	2520	makeSomething(new Torus());
1605	2521	} else
1606		- if (event.getSource() == superItem)
	2522	+ if (source == superItem \|\| source == superButton)
1607	2523	{
1608	2524	makeSomething(new Superellipsoid());
1609	2525	} else
1610		- if (event.getSource() == kleinItem)
	2526	+ if (source == kleinItem \|\| source == kleinButton)
1611	2527	{
1612	2528	makeSomething(new Klein());
1613	2529	} else
1614		- if (event.getSource() == blobItem)
	2530	+ if (source == blobItem)
1615	2531	{
1616	2532	Blob blob = new Blob();
1617	2533	BlobComponent comp = new BlobComponent();
..	..	@@ -1619,15 +2535,15 @@
1619	2535	//blob.retile();
1620	2536	makeSomething(blob);
1621	2537	} else
1622		- if (event.getSource() == latheItem)
	2538	+ if (source == latheItem)
1623	2539	{
1624	2540	makeSomething(new Lathe());
1625	2541	} else
1626		- if (event.getSource() == bezierItem)
	2542	+ if (source == bezierItem)
1627	2543	{
1628	2544	makeSomething(new BezierSurface());
1629	2545	} else
1630		- if (event.getSource() == checkerItem)
	2546	+ if (source == overlayItem \|\| source == overlayButton)
1631	2547	{
1632	2548	/*
1633	2549	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1642,7 +2558,7 @@
1642	2558	*/
1643	2559	makeSomething(new Checker());
1644	2560	} else
1645		- if (event.getSource() == meshItem)
	2561	+ if (source == meshItem)
1646	2562	{
1647	2563	Object3D itemtomake = new Object3D();
1648	2564	Object3D child;
..	..	@@ -1663,35 +2579,52 @@
1663	2579	makeSomething(child);
1664	2580	}
1665	2581	} else
1666		- if (event.getSource() == springItem)
	2582	+ if (source == springItem)
1667	2583	{
1668	2584	cSpring s = new cSpring();
1669	2585	s.setup();
1670	2586	makeSomething(s);
1671	2587	} else
1672		- if (event.getSource() == flagItem)
	2588	+ if (source == flagItem)
1673	2589	{
1674	2590	cSpring s = new cFlag();
1675	2591	s.setup();
1676	2592	makeSomething(s);
1677	2593	} else
1678		- if (event.getSource() == lightItem)
	2594	+ if (source == lightItem \|\| source == lightButton)
1679	2595	{
1680	2596	makeSomething(new Light());
1681	2597	} else
1682		- if (event.getSource() == csgItem)
	2598	+// if (source == skybox1Button \|\|
	2599	+// source == skybox2Button \|\|
	2600	+// source == skybox3Button \|\|
	2601	+// source == skybox4Button \|\|
	2602	+// source == skybox5Button \|\|
	2603	+// source == skybox6Button \|\|
	2604	+// source == skybox7Button \|\|
	2605	+// source == skybox11Button \|\|
	2606	+// source == skybox12Button \|\|
	2607	+// source == skybox13Button \|\|
	2608	+// source == skybox14Button \|\|
	2609	+// source == skybox15Button \|\|
	2610	+// source == skybox16Button \|\|
	2611	+// source == skybox17Button)
	2612	+// {
	2613	+// ChangeSkybox(source);
	2614	+// } else
	2615	+ if (source == csgItem)
1683	2616	{
1684	2617	group(new CSG());
1685	2618	} else
1686		- if (event.getSource() == templateItem)
	2619	+ if (source == templateItem)
1687	2620	{
1688	2621	group(new cTemplate());
1689	2622	} else
1690		- if (event.getSource() == attributeItem)
	2623	+ if (source == attributeItem)
1691	2624	{
1692	2625	makeSomething(new Attribute());
1693	2626	} else
1694		- if (event.getSource() == pointflowItem)
	2627	+ if (source == pointflowItem)
1695	2628	{
1696	2629	makeSomething(new PointFlow());
1697	2630	} else
..	..	@@ -1703,7 +2636,7 @@
1703	2636	} else
1704	2637	*/
1705	2638
1706		- if (event.getSource() == superLoopItem)
	2639	+ if (source == superLoopItem)
1707	2640	{
1708	2641	Composite g = new cGroup();
1709	2642	for (int i=0; i<15; i++)
..	..	@@ -1725,30 +2658,30 @@
1725	2658
1726	2659	group(g);
1727	2660	} else
1728		- if (event.getSource() == loopItem)
	2661	+ if (source == loopItem \|\| source == loopButton)
1729	2662	{
1730	2663	Composite csg = new GroupLeaf();
1731	2664	csg.count = 5;
1732	2665	group(csg);
1733		- Composite child = new cGroup();
	2666	+ Composite child = new cGroup("Branch");
1734	2667	csg.addChild(child);
1735	2668	child.addChild(csg);
1736	2669	} else
1737		- if (event.getSource() == doubleItem)
	2670	+ if (source == doubleItem)
1738	2671	{
1739		- Composite csg = new GroupLeaf();
	2672	+ Composite csg = new GroupLeaf("Fork");
1740	2673	csg.count = 5;
1741	2674	group(csg);
1742		- Composite child = new cGroup();
	2675	+ Composite child = new cGroup("Branch A");
1743	2676	csg.addChild(child);
1744	2677	child.addChild(csg);
1745		- child = new cGroup();
	2678	+ child = new cGroup("Branch B");
1746	2679	csg.addChild(child);
1747	2680	child.addChild(csg);
1748	2681	} else
1749		- if (event.getSource() == tripleItem)
	2682	+ if (source == tripleItem)
1750	2683	{
1751		- Composite csg = new GroupLeaf();
	2684	+ Composite csg = new GroupLeaf("Trident");
1752	2685	csg.count = 4;
1753	2686	group(csg);
1754	2687	Composite child = new cGroup();
..	..	@@ -1761,73 +2694,117 @@
1761	2694	csg.addChild(child);
1762	2695	child.addChild(csg);
1763	2696	} else
1764		-
1765		- if (event.getSource() == importGFDItem)
	2697	+ if (source == computeAOItem)
1766	2698	{
1767		- ImportGFD();
	2699	+ Globals.drawMode = CameraPane.OCCLUSION;
	2700	+ cameraView.repaint();
1768	2701	} else
1769		- if (event.getSource() == importVRMLX3DItem)
1770		- {
1771		- ImportVRMLX3D();
1772		- } else
1773		- if (event.getSource() == import3DSItem)
1774		- {
1775		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1776		- } else
1777		- if (event.getSource() == importOBJItem)
1778		- {
1779		- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1780		- } else
1781		- if (event.getSource() == computeAOItem)
1782		- {
1783		- CameraPane.drawMode = CameraPane.OCCLUSION;
1784		- CameraPane.theRenderer.repaint();
1785		- } else
1786		- if (event.getSource() == recompileItem)
	2702	+ if (source == recompileItem)
1787	2703	{
1788	2704	Recompile();
1789	2705	refreshContents();
1790	2706	} else
1791		- if (event.getSource() == editScriptItem)
	2707	+ if (source == editScriptItem)
1792	2708	{
1793	2709	OpenDialog();
1794	2710	refreshContents();
1795	2711	} else
1796		- if (event.getSource() == invariantsItem)
	2712	+ if (source == invariantsItem)
1797	2713	{
1798	2714	System.out.println("Invariants:");
1799		- GrafreeD.grafreeD.universe.invariants();
	2715	+ Grafreed.grafreed.universe.invariants();
1800	2716	} else
1801		- if (event.getSource() == memoryItem)
	2717	+ if (source == memoryItem)
1802	2718	{
1803	2719	//System.out.println("Invariants:");
1804	2720	PrintMemory();
1805	2721	} else
1806		- if (event.getSource() == pathItem)
	2722	+ if (source == pathItem)
1807	2723	{
1808	2724	PrintPath();
1809	2725	} else
1810		- if (event.getSource() == analyzeItem)
	2726	+ if (source == analyzeItem)
1811	2727	{
1812	2728	AnalyzeObject();
1813	2729	} else
1814		- if (event.getSource() == dumpItem)
	2730	+ if (source == dumpItem)
1815	2731	{
1816	2732	DumpObject();
1817	2733	} else
1818		- if (event.getSource() == screenfitButton)
	2734	+ if (source == minButton)
1819	2735	{
1820		- //Reload(lastConverter, lastFilename, true);
	2736	+ Minimize();
	2737	+ } else
	2738	+ if (source == maxButton)
	2739	+ {
	2740	+ Maximize();
	2741	+ } else
	2742	+ if (source == fullButton)
	2743	+ {
	2744	+ ToggleFullScreen();
	2745	+ } else
	2746	+ if (source == collapseButton)
	2747	+ {
	2748	+ this.expandedLayout = radio.layout;
	2749	+ CollapseToolbar();
	2750	+ } else
	2751	+ if (source == maximize3DButton)
	2752	+ {
	2753	+ this.expandedLayout = radio.layout;
	2754	+ radio.layout = twoButton;
	2755	+ Show3DView();
	2756	+ CollapseToolbar();
	2757	+ } else
	2758	+ if (source == previousVersionButton)
	2759	+ {
	2760	+ // Go to previous version
	2761	+ //if (!Undo())
	2762	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2763	+ PreviousVersion();
	2764	+ } else
	2765	+ if (source == restoreButton)
	2766	+ {
	2767	+ // Restore current version
	2768	+ Restore();
	2769	+ //restoreButton.setEnabled(false);
	2770	+ } else
	2771	+ if (source == replaceButton)
	2772	+ {
	2773	+ // Overwrite current version
	2774	+ Replace();
	2775	+ //replaceButton.setEnabled(false);
	2776	+ } else
	2777	+ if (source == nextVersionButton)
	2778	+ {
	2779	+ // Go to next version
	2780	+ NextVersion();
	2781	+ } else
	2782	+ if (source == saveVersionButton)
	2783	+ {
	2784	+ // Save a new version
	2785	+ if (!Save(true))
	2786	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2787	+ } else
	2788	+ if (source == deleteVersionButton)
	2789	+ {
	2790	+ // Delete a new version
	2791	+ DeleteVersion();
	2792	+ } else
	2793	+ if (source == oneStepButton)
	2794	+ {
	2795	+ Globals.ONESTEP = true;
	2796	+ cameraView.repaint();
	2797	+ } else
	2798	+ if (source == screenfitButton)
	2799	+ {
1821	2800	ScreenFit();
1822	2801	} else
1823		- if (event.getSource() == screenfitpointButton)
	2802	+ if (source == screenfitpointButton)
1824	2803	{
1825		- //Reload(lastConverter, lastFilename, true);
1826	2804	ScreenFitPoint();
1827	2805	} else
1828		- if (event.getSource() == snapobjectButton)
	2806	+ if (source == snapobjectButton)
1829	2807	{
1830		- //Reload(lastConverter, lastFilename, true);
1831	2808	SnapObject();
1832	2809	} else
1833	2810	// if (event.getSource() == recompileButton)
..	..	@@ -1836,13 +2813,13 @@
1836	2813	// Recompile();
1837	2814	// refreshContents();
1838	2815	// } else
1839		- if (event.getSource() == gcButton)
	2816	+ if (source == gcButton)
1840	2817	{
1841	2818	System.out.println("Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1842	2819	System.gc();
1843	2820	System.out.println("GC Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1844	2821	} else
1845		- if (event.getSource() == editLeafItem)
	2822	+ if (source == editLeafItem)
1846	2823	{
1847	2824	Object3D obj;
1848	2825	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -1856,62 +2833,74 @@
1856	2833	}
1857	2834	refreshContents(true);
1858	2835	} else
1859		- if (event.getSource() == openWindowItem)
	2836	+ if (source == openWindowItem)
1860	2837	{
1861	2838	EditSelection(true);
1862	2839	} else
1863		- if (event.getSource() == cutItem \|\| event.getSource() == clearButton)
	2840	+ if (source == cutItem \|\| source == clearButton)
1864	2841	{
1865	2842	loadClipboard(true);
1866	2843	} else
1867		- if (event.getSource() == duplicateItem)
	2844	+ if (source == undoItem)
1868	2845	{
1869		- Object3D keep = GrafreeD.clipboard;
	2846	+ PreviousVersion();
	2847	+ } else
	2848	+ if (source == redoItem)
	2849	+ {
	2850	+ NextVersion();
	2851	+ } else
	2852	+ if (source == duplicateItem)
	2853	+ {
	2854	+ Object3D keep = Grafreed.clipboard;
1870	2855	loadClipboard(false);
1871	2856	paste(false);
1872		- GrafreeD.clipboard = keep;
	2857	+ Grafreed.clipboard = keep;
1873	2858	} else
1874		- if (event.getSource() == cloneItem)
	2859	+ if (source == cloneItem)
1875	2860	{
1876	2861	CloneSelection(false);
1877	2862	} else
1878		- if (event.getSource() == cloneSupportItem)
	2863	+ if (source == cloneSupportItem)
1879	2864	{
1880	2865	CloneSelection(true);
1881	2866	} else
1882		- if (event.getSource() == copyItem)
	2867	+ if (source == copyItem)
1883	2868	{
1884	2869	loadClipboard(false);
1885	2870	} else
1886		- if (event.getSource() == pasteItem)
	2871	+ if (source == pasteItem)
1887	2872	{
1888	2873	paste(false);
1889	2874	} else
1890		- if (event.getSource() == pasteLinkItem)
	2875	+ if (source == pasteIntoItem)
1891	2876	{
1892		- pasteInto(false);
	2877	+ pasteInto(true, false);
1893	2878	} else
1894		- if (event.getSource() == pasteCloneItem)
	2879	+ if (source == pasteLinkItem)
1895	2880	{
1896		- pasteInto(true);
	2881	+ pasteInto(false, false);
1897	2882	} else
1898		- if (event.getSource() == pasteExpandItem)
	2883	+ if (source == pasteCloneItem)
	2884	+ {
	2885	+ pasteInto(true, true);
	2886	+ } else
	2887	+ if (source == pasteExpandItem)
1899	2888	{
1900	2889	paste(true);
1901	2890	} else
1902		- if (event.getSource() == synchronizeItem)
	2891	+ if (source == synchronizeItem)
1903	2892	{
1904	2893	Overwrite(Object3D.TRANSFORM);
1905	2894	} else
1906		- if (event.getSource() == overwriteNameItem)
	2895	+ if (source == overwriteNameItem)
1907	2896	{
1908	2897	Overwrite(Object3D.NAME);
1909	2898	} else
1910		- if (event.getSource() == overwriteUVItem)
	2899	+ if (source == overwriteUVItem)
1911	2900	{
1912	2901	Overwrite(Object3D.UV);
1913	2902	} else
1914		- if (event.getSource() == overwriteMatItem)
	2903	+ if (source == overwriteMatItem)
1915	2904	{
1916	2905	/* july 2015
1917	2906	if ((dropAttributes & Object3D.TEXTURE) == 0)
..	..	@@ -1931,7 +2920,7 @@
1931	2920
1932	2921	Overwrite(dropAttributes);
1933	2922	}
1934		- if (event.getSource() == overwriteGeoItem)
	2923	+ if (source == overwriteGeoItem)
1935	2924	{
1936	2925	Overwrite(Object3D.GEOMETRY);
1937	2926	// if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
..	..	@@ -1948,7 +2937,7 @@
1948	2937	// refreshContents();
1949	2938	// }
1950	2939	} else
1951		- if (event.getSource() == generateMeshItem)
	2940	+ if (source == generateMeshItem)
1952	2941	{
1953	2942	//if (group.selection.size() == 1)
1954	2943	// for (int i=0; i<group.selection.size(); i++)
..	..	@@ -1959,7 +2948,7 @@
1959	2948	ResetModel();
1960	2949	refreshContents();
1961	2950	} else
1962		- if (event.getSource() == extractGeometriesItem)
	2951	+ if (source == extractGeometriesItem)
1963	2952	{
1964	2953	boolean one = false;
1965	2954
..	..	@@ -1986,7 +2975,7 @@
1986	2975	ResetModel();
1987	2976	refreshContents();
1988	2977	} else
1989		- if (event.getSource() == cloneGeometriesItem)
	2978	+ if (source == cloneGeometriesItem)
1990	2979	{
1991	2980	boolean one = false;
1992	2981
..	..	@@ -2012,7 +3001,7 @@
2012	3001	ResetModel();
2013	3002	refreshContents();
2014	3003	} else
2015		- if (event.getSource() == shareGeometriesItem)
	3004	+ if (source == shareGeometriesItem)
2016	3005	{
2017	3006	boolean one = false;
2018	3007
..	..	@@ -2042,7 +3031,7 @@
2042	3031	refreshContents();
2043	3032	}
2044	3033	} else
2045		- if (event.getSource() == mergeGeometriesItem)
	3034	+ if (source == mergeGeometriesItem)
2046	3035	{
2047	3036	boolean one = false;
2048	3037
..	..	@@ -2072,7 +3061,7 @@
2072	3061	ResetModel();
2073	3062	refreshContents();
2074	3063	} else
2075		- if (event.getSource() == linkverticesItem)
	3064	+ if (source == linkverticesItem)
2076	3065	{
2077	3066	// if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2078	3067	// {
..	..	@@ -2085,48 +3074,48 @@
2085	3074	// group.selection.get(0).setMasterThis(content); // should be identity
2086	3075	// refreshContents();
2087	3076	// }
2088		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	3077	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2089	3078	{
2090		- Object3D content = GrafreeD.clipboard.get(0);
	3079	+ Object3D content = Grafreed.clipboard.get(0);
2091	3080
2092	3081	if (content instanceof cGroup && ((cGroup)content).transientlink )
2093	3082	content = ((cGroup)content).get(0);
2094	3083
2095		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	3084	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2096	3085	for (int i=0; i<group.selection.size(); i++)
2097	3086	{
2098		- boolean random = CameraPane.RANDOM;
2099		- CameraPane.RANDOM = false; // parse all random nodes
	3087	+ boolean random = CameraPane.SWITCH;
	3088	+ CameraPane.SWITCH = false; // parse all random nodes
2100	3089	group.selection.get(i).linkVerticesThis(content);
2101	3090	// group.selection.get(i).setMasterThis(content); // should be identity
2102		- CameraPane.RANDOM = random;
	3091	+ CameraPane.SWITCH = random;
2103	3092	}
2104		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	3093	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2105	3094	refreshContents();
2106	3095	}
2107	3096	} else
2108		- if (event.getSource() == resetsupportItem)
	3097	+ if (source == resetsupportItem)
2109	3098	{
2110	3099	for (int i=0; i<group.selection.size(); i++)
2111	3100	{
2112		- boolean random = CameraPane.RANDOM;
2113		- CameraPane.RANDOM = false; // parse all random nodes
	3101	+ boolean random = CameraPane.SWITCH;
	3102	+ CameraPane.SWITCH = false; // parse all random nodes
2114	3103	group.selection.get(i).linkVerticesThis(null);
2115		- CameraPane.RANDOM = random;
	3104	+ CameraPane.SWITCH = random;
2116	3105	}
2117	3106
2118	3107	refreshContents();
2119	3108	} else
2120		- if (event.getSource() == relinkverticesItem)
	3109	+ if (source == relinkverticesItem)
2121	3110	{
2122		- boolean random = CameraPane.RANDOM;
2123		- CameraPane.RANDOM = false; // parse all random nodes
	3111	+ boolean random = CameraPane.SWITCH;
	3112	+ CameraPane.SWITCH = false; // parse all random nodes
2124	3113	group.selection.RelinkToSupport();
2125		- CameraPane.RANDOM = random;
	3114	+ CameraPane.SWITCH = random;
2126	3115
2127	3116	refreshContents();
2128	3117	} else
2129		- if (event.getSource() == resetreferencesItem)
	3118	+ if (source == resetreferencesItem)
2130	3119	{
2131	3120	for (int i=0; i<group.selection.size(); i++)
2132	3121	{
..	..	@@ -2135,11 +3124,11 @@
2135	3124
2136	3125	refreshContents();
2137	3126	} else
2138		- if (event.getSource() == setMasterItem)
	3127	+ if (source == setMasterItem)
2139	3128	{
2140		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	3129	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2141	3130	{
2142		- Object3D content = GrafreeD.clipboard.get(0);
	3131	+ Object3D content = Grafreed.clipboard.get(0);
2143	3132
2144	3133	if (content instanceof cGroup && ((cGroup)content).transientlink )
2145	3134	content = ((cGroup)content).get(0);
..	..	@@ -2148,13 +3137,13 @@
2148	3137	refreshContents();
2149	3138	}
2150	3139	} else
2151		- if (event.getSource() == poseMeshItem)
	3140	+ if (source == poseMeshItem)
2152	3141	{
2153	3142	if (group.selection.size() == 1)
2154	3143	{
2155		- if (GrafreeD.clipboard.size() == 1)
	3144	+ if (Grafreed.clipboard.size() == 1)
2156	3145	{
2157		- Object3D content = GrafreeD.clipboard.get(0);
	3146	+ Object3D content = Grafreed.clipboard.get(0);
2158	3147
2159	3148	if (content instanceof cGroup && ((cGroup)content).transientlink )
2160	3149	content = ((cGroup)content).get(0);
..	..	@@ -2167,19 +3156,19 @@
2167	3156	}
2168	3157
2169	3158	} else
2170		- if (event.getSource() == revertMeshItem)
	3159	+ if (source == revertMeshItem)
2171	3160	{
2172	3161	RevertMeshes();
2173	3162	} else
2174		- if (event.getSource() == resetMeshItem)
	3163	+ if (source == resetAllItem)
2175	3164	{
2176	3165	ResetAll();
2177	3166	} else
2178		- if (event.getSource() == stepAllItem)
	3167	+ if (source == stepAllItem)
2179	3168	{
2180	3169	StepAll();
2181	3170	} else
2182		- if (event.getSource() == clearItem) // \|\| event.getSource() == clearButton)
	3171	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2183	3172	{
2184	3173	//int indices[] = jList.getSelectedIndices();
2185	3174	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2187,46 +3176,46 @@
2187	3176
2188	3177	ClearSelection(false);
2189	3178	} else
2190		- if (event.getSource() == clearAllItem)
	3179	+ if (source == clearAllItem)
2191	3180	{
2192	3181	ClearSelection(true);
2193	3182	} else
2194		- if (event.getSource() == grabItem)
	3183	+ if (source == grabItem \|\| source == groupButton)
2195	3184	{
2196		- group(new cGroup(), true);
	3185	+ group(new cGroup(), false); // true);
2197	3186	} else
2198		- if (event.getSource() == hideItem)
	3187	+ if (source == hideItem)
2199	3188	{
2200	3189	group(new HiddenObject());
2201	3190	} else
2202		- if (event.getSource() == frontItem)
	3191	+ if (source == frontItem)
2203	3192	{
2204	3193	front();
2205	3194	} else
2206		- if (event.getSource() == backItem)
	3195	+ if (source == backItem)
2207	3196	{
2208	3197	back();
2209	3198	} else
2210		- if (event.getSource() == cameraItem)
	3199	+ if (source == cameraItem)
2211	3200	{
2212	3201	makeSomething(new Camera());
2213	3202	} else
2214		- if (event.getSource() == compositeItem)
	3203	+ if (source == compositeItem \|\| source == compositeButton)
2215	3204	{
2216	3205	group(new Composite());
2217	3206	} else
2218		- if (event.getSource() == randomItem)
	3207	+ if (source == switchItem \|\| source == switchButton)
2219	3208	{
2220	3209	RandomNode random = new RandomNode();
2221	3210	group(random);
2222	3211	if (random.size() > 0)
2223		- random.name = random.get(0).name + "Rnd";
	3212	+ random.name = random.get(0).name + "Switch";
2224	3213	} else
2225		- if (event.getSource() == physicsItem)
	3214	+ if (source == physicsItem)
2226	3215	{
2227	3216	group(new PhysicsNode());
2228	3217	} else
2229		- if (event.getSource() == frameselectorItem)
	3218	+ if (source == frameselectorItem)
2230	3219	{
2231	3220	for (int i=0; i<group.selection.size(); i++)
2232	3221	{
..	..	@@ -2238,7 +3227,7 @@
2238	3227	ResetModel();
2239	3228	refreshContents();
2240	3229	} else
2241		- if (event.getSource() == switchGeoItem)
	3230	+ if (source == switchGeoItem)
2242	3231	{
2243	3232	for (int i=0; i<group.selection.size(); i++)
2244	3233	{
..	..	@@ -2250,7 +3239,7 @@
2250	3239	ResetModel();
2251	3240	refreshContents();
2252	3241	} else
2253		- if (event.getSource() == switchTransfoItem)
	3242	+ if (source == switchTransfoItem)
2254	3243	{
2255	3244	for (int i=0; i<group.selection.size(); i++)
2256	3245	{
..	..	@@ -2262,7 +3251,7 @@
2262	3251	ResetModel();
2263	3252	refreshContents();
2264	3253	} else
2265		- if (event.getSource() == morphItem)
	3254	+ if (source == morphItem)
2266	3255	{
2267	3256	for (int i=0; i<group.selection.size(); i++)
2268	3257	{
..	..	@@ -2274,7 +3263,7 @@
2274	3263	ResetModel();
2275	3264	refreshContents();
2276	3265	} else
2277		- if (event.getSource() == scriptNodeItem)
	3266	+ if (source == scriptNodeItem)
2278	3267	{
2279	3268	boolean atleastone = false;
2280	3269
..	..	@@ -2313,215 +3302,252 @@
2313	3302	}
2314	3303	}
2315	3304	} else
2316		- if (event.getSource() == linkerItem)
	3305	+ if (source == linkerItem)
2317	3306	{
2318	3307	group(new cLinker());
2319	3308	} else
2320		- if (event.getSource() == textureItem)
	3309	+ if (source == textureItem \|\| source == textureButton)
2321	3310	{
2322	3311	group(new TextureNode());
2323	3312	} else
2324		- if (event.getSource() == billboardItem)
	3313	+ if (source == billboardItem)
2325	3314	{
2326	3315	group(new BillboardNode());
2327	3316	} else
2328		- if (event.getSource() == shadowXItem)
	3317	+ if (source == shadowXItem)
2329	3318	{
2330	3319	CastShadow(0);
2331	3320	} else
2332		- if (event.getSource() == shadowYItem)
	3321	+ if (source == shadowYItem)
2333	3322	{
2334	3323	CastShadow(1);
2335	3324	} else
2336		- if (event.getSource() == shadowZItem)
	3325	+ if (source == shadowZItem)
2337	3326	{
2338	3327	CastShadow(2);
2339	3328	} else
2340		- if (event.getSource() == ungroupItem)
	3329	+ if (source == ungroupItem \|\| source == ungroupButton)
2341	3330	{
2342		- //ungroup();
	3331	+ boolean hasRoot = false;
	3332	+
2343	3333	for (int i=0; i<group.selection.size(); i++)
2344	3334	{
2345		- Ungroup(group.selection.get(i));
	3335	+ if (group.selection.get(i) == group)
	3336	+ {
	3337	+ hasRoot = true;
	3338	+ break;
	3339	+ }
2346	3340	}
2347	3341
2348		- ClearSelection(false);
2349		-
2350		- refreshContents();
	3342	+ if (!hasRoot)
	3343	+ {
	3344	+ for (int i=0; i<group.selection.size(); i++)
	3345	+ {
	3346	+ Ungroup(group.selection.get(i));
	3347	+ }
	3348	+
	3349	+ ClearSelection(false);
	3350	+
	3351	+ refreshContents();
	3352	+ }
2351	3353	} else
2352		- if (event.getSource() == genUVItem)
	3354	+ if (source == genUVItem)
2353	3355	{
2354	3356	GenUV();
2355	3357	} else
2356		- if (event.getSource() == genNormalsCADItem)
	3358	+ if (source == genNormalsCADItem)
2357	3359	{
2358	3360	GenNormals(true);
2359	3361	} else
2360		- if (event.getSource() == genNormalsMESHItem)
	3362	+ if (source == genNormalsMESHItem)
2361	3363	{
2362		- GenNormals(true); // TODO
	3364	+ GenNormalsMESH();
2363	3365	} else
2364		- if (event.getSource() == genNormalsORGANItem)
	3366	+ if (source == genNormalsORGANItem)
2365	3367	{
2366	3368	GenNormals(false);
2367	3369	} else
2368		- if (event.getSource() == genNormalsMINEItem)
	3370	+ if (source == genNormalsMINEItem)
2369	3371	{
2370	3372	GenNormalsMINE();
2371	3373	} else
2372		- if (event.getSource() == stripifyItem)
	3374	+ if (source == stripifyItem)
2373	3375	{
2374	3376	Stripify();
2375	3377	} else
2376		- if (event.getSource() == unstripifyItem)
	3378	+ if (source == unstripifyItem)
2377	3379	{
2378	3380	Unstripify();
2379	3381	} else
2380		- if (event.getSource() == trimItem)
	3382	+ if (source == trimItem)
2381	3383	{
2382	3384	Trim();
2383	3385	} else
2384		- if (event.getSource() == untrimItem)
	3386	+ if (source == untrimItem)
2385	3387	{
2386	3388	Untrim();
2387	3389	} else
2388		- if (event.getSource() == clearColorsItem)
	3390	+ if (source == clearColorsItem)
2389	3391	{
2390	3392	ClearColors();
2391	3393	} else
2392		- if (event.getSource() == clearMaterialsItem)
	3394	+ if (source == clearMaterialsItem)
2393	3395	{
2394	3396	ClearMaterials();
2395	3397	} else
2396		- if (event.getSource() == liveleavesItem)
	3398	+ if (source == liveleavesItem)
2397	3399	{
2398	3400	LiveLeaves(true);
2399	3401	} else
2400		- if (event.getSource() == unliveleavesItem)
	3402	+ if (source == unliveleavesItem)
2401	3403	{
2402	3404	LiveLeaves(false);
2403	3405	} else
2404		- if (event.getSource() == supportleavesItem)
	3406	+ if (source == supportleavesItem)
2405	3407	{
2406	3408	SupportLeaves(true);
2407	3409	} else
2408		- if (event.getSource() == unsupportleavesItem)
	3410	+ if (source == unsupportleavesItem)
2409	3411	{
2410	3412	SupportLeaves(false);
2411	3413	} else
2412		- if (event.getSource() == hideleavesItem)
	3414	+ if (source == hideleavesItem)
2413	3415	{
2414	3416	HideLeaves(true);
2415	3417	} else
2416		- if (event.getSource() == showleavesItem)
	3418	+ if (source == showleavesItem)
2417	3419	{
2418	3420	HideLeaves(false);
2419	3421	} else
2420		- if (event.getSource() == markleavesItem)
	3422	+ if (source == markleavesItem)
2421	3423	{
2422	3424	MarkLeaves(true);
2423	3425	} else
2424		- if (event.getSource() == unmarkleavesItem)
	3426	+ if (source == unmarkleavesItem)
2425	3427	{
2426	3428	MarkLeaves(false);
2427	3429	} else
2428		- if (event.getSource() == flipVItem)
	3430	+ if (source == rewindleavesItem)
	3431	+ {
	3432	+ RewindLeaves(true);
	3433	+ } else
	3434	+ if (source == unrewindleavesItem)
	3435	+ {
	3436	+ RewindLeaves(false);
	3437	+ } else
	3438	+ if (source == randomleavesItem)
	3439	+ {
	3440	+ RandomLeaves(true);
	3441	+ } else
	3442	+ if (source == unrandomleavesItem)
	3443	+ {
	3444	+ RandomLeaves(false);
	3445	+ } else
	3446	+ if (source == flipVItem)
2429	3447	{
2430	3448	FlipV(true);
2431	3449	} else
2432		- if (event.getSource() == unflipVItem)
	3450	+ if (source == unflipVItem)
2433	3451	{
2434	3452	FlipV(false);
2435	3453	} else
2436		- if (event.getSource() == lowTexturesItem)
	3454	+ if (source == lowTexturesItem)
2437	3455	{
2438	3456	SetTexRes(0);
2439	3457	} else
2440		- if (event.getSource() == normalTexturesItem)
	3458	+ if (source == normalTexturesItem)
2441	3459	{
2442	3460	SetTexRes(1);
2443	3461	} else
2444		- if (event.getSource() == highTexturesItem)
	3462	+ if (source == highTexturesItem)
2445	3463	{
2446	3464	SetTexRes(2);
2447	3465	} else
2448		- if (event.getSource() == veryhighTexturesItem)
	3466	+ if (source == veryhighTexturesItem)
2449	3467	{
2450	3468	SetTexRes(3);
2451	3469	} else
2452		- if (event.getSource() == maxTexturesItem)
	3470	+ if (source == maxTexturesItem)
2453	3471	{
2454	3472	SetTexRes(4);
2455	3473	} else
2456		- if (event.getSource() == panoTexturesItem)
	3474	+ if (source == panoTexturesItem)
2457	3475	{
2458	3476	SetTexRes(5);
2459	3477	} else
2460		- if (event.getSource() == reverseNormalsItem)
	3478	+ if (source == reverseNormalsItem)
2461	3479	{
2462	3480	ReverseNormals();
2463	3481	} else
2464		- if (event.getSource() == parseverticesItem)
	3482	+ if (source == parseverticesItem)
2465	3483	{
2466	3484	ParseVertices();
2467	3485	} else
2468		- if (event.getSource() == textureFieldItem)
	3486	+ if (source == textureFieldItem)
2469	3487	{
2470	3488	TextureVertices();
2471	3489	} else
2472		- if (event.getSource() == alignItem)
	3490	+ if (source == alignItem)
2473	3491	{
2474	3492	Align();
2475	3493	} else
2476		- if (event.getSource() == mirrorItem)
	3494	+ if (source == mirrorItem)
2477	3495	{
2478	3496	MirrorPoses();
2479	3497	} else
2480		- if (event.getSource() == reduceMorphItem)
	3498	+ if (source == reduceMorphItem)
2481	3499	{
2482	3500	MeshReduction(false);
2483	3501	} else
2484		- if (event.getSource() == reduce34MorphItem)
	3502	+ if (source == reduce34MorphItem)
2485	3503	{
2486	3504	MeshReduction(true);
2487	3505	} else
2488		- if (event.getSource() == reverseTrianglesItem)
	3506	+ if (source == reverseTrianglesItem)
2489	3507	{
2490	3508	ReverseTriangles();
2491	3509	} else
2492		- if (event.getSource() == reduceMeshItem)
	3510	+ if (source == reduceMeshItem)
2493	3511	{
2494	3512	ReduceMesh(false);
2495	3513	} else
2496		- if (event.getSource() == reduce34MeshItem)
	3514	+ if (source == reduce34MeshItem)
2497	3515	{
2498	3516	ReduceMesh(true);
2499	3517	} else
2500		- if (event.getSource() == increaseMeshItem)
	3518	+ if (source == increaseMeshItem)
2501	3519	{
2502	3520	IncreaseMesh();
2503	3521	} else
2504		- if (event.getSource() == clipMeshItem)
	3522	+ if (source == clipMeshItem)
2505	3523	{
2506	3524	ClipMesh();
2507	3525	} else
2508		- if (event.getSource() == smoothMeshItem)
	3526	+ if (source == smoothMeshItem)
2509	3527	{
2510	3528	SmoothMesh();
2511	3529	} else
2512		- if (event.getSource() == transformgeometryItem)
	3530	+ if (source == transformGeometryItem)
2513	3531	{
2514	3532	TransformGeometry();
2515	3533	} else
2516		- if (event.getSource() == resetTransformItem)
	3534	+ if (source == transformChildrenItem)
	3535	+ {
	3536	+ TransformChildren();
	3537	+ } else
	3538	+ if (source == resetTransformItem)
2517	3539	{
2518	3540	ResetTransform();
2519	3541	} else
2520		- if (event.getSource() == resetCentroidItem)
	3542	+ if (source == resetCentroidItem)
2521	3543	{
2522		- ResetCentroid();
	3544	+ ResetCentroid(true);
2523	3545	} else
2524		- if (event.getSource() == resetParentItem)
	3546	+ if (source == resetCentroidXZItem)
	3547	+ {
	3548	+ ResetCentroid(false);
	3549	+ } else
	3550	+ if (source == resetParentItem)
2525	3551	{
2526	3552	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2527	3553	{
..	..	@@ -2531,7 +3557,7 @@
2531	3557
2532	3558	refreshContents();
2533	3559	} else
2534		- if (event.getSource() == repairParentItem)
	3560	+ if (source == repairParentItem)
2535	3561	{
2536	3562	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2537	3563	{
..	..	@@ -2545,7 +3571,21 @@
2545	3571
2546	3572	refreshContents();
2547	3573	} else
2548		- if (event.getSource() == sortbysizeItem)
	3574	+ if (source == repairShadowItem)
	3575	+ {
	3576	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3577	+ {
	3578	+ Object3D obj = (Object3D)e.nextElement();
	3579	+ obj.RepairShadow();
	3580	+// for (int i=0; i<obj.size(); i++)
	3581	+// {
	3582	+// obj.get(i).parent = obj;
	3583	+// }
	3584	+ }
	3585	+
	3586	+ refreshContents();
	3587	+ } else
	3588	+ if (source == sortbysizeItem)
2549	3589	{
2550	3590	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2551	3591	{
..	..	@@ -2557,7 +3597,7 @@
2557	3597	ResetModel();
2558	3598	refreshContents();
2559	3599	} else
2560		- if (event.getSource() == sortbynameItem)
	3600	+ if (source == sortbynameItem)
2561	3601	{
2562	3602	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2563	3603	{
..	..	@@ -2569,7 +3609,7 @@
2569	3609	ResetModel();
2570	3610	refreshContents();
2571	3611	} else
2572		- if (event.getSource() == attachPigmentItem)
	3612	+ if (source == attachPigmentItem)
2573	3613	{
2574	3614	String texture = GetFile("Attach pigment");
2575	3615	Object3D obj;
..	..	@@ -2581,7 +3621,7 @@
2581	3621
2582	3622	refreshContents();
2583	3623	} else
2584		- if (event.getSource() == detachPigmentItem)
	3624	+ if (source == detachPigmentItem)
2585	3625	{
2586	3626	Object3D obj;
2587	3627	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2592,7 +3632,7 @@
2592	3632
2593	3633	refreshContents();
2594	3634	} else
2595		- if (event.getSource() == attachBumpItem)
	3635	+ if (source == attachBumpItem)
2596	3636	{
2597	3637	String texture = GetFile("Attach bump");
2598	3638	Object3D obj;
..	..	@@ -2604,18 +3644,18 @@
2604	3644
2605	3645	refreshContents();
2606	3646	} else
2607		- if (event.getSource() == detachBumpItem)
	3647	+ if (source == detachBumpItem)
2608	3648	{
2609	3649	Object3D obj;
2610	3650	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2611	3651	{
2612	3652	obj = (Object3D)e.nextElement();
2613		- obj.SetBumpTexture(null);
	3653	+ obj.ResetBumpTexture();
2614	3654	}
2615	3655
2616	3656	refreshContents();
2617	3657	} else
2618		- if (event.getSource() == pigmentBumpItem)
	3658	+ if (source == pigmentBumpItem)
2619	3659	{
2620	3660	Object3D obj;
2621	3661	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2626,158 +3666,231 @@
2626	3666
2627	3667	refreshContents();
2628	3668	} else
2629		- if (event.getSource() == flashSelectionButton)
	3669	+ if (source == embedTexturesItem)
	3670	+ {
	3671	+ Object3D obj;
	3672	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3673	+ {
	3674	+ obj = (Object3D)e.nextElement();
	3675	+ obj.EmbedTextures(true);
	3676	+ }
	3677	+
	3678	+ refreshContents();
	3679	+ } else
	3680	+ if (source == deEmbedTexturesItem)
	3681	+ {
	3682	+ Object3D obj;
	3683	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3684	+ {
	3685	+ obj = (Object3D)e.nextElement();
	3686	+ obj.EmbedTextures(false);
	3687	+ }
	3688	+
	3689	+ CameraPane.texturepigment.clear();
	3690	+ CameraPane.texturebump.clear();
	3691	+
	3692	+ refreshContents();
	3693	+ } else
	3694	+ if (source == flashSelectionButton)
2630	3695	{
2631	3696	CameraPane.flash = true;
2632	3697	refreshContents();
2633	3698	} else
2634		- if (event.getSource() == oneButton)
	3699	+ if (source == oneButton)
2635	3700	{
2636	3701	} else
2637		- if (event.getSource() == twoButton)
	3702	+ if (source == twoButton)
2638	3703	{
2639	3704	radio.layout = twoButton;
2640		- // bug
2641		- //gridPanel.setDividerLocation(1.0);
2642		- //bigPanel.setDividerLocation(0.0);
2643		- bigThree.remove(scenePanel);
2644		- bigThree.remove(centralPanel);
2645		- bigThree.remove(XYZPanel);
2646		- aWindowConstraints.gridx = 0;
2647		- aWindowConstraints.gridy = 0;
2648		- aWindowConstraints.gridwidth = 1;
2649		- // aConstraints.gridheight = 3;
2650		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2651		- aWindowConstraints.weightx = 0;
2652		- aWindowConstraints.weighty = 1;
2653		- //bigThree.add(jtp, aWindowConstraints);
2654		- aWindowConstraints.weightx = 1;
2655		- aWindowConstraints.gridwidth = 3;
2656		- // aConstraints.gridheight = 3;
2657		- aWindowConstraints.gridx = 1;
2658		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2659		- bigThree.add(centralPanel, aWindowConstraints);
2660		- aWindowConstraints.weightx = 0;
2661		- aWindowConstraints.gridx = 4;
2662		- aWindowConstraints.gridwidth = 1;
2663		- // aConstraints.gridheight = 3;
2664		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2665		- //bigThree.add(XYZPanel, aWindowConstraints);
2666		- bigThree.revalidate();
	3705	+
	3706	+ if (CameraPane.FULLSCREEN)
	3707	+ fullscreenLayout = radio.layout;
	3708	+
	3709	+ Show3DView();
	3710	+
	3711	+ cameraView.requestFocusInWindow();
	3712	+
	3713	+// refreshContents(true);
	3714	+//
	3715	+// try
	3716	+// {
	3717	+// java.awt.Robot bot = new java.awt.Robot();
	3718	+// int mask = InputEvent.BUTTON1_MASK;
	3719	+// bot.mouseMove(100, 100);
	3720	+// bot.mousePress(mask);
	3721	+// bot.mouseRelease(mask);
	3722	+// }
	3723	+// catch (Exception e)
	3724	+// {
	3725	+//
	3726	+// }
	3727	+
2667	3728	} else
2668		- if (event.getSource() == threeButton)
	3729	+ if (source == threeButton)
2669	3730	{
2670	3731	radio.layout = threeButton;
2671		- bigThree.remove(scenePanel);
2672		- bigThree.remove(centralPanel);
2673		- bigThree.remove(XYZPanel);
2674		- aWindowConstraints.gridx = 0;
2675		- aWindowConstraints.gridy = 0;
2676		- aWindowConstraints.gridwidth = 1;
2677		- // aConstraints.gridheight = 3;
2678		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2679		- aWindowConstraints.weightx = 0;
2680		- aWindowConstraints.weighty = 1;
2681		- //bigThree.add(jtp, aWindowConstraints);
2682		- aWindowConstraints.weightx = 1;
2683		- aWindowConstraints.gridwidth = 3;
2684		- // aConstraints.gridheight = 3;
2685		- aWindowConstraints.gridx = 1;
2686		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2687		- bigThree.add(centralPanel, aWindowConstraints);
2688		- aWindowConstraints.weightx = 0;
2689		- aWindowConstraints.gridx = 4;
2690		- aWindowConstraints.gridwidth = 1;
2691		- // aConstraints.gridheight = 3;
2692		- aConstraints.fill = GridBagConstraints.VERTICAL;
2693		- bigThree.add(XYZPanel, aWindowConstraints);
2694		- bigThree.revalidate();
	3732	+
	3733	+ if (CameraPane.FULLSCREEN)
	3734	+ fullscreenLayout = radio.layout;
	3735	+
	3736	+// bigThree.remove(scenePanel);
	3737	+// bigThree.remove(centralPanel);
	3738	+// bigThree.remove(XYZPanel);
	3739	+// aWindowConstraints.gridx = 0;
	3740	+// aWindowConstraints.gridy = 0;
	3741	+// aWindowConstraints.gridwidth = 1;
	3742	+// // aConstraints.gridheight = 3;
	3743	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3744	+// aWindowConstraints.weightx = 0;
	3745	+// aWindowConstraints.weighty = 1;
	3746	+// //bigThree.add(jtp, aWindowConstraints);
	3747	+// aWindowConstraints.weightx = 1;
	3748	+// aWindowConstraints.gridwidth = 3;
	3749	+// // aConstraints.gridheight = 3;
	3750	+// aWindowConstraints.gridx = 1;
	3751	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3752	+// bigThree.add(centralPanel, aWindowConstraints);
	3753	+// aWindowConstraints.weightx = 0;
	3754	+// aWindowConstraints.gridx = 4;
	3755	+// aWindowConstraints.gridwidth = 1;
	3756	+// // aConstraints.gridheight = 3;
	3757	+// aConstraints.fill = GridBagConstraints.VERTICAL;
	3758	+// bigThree.add(XYZPanel, aWindowConstraints);
	3759	+// bigThree.validate();
	3760	+// scenePanel.setVisible(false);
	3761	+// centralPanel.setVisible(true);
	3762	+// XYZPanel.setVisible(true);
	3763	+ bigThree.ClearUI();
	3764	+ bigThree.add(scenePanel);
	3765	+ bigThree.add(centralPanel);
	3766	+ bigThree.FlushUI();
	3767	+
	3768	+ cameraView.requestFocusInWindow();
2695	3769	} else
2696		- if (event.getSource() == fourButton)
	3770	+ if (source == fourButton)
2697	3771	{
2698	3772	radio.layout = fourButton;
2699		- bigThree.remove(scenePanel);
2700		- bigThree.remove(centralPanel);
2701		- bigThree.remove(XYZPanel);
2702		- aWindowConstraints.gridx = 0;
2703		- aWindowConstraints.gridy = 0;
2704		- aWindowConstraints.gridwidth = 1;
2705		- // aWindowConstraints.gridheight = 3;
2706		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2707		- aWindowConstraints.weightx = 1;
2708		- aWindowConstraints.weighty = 1;
2709		- bigThree.add(scenePanel, aWindowConstraints);
2710		- aWindowConstraints.weightx = 1;
2711		- aWindowConstraints.gridwidth = 3;
2712		- // aConstraints.gridheight = 3;
2713		- aWindowConstraints.gridx = 1;
2714		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2715		- //bigThree.add(cameraPanel, aWindowConstraints);
2716		- aWindowConstraints.weightx = 0;
2717		- aWindowConstraints.gridx = 4;
2718		- aWindowConstraints.gridwidth = 1;
2719		- // aWindowConstraints.gridheight = 3;
2720		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2721		- //bigThree.add(XYZPanel, aWindowConstraints);
2722		- bigThree.revalidate();
	3773	+
	3774	+ if (CameraPane.FULLSCREEN)
	3775	+ fullscreenLayout = radio.layout;
	3776	+
	3777	+// bigThree.remove(scenePanel);
	3778	+// bigThree.remove(centralPanel);
	3779	+// bigThree.remove(XYZPanel);
	3780	+// aWindowConstraints.gridx = 0;
	3781	+// aWindowConstraints.gridy = 0;
	3782	+// aWindowConstraints.gridwidth = 1;
	3783	+// // aWindowConstraints.gridheight = 3;
	3784	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3785	+// aWindowConstraints.weightx = 1;
	3786	+// aWindowConstraints.weighty = 1;
	3787	+// bigThree.add(scenePanel, aWindowConstraints);
	3788	+// aWindowConstraints.weightx = 1;
	3789	+// aWindowConstraints.gridwidth = 3;
	3790	+// // aConstraints.gridheight = 3;
	3791	+// aWindowConstraints.gridx = 1;
	3792	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3793	+// //bigThree.add(cameraPanel, aWindowConstraints);
	3794	+// aWindowConstraints.weightx = 0;
	3795	+// aWindowConstraints.gridx = 4;
	3796	+// aWindowConstraints.gridwidth = 1;
	3797	+// // aWindowConstraints.gridheight = 3;
	3798	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3799	+// //bigThree.add(XYZPanel, aWindowConstraints);
	3800	+// bigThree.validate();
	3801	+// scenePanel.setVisible(true);
	3802	+// centralPanel.setVisible(false);
	3803	+// XYZPanel.setVisible(false);
	3804	+ bigThree.ClearUI();
	3805	+ bigThree.add(scenePanel);
	3806	+ bigThree.FlushUI();
	3807	+
	3808	+ cameraView.requestFocusInWindow();
2723	3809	} else
2724		- if (event.getSource() == sixButton)
	3810	+ if (source == sixButton)
2725	3811	{
2726	3812	radio.layout = sixButton;
2727		- bigThree.remove(scenePanel);
2728		- bigThree.remove(centralPanel);
2729		- bigThree.remove(XYZPanel);
2730		- aWindowConstraints.gridx = 0;
2731		- aWindowConstraints.gridy = 0;
2732		- aWindowConstraints.gridwidth = 1;
2733		- // aConstraints.gridheight = 3;
2734		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2735		- aWindowConstraints.weightx = 0;
2736		- aWindowConstraints.weighty = 1;
2737		- bigThree.add(scenePanel, aWindowConstraints);
2738		- aWindowConstraints.weightx = 1;
2739		- aWindowConstraints.gridwidth = 3;
2740		- // aWindowConstraints.gridheight = 3;
2741		- aWindowConstraints.gridx = 1;
2742		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2743		- bigThree.add(centralPanel, aWindowConstraints);
2744		- aWindowConstraints.weightx = 0;
2745		- aWindowConstraints.gridx = 4;
2746		- aWindowConstraints.gridwidth = 1;
2747		- // aWindowConstraints.gridheight = 3;
2748		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2749		- //bigThree.add(XYZPanel, aConstraints);
2750		- bigThree.revalidate();
	3813	+
	3814	+ if (CameraPane.FULLSCREEN)
	3815	+ fullscreenLayout = radio.layout;
	3816	+
	3817	+// bigThree.remove(scenePanel);
	3818	+// bigThree.remove(centralPanel);
	3819	+// bigThree.remove(XYZPanel);
	3820	+// aWindowConstraints.gridx = 0;
	3821	+// aWindowConstraints.gridy = 0;
	3822	+// aWindowConstraints.gridwidth = 1;
	3823	+// // aConstraints.gridheight = 3;
	3824	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3825	+// aWindowConstraints.weightx = 0;
	3826	+// aWindowConstraints.weighty = 1;
	3827	+// bigThree.add(scenePanel, aWindowConstraints);
	3828	+// aWindowConstraints.weightx = 1;
	3829	+// aWindowConstraints.gridwidth = 3;
	3830	+// // aWindowConstraints.gridheight = 3;
	3831	+// aWindowConstraints.gridx = 1;
	3832	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3833	+// bigThree.add(centralPanel, aWindowConstraints);
	3834	+// aWindowConstraints.weightx = 0;
	3835	+// aWindowConstraints.gridx = 4;
	3836	+// aWindowConstraints.gridwidth = 1;
	3837	+// // aWindowConstraints.gridheight = 3;
	3838	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3839	+// //bigThree.add(XYZPanel, aConstraints);
	3840	+// bigThree.validate();
	3841	+// scenePanel.setVisible(true);
	3842	+// centralPanel.setVisible(true);
	3843	+// XYZPanel.setVisible(false);
	3844	+ bigThree.ClearUI();
	3845	+ bigThree.add(centralPanel);
	3846	+ bigThree.add(scenePanel);
	3847	+ bigThree.FlushUI();
	3848	+
	3849	+ cameraView.requestFocusInWindow();
2751	3850	} else
2752		- if (event.getSource() == sevenButton)
	3851	+ if (source == sevenButton)
2753	3852	{
2754	3853	radio.layout = sevenButton;
2755		- bigThree.remove(scenePanel);
2756		- bigThree.remove(centralPanel);
2757		- bigThree.remove(XYZPanel);
2758		- aWindowConstraints.gridx = 0;
2759		- aWindowConstraints.gridy = 0;
2760		- aWindowConstraints.gridwidth = 1;
2761		- // aWindowConstraints.gridheight = 3;
2762		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2763		- aWindowConstraints.weightx = 0;
2764		- aWindowConstraints.weighty = 1;
2765		- bigThree.add(scenePanel, aWindowConstraints);
2766		- aWindowConstraints.weightx = 1;
2767		- aWindowConstraints.gridwidth = 3;
2768		- // aWindowConstraints.gridheight = 3;
2769		- aWindowConstraints.gridx = 1;
2770		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2771		- bigThree.add(centralPanel, aWindowConstraints);
2772		- aWindowConstraints.weightx = 0;
2773		- aWindowConstraints.gridx = 4;
2774		- aWindowConstraints.gridwidth = 1;
2775		- // aConstraints.gridheight = 3;
2776		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2777		- bigThree.add(XYZPanel, aWindowConstraints);
2778		- bigThree.revalidate();
	3854	+
	3855	+ if (CameraPane.FULLSCREEN)
	3856	+ fullscreenLayout = radio.layout;
	3857	+
	3858	+// bigThree.remove(scenePanel);
	3859	+// bigThree.remove(centralPanel);
	3860	+// bigThree.remove(XYZPanel);
	3861	+// aWindowConstraints.gridx = 0;
	3862	+// aWindowConstraints.gridy = 0;
	3863	+// aWindowConstraints.gridwidth = 1;
	3864	+// // aWindowConstraints.gridheight = 3;
	3865	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3866	+// aWindowConstraints.weightx = 0;
	3867	+// aWindowConstraints.weighty = 1;
	3868	+// bigThree.add(scenePanel, aWindowConstraints);
	3869	+// aWindowConstraints.weightx = 1;
	3870	+// aWindowConstraints.gridwidth = 3;
	3871	+// // aWindowConstraints.gridheight = 3;
	3872	+// aWindowConstraints.gridx = 1;
	3873	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3874	+// bigThree.add(centralPanel, aWindowConstraints);
	3875	+// aWindowConstraints.weightx = 0;
	3876	+// aWindowConstraints.gridx = 4;
	3877	+// aWindowConstraints.gridwidth = 1;
	3878	+// // aConstraints.gridheight = 3;
	3879	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3880	+// bigThree.add(XYZPanel, aWindowConstraints);
	3881	+// bigThree.validate();
	3882	+// scenePanel.setVisible(true);
	3883	+// centralPanel.setVisible(true);
	3884	+// XYZPanel.setVisible(true);
	3885	+ bigThree.ClearUI();
	3886	+ bigThree.add(scenePanel);
	3887	+ bigThree.add(centralPanel);
	3888	+ bigThree.add(XYZPanel);
	3889	+ bigThree.FlushUI();
	3890	+
	3891	+ cameraView.requestFocusInWindow();
2779	3892	} else
2780		- if (event.getSource() == rootButton)
	3893	+ if (source == rootButton)
2781	3894	{
2782	3895	Object3D obj;
2783	3896	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2787,66 +3900,85 @@
2787	3900	EditObject(obj);
2788	3901	}
2789	3902
	3903	+ cameraView.requestFocusInWindow();
2790	3904	refreshContents(true);
2791	3905	} else
2792		- if (event.getSource() == closeButton)
	3906	+ if (source == closeButton)
2793	3907	{
2794	3908	//System.out.println("CLOSE: " + buttonGroup.getSelection());
2795	3909	cRadio ab;
2796	3910	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2797	3911	{
2798	3912	ab = (cRadio)e.nextElement();
2799		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3913	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2800	3914	{
	3915	+ // Patch to avoid bug with transparency.
	3916	+ if (!ab.hadMaterial)
	3917	+ {
	3918	+ ab.object.material = null;
	3919	+ }
	3920	+
2801	3921	buttonGroup.remove(ab);
2802	3922	radioPanel.remove(ab);
2803	3923
2804		- ab.GetObject().editWindow = null;
	3924	+ //ab.GetObject().editWindow = null;
	3925	+ ab.GetObject().manipWindow = null;
2805	3926	// ab.GetObject().objectUI = null; // ?????????
2806	3927
2807	3928	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2808	3929	break;
2809	3930	}
2810	3931	}
	3932	+
	3933	+ cameraView.requestFocusInWindow();
2811	3934	refreshContents(true);
2812	3935	} else
2813		- if (event.getSource() == editItem \|\| event.getSource() == editButton)
	3936	+ if (source == editItem \|\| source == editButton)
2814	3937	{
	3938	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3939	+ {
	3940	+ Object3D child = (Object3D)e.nextElement();
	3941	+ child.pinned = true;
	3942	+ }
	3943	+
2815	3944	EditSelection(false);
2816	3945	} else
2817		- if (event.getSource() == uneditButton)
	3946	+ if (source == uneditButton)
2818	3947	{
2819	3948	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2820	3949	{
2821	3950	Object3D child = (Object3D)e.nextElement();
2822	3951	if(child.editWindow != null)
2823		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3952	+ child.pinned = false;
2824	3953	child.CloseUI();
2825	3954	listUI.remove(child);
	3955	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2826	3956
2827		- child.editWindow = null; // ???????????
	3957	+ //child.editWindow = null; // ???????????
2828	3958	}
2829		- objEditor.ctrlPanel.revalidate();
	3959	+ objEditor.ctrlPanel.FlushUI();
2830	3960	//objEditor.jTree.clearSelection();
2831	3961	//objEditor.ResetSliders();
2832	3962	refreshContents(true);
2833	3963	} else
2834		- if (event.getSource() == clearPanelButton)
	3964	+ if (source == clearPanelButton)
2835	3965	{
2836	3966	assert(copy == group);
2837	3967	//copy.ClearUI();
2838	3968	for (Object3D obj : listUI)
2839	3969	{
	3970	+ obj.pinned = false;
2840	3971	obj.CloseUI();
2841	3972	}
2842	3973	listUI.clear();
	3974	+ SetPinStates(group.selection.size() > 0);
2843	3975	refreshContents(true);
2844	3976	} else
2845		- if (event.getSource() == allParamsButton)
	3977	+ if (source == allParamsButton)
2846	3978	{
2847	3979	assert(copy == group);
2848	3980
2849		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3981	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2850	3982
2851	3983	for (Object3D obj : listUI)
2852	3984	{
..	..	@@ -2863,19 +3995,19 @@
2863	3995
2864	3996	refreshContents(true);
2865	3997	} else
2866		- if (event.getSource() == unselectButton)
	3998	+ if (source == unselectButton)
2867	3999	{
2868	4000	objEditor.jTree.clearSelection();
2869	4001	// ?? oct 2012 GrafreeD.clipboard.clear();
2870	4002	objEditor.ResetSliders();
2871	4003	refreshContents(true);
2872	4004	} else
2873		- if(event.getSource() instanceof cRadio)
	4005	+ if(source instanceof cRadio)
2874	4006	{
2875	4007	group.parent = keepparent;
2876	4008	group.attributes = 0;
2877	4009	//group.editWindow = null;
2878		- /cRadio/ radio = (cRadio)event.getSource();
	4010	+ /cRadio/ radio = (cRadio)source;
2879	4011	Object3D obj = radio.GetObject();
2880	4012	System.out.println("Edit " + obj);
2881	4013	if (true) // obj instanceof Composite) // obj.parent == null) // obj instanceof Composite)
..	..	@@ -2895,7 +4027,10 @@
2895	4027	}
2896	4028
2897	4029	copy = group;
2898		- //CameraPane.theRenderer.object = group;
	4030	+
	4031	+ SetUndoStates();
	4032	+
	4033	+ //Globals.theRenderer.object = group;
2899	4034	if(!useclient)
2900	4035	{
2901	4036	cameraView.renderCamera = radio.camera;
..	..	@@ -2904,25 +4039,55 @@
2904	4039	cameraView.cameras[cameraView.cameracount] = radio.camera;
2905	4040	cameraView.targetLookAt.set(radio.camera.lookAt);
2906	4041	cameraView.object = group;
2907		- cameraView.lighttouched = true;
	4042	+ //cameraView.lighttouched = true;
	4043	+ Globals.lighttouched = true;
2908	4044	topView.object = group;
2909	4045	frontView.object = group;
2910	4046	sideView.object = group;
2911	4047	}
2912		- group.editWindow = this;
	4048	+
	4049	+// fix "+" issue
	4050	+ //group.editWindow = this;
	4051	+ group.manipWindow = this;
	4052	+
2913	4053	/*
2914	4054	currentLayout = radio.layout;
2915	4055	if (currentLayout == null)
2916	4056	currentLayout = sevenButton;
2917	4057	*/
2918	4058	radio.layout.doClick();
	4059	+
	4060	+ ClearUnpinned();
	4061	+
	4062	+ //Grafreed.Assert(group != null);
	4063	+ //Grafreed.Assert(group.selection != null);
	4064	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	4065	+ if (group.selection == null \|\| group.selection.size() == 1)
	4066	+ EditSelection(false);
2919	4067	keepparent = group.parent;
2920	4068	// PARENT = NULL or not???
2921	4069	//group.parent = null; // ROOT
2922	4070	//group.attributes = -1;
2923	4071	ResetModel();
	4072	+
	4073	+ cameraView.requestFocusInWindow();
2924	4074	refreshContents(true);
2925		- }
	4075	+ } else if (event.getSource() == editCameraItem)
	4076	+ {
	4077	+ cameraView.ProtectCamera();
	4078	+ cameraView.requestFocusInWindow();
	4079	+ cameraView.repaint();
	4080	+ return;
	4081	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
	4082	+ {
	4083	+ cameraView.RevertCamera();
	4084	+ cameraView.requestFocusInWindow();
	4085	+ cameraView.repaint();
	4086	+ return;
	4087	+ // } else if (event.getSource() == textureButton)
	4088	+ // {
	4089	+ // return; // true;
	4090	+ }
2926	4091	else
2927	4092	{
2928	4093	//return super.action(event, arg);
..	..	@@ -2931,7 +4096,6 @@
2931	4096	}
2932	4097
2933	4098	boolean useclient = false;
2934		- cRadio radio;
2935	4099
2936	4100	void ToggleRoot()
2937	4101	{
..	..	@@ -2940,7 +4104,7 @@
2940	4104	if (useclient)
2941	4105	{
2942	4106	cameraView.object = client;
2943		- cameraView.lighttouched = true;
	4107	+ Globals.lighttouched = true;
2944	4108	//topView.object = client;
2945	4109	//frontView.object = client;
2946	4110	//sideView.object = client;
..	..	@@ -2948,7 +4112,7 @@
2948	4112	else
2949	4113	{
2950	4114	cameraView.object = group;
2951		- cameraView.lighttouched = true;
	4115	+ Globals.lighttouched = true;
2952	4116	//topView.object = group;
2953	4117	//frontView.object = group;
2954	4118	//sideView.object = group;
..	..	@@ -2983,6 +4147,28 @@
2983	4147	refreshContents();
2984	4148	}
2985	4149
	4150	+ void TransformChildren()
	4151	+ {
	4152	+ Object3D obj;
	4153	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4154	+ {
	4155	+ obj = (Object3D)e.nextElement();
	4156	+ obj.KeepTextureMatrices();
	4157	+ obj.TransformChildren();
	4158	+ obj.RestoreTextureMatrices();
	4159	+
	4160	+// if (obj.parent == null)
	4161	+// {
	4162	+// System.out.println("NULL PARENT!");
	4163	+// new Exception().printStackTrace();
	4164	+// }
	4165	+// else
	4166	+// TouchTransform(obj);
	4167	+// //obj.parent.Touch();
	4168	+ }
	4169	+
	4170	+ refreshContents();
	4171	+ }
2986	4172
2987	4173	void ResetTransform()
2988	4174	{
..	..	@@ -3095,7 +4281,7 @@
3095	4281	refreshContents();
3096	4282	}
3097	4283
3098		- void ResetCentroid()
	4284	+ void ResetCentroid(boolean full)
3099	4285	{
3100	4286	Object3D obj;
3101	4287	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3110,12 +4296,16 @@
3110	4296	LA.matIdentity(Object3D.mat);
3111	4297	obj.getBounds(minima, maxima, false);
3112	4298	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3113		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	4299	+ if (full)
	4300	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3114	4301	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3115	4302	obj.TransformMesh(Object3D.mat);
	4303	+
3116	4304	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3117		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	4305	+ if (full)
	4306	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3118	4307	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	4308	+
3119	4309	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3120	4310	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3121	4311	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3144,7 +4334,8 @@
3144	4334
3145	4335	int size = obj.MemorySize();
3146	4336
3147		- System.err.println((size/1024) + " KB is the size of " + obj);
	4337	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	4338	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3148	4339	}
3149	4340	}
3150	4341	catch (Exception e)
..	..	@@ -3181,9 +4372,9 @@
3181	4372	obj = (Object3D)e.nextElement();
3182	4373
3183	4374	System.out.println("Object is: " + obj);
3184		- GrafreeD.AnalyzeObject(obj);
	4375	+ Grafreed.AnalyzeObject(obj);
3185	4376	System.out.println("Boundary rep: " + obj.bRep);
3186		- GrafreeD.AnalyzeObject(obj.bRep);
	4377	+ Grafreed.AnalyzeObject(obj.bRep);
3187	4378
3188	4379	// System.err.println((size/1024) + " KB is the size of " + obj);
3189	4380	}
..	..	@@ -3225,6 +4416,13 @@
3225	4416	void GenNormals(boolean crease)
3226	4417	{
3227	4418	group.GenNormalsS(crease);
	4419	+
	4420	+ refreshContents();
	4421	+ }
	4422	+
	4423	+ void GenNormalsMESH()
	4424	+ {
	4425	+ group.GenNormalsMeshS();
3228	4426
3229	4427	refreshContents();
3230	4428	}
..	..	@@ -3397,8 +4595,8 @@
3397	4595
3398	4596	void ParseVertices()
3399	4597	{
3400		- boolean epsequal = GrafreeD.epsequal;
3401		- GrafreeD.epsequal = true;
	4598	+ boolean epsequal = Grafreed.epsequal;
	4599	+ Grafreed.epsequal = true;
3402	4600
3403	4601	for (int i=0; i<group.selection.size(); i++)
3404	4602	{
..	..	@@ -3423,7 +4621,7 @@
3423	4621	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3424	4622	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3425	4623
3426		- g.add(GrafreeD.clipboard);
	4624	+ g.add(Grafreed.clipboard);
3427	4625
3428	4626	buffer.add(g);
3429	4627	}
..	..	@@ -3438,7 +4636,7 @@
3438	4636	makeSomething(buffer, i==group.selection.size()-1);
3439	4637	}
3440	4638
3441		- GrafreeD.epsequal = epsequal;
	4639	+ Grafreed.epsequal = epsequal;
3442	4640
3443	4641	refreshContents();
3444	4642	}
..	..	@@ -3456,7 +4654,16 @@
3456	4654	String pigment = Object3D.GetPigment(tex);
3457	4655	//String bump = Object3D.GetBump(tex);
3458	4656
3459		- com.sun.opengl.util.texture.TextureData texturedata = CameraPane.theRenderer.GetTextureData(pigment, false, node.texres);
	4657	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	4658	+
	4659	+ try
	4660	+ {
	4661	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
	4662	+ }
	4663	+ catch (Exception e)
	4664	+ {
	4665	+ System.err.println("FAIL: " + node);
	4666	+ }
3460	4667
3461	4668	double s = v.s;
3462	4669
..	..	@@ -3544,11 +4751,11 @@
3544	4751
3545	4752	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3546	4753
3547		- boolean random = CameraPane.RANDOM;
3548		- CameraPane.RANDOM = false; // parse all random nodes
	4754	+ boolean random = CameraPane.SWITCH;
	4755	+ CameraPane.SWITCH = false; // parse all random nodes
3549	4756	lowres.linkVerticesThis(null);
3550	4757	lowres.linkVerticesThis(sn);
3551		- CameraPane.RANDOM = random;
	4758	+ CameraPane.SWITCH = random;
3552	4759
3553	4760	System.err.flush();
3554	4761
..	..	@@ -3588,7 +4795,7 @@
3588	4795	return;
3589	4796
3590	4797	Object3D poses = group.selection.get(0);
3591		- Object3D ref = GrafreeD.clipboard.get(0);
	4798	+ Object3D ref = Grafreed.clipboard.get(0);
3592	4799
3593	4800	Object3D newgroup = new Object3D("Po:" + poses.name);
3594	4801
..	..	@@ -3757,7 +4964,7 @@
3757	4964	group.selection.RelinkToSupport(); // july 2014
3758	4965	System.out.println("DONE.");
3759	4966	refreshContents();
3760		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	4967	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
3761	4968	}
3762	4969
3763	4970	void ReduceMesh(boolean reduction34)
..	..	@@ -3782,9 +4989,9 @@
3782	4989
3783	4990	void ClipMesh()
3784	4991	{
3785		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	4992	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3786	4993	{
3787		- Object3D content = GrafreeD.clipboard.get(0);
	4994	+ Object3D content = Grafreed.clipboard.get(0);
3788	4995
3789	4996	if (content instanceof cGroup && ((cGroup)content).transientlink )
3790	4997	content = ((cGroup)content).get(0);
..	..	@@ -3793,7 +5000,7 @@
3793	5000	// {
3794	5001	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3795	5002	// }
3796		- group.selection.ClipMesh(GrafreeD.clipboard);
	5003	+ group.selection.ClipMesh(Grafreed.clipboard);
3797	5004	}
3798	5005	// group.selection.ClipMesh(GrafreeD.clipboard);
3799	5006	System.out.println("DONE.");
..	..	@@ -3840,6 +5047,18 @@
3840	5047	void MarkLeaves(boolean hide)
3841	5048	{
3842	5049	group.selection.MarkLeaves(hide);
	5050	+ refreshContents();
	5051	+ }
	5052	+
	5053	+ void RewindLeaves(boolean hide)
	5054	+ {
	5055	+ group.selection.RewindLeaves(hide);
	5056	+ refreshContents();
	5057	+ }
	5058	+
	5059	+ void RandomLeaves(boolean hide)
	5060	+ {
	5061	+ group.selection.RandomLeaves(hide);
3843	5062	refreshContents();
3844	5063	}
3845	5064
..	..	@@ -3914,28 +5133,25 @@
3914	5133	// }
3915	5134	// }
3916	5135
3917		- static boolean allparams = true;
3918		-
3919		- static Vector<Object3D> listUI = new Vector<Object3D>();
3920		-
3921	5136	void EditSelection(boolean newWindow)
3922	5137	{
	5138	+ if (group.selection == null)
	5139	+ {
	5140	+ EditElement(group, newWindow); // ? new
	5141	+ return;
	5142	+ }
	5143	+
3923	5144	// aConstraints.gridy = 0;
3924	5145	for (int i=0; i<group.selection.size(); i++)
3925	5146	{
3926	5147	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
3927	5148	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
3928		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	5149	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3929	5150
3930	5151	Object3D elem = (Object3D)group.selection.elementAt(i);
3931		- if(elem != group)
	5152	+ if(elem != group \|\| !newWindow)
3932	5153	{
3933		- // if (!(elem instanceof Composite))
3934		- // newWindow = false;
3935		- listUI.add(elem);
3936		- elem.openEditWindow(this, newWindow); //, false);
3937		- System.out.println("edit : " + elem);
3938		- elem.editWindow.refreshContents(true); // ? new
	5154	+ EditElement(elem, newWindow); // ? new
3939	5155	}
3940	5156	}
3941	5157	}
..	..	@@ -3998,9 +5214,7 @@
3998	5214
3999	5215	freezemodel = false;
4000	5216	}
4001		-
4002		- boolean flashIt = true;
4003		-
	5217	+
4004	5218	public void valueChanged(TreeSelectionEvent e)
4005	5219	//public boolean handleEvent(Event event)
4006	5220	{
..	..	@@ -4010,7 +5224,8 @@
4010	5224	//new Exception().printStackTrace();
4011	5225
4012	5226	freezemodel = true;
4013		-
	5227	+ ClearUnpinned();
	5228	+
4014	5229	/**/
4015	5230	//switch (event.id)
4016	5231	{
..	..	@@ -4018,7 +5233,6 @@
4018	5233	//case 702: // Event.LIST_DESELECT
4019	5234	group.deselectAll();
4020	5235	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4021		- objEditor.ClearInfo(); // .GetMaterial());
4022	5236	if (tps != null)
4023	5237	{
4024	5238	for (int i=0; i < tps.length; i++)
..	..	@@ -4027,33 +5241,39 @@
4027	5241
4028	5242	//if (child.parent != null)
4029	5243	//child.parent.addSelectee(child);
	5244	+ objEditor.SetMaterial(child);
4030	5245	group.addSelectee(child);
4031		- objEditor.SetMaterial(child); // .GetMaterial());
4032		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4033		- System.err.println("info : " + child.GetPath());
4034	5246	}
4035	5247	}
4036		- else
4037		- {
4038		- objEditor.SetMaterial(group); // .GetMaterial());
4039		- objEditor.AddInfo(group, this, true); // .GetMaterial());
4040		- System.err.println("info : " + group.GetPath());
4041		- }
	5248	+// else
	5249	+// {
	5250	+// objEditor.SetMaterial(group); // .GetMaterial());
	5251	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	5252	+// System.err.println("info : " + group.GetPath());
	5253	+// }
4042	5254
4043		- objEditor.SetText(); // jan 2014
4044		-
4045		- if (flashIt && !CameraPane.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	5255	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4046	5256	CameraPane.flash = true;
4047	5257
4048		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	5258	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4049	5259	// a camera
4050	5260	{
4051		- CameraPane.camerachangeframe = 0; // don't refuse it
4052		- CameraPane.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
4053		- // CameraPane.theRenderer.renderCamera = CameraPane.theRenderer.manipCamera;
4054		- // CameraPane.theRenderer.eyeCamera = CameraPane.theRenderer.manipCamera;
	5261	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
	5262	+ {
	5263	+ CameraPane.camerachangeframe = 0; // don't refuse it
	5264	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	5265	+ }
	5266	+ // Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
	5267	+ // Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4055	5268	}
4056	5269
	5270	+ if (tps != null && tps.length == 1)
	5271	+ {
	5272	+ EditSelection(false);
	5273	+ }
	5274	+
	5275	+ SetPinStates(tps != null && tps.length > 0);
	5276	+
4057	5277	refreshContents();
4058	5278	//return true;
4059	5279	}
..	..	@@ -4062,6 +5282,37 @@
4062	5282
4063	5283	freezemodel = false;
4064	5284	}
	5285	+
	5286	+ void SetPinStates(boolean enabled)
	5287	+ {
	5288	+ editButton.setEnabled(enabled);
	5289	+ uneditButton.setEnabled(enabled);
	5290	+ //unselectButton.setEnabled(enabled);
	5291	+ flashSelectionButton.setEnabled(enabled);
	5292	+
	5293	+ clearPanelButton.setEnabled(!listUI.isEmpty());
	5294	+ }
	5295	+
	5296	+ void refreshContents(boolean cp)
	5297	+ {
	5298	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5299	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
	5300	+ {
	5301	+ objEditor.ClearInfo(); // .GetMaterial());
	5302	+
	5303	+ for (int i=0; i < group.selection.Size(); i++)
	5304	+ {
	5305	+ Object3D child = (Object3D) group.selection.get(i);
	5306	+
	5307	+ objEditor.AddInfo(child, this, true);
	5308	+// System.err.println("info : " + child.GetPath());
	5309	+ }
	5310	+
	5311	+ objEditor.SetText(); // jan 2014
	5312	+ }
	5313	+
	5314	+ super.refreshContents(cp);
	5315	+ }
4065	5316
4066	5317	void linkSomething(Object3D thing)
4067	5318	{
..	..	@@ -4133,16 +5384,19 @@
4133	5384	{
4134	5385	if (group.selection.isEmpty())
4135	5386	return;
4136		- GrafreeD.clipboardIsTempGroup = false;
	5387	+
	5388	+ Grafreed.clipboardIsTempGroup = false;
4137	5389	Composite tGroup = null;
4138	5390	if (group.selection.size() > 0) // 1)
4139	5391	{
4140	5392	tGroup = new cGroup();
4141		- GrafreeD.clipboardIsTempGroup = true;
	5393	+ Grafreed.clipboardIsTempGroup = true;
4142	5394	}
4143	5395
4144	5396	if (cut)
4145	5397	{
	5398	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5399	+// Save();
4146	5400	//int indices[] = jList.getSelectedIndices();
4147	5401	//for (int i = indices.length - 1; i >= 0; i--)
4148	5402	//jList.remove(indices[i]);
..	..	@@ -4178,16 +5432,16 @@
4178	5432	//System.out.println("cut " + child);
4179	5433	//System.out.println("parent = " + child.parent);
4180	5434	// tmp.addChild(child);
4181		- if (GrafreeD.clipboardIsTempGroup)
	5435	+ if (Grafreed.clipboardIsTempGroup)
4182	5436	tGroup.add/Child/(tmp);
4183	5437	else
4184		- GrafreeD.clipboard = tmp;
	5438	+ Grafreed.clipboard = tmp;
4185	5439	}
4186	5440	else
4187		- if (GrafreeD.clipboardIsTempGroup)
	5441	+ if (Grafreed.clipboardIsTempGroup)
4188	5442	tGroup.add/Child/(child);
4189	5443	else
4190		- GrafreeD.clipboard = child;
	5444	+ Grafreed.clipboard = child;
4191	5445	}
4192	5446
4193	5447	//ResetModel();
..	..	@@ -4219,21 +5473,23 @@
4219	5473	//System.out.println("cut " + elem);
4220	5474	//System.out.println("parent = " + elem.parent);
4221	5475	// tmp.addChild(elem);
4222		- if (GrafreeD.clipboardIsTempGroup)
	5476	+ if (Grafreed.clipboardIsTempGroup)
4223	5477	tGroup.add/Child/(tmp);
4224	5478	else
4225		- GrafreeD.clipboard = tmp;
	5479	+ Grafreed.clipboard = tmp;
4226	5480	}
4227	5481	else
4228		- if (GrafreeD.clipboardIsTempGroup)
	5482	+ if (Grafreed.clipboardIsTempGroup)
4229	5483	tGroup.add/Child/(child);
4230	5484	else
4231		- GrafreeD.clipboard = child;
	5485	+ Grafreed.clipboard = child;
4232	5486	}
4233	5487
4234	5488	}
4235		- if (GrafreeD.clipboardIsTempGroup)
4236		- GrafreeD.clipboard = tGroup;
	5489	+
	5490	+ if (Grafreed.clipboardIsTempGroup)
	5491	+ Grafreed.clipboard = tGroup;
	5492	+
4237	5493	if (cut)
4238	5494	{
4239	5495	ResetModel();
..	..	@@ -4243,11 +5499,15 @@
4243	5499
4244	5500	void paste(boolean expand)
4245	5501	{
	5502	+ if (Globals.REPLACEONMAKE)
	5503	+ Save();
	5504	+ boolean keep = Globals.REPLACEONMAKE;
	5505	+ Globals.REPLACEONMAKE = false;
4246	5506	// if (GrafreeD.clipboard == null)
4247	5507	// return;
4248	5508	boolean first = true;
4249	5509
4250		- if (GrafreeD.clipboardIsTempGroup)
	5510	+ if (Grafreed.clipboardIsTempGroup)
4251	5511	{
4252	5512	Composite temp;
4253	5513
..	..	@@ -4258,7 +5518,7 @@
4258	5518	temp = (Composite)Applet3D.clipboard.deepCopy();
4259	5519	*/
4260	5520	Object3D elem;
4261		- for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	5521	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4262	5522	{
4263	5523	Object3D child = (Object3D)e.nextElement();
4264	5524
..	..	@@ -4292,21 +5552,22 @@
4292	5552	//Object3D cb = Applet3D.clipboard;
4293	5553	//temp.addChild(cb);
4294	5554	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4295		- assert(GrafreeD.clipboard.parent == null);
4296		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
4297		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4298		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4299		- makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
	5555	+ assert(Grafreed.clipboard.parent == null);
	5556	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	5557	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	5558	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	5559	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4300	5560	else
4301		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4302		- GrafreeD.clipboard.get(0).parent = keepparent;
	5561	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	5562	+ Grafreed.clipboard.get(0).parent = keepparent;
4303	5563	}
4304	5564
	5565	+ Globals.REPLACEONMAKE = keep;
4305	5566	ResetModel();
4306	5567	refreshContents();
4307	5568	}
4308	5569
4309		- void pasteInto(boolean copyit)
	5570	+ void pasteInto(boolean copyit, boolean clone)
4310	5571	{
4311	5572	// if (GrafreeD.clipboard == null)
4312	5573	// return;
..	..	@@ -4335,15 +5596,22 @@
4335	5596	if (copyit)
4336	5597	{
4337	5598	// paste(false);
4338		- CloneClipboard(false); // sept 2014
	5599	+ if (clone)
	5600	+ {
	5601	+ CloneClipboard(false); // sept 2014
	5602	+ }
	5603	+ else
	5604	+ {
	5605	+ paste(false);
	5606	+ }
4339	5607	}
4340	5608	else
4341	5609	{
4342	5610	boolean first = true;
4343	5611
4344		- if (GrafreeD.clipboardIsTempGroup)
	5612	+ if (Grafreed.clipboardIsTempGroup)
4345	5613	{
4346		- Composite temp = (Composite)GrafreeD.clipboard;
	5614	+ Composite temp = (Composite)Grafreed.clipboard;
4347	5615	Object3D copy;
4348	5616	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4349	5617	{
..	..	@@ -4353,7 +5621,7 @@
4353	5621	}
4354	5622	} else
4355	5623	{
4356		- linkSomething(GrafreeD.clipboard); //.get(0));
	5624	+ linkSomething(Grafreed.clipboard); //.get(0));
4357	5625	}
4358	5626	}
4359	5627	}
..	..	@@ -4430,6 +5698,10 @@
4430	5698
4431	5699	void group(Object3D csg, boolean grab)
4432	5700	{
	5701	+ if (Globals.REPLACEONMAKE)
	5702	+ Save();
	5703	+ boolean keep = Globals.REPLACEONMAKE;
	5704	+ Globals.REPLACEONMAKE = false;
4433	5705	if (//false) // why??
4434	5706	!group.selection.isEmpty())
4435	5707	{
..	..	@@ -4543,10 +5815,15 @@
4543	5815	//node.add(csg);
4544	5816	//makeSomething(node);
4545	5817	makeSomething(csg);
	5818	+ Globals.REPLACEONMAKE = keep;
4546	5819	}
4547	5820
4548	5821	void Ungroup(Object3D g)
4549	5822	{
	5823	+ if (Globals.REPLACEONMAKE)
	5824	+ Save();
	5825	+ boolean keep = Globals.REPLACEONMAKE;
	5826	+ Globals.REPLACEONMAKE = false;
4550	5827	if (g instanceof HiddenObject)
4551	5828	{
4552	5829	HiddenObject h = (HiddenObject) g;
..	..	@@ -4563,6 +5840,7 @@
4563	5840	objEditor.makeSomething(g.get(i), false);
4564	5841	}
4565	5842	}
	5843	+ Globals.REPLACEONMAKE = keep;
4566	5844	}
4567	5845
4568	5846	void ungroup()
..	..	@@ -4758,21 +6036,6 @@
4758	6036	}
4759	6037	*/
4760	6038
4761		- void ImportGFD()
4762		- {
4763		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4764		- browser.show();
4765		- String filename = browser.getFile();
4766		- if (filename != null && filename.length() > 0)
4767		- {
4768		- String fullname = browser.getDirectory() + filename;
4769		-
4770		- //Object3D readobj =
4771		- objEditor.ReadGFD(fullname, objEditor);
4772		- //makeSomething(readobj);
4773		- }
4774		- }
4775		-
4776	6039	/*
4777	6040	public void Callback(Object obj)
4778	6041	{
..	..	@@ -4796,26 +6059,9 @@
4796	6059	}
4797	6060	*/
4798	6061
4799		- void ImportVRMLX3D()
4800		- {
4801		- if (GrafreeD.standAlone)
4802		- {
4803		- /**/
4804		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4805		- browser.show();
4806		- String filename = browser.getFile();
4807		- if (filename != null && filename.length() > 0)
4808		- {
4809		- String fullname = browser.getDirectory() + filename;
4810		- LoadVRMLX3D(fullname);
4811		- }
4812		- /**/
4813		- }
4814		- }
4815		-
4816	6062	String GetFile(String dialogName)
4817	6063	{
4818		- if (GrafreeD.standAlone)
	6064	+ if (Grafreed.standAlone)
4819	6065	{
4820	6066	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4821	6067	browser.show();
..	..	@@ -4879,10 +6125,48 @@
4879	6125	cButton flashSelectionButton;
4880	6126	cButton editButton;
4881	6127	cButton uneditButton;
	6128	+ JCheckBox allParamsButton;
4882	6129	cButton clearpanelButton;
4883		- cButton allParamsButton;
4884	6130	cButton unselectButton;
4885	6131
	6132	+ cButton restoreCameraButton;
	6133	+
	6134	+ cButton oneStepButton;
	6135	+
	6136	+ cButton groupButton;
	6137	+ cButton ungroupButton;
	6138	+ cButton compositeButton;
	6139	+ cButton switchButton;
	6140	+ cButton loopButton;
	6141	+ cButton textureButton;
	6142	+
	6143	+ cButton skybox1Button;
	6144	+ cButton skybox2Button;
	6145	+ cButton skybox3Button;
	6146	+ cButton skybox4Button;
	6147	+ cButton skybox5Button;
	6148	+ cButton skybox6Button;
	6149	+ cButton skybox7Button;
	6150	+
	6151	+ cButton skybox11Button;
	6152	+ cButton skybox12Button;
	6153	+ cButton skybox13Button;
	6154	+ cButton skybox14Button;
	6155	+ cButton skybox15Button;
	6156	+ cButton skybox16Button;
	6157	+ cButton skybox17Button;
	6158	+
	6159	+ cButton gridButton;
	6160	+ cButton boxButton;
	6161	+ cButton sphereButton;
	6162	+ cButton coneButton;
	6163	+ cButton torusButton;
	6164	+ cButton superButton;
	6165	+ cButton kleinButton;
	6166	+ cButton particlesButton;
	6167	+ cButton overlayButton;
	6168	+ cButton lightButton;
	6169	+
4886	6170	cButton screenfitButton;
4887	6171	cButton screenfitpointButton;
4888	6172	cButton snapobjectButton;
..	..	@@ -4894,14 +6178,6 @@
4894	6178
4895	6179	cButton setsupportButton;
4896	6180
4897		- cButton twoButton;
4898		- cButton sixButton;
4899		- cButton threeButton;
4900		- cButton sevenButton;
4901		- cButton fourButton; // full panel
4902		- cButton oneButton; // full XYZ
4903		- //cButton currentLayout;
4904		-
4905	6181	//
4906	6182	//Composite
4907	6183	Object3D // to do !!
..	..	@@ -4911,9 +6187,11 @@
4911	6187	//JTree jTree;
4912	6188	private MenuItem lookAtItem;
4913	6189	private MenuItem lookFromItem;
4914		- private MenuItem switchItem;
	6190	+ private MenuItem switchViewItem;
4915	6191	private MenuItem cutItem;
4916		- private MenuItem duplicateItem;
	6192	+ private MenuItem undoItem;
	6193	+ private MenuItem redoItem;
	6194	+ private JMenuItem duplicateItem;
4917	6195	private MenuItem cloneItem;
4918	6196	private MenuItem cloneSupportItem;
4919	6197	private MenuItem overwriteGeoItem;
..	..	@@ -4926,7 +6204,7 @@
4926	6204	private MenuItem linkverticesItem;
4927	6205	private MenuItem relinkverticesItem;
4928	6206	private MenuItem setMasterItem;
4929		- private MenuItem resetMeshItem;
	6207	+ private MenuItem resetAllItem;
4930	6208	private MenuItem stepAllItem;
4931	6209	private MenuItem revertMeshItem;
4932	6210	private MenuItem poseMeshItem;
..	..	@@ -4937,10 +6215,11 @@
4937	6215	private MenuItem mergeGeometriesItem;
4938	6216	private MenuItem copyItem;
4939	6217	private MenuItem pasteItem;
	6218	+ private MenuItem pasteIntoItem;
4940	6219	private MenuItem pasteLinkItem;
4941	6220	private MenuItem pasteCloneItem;
4942	6221	private MenuItem pasteExpandItem;
4943		- private MenuItem clearItem;
	6222	+ private MenuItem deleteItem;
4944	6223	private MenuItem clearAllItem;
4945	6224	private MenuItem genUVItem;
4946	6225	private MenuItem genNormalsMESHItem;
..	..	@@ -4975,6 +6254,10 @@
4975	6254	private MenuItem showleavesItem;
4976	6255	private MenuItem markleavesItem;
4977	6256	private MenuItem unmarkleavesItem;
	6257	+ private MenuItem rewindleavesItem;
	6258	+ private MenuItem unrewindleavesItem;
	6259	+ private MenuItem randomleavesItem;
	6260	+ private MenuItem unrandomleavesItem;
4978	6261
4979	6262	private MenuItem flipVItem;
4980	6263	private MenuItem unflipVItem;
..	..	@@ -4986,15 +6269,17 @@
4986	6269	private MenuItem panoTexturesItem;
4987	6270
4988	6271	private MenuItem resetCentroidItem;
4989		- private MenuItem transformgeometryItem;
	6272	+ private MenuItem resetCentroidXZItem;
4990	6273	private MenuItem resetTransformItem;
	6274	+ private MenuItem transformGeometryItem;
	6275	+ private MenuItem transformChildrenItem;
4991	6276	private MenuItem hideItem;
4992	6277	private MenuItem grabItem;
4993	6278	private MenuItem backItem;
4994	6279	private MenuItem frontItem;
4995	6280	private MenuItem cameraItem;
4996	6281	private MenuItem compositeItem;
4997		- private MenuItem randomItem;
	6282	+ private MenuItem switchItem;
4998	6283	private MenuItem physicsItem;
4999	6284	private MenuItem frameselectorItem;
5000	6285	private MenuItem scriptNodeItem;
..	..	@@ -5009,6 +6294,7 @@
5009	6294
5010	6295	private MenuItem resetParentItem;
5011	6296	private MenuItem repairParentItem;
	6297	+ private MenuItem repairShadowItem;
5012	6298	private MenuItem sortbysizeItem;
5013	6299	private MenuItem sortbynameItem;
5014	6300
..	..	@@ -5017,6 +6303,8 @@
5017	6303	private MenuItem attachBumpItem;
5018	6304	private MenuItem detachBumpItem;
5019	6305	private MenuItem pigmentBumpItem;
	6306	+ private MenuItem embedTexturesItem;
	6307	+ private MenuItem deEmbedTexturesItem;
5020	6308
5021	6309	private MenuItem particleItem;
5022	6310	private MenuItem ragdollItem;
..	..	@@ -5033,7 +6321,7 @@
5033	6321	private MenuItem blobItem;
5034	6322	private MenuItem latheItem;
5035	6323	private MenuItem bezierItem;
5036		- private MenuItem checkerItem;
	6324	+ private MenuItem overlayItem;
5037	6325	private MenuItem meshItem;
5038	6326	// private MenuItem meshGroupItem;
5039	6327	private MenuItem springItem;
..	..	@@ -5055,11 +6343,6 @@
5055	6343	private MenuItem doubleItem;
5056	6344	private MenuItem tripleItem;
5057	6345
5058		- private MenuItem importGFDItem;
5059		- private MenuItem importVRMLX3DItem;
5060		- private MenuItem import3DSItem;
5061		- private MenuItem importOBJItem;
5062		-
5063	6346	private MenuItem computeAOItem;
5064	6347	private MenuItem recompileItem;
5065	6348	private MenuItem editScriptItem;
..	..	@@ -5069,4 +6352,8 @@
5069	6352	private MenuItem analyzeItem;
5070	6353	private MenuItem dumpItem;
5071	6354	//boolean freezemodel = false;
	6355	+
	6356	+ Menu cameraMenu;
	6357	+ MenuItem editCameraItem;
	6358	+ MenuItem restoreCameraItem;
5072	6359	}