~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,14 @@
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	+ Save(true);
	415	+ }
	416	+
62	417	if(ui)
63	418	SetupUI(objEditor);
64	419	}
..	..	@@ -73,16 +428,28 @@
73	428	this.copy = this.group = copy;
74	429	//selectees = this.group.selectees;
75	430
76		- SetupMenu2(objEditor);
	431	+ SetupMenu2(this); //objEditor);
77	432	SetupUI2(objEditor);
78	433	objEditor.SetupUI(true);
79	434	SetupViews(objEditor);
80	435
81	436	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
	437	+
	438	+ if (copy.versionlist == null)
	439	+ {
	440	+ copy.versionlist = new Object3D[100];
	441	+ copy.versionindex = -1;
	442	+
	443	+ Save(true);
	444	+ }
82	445	}
83	446
84	447	void CloneSelection(boolean supports)
85	448	{
	449	+ if (Globals.REPLACEONMAKE)
	450	+ Save();
	451	+ boolean keep = Globals.REPLACEONMAKE;
	452	+ Globals.REPLACEONMAKE = false;
86	453	// Object3D keep = GrafreeD.clipboard;
87	454	//Object3D obj;
88	455	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -93,18 +460,19 @@
93	460
94	461	makeSomething(clone, i==group.selection.size()-1);
95	462	}
	463	+ Globals.REPLACEONMAKE = keep;
96	464	}
97	465
98	466	void CloneClipboard(boolean supports)
99	467	{
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));
	468	+ assert(Grafreed.clipboard.parent == null);
	469	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	470	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	471	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	472	+ makeSomething(CloneObject(Grafreed.clipboard.get(0), false));
105	473	else
106		- makeSomething(CloneObject(GrafreeD.clipboard, false));
107		- GrafreeD.clipboard.get(0).parent = keepparent;
	474	+ makeSomething(CloneObject(Grafreed.clipboard, false));
	475	+ Grafreed.clipboard.get(0).parent = keepparent;
108	476	}
109	477
110	478	static Object3D CloneObject(Object3D obj, boolean supports)
..	..	@@ -118,7 +486,7 @@
118	486	// obj.support = null;
119	487	if (!supports)
120	488	obj.SaveSupports();
121		- Object3D clone = (Object3D)GrafreeD.clone(obj);
	489	+ Object3D clone = (Object3D)Grafreed.clone(obj);
122	490	obj.parent = parent;
123	491	// obj.support = support;
124	492	// clone.support = support; // aout 2013
..	..	@@ -147,30 +515,29 @@
147	515
148	516	//JTextField nameField;
149	517
150		- void SetupMenu2(ObjEditor oe)
	518	+ void SetupMenu2(GroupEditor oe)
151	519	{
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);
	520	+ oe.jTree = new cTree();
	521	+
163	522	Menu menu;
164	523	oe.menuBar.add(menu = new Menu("Edit"));
165	524	//editItem = menu.add(new MenuItem("Edit"));
166	525	//editItem.addActionListener(this);
167		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	526	+
	527	+// undoItem = menu.add(new MenuItem("Undo"));
	528	+// undoItem.addActionListener(this);
	529	+// redoItem = menu.add(new MenuItem("Redo"));
	530	+// redoItem.addActionListener(this);
	531	+// menu.add("-");
	532	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
168	533	duplicateItem.addActionListener(this);
169		- menu.add("-");
170	534	cloneItem = menu.add(new MenuItem("Clone"));
171	535	cloneItem.addActionListener(this);
	536	+ if (Globals.ADVANCED)
	537	+ {
172	538	cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
173	539	cloneSupportItem.addActionListener(this);
	540	+ }
174	541	menu.add("-");
175	542	cutItem = menu.add(new MenuItem("Cut"));
176	543	cutItem.addActionListener(this);
..	..	@@ -178,27 +545,121 @@
178	545	copyItem.addActionListener(this);
179	546	pasteItem = menu.add(new MenuItem("Paste"));
180	547	pasteItem.addActionListener(this);
	548	+
	549	+ menu.add("-");
	550	+ pasteIntoItem = menu.add(new MenuItem("Paste into"));
	551	+ pasteIntoItem.addActionListener(this);
181	552	pasteLinkItem = menu.add(new MenuItem("Paste link"));
182	553	pasteLinkItem.addActionListener(this);
183	554	pasteCloneItem = menu.add(new MenuItem("Paste clone"));
184	555	pasteCloneItem.addActionListener(this);
185	556	// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
186	557	// pasteExpandItem.addActionListener(this);
187		- clearItem = menu.add(new MenuItem("Clear"));
188		- clearItem.addActionListener(this);
	558	+ menu.add("-");
	559	+ deleteItem = menu.add(new MenuItem("Delete"));
	560	+ deleteItem.addActionListener(this);
	561	+
	562	+ if (Globals.ADVANCED)
	563	+ {
	564	+ // Deletes the cameras...
189	565	clearAllItem = menu.add(new MenuItem("Clear All"));
190	566	clearAllItem.addActionListener(this);
	567	+ }
	568	+
	569	+ menuBar.add(cameraMenu = new Menu("View"));
	570	+ //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
	571	+ //zBufferItem.addActionListener(this);
	572	+ //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
	573	+ //normalLensItem.addActionListener(this);
	574	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	575	+ restoreCameraItem.addActionListener(this);
	576	+
	577	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	578	+// toggleFullScreenItem.addItemListener(this);
	579	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	580	+// cameraMenu.add("-");
	581	+//
	582	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	583	+// toggleTextureItem.addItemListener(this);
	584	+// toggleTextureItem.setState(CameraPane.textureon);
	585	+//
	586	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	587	+// toggleSwitchItem.addItemListener(this);
	588	+// toggleSwitchItem.setState(CameraPane.SWITCH);
	589	+
	590	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
	591	+ toggleHandleItem.addItemListener(this);
	592	+ toggleHandleItem.setState(CameraPane.HANDLES);
	593	+
	594	+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
	595	+ togglePaintItem.addItemListener(this);
	596	+ togglePaintItem.setState(CameraPane.PAINTMODE);
	597	+
	598	+ if (Globals.ADVANCED)
	599	+ {
	600	+ cameraMenu.add("-");
	601	+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
	602	+ toggleLiveItem.addItemListener(this);
	603	+ toggleLiveItem.setState(Globals.isLIVE());
191	604
	605	+ cameraMenu.add(stepItem = new MenuItem("Step"));
	606	+ stepItem.addActionListener(this);
	607	+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
	608	+ // toggleDLItem.addItemListener(this);
	609	+ // toggleDLItem.setState(false);
	610	+
	611	+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
	612	+ toggleRenderItem.addItemListener(this);
	613	+ toggleRenderItem.setState(!CameraPane.frozen);
	614	+
	615	+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
	616	+ toggleDebugItem.addItemListener(this);
	617	+ toggleDebugItem.setState(Globals.DEBUG);
	618	+
	619	+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
	620	+ toggleFrustumItem.addItemListener(this);
	621	+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
	622	+
	623	+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
	624	+ toggleFootContactItem.addItemListener(this);
	625	+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
	626	+
	627	+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
	628	+ toggleTimelineItem.addItemListener(this);
	629	+ }
	630	+
	631	+// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
	632	+// toggleRootItem.addItemListener(this);
	633	+// toggleRootItem.setState(false);
	634	+// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
	635	+// animationItem.addItemListener(this);
	636	+// animationItem.setState(CameraPane.ANIMATION);
	637	+ cameraMenu.add("-");
	638	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
	639	+ editCameraItem.addActionListener(this);
	640	+
	641	+ if (Globals.ADVANCED)
	642	+ {
	643	+ oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
	644	+ //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
	645	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
	646	+ oe.cameraMenu.add("-");
	647	+ openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
	648	+ openWindowItem.addActionListener(this);
	649	+ lookAtItem.addActionListener(this);
	650	+ //lookFromItem.addActinoListener(this);
	651	+ //switchViewItem.addActionListener(this);
	652	+ }
	653	+
192	654	oe.menuBar.add(menu = new Menu("Setting"));
193		- resetMeshItem = menu.add(new MenuItem("Reset All"));
194		- resetMeshItem.addActionListener(this);
195		- stepAllItem = menu.add(new MenuItem("Step All"));
196		- stepAllItem.addActionListener(this);
	655	+ if (Globals.ADVANCED)
	656	+ {
197	657	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
198	658	revertMeshItem.addActionListener(this);
199	659	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
200	660	resetreferencesItem.addActionListener(this);
201	661	menu.add("-");
	662	+ }
202	663	overwriteGeoItem = menu.add(new MenuItem("Overwrite Geometry"));
203	664	overwriteGeoItem.addActionListener(this);
204	665	overwriteMatItem = menu.add(new MenuItem("Overwrite Material"));
..	..	@@ -210,79 +671,104 @@
210	671	overwriteUVItem = menu.add(new MenuItem("Overwrite UV"));
211	672	overwriteUVItem.addActionListener(this);
212	673	menu.add("-");
	674	+ if (Globals.ADVANCED)
	675	+ {
213	676	generateMeshItem = menu.add(new MenuItem("Generate Meshes"));
214	677	generateMeshItem.addActionListener(this);
215	678	poseMeshItem = menu.add(new MenuItem("Set Pose Meshes"));
216	679	poseMeshItem.addActionListener(this);
217	680	menu.add("-");
	681	+ }
218	682	resetsupportItem = menu.add(new MenuItem("Reset support"));
219	683	resetsupportItem.addActionListener(this);
220	684	linkverticesItem = menu.add(new MenuItem("Link to Support"));
221	685	linkverticesItem.addActionListener(this);
222	686	relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
223	687	relinkverticesItem.addActionListener(this);
	688	+
	689	+ if (Globals.ADVANCED)
	690	+ {
224	691	setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
225	692	setMasterItem.addActionListener(this);
	693	+ }
226	694
227	695	oe.menuBar.add(menu = new Menu("Group"));
228		- grabItem = menu.add(new MenuItem("Grab"));
229		- grabItem.addActionListener(this);
	696	+// grabItem = menu.add(new MenuItem("Grab"));
	697	+// grabItem.addActionListener(this);
230	698	backItem = menu.add(new MenuItem("Back"));
231	699	backItem.addActionListener(this);
232	700	frontItem = menu.add(new MenuItem("Front"));
233	701	frontItem.addActionListener(this);
234		- compositeItem = menu.add(new MenuItem("Composite"));
235		- compositeItem.addActionListener(this);
236		- hideItem = menu.add(new MenuItem("Hide"));
	702	+// compositeItem = menu.add(new MenuItem("Composite"));
	703	+// compositeItem.addActionListener(this);
	704	+
	705	+ if (Globals.ADVANCED)
	706	+ {
	707	+ hideItem = menu.add(new MenuItem("Hidden Group"));
237	708	hideItem.addActionListener(this);
	709	+ }
238	710	ungroupItem = menu.add(new MenuItem("Ungroup"));
239	711	ungroupItem.addActionListener(this);
240		- menu.add("-");
241		- randomItem = menu.add(new MenuItem("Random"));
242		- randomItem.addActionListener(this);
243		- physicsItem = menu.add(new MenuItem("Physics"));
244		- physicsItem.addActionListener(this);
245		- frameselectorItem = menu.add(new MenuItem("Frame Selector"));
246		- frameselectorItem.addActionListener(this);
	712	+
	713	+// menu.add("-");
	714	+//
	715	+// switchItem = menu.add(new MenuItem("Switch node"));
	716	+// switchItem.addActionListener(this);
	717	+ if (Globals.ADVANCED)
	718	+ {
247	719	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
248	720	switchGeoItem.addActionListener(this);
249	721	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
250	722	switchTransfoItem.addActionListener(this);
251		- morphItem = menu.add(new MenuItem("Morph"));
	723	+ morphItem = menu.add(new MenuItem("Morph Group"));
252	724	morphItem.addActionListener(this);
	725	+
	726	+ menu.add("-");
	727	+ physicsItem = menu.add(new MenuItem("Physics"));
	728	+ physicsItem.addActionListener(this);
	729	+ frameselectorItem = menu.add(new MenuItem("Frame Selector"));
	730	+ frameselectorItem.addActionListener(this);
253	731	scriptNodeItem = menu.add(new MenuItem("Script Node"));
254	732	scriptNodeItem.addActionListener(this);
255		- cameraItem = menu.add(new MenuItem("Camera"));
256		- cameraItem.addActionListener(this);
	733	+ }
257	734
258	735	oe.menuBar.add(menu = new Menu("Object"));
259		- textureItem = menu.add(new MenuItem("Texture"));
260		- textureItem.addActionListener(this);
	736	+// textureItem = menu.add(new MenuItem("Texture"));
	737	+// textureItem.addActionListener(this);
261	738	billboardItem = menu.add(new MenuItem("Billboard"));
262	739	billboardItem.addActionListener(this);
263	740	csgItem = menu.add(new MenuItem("CSG"));
264	741	csgItem.addActionListener(this);
265		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	742	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
266	743	shadowXItem.addActionListener(this);
267		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	744	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
268	745	shadowYItem.addActionListener(this);
269		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	746	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
270	747	shadowZItem.addActionListener(this);
	748	+ attributeItem = menu.add(new MenuItem("Attribute"));
	749	+ attributeItem.addActionListener(this);
	750	+
	751	+ if (Globals.ADVANCED)
	752	+ {
	753	+ menu.add("-");
271	754	linkerItem = menu.add(new MenuItem("Linker"));
272	755	linkerItem.addActionListener(this);
273	756	templateItem = menu.add(new MenuItem("Template"));
274	757	templateItem.addActionListener(this);
275		- attributeItem = menu.add(new MenuItem("Attribute"));
276		- attributeItem.addActionListener(this);
277	758	pointflowItem = menu.add(new MenuItem("Point Flow"));
278	759	pointflowItem.addActionListener(this);
	760	+ }
279	761	menu.add("-");
280	762	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
281	763	resetTransformItem.addActionListener(this);
282	764	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
283	765	resetCentroidItem.addActionListener(this);
284		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
285		- transformgeometryItem.addActionListener(this);
	766	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	767	+ resetCentroidXZItem.addActionListener(this);
	768	+ transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
	769	+ transformGeometryItem.addActionListener(this);
	770	+ transformChildrenItem = menu.add(new MenuItem("Transform Children"));
	771	+ transformChildrenItem.addActionListener(this);
286	772
287	773	oe.menuBar.add(menu = new Menu("Geometry"));
288	774	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -293,8 +779,11 @@
293	779	genNormalsCADItem.addActionListener(this);
294	780	genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
295	781	genNormalsMESHItem.addActionListener(this);
296		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	782	+ if (Globals.ADVANCED)
	783	+ {
	784	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
297	785	genNormalsMINEItem.addActionListener(this);
	786	+ }
298	787	stripifyItem = menu.add(new MenuItem("Stripify"));
299	788	stripifyItem.addActionListener(this);
300	789	unstripifyItem = menu.add(new MenuItem("Unstripify"));
..	..	@@ -316,23 +805,34 @@
316	805	reduce34MeshItem.addActionListener(this);
317	806	increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
318	807	increaseMeshItem.addActionListener(this);
319		- smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
320		- smoothMeshItem.addActionListener(this);
321	808	clipMeshItem = menu.add(new MenuItem("Clip mesh"));
322	809	clipMeshItem.addActionListener(this);
	810	+
	811	+ if (Globals.ADVANCED)
	812	+ {
	813	+ smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
	814	+ smoothMeshItem.addActionListener(this);
	815	+ }
323	816
324	817	oe.menuBar.add(menu = new Menu("Attributes"));
325	818	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
326	819	clearMaterialsItem.addActionListener(this);
	820	+ resetAllItem = menu.add(new MenuItem("Reset All"));
	821	+ resetAllItem.addActionListener(this);
	822	+ stepAllItem = menu.add(new MenuItem("Step All"));
	823	+ stepAllItem.addActionListener(this);
327	824	menu.add("-");
328	825	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
329	826	liveleavesItem.addActionListener(this);
330	827	unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
331	828	unliveleavesItem.addActionListener(this);
	829	+ if (Globals.ADVANCED)
	830	+ {
332	831	supportleavesItem = menu.add(new MenuItem("Support Leaves"));
333	832	supportleavesItem.addActionListener(this);
334	833	unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
335	834	unsupportleavesItem.addActionListener(this);
	835	+ }
336	836	hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
337	837	hideleavesItem.addActionListener(this);
338	838	showleavesItem = menu.add(new MenuItem("Show Leaves"));
..	..	@@ -341,6 +841,14 @@
341	841	markleavesItem.addActionListener(this);
342	842	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
343	843	unmarkleavesItem.addActionListener(this);
	844	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	845	+ rewindleavesItem.addActionListener(this);
	846	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	847	+ unrewindleavesItem.addActionListener(this);
	848	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	849	+ randomleavesItem.addActionListener(this);
	850	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	851	+ unrandomleavesItem.addActionListener(this);
344	852	menu.add("-");
345	853	flipVItem = menu.add(new MenuItem("Flip V"));
346	854	flipVItem.addActionListener(this);
..	..	@@ -366,53 +874,129 @@
366	874	attachBumpItem.addActionListener(this);
367	875	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
368	876	pigmentBumpItem.addActionListener(this);
	877	+ //embedTexturesItem
369	878	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
370	879	detachPigmentItem.addActionListener(this);
371	880	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
372	881	detachBumpItem.addActionListener(this);
	882	+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
	883	+ embedTexturesItem.addActionListener(this);
	884	+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
	885	+ deEmbedTexturesItem.addActionListener(this);
373	886	menu.add("-");
374	887	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
375	888	sortbysizeItem.addActionListener(this);
376	889	sortbynameItem = menu.add(new MenuItem("Sort by name"));
377	890	sortbynameItem.addActionListener(this);
378	891	menu.add("-");
	892	+ shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
	893	+ shareGeometriesItem.addActionListener(this);
	894	+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
	895	+ mergeGeometriesItem.addActionListener(this);
	896	+ menu.add("-");
	897	+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
	898	+ editLeafItem.addActionListener(this);
	899	+ if (Globals.ADVANCED)
	900	+ {
	901	+ // Pretty much the same as duplicate and clone.
379	902	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
380	903	extractGeometriesItem.addActionListener(this);
381	904	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
382	905	cloneGeometriesItem.addActionListener(this);
383		- shareGeometriesItem = menu.add(new MenuItem("Share Geometry"));
384		- shareGeometriesItem.addActionListener(this);
385		- mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
386		- mergeGeometriesItem.addActionListener(this);
	906	+ }
