~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,73 +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);
	686	+ relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
	687	+ relinkverticesItem.addActionListener(this);
	688	+
	689	+ if (Globals.ADVANCED)
	690	+ {
222	691	setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
223	692	setMasterItem.addActionListener(this);
	693	+ }
224	694
225	695	oe.menuBar.add(menu = new Menu("Group"));
226		- grabItem = menu.add(new MenuItem("Grab"));
227		- grabItem.addActionListener(this);
	696	+// grabItem = menu.add(new MenuItem("Grab"));
	697	+// grabItem.addActionListener(this);
228	698	backItem = menu.add(new MenuItem("Back"));
229	699	backItem.addActionListener(this);
230	700	frontItem = menu.add(new MenuItem("Front"));
231	701	frontItem.addActionListener(this);
232		- compositeItem = menu.add(new MenuItem("Composite"));
233		- compositeItem.addActionListener(this);
234		- menu.add("-");
235		- randomItem = menu.add(new MenuItem("Random"));
236		- randomItem.addActionListener(this);
237		- physicsItem = menu.add(new MenuItem("Physics"));
238		- physicsItem.addActionListener(this);
239		- frameselectorItem = menu.add(new MenuItem("Frame Selector"));
240		- frameselectorItem.addActionListener(this);
	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"));
	708	+ hideItem.addActionListener(this);
	709	+ }
	710	+ ungroupItem = menu.add(new MenuItem("Ungroup"));
	711	+ ungroupItem.addActionListener(this);
	712	+
	713	+// menu.add("-");
	714	+//
	715	+// switchItem = menu.add(new MenuItem("Switch node"));
	716	+// switchItem.addActionListener(this);
	717	+ if (Globals.ADVANCED)
	718	+ {
241	719	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
242	720	switchGeoItem.addActionListener(this);
243	721	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
244	722	switchTransfoItem.addActionListener(this);
245		- morphItem = menu.add(new MenuItem("Morph"));
	723	+ morphItem = menu.add(new MenuItem("Morph Group"));
246	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);
247	731	scriptNodeItem = menu.add(new MenuItem("Script Node"));
248	732	scriptNodeItem.addActionListener(this);
249		- cameraItem = menu.add(new MenuItem("Camera"));
250		- cameraItem.addActionListener(this);
	733	+ }
251	734
252	735	oe.menuBar.add(menu = new Menu("Object"));
253		- textureItem = menu.add(new MenuItem("Texture"));
254		- textureItem.addActionListener(this);
	736	+// textureItem = menu.add(new MenuItem("Texture"));
	737	+// textureItem.addActionListener(this);
	738	+ billboardItem = menu.add(new MenuItem("Billboard"));
	739	+ billboardItem.addActionListener(this);
255	740	csgItem = menu.add(new MenuItem("CSG"));
256	741	csgItem.addActionListener(this);
257		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	742	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
258	743	shadowXItem.addActionListener(this);
259		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	744	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
260	745	shadowYItem.addActionListener(this);
261		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	746	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
262	747	shadowZItem.addActionListener(this);
	748	+ attributeItem = menu.add(new MenuItem("Attribute"));
	749	+ attributeItem.addActionListener(this);
	750	+
	751	+ if (Globals.ADVANCED)
	752	+ {
	753	+ menu.add("-");
263	754	linkerItem = menu.add(new MenuItem("Linker"));
264	755	linkerItem.addActionListener(this);
265	756	templateItem = menu.add(new MenuItem("Template"));
266	757	templateItem.addActionListener(this);
267		- attributeItem = menu.add(new MenuItem("Attribute"));
268		- attributeItem.addActionListener(this);
269	758	pointflowItem = menu.add(new MenuItem("Point Flow"));
270	759	pointflowItem.addActionListener(this);
	760	+ }
271	761	menu.add("-");
272		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
273		- transformgeometryItem.addActionListener(this);
274	762	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
275	763	resetTransformItem.addActionListener(this);
276	764	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
277	765	resetCentroidItem.addActionListener(this);
278		- ungroupItem = menu.add(new MenuItem("Ungroup"));
279		- ungroupItem.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);
280	772
281	773	oe.menuBar.add(menu = new Menu("Geometry"));
282	774	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -285,6 +777,13 @@
285	777	genNormalsORGANItem.addActionListener(this);
286	778	genNormalsCADItem = menu.add(new MenuItem("CAD Normals"));
287	779	genNormalsCADItem.addActionListener(this);
	780	+ genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
	781	+ genNormalsMESHItem.addActionListener(this);
	782	+ if (Globals.ADVANCED)
	783	+ {
	784	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
	785	+ genNormalsMINEItem.addActionListener(this);
	786	+ }
288	787	stripifyItem = menu.add(new MenuItem("Stripify"));
289	788	stripifyItem.addActionListener(this);
290	789	unstripifyItem = menu.add(new MenuItem("Unstripify"));
..	..	@@ -306,23 +805,34 @@
306	805	reduce34MeshItem.addActionListener(this);
307	806	increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
308	807	increaseMeshItem.addActionListener(this);
309		- smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
310		- smoothMeshItem.addActionListener(this);
311	808	clipMeshItem = menu.add(new MenuItem("Clip mesh"));
312	809	clipMeshItem.addActionListener(this);
	810	+
	811	+ if (Globals.ADVANCED)
	812	+ {
	813	+ smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
	814	+ smoothMeshItem.addActionListener(this);
	815	+ }
313	816
314	817	oe.menuBar.add(menu = new Menu("Attributes"));
315	818	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
316	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);
317	824	menu.add("-");
318	825	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
319	826	liveleavesItem.addActionListener(this);
320	827	unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
321	828	unliveleavesItem.addActionListener(this);
	829	+ if (Globals.ADVANCED)
	830	+ {
322	831	supportleavesItem = menu.add(new MenuItem("Support Leaves"));
323	832	supportleavesItem.addActionListener(this);
324	833	unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
325	834	unsupportleavesItem.addActionListener(this);
	835	+ }
326	836	hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
327	837	hideleavesItem.addActionListener(this);
328	838	showleavesItem = menu.add(new MenuItem("Show Leaves"));
..	..	@@ -331,6 +841,14 @@
331	841	markleavesItem.addActionListener(this);
332	842	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
333	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);
334	852	menu.add("-");
335	853	flipVItem = menu.add(new MenuItem("Flip V"));
336	854	flipVItem.addActionListener(this);
..	..	@@ -356,53 +874,126 @@
356	874	attachBumpItem.addActionListener(this);
357	875	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
358	876	pigmentBumpItem.addActionListener(this);
	877	+ //embedTexturesItem
359	878	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
360	879	detachPigmentItem.addActionListener(this);
361	880	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
362	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);
363	886	menu.add("-");
364	887	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
365	888	sortbysizeItem.addActionListener(this);
366	889	sortbynameItem = menu.add(new MenuItem("Sort by name"));
367	890	sortbynameItem.addActionListener(this);
368	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.
369	899	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
370	900	extractGeometriesItem.addActionListener(this);
371	901	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
372	902	cloneGeometriesItem.addActionListener(this);
373		- shareGeometriesItem = menu.add(new MenuItem("Share Geometry"));
374		- shareGeometriesItem.addActionListener(this);
375		- mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
376		- mergeGeometriesItem.addActionListener(this);
	903	+ }
377	904
378	905	oe.menuBar.add(menu = new Menu("Insert"));
379	906	buildCreateMenu(menu);
380	907
381		-
382		- oe.menuBar.add(menu = new Menu("Include"));
383		- importGFDItem = menu.add(new MenuItem("GrafreeD Object..."));
384		- importGFDItem.addActionListener(this);
385		- importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D Object..."));
386		- importVRMLX3DItem.addActionListener(this);
387		- importOBJItem = menu.add(new MenuItem("OBJ Object..."));
388		- importOBJItem.addActionListener(this);
389		- import3DSItem = menu.add(new MenuItem("3DS Object..."));
390		- import3DSItem.addActionListener(this);
391		-
392	908	oe.menuBar.add(menu = new Menu("Tools"));
393	909	buildToolsMenu(menu);
394	910	}
395	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	+
396	980	void SetupUI2(ObjEditor oe)
397	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	+
398	994	//new Exception().printStackTrace();
399	995
400	996	oe.radioPanel = new JPanel(new GridBagLayout());
401		- oe.aConstraints.weightx = 1;
402		- oe.aConstraints.weighty = 0;
403		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
404		- oe.aConstraints.gridwidth = 100;
405		- oe.aConstraints.gridheight = 1;
406	997	// oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
407	998
408	999	oe.buttonGroup = new ButtonGroup();
..	..	@@ -423,150 +1014,263 @@
423	1014	oe.radioPanel.add(dummyButton);
424	1015	oe.buttonGroup.add(dummyButton);
425	1016	*/
426		- aConstraints.gridy += 1;
427		- oe.aConstraints.gridwidth = 1;
428		- oe.aConstraints.gridx = 0;
	1017	+ cGridBag copyOptionsPanel = new cGridBag();
	1018	+
	1019	+ copyOptionsPanel.preferredHeight = 2;
429	1020
430		- 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");
431	1122	liveCB.addItemListener(this);
432	1123
433		- oe.aConstraints.gridx += 1;
434		- oe.toolbarPanel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT), oe.aConstraints);
435		- supportCB.addItemListener(this);
436		-
437		- // oe.aConstraints.gridx += 1;
438		- // oe.toolbarPanel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), oe.aConstraints);
439		- // localCB.addItemListener(this);
440		-
441		- oe.aConstraints.gridx += 1;
442		- oe.toolbarPanel.add(crowdCB = new cCheckBox("Crowd", CameraPane.CROWD), oe.aConstraints);
443		- crowdCB.addItemListener(this);
444		-
445		- oe.aConstraints.gridx += 1;
446		- oe.toolbarPanel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA), oe.aConstraints);
447		- smoothCB.addItemListener(this);
448		-
449		- oe.aConstraints.gridx += 1;
450		- 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");
451	1126	fastCB.addItemListener(this);
452		- oe.aConstraints.gridx += 1;
453		- oe.toolbarPanel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE), oe.aConstraints);
454		- slowCB.addItemListener(this);
455		- oe.aConstraints.gridx += 1;
456		- oe.toolbarPanel.add(boxCB = new cCheckBox("Box", CameraPane.FAST), oe.aConstraints);
457		- 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);
458	1133
459		-// oe.aConstraints.gridx += 1;
460		-// oe.toolbarPanel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), oe.aConstraints);
461		-// speakerMocapCB.addItemListener(this);
462		-
463		- if (false)
464		- {
465		- // handled in scripts
466		- oe.aConstraints.gridx += 1;
467		- oe.toolbarPanel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA), oe.aConstraints);
468		- speakerCameraCB.addItemListener(this);
469		-
470		- oe.aConstraints.gridx += 1;
471		- oe.toolbarPanel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS), oe.aConstraints);
472		- speakerFocusCB.addItemListener(this);
473		-
474		- oe.aConstraints.gridx += 1;
475		- oe.toolbarPanel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS), oe.aConstraints);
476		- smoothfocusCB.addItemListener(this);
477		- }
478		-
479		-//oe.aConstraints.gridx += 1;
480		-//oe.toolbarPanel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), oe.aConstraints);
481		-// debugCB.addItemListener(this);
482		-
483		- oe.aConstraints.gridx += 1;
484		- oe.toolbarPanel.add(oeilCB = new cCheckBox("O", CameraPane.OEIL), oe.aConstraints);
485		- oeilCB.addItemListener(this);
486		-
487		- oe.aConstraints.gridx += 1;
488		- oe.toolbarPanel.add(lookAtCB = new cCheckBox("T", CameraPane.LOOKAT), oe.aConstraints);
489		- lookAtCB.addItemListener(this);
490		-
491		- oe.aConstraints.gridx += 1;
492		- oe.toolbarPanel.add(trackCB = new cCheckBox(":", CameraPane.TRACK), oe.aConstraints);
493		- trackCB.addItemListener(this);
494		-
495		- oe.aConstraints.gridx += 1;
496		- oe.toolbarPanel.add(screenfitButton = new cButton("@ ")); //, oe.aConstraints);
497		- screenfitButton.addActionListener(this);
498		- oe.aConstraints.gridx += 1;
499	1134	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
500	1135	// screenfitpointButton.addActionListener(this);
501		-// oe.aConstraints.gridx += 1;
502		- oe.toolbarPanel.add(snapobjectButton = new cButton(" O+ ")); //, oe.aConstraints);
503		- snapobjectButton.addActionListener(this);
504		- oe.aConstraints.gridx += 1;
505	1136
506		- //aConstraints.gridx = 0;
507		- //aConstraints.gridy += 1;
508		- oe.aConstraints.weighty = 0;
509		- oe.aConstraints.gridwidth = 1;
510		-
511		- oe.toolbarPanel.add(flashSelectionButton = new cButton(" ? ")); //, oe.aConstraints);
512		- flashSelectionButton.addActionListener(this);
513		- oe.aConstraints.gridx += 1;
514		- oe.aConstraints.weighty = 0;
515		- oe.aConstraints.gridwidth = 1;
516		-
517		- //
518		- oe.toolbarPanel.add(twoButton = new cButton(" \|+\| ")); //, oe.aConstraints);
519		- twoButton.addActionListener(this);
520		- 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);
521	1144	fourButton.addActionListener(this);
522		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\| ")); //, oe.aConstraints);
523		- sixButton.addActionListener(this);
524		- oe.toolbarPanel.add(threeButton = new cButton(" \|+\|+")); //, oe.aConstraints);
525		- threeButton.addActionListener(this);
526		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+")); //, oe.aConstraints);
527		- sevenButton.addActionListener(this);
528		- //
	1145	+ fourButton.setToolTipText("Show control panel only");
	1146	+ }