387	907
388	908	oe.menuBar.add(menu = new Menu("Insert"));
389	909	buildCreateMenu(menu);
390	910
391		-
392		- oe.menuBar.add(menu = new Menu("Include"));
393		- importGFDItem = menu.add(new MenuItem("GrafreeD Object..."));
394		- importGFDItem.addActionListener(this);
395		- importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D Object..."));
396		- importVRMLX3DItem.addActionListener(this);
397		- importOBJItem = menu.add(new MenuItem("OBJ Object..."));
398		- importOBJItem.addActionListener(this);
399		- import3DSItem = menu.add(new MenuItem("3DS Object..."));
400		- import3DSItem.addActionListener(this);
401		-
402	911	oe.menuBar.add(menu = new Menu("Tools"));
403	912	buildToolsMenu(menu);
404	913	}
405	914
	915	+ JTabbedPane resourcecontainer;
	916	+ cGridBag currenttab;
	917	+ boolean added; // patch for jar
	918	+
	919	+ int tabcount = 0;
	920	+ int colcount = 0;
	921	+ int rowcount = 0;
	922	+ int texturecount = 0;
	923	+
	924	+ int columns = 5;
	925	+ int rows = 7;
	926	+
	927	+ public void ResourceCallBack(String[] path)
	928	+ {
	929	+// for (int i = 0; i < path.length; i++)
	930	+// System.out.print(path[i] + "/");
	931	+// System.out.println();
	932	+
	933	+ if (//rowcount == 0 \|\|
	934	+ path.length == 1)
	935	+ {
	936	+ currenttab = new cGridBag();
	937	+ added = false;
	938	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	939	+ currenttab.setName(tabname);
	940	+ rowcount = 1;
	941	+ colcount = 0;
	942	+ texturecount = 0;
	943	+ }
	944	+
	945	+ if (path.length > 2 && path[2].toLowerCase().endsWith(".jpg"))
	946	+ {
	947	+ if (!added)
	948	+ {
	949	+ added = true;
	950	+ resourcecontainer.add(currenttab);
	951	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	952	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
	953	+ }
	954	+
	955	+ AddTextureButton(path[0], path[1], path[2], texturecount++, currenttab);
	956	+
	957	+ if (++colcount >= columns)
	958	+ {
	959	+ colcount = 0;
	960	+ currenttab.Return();
	961	+
	962	+ if (rowcount++ >= rows)
	963	+ {
	964	+ rowcount = 0;
	965	+ }
	966	+ }
	967	+ }
	968	+ else
	969	+ {
	970	+// if (!path[path.length-1].equals("icons"))
	971	+// resourcecontainer.Return();
	972	+ }
	973	+ }
	974	+
	975	+ void CreateTexturePanel(cGridBag container)
	976	+ {
	977	+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
	978	+ container.add(resourcecontainer);
	979	+
	980	+ Grafreed.ParseResources("textures", this);
	981	+ }
	982	+
406	983	void SetupUI2(ObjEditor oe)
407	984	{
	985	+ // June 2019
	986	+ if (oe == null)
	987	+ {
	988	+ //super.SetupUI2(this);
	989	+ //return;
	990	+ }
	991	+
	992	+ if (copy != group)
	993	+ {
	994	+ //super.SetupUI2(this);
	995	+ }
	996	+
408	997	//new Exception().printStackTrace();
409	998
410	999	oe.radioPanel = new JPanel(new GridBagLayout());
411		- oe.aConstraints.weightx = 1;
412		- oe.aConstraints.weighty = 0;
413		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
414		- oe.aConstraints.gridwidth = 100;
415		- oe.aConstraints.gridheight = 1;
416	1000	// oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
417	1001
418	1002	oe.buttonGroup = new ButtonGroup();
..	..	@@ -433,153 +1017,263 @@
433	1017	oe.radioPanel.add(dummyButton);
434	1018	oe.buttonGroup.add(dummyButton);
435	1019	*/
436		- aConstraints.gridy += 1;
437		- oe.aConstraints.gridwidth = 1;
438		- oe.aConstraints.gridx = 0;
	1020	+ cGridBag copyOptionsPanel = new cGridBag();
	1021	+
	1022	+ copyOptionsPanel.preferredHeight = 2;
439	1023
440		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE()), oe.aConstraints);
	1024	+ //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
	1025	+
	1026	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1027	+ //minButton.setToolTipText("Minimize window");
	1028	+ //minButton.addActionListener(this);
	1029	+
	1030	+ if (Globals.ADVANCED)
	1031	+ {
	1032	+// oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1033	+// maxButton.setToolTipText("Maximize window");
	1034	+// maxButton.addActionListener(this);
	1035	+ }
	1036	+
	1037	+// cButton gcButton;
	1038	+//
	1039	+// oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1040	+// gcButton.setToolTipText("Garbage collect");
	1041	+// gcButton.addActionListener(new ActionListener()
	1042	+// {
	1043	+// public void actionPerformed(ActionEvent e)
	1044	+// {
	1045	+// System.gc();
	1046	+// }
	1047	+// });
	1048	+
	1049	+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1050	+ collapseButton.setToolTipText("Collapse toolbar");
	1051	+ collapseButton.addActionListener(this);
	1052	+
	1053	+ oe.toolbarPanel.add(maximize3DButton = GetButton("", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1054	+ maximize3DButton.setToolTipText("Maximize 3D view");
	1055	+ maximize3DButton.addActionListener(this);
	1056	+
	1057	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1058	+ twoButton.setToolTipText("Show 3D view only");
	1059	+ twoButton.addActionListener(this);
	1060	+ this.fullscreenLayout = twoButton;
	1061	+
	1062	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1063	+ threeButton.setToolTipText("Show controls and 3D view");
	1064	+ threeButton.addActionListener(this);
	1065	+ if (Globals.ADVANCED)
	1066	+ {
	1067	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1068	+ sixButton.setToolTipText("Show 3D view and controls");
	1069	+ sixButton.addActionListener(this);
	1070	+ }
	1071	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1072	+// sevenButton.setToolTipText("3-column layout");
	1073	+// sevenButton.addActionListener(this);
	1074	+ //
	1075	+
	1076	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1077	+ fullButton.setToolTipText("Full-screen window");
	1078	+ fullButton.addActionListener(this);
	1079	+
	1080	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1081	+ screenfitButton.setToolTipText("Screen fit");
	1082	+ screenfitButton.addActionListener(this);
	1083	+
	1084	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1085	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	1086	+ restoreCameraButton.addActionListener(this);
	1087	+
	1088	+ copyOptionsPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1089	+ saveVersionButton.setToolTipText("Duplicate current version");
	1090	+ saveVersionButton.addActionListener(this);
	1091	+
	1092	+ copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1093	+ deleteVersionButton.setToolTipText("Delete current version");
	1094	+ deleteVersionButton.addActionListener(this);
	1095	+
	1096	+ copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1097	+ previousVersionButton.setToolTipText("Previous version");
	1098	+ previousVersionButton.addActionListener(this);
	1099	+ previousVersionButton.setEnabled(false);
	1100	+
	1101	+ cGridBag updown = new cGridBag().setVertical(true);
	1102	+ updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1103	+ restoreButton.setToolTipText("Undo (restore current version)");
	1104	+ restoreButton.addActionListener(this);
	1105	+ //restoreButton.setEnabled(false);
	1106	+
	1107	+ updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1108	+ replaceButton.setToolTipText("Save (replace current version)");
	1109	+ replaceButton.addActionListener(this);
	1110	+ //replaceButton.setEnabled(false);
	1111	+
	1112	+ copyOptionsPanel.add(updown);
	1113	+
	1114	+ copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1115	+ nextVersionButton.setToolTipText("Next version");
	1116	+ nextVersionButton.addActionListener(this);
	1117	+ nextVersionButton.setEnabled(false);
	1118	+
	1119	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1120	+ oneStepButton.setToolTipText("Animate one step forward");
	1121	+ oneStepButton.addActionListener(this);
	1122	+
	1123	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	1124	+ liveCB.setToolTipText("Enable animation");
441	1125	liveCB.addItemListener(this);
442	1126
443		- oe.aConstraints.gridx += 1;
444		- oe.toolbarPanel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT), oe.aConstraints);
445		- supportCB.addItemListener(this);
446		-
447		- // oe.aConstraints.gridx += 1;
448		- // oe.toolbarPanel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), oe.aConstraints);
449		- // localCB.addItemListener(this);
450		-
451		- oe.aConstraints.gridx += 1;
452		- oe.toolbarPanel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD), oe.aConstraints);
453		- crowdCB.addItemListener(this);
454		-
455		- oe.aConstraints.gridx += 1;
456		- oe.toolbarPanel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA), oe.aConstraints);
457		- smoothCB.addItemListener(this);
458		-
459		- oe.aConstraints.gridx += 1;
460		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST), oe.aConstraints);
	1127	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
	1128	+ fastCB.setToolTipText("Fast mode");
461	1129	fastCB.addItemListener(this);
462		- oe.aConstraints.gridx += 1;
463		- oe.toolbarPanel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE), oe.aConstraints);
464		- slowCB.addItemListener(this);
465		- oe.aConstraints.gridx += 1;
466		- oe.toolbarPanel.add(boxCB = new cCheckBox("Box", CameraPane.FAST), oe.aConstraints);
467		- boxCB.addItemListener(this);
	1130	+
	1131	+ //oe.toolboxPanel.Return();
	1132	+
	1133	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	1134	+// trackCB.setToolTipText("Enable tracking");
	1135	+// trackCB.addItemListener(this);
468	1136
469		-// oe.aConstraints.gridx += 1;
470		-// oe.toolbarPanel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), oe.aConstraints);
471		-// speakerMocapCB.addItemListener(this);
472		-
473		- if (false)
474		- {
475		- // handled in scripts
476		- oe.aConstraints.gridx += 1;
477		- oe.toolbarPanel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA), oe.aConstraints);
478		- speakerCameraCB.addItemListener(this);
479		-
480		- oe.aConstraints.gridx += 1;
481		- oe.toolbarPanel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS), oe.aConstraints);
482		- speakerFocusCB.addItemListener(this);
483		-
484		- oe.aConstraints.gridx += 1;
485		- oe.toolbarPanel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS), oe.aConstraints);
486		- smoothfocusCB.addItemListener(this);
487		- }
488		-
489		-//oe.aConstraints.gridx += 1;
490		-//oe.toolbarPanel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), oe.aConstraints);
491		-// debugCB.addItemListener(this);
492		-
493		- oe.aConstraints.gridx += 1;
494		- oe.toolbarPanel.add(oeilCB = new cCheckBox("O", CameraPane.OEIL), oe.aConstraints);
495		- oeilCB.addItemListener(this);
496		-
497		- oe.aConstraints.gridx += 1;
498		- oe.toolbarPanel.add(lookAtCB = new cCheckBox("T", CameraPane.LOOKAT), oe.aConstraints);
499		- lookAtCB.addItemListener(this);
500		-
501		- oe.aConstraints.gridx += 1;
502		- oe.toolbarPanel.add(trackCB = new cCheckBox(":", CameraPane.TRACK), oe.aConstraints);
503		- trackCB.addItemListener(this);
504		-
505		- oe.aConstraints.gridx += 1;
506		- oe.toolbarPanel.add(screenfitButton = new cButton("@ ")); //, oe.aConstraints);
507		- screenfitButton.addActionListener(this);
508		- oe.aConstraints.gridx += 1;
509	1137	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
510	1138	// screenfitpointButton.addActionListener(this);
511		-// oe.aConstraints.gridx += 1;
512		- oe.toolbarPanel.add(snapobjectButton = new cButton(" O+ ")); //, oe.aConstraints);
513		- snapobjectButton.addActionListener(this);
514		- oe.aConstraints.gridx += 1;
515	1139
516		- //aConstraints.gridx = 0;
517		- //aConstraints.gridy += 1;
518		- oe.aConstraints.weighty = 0;
519		- oe.aConstraints.gridwidth = 1;
520		-
521		- oe.toolbarPanel.add(flashSelectionButton = new cButton(" ? ")); //, oe.aConstraints);
522		- flashSelectionButton.addActionListener(this);
523		-
524		- oe.toolbarPanel.add(new cButton(" ", false));
525		-
526		- oe.aConstraints.gridx += 1;
527		- oe.aConstraints.weighty = 0;
528		- oe.aConstraints.gridwidth = 1;
529		-
530		- //
531		- oe.toolbarPanel.add(twoButton = new cButton(" \|+\| ")); //, oe.aConstraints);
532		- twoButton.addActionListener(this);
533		- oe.toolbarPanel.add(fourButton = new cButton("+\|\| ")); //, oe.aConstraints);
	1140	+ if (Globals.ADVANCED)
	1141	+ {
	1142	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1143	+ snapobjectButton.addActionListener(this);
	1144	+ snapobjectButton.setToolTipText("Snap Object");
	1145	+
	1146	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
534	1147	fourButton.addActionListener(this);
535		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\| ")); //, oe.aConstraints);
536		- sixButton.addActionListener(this);
537		- oe.toolbarPanel.add(threeButton = new cButton(" \|+\|+")); //, oe.aConstraints);
538		- threeButton.addActionListener(this);
539		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+")); //, oe.aConstraints);
540		- sevenButton.addActionListener(this);
541		- //
	1148	+ fourButton.setToolTipText("Show control panel only");
	1149	+ }
542	1150
543		- oe.toolbarPanel.add(rootButton = new cButton(" o o o E ")); //, oe.aConstraints);
	1151	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
	1152	+
	1153	+
	1154	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1155	+ rootButton.setToolTipText("Open selection in new tab");
544	1156	rootButton.addActionListener(this);
545		- oe.aConstraints.gridx += 1;
546		- oe.toolbarPanel.add(closeButton = new cButton(" X ")); //, oe.aConstraints);
	1157	+
	1158	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1159	+ closeButton.setToolTipText("Close tab");
547	1160	closeButton.addActionListener(this);
548	1161	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
549	1162	//clearButton.addActionListener(this);
550		- oe.aConstraints.gridx += 1;
551		-
552		- oe.aConstraints.gridx = 1; //
553		- oe.treePanel.add(editButton = new cButton("+"), oe.aConstraints);
554		- editButton.addActionListener(this);
555		- oe.aConstraints.gridx += 1;
556		- oe.aConstraints.weighty = 0;
557		- oe.aConstraints.gridwidth = 1;
558	1163
559		- oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
	1164	+ cGridBag row1 = new cGridBag();
	1165	+
	1166	+ // INSERT
	1167	+ row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1168	+ gridButton.setToolTipText("Create ground");
	1169	+ gridButton.addActionListener(this);
	1170	+
	1171	+ row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1172	+ boxButton.setToolTipText("Create box");
	1173	+ boxButton.addActionListener(this);
	1174	+
	1175	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1176	+ sphereButton.setToolTipText("Create sphere");
	1177	+ sphereButton.addActionListener(this);
	1178	+
	1179	+ row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1180	+ coneButton.setToolTipText("Create cone");
	1181	+ coneButton.addActionListener(this);
	1182	+
	1183	+ row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1184	+ torusButton.setToolTipText("Create torus");
	1185	+ torusButton.addActionListener(this);
	1186	+
	1187	+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1188	+ superButton.setToolTipText("Create superellipsoid");
	1189	+ superButton.addActionListener(this);
	1190	+
	1191	+ if (Globals.ADVANCED)
	1192	+ {
	1193	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1194	+ kleinButton.setToolTipText("Create Klein bottle");
	1195	+ kleinButton.addActionListener(this);
	1196	+ }
	1197	+
	1198	+ row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1199	+ particlesButton.setToolTipText("Create particle system");
	1200	+ particlesButton.addActionListener(this);
	1201	+
	1202	+ oe.toolboxPanel.add(row1);
	1203	+
	1204	+ cGridBag row2 = new cGridBag();
	1205	+
	1206	+ row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1207	+ groupButton.setToolTipText("Create group");
	1208	+ groupButton.addActionListener(this);
	1209	+
	1210	+ row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1211	+ compositeButton.setToolTipText("Create composite");
	1212	+ compositeButton.addActionListener(this);
	1213	+
	1214	+ row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1215	+ switchButton.setToolTipText("Create item switcher");
	1216	+ switchButton.addActionListener(this);
	1217	+
	1218	+ row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1219	+ loopButton.setToolTipText("Create loop");
	1220	+ loopButton.addActionListener(this);
	1221	+
	1222	+ row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1223	+ textureButton.setToolTipText("Create texture");
	1224	+ textureButton.addActionListener(this);
	1225	+
	1226	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1227	+ overlayButton.setToolTipText("Create overlay");
	1228	+ overlayButton.addActionListener(this);
	1229	+
	1230	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1231	+ lightButton.setToolTipText("Create light");
	1232	+ lightButton.addActionListener(this);
	1233	+
	1234	+ oe.toolboxPanel.add(row2);
	1235	+
	1236	+ cGridBag textures = new cGridBag();
	1237	+
	1238	+ CreateTexturePanel(textures);
	1239	+
	1240	+ oe.toolboxPanel.add(textures);
	1241	+
	1242	+ textures.preferredHeight = 100;
	1243	+
	1244	+ CreateSkyboxPanel(oe.skyboxPanel);
	1245	+
	1246	+ // EDIT panel
	1247	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1248	+ editButton.setToolTipText("Pin selection controls");
	1249	+ editButton.addActionListener(this);
	1250	+
	1251	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1252	+ uneditButton.setToolTipText("Unpin and remove selection controls");
560	1253	uneditButton.addActionListener(this);
561	1254
562		- oe.aConstraints.gridx += 1;
563		- oe.aConstraints.weighty = 0;
564		- oe.aConstraints.gridwidth = 1;
565		-
566		- oe.treePanel.add(clearPanelButton = new cButton("C"), oe.aConstraints);
567		- clearPanelButton.addActionListener(this);
568		-
569		- oe.aConstraints.gridx += 1;
570		- oe.aConstraints.weighty = 0;
571		- oe.aConstraints.gridwidth = 1;
572		-
573		- oe.treePanel.add(allParamsButton = new cButton("A"), oe.aConstraints);
	1255	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	1256	+ allParamsButton.setToolTipText("Show all controls");
574	1257	allParamsButton.addActionListener(this);
575	1258
576		- oe.aConstraints.gridx += 1;
577		- oe.aConstraints.weighty = 0;
578		- oe.aConstraints.gridwidth = 1;
579		-
580		- oe.treePanel.add(unselectButton = new cButton("U"), oe.aConstraints);
581		- unselectButton.addActionListener(this);
	1259	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1260	+ clearPanelButton.setToolTipText("Clear all controls");
	1261	+ clearPanelButton.addActionListener(this);
582	1262
	1263	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1264	+ //unselectButton.setToolTipText("Unselect");
	1265	+ //unselectButton.addActionListener(this);
	1266	+
	1267	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1268	+ flashSelectionButton.setToolTipText("Highlight selection");
	1269	+ flashSelectionButton.addActionListener(this);
	1270	+
	1271	+ editCommandsPanel.preferredHeight = 1;
	1272	+
	1273	+ SetPinStates(false);
	1274	+// oe.treePanel.add(commandsPanel);
	1275	+// oe.treePanel.Return();
	1276	+
583	1277	// oe.aConstraints.gridx += 1;
584	1278	// oe.aConstraints.weighty = 0;
585	1279	// oe.aConstraints.gridwidth = 1;
..	..	@@ -591,47 +1285,32 @@
591	1285	// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
592	1286	// gcButton.addActionListener(this);
593	1287
594		- oe.aConstraints.gridx = 0;
595		- oe.aConstraints.gridy += 1;
596		-
597		- //ctrlPanel.add(objList = new List(5, true));
598		- oe.aConstraints.gridwidth = 100;
599		- // oe.aConstraints.gridheight = 100;
600		- oe.aConstraints.fill = GridBagConstraints.BOTH; // HORIZONTAL;
601		- oe.aConstraints.gridheight = 1;
602		- oe.aConstraints.weighty = 0.5;
603		- oe.aConstraints.gridx = 0;
604		- JScrollPane jSP;
	1288	+ cGridBag jSPPanel = new cGridBag();
	1289	+
	1290	+ JScrollPane jSP;
605	1291	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
606		- oe.treePanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null)), oe.aConstraints);
	1292	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