529	1147
530		- 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");
531	1153	rootButton.addActionListener(this);
532		- oe.aConstraints.gridx += 1;
533		- 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");
534	1157	closeButton.addActionListener(this);
535	1158	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
536	1159	//clearButton.addActionListener(this);
537		- oe.aConstraints.gridx += 1;
538		-
539		- oe.aConstraints.gridx = 1; //
540		- oe.treePanel.add(editButton = new cButton("+"), oe.aConstraints);
541		- editButton.addActionListener(this);
542		- oe.aConstraints.gridx += 1;
543		- oe.aConstraints.weighty = 0;
544		- oe.aConstraints.gridwidth = 1;
545	1160
546		- 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");
547	1250	uneditButton.addActionListener(this);
548	1251
549		- oe.aConstraints.gridx += 1;
550		- oe.aConstraints.weighty = 0;
551		- oe.aConstraints.gridwidth = 1;
552		-
553		- oe.treePanel.add(clearPanelButton = new cButton("C"), oe.aConstraints);
554		- clearPanelButton.addActionListener(this);
555		-
556		- oe.aConstraints.gridx += 1;
557		- oe.aConstraints.weighty = 0;
558		- oe.aConstraints.gridwidth = 1;
559		-
560		- 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");
561	1254	allParamsButton.addActionListener(this);
562	1255
563		- oe.aConstraints.gridx += 1;
564		- oe.aConstraints.weighty = 0;
565		- oe.aConstraints.gridwidth = 1;
566		-
567		- oe.treePanel.add(unselectButton = new cButton("U"), oe.aConstraints);
568		- 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);
569	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	+
570	1274	// oe.aConstraints.gridx += 1;
571	1275	// oe.aConstraints.weighty = 0;
572	1276	// oe.aConstraints.gridwidth = 1;
..	..	@@ -578,47 +1282,32 @@
578	1282	// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
579	1283	// gcButton.addActionListener(this);
580	1284
581		- oe.aConstraints.gridx = 0;
582		- oe.aConstraints.gridy += 1;
583		-
584		- //ctrlPanel.add(objList = new List(5, true));
585		- oe.aConstraints.gridwidth = 100;
586		- // oe.aConstraints.gridheight = 100;
587		- oe.aConstraints.fill = GridBagConstraints.BOTH; // HORIZONTAL;
588		- oe.aConstraints.gridheight = 1;
589		- oe.aConstraints.weighty = 0.5;
590		- oe.aConstraints.gridx = 0;
591		- JScrollPane jSP;
	1285	+ cGridBag jSPPanel = new cGridBag();
	1286	+
	1287	+ JScrollPane jSP;
592	1288	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
593		- oe.treePanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null)), oe.aConstraints);
	1289	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
594	1290	ResetModel();
595		- oe.aConstraints.weighty = 0.5;
596		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
597		- oe.aConstraints.gridy += 1;
598		- oe.aConstraints.gridwidth = 1;
599		-
600		- oe.aConstraints.weighty = 0;
601		- oe.aConstraints.gridwidth = 2;
602		-
603		- oe.treePanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0), oe.aConstraints);
604		- colorCB.addItemListener(this);
605		- oe.aConstraints.gridx += 2;
606		- oe.treePanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0), oe.aConstraints);
607		- materialCB.addItemListener(this);
608		- oe.aConstraints.gridx += 2;
609		- oe.treePanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0), oe.aConstraints);
610		- textureCB.addItemListener(this);
611		-
612		- oe.aConstraints.gridx = 0;
613		- oe.aConstraints.gridy += 1;
614	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	+
615	1304	//jList.addListSelectionListener(this);
616	1305	oe.jTree.addTreeSelectionListener(this);
617	1306	//jTree.setRootVisible(false);
618	1307	//jTree.setEditable(true);
619	1308	oe.jTree.setDragEnabled(true);
620	1309	//jTree.setPreferredSize(new Dimension(10,10));
621		- jSP.setPreferredSize(new Dimension(100,200));
	1310	+ //jSP.setPreferredSize(new Dimension(100,200));
622	1311
623	1312	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
624	1313
..	..	@@ -630,23 +1319,163 @@
630	1319	dgr.addDragGestureListener(this);
631	1320	}catch(Exception e) {}
632	1321	*/
633		- radio.layout = sevenButton;
	1322	+ radio.layout = threeButton; // sixButton;
634	1323	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
635	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	+ }
636	1454
637	1455	void EditObject(Object3D obj)
638	1456	{
639		- cRadio dummyButton = new cRadio(obj.name);
640		- dummyButton.SetObject(obj);
641		- dummyButton.layout = sevenButton;
642		- dummyButton.SetCamera(cameraView.renderCamera, false);
643		- dummyButton.addActionListener(this);
644		- radioPanel.add(dummyButton);
645		- buttonGroup.add(dummyButton);
646		- 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();
647	1473	}
	1474	+
648	1475	void SetupViews(ObjEditor oe)
649	1476	{
	1477	+ theFrame = this;
	1478	+
650	1479	oe.SetupViews();
651	1480
652	1481	System.out.println("SetupViews");
..	..	@@ -655,22 +1484,30 @@
655	1484	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
656	1485	}
657	1486
658		- JCheckBox liveCB;
659		- JCheckBox supportCB;
660		- JCheckBox localCB;
661		- JCheckBox crowdCB;
662		- JCheckBox smoothCB;
663		- JCheckBox fastCB;
664		- JCheckBox slowCB;
665		- JCheckBox boxCB;
666		- JCheckBox trackCB;
667		- 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;
668	1502	// JCheckBox speakerMocapCB;
669		- JCheckBox speakerCameraCB;
670		- JCheckBox speakerFocusCB;
671		- JCheckBox debugCB;
672		- JCheckBox oeilCB;
673		- JCheckBox lookAtCB;
	1503	+ cCheckBox speakerCameraCB;
	1504	+ cCheckBox speakerFocusCB;
	1505	+ cCheckBox debugCB;
	1506	+
	1507	+ cCheckBox oeilCB;
	1508	+ cCheckBox shadowCB;
	1509	+ cCheckBox autokeepCB;
	1510	+ cCheckBox lookAtCB;
674	1511
675	1512	// static int COLOR = 1;
676	1513	// static int MATERIAL = 2;
..	..	@@ -678,9 +1515,9 @@
678	1515
679	1516	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
680	1517
681		- JCheckBox colorCB;
682		- JCheckBox materialCB;
683		- JCheckBox textureCB;
	1518	+ cCheckBox colorCB;
	1519	+ cCheckBox materialCB;
	1520	+ cCheckBox textureCB;
684	1521
685	1522	public void itemStateChanged(ItemEvent e)
686	1523	{
..	..	@@ -705,10 +1542,10 @@
705	1542	dropAttributes \|= Object3D.TEXTURE;
706	1543	else
707	1544	dropAttributes &= ~Object3D.TEXTURE;
708		- }
709		- else if(e.getSource() == liveCB)
	1545	+ } else if(e.getSource() == liveCB)
710	1546	{
711	1547	cameraView.ToggleLive();
	1548	+ refreshContents(false);
712	1549	}
713	1550	else if(e.getSource() == supportCB)
714	1551	{
..	..	@@ -724,6 +1561,12 @@
724	1561	{
725	1562	cameraView.ToggleInertia();
726	1563	cameraView.repaint();
	1564	+ }
	1565	+ else if(e.getSource() == minshaderCB)
	1566	+ {
	1567	+ Globals.MINSHADER ^= true;
	1568	+ cameraView.programInitialized = false;
	1569	+ cameraView.repaint();
727	1570	}
728	1571	else if(e.getSource() == localCB)
729	1572	{
..	..	@@ -743,6 +1586,10 @@
743	1586	Recompile();
744	1587	cameraView.repaint();
745	1588	// refreshContents();
	1589	+ }
	1590	+ else if(e.getSource() == zoomBoxCB)
	1591	+ {
	1592	+ cameraView.ToggleZoomBoxMode();
746	1593	}
747	1594	else if(e.getSource() == smoothfocusCB)
748	1595	{
..	..	@@ -769,6 +1616,18 @@
769	1616	{
770	1617	cameraView.ToggleOeil();
771	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	+ }
772	1631	else if(e.getSource() == lookAtCB)
773	1632	{
774	1633	cameraView.ToggleLookAt();
..	..	@@ -785,7 +1644,8 @@
785	1644
786	1645	/**/
787	1646	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
788		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1647	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1648	+ TreePath path = objEditor.jTree.getSelectionPath();
789	1649	if ((path == null) \|\| (path.getPathCount() <= 1)) {
790	1650	// We can't move the root node or an empty selection
791	1651	return;
..	..	@@ -848,8 +1708,6 @@
848	1708	}
849	1709	}
850	1710
851		- String string = (String) object;
852		-
853	1711	System.out.println("Transfer = " + object + "; drop : " + target);
854	1712	// if( object instanceof java.io.File[])
855	1713	// {
..	..	@@ -857,7 +1715,11 @@
857	1715	// objEditor.DropFile((java.io.File[]) object, true);
858	1716	// return;
859	1717	// }
860		- 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) == ':')
861	1723	{
862	1724	// file(s)
863	1725	String[] names = string.split("\n");
..	..	@@ -884,7 +1746,7 @@
884	1746
885	1747	flashIt = false;
886	1748	CameraPane pane = (CameraPane) target;
887		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1749	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
888	1750	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
889	1751
890	1752	if (group.selection.size() == 1)
..	..	@@ -900,23 +1762,33 @@
900	1762
901	1763	assert target == objEditor.jTree;
902	1764	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1765	+ Object3D destinationLeaf;
903	1766	try {
904		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1767	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
905	1768	} catch (Exception e) {
906	1769	System.out.println("destinationPath : " + destinationPath);
907	1770	return;
908	1771	}
909	1772
910		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1773	+ for (int i=group.selection.size(); --i>=0;)
911	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	+// {
912	1784	loadClipboard(true);
913	1785	objEditor.jTree.setSelectionPath(destinationPath);
914		- pasteInto(false);
915		- } else {
916		- loadClipboard(false);
917		- objEditor.jTree.setSelectionPath(destinationPath);
918		- pasteInto(false); // true); // ???
919		- }
	1786	+ pasteInto(false, false);
	1787	+// } else {
	1788	+// loadClipboard(false);
	1789	+// objEditor.jTree.setSelectionPath(destinationPath);
	1790	+// pasteInto(false, false); // true); // ???
	1791	+// }
920	1792	}
921	1793	public void dropActionChanged(DropTargetDragEvent dtde)
922	1794	// Called if the user has modified the current drop gesture
..	..	@@ -972,7 +1844,12 @@
972	1844	TreePath path;
973	1845
974	1846	public TransferableTreePath(TreePath tp) {
975		- 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);
976	1853	}
977	1854
978	1855	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -1021,83 +1898,107 @@
1021	1898	{
1022	1899	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1023	1900	//heightFieldItem.addActionListener(this);
1024		- gridItem = menu.add(new MenuItem("Grid"));
1025		- gridItem.addActionListener(this);
1026		- rectoidItem = menu.add(new MenuItem("Box"));
1027		- rectoidItem.addActionListener(this);
1028		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1029		- ellipsoidItem.addActionListener(this);
1030		- coneItem = menu.add(new MenuItem("Cone"));
1031		- coneItem.addActionListener(this);
1032		- torusItem = menu.add(new MenuItem("Torus"));
1033		- torusItem.addActionListener(this);
1034		- superItem = menu.add(new MenuItem("Superellipsoid"));
1035		- superItem.addActionListener(this);
1036		- particleItem = menu.add(new MenuItem("Particle system"));
1037		- particleItem.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	+ {
	1919	+ kleinItem = menu.add(new MenuItem("Klein Bottle"));
	1920	+ kleinItem.addActionListener(this);
	1921	+ }
	1922	+
	1923	+// particleItem = menu.add(new MenuItem("Particle system"));
	1924	+// particleItem.addActionListener(this);
	1925	+ if (Globals.ADVANCED)
	1926	+ {
1038	1927	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1039	1928	ragdollItem.addActionListener(this);
1040	1929	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1041	1930	ragdoll2Item.addActionListener(this);
	1931	+ }
1042	1932	menu.add("-");
1043		- meshItem = menu.add(new MenuItem("Mesh"));
	1933	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1044	1934	meshItem.addActionListener(this);
1045	1935	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1046	1936	// meshGroupItem.addActionListener(this);
	1937	+ if (Globals.ADVANCED)
	1938	+ {
1047	1939	springItem = menu.add(new MenuItem("Spring"));
1048	1940	springItem.addActionListener(this);
1049	1941	flagItem = menu.add(new MenuItem("Flag"));
1050	1942	flagItem.addActionListener(this);
1051		- bezierItem = menu.add(new MenuItem("Patch"));
1052		- bezierItem.addActionListener(this);
1053		- checkerItem = menu.add(new MenuItem("Checker"));
1054		- checkerItem.addActionListener(this);
1055	1943	blobItem = menu.add(new MenuItem("Blob"));
1056	1944	blobItem.addActionListener(this);
1057	1945	latheItem = menu.add(new MenuItem("Lathe"));
1058	1946	latheItem.addActionListener(this);
1059		- lightItem = menu.add(new MenuItem("Light"));
1060		- 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);
1061	1954	menu.add("-");
1062	1955	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1063	1956	//superLoopItem.addActionListener(this);
1064		- loopItem = menu.add(new MenuItem("Loop"));
1065		- loopItem.addActionListener(this);
	1957	+// loopItem = menu.add(new MenuItem("Loop"));
	1958	+// loopItem.addActionListener(this);
1066	1959	doubleItem = menu.add(new MenuItem("Fork"));
1067	1960	doubleItem.addActionListener(this);
	1961	+ if (Globals.ADVANCED)
	1962	+ {
1068	1963	tripleItem = menu.add(new MenuItem("Trident"));
1069	1964	tripleItem.addActionListener(this);
	1965	+ }
1070	1966	}
1071	1967
1072	1968	void buildToolsMenu(Menu menu)
1073	1969	{
1074	1970	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1075	1971	animationItem.addItemListener(this);
1076		- animationItem.setState(CameraPane.ANIMATION);
	1972	+ animationItem.setState(Globals.ANIMATION);
	1973	+
	1974	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1975	+ archiveItem.addActionListener(this);
1077	1976
1078	1977	menu.add("-");
1079	1978	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1080	1979	parseverticesItem.addActionListener(this);
1081	1980	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1082	1981	textureFieldItem.addActionListener(this);
1083		- alignItem = menu.add(new MenuItem("Align"));
	1982	+ alignItem = menu.add(new MenuItem("Align Objects"));
1084	1983	alignItem.addActionListener(this);
1085		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1086		- mirrorItem.addActionListener(this);
1087	1984	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1088	1985	reduceMorphItem.addActionListener(this);
1089	1986	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1090	1987	reduce34MorphItem.addActionListener(this);
1091		-
1092		- menu.add(computeAOItem = new MenuItem("Compute AO"));
1093		- computeAOItem.addActionListener(this);
1094	1988	menu.add("-");
1095		-
1096	1989	menu.add(memoryItem = new MenuItem("Memory Usage"));
1097	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("-");
1098	1999	menu.add(analyzeItem = new MenuItem("Analyze"));
1099	2000	analyzeItem.addActionListener(this);
1100		- menu.add(dumpItem = new MenuItem("Dump"));
	2001	+ menu.add(dumpItem = new MenuItem("Print"));
1101	2002	dumpItem.addActionListener(this);
1102	2003	// menu.add(pathItem = new MenuItem("From-to path"));
1103	2004	// pathItem.addActionListener(this);
..	..	@@ -1106,6 +2007,8 @@
1106	2007	resetParentItem.addActionListener(this);
1107	2008	repairParentItem = menu.add(new MenuItem("Repair Parent"));
1108	2009	repairParentItem.addActionListener(this);
	2010	+ repairShadowItem = menu.add(new MenuItem("Repair Shadow"));
	2011	+ repairShadowItem.addActionListener(this);
1109	2012	menu.add(invariantsItem = new MenuItem("Invariants"));
1110	2013	invariantsItem.addActionListener(this);
1111	2014	menu.add(recompileItem = new MenuItem("Recompile"));
..	..	@@ -1113,6 +2016,7 @@
1113	2016	menu.add("-");
1114	2017	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1115	2018	editScriptItem.addActionListener(this);
	2019	+ }
1116	2020	}
1117	2021
1118	2022	void ScreenFit()
..	..	@@ -1235,9 +2139,34 @@
1235	2139	shadow.material = new cMaterial(obj.material);
1236	2140	shadow.material.diffuse = 0.0001f;
1237	2141	shadow.material.specular = 0.0001f;
	2142	+ //shadow.projectedVertices[1].x = 300;
1238	2143
1239	2144	makeSomething(shadow);
1240	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	+ }
1241	2170
1242	2171	/**
1243	2172	* applyExample
..	..	@@ -1441,9 +2370,9 @@
1441	2370
1442	2371	void Overwrite(int mask)
1443	2372	{
1444		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2373	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1445	2374	{
1446		- Object3D content = GrafreeD.clipboard.get(0);
	2375	+ Object3D content = Grafreed.clipboard.get(0);
1447	2376
1448	2377	if (content instanceof cGroup && ((cGroup)content).transientlink )
1449	2378	content = ((cGroup)content).get(0);
..	..	@@ -1466,6 +2395,7 @@
1466	2395	//
1467	2396	public void actionPerformed(ActionEvent event) // , Object arg)
1468	2397	{
	2398	+ Object source = event.getSource();
1469	2399	/*
1470	2400	if (event.getSource() == nameField)
1471	2401	{
..	..	@@ -1477,11 +2407,11 @@
1477	2407	}
1478	2408	else
1479	2409	*/
1480		- if (event.getSource() == lookAtItem \|\| event.getSource() == lookFromItem)
	2410	+ if (source == lookAtItem \|\| source == lookFromItem)
1481	2411	{
1482	2412	ScreenFit();
1483	2413	} else
1484		- if (event.getSource() == switchItem)
	2414	+ if (source == switchViewItem)
1485	2415	{
1486	2416	cVector v1 = new cVector();
1487	2417	cVector v2 = new cVector();
..	..	@@ -1490,11 +2420,11 @@
1490	2420	objEditor.cameraView.renderCamera.setAim(v2, v1);
1491	2421	objEditor.cameraView.repaint();
1492	2422	} else
1493		- if (event.getSource() == rectoidItem)
	2423	+ if (source == rectoidItem \|\| source == boxButton)
1494	2424	{
1495	2425	makeSomething(new Box());
1496	2426	} else
1497		- if (event.getSource() == particleItem)
	2427	+ if (source == particleItem \|\| source == particlesButton)
1498	2428	{
1499	2429	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1500	2430	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1515,9 +2445,9 @@
1515	2445	applyExample(particleGeom, "SMOKE");
1516	2446	makeSomething(particleGeom);
1517	2447	} else
1518		- if (event.getSource() == ragdollItem \|\| event.getSource() == ragdoll2Item)
	2448	+ if (source == ragdollItem \|\| source == ragdoll2Item)
1519	2449	{
1520		- GenericJoint ragdoll = new GenericJoint(event.getSource() == ragdollItem);
	2450	+ GenericJoint ragdoll = new GenericJoint(source == ragdollItem);
1521	2451
1522	2452	ragdoll.toParent = LA.newMatrix();
1523	2453	ragdoll.fromParent = LA.newMatrix();
..	..	@@ -1535,7 +2465,7 @@
1535	2465	} else
1536	2466	/*
1537	2467	*/
1538		- if (event.getSource() == heightFieldItem)
	2468	+ if (source == heightFieldItem)
1539	2469	{
1540	2470	Object3D obj = new Object3D();
1541	2471
..	..	@@ -1573,27 +2503,31 @@
1573	2503
1574	2504	makeSomething(obj);
1575	2505	} else
1576		- if (event.getSource() == gridItem)
	2506	+ if (source == gridItem \|\| source == gridButton)
1577	2507	{
1578	2508	makeSomething(new Grid());
1579	2509	} else
1580		- if (event.getSource() == ellipsoidItem)
	2510	+ if (source == ellipsoidItem \|\| source == sphereButton)
1581	2511	{
1582	2512	makeSomething(new Sphere());
1583	2513	} else
1584		- if (event.getSource() == coneItem)
	2514	+ if (source == coneItem \|\| source == coneButton)
1585	2515	{
1586	2516	makeSomething(new Cone());
1587	2517	} else
1588		- if (event.getSource() == torusItem)
	2518	+ if (source == torusItem \|\| source == torusButton)
1589	2519	{
1590	2520	makeSomething(new Torus());
1591	2521	} else
1592		- if (event.getSource() == superItem)
	2522	+ if (source == superItem \|\| source == superButton)
1593	2523	{
1594	2524	makeSomething(new Superellipsoid());
1595	2525	} else
1596		- if (event.getSource() == blobItem)
	2526	+ if (source == kleinItem \|\| source == kleinButton)
	2527	+ {
	2528	+ makeSomething(new Klein());
	2529	+ } else
	2530	+ if (source == blobItem)
1597	2531	{
1598	2532	Blob blob = new Blob();
1599	2533	BlobComponent comp = new BlobComponent();
..	..	@@ -1601,15 +2535,15 @@
1601	2535	//blob.retile();
1602	2536	makeSomething(blob);
1603	2537	} else
1604		- if (event.getSource() == latheItem)
	2538	+ if (source == latheItem)
1605	2539	{
1606	2540	makeSomething(new Lathe());
1607	2541	} else
1608		- if (event.getSource() == bezierItem)
	2542	+ if (source == bezierItem)
1609	2543	{
1610	2544	makeSomething(new BezierSurface());
1611	2545	} else
1612		- if (event.getSource() == checkerItem)
	2546	+ if (source == overlayItem \|\| source == overlayButton)
1613	2547	{
1614	2548	/*
1615	2549	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1624,7 +2558,7 @@
1624	2558	*/
1625	2559	makeSomething(new Checker());
1626	2560	} else
1627		- if (event.getSource() == meshItem)
	2561	+ if (source == meshItem)
1628	2562	{
1629	2563	Object3D itemtomake = new Object3D();
1630	2564	Object3D child;
..	..	@@ -1645,35 +2579,52 @@
1645	2579	makeSomething(child);
1646	2580	}
1647	2581	} else
1648		- if (event.getSource() == springItem)
	2582	+ if (source == springItem)
1649	2583	{
1650	2584	cSpring s = new cSpring();
1651	2585	s.setup();
1652	2586	makeSomething(s);
1653	2587	} else
1654		- if (event.getSource() == flagItem)
	2588	+ if (source == flagItem)
1655	2589	{
1656	2590	cSpring s = new cFlag();
1657	2591	s.setup();
1658	2592	makeSomething(s);
1659	2593	} else
1660		- if (event.getSource() == lightItem)
	2594	+ if (source == lightItem \|\| source == lightButton)
1661	2595	{
1662	2596	makeSomething(new Light());
1663	2597	} else
1664		- 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)
1665	2616	{
1666	2617	group(new CSG());
1667	2618	} else
1668		- if (event.getSource() == templateItem)
	2619	+ if (source == templateItem)
1669	2620	{
1670	2621	group(new cTemplate());
1671	2622	} else
1672		- if (event.getSource() == attributeItem)
	2623	+ if (source == attributeItem)
1673	2624	{
1674	2625	makeSomething(new Attribute());
1675	2626	} else
1676		- if (event.getSource() == pointflowItem)
	2627	+ if (source == pointflowItem)
1677	2628	{
1678	2629	makeSomething(new PointFlow());
1679	2630	} else
..	..	@@ -1685,7 +2636,7 @@
1685	2636	} else
1686	2637	*/
1687	2638
1688		- if (event.getSource() == superLoopItem)
	2639	+ if (source == superLoopItem)
1689	2640	{
1690	2641	Composite g = new cGroup();
1691	2642	for (int i=0; i<15; i++)
..	..	@@ -1707,30 +2658,30 @@
1707	2658
1708	2659	group(g);
1709	2660	} else
1710		- if (event.getSource() == loopItem)
	2661	+ if (source == loopItem \|\| source == loopButton)
1711	2662	{
1712	2663	Composite csg = new GroupLeaf();
1713	2664	csg.count = 5;
1714	2665	group(csg);
1715		- Composite child = new cGroup();
	2666	+ Composite child = new cGroup("Branch");
1716	2667	csg.addChild(child);
1717	2668	child.addChild(csg);
1718	2669	} else
1719		- if (event.getSource() == doubleItem)
	2670	+ if (source == doubleItem)
1720	2671	{
1721		- Composite csg = new GroupLeaf();
	2672	+ Composite csg = new GroupLeaf("Fork");
1722	2673	csg.count = 5;
1723	2674	group(csg);
1724		- Composite child = new cGroup();
	2675	+ Composite child = new cGroup("Branch A");
1725	2676	csg.addChild(child);
1726	2677	child.addChild(csg);
1727		- child = new cGroup();
	2678	+ child = new cGroup("Branch B");
1728	2679	csg.addChild(child);
1729	2680	child.addChild(csg);
1730	2681	} else
1731		- if (event.getSource() == tripleItem)
	2682	+ if (source == tripleItem)
1732	2683	{
1733		- Composite csg = new GroupLeaf();
	2684	+ Composite csg = new GroupLeaf("Trident");
1734	2685	csg.count = 4;
1735	2686	group(csg);
1736	2687	Composite child = new cGroup();
..	..	@@ -1743,73 +2694,117 @@
1743	2694	csg.addChild(child);
1744	2695	child.addChild(csg);
1745	2696	} else
1746		-
1747		- if (event.getSource() == importGFDItem)
	2697	+ if (source == computeAOItem)
1748	2698	{
1749		- ImportGFD();
	2699	+ Globals.drawMode = CameraPane.OCCLUSION;
	2700	+ cameraView.repaint();
1750	2701	} else
1751		- if (event.getSource() == importVRMLX3DItem)
1752		- {
1753		- ImportVRMLX3D();
1754		- } else
1755		- if (event.getSource() == import3DSItem)
1756		- {
1757		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1758		- } else
1759		- if (event.getSource() == importOBJItem)
1760		- {
1761		- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1762		- } else
1763		- if (event.getSource() == computeAOItem)
1764		- {
1765		- CameraPane.drawMode = CameraPane.OCCLUSION;
1766		- CameraPane.theRenderer.repaint();
1767		- } else
1768		- if (event.getSource() == recompileItem)
	2702	+ if (source == recompileItem)
1769	2703	{
1770	2704	Recompile();
1771	2705	refreshContents();
1772	2706	} else
1773		- if (event.getSource() == editScriptItem)
	2707	+ if (source == editScriptItem)
1774	2708	{
1775	2709	OpenDialog();
1776	2710	refreshContents();
1777	2711	} else
1778		- if (event.getSource() == invariantsItem)
	2712	+ if (source == invariantsItem)
1779	2713	{
1780	2714	System.out.println("Invariants:");
1781		- GrafreeD.theApplet3D.universe.invariants();
	2715	+ Grafreed.grafreed.universe.invariants();
1782	2716	} else
1783		- if (event.getSource() == memoryItem)
	2717	+ if (source == memoryItem)
1784	2718	{
1785	2719	//System.out.println("Invariants:");
1786	2720	PrintMemory();
1787	2721	} else
1788		- if (event.getSource() == pathItem)
	2722	+ if (source == pathItem)
1789	2723	{
1790	2724	PrintPath();
1791	2725	} else
1792		- if (event.getSource() == analyzeItem)
	2726	+ if (source == analyzeItem)
1793	2727	{
1794	2728	AnalyzeObject();
1795	2729	} else
1796		- if (event.getSource() == dumpItem)
	2730	+ if (source == dumpItem)