607	1293	ResetModel();
608		- oe.aConstraints.weighty = 0.5;
609		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
610		- oe.aConstraints.gridy += 1;
611		- oe.aConstraints.gridwidth = 1;
612		-
613		- oe.aConstraints.weighty = 0;
614		- oe.aConstraints.gridwidth = 2;
615		-
616		- oe.treePanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0), oe.aConstraints);
617		- colorCB.addItemListener(this);
618		- oe.aConstraints.gridx += 2;
619		- oe.treePanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0), oe.aConstraints);
620		- materialCB.addItemListener(this);
621		- oe.aConstraints.gridx += 2;
622		- oe.treePanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0), oe.aConstraints);
623		- textureCB.addItemListener(this);
624		-
625		- oe.aConstraints.gridx = 0;
626		- oe.aConstraints.gridy += 1;
627	1294
	1295	+ oe.treePanel.add(jSPPanel);
	1296	+ oe.treePanel.Return();
	1297	+
	1298	+ oe.treePanel.add(copyOptionsPanel);
	1299	+ oe.treePanel.Return();
	1300	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1301	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	1302	+ sliderPane.preferredHeight = 1;
	1303	+
	1304	+// mainPanel.setDividerLocation(0.1); //1.0);
	1305	+ mainPanel.setResizeWeight(0.4);
	1306	+
628	1307	//jList.addListSelectionListener(this);
629	1308	oe.jTree.addTreeSelectionListener(this);
630	1309	//jTree.setRootVisible(false);
631	1310	//jTree.setEditable(true);
632	1311	oe.jTree.setDragEnabled(true);
633	1312	//jTree.setPreferredSize(new Dimension(10,10));
634		- jSP.setPreferredSize(new Dimension(100,200));
	1313	+ //jSP.setPreferredSize(new Dimension(100,200));
635	1314
636	1315	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
637	1316
..	..	@@ -643,23 +1322,171 @@
643	1322	dgr.addDragGestureListener(this);
644	1323	}catch(Exception e) {}
645	1324	*/
646		- radio.layout = sevenButton;
	1325	+ radio.layout = threeButton; // sixButton;
647	1326	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
648	1327	}
	1328	+
	1329	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
	1330	+ {
	1331	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	1332	+ colorCB.setToolTipText("Copy color when dropped");
	1333	+ colorCB.addItemListener(this);
	1334	+
	1335	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	1336	+ materialCB.setToolTipText("Copy material when dropped");
	1337	+ materialCB.addItemListener(this);
	1338	+
	1339	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	1340	+ textureCB.setToolTipText("Copy texture when dropped");
	1341	+ textureCB.addItemListener(this);
	1342	+
	1343	+ panel.Return();
	1344	+
	1345	+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
	1346	+ boxCB.setToolTipText("Display bounding boxes");
	1347	+ boxCB.addItemListener(this);
	1348	+
	1349	+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
	1350	+ zoomBoxCB.setToolTipText("Display only for wheel");
	1351	+ zoomBoxCB.addItemListener(this);
	1352	+
	1353	+ if (true) // Globals.ADVANCED)
	1354	+ {
	1355	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	1356	+// supportCB.setToolTipText("Enable rigging");
	1357	+// supportCB.addItemListener(this);
	1358	+
	1359	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	1360	+ freezeCB.setToolTipText("Fast moving camera");
	1361	+ freezeCB.addItemListener(this);
	1362	+
	1363	+ // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
	1364	+ // localCB.addItemListener(this);
	1365	+
	1366	+ panel.Return();
	1367	+
	1368	+ panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
	1369	+ crowdCB.setToolTipText("Used for crowds");
	1370	+ crowdCB.addItemListener(this);
	1371	+
	1372	+ panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
	1373	+ smoothCB.setToolTipText("Snapping delay");
	1374	+ smoothCB.addItemListener(this);
	1375	+
	1376	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1377	+// slowCB.setToolTipText("Smooth interpolation");
	1378	+// slowCB.addItemListener(this);
	1379	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1380	+ minshaderCB.setToolTipText("Minimal fast shader");
	1381	+ minshaderCB.addItemListener(this);
	1382	+
	1383	+// constraints.gridy += 1;
	1384	+// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
	1385	+// speakerMocapCB.addItemListener(this);
	1386	+
	1387	+ panel.Return();
	1388	+
	1389	+ if (false)
	1390	+ {
	1391	+ // handled in scripts
	1392	+ //constraints.gridy += 1;
	1393	+ panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
	1394	+ speakerCameraCB.addItemListener(this);
	1395	+
	1396	+ //constraints.gridy += 1;
	1397	+ panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
	1398	+ speakerFocusCB.addItemListener(this);
	1399	+
	1400	+ //constraints.gridy += 1;
	1401	+ panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
	1402	+ smoothfocusCB.addItemListener(this);
	1403	+ panel.Return();
	1404	+ }
	1405	+
	1406	+//constraints.gridx += 1;
	1407	+//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
	1408	+// debugCB.addItemListener(this);
	1409	+
	1410	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	1411	+ trackCB.setToolTipText("Enable tracking target");
	1412	+ trackCB.addItemListener(this);
	1413	+
	1414	+ panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	1415	+ oeilCB.setToolTipText("Move camera when tracking");
	1416	+ oeilCB.addItemListener(this);
	1417	+
	1418	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	1419	+ shadowCB.setToolTipText("When live compute shadows");
	1420	+ shadowCB.addItemListener(this);
	1421	+
	1422	+ panel.Return();
	1423	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	1424	+ toggleTextureCB.setToolTipText("Load textures");
	1425	+ toggleTextureCB.addItemListener(this);
	1426	+
	1427	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	1428	+ toggleSwitchCB.setToolTipText("Choose a single item");
	1429	+ toggleSwitchCB.addItemListener(this);
	1430	+
	1431	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1432	+ autokeepCB.setToolTipText("On structure change");
	1433	+ autokeepCB.addItemListener(this);
	1434	+
	1435	+ panel.Return();
	1436	+ if (Globals.ADVANCED)
	1437	+ {
	1438	+ panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
	1439	+ lookAtCB.setToolTipText("Look-at target");
	1440	+ lookAtCB.addItemListener(this);
	1441	+ }
	1442	+
	1443	+ }
	1444	+
	1445	+ cGridBag fill = new cGridBag();
	1446	+ fill.preferredHeight = 200;
	1447	+ cGridBag fill2 = new cGridBag();
	1448	+ fill2.preferredHeight = 200;
	1449	+ cGridBag fill3 = new cGridBag();
	1450	+ fill3.preferredHeight = 200;
	1451	+
	1452	+ panel.add(fill);
	1453	+ panel.add(fill2);
	1454	+ panel.add(fill3);
	1455	+
	1456	+ }
649	1457
650	1458	void EditObject(Object3D obj)
651	1459	{
	1460	+ assert(obj instanceof Composite);
	1461	+
	1462	+ if (obj.versionlist == null)
	1463	+ {
	1464	+ obj.versionlist = new Object3D[100];
	1465	+ obj.versionindex = -1;
	1466	+ }
	1467	+
652	1468	cRadio radioButton = new cRadio(obj.name);
	1469	+
	1470	+ // June 2019. Patch to avoid bug with transparency.
	1471	+ radioButton.hadMaterial = obj.material != null;
	1472	+ if (!radioButton.hadMaterial)
	1473	+ {
	1474	+ obj.material = new cMaterial();
	1475	+ }
	1476	+
653	1477	radioButton.SetObject(obj);
654		- radioButton.layout = sevenButton;
	1478	+ radioButton.layout = threeButton; // sixButton;
655	1479	radioButton.SetCamera(cameraView.renderCamera, false);
656	1480	radioButton.addActionListener(this);
657	1481	radioPanel.add(radioButton);
658	1482	buttonGroup.add(radioButton);
659	1483	radioButton.doClick();
660	1484	}
	1485	+
661	1486	void SetupViews(ObjEditor oe)
662	1487	{
	1488	+ theFrame = this;
	1489	+
663	1490	oe.SetupViews();
664	1491
665	1492	System.out.println("SetupViews");
..	..	@@ -668,22 +1495,30 @@
668	1495	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
669	1496	}
670	1497
671		- JCheckBox liveCB;
672		- JCheckBox supportCB;
673		- JCheckBox localCB;
674		- JCheckBox crowdCB;
675		- JCheckBox smoothCB;
676		- JCheckBox fastCB;
677		- JCheckBox slowCB;
678		- JCheckBox boxCB;
679		- JCheckBox trackCB;
680		- JCheckBox smoothfocusCB;
	1498	+ cToggleButton liveCB;
	1499	+ cCheckBox supportCB;
	1500	+ cCheckBox localCB;
	1501	+ cCheckBox crowdCB;
	1502	+ cCheckBox smoothCB;
	1503	+ cCheckBox minshaderCB;
	1504	+
	1505	+ cToggleButton fastCB;
	1506	+ cCheckBox slowCB;
	1507	+ cCheckBox boxCB;
	1508	+ cCheckBox zoomBoxCB;
	1509	+ cCheckBox freezeCB;
	1510	+ //cToggleButton trackCB;
	1511	+ cCheckBox trackCB;
	1512	+ cCheckBox smoothfocusCB;
681	1513	// JCheckBox speakerMocapCB;
682		- JCheckBox speakerCameraCB;
683		- JCheckBox speakerFocusCB;
684		- JCheckBox debugCB;
685		- JCheckBox oeilCB;
686		- JCheckBox lookAtCB;
	1514	+ cCheckBox speakerCameraCB;
	1515	+ cCheckBox speakerFocusCB;
	1516	+ cCheckBox debugCB;
	1517	+
	1518	+ cCheckBox oeilCB;
	1519	+ cCheckBox shadowCB;
	1520	+ cCheckBox autokeepCB;
	1521	+ cCheckBox lookAtCB;
687	1522
688	1523	// static int COLOR = 1;
689	1524	// static int MATERIAL = 2;
..	..	@@ -691,9 +1526,9 @@
691	1526
692	1527	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
693	1528
694		- JCheckBox colorCB;
695		- JCheckBox materialCB;
696		- JCheckBox textureCB;
	1529	+ cCheckBox colorCB;
	1530	+ cCheckBox materialCB;
	1531	+ cCheckBox textureCB;
697	1532
698	1533	public void itemStateChanged(ItemEvent e)
699	1534	{
..	..	@@ -721,6 +1556,7 @@
721	1556	} else if(e.getSource() == liveCB)
722	1557	{
723	1558	cameraView.ToggleLive();
	1559	+ refreshContents(false);
724	1560	}
725	1561	else if(e.getSource() == supportCB)
726	1562	{
..	..	@@ -736,6 +1572,12 @@
736	1572	{
737	1573	cameraView.ToggleInertia();
738	1574	cameraView.repaint();
	1575	+ }
	1576	+ else if(e.getSource() == minshaderCB)
	1577	+ {
	1578	+ Globals.MINSHADER ^= true;
	1579	+ cameraView.programInitialized = false;
	1580	+ cameraView.repaint();
739	1581	}
740	1582	else if(e.getSource() == localCB)
741	1583	{
..	..	@@ -755,6 +1597,10 @@
755	1597	Recompile();
756	1598	cameraView.repaint();
757	1599	// refreshContents();
	1600	+ }
	1601	+ else if(e.getSource() == zoomBoxCB)
	1602	+ {
	1603	+ cameraView.ToggleZoomBoxMode();
758	1604	}
759	1605	else if(e.getSource() == smoothfocusCB)
760	1606	{
..	..	@@ -781,6 +1627,18 @@
781	1627	{
782	1628	cameraView.ToggleOeil();
783	1629	}
	1630	+ else if(e.getSource() == shadowCB)
	1631	+ {
	1632	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1633	+ }
	1634	+ else if(e.getSource() == freezeCB)
	1635	+ {
	1636	+ Globals.FREEZEONMOVE ^= true;
	1637	+ }
	1638	+ else if(e.getSource() == autokeepCB)
	1639	+ {
	1640	+ Globals.REPLACEONMAKE ^= true;
	1641	+ }
784	1642	else if(e.getSource() == lookAtCB)
785	1643	{
786	1644	cameraView.ToggleLookAt();
..	..	@@ -797,7 +1655,8 @@
797	1655
798	1656	/**/
799	1657	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
800		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1658	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1659	+ TreePath path = objEditor.jTree.getSelectionPath();
801	1660	if ((path == null) \|\| (path.getPathCount() <= 1)) {
802	1661	// We can't move the root node or an empty selection
803	1662	return;
..	..	@@ -860,8 +1719,6 @@
860	1719	}
861	1720	}
862	1721
863		- String string = (String) object;
864		-
865	1722	System.out.println("Transfer = " + object + "; drop : " + target);
866	1723	// if( object instanceof java.io.File[])
867	1724	// {
..	..	@@ -869,7 +1726,11 @@
869	1726	// objEditor.DropFile((java.io.File[]) object, true);
870	1727	// return;
871	1728	// }
872		- if (string.charAt(0) == '/')
	1729	+
	1730	+ String string = object.toString();
	1731	+
	1732	+ // File path for Mac and Windows
	1733	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
873	1734	{
874	1735	// file(s)
875	1736	String[] names = string.split("\n");
..	..	@@ -896,7 +1757,7 @@
896	1757
897	1758	flashIt = false;
898	1759	CameraPane pane = (CameraPane) target;
899		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1760	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
900	1761	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
901	1762
902	1763	if (group.selection.size() == 1)
..	..	@@ -912,23 +1773,33 @@
912	1773
913	1774	assert target == objEditor.jTree;
914	1775	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1776	+ Object3D destinationLeaf;
915	1777	try {
916		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1778	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
917	1779	} catch (Exception e) {
918	1780	System.out.println("destinationPath : " + destinationPath);
919	1781	return;
920	1782	}
921	1783
922		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1784	+ for (int i=group.selection.size(); --i>=0;)
923	1785	{
	1786	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1787	+
	1788	+ // Cannot move into itself
	1789	+ if (child == destinationLeaf)
	1790	+ return;
	1791	+ }
	1792	+
	1793	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1794	+// {
924	1795	loadClipboard(true);
925	1796	objEditor.jTree.setSelectionPath(destinationPath);
926		- pasteInto(false);
927		- } else {
928		- loadClipboard(false);
929		- objEditor.jTree.setSelectionPath(destinationPath);
930		- pasteInto(false); // true); // ???
931		- }
	1797	+ pasteInto(false, false);
	1798	+// } else {
	1799	+// loadClipboard(false);
	1800	+// objEditor.jTree.setSelectionPath(destinationPath);
	1801	+// pasteInto(false, false); // true); // ???
	1802	+// }
932	1803	}
933	1804	public void dropActionChanged(DropTargetDragEvent dtde)
934	1805	// Called if the user has modified the current drop gesture
..	..	@@ -984,7 +1855,12 @@
984	1855	TreePath path;
985	1856
986	1857	public TransferableTreePath(TreePath tp) {
987		- path = tp;
	1858	+ Object[] objs = new Object[tp.getPathCount()];
	1859	+ for (int i=0; i<objs.length; i++)
	1860	+ {
	1861	+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
	1862	+ }
	1863	+ path = new TreePath(objs);
988	1864	}
989	1865
990	1866	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -1033,85 +1909,107 @@
1033	1909	{
1034	1910	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1035	1911	//heightFieldItem.addActionListener(this);
1036		- gridItem = menu.add(new MenuItem("Grid"));
1037		- gridItem.addActionListener(this);
1038		- rectoidItem = menu.add(new MenuItem("Box"));
1039		- rectoidItem.addActionListener(this);
1040		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1041		- ellipsoidItem.addActionListener(this);
1042		- coneItem = menu.add(new MenuItem("Cone"));
1043		- coneItem.addActionListener(this);
1044		- torusItem = menu.add(new MenuItem("Torus"));
1045		- torusItem.addActionListener(this);
1046		- superItem = menu.add(new MenuItem("Superellipsoid"));
1047		- superItem.addActionListener(this);
	1912	+// gridItem = menu.add(new MenuItem("Grid"));
	1913	+// gridItem.addActionListener(this);
	1914	+// rectoidItem = menu.add(new MenuItem("Box"));
	1915	+// rectoidItem.addActionListener(this);
	1916	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1917	+// ellipsoidItem.addActionListener(this);
	1918	+// coneItem = menu.add(new MenuItem("Cone"));
	1919	+// coneItem.addActionListener(this);
	1920	+// torusItem = menu.add(new MenuItem("Torus"));
	1921	+// torusItem.addActionListener(this);
	1922	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1923	+// superItem.addActionListener(this);
	1924	+
	1925	+ cameraItem = menu.add(new MenuItem("Camera"));
	1926	+ cameraItem.addActionListener(this);
	1927	+
	1928	+ if (!Globals.ADVANCED)
	1929	+ {
1048	1930	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1049	1931	kleinItem.addActionListener(this);
1050		- particleItem = menu.add(new MenuItem("Particle system"));
1051		- particleItem.addActionListener(this);
	1932	+ }
	1933	+
	1934	+// particleItem = menu.add(new MenuItem("Particle system"));
	1935	+// particleItem.addActionListener(this);
	1936	+ if (Globals.ADVANCED)
	1937	+ {
1052	1938	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1053	1939	ragdollItem.addActionListener(this);
1054	1940	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1055	1941	ragdoll2Item.addActionListener(this);
	1942	+ }
1056	1943	menu.add("-");
1057		- meshItem = menu.add(new MenuItem("Mesh"));
	1944	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1058	1945	meshItem.addActionListener(this);
1059	1946	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1060	1947	// meshGroupItem.addActionListener(this);
	1948	+ if (Globals.ADVANCED)
	1949	+ {
1061	1950	springItem = menu.add(new MenuItem("Spring"));
1062	1951	springItem.addActionListener(this);
1063	1952	flagItem = menu.add(new MenuItem("Flag"));
1064	1953	flagItem.addActionListener(this);
1065		- bezierItem = menu.add(new MenuItem("Patch"));
1066		- bezierItem.addActionListener(this);
1067		- checkerItem = menu.add(new MenuItem("Checker"));
1068		- checkerItem.addActionListener(this);
1069	1954	blobItem = menu.add(new MenuItem("Blob"));
1070	1955	blobItem.addActionListener(this);
1071	1956	latheItem = menu.add(new MenuItem("Lathe"));
1072	1957	latheItem.addActionListener(this);
1073		- lightItem = menu.add(new MenuItem("Light"));
1074		- lightItem.addActionListener(this);
	1958	+ }
	1959	+ bezierItem = menu.add(new MenuItem("Bezier Patch"));
	1960	+ bezierItem.addActionListener(this);
	1961	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1962	+// overlayItem.addActionListener(this);
	1963	+// lightItem = menu.add(new MenuItem("Light"));
	1964	+// lightItem.addActionListener(this);
1075	1965	menu.add("-");
1076	1966	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1077	1967	//superLoopItem.addActionListener(this);
1078		- loopItem = menu.add(new MenuItem("Loop"));
1079		- loopItem.addActionListener(this);
	1968	+// loopItem = menu.add(new MenuItem("Loop"));
	1969	+// loopItem.addActionListener(this);
1080	1970	doubleItem = menu.add(new MenuItem("Fork"));
1081	1971	doubleItem.addActionListener(this);
	1972	+ if (Globals.ADVANCED)
	1973	+ {
1082	1974	tripleItem = menu.add(new MenuItem("Trident"));
1083	1975	tripleItem.addActionListener(this);
	1976	+ }
1084	1977	}
1085	1978
1086	1979	void buildToolsMenu(Menu menu)
1087	1980	{
1088	1981	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1089	1982	animationItem.addItemListener(this);
1090		- animationItem.setState(CameraPane.ANIMATION);
	1983	+ animationItem.setState(Globals.ANIMATION);
	1984	+
	1985	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1986	+ archiveItem.addActionListener(this);
1091	1987
1092	1988	menu.add("-");
1093	1989	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1094	1990	parseverticesItem.addActionListener(this);
1095	1991	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1096	1992	textureFieldItem.addActionListener(this);
1097		- alignItem = menu.add(new MenuItem("Align"));
	1993	+ alignItem = menu.add(new MenuItem("Align Objects"));
1098	1994	alignItem.addActionListener(this);
1099		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1100		- mirrorItem.addActionListener(this);
1101	1995	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1102	1996	reduceMorphItem.addActionListener(this);
1103	1997	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1104	1998	reduce34MorphItem.addActionListener(this);
1105		-
1106		- menu.add(computeAOItem = new MenuItem("Compute AO"));
1107		- computeAOItem.addActionListener(this);
1108	1999	menu.add("-");
1109		-
1110	2000	menu.add(memoryItem = new MenuItem("Memory Usage"));
1111	2001	memoryItem.addActionListener(this);
	2002	+ menu.add(computeAOItem = new MenuItem("Compute AO"));
	2003	+ computeAOItem.addActionListener(this);
	2004	+
	2005	+ if (Globals.ADVANCED)
	2006	+ {
	2007	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	2008	+ mirrorItem.addActionListener(this);
	2009	+ menu.add("-");
1112	2010	menu.add(analyzeItem = new MenuItem("Analyze"));
1113	2011	analyzeItem.addActionListener(this);
1114		- menu.add(dumpItem = new MenuItem("Dump"));
	2012	+ menu.add(dumpItem = new MenuItem("Print"));
1115	2013	dumpItem.addActionListener(this);
1116	2014	// menu.add(pathItem = new MenuItem("From-to path"));
1117	2015	// pathItem.addActionListener(this);
..	..	@@ -1129,6 +2027,7 @@
1129	2027	menu.add("-");
1130	2028	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1131	2029	editScriptItem.addActionListener(this);
	2030	+ }
1132	2031	}
1133	2032
1134	2033	void ScreenFit()
..	..	@@ -1251,9 +2150,34 @@
1251	2150	shadow.material = new cMaterial(obj.material);
1252	2151	shadow.material.diffuse = 0.0001f;
1253	2152	shadow.material.specular = 0.0001f;
	2153	+ //shadow.projectedVertices[1].x = 300;
1254	2154
1255	2155	makeSomething(shadow);
1256	2156	}
	2157	+
	2158	+ private void ClearUnpinned()
	2159	+ {
	2160	+ //for (Object3D obj : listUI)
	2161	+ for (int i=listUI.size(); --i>=0;)
	2162	+ {
	2163	+ Object3D obj = listUI.elementAt(i);
	2164	+ if (!obj.pinned)
	2165	+ {
	2166	+ obj.CloseUI();
	2167	+ listUI.remove(i);
	2168	+ }
	2169	+ }
	2170	+ }
	2171	+
	2172	+ private void EditElement(Object3D elem, boolean newWindow)
	2173	+ {
	2174	+ // if (!(elem instanceof Composite))
	2175	+ // newWindow = false;
	2176	+ listUI.add(elem);
	2177	+ elem.openEditWindow(this, newWindow); //, false);
	2178	+ System.out.println("edit : " + elem);
	2179	+ elem.editWindow.refreshContents(true); // ? new
	2180	+ }