1797	2731	{
1798	2732	DumpObject();
1799	2733	} else
1800		- if (event.getSource() == screenfitButton)
	2734	+ if (source == minButton)
1801	2735	{
1802		- //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	+ {
1803	2800	ScreenFit();
1804	2801	} else
1805		- if (event.getSource() == screenfitpointButton)
	2802	+ if (source == screenfitpointButton)
1806	2803	{
1807		- //Reload(lastConverter, lastFilename, true);
1808	2804	ScreenFitPoint();
1809	2805	} else
1810		- if (event.getSource() == snapobjectButton)
	2806	+ if (source == snapobjectButton)
1811	2807	{
1812		- //Reload(lastConverter, lastFilename, true);
1813	2808	SnapObject();
1814	2809	} else
1815	2810	// if (event.getSource() == recompileButton)
..	..	@@ -1818,13 +2813,13 @@
1818	2813	// Recompile();
1819	2814	// refreshContents();
1820	2815	// } else
1821		- if (event.getSource() == gcButton)
	2816	+ if (source == gcButton)
1822	2817	{
1823	2818	System.out.println("Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1824	2819	System.gc();
1825	2820	System.out.println("GC Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1826	2821	} else
1827		- if (event.getSource() == editLeafItem)
	2822	+ if (source == editLeafItem)
1828	2823	{
1829	2824	Object3D obj;
1830	2825	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -1838,62 +2833,74 @@
1838	2833	}
1839	2834	refreshContents(true);
1840	2835	} else
1841		- if (event.getSource() == openWindowItem)
	2836	+ if (source == openWindowItem)
1842	2837	{
1843	2838	EditSelection(true);
1844	2839	} else
1845		- if (event.getSource() == cutItem \|\| event.getSource() == clearButton)
	2840	+ if (source == cutItem \|\| source == clearButton)
1846	2841	{
1847	2842	loadClipboard(true);
1848	2843	} else
1849		- if (event.getSource() == duplicateItem)
	2844	+ if (source == undoItem)
1850	2845	{
1851		- 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;
1852	2855	loadClipboard(false);
1853	2856	paste(false);
1854		- GrafreeD.clipboard = keep;
	2857	+ Grafreed.clipboard = keep;
1855	2858	} else
1856		- if (event.getSource() == cloneItem)
	2859	+ if (source == cloneItem)
1857	2860	{
1858	2861	CloneSelection(false);
1859	2862	} else
1860		- if (event.getSource() == cloneSupportItem)
	2863	+ if (source == cloneSupportItem)
1861	2864	{
1862	2865	CloneSelection(true);
1863	2866	} else
1864		- if (event.getSource() == copyItem)
	2867	+ if (source == copyItem)
1865	2868	{
1866	2869	loadClipboard(false);
1867	2870	} else
1868		- if (event.getSource() == pasteItem)
	2871	+ if (source == pasteItem)
1869	2872	{
1870	2873	paste(false);
1871	2874	} else
1872		- if (event.getSource() == pasteLinkItem)
	2875	+ if (source == pasteIntoItem)
1873	2876	{
1874		- pasteInto(false);
	2877	+ pasteInto(true, false);
1875	2878	} else
1876		- if (event.getSource() == pasteCloneItem)
	2879	+ if (source == pasteLinkItem)
1877	2880	{
1878		- pasteInto(true);
	2881	+ pasteInto(false, false);
1879	2882	} else
1880		- if (event.getSource() == pasteExpandItem)
	2883	+ if (source == pasteCloneItem)
	2884	+ {
	2885	+ pasteInto(true, true);
	2886	+ } else
	2887	+ if (source == pasteExpandItem)
1881	2888	{
1882	2889	paste(true);
1883	2890	} else
1884		- if (event.getSource() == synchronizeItem)
	2891	+ if (source == synchronizeItem)
1885	2892	{
1886	2893	Overwrite(Object3D.TRANSFORM);
1887	2894	} else
1888		- if (event.getSource() == overwriteNameItem)
	2895	+ if (source == overwriteNameItem)
1889	2896	{
1890	2897	Overwrite(Object3D.NAME);
1891	2898	} else
1892		- if (event.getSource() == overwriteUVItem)
	2899	+ if (source == overwriteUVItem)
1893	2900	{
1894	2901	Overwrite(Object3D.UV);
1895	2902	} else
1896		- if (event.getSource() == overwriteMatItem)
	2903	+ if (source == overwriteMatItem)
1897	2904	{
1898	2905	/* july 2015
1899	2906	if ((dropAttributes & Object3D.TEXTURE) == 0)
..	..	@@ -1913,7 +2920,7 @@
1913	2920
1914	2921	Overwrite(dropAttributes);
1915	2922	}
1916		- if (event.getSource() == overwriteGeoItem)
	2923	+ if (source == overwriteGeoItem)
1917	2924	{
1918	2925	Overwrite(Object3D.GEOMETRY);
1919	2926	// if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
..	..	@@ -1930,7 +2937,7 @@
1930	2937	// refreshContents();
1931	2938	// }
1932	2939	} else
1933		- if (event.getSource() == generateMeshItem)
	2940	+ if (source == generateMeshItem)
1934	2941	{
1935	2942	//if (group.selection.size() == 1)
1936	2943	// for (int i=0; i<group.selection.size(); i++)
..	..	@@ -1941,7 +2948,7 @@
1941	2948	ResetModel();
1942	2949	refreshContents();
1943	2950	} else
1944		- if (event.getSource() == extractGeometriesItem)
	2951	+ if (source == extractGeometriesItem)
1945	2952	{
1946	2953	boolean one = false;
1947	2954
..	..	@@ -1968,7 +2975,7 @@
1968	2975	ResetModel();
1969	2976	refreshContents();
1970	2977	} else
1971		- if (event.getSource() == cloneGeometriesItem)
	2978	+ if (source == cloneGeometriesItem)
1972	2979	{
1973	2980	boolean one = false;
1974	2981
..	..	@@ -1994,32 +3001,37 @@
1994	3001	ResetModel();
1995	3002	refreshContents();
1996	3003	} else
1997		- if (event.getSource() == shareGeometriesItem)
	3004	+ if (source == shareGeometriesItem)
1998	3005	{
1999	3006	boolean one = false;
2000	3007
2001	3008	if (group.selection.size() == 1)
2002	3009	one = true;
2003	3010
	3011	+ Object3D merge = null;
	3012	+
2004	3013	Object3D content = new cGroup();
2005	3014
2006	3015	for (int i=0; i<group.selection.size(); i++)
2007	3016	{
2008		- Object3D sel = new Merge(group.selection.get(i));
	3017	+ merge = new Merge(group.selection.get(i));
2009	3018
2010	3019	if (one)
2011		- makeSomething(sel, false);
	3020	+ makeSomething(merge, false);
2012	3021	else
2013		- content.addChild(sel);
	3022	+ content.addChild(merge);
2014	3023	}
2015	3024
2016	3025	if (!one)
2017		- makeSomething(content, false);
2018		-
2019		- ResetModel();
2020		- refreshContents();
	3026	+ makeSomething(content, true);
	3027	+ else
	3028	+ {
	3029	+ ResetModel();
	3030	+ Select(merge.GetTreePath(), true, false); // unselect... false);
	3031	+ refreshContents();
	3032	+ }
2021	3033	} else
2022		- if (event.getSource() == mergeGeometriesItem)
	3034	+ if (source == mergeGeometriesItem)
2023	3035	{
2024	3036	boolean one = false;
2025	3037
..	..	@@ -2049,7 +3061,7 @@
2049	3061	ResetModel();
2050	3062	refreshContents();
2051	3063	} else
2052		- if (event.getSource() == linkverticesItem)
	3064	+ if (source == linkverticesItem)
2053	3065	{
2054	3066	// if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2055	3067	// {
..	..	@@ -2062,39 +3074,48 @@
2062	3074	// group.selection.get(0).setMasterThis(content); // should be identity
2063	3075	// refreshContents();
2064	3076	// }
2065		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	3077	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2066	3078	{
2067		- Object3D content = GrafreeD.clipboard.get(0);
	3079	+ Object3D content = Grafreed.clipboard.get(0);
2068	3080
2069	3081	if (content instanceof cGroup && ((cGroup)content).transientlink )
2070	3082	content = ((cGroup)content).get(0);
2071	3083
2072		- 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));
2073	3085	for (int i=0; i<group.selection.size(); i++)
2074	3086	{
2075		- boolean random = CameraPane.RANDOM;
2076		- CameraPane.RANDOM = false; // parse all random nodes
	3087	+ boolean random = CameraPane.SWITCH;
	3088	+ CameraPane.SWITCH = false; // parse all random nodes
2077	3089	group.selection.get(i).linkVerticesThis(content);
2078	3090	// group.selection.get(i).setMasterThis(content); // should be identity
2079		- CameraPane.RANDOM = random;
	3091	+ CameraPane.SWITCH = random;
2080	3092	}
2081		- 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));
2082	3094	refreshContents();
2083	3095	}
2084	3096	} else
2085		- if (event.getSource() == resetsupportItem)
	3097	+ if (source == resetsupportItem)
2086	3098	{
2087	3099	for (int i=0; i<group.selection.size(); i++)
2088	3100	{
2089		- boolean random = CameraPane.RANDOM;
2090		- CameraPane.RANDOM = false; // parse all random nodes
	3101	+ boolean random = CameraPane.SWITCH;
	3102	+ CameraPane.SWITCH = false; // parse all random nodes
2091	3103	group.selection.get(i).linkVerticesThis(null);
2092		- CameraPane.RANDOM = random;
	3104	+ CameraPane.SWITCH = random;
2093	3105	}
2094	3106
2095	3107	refreshContents();
2096	3108	} else
2097		- if (event.getSource() == resetreferencesItem)
	3109	+ if (source == relinkverticesItem)
	3110	+ {
	3111	+ boolean random = CameraPane.SWITCH;
	3112	+ CameraPane.SWITCH = false; // parse all random nodes
	3113	+ group.selection.RelinkToSupport();
	3114	+ CameraPane.SWITCH = random;
	3115	+
	3116	+ refreshContents();
	3117	+ } else
	3118	+ if (source == resetreferencesItem)
2098	3119	{
2099	3120	for (int i=0; i<group.selection.size(); i++)
2100	3121	{
..	..	@@ -2103,11 +3124,11 @@
2103	3124
2104	3125	refreshContents();
2105	3126	} else
2106		- if (event.getSource() == setMasterItem)
	3127	+ if (source == setMasterItem)
2107	3128	{
2108		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	3129	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2109	3130	{
2110		- Object3D content = GrafreeD.clipboard.get(0);
	3131	+ Object3D content = Grafreed.clipboard.get(0);
2111	3132
2112	3133	if (content instanceof cGroup && ((cGroup)content).transientlink )
2113	3134	content = ((cGroup)content).get(0);
..	..	@@ -2116,13 +3137,13 @@
2116	3137	refreshContents();
2117	3138	}
2118	3139	} else
2119		- if (event.getSource() == poseMeshItem)
	3140	+ if (source == poseMeshItem)
2120	3141	{
2121	3142	if (group.selection.size() == 1)
2122	3143	{
2123		- if (GrafreeD.clipboard.size() == 1)
	3144	+ if (Grafreed.clipboard.size() == 1)
2124	3145	{
2125		- Object3D content = GrafreeD.clipboard.get(0);
	3146	+ Object3D content = Grafreed.clipboard.get(0);
2126	3147
2127	3148	if (content instanceof cGroup && ((cGroup)content).transientlink )
2128	3149	content = ((cGroup)content).get(0);
..	..	@@ -2135,19 +3156,19 @@
2135	3156	}
2136	3157
2137	3158	} else
2138		- if (event.getSource() == revertMeshItem)
	3159	+ if (source == revertMeshItem)
2139	3160	{
2140	3161	RevertMeshes();
2141	3162	} else
2142		- if (event.getSource() == resetMeshItem)
	3163	+ if (source == resetAllItem)
2143	3164	{
2144	3165	ResetAll();
2145	3166	} else
2146		- if (event.getSource() == stepAllItem)
	3167	+ if (source == stepAllItem)
2147	3168	{
2148	3169	StepAll();
2149	3170	} else
2150		- if (event.getSource() == clearItem) // \|\| event.getSource() == clearButton)
	3171	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2151	3172	{
2152	3173	//int indices[] = jList.getSelectedIndices();
2153	3174	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2155,42 +3176,46 @@
2155	3176
2156	3177	ClearSelection(false);
2157	3178	} else
2158		- if (event.getSource() == clearAllItem)
	3179	+ if (source == clearAllItem)
2159	3180	{
2160	3181	ClearSelection(true);
2161	3182	} else
2162		- if (event.getSource() == grabItem)
	3183	+ if (source == grabItem \|\| source == groupButton)
2163	3184	{
2164		- group(new cGroup(), true);
	3185	+ group(new cGroup(), false); // true);
2165	3186	} else
2166		- if (event.getSource() == frontItem)
	3187	+ if (source == hideItem)
	3188	+ {
	3189	+ group(new HiddenObject());
	3190	+ } else
	3191	+ if (source == frontItem)
2167	3192	{
2168	3193	front();
2169	3194	} else
2170		- if (event.getSource() == backItem)
	3195	+ if (source == backItem)
2171	3196	{
2172	3197	back();
2173	3198	} else
2174		- if (event.getSource() == cameraItem)
	3199	+ if (source == cameraItem)
2175	3200	{
2176	3201	makeSomething(new Camera());
2177	3202	} else
2178		- if (event.getSource() == compositeItem)
	3203	+ if (source == compositeItem \|\| source == compositeButton)
2179	3204	{
2180	3205	group(new Composite());
2181	3206	} else
2182		- if (event.getSource() == randomItem)
	3207	+ if (source == switchItem \|\| source == switchButton)
2183	3208	{
2184	3209	RandomNode random = new RandomNode();
2185	3210	group(random);
2186	3211	if (random.size() > 0)
2187		- random.name = random.get(0).name + "Rnd";
	3212	+ random.name = random.get(0).name + "Switch";
2188	3213	} else
2189		- if (event.getSource() == physicsItem)
	3214	+ if (source == physicsItem)
2190	3215	{
2191	3216	group(new PhysicsNode());
2192	3217	} else
2193		- if (event.getSource() == frameselectorItem)
	3218	+ if (source == frameselectorItem)
2194	3219	{
2195	3220	for (int i=0; i<group.selection.size(); i++)
2196	3221	{
..	..	@@ -2202,7 +3227,7 @@
2202	3227	ResetModel();
2203	3228	refreshContents();
2204	3229	} else
2205		- if (event.getSource() == switchGeoItem)
	3230	+ if (source == switchGeoItem)
2206	3231	{
2207	3232	for (int i=0; i<group.selection.size(); i++)
2208	3233	{
..	..	@@ -2214,7 +3239,7 @@
2214	3239	ResetModel();
2215	3240	refreshContents();
2216	3241	} else
2217		- if (event.getSource() == switchTransfoItem)
	3242	+ if (source == switchTransfoItem)
2218	3243	{
2219	3244	for (int i=0; i<group.selection.size(); i++)
2220	3245	{
..	..	@@ -2226,7 +3251,7 @@
2226	3251	ResetModel();
2227	3252	refreshContents();
2228	3253	} else
2229		- if (event.getSource() == morphItem)
	3254	+ if (source == morphItem)
2230	3255	{
2231	3256	for (int i=0; i<group.selection.size(); i++)
2232	3257	{
..	..	@@ -2238,7 +3263,7 @@
2238	3263	ResetModel();
2239	3264	refreshContents();
2240	3265	} else
2241		- if (event.getSource() == scriptNodeItem)
	3266	+ if (source == scriptNodeItem)
2242	3267	{
2243	3268	boolean atleastone = false;
2244	3269
..	..	@@ -2277,195 +3302,252 @@
2277	3302	}
2278	3303	}
2279	3304	} else
2280		- if (event.getSource() == linkerItem)
	3305	+ if (source == linkerItem)
2281	3306	{
2282	3307	group(new cLinker());
2283	3308	} else
2284		- if (event.getSource() == textureItem)
	3309	+ if (source == textureItem \|\| source == textureButton)
2285	3310	{
2286	3311	group(new TextureNode());
2287	3312	} else
2288		- if (event.getSource() == shadowXItem)
	3313	+ if (source == billboardItem)
	3314	+ {
	3315	+ group(new BillboardNode());
	3316	+ } else
	3317	+ if (source == shadowXItem)
2289	3318	{
2290	3319	CastShadow(0);
2291	3320	} else
2292		- if (event.getSource() == shadowYItem)
	3321	+ if (source == shadowYItem)
2293	3322	{
2294	3323	CastShadow(1);
2295	3324	} else
2296		- if (event.getSource() == shadowZItem)
	3325	+ if (source == shadowZItem)
2297	3326	{
2298	3327	CastShadow(2);
2299	3328	} else
2300		- if (event.getSource() == ungroupItem)
	3329	+ if (source == ungroupItem \|\| source == ungroupButton)
2301	3330	{
2302		- ungroup();
	3331	+ boolean hasRoot = false;
	3332	+
	3333	+ for (int i=0; i<group.selection.size(); i++)
	3334	+ {
	3335	+ if (group.selection.get(i) == group)
	3336	+ {
	3337	+ hasRoot = true;
	3338	+ break;
	3339	+ }
	3340	+ }
	3341	+
	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	+ }
2303	3353	} else
2304		- if (event.getSource() == genUVItem)
	3354	+ if (source == genUVItem)
2305	3355	{
2306	3356	GenUV();
2307	3357	} else
2308		- if (event.getSource() == genNormalsCADItem)
	3358	+ if (source == genNormalsCADItem)
2309	3359	{
2310	3360	GenNormals(true);
2311	3361	} else
2312		- if (event.getSource() == genNormalsORGANItem)
	3362	+ if (source == genNormalsMESHItem)
	3363	+ {
	3364	+ GenNormalsMESH();
	3365	+ } else
	3366	+ if (source == genNormalsORGANItem)
2313	3367	{
2314	3368	GenNormals(false);
2315	3369	} else
2316		- if (event.getSource() == stripifyItem)
	3370	+ if (source == genNormalsMINEItem)
	3371	+ {
	3372	+ GenNormalsMINE();
	3373	+ } else
	3374	+ if (source == stripifyItem)
2317	3375	{
2318	3376	Stripify();
2319	3377	} else
2320		- if (event.getSource() == unstripifyItem)
	3378	+ if (source == unstripifyItem)
2321	3379	{
2322	3380	Unstripify();
2323	3381	} else
2324		- if (event.getSource() == trimItem)
	3382	+ if (source == trimItem)
2325	3383	{
2326	3384	Trim();
2327	3385	} else
2328		- if (event.getSource() == untrimItem)
	3386	+ if (source == untrimItem)
2329	3387	{
2330	3388	Untrim();
2331	3389	} else
2332		- if (event.getSource() == clearColorsItem)
	3390	+ if (source == clearColorsItem)
2333	3391	{
2334	3392	ClearColors();
2335	3393	} else
2336		- if (event.getSource() == clearMaterialsItem)
	3394	+ if (source == clearMaterialsItem)
2337	3395	{
2338	3396	ClearMaterials();
2339	3397	} else
2340		- if (event.getSource() == liveleavesItem)
	3398	+ if (source == liveleavesItem)
2341	3399	{
2342	3400	LiveLeaves(true);
2343	3401	} else
2344		- if (event.getSource() == unliveleavesItem)
	3402	+ if (source == unliveleavesItem)
2345	3403	{
2346	3404	LiveLeaves(false);
2347	3405	} else
2348		- if (event.getSource() == supportleavesItem)
	3406	+ if (source == supportleavesItem)
2349	3407	{
2350	3408	SupportLeaves(true);
2351	3409	} else
2352		- if (event.getSource() == unsupportleavesItem)
	3410	+ if (source == unsupportleavesItem)
2353	3411	{
2354	3412	SupportLeaves(false);
2355	3413	} else
2356		- if (event.getSource() == hideleavesItem)
	3414	+ if (source == hideleavesItem)
2357	3415	{
2358	3416	HideLeaves(true);
2359	3417	} else
2360		- if (event.getSource() == showleavesItem)
	3418	+ if (source == showleavesItem)
2361	3419	{
2362	3420	HideLeaves(false);
2363	3421	} else
2364		- if (event.getSource() == markleavesItem)
	3422	+ if (source == markleavesItem)
2365	3423	{
2366	3424	MarkLeaves(true);
2367	3425	} else
2368		- if (event.getSource() == unmarkleavesItem)
	3426	+ if (source == unmarkleavesItem)
2369	3427	{
2370	3428	MarkLeaves(false);
2371	3429	} else
2372		- 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)
2373	3447	{
2374	3448	FlipV(true);
2375	3449	} else
2376		- if (event.getSource() == unflipVItem)
	3450	+ if (source == unflipVItem)
2377	3451	{
2378	3452	FlipV(false);
2379	3453	} else
2380		- if (event.getSource() == lowTexturesItem)
	3454	+ if (source == lowTexturesItem)
2381	3455	{
2382	3456	SetTexRes(0);
2383	3457	} else
2384		- if (event.getSource() == normalTexturesItem)
	3458	+ if (source == normalTexturesItem)
2385	3459	{
2386	3460	SetTexRes(1);
2387	3461	} else
2388		- if (event.getSource() == highTexturesItem)
	3462	+ if (source == highTexturesItem)
2389	3463	{
2390	3464	SetTexRes(2);
2391	3465	} else
2392		- if (event.getSource() == veryhighTexturesItem)
	3466	+ if (source == veryhighTexturesItem)
2393	3467	{
2394	3468	SetTexRes(3);
2395	3469	} else
2396		- if (event.getSource() == maxTexturesItem)
	3470	+ if (source == maxTexturesItem)
2397	3471	{
2398	3472	SetTexRes(4);
2399	3473	} else
2400		- if (event.getSource() == panoTexturesItem)
	3474	+ if (source == panoTexturesItem)
2401	3475	{
2402	3476	SetTexRes(5);
2403	3477	} else
2404		- if (event.getSource() == reverseNormalsItem)
	3478	+ if (source == reverseNormalsItem)
2405	3479	{
2406	3480	ReverseNormals();
2407	3481	} else
2408		- if (event.getSource() == parseverticesItem)
	3482	+ if (source == parseverticesItem)
2409	3483	{
2410	3484	ParseVertices();
2411	3485	} else
2412		- if (event.getSource() == textureFieldItem)
	3486	+ if (source == textureFieldItem)
2413	3487	{
2414	3488	TextureVertices();
2415	3489	} else
2416		- if (event.getSource() == alignItem)
	3490	+ if (source == alignItem)
2417	3491	{
2418	3492	Align();
2419	3493	} else
2420		- if (event.getSource() == mirrorItem)
	3494	+ if (source == mirrorItem)
2421	3495	{
2422	3496	MirrorPoses();
2423	3497	} else
2424		- if (event.getSource() == reduceMorphItem)
	3498	+ if (source == reduceMorphItem)
2425	3499	{
2426	3500	MeshReduction(false);
2427	3501	} else
2428		- if (event.getSource() == reduce34MorphItem)
	3502	+ if (source == reduce34MorphItem)
2429	3503	{
2430	3504	MeshReduction(true);
2431	3505	} else
2432		- if (event.getSource() == reverseTrianglesItem)
	3506	+ if (source == reverseTrianglesItem)
2433	3507	{
2434	3508	ReverseTriangles();
2435	3509	} else
2436		- if (event.getSource() == reduceMeshItem)
	3510	+ if (source == reduceMeshItem)
2437	3511	{
2438	3512	ReduceMesh(false);
2439	3513	} else
2440		- if (event.getSource() == reduce34MeshItem)
	3514	+ if (source == reduce34MeshItem)
2441	3515	{
2442	3516	ReduceMesh(true);
2443	3517	} else
2444		- if (event.getSource() == increaseMeshItem)
	3518	+ if (source == increaseMeshItem)
2445	3519	{
2446	3520	IncreaseMesh();
2447	3521	} else
2448		- if (event.getSource() == clipMeshItem)
	3522	+ if (source == clipMeshItem)
2449	3523	{
2450	3524	ClipMesh();
2451	3525	} else
2452		- if (event.getSource() == smoothMeshItem)
	3526	+ if (source == smoothMeshItem)
2453	3527	{
2454	3528	SmoothMesh();
2455	3529	} else
2456		- if (event.getSource() == transformgeometryItem)
	3530	+ if (source == transformGeometryItem)
2457	3531	{
2458	3532	TransformGeometry();
2459	3533	} else
2460		- if (event.getSource() == resetTransformItem)
	3534	+ if (source == transformChildrenItem)
	3535	+ {
	3536	+ TransformChildren();
	3537	+ } else
	3538	+ if (source == resetTransformItem)
2461	3539	{
2462	3540	ResetTransform();
2463	3541	} else
2464		- if (event.getSource() == resetCentroidItem)
	3542	+ if (source == resetCentroidItem)
2465	3543	{
2466		- ResetCentroid();
	3544	+ ResetCentroid(true);
2467	3545	} else
2468		- if (event.getSource() == resetParentItem)
	3546	+ if (source == resetCentroidXZItem)
	3547	+ {
	3548	+ ResetCentroid(false);
	3549	+ } else
	3550	+ if (source == resetParentItem)
2469	3551	{
2470	3552	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2471	3553	{
..	..	@@ -2475,7 +3557,7 @@
2475	3557
2476	3558	refreshContents();
2477	3559	} else
2478		- if (event.getSource() == repairParentItem)
	3560	+ if (source == repairParentItem)
2479	3561	{
2480	3562	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2481	3563	{
..	..	@@ -2489,7 +3571,21 @@
2489	3571
2490	3572	refreshContents();
2491	3573	} else
2492		- 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)
2493	3589	{
2494	3590	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2495	3591	{
..	..	@@ -2501,7 +3597,7 @@
2501	3597	ResetModel();
2502	3598	refreshContents();
2503	3599	} else
2504		- if (event.getSource() == sortbynameItem)
	3600	+ if (source == sortbynameItem)
2505	3601	{
2506	3602	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2507	3603	{
..	..	@@ -2513,7 +3609,7 @@
2513	3609	ResetModel();
2514	3610	refreshContents();
2515	3611	} else
2516		- if (event.getSource() == attachPigmentItem)
	3612	+ if (source == attachPigmentItem)
2517	3613	{
2518	3614	String texture = GetFile("Attach pigment");
2519	3615	Object3D obj;
..	..	@@ -2525,7 +3621,7 @@
2525	3621
2526	3622	refreshContents();
2527	3623	} else
2528		- if (event.getSource() == detachPigmentItem)
	3624	+ if (source == detachPigmentItem)
2529	3625	{
2530	3626	Object3D obj;
2531	3627	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2536,7 +3632,7 @@
2536	3632
2537	3633	refreshContents();
2538	3634	} else
2539		- if (event.getSource() == attachBumpItem)
	3635	+ if (source == attachBumpItem)
2540	3636	{
2541	3637	String texture = GetFile("Attach bump");
2542	3638	Object3D obj;
..	..	@@ -2548,18 +3644,18 @@
2548	3644
2549	3645	refreshContents();
2550	3646	} else
2551		- if (event.getSource() == detachBumpItem)
	3647	+ if (source == detachBumpItem)
2552	3648	{
2553	3649	Object3D obj;
2554	3650	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2555	3651	{
2556	3652	obj = (Object3D)e.nextElement();
2557		- obj.SetBumpTexture(null);
	3653	+ obj.ResetBumpTexture();
2558	3654	}
2559	3655
2560	3656	refreshContents();
2561	3657	} else
2562		- if (event.getSource() == pigmentBumpItem)
	3658	+ if (source == pigmentBumpItem)
2563	3659	{
2564	3660	Object3D obj;
2565	3661	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2570,158 +3666,231 @@
2570	3666
2571	3667	refreshContents();
2572	3668	} else
2573		- 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)
2574	3695	{
2575	3696	CameraPane.flash = true;
2576	3697	refreshContents();
2577	3698	} else
2578		- if (event.getSource() == oneButton)
	3699	+ if (source == oneButton)
2579	3700	{
2580	3701	} else
2581		- if (event.getSource() == twoButton)
	3702	+ if (source == twoButton)
2582	3703	{
2583	3704	radio.layout = twoButton;
2584		- // bug
2585		- //gridPanel.setDividerLocation(1.0);
2586		- //bigPanel.setDividerLocation(0.0);
2587		- bigThree.remove(jtp);
2588		- bigThree.remove(cameraPanel);
2589		- bigThree.remove(XYZPanel);
2590		- aWindowConstraints.gridx = 0;
2591		- aWindowConstraints.gridy = 0;
2592		- aWindowConstraints.gridwidth = 1;
2593		- // aConstraints.gridheight = 3;
2594		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2595		- aWindowConstraints.weightx = 0;
2596		- aWindowConstraints.weighty = 1;
2597		- //bigThree.add(jtp, aWindowConstraints);
2598		- aWindowConstraints.weightx = 1;
2599		- aWindowConstraints.gridwidth = 3;
2600		- // aConstraints.gridheight = 3;
2601		- aWindowConstraints.gridx = 1;
2602		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2603		- bigThree.add(cameraPanel, aWindowConstraints);
2604		- aWindowConstraints.weightx = 0;
2605		- aWindowConstraints.gridx = 4;
2606		- aWindowConstraints.gridwidth = 1;
2607		- // aConstraints.gridheight = 3;
2608		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2609		- //bigThree.add(XYZPanel, aWindowConstraints);
2610		- 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	+
2611	3728	} else
2612		- if (event.getSource() == threeButton)
	3729	+ if (source == threeButton)
2613	3730	{
2614	3731	radio.layout = threeButton;
2615		- bigThree.remove(jtp);
2616		- bigThree.remove(cameraPanel);
2617		- bigThree.remove(XYZPanel);
2618		- aWindowConstraints.gridx = 0;
2619		- aWindowConstraints.gridy = 0;
2620		- aWindowConstraints.gridwidth = 1;
2621		- // aConstraints.gridheight = 3;
2622		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2623		- aWindowConstraints.weightx = 0;
2624		- aWindowConstraints.weighty = 1;
2625		- //bigThree.add(jtp, aWindowConstraints);
2626		- aWindowConstraints.weightx = 1;
2627		- aWindowConstraints.gridwidth = 3;
2628		- // aConstraints.gridheight = 3;
2629		- aWindowConstraints.gridx = 1;
2630		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2631		- bigThree.add(cameraPanel, aWindowConstraints);
2632		- aWindowConstraints.weightx = 0;
2633		- aWindowConstraints.gridx = 4;
2634		- aWindowConstraints.gridwidth = 1;
2635		- // aConstraints.gridheight = 3;
2636		- aConstraints.fill = GridBagConstraints.VERTICAL;
2637		- bigThree.add(XYZPanel, aWindowConstraints);
2638		- 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();
2639	3769	} else
2640		- if (event.getSource() == fourButton)
	3770	+ if (source == fourButton)
2641	3771	{
2642	3772	radio.layout = fourButton;
2643		- bigThree.remove(jtp);
2644		- bigThree.remove(cameraPanel);
2645		- bigThree.remove(XYZPanel);
2646		- aWindowConstraints.gridx = 0;
2647		- aWindowConstraints.gridy = 0;
2648		- aWindowConstraints.gridwidth = 1;
2649		- // aWindowConstraints.gridheight = 3;
2650		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2651		- aWindowConstraints.weightx = 1;
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(cameraPanel, aWindowConstraints);
2660		- aWindowConstraints.weightx = 0;
2661		- aWindowConstraints.gridx = 4;
2662		- aWindowConstraints.gridwidth = 1;
2663		- // aWindowConstraints.gridheight = 3;
2664		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2665		- //bigThree.add(XYZPanel, aWindowConstraints);
2666		- 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();
2667	3809	} else
2668		- if (event.getSource() == sixButton)
	3810	+ if (source == sixButton)
2669	3811	{
2670	3812	radio.layout = sixButton;
2671		- bigThree.remove(jtp);
2672		- bigThree.remove(cameraPanel);
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		- // aWindowConstraints.gridheight = 3;
2685		- aWindowConstraints.gridx = 1;
2686		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2687		- bigThree.add(cameraPanel, aWindowConstraints);
2688		- aWindowConstraints.weightx = 0;
2689		- aWindowConstraints.gridx = 4;
2690		- aWindowConstraints.gridwidth = 1;
2691		- // aWindowConstraints.gridheight = 3;
2692		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2693		- //bigThree.add(XYZPanel, aConstraints);
2694		- 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();
2695	3850	} else
2696		- if (event.getSource() == sevenButton)
	3851	+ if (source == sevenButton)
2697	3852	{
2698	3853	radio.layout = sevenButton;
2699		- bigThree.remove(jtp);
2700		- bigThree.remove(cameraPanel);
2701		- bigThree.remove(XYZPanel);
2702		- aWindowConstraints.gridx = 0;
2703		- aWindowConstraints.gridy = 0;
2704		- aWindowConstraints.gridwidth = 1;
2705		- // aWindowConstraints.gridheight = 3;
2706		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2707		- aWindowConstraints.weightx = 0;
2708		- aWindowConstraints.weighty = 1;
2709		- bigThree.add(jtp, aWindowConstraints);
2710		- aWindowConstraints.weightx = 1;
2711		- aWindowConstraints.gridwidth = 3;
2712		- // aWindowConstraints.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		- // aConstraints.gridheight = 3;
2720		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2721		- bigThree.add(XYZPanel, aWindowConstraints);
2722		- 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();
2723	3892	} else
2724		- if (event.getSource() == rootButton)
	3893	+ if (source == rootButton)
2725	3894	{
2726	3895	Object3D obj;
2727	3896	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2731,66 +3900,85 @@
2731	3900	EditObject(obj);
2732	3901	}
2733	3902
	3903	+ cameraView.requestFocusInWindow();
2734	3904	refreshContents(true);
2735	3905	} else
2736		- if (event.getSource() == closeButton)
	3906	+ if (source == closeButton)
2737	3907	{
2738	3908	//System.out.println("CLOSE: " + buttonGroup.getSelection());
2739	3909	cRadio ab;
2740	3910	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2741	3911	{
2742	3912	ab = (cRadio)e.nextElement();
2743		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3913	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2744	3914	{
	3915	+ // Patch to avoid bug with transparency.
	3916	+ if (!ab.hadMaterial)
	3917	+ {
	3918	+ ab.object.material = null;
	3919	+ }
	3920	+
2745	3921	buttonGroup.remove(ab);
2746	3922	radioPanel.remove(ab);
2747	3923
2748		- ab.GetObject().editWindow = null;
	3924	+ //ab.GetObject().editWindow = null;
	3925	+ ab.GetObject().manipWindow = null;
2749	3926	// ab.GetObject().objectUI = null; // ?????????
2750	3927
2751	3928	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2752	3929	break;
2753	3930	}
2754	3931	}
	3932	+
	3933	+ cameraView.requestFocusInWindow();
2755	3934	refreshContents(true);
2756	3935	} else
2757		- if (event.getSource() == editItem \|\| event.getSource() == editButton)
	3936	+ if (source == editItem \|\| source == editButton)
2758	3937	{
	3938	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3939	+ {
	3940	+ Object3D child = (Object3D)e.nextElement();
	3941	+ child.pinned = true;
	3942	+ }
	3943	+
2759	3944	EditSelection(false);
2760	3945	} else
2761		- if (event.getSource() == uneditButton)
	3946	+ if (source == uneditButton)
2762	3947	{
2763	3948	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2764	3949	{
2765	3950	Object3D child = (Object3D)e.nextElement();
2766	3951	if(child.editWindow != null)
2767		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3952	+ child.pinned = false;
2768	3953	child.CloseUI();
2769	3954	listUI.remove(child);
	3955	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2770	3956
2771		- child.editWindow = null; // ???????????
	3957	+ //child.editWindow = null; // ???????????
2772	3958	}
2773		- objEditor.ctrlPanel.revalidate();
	3959	+ objEditor.ctrlPanel.FlushUI();
2774	3960	//objEditor.jTree.clearSelection();
2775	3961	//objEditor.ResetSliders();
2776	3962	refreshContents(true);
2777	3963	} else
2778		- if (event.getSource() == clearPanelButton)
	3964	+ if (source == clearPanelButton)
2779	3965	{
2780	3966	assert(copy == group);
2781	3967	//copy.ClearUI();
2782	3968	for (Object3D obj : listUI)
2783	3969	{
	3970	+ obj.pinned = false;
2784	3971	obj.CloseUI();
2785	3972	}
2786	3973	listUI.clear();
	3974	+ SetPinStates(group.selection.size() > 0);
2787	3975	refreshContents(true);
2788	3976	} else
2789		- if (event.getSource() == allParamsButton)
	3977	+ if (source == allParamsButton)
2790	3978	{
2791	3979	assert(copy == group);
2792	3980
2793		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3981	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2794	3982
2795	3983	for (Object3D obj : listUI)
2796	3984	{
..	..	@@ -2807,19 +3995,19 @@
2807	3995
2808	3996	refreshContents(true);
2809	3997	} else
2810		- if (event.getSource() == unselectButton)
	3998	+ if (source == unselectButton)
2811	3999	{
2812	4000	objEditor.jTree.clearSelection();
2813	4001	// ?? oct 2012 GrafreeD.clipboard.clear();
2814	4002	objEditor.ResetSliders();
2815	4003	refreshContents(true);
2816	4004	} else
2817		- if(event.getSource() instanceof cRadio)
	4005	+ if(source instanceof cRadio)
2818	4006	{
2819	4007	group.parent = keepparent;
2820	4008	group.attributes = 0;
2821	4009	//group.editWindow = null;
2822		- /cRadio/ radio = (cRadio)event.getSource();
	4010	+ /cRadio/ radio = (cRadio)source;
2823	4011	Object3D obj = radio.GetObject();
2824	4012	System.out.println("Edit " + obj);
2825	4013	if (true) // obj instanceof Composite) // obj.parent == null) // obj instanceof Composite)
..	..	@@ -2839,7 +4027,10 @@
2839	4027	}
2840	4028
2841	4029	copy = group;
2842		- //CameraPane.theRenderer.object = group;
	4030	+
	4031	+ SetUndoStates();
	4032	+
	4033	+ //Globals.theRenderer.object = group;
2843	4034	if(!useclient)
2844	4035	{
2845	4036	cameraView.renderCamera = radio.camera;
..	..	@@ -2848,25 +4039,55 @@
2848	4039	cameraView.cameras[cameraView.cameracount] = radio.camera;
2849	4040	cameraView.targetLookAt.set(radio.camera.lookAt);
2850	4041	cameraView.object = group;
2851		- cameraView.lighttouched = true;
	4042	+ //cameraView.lighttouched = true;
	4043	+ Globals.lighttouched = true;
2852	4044	topView.object = group;
2853	4045	frontView.object = group;
2854	4046	sideView.object = group;
2855	4047	}
2856		- group.editWindow = this;
	4048	+
	4049	+// fix "+" issue
	4050	+ //group.editWindow = this;
	4051	+ group.manipWindow = this;
	4052	+
2857	4053	/*
2858	4054	currentLayout = radio.layout;
2859	4055	if (currentLayout == null)
2860	4056	currentLayout = sevenButton;
2861	4057	*/
2862	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);
2863	4067	keepparent = group.parent;
2864	4068	// PARENT = NULL or not???
2865	4069	//group.parent = null; // ROOT
2866	4070	//group.attributes = -1;
2867	4071	ResetModel();
	4072	+
	4073	+ cameraView.requestFocusInWindow();
2868	4074	refreshContents(true);
2869		- }
	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	+ }
2870	4091	else
2871	4092	{
2872	4093	//return super.action(event, arg);
..	..	@@ -2875,7 +4096,6 @@
2875	4096	}
2876	4097
2877	4098	boolean useclient = false;
2878		- cRadio radio;
2879	4099
2880	4100	void ToggleRoot()
2881	4101	{
..	..	@@ -2884,7 +4104,7 @@
2884	4104	if (useclient)
2885	4105	{
2886	4106	cameraView.object = client;
2887		- cameraView.lighttouched = true;
	4107	+ Globals.lighttouched = true;
2888	4108	//topView.object = client;
2889	4109	//frontView.object = client;
2890	4110	//sideView.object = client;
..	..	@@ -2892,7 +4112,7 @@
2892	4112	else
2893	4113	{
2894	4114	cameraView.object = group;
2895		- cameraView.lighttouched = true;
	4115	+ Globals.lighttouched = true;
2896	4116	//topView.object = group;
2897	4117	//frontView.object = group;
2898	4118	//sideView.object = group;
..	..	@@ -2927,6 +4147,28 @@
2927	4147	refreshContents();
2928	4148	}
2929	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	+ }
2930	4172
2931	4173	void ResetTransform()
2932	4174	{
..	..	@@ -3039,7 +4281,7 @@
3039	4281	refreshContents();
3040	4282	}
3041	4283
3042		- void ResetCentroid()
	4284	+ void ResetCentroid(boolean full)
3043	4285	{
3044	4286	Object3D obj;
3045	4287	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3054,12 +4296,16 @@
3054	4296	LA.matIdentity(Object3D.mat);
3055	4297	obj.getBounds(minima, maxima, false);
3056	4298	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3057		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	4299	+ if (full)
	4300	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3058	4301	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3059	4302	obj.TransformMesh(Object3D.mat);
	4303	+
3060	4304	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3061		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	4305	+ if (full)
	4306	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3062	4307	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	4308	+
3063	4309	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3064	4310	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3065	4311	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3088,7 +4334,8 @@
3088	4334
3089	4335	int size = obj.MemorySize();
3090	4336
3091		- 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)");
3092	4339	}
3093	4340	}
3094	4341	catch (Exception e)
..	..	@@ -3125,9 +4372,9 @@
3125	4372	obj = (Object3D)e.nextElement();
3126	4373
3127	4374	System.out.println("Object is: " + obj);
3128		- GrafreeD.AnalyzeObject(obj);
	4375	+ Grafreed.AnalyzeObject(obj);