1257	2181
1258	2182	/**
1259	2183	* applyExample
..	..	@@ -1457,9 +2381,9 @@
1457	2381
1458	2382	void Overwrite(int mask)
1459	2383	{
1460		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2384	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1461	2385	{
1462		- Object3D content = GrafreeD.clipboard.get(0);
	2386	+ Object3D content = Grafreed.clipboard.get(0);
1463	2387
1464	2388	if (content instanceof cGroup && ((cGroup)content).transientlink )
1465	2389	content = ((cGroup)content).get(0);
..	..	@@ -1482,6 +2406,7 @@
1482	2406	//
1483	2407	public void actionPerformed(ActionEvent event) // , Object arg)
1484	2408	{
	2409	+ Object source = event.getSource();
1485	2410	/*
1486	2411	if (event.getSource() == nameField)
1487	2412	{
..	..	@@ -1493,11 +2418,11 @@
1493	2418	}
1494	2419	else
1495	2420	*/
1496		- if (event.getSource() == lookAtItem \|\| event.getSource() == lookFromItem)
	2421	+ if (source == lookAtItem \|\| source == lookFromItem)
1497	2422	{
1498	2423	ScreenFit();
1499	2424	} else
1500		- if (event.getSource() == switchItem)
	2425	+ if (source == switchViewItem)
1501	2426	{
1502	2427	cVector v1 = new cVector();
1503	2428	cVector v2 = new cVector();
..	..	@@ -1506,11 +2431,11 @@
1506	2431	objEditor.cameraView.renderCamera.setAim(v2, v1);
1507	2432	objEditor.cameraView.repaint();
1508	2433	} else
1509		- if (event.getSource() == rectoidItem)
	2434	+ if (source == rectoidItem \|\| source == boxButton)
1510	2435	{
1511	2436	makeSomething(new Box());
1512	2437	} else
1513		- if (event.getSource() == particleItem)
	2438	+ if (source == particleItem \|\| source == particlesButton)
1514	2439	{
1515	2440	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1516	2441	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1531,9 +2456,9 @@
1531	2456	applyExample(particleGeom, "SMOKE");
1532	2457	makeSomething(particleGeom);
1533	2458	} else
1534		- if (event.getSource() == ragdollItem \|\| event.getSource() == ragdoll2Item)
	2459	+ if (source == ragdollItem \|\| source == ragdoll2Item)
1535	2460	{
1536		- GenericJoint ragdoll = new GenericJoint(event.getSource() == ragdollItem);
	2461	+ GenericJoint ragdoll = new GenericJoint(source == ragdollItem);
1537	2462
1538	2463	ragdoll.toParent = LA.newMatrix();
1539	2464	ragdoll.fromParent = LA.newMatrix();
..	..	@@ -1551,7 +2476,7 @@
1551	2476	} else
1552	2477	/*
1553	2478	*/
1554		- if (event.getSource() == heightFieldItem)
	2479	+ if (source == heightFieldItem)
1555	2480	{
1556	2481	Object3D obj = new Object3D();
1557	2482
..	..	@@ -1589,31 +2514,31 @@
1589	2514
1590	2515	makeSomething(obj);
1591	2516	} else
1592		- if (event.getSource() == gridItem)
	2517	+ if (source == gridItem \|\| source == gridButton)
1593	2518	{
1594	2519	makeSomething(new Grid());
1595	2520	} else
1596		- if (event.getSource() == ellipsoidItem)
	2521	+ if (source == ellipsoidItem \|\| source == sphereButton)
1597	2522	{
1598	2523	makeSomething(new Sphere());
1599	2524	} else
1600		- if (event.getSource() == coneItem)
	2525	+ if (source == coneItem \|\| source == coneButton)
1601	2526	{
1602	2527	makeSomething(new Cone());
1603	2528	} else
1604		- if (event.getSource() == torusItem)
	2529	+ if (source == torusItem \|\| source == torusButton)
1605	2530	{
1606	2531	makeSomething(new Torus());
1607	2532	} else
1608		- if (event.getSource() == superItem)
	2533	+ if (source == superItem \|\| source == superButton)
1609	2534	{
1610	2535	makeSomething(new Superellipsoid());
1611	2536	} else
1612		- if (event.getSource() == kleinItem)
	2537	+ if (source == kleinItem \|\| source == kleinButton)
1613	2538	{
1614	2539	makeSomething(new Klein());
1615	2540	} else
1616		- if (event.getSource() == blobItem)
	2541	+ if (source == blobItem)
1617	2542	{
1618	2543	Blob blob = new Blob();
1619	2544	BlobComponent comp = new BlobComponent();
..	..	@@ -1621,15 +2546,15 @@
1621	2546	//blob.retile();
1622	2547	makeSomething(blob);
1623	2548	} else
1624		- if (event.getSource() == latheItem)
	2549	+ if (source == latheItem)
1625	2550	{
1626	2551	makeSomething(new Lathe());
1627	2552	} else
1628		- if (event.getSource() == bezierItem)
	2553	+ if (source == bezierItem)
1629	2554	{
1630	2555	makeSomething(new BezierSurface());
1631	2556	} else
1632		- if (event.getSource() == checkerItem)
	2557	+ if (source == overlayItem \|\| source == overlayButton)
1633	2558	{
1634	2559	/*
1635	2560	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1644,7 +2569,7 @@
1644	2569	*/
1645	2570	makeSomething(new Checker());
1646	2571	} else
1647		- if (event.getSource() == meshItem)
	2572	+ if (source == meshItem)
1648	2573	{
1649	2574	Object3D itemtomake = new Object3D();
1650	2575	Object3D child;
..	..	@@ -1665,35 +2590,52 @@
1665	2590	makeSomething(child);
1666	2591	}
1667	2592	} else
1668		- if (event.getSource() == springItem)
	2593	+ if (source == springItem)
1669	2594	{
1670	2595	cSpring s = new cSpring();
1671	2596	s.setup();
1672	2597	makeSomething(s);
1673	2598	} else
1674		- if (event.getSource() == flagItem)
	2599	+ if (source == flagItem)
1675	2600	{
1676	2601	cSpring s = new cFlag();
1677	2602	s.setup();
1678	2603	makeSomething(s);
1679	2604	} else
1680		- if (event.getSource() == lightItem)
	2605	+ if (source == lightItem \|\| source == lightButton)
1681	2606	{
1682	2607	makeSomething(new Light());
1683	2608	} else
1684		- if (event.getSource() == csgItem)
	2609	+// if (source == skybox1Button \|\|
	2610	+// source == skybox2Button \|\|
	2611	+// source == skybox3Button \|\|
	2612	+// source == skybox4Button \|\|
	2613	+// source == skybox5Button \|\|
	2614	+// source == skybox6Button \|\|
	2615	+// source == skybox7Button \|\|
	2616	+// source == skybox11Button \|\|
	2617	+// source == skybox12Button \|\|
	2618	+// source == skybox13Button \|\|
	2619	+// source == skybox14Button \|\|
	2620	+// source == skybox15Button \|\|
	2621	+// source == skybox16Button \|\|
	2622	+// source == skybox17Button)
	2623	+// {
	2624	+// ChangeSkybox(source);
	2625	+// } else
	2626	+ if (source == csgItem)
1685	2627	{
1686	2628	group(new CSG());
1687	2629	} else
1688		- if (event.getSource() == templateItem)
	2630	+ if (source == templateItem)
1689	2631	{
1690	2632	group(new cTemplate());
1691	2633	} else
1692		- if (event.getSource() == attributeItem)
	2634	+ if (source == attributeItem)
1693	2635	{
1694	2636	makeSomething(new Attribute());
1695	2637	} else
1696		- if (event.getSource() == pointflowItem)
	2638	+ if (source == pointflowItem)
1697	2639	{
1698	2640	makeSomething(new PointFlow());
1699	2641	} else
..	..	@@ -1705,7 +2647,7 @@
1705	2647	} else
1706	2648	*/
1707	2649
1708		- if (event.getSource() == superLoopItem)
	2650	+ if (source == superLoopItem)
1709	2651	{
1710	2652	Composite g = new cGroup();
1711	2653	for (int i=0; i<15; i++)
..	..	@@ -1727,30 +2669,30 @@
1727	2669
1728	2670	group(g);
1729	2671	} else
1730		- if (event.getSource() == loopItem)
	2672	+ if (source == loopItem \|\| source == loopButton)
1731	2673	{
1732	2674	Composite csg = new GroupLeaf();
1733	2675	csg.count = 5;
1734	2676	group(csg);
1735		- Composite child = new cGroup();
	2677	+ Composite child = new cGroup("Branch");
1736	2678	csg.addChild(child);
1737	2679	child.addChild(csg);
1738	2680	} else
1739		- if (event.getSource() == doubleItem)
	2681	+ if (source == doubleItem)
1740	2682	{
1741		- Composite csg = new GroupLeaf();
	2683	+ Composite csg = new GroupLeaf("Fork");
1742	2684	csg.count = 5;
1743	2685	group(csg);
1744		- Composite child = new cGroup();
	2686	+ Composite child = new cGroup("Branch A");
1745	2687	csg.addChild(child);
1746	2688	child.addChild(csg);
1747		- child = new cGroup();
	2689	+ child = new cGroup("Branch B");
1748	2690	csg.addChild(child);
1749	2691	child.addChild(csg);
1750	2692	} else
1751		- if (event.getSource() == tripleItem)
	2693	+ if (source == tripleItem)
1752	2694	{
1753		- Composite csg = new GroupLeaf();
	2695	+ Composite csg = new GroupLeaf("Trident");
1754	2696	csg.count = 4;
1755	2697	group(csg);
1756	2698	Composite child = new cGroup();
..	..	@@ -1763,73 +2705,117 @@
1763	2705	csg.addChild(child);
1764	2706	child.addChild(csg);
1765	2707	} else
1766		-
1767		- if (event.getSource() == importGFDItem)
1768		- {
1769		- ImportGFD();
1770		- } else
1771		- if (event.getSource() == importVRMLX3DItem)
1772		- {
1773		- ImportVRMLX3D();
1774		- } else
1775		- if (event.getSource() == import3DSItem)
1776		- {
1777		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1778		- } else
1779		- if (event.getSource() == importOBJItem)
1780		- {
1781		- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1782		- } else
1783		- if (event.getSource() == computeAOItem)
	2708	+ if (source == computeAOItem)
1784	2709	{
1785	2710	Globals.drawMode = CameraPane.OCCLUSION;
1786		- CameraPane.theRenderer.repaint();
	2711	+ cameraView.repaint();
1787	2712	} else
1788		- if (event.getSource() == recompileItem)
	2713	+ if (source == recompileItem)
1789	2714	{
1790	2715	Recompile();
1791	2716	refreshContents();
1792	2717	} else
1793		- if (event.getSource() == editScriptItem)
	2718	+ if (source == editScriptItem)
1794	2719	{
1795	2720	OpenDialog();
1796	2721	refreshContents();
1797	2722	} else
1798		- if (event.getSource() == invariantsItem)
	2723	+ if (source == invariantsItem)
1799	2724	{
1800	2725	System.out.println("Invariants:");
1801		- GrafreeD.grafreeD.universe.invariants();
	2726	+ Grafreed.grafreed.universe.invariants();
1802	2727	} else
1803		- if (event.getSource() == memoryItem)
	2728	+ if (source == memoryItem)
1804	2729	{
1805	2730	//System.out.println("Invariants:");
1806	2731	PrintMemory();
1807	2732	} else
1808		- if (event.getSource() == pathItem)
	2733	+ if (source == pathItem)
1809	2734	{
1810	2735	PrintPath();
1811	2736	} else
1812		- if (event.getSource() == analyzeItem)
	2737	+ if (source == analyzeItem)
1813	2738	{
1814	2739	AnalyzeObject();
1815	2740	} else
1816		- if (event.getSource() == dumpItem)
	2741	+ if (source == dumpItem)
1817	2742	{
1818	2743	DumpObject();
1819	2744	} else
1820		- if (event.getSource() == screenfitButton)
	2745	+ if (source == minButton)
1821	2746	{
1822		- //Reload(lastConverter, lastFilename, true);
	2747	+ Minimize();
	2748	+ } else
	2749	+ if (source == maxButton)
	2750	+ {
	2751	+ Maximize();
	2752	+ } else
	2753	+ if (source == fullButton)
	2754	+ {
	2755	+ ToggleFullScreen();
	2756	+ } else
	2757	+ if (source == collapseButton)
	2758	+ {
	2759	+ this.expandedLayout = radio.layout;
	2760	+ CollapseToolbar();
	2761	+ } else
	2762	+ if (source == maximize3DButton)
	2763	+ {
	2764	+ this.expandedLayout = radio.layout;
	2765	+ radio.layout = twoButton;
	2766	+ Show3DView();
	2767	+ CollapseToolbar();
	2768	+ } else
	2769	+ if (source == previousVersionButton)
	2770	+ {
	2771	+ // Go to previous version
	2772	+ //if (!Undo())
	2773	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2774	+ PreviousVersion();
	2775	+ } else
	2776	+ if (source == restoreButton)
	2777	+ {
	2778	+ // Restore current version
	2779	+ Restore();
	2780	+ //restoreButton.setEnabled(false);
	2781	+ } else
	2782	+ if (source == replaceButton)
	2783	+ {
	2784	+ // Overwrite current version
	2785	+ Replace();
	2786	+ //replaceButton.setEnabled(false);
	2787	+ } else
	2788	+ if (source == nextVersionButton)
	2789	+ {
	2790	+ // Go to next version
	2791	+ NextVersion();
	2792	+ } else
	2793	+ if (source == saveVersionButton)
	2794	+ {
	2795	+ // Save a new version
	2796	+ if (!Save(true))
	2797	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2798	+ } else
	2799	+ if (source == deleteVersionButton)
	2800	+ {
	2801	+ // Delete a new version
	2802	+ DeleteVersion();
	2803	+ } else
	2804	+ if (source == oneStepButton)
	2805	+ {
	2806	+ Globals.ONESTEP = true;
	2807	+ cameraView.repaint();
	2808	+ } else
	2809	+ if (source == screenfitButton)
	2810	+ {
1823	2811	ScreenFit();
1824	2812	} else
1825		- if (event.getSource() == screenfitpointButton)
	2813	+ if (source == screenfitpointButton)
1826	2814	{
1827		- //Reload(lastConverter, lastFilename, true);
1828	2815	ScreenFitPoint();
1829	2816	} else
1830		- if (event.getSource() == snapobjectButton)
	2817	+ if (source == snapobjectButton)
1831	2818	{
1832		- //Reload(lastConverter, lastFilename, true);
1833	2819	SnapObject();
1834	2820	} else
1835	2821	// if (event.getSource() == recompileButton)
..	..	@@ -1838,13 +2824,13 @@
1838	2824	// Recompile();
1839	2825	// refreshContents();
1840	2826	// } else
1841		- if (event.getSource() == gcButton)
	2827	+ if (source == gcButton)