3129	4376	System.out.println("Boundary rep: " + obj.bRep);
3130		- GrafreeD.AnalyzeObject(obj.bRep);
	4377	+ Grafreed.AnalyzeObject(obj.bRep);
3131	4378
3132	4379	// System.err.println((size/1024) + " KB is the size of " + obj);
3133	4380	}
..	..	@@ -3169,6 +4416,20 @@
3169	4416	void GenNormals(boolean crease)
3170	4417	{
3171	4418	group.GenNormalsS(crease);
	4419	+
	4420	+ refreshContents();
	4421	+ }
	4422	+
	4423	+ void GenNormalsMESH()
	4424	+ {
	4425	+ group.GenNormalsMeshS();
	4426	+
	4427	+ refreshContents();
	4428	+ }
	4429	+
	4430	+ void GenNormalsMINE()
	4431	+ {
	4432	+ group.selection.GenNormalsMINE();
3172	4433
3173	4434	refreshContents();
3174	4435	}
..	..	@@ -3334,8 +4595,8 @@
3334	4595
3335	4596	void ParseVertices()
3336	4597	{
3337		- boolean epsequal = GrafreeD.epsequal;
3338		- GrafreeD.epsequal = true;
	4598	+ boolean epsequal = Grafreed.epsequal;
	4599	+ Grafreed.epsequal = true;
3339	4600
3340	4601	for (int i=0; i<group.selection.size(); i++)
3341	4602	{
..	..	@@ -3360,7 +4621,7 @@
3360	4621	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3361	4622	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3362	4623
3363		- g.add(GrafreeD.clipboard);
	4624	+ g.add(Grafreed.clipboard);
3364	4625
3365	4626	buffer.add(g);
3366	4627	}
..	..	@@ -3375,7 +4636,7 @@
3375	4636	makeSomething(buffer, i==group.selection.size()-1);
3376	4637	}
3377	4638
3378		- GrafreeD.epsequal = epsequal;
	4639	+ Grafreed.epsequal = epsequal;
3379	4640
3380	4641	refreshContents();
3381	4642	}
..	..	@@ -3393,7 +4654,16 @@
3393	4654	String pigment = Object3D.GetPigment(tex);
3394	4655	//String bump = Object3D.GetBump(tex);
3395	4656
3396		- 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	+ }
3397	4667
3398	4668	double s = v.s;
3399	4669
..	..	@@ -3441,12 +4711,26 @@
3441	4711
3442	4712	void Align()
3443	4713	{
	4714	+ if (group.selection.size() == 0)
	4715	+ return;
	4716	+
	4717	+ cVector bbmin = new cVector();
	4718	+ cVector bbmax = new cVector();
	4719	+
	4720	+ group.selection.get(0).getBounds(bbmin, bbmax, true);
	4721	+
	4722	+ double dx = bbmax.x - bbmin.x;
	4723	+ double dy = bbmax.y - bbmin.y;
	4724	+ double dz = bbmax.z - bbmin.z;
	4725	+
	4726	+ double scale = Math.sqrt(dxdx + dydy + dz*dz);
	4727	+
3444	4728	for (int i=0; i<group.selection.size(); i++)
3445	4729	{
3446	4730	Object3D obj = group.selection.get(i);
3447	4731
3448		- LA.matTranslate(obj.toParent, i/2f, 0, 0);
3449		- LA.matTranslateInv(obj.fromParent, -i/2f, 0, 0);
	4732	+ LA.matTranslate(obj.toParent, i * scale, 0, 0);
	4733	+ LA.matTranslateInv(obj.fromParent, -i * scale, 0, 0);
3450	4734	}
3451	4735
3452	4736	refreshContents();
..	..	@@ -3467,11 +4751,11 @@
3467	4751
3468	4752	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3469	4753
3470		- boolean random = CameraPane.RANDOM;
3471		- CameraPane.RANDOM = false; // parse all random nodes
	4754	+ boolean random = CameraPane.SWITCH;
	4755	+ CameraPane.SWITCH = false; // parse all random nodes
3472	4756	lowres.linkVerticesThis(null);
3473	4757	lowres.linkVerticesThis(sn);
3474		- CameraPane.RANDOM = random;
	4758	+ CameraPane.SWITCH = random;
3475	4759
3476	4760	System.err.flush();
3477	4761
..	..	@@ -3511,7 +4795,7 @@
3511	4795	return;
3512	4796
3513	4797	Object3D poses = group.selection.get(0);
3514		- Object3D ref = GrafreeD.clipboard.get(0);
	4798	+ Object3D ref = Grafreed.clipboard.get(0);
3515	4799
3516	4800	Object3D newgroup = new Object3D("Po:" + poses.name);
3517	4801
..	..	@@ -3680,7 +4964,7 @@
3680	4964	group.selection.RelinkToSupport(); // july 2014
3681	4965	System.out.println("DONE.");
3682	4966	refreshContents();
3683		- 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));
3684	4968	}
3685	4969
3686	4970	void ReduceMesh(boolean reduction34)
..	..	@@ -3705,9 +4989,9 @@
3705	4989
3706	4990	void ClipMesh()
3707	4991	{
3708		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	4992	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3709	4993	{
3710		- Object3D content = GrafreeD.clipboard.get(0);
	4994	+ Object3D content = Grafreed.clipboard.get(0);
3711	4995
3712	4996	if (content instanceof cGroup && ((cGroup)content).transientlink )
3713	4997	content = ((cGroup)content).get(0);
..	..	@@ -3716,7 +5000,7 @@
3716	5000	// {
3717	5001	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3718	5002	// }
3719		- group.selection.ClipMesh(GrafreeD.clipboard);
	5003	+ group.selection.ClipMesh(Grafreed.clipboard);
3720	5004	}
3721	5005	// group.selection.ClipMesh(GrafreeD.clipboard);
3722	5006	System.out.println("DONE.");
..	..	@@ -3763,6 +5047,18 @@
3763	5047	void MarkLeaves(boolean hide)
3764	5048	{
3765	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);
3766	5062	refreshContents();
3767	5063	}
3768	5064
..	..	@@ -3837,28 +5133,25 @@
3837	5133	// }
3838	5134	// }
3839	5135
3840		- static boolean allparams = true;
3841		-
3842		- static Vector<Object3D> listUI = new Vector<Object3D>();
3843		-
3844	5136	void EditSelection(boolean newWindow)
3845	5137	{
	5138	+ if (group.selection == null)
	5139	+ {
	5140	+ EditElement(group, newWindow); // ? new
	5141	+ return;
	5142	+ }
	5143	+
3846	5144	// aConstraints.gridy = 0;
3847	5145	for (int i=0; i<group.selection.size(); i++)
3848	5146	{
3849	5147	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
3850	5148	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
3851		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	5149	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3852	5150
3853	5151	Object3D elem = (Object3D)group.selection.elementAt(i);
3854		- if(elem != group)
	5152	+ if(elem != group \|\| !newWindow)
3855	5153	{
3856		- // if (!(elem instanceof Composite))
3857		- // newWindow = false;
3858		- listUI.add(elem);
3859		- elem.openEditWindow(this, newWindow); //, false);
3860		- System.out.println("edit : " + elem);
3861		- elem.editWindow.refreshContents(true); // ? new
	5154	+ EditElement(elem, newWindow); // ? new
3862	5155	}
3863	5156	}
3864	5157	}
..	..	@@ -3921,9 +5214,7 @@
3921	5214
3922	5215	freezemodel = false;
3923	5216	}
3924		-
3925		- boolean flashIt = true;
3926		-
	5217	+
3927	5218	public void valueChanged(TreeSelectionEvent e)
3928	5219	//public boolean handleEvent(Event event)
3929	5220	{
..	..	@@ -3933,7 +5224,8 @@
3933	5224	//new Exception().printStackTrace();
3934	5225
3935	5226	freezemodel = true;
3936		-
	5227	+ ClearUnpinned();
	5228	+
3937	5229	/**/
3938	5230	//switch (event.id)
3939	5231	{
..	..	@@ -3941,7 +5233,6 @@
3941	5233	//case 702: // Event.LIST_DESELECT
3942	5234	group.deselectAll();
3943	5235	TreePath tps[] = objEditor.jTree.getSelectionPaths();
3944		- objEditor.ClearInfo(); // .GetMaterial());
3945	5236	if (tps != null)
3946	5237	{
3947	5238	for (int i=0; i < tps.length; i++)
..	..	@@ -3950,33 +5241,39 @@
3950	5241
3951	5242	//if (child.parent != null)
3952	5243	//child.parent.addSelectee(child);
	5244	+ objEditor.SetMaterial(child);
3953	5245	group.addSelectee(child);
3954		- objEditor.SetMaterial(child); // .GetMaterial());
3955		- objEditor.AddInfo(child, this, true); // .GetMaterial());
3956		- System.err.println("info : " + child.GetPath());
3957	5246	}
3958	5247	}
3959		- else
3960		- {
3961		- objEditor.SetMaterial(group); // .GetMaterial());
3962		- objEditor.AddInfo(group, this, true); // .GetMaterial());
3963		- System.err.println("info : " + group.GetPath());
3964		- }
	5248	+// else
	5249	+// {
	5250	+// objEditor.SetMaterial(group); // .GetMaterial());
	5251	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	5252	+// System.err.println("info : " + group.GetPath());
	5253	+// }
3965	5254
3966		- objEditor.SetText(); // jan 2014
3967		-
3968		- 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))
3969	5256	CameraPane.flash = true;
3970	5257
3971		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	5258	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
3972	5259	// a camera
3973	5260	{
3974		- CameraPane.camerachangeframe = 0; // don't refuse it
3975		- CameraPane.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
3976		- // CameraPane.theRenderer.renderCamera = CameraPane.theRenderer.manipCamera;
3977		- // 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;
3978	5268	}
3979	5269
	5270	+ if (tps != null && tps.length == 1)
	5271	+ {
	5272	+ EditSelection(false);
	5273	+ }
	5274	+
	5275	+ SetPinStates(tps != null && tps.length > 0);
	5276	+
3980	5277	refreshContents();
3981	5278	//return true;
3982	5279	}
..	..	@@ -3985,6 +5282,37 @@
3985	5282
3986	5283	freezemodel = false;
3987	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	+ }
3988	5316
3989	5317	void linkSomething(Object3D thing)
3990	5318	{
..	..	@@ -4056,16 +5384,19 @@
4056	5384	{
4057	5385	if (group.selection.isEmpty())
4058	5386	return;
4059		- GrafreeD.clipboardIsTempGroup = false;
	5387	+
	5388	+ Grafreed.clipboardIsTempGroup = false;
4060	5389	Composite tGroup = null;
4061	5390	if (group.selection.size() > 0) // 1)
4062	5391	{
4063	5392	tGroup = new cGroup();
4064		- GrafreeD.clipboardIsTempGroup = true;
	5393	+ Grafreed.clipboardIsTempGroup = true;
4065	5394	}
4066	5395
4067	5396	if (cut)
4068	5397	{
	5398	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5399	+// Save();
4069	5400	//int indices[] = jList.getSelectedIndices();
4070	5401	//for (int i = indices.length - 1; i >= 0; i--)
4071	5402	//jList.remove(indices[i]);
..	..	@@ -4101,16 +5432,16 @@
4101	5432	//System.out.println("cut " + child);
4102	5433	//System.out.println("parent = " + child.parent);
4103	5434	// tmp.addChild(child);
4104		- if (GrafreeD.clipboardIsTempGroup)
	5435	+ if (Grafreed.clipboardIsTempGroup)
4105	5436	tGroup.add/Child/(tmp);
4106	5437	else
4107		- GrafreeD.clipboard = tmp;
	5438	+ Grafreed.clipboard = tmp;
4108	5439	}
4109	5440	else
4110		- if (GrafreeD.clipboardIsTempGroup)
	5441	+ if (Grafreed.clipboardIsTempGroup)
4111	5442	tGroup.add/Child/(child);
4112	5443	else
4113		- GrafreeD.clipboard = child;
	5444	+ Grafreed.clipboard = child;
4114	5445	}
4115	5446
4116	5447	//ResetModel();
..	..	@@ -4142,21 +5473,23 @@
4142	5473	//System.out.println("cut " + elem);
4143	5474	//System.out.println("parent = " + elem.parent);
4144	5475	// tmp.addChild(elem);
4145		- if (GrafreeD.clipboardIsTempGroup)
	5476	+ if (Grafreed.clipboardIsTempGroup)
4146	5477	tGroup.add/Child/(tmp);
4147	5478	else
4148		- GrafreeD.clipboard = tmp;
	5479	+ Grafreed.clipboard = tmp;
4149	5480	}
4150	5481	else
4151		- if (GrafreeD.clipboardIsTempGroup)
	5482	+ if (Grafreed.clipboardIsTempGroup)
4152	5483	tGroup.add/Child/(child);
4153	5484	else
4154		- GrafreeD.clipboard = child;
	5485	+ Grafreed.clipboard = child;