1842	2828	{
1843	2829	System.out.println("Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1844	2830	System.gc();
1845	2831	System.out.println("GC Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1846	2832	} else
1847		- if (event.getSource() == editLeafItem)
	2833	+ if (source == editLeafItem)
1848	2834	{
1849	2835	Object3D obj;
1850	2836	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -1858,62 +2844,74 @@
1858	2844	}
1859	2845	refreshContents(true);
1860	2846	} else
1861		- if (event.getSource() == openWindowItem)
	2847	+ if (source == openWindowItem)
1862	2848	{
1863	2849	EditSelection(true);
1864	2850	} else
1865		- if (event.getSource() == cutItem \|\| event.getSource() == clearButton)
	2851	+ if (source == cutItem \|\| source == clearButton)
1866	2852	{
1867	2853	loadClipboard(true);
1868	2854	} else
1869		- if (event.getSource() == duplicateItem)
	2855	+ if (source == undoItem)
1870	2856	{
1871		- Object3D keep = GrafreeD.clipboard;
	2857	+ PreviousVersion();
	2858	+ } else
	2859	+ if (source == redoItem)
	2860	+ {
	2861	+ NextVersion();
	2862	+ } else
	2863	+ if (source == duplicateItem)
	2864	+ {
	2865	+ Object3D keep = Grafreed.clipboard;
1872	2866	loadClipboard(false);
1873	2867	paste(false);
1874		- GrafreeD.clipboard = keep;
	2868	+ Grafreed.clipboard = keep;
1875	2869	} else
1876		- if (event.getSource() == cloneItem)
	2870	+ if (source == cloneItem)
1877	2871	{
1878	2872	CloneSelection(false);
1879	2873	} else
1880		- if (event.getSource() == cloneSupportItem)
	2874	+ if (source == cloneSupportItem)
1881	2875	{
1882	2876	CloneSelection(true);
1883	2877	} else
1884		- if (event.getSource() == copyItem)
	2878	+ if (source == copyItem)
1885	2879	{
1886	2880	loadClipboard(false);
1887	2881	} else
1888		- if (event.getSource() == pasteItem)
	2882	+ if (source == pasteItem)
1889	2883	{
1890	2884	paste(false);
1891	2885	} else
1892		- if (event.getSource() == pasteLinkItem)
	2886	+ if (source == pasteIntoItem)
1893	2887	{
1894		- pasteInto(false);
	2888	+ pasteInto(true, false);
1895	2889	} else
1896		- if (event.getSource() == pasteCloneItem)
	2890	+ if (source == pasteLinkItem)
1897	2891	{
1898		- pasteInto(true);
	2892	+ pasteInto(false, false);
1899	2893	} else
1900		- if (event.getSource() == pasteExpandItem)
	2894	+ if (source == pasteCloneItem)
	2895	+ {
	2896	+ pasteInto(true, true);
	2897	+ } else
	2898	+ if (source == pasteExpandItem)
1901	2899	{
1902	2900	paste(true);
1903	2901	} else
1904		- if (event.getSource() == synchronizeItem)
	2902	+ if (source == synchronizeItem)
1905	2903	{
1906	2904	Overwrite(Object3D.TRANSFORM);
1907	2905	} else
1908		- if (event.getSource() == overwriteNameItem)
	2906	+ if (source == overwriteNameItem)
1909	2907	{
1910	2908	Overwrite(Object3D.NAME);
1911	2909	} else
1912		- if (event.getSource() == overwriteUVItem)
	2910	+ if (source == overwriteUVItem)
1913	2911	{
1914	2912	Overwrite(Object3D.UV);
1915	2913	} else
1916		- if (event.getSource() == overwriteMatItem)
	2914	+ if (source == overwriteMatItem)
1917	2915	{
1918	2916	/* july 2015
1919	2917	if ((dropAttributes & Object3D.TEXTURE) == 0)
..	..	@@ -1933,7 +2931,7 @@
1933	2931
1934	2932	Overwrite(dropAttributes);
1935	2933	}
1936		- if (event.getSource() == overwriteGeoItem)
	2934	+ if (source == overwriteGeoItem)
1937	2935	{
1938	2936	Overwrite(Object3D.GEOMETRY);
1939	2937	// if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
..	..	@@ -1950,7 +2948,7 @@
1950	2948	// refreshContents();
1951	2949	// }
1952	2950	} else
1953		- if (event.getSource() == generateMeshItem)
	2951	+ if (source == generateMeshItem)
1954	2952	{
1955	2953	//if (group.selection.size() == 1)
1956	2954	// for (int i=0; i<group.selection.size(); i++)
..	..	@@ -1961,7 +2959,7 @@
1961	2959	ResetModel();
1962	2960	refreshContents();
1963	2961	} else
1964		- if (event.getSource() == extractGeometriesItem)
	2962	+ if (source == extractGeometriesItem)
1965	2963	{
1966	2964	boolean one = false;
1967	2965
..	..	@@ -1988,7 +2986,7 @@
1988	2986	ResetModel();
1989	2987	refreshContents();
1990	2988	} else
1991		- if (event.getSource() == cloneGeometriesItem)
	2989	+ if (source == cloneGeometriesItem)
1992	2990	{
1993	2991	boolean one = false;
1994	2992
..	..	@@ -2014,7 +3012,7 @@
2014	3012	ResetModel();
2015	3013	refreshContents();
2016	3014	} else
2017		- if (event.getSource() == shareGeometriesItem)
	3015	+ if (source == shareGeometriesItem)
2018	3016	{
2019	3017	boolean one = false;
2020	3018
..	..	@@ -2044,7 +3042,7 @@
2044	3042	refreshContents();
2045	3043	}
2046	3044	} else
2047		- if (event.getSource() == mergeGeometriesItem)
	3045	+ if (source == mergeGeometriesItem)
2048	3046	{
2049	3047	boolean one = false;
2050	3048
..	..	@@ -2074,7 +3072,7 @@
2074	3072	ResetModel();
2075	3073	refreshContents();
2076	3074	} else
2077		- if (event.getSource() == linkverticesItem)
	3075	+ if (source == linkverticesItem)
2078	3076	{
2079	3077	// if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2080	3078	// {
..	..	@@ -2087,48 +3085,48 @@
2087	3085	// group.selection.get(0).setMasterThis(content); // should be identity
2088	3086	// refreshContents();
2089	3087	// }
2090		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	3088	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2091	3089	{
2092		- Object3D content = GrafreeD.clipboard.get(0);
	3090	+ Object3D content = Grafreed.clipboard.get(0);
2093	3091
2094	3092	if (content instanceof cGroup && ((cGroup)content).transientlink )
2095	3093	content = ((cGroup)content).get(0);
2096	3094
2097		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	3095	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2098	3096	for (int i=0; i<group.selection.size(); i++)
2099	3097	{
2100		- boolean random = CameraPane.RANDOM;
2101		- CameraPane.RANDOM = false; // parse all random nodes
	3098	+ boolean random = CameraPane.SWITCH;
	3099	+ CameraPane.SWITCH = false; // parse all random nodes
2102	3100	group.selection.get(i).linkVerticesThis(content);
2103	3101	// group.selection.get(i).setMasterThis(content); // should be identity
2104		- CameraPane.RANDOM = random;
	3102	+ CameraPane.SWITCH = random;
2105	3103	}
2106		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	3104	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2107	3105	refreshContents();
2108	3106	}
2109	3107	} else
2110		- if (event.getSource() == resetsupportItem)
	3108	+ if (source == resetsupportItem)
2111	3109	{
2112	3110	for (int i=0; i<group.selection.size(); i++)
2113	3111	{
2114		- boolean random = CameraPane.RANDOM;
2115		- CameraPane.RANDOM = false; // parse all random nodes
	3112	+ boolean random = CameraPane.SWITCH;
	3113	+ CameraPane.SWITCH = false; // parse all random nodes
2116	3114	group.selection.get(i).linkVerticesThis(null);
2117		- CameraPane.RANDOM = random;
	3115	+ CameraPane.SWITCH = random;
2118	3116	}
2119	3117
2120	3118	refreshContents();
2121	3119	} else
2122		- if (event.getSource() == relinkverticesItem)
	3120	+ if (source == relinkverticesItem)
2123	3121	{
2124		- boolean random = CameraPane.RANDOM;
2125		- CameraPane.RANDOM = false; // parse all random nodes
	3122	+ boolean random = CameraPane.SWITCH;
	3123	+ CameraPane.SWITCH = false; // parse all random nodes
2126	3124	group.selection.RelinkToSupport();
2127		- CameraPane.RANDOM = random;
	3125	+ CameraPane.SWITCH = random;
2128	3126
2129	3127	refreshContents();
2130	3128	} else
2131		- if (event.getSource() == resetreferencesItem)
	3129	+ if (source == resetreferencesItem)
2132	3130	{
2133	3131	for (int i=0; i<group.selection.size(); i++)
2134	3132	{
..	..	@@ -2137,11 +3135,11 @@
2137	3135
2138	3136	refreshContents();
2139	3137	} else
2140		- if (event.getSource() == setMasterItem)
	3138	+ if (source == setMasterItem)
2141	3139	{
2142		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	3140	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2143	3141	{
2144		- Object3D content = GrafreeD.clipboard.get(0);
	3142	+ Object3D content = Grafreed.clipboard.get(0);
2145	3143
2146	3144	if (content instanceof cGroup && ((cGroup)content).transientlink )
2147	3145	content = ((cGroup)content).get(0);
..	..	@@ -2150,13 +3148,13 @@
2150	3148	refreshContents();
2151	3149	}
2152	3150	} else
2153		- if (event.getSource() == poseMeshItem)
	3151	+ if (source == poseMeshItem)
2154	3152	{
2155	3153	if (group.selection.size() == 1)
2156	3154	{
2157		- if (GrafreeD.clipboard.size() == 1)
	3155	+ if (Grafreed.clipboard.size() == 1)
2158	3156	{
2159		- Object3D content = GrafreeD.clipboard.get(0);
	3157	+ Object3D content = Grafreed.clipboard.get(0);
2160	3158
2161	3159	if (content instanceof cGroup && ((cGroup)content).transientlink )
2162	3160	content = ((cGroup)content).get(0);
..	..	@@ -2169,19 +3167,19 @@
2169	3167	}
2170	3168
2171	3169	} else
2172		- if (event.getSource() == revertMeshItem)
	3170	+ if (source == revertMeshItem)
2173	3171	{
2174	3172	RevertMeshes();
2175	3173	} else
2176		- if (event.getSource() == resetMeshItem)
	3174	+ if (source == resetAllItem)
2177	3175	{
2178	3176	ResetAll();
2179	3177	} else
2180		- if (event.getSource() == stepAllItem)
	3178	+ if (source == stepAllItem)
2181	3179	{
2182	3180	StepAll();
2183	3181	} else
2184		- if (event.getSource() == clearItem) // \|\| event.getSource() == clearButton)
	3182	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2185	3183	{
2186	3184	//int indices[] = jList.getSelectedIndices();
2187	3185	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2189,46 +3187,46 @@
2189	3187
2190	3188	ClearSelection(false);
2191	3189	} else
2192		- if (event.getSource() == clearAllItem)
	3190	+ if (source == clearAllItem)
2193	3191	{
2194	3192	ClearSelection(true);
2195	3193	} else
2196		- if (event.getSource() == grabItem)
	3194	+ if (source == grabItem \|\| source == groupButton)
2197	3195	{
2198		- group(new cGroup(), true);
	3196	+ group(new cGroup(), false); // true);
2199	3197	} else
2200		- if (event.getSource() == hideItem)
	3198	+ if (source == hideItem)
2201	3199	{
2202	3200	group(new HiddenObject());
2203	3201	} else
2204		- if (event.getSource() == frontItem)
	3202	+ if (source == frontItem)
2205	3203	{
2206	3204	front();
2207	3205	} else
2208		- if (event.getSource() == backItem)
	3206	+ if (source == backItem)
2209	3207	{
2210	3208	back();
2211	3209	} else
2212		- if (event.getSource() == cameraItem)
	3210	+ if (source == cameraItem)
2213	3211	{
2214	3212	makeSomething(new Camera());
2215	3213	} else
2216		- if (event.getSource() == compositeItem)
	3214	+ if (source == compositeItem \|\| source == compositeButton)
2217	3215	{
2218	3216	group(new Composite());
2219	3217	} else
2220		- if (event.getSource() == randomItem)
	3218	+ if (source == switchItem \|\| source == switchButton)
2221	3219	{
2222	3220	RandomNode random = new RandomNode();
2223	3221	group(random);
2224	3222	if (random.size() > 0)
2225		- random.name = random.get(0).name + "Rnd";
	3223	+ random.name = random.get(0).name + "Switch";
2226	3224	} else
2227		- if (event.getSource() == physicsItem)
	3225	+ if (source == physicsItem)
2228	3226	{
2229	3227	group(new PhysicsNode());
2230	3228	} else
2231		- if (event.getSource() == frameselectorItem)
	3229	+ if (source == frameselectorItem)
2232	3230	{
2233	3231	for (int i=0; i<group.selection.size(); i++)
2234	3232	{
..	..	@@ -2240,7 +3238,7 @@
2240	3238	ResetModel();
2241	3239	refreshContents();
2242	3240	} else
2243		- if (event.getSource() == switchGeoItem)
	3241	+ if (source == switchGeoItem)
2244	3242	{
2245	3243	for (int i=0; i<group.selection.size(); i++)
2246	3244	{
..	..	@@ -2252,7 +3250,7 @@
2252	3250	ResetModel();
2253	3251	refreshContents();
2254	3252	} else
2255		- if (event.getSource() == switchTransfoItem)
	3253	+ if (source == switchTransfoItem)
2256	3254	{
2257	3255	for (int i=0; i<group.selection.size(); i++)
2258	3256	{
..	..	@@ -2264,7 +3262,7 @@
2264	3262	ResetModel();
2265	3263	refreshContents();
2266	3264	} else
2267		- if (event.getSource() == morphItem)
	3265	+ if (source == morphItem)
2268	3266	{
2269	3267	for (int i=0; i<group.selection.size(); i++)
2270	3268	{
..	..	@@ -2276,7 +3274,7 @@
2276	3274	ResetModel();
2277	3275	refreshContents();
2278	3276	} else
2279		- if (event.getSource() == scriptNodeItem)
	3277	+ if (source == scriptNodeItem)
2280	3278	{
2281	3279	boolean atleastone = false;
2282	3280
..	..	@@ -2315,215 +3313,252 @@
2315	3313	}
2316	3314	}
2317	3315	} else
2318		- if (event.getSource() == linkerItem)
	3316	+ if (source == linkerItem)
2319	3317	{
2320	3318	group(new cLinker());
2321	3319	} else
2322		- if (event.getSource() == textureItem)
	3320	+ if (source == textureItem \|\| source == textureButton)
2323	3321	{
2324	3322	group(new TextureNode());
2325	3323	} else
2326		- if (event.getSource() == billboardItem)
	3324	+ if (source == billboardItem)
2327	3325	{
2328	3326	group(new BillboardNode());
2329	3327	} else
2330		- if (event.getSource() == shadowXItem)
	3328	+ if (source == shadowXItem)
2331	3329	{
2332	3330	CastShadow(0);
2333	3331	} else
2334		- if (event.getSource() == shadowYItem)
	3332	+ if (source == shadowYItem)
2335	3333	{
2336	3334	CastShadow(1);
2337	3335	} else
2338		- if (event.getSource() == shadowZItem)
	3336	+ if (source == shadowZItem)
2339	3337	{
2340	3338	CastShadow(2);
2341	3339	} else
2342		- if (event.getSource() == ungroupItem)
	3340	+ if (source == ungroupItem \|\| source == ungroupButton)
2343	3341	{
2344		- //ungroup();
	3342	+ boolean hasRoot = false;
	3343	+
2345	3344	for (int i=0; i<group.selection.size(); i++)
2346	3345	{
2347		- Ungroup(group.selection.get(i));
	3346	+ if (group.selection.get(i) == group)
	3347	+ {
	3348	+ hasRoot = true;
	3349	+ break;
	3350	+ }
2348	3351	}
2349	3352
2350		- ClearSelection(false);
2351		-
2352		- refreshContents();
	3353	+ if (!hasRoot)
	3354	+ {
	3355	+ for (int i=0; i<group.selection.size(); i++)
	3356	+ {
	3357	+ Ungroup(group.selection.get(i));
	3358	+ }
	3359	+
	3360	+ ClearSelection(false);
	3361	+
	3362	+ refreshContents();
	3363	+ }
2353	3364	} else
2354		- if (event.getSource() == genUVItem)
	3365	+ if (source == genUVItem)
2355	3366	{
2356	3367	GenUV();
2357	3368	} else
2358		- if (event.getSource() == genNormalsCADItem)
	3369	+ if (source == genNormalsCADItem)
2359	3370	{
2360	3371	GenNormals(true);
2361	3372	} else
2362		- if (event.getSource() == genNormalsMESHItem)
	3373	+ if (source == genNormalsMESHItem)
2363	3374	{
2364		- GenNormals(true); // TODO
	3375	+ GenNormalsMESH();
2365	3376	} else
2366		- if (event.getSource() == genNormalsORGANItem)
	3377	+ if (source == genNormalsORGANItem)
2367	3378	{
2368	3379	GenNormals(false);
2369	3380	} else
2370		- if (event.getSource() == genNormalsMINEItem)
	3381	+ if (source == genNormalsMINEItem)
2371	3382	{
2372	3383	GenNormalsMINE();
2373	3384	} else
2374		- if (event.getSource() == stripifyItem)
	3385	+ if (source == stripifyItem)
2375	3386	{
2376	3387	Stripify();
2377	3388	} else
2378		- if (event.getSource() == unstripifyItem)
	3389	+ if (source == unstripifyItem)
2379	3390	{
2380	3391	Unstripify();
2381	3392	} else
2382		- if (event.getSource() == trimItem)
	3393	+ if (source == trimItem)
2383	3394	{
2384	3395	Trim();
2385	3396	} else
2386		- if (event.getSource() == untrimItem)
	3397	+ if (source == untrimItem)
2387	3398	{
2388	3399	Untrim();
2389	3400	} else
2390		- if (event.getSource() == clearColorsItem)
	3401	+ if (source == clearColorsItem)
2391	3402	{
2392	3403	ClearColors();
2393	3404	} else
2394		- if (event.getSource() == clearMaterialsItem)
	3405	+ if (source == clearMaterialsItem)
2395	3406	{
2396	3407	ClearMaterials();
2397	3408	} else
2398		- if (event.getSource() == liveleavesItem)
	3409	+ if (source == liveleavesItem)
2399	3410	{
2400	3411	LiveLeaves(true);
2401	3412	} else
2402		- if (event.getSource() == unliveleavesItem)
	3413	+ if (source == unliveleavesItem)
2403	3414	{
2404	3415	LiveLeaves(false);
2405	3416	} else
2406		- if (event.getSource() == supportleavesItem)
	3417	+ if (source == supportleavesItem)
2407	3418	{
2408	3419	SupportLeaves(true);
2409	3420	} else
2410		- if (event.getSource() == unsupportleavesItem)
	3421	+ if (source == unsupportleavesItem)
2411	3422	{
2412	3423	SupportLeaves(false);
2413	3424	} else
2414		- if (event.getSource() == hideleavesItem)
	3425	+ if (source == hideleavesItem)
2415	3426	{
2416	3427	HideLeaves(true);
2417	3428	} else
2418		- if (event.getSource() == showleavesItem)
	3429	+ if (source == showleavesItem)
2419	3430	{
2420	3431	HideLeaves(false);
2421	3432	} else
2422		- if (event.getSource() == markleavesItem)
	3433	+ if (source == markleavesItem)
2423	3434	{
2424	3435	MarkLeaves(true);
2425	3436	} else
2426		- if (event.getSource() == unmarkleavesItem)
	3437	+ if (source == unmarkleavesItem)
2427	3438	{
2428	3439	MarkLeaves(false);
2429	3440	} else
2430		- if (event.getSource() == flipVItem)
	3441	+ if (source == rewindleavesItem)
	3442	+ {
	3443	+ RewindLeaves(true);
	3444	+ } else
	3445	+ if (source == unrewindleavesItem)
	3446	+ {
	3447	+ RewindLeaves(false);
	3448	+ } else
	3449	+ if (source == randomleavesItem)
	3450	+ {
	3451	+ RandomLeaves(true);
	3452	+ } else
	3453	+ if (source == unrandomleavesItem)
	3454	+ {
	3455	+ RandomLeaves(false);
	3456	+ } else
	3457	+ if (source == flipVItem)
2431	3458	{
2432	3459	FlipV(true);
2433	3460	} else
2434		- if (event.getSource() == unflipVItem)
	3461	+ if (source == unflipVItem)
2435	3462	{
2436	3463	FlipV(false);
2437	3464	} else
2438		- if (event.getSource() == lowTexturesItem)
	3465	+ if (source == lowTexturesItem)
2439	3466	{
2440	3467	SetTexRes(0);
2441	3468	} else
2442		- if (event.getSource() == normalTexturesItem)
	3469	+ if (source == normalTexturesItem)
2443	3470	{
2444	3471	SetTexRes(1);
2445	3472	} else
2446		- if (event.getSource() == highTexturesItem)
	3473	+ if (source == highTexturesItem)
2447	3474	{
2448	3475	SetTexRes(2);
2449	3476	} else
2450		- if (event.getSource() == veryhighTexturesItem)
	3477	+ if (source == veryhighTexturesItem)
2451	3478	{
2452	3479	SetTexRes(3);
2453	3480	} else
2454		- if (event.getSource() == maxTexturesItem)
	3481	+ if (source == maxTexturesItem)
2455	3482	{
2456	3483	SetTexRes(4);
2457	3484	} else
2458		- if (event.getSource() == panoTexturesItem)
	3485	+ if (source == panoTexturesItem)
2459	3486	{
2460	3487	SetTexRes(5);
2461	3488	} else
2462		- if (event.getSource() == reverseNormalsItem)
	3489	+ if (source == reverseNormalsItem)
2463	3490	{
2464	3491	ReverseNormals();
2465	3492	} else
2466		- if (event.getSource() == parseverticesItem)
	3493	+ if (source == parseverticesItem)
2467	3494	{
2468	3495	ParseVertices();
2469	3496	} else
2470		- if (event.getSource() == textureFieldItem)
	3497	+ if (source == textureFieldItem)
2471	3498	{
2472	3499	TextureVertices();
2473	3500	} else
2474		- if (event.getSource() == alignItem)
	3501	+ if (source == alignItem)
2475	3502	{
2476	3503	Align();
2477	3504	} else
2478		- if (event.getSource() == mirrorItem)
	3505	+ if (source == mirrorItem)
2479	3506	{
2480	3507	MirrorPoses();
2481	3508	} else
2482		- if (event.getSource() == reduceMorphItem)
	3509	+ if (source == reduceMorphItem)
2483	3510	{
2484	3511	MeshReduction(false);
2485	3512	} else
2486		- if (event.getSource() == reduce34MorphItem)
	3513	+ if (source == reduce34MorphItem)
2487	3514	{
2488	3515	MeshReduction(true);
2489	3516	} else
2490		- if (event.getSource() == reverseTrianglesItem)
	3517	+ if (source == reverseTrianglesItem)
2491	3518	{
2492	3519	ReverseTriangles();
2493	3520	} else
2494		- if (event.getSource() == reduceMeshItem)
	3521	+ if (source == reduceMeshItem)
2495	3522	{
2496	3523	ReduceMesh(false);
2497	3524	} else
2498		- if (event.getSource() == reduce34MeshItem)
	3525	+ if (source == reduce34MeshItem)
2499	3526	{
2500	3527	ReduceMesh(true);
2501	3528	} else
2502		- if (event.getSource() == increaseMeshItem)
	3529	+ if (source == increaseMeshItem)
2503	3530	{
2504	3531	IncreaseMesh();
2505	3532	} else
2506		- if (event.getSource() == clipMeshItem)
	3533	+ if (source == clipMeshItem)
2507	3534	{
2508	3535	ClipMesh();
2509	3536	} else
2510		- if (event.getSource() == smoothMeshItem)
	3537	+ if (source == smoothMeshItem)
2511	3538	{
2512	3539	SmoothMesh();
2513	3540	} else
2514		- if (event.getSource() == transformgeometryItem)
	3541	+ if (source == transformGeometryItem)
2515	3542	{
2516	3543	TransformGeometry();
2517	3544	} else
2518		- if (event.getSource() == resetTransformItem)
	3545	+ if (source == transformChildrenItem)
	3546	+ {
	3547	+ TransformChildren();
	3548	+ } else
	3549	+ if (source == resetTransformItem)
2519	3550	{
2520	3551	ResetTransform();
2521	3552	} else
2522		- if (event.getSource() == resetCentroidItem)
	3553	+ if (source == resetCentroidItem)
2523	3554	{
2524		- ResetCentroid();
	3555	+ ResetCentroid(true);
2525	3556	} else
2526		- if (event.getSource() == resetParentItem)
	3557	+ if (source == resetCentroidXZItem)
	3558	+ {
	3559	+ ResetCentroid(false);
	3560	+ } else
	3561	+ if (source == resetParentItem)
2527	3562	{
2528	3563	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2529	3564	{
..	..	@@ -2533,7 +3568,7 @@
2533	3568
2534	3569	refreshContents();
2535	3570	} else
2536		- if (event.getSource() == repairParentItem)
	3571	+ if (source == repairParentItem)
2537	3572	{
2538	3573	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2539	3574	{
..	..	@@ -2547,7 +3582,7 @@
2547	3582
2548	3583	refreshContents();
2549	3584	} else
2550		- if (event.getSource() == repairShadowItem)
	3585	+ if (source == repairShadowItem)
2551	3586	{
2552	3587	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2553	3588	{
..	..	@@ -2561,7 +3596,7 @@
2561	3596
2562	3597	refreshContents();
2563	3598	} else
2564		- if (event.getSource() == sortbysizeItem)
	3599	+ if (source == sortbysizeItem)
2565	3600	{
2566	3601	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2567	3602	{
..	..	@@ -2573,7 +3608,7 @@
2573	3608	ResetModel();
2574	3609	refreshContents();
2575	3610	} else
2576		- if (event.getSource() == sortbynameItem)
	3611	+ if (source == sortbynameItem)
2577	3612	{
2578	3613	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2579	3614	{
..	..	@@ -2585,7 +3620,7 @@
2585	3620	ResetModel();
2586	3621	refreshContents();
2587	3622	} else
2588		- if (event.getSource() == attachPigmentItem)
	3623	+ if (source == attachPigmentItem)
2589	3624	{
2590	3625	String texture = GetFile("Attach pigment");
2591	3626	Object3D obj;
..	..	@@ -2597,7 +3632,7 @@
2597	3632
2598	3633	refreshContents();
2599	3634	} else
2600		- if (event.getSource() == detachPigmentItem)
	3635	+ if (source == detachPigmentItem)
2601	3636	{
2602	3637	Object3D obj;
2603	3638	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2608,7 +3643,7 @@
2608	3643
2609	3644	refreshContents();
2610	3645	} else
2611		- if (event.getSource() == attachBumpItem)
	3646	+ if (source == attachBumpItem)
2612	3647	{
2613	3648	String texture = GetFile("Attach bump");
2614	3649	Object3D obj;
..	..	@@ -2620,18 +3655,18 @@
2620	3655
2621	3656	refreshContents();
2622	3657	} else
2623		- if (event.getSource() == detachBumpItem)
	3658	+ if (source == detachBumpItem)
2624	3659	{
2625	3660	Object3D obj;
2626	3661	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2627	3662	{
2628	3663	obj = (Object3D)e.nextElement();
2629		- obj.SetBumpTexture(null);
	3664	+ obj.ResetBumpTexture();
2630	3665	}
2631	3666
2632	3667	refreshContents();
2633	3668	} else
2634		- if (event.getSource() == pigmentBumpItem)
	3669	+ if (source == pigmentBumpItem)
2635	3670	{
2636	3671	Object3D obj;
2637	3672	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2642,159 +3677,233 @@
2642	3677
2643	3678	refreshContents();
2644	3679	} else
2645		- if (event.getSource() == flashSelectionButton)
	3680	+ if (source == embedTexturesItem)
	3681	+ {
	3682	+ Object3D obj;
	3683	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3684	+ {
	3685	+ obj = (Object3D)e.nextElement();
	3686	+ obj.EmbedTextures(true);
	3687	+ }
	3688	+
	3689	+ refreshContents();
	3690	+ } else
	3691	+ if (source == deEmbedTexturesItem)
	3692	+ {
	3693	+ Object3D obj;
	3694	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3695	+ {
	3696	+ obj = (Object3D)e.nextElement();
	3697	+ obj.EmbedTextures(false);
	3698	+ }
	3699	+
	3700	+ CameraPane.texturepigment.clear();
	3701	+ CameraPane.texturebump.clear();
	3702	+
	3703	+ refreshContents();
	3704	+ } else
	3705	+ if (source == flashSelectionButton)
2646	3706	{
2647	3707	CameraPane.flash = true;
2648	3708	refreshContents();
2649	3709	} else
2650		- if (event.getSource() == oneButton)
	3710	+ if (source == oneButton)
2651	3711	{
2652	3712	} else
2653		- if (event.getSource() == twoButton)
	3713	+ if (source == twoButton)
2654	3714	{
2655	3715	radio.layout = twoButton;
2656		- // bug
2657		- //gridPanel.setDividerLocation(1.0);
2658		- //bigPanel.setDividerLocation(0.0);
2659		- bigThree.remove(scenePanel);
2660		- bigThree.remove(centralPanel);
2661		- bigThree.remove(XYZPanel);
2662		- aWindowConstraints.gridx = 0;
2663		- aWindowConstraints.gridy = 0;
2664		- aWindowConstraints.gridwidth = 1;
2665		- // aConstraints.gridheight = 3;
2666		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2667		- aWindowConstraints.weightx = 0;
2668		- aWindowConstraints.weighty = 1;
2669		- //bigThree.add(jtp, aWindowConstraints);
2670		- aWindowConstraints.weightx = 1;
2671		- aWindowConstraints.gridwidth = 3;
2672		- // aConstraints.gridheight = 3;
2673		- aWindowConstraints.gridx = 1;
2674		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2675		- bigThree.add(centralPanel, aWindowConstraints);
2676		- aWindowConstraints.weightx = 0;
2677		- aWindowConstraints.gridx = 4;
2678		- aWindowConstraints.gridwidth = 1;
2679		- // aConstraints.gridheight = 3;
2680		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2681		- //bigThree.add(XYZPanel, aWindowConstraints);
2682		- bigThree.revalidate();
	3716	+
	3717	+ if (CameraPane.FULLSCREEN)
	3718	+ fullscreenLayout = radio.layout;
	3719	+
	3720	+ Show3DView();
	3721	+
	3722	+ cameraView.requestFocusInWindow();
	3723	+
	3724	+// refreshContents(true);
	3725	+//
	3726	+// try
	3727	+// {
	3728	+// java.awt.Robot bot = new java.awt.Robot();
	3729	+// int mask = InputEvent.BUTTON1_MASK;
	3730	+// bot.mouseMove(100, 100);
	3731	+// bot.mousePress(mask);
	3732	+// bot.mouseRelease(mask);
	3733	+// }
	3734	+// catch (Exception e)
	3735	+// {
	3736	+//
	3737	+// }
	3738	+
2683	3739	} else
2684		- if (event.getSource() == threeButton)
	3740	+ if (source == threeButton)
2685	3741	{
2686	3742	radio.layout = threeButton;
2687		- bigThree.remove(scenePanel);
2688		- bigThree.remove(centralPanel);
2689		- bigThree.remove(XYZPanel);
2690		- aWindowConstraints.gridx = 0;
2691		- aWindowConstraints.gridy = 0;
2692		- aWindowConstraints.gridwidth = 1;
2693		- // aConstraints.gridheight = 3;
2694		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2695		- aWindowConstraints.weightx = 0;
2696		- aWindowConstraints.weighty = 1;
2697		- //bigThree.add(jtp, aWindowConstraints);
2698		- aWindowConstraints.weightx = 1;
2699		- aWindowConstraints.gridwidth = 3;
2700		- // aConstraints.gridheight = 3;
2701		- aWindowConstraints.gridx = 1;
2702		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2703		- bigThree.add(centralPanel, aWindowConstraints);
2704		- aWindowConstraints.weightx = 0;
2705		- aWindowConstraints.gridx = 4;
2706		- aWindowConstraints.gridwidth = 1;
2707		- // aConstraints.gridheight = 3;
2708		- aConstraints.fill = GridBagConstraints.VERTICAL;
2709		- bigThree.add(XYZPanel, aWindowConstraints);
2710		- bigThree.revalidate();
	3743	+
	3744	+ if (CameraPane.FULLSCREEN)
	3745	+ fullscreenLayout = radio.layout;
	3746	+
	3747	+// bigThree.remove(scenePanel);
	3748	+// bigThree.remove(centralPanel);
	3749	+// bigThree.remove(XYZPanel);
	3750	+// aWindowConstraints.gridx = 0;
	3751	+// aWindowConstraints.gridy = 0;
	3752	+// aWindowConstraints.gridwidth = 1;
	3753	+// // aConstraints.gridheight = 3;
	3754	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3755	+// aWindowConstraints.weightx = 0;
	3756	+// aWindowConstraints.weighty = 1;
	3757	+// //bigThree.add(jtp, aWindowConstraints);
	3758	+// aWindowConstraints.weightx = 1;
	3759	+// aWindowConstraints.gridwidth = 3;
	3760	+// // aConstraints.gridheight = 3;
	3761	+// aWindowConstraints.gridx = 1;
	3762	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3763	+// bigThree.add(centralPanel, aWindowConstraints);
	3764	+// aWindowConstraints.weightx = 0;
	3765	+// aWindowConstraints.gridx = 4;
	3766	+// aWindowConstraints.gridwidth = 1;
	3767	+// // aConstraints.gridheight = 3;
	3768	+// aConstraints.fill = GridBagConstraints.VERTICAL;
	3769	+// bigThree.add(XYZPanel, aWindowConstraints);
	3770	+// bigThree.validate();
	3771	+// scenePanel.setVisible(false);
	3772	+// centralPanel.setVisible(true);
	3773	+// XYZPanel.setVisible(true);
	3774	+ bigThree.ClearUI();
	3775	+ bigThree.add(scenePanel);
	3776	+ bigThree.add(centralPanel);
	3777	+ bigThree.FlushUI();
	3778	+
	3779	+ cameraView.requestFocusInWindow();
2711	3780	} else
2712		- if (event.getSource() == fourButton)
	3781	+ if (source == fourButton)
2713	3782	{
2714	3783	radio.layout = fourButton;
2715		- bigThree.remove(scenePanel);
2716		- bigThree.remove(centralPanel);
2717		- bigThree.remove(XYZPanel);
2718		- aWindowConstraints.gridx = 0;
2719		- aWindowConstraints.gridy = 0;
2720		- aWindowConstraints.gridwidth = 1;
2721		- // aWindowConstraints.gridheight = 3;
2722		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2723		- aWindowConstraints.weightx = 1;
2724		- aWindowConstraints.weighty = 1;
2725		- bigThree.add(scenePanel, aWindowConstraints);
2726		- aWindowConstraints.weightx = 1;
2727		- aWindowConstraints.gridwidth = 3;
2728		- // aConstraints.gridheight = 3;
2729		- aWindowConstraints.gridx = 1;
2730		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2731		- //bigThree.add(cameraPanel, aWindowConstraints);
2732		- aWindowConstraints.weightx = 0;
2733		- aWindowConstraints.gridx = 4;
2734		- aWindowConstraints.gridwidth = 1;
2735		- // aWindowConstraints.gridheight = 3;
2736		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2737		- //bigThree.add(XYZPanel, aWindowConstraints);
2738		- bigThree.revalidate();
	3784	+
	3785	+ if (CameraPane.FULLSCREEN)
	3786	+ fullscreenLayout = radio.layout;
	3787	+
	3788	+// bigThree.remove(scenePanel);
	3789	+// bigThree.remove(centralPanel);
	3790	+// bigThree.remove(XYZPanel);
	3791	+// aWindowConstraints.gridx = 0;
	3792	+// aWindowConstraints.gridy = 0;
	3793	+// aWindowConstraints.gridwidth = 1;
	3794	+// // aWindowConstraints.gridheight = 3;
	3795	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3796	+// aWindowConstraints.weightx = 1;
	3797	+// aWindowConstraints.weighty = 1;
	3798	+// bigThree.add(scenePanel, aWindowConstraints);
	3799	+// aWindowConstraints.weightx = 1;
	3800	+// aWindowConstraints.gridwidth = 3;
	3801	+// // aConstraints.gridheight = 3;
	3802	+// aWindowConstraints.gridx = 1;
	3803	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3804	+// //bigThree.add(cameraPanel, aWindowConstraints);
	3805	+// aWindowConstraints.weightx = 0;
	3806	+// aWindowConstraints.gridx = 4;
	3807	+// aWindowConstraints.gridwidth = 1;
	3808	+// // aWindowConstraints.gridheight = 3;
	3809	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3810	+// //bigThree.add(XYZPanel, aWindowConstraints);
	3811	+// bigThree.validate();
	3812	+// scenePanel.setVisible(true);
	3813	+// centralPanel.setVisible(false);
	3814	+// XYZPanel.setVisible(false);
	3815	+ bigThree.ClearUI();
	3816	+ bigThree.add(scenePanel);
	3817	+ bigThree.FlushUI();
	3818	+
	3819	+ cameraView.requestFocusInWindow();
2739	3820	} else
2740		- if (event.getSource() == sixButton)
	3821	+ if (source == sixButton)
2741	3822	{
2742	3823	radio.layout = sixButton;
2743		- bigThree.remove(scenePanel);
2744		- bigThree.remove(centralPanel);
2745		- bigThree.remove(XYZPanel);
2746		- aWindowConstraints.gridx = 0;
2747		- aWindowConstraints.gridy = 0;
2748		- aWindowConstraints.gridwidth = 1;
2749		- // aConstraints.gridheight = 3;
2750		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2751		- aWindowConstraints.weightx = 0;
2752		- aWindowConstraints.weighty = 1;
2753		- bigThree.add(scenePanel, aWindowConstraints);
2754		- aWindowConstraints.weightx = 1;
2755		- aWindowConstraints.gridwidth = 3;
2756		- // aWindowConstraints.gridheight = 3;
2757		- aWindowConstraints.gridx = 1;
2758		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2759		- bigThree.add(centralPanel, aWindowConstraints);
2760		- aWindowConstraints.weightx = 0;
2761		- aWindowConstraints.gridx = 4;
2762		- aWindowConstraints.gridwidth = 1;
2763		- // aWindowConstraints.gridheight = 3;
2764		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2765		- //bigThree.add(XYZPanel, aConstraints);
2766		- bigThree.revalidate();
	3824	+
	3825	+ if (CameraPane.FULLSCREEN)
	3826	+ fullscreenLayout = radio.layout;
	3827	+
	3828	+// bigThree.remove(scenePanel);
	3829	+// bigThree.remove(centralPanel);
	3830	+// bigThree.remove(XYZPanel);
	3831	+// aWindowConstraints.gridx = 0;
	3832	+// aWindowConstraints.gridy = 0;
	3833	+// aWindowConstraints.gridwidth = 1;
	3834	+// // aConstraints.gridheight = 3;
	3835	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3836	+// aWindowConstraints.weightx = 0;
	3837	+// aWindowConstraints.weighty = 1;
	3838	+// bigThree.add(scenePanel, aWindowConstraints);
	3839	+// aWindowConstraints.weightx = 1;
	3840	+// aWindowConstraints.gridwidth = 3;
	3841	+// // aWindowConstraints.gridheight = 3;
	3842	+// aWindowConstraints.gridx = 1;
	3843	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3844	+// bigThree.add(centralPanel, aWindowConstraints);
	3845	+// aWindowConstraints.weightx = 0;
	3846	+// aWindowConstraints.gridx = 4;
	3847	+// aWindowConstraints.gridwidth = 1;
	3848	+// // aWindowConstraints.gridheight = 3;
	3849	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3850	+// //bigThree.add(XYZPanel, aConstraints);
	3851	+// bigThree.validate();
	3852	+// scenePanel.setVisible(true);
	3853	+// centralPanel.setVisible(true);
	3854	+// XYZPanel.setVisible(false);
	3855	+ bigThree.ClearUI();
	3856	+ bigThree.add(centralPanel);
	3857	+ bigThree.add(scenePanel);
	3858	+ bigThree.FlushUI();
	3859	+
	3860	+ cameraView.requestFocusInWindow();
2767	3861	} else
2768		- if (event.getSource() == sevenButton)
	3862	+ if (source == sevenButton)
2769	3863	{
2770	3864	radio.layout = sevenButton;
2771		- bigThree.remove(scenePanel);
2772		- bigThree.remove(centralPanel);
2773		- bigThree.remove(XYZPanel);
2774		- aWindowConstraints.gridx = 0;
2775		- aWindowConstraints.gridy = 0;
2776		- aWindowConstraints.gridwidth = 1;
2777		- // aWindowConstraints.gridheight = 3;
2778		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2779		- aWindowConstraints.weightx = 0;
2780		- aWindowConstraints.weighty = 1;
2781		- bigThree.add(scenePanel, aWindowConstraints);
2782		- aWindowConstraints.weightx = 1;
2783		- aWindowConstraints.gridwidth = 3;
2784		- // aWindowConstraints.gridheight = 3;
2785		- aWindowConstraints.gridx = 1;
2786		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2787		- bigThree.add(centralPanel, aWindowConstraints);
2788		- aWindowConstraints.weightx = 0;
2789		- aWindowConstraints.gridx = 4;
2790		- aWindowConstraints.gridwidth = 1;
2791		- // aConstraints.gridheight = 3;
2792		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2793		- bigThree.add(XYZPanel, aWindowConstraints);
2794		- bigThree.revalidate();
	3865	+
	3866	+ if (CameraPane.FULLSCREEN)
	3867	+ fullscreenLayout = radio.layout;
	3868	+
	3869	+// bigThree.remove(scenePanel);
	3870	+// bigThree.remove(centralPanel);
	3871	+// bigThree.remove(XYZPanel);
	3872	+// aWindowConstraints.gridx = 0;
	3873	+// aWindowConstraints.gridy = 0;
	3874	+// aWindowConstraints.gridwidth = 1;
	3875	+// // aWindowConstraints.gridheight = 3;
	3876	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3877	+// aWindowConstraints.weightx = 0;
	3878	+// aWindowConstraints.weighty = 1;
	3879	+// bigThree.add(scenePanel, aWindowConstraints);
	3880	+// aWindowConstraints.weightx = 1;
	3881	+// aWindowConstraints.gridwidth = 3;
	3882	+// // aWindowConstraints.gridheight = 3;
	3883	+// aWindowConstraints.gridx = 1;
	3884	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3885	+// bigThree.add(centralPanel, aWindowConstraints);
	3886	+// aWindowConstraints.weightx = 0;
	3887	+// aWindowConstraints.gridx = 4;
	3888	+// aWindowConstraints.gridwidth = 1;
	3889	+// // aConstraints.gridheight = 3;
	3890	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3891	+// bigThree.add(XYZPanel, aWindowConstraints);
	3892	+// bigThree.validate();
	3893	+// scenePanel.setVisible(true);
	3894	+// centralPanel.setVisible(true);
	3895	+// XYZPanel.setVisible(true);
	3896	+ bigThree.ClearUI();
	3897	+ bigThree.add(scenePanel);
	3898	+ bigThree.add(centralPanel);
	3899	+ bigThree.add(XYZPanel);
	3900	+ bigThree.FlushUI();
	3901	+
	3902	+ cameraView.requestFocusInWindow();
2795	3903	} else
2796		- if (event.getSource() == rootButton)
	3904	+ if (source == rootButton)
2797	3905	{
	3906	+ Replace();
2798	3907	Object3D obj;
2799	3908	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2800	3909	{
..	..	@@ -2803,66 +3912,85 @@
2803	3912	EditObject(obj);
2804	3913	}
2805	3914
	3915	+ cameraView.requestFocusInWindow();
2806	3916	refreshContents(true);
2807	3917	} else
2808		- if (event.getSource() == closeButton)
	3918	+ if (source == closeButton)
2809	3919	{
2810	3920	//System.out.println("CLOSE: " + buttonGroup.getSelection());
2811	3921	cRadio ab;
2812	3922	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2813	3923	{
2814	3924	ab = (cRadio)e.nextElement();
2815		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3925	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2816	3926	{
	3927	+ // Patch to avoid bug with transparency.
	3928	+ if (!ab.hadMaterial)
	3929	+ {
	3930	+ ab.object.material = null;
	3931	+ }
	3932	+
2817	3933	buttonGroup.remove(ab);
2818	3934	radioPanel.remove(ab);
2819	3935
2820		- ab.GetObject().editWindow = null;
	3936	+ //ab.GetObject().editWindow = null;
	3937	+ ab.GetObject().manipWindow = null;
2821	3938	// ab.GetObject().objectUI = null; // ?????????
2822	3939
2823	3940	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2824	3941	break;
2825	3942	}
2826	3943	}
	3944	+
	3945	+ cameraView.requestFocusInWindow();
2827	3946	refreshContents(true);
2828	3947	} else
2829		- if (event.getSource() == editItem \|\| event.getSource() == editButton)
	3948	+ if (source == editItem \|\| source == editButton)
2830	3949	{
	3950	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3951	+ {
	3952	+ Object3D child = (Object3D)e.nextElement();
	3953	+ child.pinned = true;
	3954	+ }
	3955	+
2831	3956	EditSelection(false);
2832	3957	} else
2833		- if (event.getSource() == uneditButton)
	3958	+ if (source == uneditButton)
2834	3959	{
2835	3960	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2836	3961	{
2837	3962	Object3D child = (Object3D)e.nextElement();
2838	3963	if(child.editWindow != null)
2839		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3964	+ child.pinned = false;
2840	3965	child.CloseUI();
2841	3966	listUI.remove(child);
	3967	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2842	3968
2843		- child.editWindow = null; // ???????????
	3969	+ //child.editWindow = null; // ???????????
2844	3970	}
2845		- objEditor.ctrlPanel.revalidate();
	3971	+ objEditor.ctrlPanel.FlushUI();
2846	3972	//objEditor.jTree.clearSelection();
2847	3973	//objEditor.ResetSliders();
2848	3974	refreshContents(true);
2849	3975	} else
2850		- if (event.getSource() == clearPanelButton)
	3976	+ if (source == clearPanelButton)
2851	3977	{
2852	3978	assert(copy == group);
2853	3979	//copy.ClearUI();
2854	3980	for (Object3D obj : listUI)
2855	3981	{
	3982	+ obj.pinned = false;
2856	3983	obj.CloseUI();
2857	3984	}
2858	3985	listUI.clear();
	3986	+ SetPinStates(group.selection.size() > 0);
2859	3987	refreshContents(true);
2860	3988	} else
2861		- if (event.getSource() == allParamsButton)
	3989	+ if (source == allParamsButton)
2862	3990	{
2863	3991	assert(copy == group);
2864	3992
2865		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3993	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2866	3994
2867	3995	for (Object3D obj : listUI)
2868	3996	{
..	..	@@ -2879,19 +4007,19 @@
2879	4007
2880	4008	refreshContents(true);
2881	4009	} else
2882		- if (event.getSource() == unselectButton)
	4010	+ if (source == unselectButton)
2883	4011	{
2884	4012	objEditor.jTree.clearSelection();
2885	4013	// ?? oct 2012 GrafreeD.clipboard.clear();
2886	4014	objEditor.ResetSliders();
2887	4015	refreshContents(true);
2888	4016	} else
2889		- if(event.getSource() instanceof cRadio)
	4017	+ if(source instanceof cRadio)
2890	4018	{
2891	4019	group.parent = keepparent;
2892	4020	group.attributes = 0;
2893	4021	//group.editWindow = null;
2894		- /cRadio/ radio = (cRadio)event.getSource();
	4022	+ /cRadio/ radio = (cRadio)source;
2895	4023	Object3D obj = radio.GetObject();
2896	4024	System.out.println("Edit " + obj);
2897	4025	if (true) // obj instanceof Composite) // obj.parent == null) // obj instanceof Composite)
..	..	@@ -2911,7 +4039,8 @@
2911	4039	}
2912	4040
2913	4041	copy = group;
2914		- //CameraPane.theRenderer.object = group;
	4042	+
	4043	+ //Globals.theRenderer.object = group;
2915	4044	if(!useclient)
2916	4045	{
2917	4046	cameraView.renderCamera = radio.camera;
..	..	@@ -2926,20 +4055,51 @@
2926	4055	frontView.object = group;
2927	4056	sideView.object = group;
2928	4057	}
2929		- group.editWindow = this;
	4058	+
	4059	+// fix "+" issue
	4060	+ //group.editWindow = this;
	4061	+ group.manipWindow = this;
	4062	+
2930	4063	/*
2931	4064	currentLayout = radio.layout;
2932	4065	if (currentLayout == null)
2933	4066	currentLayout = sevenButton;
2934	4067	*/
2935	4068	radio.layout.doClick();
	4069	+
	4070	+ SetUndoStates();
	4071	+
	4072	+ ClearUnpinned();
	4073	+
	4074	+ //Grafreed.Assert(group != null);
	4075	+ //Grafreed.Assert(group.selection != null);
	4076	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	4077	+ if (group.selection == null \|\| group.selection.size() == 1)
	4078	+ EditSelection(false);
2936	4079	keepparent = group.parent;
2937	4080	// PARENT = NULL or not???
2938	4081	//group.parent = null; // ROOT
2939	4082	//group.attributes = -1;
2940	4083	ResetModel();
	4084	+
	4085	+ cameraView.requestFocusInWindow();
2941	4086	refreshContents(true);
2942		- }
	4087	+ } else if (event.getSource() == editCameraItem)
	4088	+ {
	4089	+ cameraView.ProtectCamera();
	4090	+ cameraView.requestFocusInWindow();
	4091	+ cameraView.repaint();
	4092	+ return;
	4093	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
	4094	+ {
	4095	+ cameraView.RevertCamera();
	4096	+ cameraView.requestFocusInWindow();
	4097	+ cameraView.repaint();
	4098	+ return;
	4099	+ // } else if (event.getSource() == textureButton)
	4100	+ // {
	4101	+ // return; // true;
	4102	+ }
2943	4103	else
2944	4104	{
2945	4105	//return super.action(event, arg);
..	..	@@ -2948,7 +4108,6 @@
2948	4108	}
2949	4109
2950	4110	boolean useclient = false;
2951		- cRadio radio;
2952	4111
2953	4112	void ToggleRoot()
2954	4113	{
..	..	@@ -3000,6 +4159,28 @@
3000	4159	refreshContents();
3001	4160	}
3002	4161
	4162	+ void TransformChildren()
	4163	+ {
	4164	+ Object3D obj;
	4165	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4166	+ {
	4167	+ obj = (Object3D)e.nextElement();
	4168	+ obj.KeepTextureMatrices();
	4169	+ obj.TransformChildren();
	4170	+ obj.RestoreTextureMatrices();
	4171	+
	4172	+// if (obj.parent == null)
	4173	+// {
	4174	+// System.out.println("NULL PARENT!");
	4175	+// new Exception().printStackTrace();
	4176	+// }
	4177	+// else
	4178	+// TouchTransform(obj);
	4179	+// //obj.parent.Touch();
	4180	+ }
	4181	+
	4182	+ refreshContents();
	4183	+ }
3003	4184
3004	4185	void ResetTransform()
3005	4186	{
..	..	@@ -3112,7 +4293,7 @@
3112	4293	refreshContents();
3113	4294	}
3114	4295
3115		- void ResetCentroid()
	4296	+ void ResetCentroid(boolean full)
3116	4297	{
3117	4298	Object3D obj;
3118	4299	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3127,12 +4308,16 @@
3127	4308	LA.matIdentity(Object3D.mat);
3128	4309	obj.getBounds(minima, maxima, false);
3129	4310	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3130		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	4311	+ if (full)
	4312	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3131	4313	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3132	4314	obj.TransformMesh(Object3D.mat);
	4315	+
3133	4316	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3134		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	4317	+ if (full)
	4318	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3135	4319	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	4320	+
3136	4321	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3137	4322	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3138	4323	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3161,7 +4346,8 @@
3161	4346
3162	4347	int size = obj.MemorySize();
3163	4348
3164		- System.err.println((size/1024) + " KB is the size of " + obj);
	4349	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	4350	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3165	4351	}
3166	4352	}
3167	4353	catch (Exception e)
..	..	@@ -3198,9 +4384,9 @@
3198	4384	obj = (Object3D)e.nextElement();
3199	4385
3200	4386	System.out.println("Object is: " + obj);
3201		- GrafreeD.AnalyzeObject(obj);
	4387	+ Grafreed.AnalyzeObject(obj);
3202	4388	System.out.println("Boundary rep: " + obj.bRep);
3203		- GrafreeD.AnalyzeObject(obj.bRep);
	4389	+ Grafreed.AnalyzeObject(obj.bRep);
3204	4390
3205	4391	// System.err.println((size/1024) + " KB is the size of " + obj);
3206	4392	}
..	..	@@ -3242,6 +4428,13 @@
3242	4428	void GenNormals(boolean crease)
3243	4429	{
3244	4430	group.GenNormalsS(crease);
	4431	+
	4432	+ refreshContents();
	4433	+ }
	4434	+
	4435	+ void GenNormalsMESH()
	4436	+ {
	4437	+ group.GenNormalsMeshS();
3245	4438
3246	4439	refreshContents();
3247	4440	}
..	..	@@ -3414,8 +4607,8 @@
3414	4607
3415	4608	void ParseVertices()
3416	4609	{
3417		- boolean epsequal = GrafreeD.epsequal;
3418		- GrafreeD.epsequal = true;
	4610	+ boolean epsequal = Grafreed.epsequal;
	4611	+ Grafreed.epsequal = true;
3419	4612
3420	4613	for (int i=0; i<group.selection.size(); i++)
3421	4614	{
..	..	@@ -3440,7 +4633,7 @@
3440	4633	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3441	4634	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3442	4635
3443		- g.add(GrafreeD.clipboard);
	4636	+ g.add(Grafreed.clipboard);
3444	4637
3445	4638	buffer.add(g);
3446	4639	}
..	..	@@ -3455,7 +4648,7 @@
3455	4648	makeSomething(buffer, i==group.selection.size()-1);
3456	4649	}
3457	4650
3458		- GrafreeD.epsequal = epsequal;
	4651	+ Grafreed.epsequal = epsequal;
3459	4652
3460	4653	refreshContents();
3461	4654	}
..	..	@@ -3473,7 +4666,16 @@
3473	4666	String pigment = Object3D.GetPigment(tex);
3474	4667	//String bump = Object3D.GetBump(tex);
3475	4668
3476		- com.sun.opengl.util.texture.TextureData texturedata = CameraPane.theRenderer.GetTextureData(pigment, false, node.texres);
	4669	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	4670	+
	4671	+ try
	4672	+ {
	4673	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
	4674	+ }
	4675	+ catch (Exception e)
	4676	+ {
	4677	+ System.err.println("FAIL: " + node);
	4678	+ }
3477	4679
3478	4680	double s = v.s;
3479	4681
..	..	@@ -3561,11 +4763,11 @@
3561	4763
3562	4764	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3563	4765
3564		- boolean random = CameraPane.RANDOM;
3565		- CameraPane.RANDOM = false; // parse all random nodes
	4766	+ boolean random = CameraPane.SWITCH;
	4767	+ CameraPane.SWITCH = false; // parse all random nodes
3566	4768	lowres.linkVerticesThis(null);
3567	4769	lowres.linkVerticesThis(sn);
3568		- CameraPane.RANDOM = random;
	4770	+ CameraPane.SWITCH = random;