4155	5486	}
4156	5487
4157	5488	}
4158		- if (GrafreeD.clipboardIsTempGroup)
4159		- GrafreeD.clipboard = tGroup;
	5489	+
	5490	+ if (Grafreed.clipboardIsTempGroup)
	5491	+ Grafreed.clipboard = tGroup;
	5492	+
4160	5493	if (cut)
4161	5494	{
4162	5495	ResetModel();
..	..	@@ -4166,11 +5499,15 @@
4166	5499
4167	5500	void paste(boolean expand)
4168	5501	{
	5502	+ if (Globals.REPLACEONMAKE)
	5503	+ Save();
	5504	+ boolean keep = Globals.REPLACEONMAKE;
	5505	+ Globals.REPLACEONMAKE = false;
4169	5506	// if (GrafreeD.clipboard == null)
4170	5507	// return;
4171	5508	boolean first = true;
4172	5509
4173		- if (GrafreeD.clipboardIsTempGroup)
	5510	+ if (Grafreed.clipboardIsTempGroup)
4174	5511	{
4175	5512	Composite temp;
4176	5513
..	..	@@ -4181,7 +5518,7 @@
4181	5518	temp = (Composite)Applet3D.clipboard.deepCopy();
4182	5519	*/
4183	5520	Object3D elem;
4184		- 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))
4185	5522	{
4186	5523	Object3D child = (Object3D)e.nextElement();
4187	5524
..	..	@@ -4215,21 +5552,22 @@
4215	5552	//Object3D cb = Applet3D.clipboard;
4216	5553	//temp.addChild(cb);
4217	5554	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4218		- assert(GrafreeD.clipboard.parent == null);
4219		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
4220		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4221		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4222		- 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());
4223	5560	else
4224		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4225		- GrafreeD.clipboard.get(0).parent = keepparent;
	5561	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	5562	+ Grafreed.clipboard.get(0).parent = keepparent;
4226	5563	}
4227	5564
	5565	+ Globals.REPLACEONMAKE = keep;
4228	5566	ResetModel();
4229	5567	refreshContents();
4230	5568	}
4231	5569
4232		- void pasteInto(boolean copyit)
	5570	+ void pasteInto(boolean copyit, boolean clone)
4233	5571	{
4234	5572	// if (GrafreeD.clipboard == null)
4235	5573	// return;
..	..	@@ -4258,15 +5596,22 @@
4258	5596	if (copyit)
4259	5597	{
4260	5598	// paste(false);
4261		- CloneClipboard(false); // sept 2014
	5599	+ if (clone)
	5600	+ {
	5601	+ CloneClipboard(false); // sept 2014
	5602	+ }
	5603	+ else
	5604	+ {
	5605	+ paste(false);
	5606	+ }
4262	5607	}
4263	5608	else
4264	5609	{
4265	5610	boolean first = true;
4266	5611
4267		- if (GrafreeD.clipboardIsTempGroup)
	5612	+ if (Grafreed.clipboardIsTempGroup)
4268	5613	{
4269		- Composite temp = (Composite)GrafreeD.clipboard;
	5614	+ Composite temp = (Composite)Grafreed.clipboard;
4270	5615	Object3D copy;
4271	5616	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4272	5617	{
..	..	@@ -4276,7 +5621,7 @@
4276	5621	}
4277	5622	} else
4278	5623	{
4279		- linkSomething(GrafreeD.clipboard); //.get(0));
	5624	+ linkSomething(Grafreed.clipboard); //.get(0));
4280	5625	}
4281	5626	}
4282	5627	}
..	..	@@ -4353,6 +5698,10 @@
4353	5698
4354	5699	void group(Object3D csg, boolean grab)
4355	5700	{
	5701	+ if (Globals.REPLACEONMAKE)
	5702	+ Save();
	5703	+ boolean keep = Globals.REPLACEONMAKE;
	5704	+ Globals.REPLACEONMAKE = false;
4356	5705	if (//false) // why??
4357	5706	!group.selection.isEmpty())
4358	5707	{
..	..	@@ -4466,8 +5815,34 @@
4466	5815	//node.add(csg);
4467	5816	//makeSomething(node);
4468	5817	makeSomething(csg);
	5818	+ Globals.REPLACEONMAKE = keep;
4469	5819	}
4470	5820
	5821	+ void Ungroup(Object3D g)
	5822	+ {
	5823	+ if (Globals.REPLACEONMAKE)
	5824	+ Save();
	5825	+ boolean keep = Globals.REPLACEONMAKE;
	5826	+ Globals.REPLACEONMAKE = false;
	5827	+ if (g instanceof HiddenObject)
	5828	+ {
	5829	+ HiddenObject h = (HiddenObject) g;
	5830	+
	5831	+ for (int i=0; i<h.ActualSize(); i++)
	5832	+ {
	5833	+ objEditor.makeSomething(h.get(i), false);
	5834	+ }
	5835	+ }
	5836	+ else
	5837	+ {
	5838	+ for (int i=0; i<g.Size(); i++)
	5839	+ {
	5840	+ objEditor.makeSomething(g.get(i), false);
	5841	+ }
	5842	+ }
	5843	+ Globals.REPLACEONMAKE = keep;
	5844	+ }
	5845	+
4471	5846	void ungroup()
4472	5847	{
4473	5848	/*
..	..	@@ -4661,21 +6036,6 @@
4661	6036	}
4662	6037	*/
4663	6038
4664		- void ImportGFD()
4665		- {
4666		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4667		- browser.show();
4668		- String filename = browser.getFile();
4669		- if (filename != null && filename.length() > 0)
4670		- {
4671		- String fullname = browser.getDirectory() + filename;
4672		-
4673		- //Object3D readobj =
4674		- objEditor.ReadGFD(fullname, objEditor);
4675		- //makeSomething(readobj);
4676		- }
4677		- }
4678		-
4679	6039	/*
4680	6040	public void Callback(Object obj)
4681	6041	{
..	..	@@ -4699,26 +6059,9 @@
4699	6059	}
4700	6060	*/
4701	6061
4702		- void ImportVRMLX3D()
4703		- {
4704		- if (GrafreeD.standAlone)
4705		- {
4706		- /**/
4707		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4708		- browser.show();
4709		- String filename = browser.getFile();
4710		- if (filename != null && filename.length() > 0)
4711		- {
4712		- String fullname = browser.getDirectory() + filename;
4713		- LoadVRMLX3D(fullname);
4714		- }
4715		- /**/
4716		- }
4717		- }
4718		-
4719	6062	String GetFile(String dialogName)
4720	6063	{
4721		- if (GrafreeD.standAlone)
	6064	+ if (Grafreed.standAlone)
4722	6065	{
4723	6066	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4724	6067	browser.show();
..	..	@@ -4782,10 +6125,48 @@
4782	6125	cButton flashSelectionButton;
4783	6126	cButton editButton;
4784	6127	cButton uneditButton;
	6128	+ JCheckBox allParamsButton;
4785	6129	cButton clearpanelButton;
4786		- cButton allParamsButton;
4787	6130	cButton unselectButton;
4788	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	+
4789	6170	cButton screenfitButton;
4790	6171	cButton screenfitpointButton;
4791	6172	cButton snapobjectButton;
..	..	@@ -4797,14 +6178,6 @@
4797	6178
4798	6179	cButton setsupportButton;
4799	6180
4800		- cButton twoButton;
4801		- cButton sixButton;
4802		- cButton threeButton;
4803		- cButton sevenButton;
4804		- cButton fourButton; // full panel
4805		- cButton oneButton; // full XYZ
4806		- //cButton currentLayout;
4807		-
4808	6181	//
4809	6182	//Composite
4810	6183	Object3D // to do !!
..	..	@@ -4814,9 +6187,11 @@
4814	6187	//JTree jTree;
4815	6188	private MenuItem lookAtItem;
4816	6189	private MenuItem lookFromItem;
4817		- private MenuItem switchItem;
	6190	+ private MenuItem switchViewItem;
4818	6191	private MenuItem cutItem;
4819		- private MenuItem duplicateItem;
	6192	+ private MenuItem undoItem;
	6193	+ private MenuItem redoItem;
	6194	+ private JMenuItem duplicateItem;
4820	6195	private MenuItem cloneItem;
4821	6196	private MenuItem cloneSupportItem;
4822	6197	private MenuItem overwriteGeoItem;
..	..	@@ -4827,8 +6202,9 @@
4827	6202	private MenuItem resetsupportItem;
4828	6203	private MenuItem resetreferencesItem;
4829	6204	private MenuItem linkverticesItem;
	6205	+ private MenuItem relinkverticesItem;
4830	6206	private MenuItem setMasterItem;
4831		- private MenuItem resetMeshItem;
	6207	+ private MenuItem resetAllItem;
4832	6208	private MenuItem stepAllItem;
4833	6209	private MenuItem revertMeshItem;
4834	6210	private MenuItem poseMeshItem;
..	..	@@ -4839,14 +6215,17 @@
4839	6215	private MenuItem mergeGeometriesItem;
4840	6216	private MenuItem copyItem;
4841	6217	private MenuItem pasteItem;
	6218	+ private MenuItem pasteIntoItem;
4842	6219	private MenuItem pasteLinkItem;
4843	6220	private MenuItem pasteCloneItem;
4844	6221	private MenuItem pasteExpandItem;
4845		- private MenuItem clearItem;
	6222	+ private MenuItem deleteItem;
4846	6223	private MenuItem clearAllItem;
4847	6224	private MenuItem genUVItem;
	6225	+ private MenuItem genNormalsMESHItem;
4848	6226	private MenuItem genNormalsCADItem;
4849	6227	private MenuItem genNormalsORGANItem;
	6228	+ private MenuItem genNormalsMINEItem;
4850	6229	private MenuItem stripifyItem;
4851	6230	private MenuItem unstripifyItem;
4852	6231	private MenuItem trimItem;
..	..	@@ -4875,6 +6254,10 @@
4875	6254	private MenuItem showleavesItem;
4876	6255	private MenuItem markleavesItem;
4877	6256	private MenuItem unmarkleavesItem;
	6257	+ private MenuItem rewindleavesItem;
	6258	+ private MenuItem unrewindleavesItem;
	6259	+ private MenuItem randomleavesItem;
	6260	+ private MenuItem unrandomleavesItem;
4878	6261
4879	6262	private MenuItem flipVItem;
4880	6263	private MenuItem unflipVItem;
..	..	@@ -4886,14 +6269,17 @@
4886	6269	private MenuItem panoTexturesItem;
4887	6270
4888	6271	private MenuItem resetCentroidItem;
4889		- private MenuItem transformgeometryItem;
	6272	+ private MenuItem resetCentroidXZItem;
4890	6273	private MenuItem resetTransformItem;
	6274	+ private MenuItem transformGeometryItem;
	6275	+ private MenuItem transformChildrenItem;
	6276	+ private MenuItem hideItem;
4891	6277	private MenuItem grabItem;
4892	6278	private MenuItem backItem;
4893	6279	private MenuItem frontItem;
4894	6280	private MenuItem cameraItem;
4895	6281	private MenuItem compositeItem;
4896		- private MenuItem randomItem;
	6282	+ private MenuItem switchItem;
4897	6283	private MenuItem physicsItem;
4898	6284	private MenuItem frameselectorItem;
4899	6285	private MenuItem scriptNodeItem;
..	..	@@ -4908,6 +6294,7 @@
4908	6294
4909	6295	private MenuItem resetParentItem;
4910	6296	private MenuItem repairParentItem;
	6297	+ private MenuItem repairShadowItem;
4911	6298	private MenuItem sortbysizeItem;
4912	6299	private MenuItem sortbynameItem;
4913	6300
..	..	@@ -4916,6 +6303,8 @@
4916	6303	private MenuItem attachBumpItem;
4917	6304	private MenuItem detachBumpItem;
4918	6305	private MenuItem pigmentBumpItem;
	6306	+ private MenuItem embedTexturesItem;
	6307	+ private MenuItem deEmbedTexturesItem;
4919	6308
4920	6309	private MenuItem particleItem;
4921	6310	private MenuItem ragdollItem;
..	..	@@ -4928,10 +6317,11 @@
4928	6317	private MenuItem coneItem;
4929	6318	private MenuItem torusItem;
4930	6319	private MenuItem superItem;
	6320	+ private MenuItem kleinItem;
4931	6321	private MenuItem blobItem;
4932	6322	private MenuItem latheItem;
4933	6323	private MenuItem bezierItem;
4934		- private MenuItem checkerItem;
	6324	+ private MenuItem overlayItem;
4935	6325	private MenuItem meshItem;
4936	6326	// private MenuItem meshGroupItem;
4937	6327	private MenuItem springItem;
..	..	@@ -4940,6 +6330,7 @@
4940	6330	private MenuItem csgItem;
4941	6331	private MenuItem templateItem;
4942	6332	private MenuItem textureItem;
	6333	+ private MenuItem billboardItem;
4943	6334	private MenuItem shadowXItem;
4944	6335	private MenuItem shadowYItem;
4945	6336	private MenuItem shadowZItem;
..	..	@@ -4952,11 +6343,6 @@
4952	6343	private MenuItem doubleItem;
4953	6344	private MenuItem tripleItem;
4954	6345
4955		- private MenuItem importGFDItem;
4956		- private MenuItem importVRMLX3DItem;
4957		- private MenuItem import3DSItem;
4958		- private MenuItem importOBJItem;
4959		-
4960	6346	private MenuItem computeAOItem;
4961	6347	private MenuItem recompileItem;
4962	6348	private MenuItem editScriptItem;
..	..	@@ -4966,4 +6352,8 @@
4966	6352	private MenuItem analyzeItem;
4967	6353	private MenuItem dumpItem;
4968	6354	//boolean freezemodel = false;
	6355	+
	6356	+ Menu cameraMenu;
	6357	+ MenuItem editCameraItem;
	6358	+ MenuItem restoreCameraItem;
4969	6359	}