3569	4771
3570	4772	System.err.flush();
3571	4773
..	..	@@ -3605,7 +4807,7 @@
3605	4807	return;
3606	4808
3607	4809	Object3D poses = group.selection.get(0);
3608		- Object3D ref = GrafreeD.clipboard.get(0);
	4810	+ Object3D ref = Grafreed.clipboard.get(0);
3609	4811
3610	4812	Object3D newgroup = new Object3D("Po:" + poses.name);
3611	4813
..	..	@@ -3774,7 +4976,7 @@
3774	4976	group.selection.RelinkToSupport(); // july 2014
3775	4977	System.out.println("DONE.");
3776	4978	refreshContents();
3777		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	4979	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
3778	4980	}
3779	4981
3780	4982	void ReduceMesh(boolean reduction34)
..	..	@@ -3799,9 +5001,9 @@
3799	5001
3800	5002	void ClipMesh()
3801	5003	{
3802		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	5004	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3803	5005	{
3804		- Object3D content = GrafreeD.clipboard.get(0);
	5006	+ Object3D content = Grafreed.clipboard.get(0);
3805	5007
3806	5008	if (content instanceof cGroup && ((cGroup)content).transientlink )
3807	5009	content = ((cGroup)content).get(0);
..	..	@@ -3810,7 +5012,7 @@
3810	5012	// {
3811	5013	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3812	5014	// }
3813		- group.selection.ClipMesh(GrafreeD.clipboard);
	5015	+ group.selection.ClipMesh(Grafreed.clipboard);
3814	5016	}
3815	5017	// group.selection.ClipMesh(GrafreeD.clipboard);
3816	5018	System.out.println("DONE.");
..	..	@@ -3857,6 +5059,18 @@
3857	5059	void MarkLeaves(boolean hide)
3858	5060	{
3859	5061	group.selection.MarkLeaves(hide);
	5062	+ refreshContents();
	5063	+ }
	5064	+
	5065	+ void RewindLeaves(boolean hide)
	5066	+ {
	5067	+ group.selection.RewindLeaves(hide);
	5068	+ refreshContents();
	5069	+ }
	5070	+
	5071	+ void RandomLeaves(boolean hide)
	5072	+ {
	5073	+ group.selection.RandomLeaves(hide);
3860	5074	refreshContents();
3861	5075	}
3862	5076
..	..	@@ -3931,28 +5145,25 @@
3931	5145	// }
3932	5146	// }
3933	5147
3934		- static boolean allparams = true;
3935		-
3936		- static Vector<Object3D> listUI = new Vector<Object3D>();
3937		-
3938	5148	void EditSelection(boolean newWindow)
3939	5149	{
	5150	+ if (group.selection == null)
	5151	+ {
	5152	+ EditElement(group, newWindow); // ? new
	5153	+ return;
	5154	+ }
	5155	+
3940	5156	// aConstraints.gridy = 0;
3941	5157	for (int i=0; i<group.selection.size(); i++)
3942	5158	{
3943	5159	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
3944	5160	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
3945		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	5161	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3946	5162
3947	5163	Object3D elem = (Object3D)group.selection.elementAt(i);
3948		- if(elem != group)
	5164	+ if(elem != group \|\| !newWindow)
3949	5165	{
3950		- // if (!(elem instanceof Composite))
3951		- // newWindow = false;
3952		- listUI.add(elem);
3953		- elem.openEditWindow(this, newWindow); //, false);
3954		- System.out.println("edit : " + elem);
3955		- elem.editWindow.refreshContents(true); // ? new
	5166	+ EditElement(elem, newWindow); // ? new
3956	5167	}
3957	5168	}
3958	5169	}
..	..	@@ -4015,9 +5226,7 @@
4015	5226
4016	5227	freezemodel = false;
4017	5228	}
4018		-
4019		- boolean flashIt = true;
4020		-
	5229	+
4021	5230	public void valueChanged(TreeSelectionEvent e)
4022	5231	//public boolean handleEvent(Event event)
4023	5232	{
..	..	@@ -4027,7 +5236,8 @@
4027	5236	//new Exception().printStackTrace();
4028	5237
4029	5238	freezemodel = true;
4030		-
	5239	+ ClearUnpinned();
	5240	+
4031	5241	/**/
4032	5242	//switch (event.id)
4033	5243	{
..	..	@@ -4035,7 +5245,6 @@
4035	5245	//case 702: // Event.LIST_DESELECT
4036	5246	group.deselectAll();
4037	5247	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4038		- objEditor.ClearInfo(); // .GetMaterial());
4039	5248	if (tps != null)
4040	5249	{
4041	5250	for (int i=0; i < tps.length; i++)
..	..	@@ -4044,33 +5253,39 @@
4044	5253
4045	5254	//if (child.parent != null)
4046	5255	//child.parent.addSelectee(child);
	5256	+ objEditor.SetMaterial(child);
4047	5257	group.addSelectee(child);
4048		- objEditor.SetMaterial(child); // .GetMaterial());
4049		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4050		- System.err.println("info : " + child.GetPath());
4051	5258	}
4052	5259	}
4053		- else
4054		- {
4055		- objEditor.SetMaterial(group); // .GetMaterial());
4056		- objEditor.AddInfo(group, this, true); // .GetMaterial());
4057		- System.err.println("info : " + group.GetPath());
4058		- }
	5260	+// else
	5261	+// {
	5262	+// objEditor.SetMaterial(group); // .GetMaterial());
	5263	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	5264	+// System.err.println("info : " + group.GetPath());
	5265	+// }
4059	5266
4060		- objEditor.SetText(); // jan 2014
4061		-
4062		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	5267	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4063	5268	CameraPane.flash = true;
4064	5269
4065		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	5270	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4066	5271	// a camera
4067	5272	{
4068		- CameraPane.camerachangeframe = 0; // don't refuse it
4069		- CameraPane.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
4070		- // CameraPane.theRenderer.renderCamera = CameraPane.theRenderer.manipCamera;
4071		- // CameraPane.theRenderer.eyeCamera = CameraPane.theRenderer.manipCamera;
	5273	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
	5274	+ {
	5275	+ CameraPane.camerachangeframe = 0; // don't refuse it
	5276	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	5277	+ }
	5278	+ // Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
	5279	+ // Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4072	5280	}
4073	5281
	5282	+ if (tps != null && tps.length == 1)
	5283	+ {
	5284	+ EditSelection(false);
	5285	+ }
	5286	+
	5287	+ SetPinStates(tps != null && tps.length > 0);
	5288	+
4074	5289	refreshContents();
4075	5290	//return true;
4076	5291	}
..	..	@@ -4079,6 +5294,50 @@
4079	5294
4080	5295	freezemodel = false;
4081	5296	}
	5297	+
	5298	+ void SetPinStates(boolean enabled)
	5299	+ {
	5300	+ editButton.setEnabled(enabled);
	5301	+ uneditButton.setEnabled(enabled);
	5302	+ //unselectButton.setEnabled(enabled);
	5303	+ flashSelectionButton.setEnabled(enabled);
	5304	+
	5305	+ clearPanelButton.setEnabled(!listUI.isEmpty());
	5306	+
	5307	+ boolean allComposites = true;
	5308	+
	5309	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	5310	+ {
	5311	+ if (!(e.nextElement() instanceof Composite))
	5312	+ {
	5313	+ allComposites = false;
	5314	+ break;
	5315	+ }
	5316	+ }
	5317	+
	5318	+ rootButton.setEnabled(allComposites);
	5319	+ }
	5320	+
	5321	+ void refreshContents(boolean cp)
	5322	+ {
	5323	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5324	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
	5325	+ {
	5326	+ objEditor.ClearInfo(); // .GetMaterial());
	5327	+
	5328	+ for (int i=0; i < group.selection.Size(); i++)
	5329	+ {
	5330	+ Object3D child = (Object3D) group.selection.get(i);
	5331	+
	5332	+ objEditor.AddInfo(child, this, true);
	5333	+// System.err.println("info : " + child.GetPath());
	5334	+ }
	5335	+
	5336	+ objEditor.SetText(); // jan 2014
	5337	+ }
	5338	+
	5339	+ super.refreshContents(cp);
	5340	+ }
4082	5341
4083	5342	void linkSomething(Object3D thing)
4084	5343	{
..	..	@@ -4150,16 +5409,19 @@
4150	5409	{
4151	5410	if (group.selection.isEmpty())
4152	5411	return;
4153		- GrafreeD.clipboardIsTempGroup = false;
	5412	+
	5413	+ Grafreed.clipboardIsTempGroup = false;
4154	5414	Composite tGroup = null;
4155	5415	if (group.selection.size() > 0) // 1)
4156	5416	{
4157	5417	tGroup = new cGroup();
4158		- GrafreeD.clipboardIsTempGroup = true;
	5418	+ Grafreed.clipboardIsTempGroup = true;
4159	5419	}
4160	5420
4161	5421	if (cut)
4162	5422	{
	5423	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5424	+// Save();
4163	5425	//int indices[] = jList.getSelectedIndices();
4164	5426	//for (int i = indices.length - 1; i >= 0; i--)
4165	5427	//jList.remove(indices[i]);
..	..	@@ -4195,16 +5457,16 @@
4195	5457	//System.out.println("cut " + child);
4196	5458	//System.out.println("parent = " + child.parent);
4197	5459	// tmp.addChild(child);
4198		- if (GrafreeD.clipboardIsTempGroup)
	5460	+ if (Grafreed.clipboardIsTempGroup)
4199	5461	tGroup.add/Child/(tmp);
4200	5462	else
4201		- GrafreeD.clipboard = tmp;
	5463	+ Grafreed.clipboard = tmp;
4202	5464	}
4203	5465	else
4204		- if (GrafreeD.clipboardIsTempGroup)
	5466	+ if (Grafreed.clipboardIsTempGroup)
4205	5467	tGroup.add/Child/(child);
4206	5468	else
4207		- GrafreeD.clipboard = child;
	5469	+ Grafreed.clipboard = child;
4208	5470	}
4209	5471
4210	5472	//ResetModel();
..	..	@@ -4236,21 +5498,23 @@
4236	5498	//System.out.println("cut " + elem);
4237	5499	//System.out.println("parent = " + elem.parent);
4238	5500	// tmp.addChild(elem);
4239		- if (GrafreeD.clipboardIsTempGroup)
	5501	+ if (Grafreed.clipboardIsTempGroup)
4240	5502	tGroup.add/Child/(tmp);
4241	5503	else
4242		- GrafreeD.clipboard = tmp;
	5504	+ Grafreed.clipboard = tmp;
4243	5505	}
4244	5506	else
4245		- if (GrafreeD.clipboardIsTempGroup)
	5507	+ if (Grafreed.clipboardIsTempGroup)
4246	5508	tGroup.add/Child/(child);
4247	5509	else
4248		- GrafreeD.clipboard = child;
	5510	+ Grafreed.clipboard = child;
4249	5511	}
4250	5512
4251	5513	}
4252		- if (GrafreeD.clipboardIsTempGroup)
4253		- GrafreeD.clipboard = tGroup;
	5514	+
	5515	+ if (Grafreed.clipboardIsTempGroup)
	5516	+ Grafreed.clipboard = tGroup;
	5517	+
4254	5518	if (cut)
4255	5519	{
4256	5520	ResetModel();
..	..	@@ -4260,11 +5524,15 @@
4260	5524
4261	5525	void paste(boolean expand)
4262	5526	{
	5527	+ if (Globals.REPLACEONMAKE)
	5528	+ Save();
	5529	+ boolean keep = Globals.REPLACEONMAKE;
	5530	+ Globals.REPLACEONMAKE = false;
4263	5531	// if (GrafreeD.clipboard == null)
4264	5532	// return;
4265	5533	boolean first = true;
4266	5534
4267		- if (GrafreeD.clipboardIsTempGroup)
	5535	+ if (Grafreed.clipboardIsTempGroup)
4268	5536	{
4269	5537	Composite temp;
4270	5538
..	..	@@ -4275,7 +5543,7 @@
4275	5543	temp = (Composite)Applet3D.clipboard.deepCopy();
4276	5544	*/
4277	5545	Object3D elem;
4278		- for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	5546	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4279	5547	{
4280	5548	Object3D child = (Object3D)e.nextElement();
4281	5549
..	..	@@ -4309,21 +5577,22 @@
4309	5577	//Object3D cb = Applet3D.clipboard;
4310	5578	//temp.addChild(cb);
4311	5579	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4312		- assert(GrafreeD.clipboard.parent == null);
4313		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
4314		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4315		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4316		- makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
	5580	+ assert(Grafreed.clipboard.parent == null);
	5581	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	5582	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	5583	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	5584	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4317	5585	else
4318		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4319		- GrafreeD.clipboard.get(0).parent = keepparent;
	5586	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	5587	+ Grafreed.clipboard.get(0).parent = keepparent;
4320	5588	}
4321	5589
	5590	+ Globals.REPLACEONMAKE = keep;
4322	5591	ResetModel();
4323	5592	refreshContents();
4324	5593	}
4325	5594
4326		- void pasteInto(boolean copyit)
	5595	+ void pasteInto(boolean copyit, boolean clone)
4327	5596	{
4328	5597	// if (GrafreeD.clipboard == null)
4329	5598	// return;
..	..	@@ -4352,15 +5621,22 @@
4352	5621	if (copyit)
4353	5622	{
4354	5623	// paste(false);
4355		- CloneClipboard(false); // sept 2014
	5624	+ if (clone)
	5625	+ {
	5626	+ CloneClipboard(false); // sept 2014
	5627	+ }
	5628	+ else
	5629	+ {
	5630	+ paste(false);
	5631	+ }
4356	5632	}
4357	5633	else
4358	5634	{
4359	5635	boolean first = true;
4360	5636
4361		- if (GrafreeD.clipboardIsTempGroup)
	5637	+ if (Grafreed.clipboardIsTempGroup)
4362	5638	{
4363		- Composite temp = (Composite)GrafreeD.clipboard;
	5639	+ Composite temp = (Composite)Grafreed.clipboard;
4364	5640	Object3D copy;
4365	5641	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4366	5642	{
..	..	@@ -4370,7 +5646,7 @@
4370	5646	}
4371	5647	} else
4372	5648	{
4373		- linkSomething(GrafreeD.clipboard); //.get(0));
	5649	+ linkSomething(Grafreed.clipboard); //.get(0));
4374	5650	}
4375	5651	}
4376	5652	}
..	..	@@ -4447,6 +5723,10 @@
4447	5723
4448	5724	void group(Object3D csg, boolean grab)
4449	5725	{
	5726	+ if (Globals.REPLACEONMAKE)
	5727	+ Save();
	5728	+ boolean keep = Globals.REPLACEONMAKE;
	5729	+ Globals.REPLACEONMAKE = false;
4450	5730	if (//false) // why??
4451	5731	!group.selection.isEmpty())
4452	5732	{
..	..	@@ -4560,10 +5840,15 @@
4560	5840	//node.add(csg);
4561	5841	//makeSomething(node);
4562	5842	makeSomething(csg);
	5843	+ Globals.REPLACEONMAKE = keep;
4563	5844	}
4564	5845
4565	5846	void Ungroup(Object3D g)
4566	5847	{
	5848	+ if (Globals.REPLACEONMAKE)
	5849	+ Save();
	5850	+ boolean keep = Globals.REPLACEONMAKE;
	5851	+ Globals.REPLACEONMAKE = false;
4567	5852	if (g instanceof HiddenObject)
4568	5853	{
4569	5854	HiddenObject h = (HiddenObject) g;
..	..	@@ -4580,6 +5865,7 @@
4580	5865	objEditor.makeSomething(g.get(i), false);
4581	5866	}
4582	5867	}
	5868	+ Globals.REPLACEONMAKE = keep;
4583	5869	}
4584	5870
4585	5871	void ungroup()
..	..	@@ -4775,21 +6061,6 @@
4775	6061	}
4776	6062	*/
4777	6063
4778		- void ImportGFD()
4779		- {
4780		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4781		- browser.show();
4782		- String filename = browser.getFile();
4783		- if (filename != null && filename.length() > 0)
4784		- {
4785		- String fullname = browser.getDirectory() + filename;
4786		-
4787		- //Object3D readobj =
4788		- objEditor.ReadGFD(fullname, objEditor);
4789		- //makeSomething(readobj);
4790		- }
4791		- }
4792		-
4793	6064	/*
4794	6065	public void Callback(Object obj)
4795	6066	{
..	..	@@ -4813,26 +6084,9 @@
4813	6084	}
4814	6085	*/
4815	6086
4816		- void ImportVRMLX3D()
4817		- {
4818		- if (GrafreeD.standAlone)
4819		- {
4820		- /**/
4821		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4822		- browser.show();
4823		- String filename = browser.getFile();
4824		- if (filename != null && filename.length() > 0)
4825		- {
4826		- String fullname = browser.getDirectory() + filename;
4827		- LoadVRMLX3D(fullname);
4828		- }
4829		- /**/
4830		- }
4831		- }
4832		-
4833	6087	String GetFile(String dialogName)
4834	6088	{
4835		- if (GrafreeD.standAlone)
	6089	+ if (Grafreed.standAlone)
4836	6090	{
4837	6091	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4838	6092	browser.show();
..	..	@@ -4896,10 +6150,48 @@
4896	6150	cButton flashSelectionButton;
4897	6151	cButton editButton;
4898	6152	cButton uneditButton;
	6153	+ JCheckBox allParamsButton;
4899	6154	cButton clearpanelButton;
4900		- cButton allParamsButton;
4901	6155	cButton unselectButton;
4902	6156
	6157	+ cButton restoreCameraButton;
	6158	+
	6159	+ cButton oneStepButton;
	6160	+
	6161	+ cButton groupButton;
	6162	+ cButton ungroupButton;
	6163	+ cButton compositeButton;
	6164	+ cButton switchButton;
	6165	+ cButton loopButton;
	6166	+ cButton textureButton;
	6167	+
	6168	+ cButton skybox1Button;
	6169	+ cButton skybox2Button;
	6170	+ cButton skybox3Button;
	6171	+ cButton skybox4Button;
	6172	+ cButton skybox5Button;
	6173	+ cButton skybox6Button;
	6174	+ cButton skybox7Button;
	6175	+
	6176	+ cButton skybox11Button;
	6177	+ cButton skybox12Button;
	6178	+ cButton skybox13Button;
	6179	+ cButton skybox14Button;
	6180	+ cButton skybox15Button;
	6181	+ cButton skybox16Button;
	6182	+ cButton skybox17Button;
	6183	+
	6184	+ cButton gridButton;
	6185	+ cButton boxButton;
	6186	+ cButton sphereButton;
	6187	+ cButton coneButton;
	6188	+ cButton torusButton;
	6189	+ cButton superButton;
	6190	+ cButton kleinButton;
	6191	+ cButton particlesButton;
	6192	+ cButton overlayButton;
	6193	+ cButton lightButton;
	6194	+
4903	6195	cButton screenfitButton;
4904	6196	cButton screenfitpointButton;
4905	6197	cButton snapobjectButton;
..	..	@@ -4911,14 +6203,6 @@
4911	6203
4912	6204	cButton setsupportButton;
4913	6205
4914		- cButton twoButton;
4915		- cButton sixButton;
4916		- cButton threeButton;
4917		- cButton sevenButton;
4918		- cButton fourButton; // full panel
4919		- cButton oneButton; // full XYZ
4920		- //cButton currentLayout;
4921		-
4922	6206	//
4923	6207	//Composite
4924	6208	Object3D // to do !!
..	..	@@ -4928,9 +6212,11 @@
4928	6212	//JTree jTree;
4929	6213	private MenuItem lookAtItem;
4930	6214	private MenuItem lookFromItem;
4931		- private MenuItem switchItem;
	6215	+ private MenuItem switchViewItem;
4932	6216	private MenuItem cutItem;
4933		- private MenuItem duplicateItem;
	6217	+ private MenuItem undoItem;
	6218	+ private MenuItem redoItem;
	6219	+ private JMenuItem duplicateItem;
4934	6220	private MenuItem cloneItem;
4935	6221	private MenuItem cloneSupportItem;
4936	6222	private MenuItem overwriteGeoItem;
..	..	@@ -4943,7 +6229,7 @@
4943	6229	private MenuItem linkverticesItem;
4944	6230	private MenuItem relinkverticesItem;
4945	6231	private MenuItem setMasterItem;
4946		- private MenuItem resetMeshItem;
	6232	+ private MenuItem resetAllItem;
4947	6233	private MenuItem stepAllItem;
4948	6234	private MenuItem revertMeshItem;
4949	6235	private MenuItem poseMeshItem;
..	..	@@ -4954,10 +6240,11 @@
4954	6240	private MenuItem mergeGeometriesItem;
4955	6241	private MenuItem copyItem;
4956	6242	private MenuItem pasteItem;
	6243	+ private MenuItem pasteIntoItem;
4957	6244	private MenuItem pasteLinkItem;
4958	6245	private MenuItem pasteCloneItem;
4959	6246	private MenuItem pasteExpandItem;
4960		- private MenuItem clearItem;
	6247	+ private MenuItem deleteItem;
4961	6248	private MenuItem clearAllItem;
4962	6249	private MenuItem genUVItem;
4963	6250	private MenuItem genNormalsMESHItem;
..	..	@@ -4992,6 +6279,10 @@
4992	6279	private MenuItem showleavesItem;
4993	6280	private MenuItem markleavesItem;
4994	6281	private MenuItem unmarkleavesItem;
	6282	+ private MenuItem rewindleavesItem;
	6283	+ private MenuItem unrewindleavesItem;
	6284	+ private MenuItem randomleavesItem;
	6285	+ private MenuItem unrandomleavesItem;
4995	6286
4996	6287	private MenuItem flipVItem;
4997	6288	private MenuItem unflipVItem;
..	..	@@ -5003,15 +6294,17 @@
5003	6294	private MenuItem panoTexturesItem;
5004	6295
5005	6296	private MenuItem resetCentroidItem;
5006		- private MenuItem transformgeometryItem;
	6297	+ private MenuItem resetCentroidXZItem;
5007	6298	private MenuItem resetTransformItem;
	6299	+ private MenuItem transformGeometryItem;
	6300	+ private MenuItem transformChildrenItem;
5008	6301	private MenuItem hideItem;
5009	6302	private MenuItem grabItem;
5010	6303	private MenuItem backItem;
5011	6304	private MenuItem frontItem;
5012	6305	private MenuItem cameraItem;
5013	6306	private MenuItem compositeItem;
5014		- private MenuItem randomItem;
	6307	+ private MenuItem switchItem;
5015	6308	private MenuItem physicsItem;
5016	6309	private MenuItem frameselectorItem;
5017	6310	private MenuItem scriptNodeItem;
..	..	@@ -5035,6 +6328,8 @@
5035	6328	private MenuItem attachBumpItem;
5036	6329	private MenuItem detachBumpItem;
5037	6330	private MenuItem pigmentBumpItem;
	6331	+ private MenuItem embedTexturesItem;
	6332	+ private MenuItem deEmbedTexturesItem;
5038	6333
5039	6334	private MenuItem particleItem;
5040	6335	private MenuItem ragdollItem;
..	..	@@ -5051,7 +6346,7 @@
5051	6346	private MenuItem blobItem;
5052	6347	private MenuItem latheItem;
5053	6348	private MenuItem bezierItem;
5054		- private MenuItem checkerItem;
	6349	+ private MenuItem overlayItem;
5055	6350	private MenuItem meshItem;
5056	6351	// private MenuItem meshGroupItem;
5057	6352	private MenuItem springItem;
..	..	@@ -5073,11 +6368,6 @@
5073	6368	private MenuItem doubleItem;
5074	6369	private MenuItem tripleItem;
5075	6370
5076		- private MenuItem importGFDItem;
5077		- private MenuItem importVRMLX3DItem;
5078		- private MenuItem import3DSItem;
5079		- private MenuItem importOBJItem;
5080		-
5081	6371	private MenuItem computeAOItem;
5082	6372	private MenuItem recompileItem;
5083	6373	private MenuItem editScriptItem;
..	..	@@ -5087,4 +6377,8 @@
5087	6377	private MenuItem analyzeItem;
5088	6378	private MenuItem dumpItem;
5089	6379	//boolean freezemodel = false;
	6380	+
	6381	+ Menu cameraMenu;
	6382	+ MenuItem editCameraItem;
	6383	+ MenuItem restoreCameraItem;
5090	6384	}