~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,335 @@
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, final String t, cGridBag row)
	46	+ {
	47	+ cButton textureButton;
	48	+ final String path = "textures/" + f + "/"; // + t;
	49	+ row.add(textureButton = GetButton(path + "icons/" + t, !Grafreed.NIMBUSLAF));
	50	+ textureButton.setToolTipText(f + "s");
	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	+ cameraView.repaint();
	354	+ }
	355	+
25	356	//ObjEditor objEditor;
26	357	public void closeUI2()
27	358	{
..	..	@@ -59,6 +390,12 @@
59	390	this.copy = this.group = group;
60	391	//selectees = this.group.selectees;
61	392
	393	+ if (copy.versionlist == null)
	394	+ {
	395	+ copy.versionlist = new Object3D[100];
	396	+ copy.versionindex = -1;
	397	+ }
	398	+
62	399	if(ui)
63	400	SetupUI(objEditor);
64	401	}
..	..	@@ -73,16 +410,28 @@
73	410	this.copy = this.group = copy;
74	411	//selectees = this.group.selectees;
75	412
76		- SetupMenu2(objEditor);
	413	+ SetupMenu2(this); //objEditor);
77	414	SetupUI2(objEditor);
78	415	objEditor.SetupUI(true);
79	416	SetupViews(objEditor);
80	417
81	418	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
	419	+
	420	+ if (copy.versionlist == null)
	421	+ {
	422	+ copy.versionlist = new Object3D[100];
	423	+ copy.versionindex = -1;
	424	+
	425	+ Save(true);
	426	+ }
82	427	}
83	428
84	429	void CloneSelection(boolean supports)
85	430	{
	431	+ if (Globals.REPLACEONMAKE)
	432	+ Save();
	433	+ boolean keep = Globals.REPLACEONMAKE;
	434	+ Globals.REPLACEONMAKE = false;
86	435	// Object3D keep = GrafreeD.clipboard;
87	436	//Object3D obj;
88	437	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -93,18 +442,19 @@
93	442
94	443	makeSomething(clone, i==group.selection.size()-1);
95	444	}
	445	+ Globals.REPLACEONMAKE = keep;
96	446	}
97	447
98	448	void CloneClipboard(boolean supports)
99	449	{
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));
	450	+ assert(Grafreed.clipboard.parent == null);
	451	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	452	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	453	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	454	+ makeSomething(CloneObject(Grafreed.clipboard.get(0), false));
105	455	else
106		- makeSomething(CloneObject(GrafreeD.clipboard, false));
107		- GrafreeD.clipboard.get(0).parent = keepparent;
	456	+ makeSomething(CloneObject(Grafreed.clipboard, false));
	457	+ Grafreed.clipboard.get(0).parent = keepparent;
108	458	}
109	459
110	460	static Object3D CloneObject(Object3D obj, boolean supports)
..	..	@@ -118,7 +468,7 @@
118	468	// obj.support = null;
119	469	if (!supports)
120	470	obj.SaveSupports();
121		- Object3D clone = (Object3D)GrafreeD.clone(obj);
	471	+ Object3D clone = (Object3D)Grafreed.clone(obj);
122	472	obj.parent = parent;
123	473	// obj.support = support;
124	474	// clone.support = support; // aout 2013
..	..	@@ -147,30 +497,29 @@
147	497
148	498	//JTextField nameField;
149	499
150		- void SetupMenu2(ObjEditor oe)
	500	+ void SetupMenu2(GroupEditor oe)
151	501	{
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);
	502	+ oe.jTree = new cTree();
	503	+
163	504	Menu menu;
164	505	oe.menuBar.add(menu = new Menu("Edit"));
165	506	//editItem = menu.add(new MenuItem("Edit"));
166	507	//editItem.addActionListener(this);
167		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	508	+
	509	+// undoItem = menu.add(new MenuItem("Undo"));
	510	+// undoItem.addActionListener(this);
	511	+// redoItem = menu.add(new MenuItem("Redo"));
	512	+// redoItem.addActionListener(this);
	513	+// menu.add("-");
	514	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
168	515	duplicateItem.addActionListener(this);
169		- menu.add("-");
170	516	cloneItem = menu.add(new MenuItem("Clone"));
171	517	cloneItem.addActionListener(this);
	518	+ if (Globals.ADVANCED)
	519	+ {
172	520	cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
173	521	cloneSupportItem.addActionListener(this);
	522	+ }
174	523	menu.add("-");
175	524	cutItem = menu.add(new MenuItem("Cut"));
176	525	cutItem.addActionListener(this);
..	..	@@ -178,27 +527,123 @@
178	527	copyItem.addActionListener(this);
179	528	pasteItem = menu.add(new MenuItem("Paste"));
180	529	pasteItem.addActionListener(this);
	530	+
	531	+ menu.add("-");
	532	+ pasteIntoItem = menu.add(new MenuItem("Paste into"));
	533	+ pasteIntoItem.addActionListener(this);
181	534	pasteLinkItem = menu.add(new MenuItem("Paste link"));
182	535	pasteLinkItem.addActionListener(this);
183	536	pasteCloneItem = menu.add(new MenuItem("Paste clone"));
184	537	pasteCloneItem.addActionListener(this);
185	538	// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
186	539	// pasteExpandItem.addActionListener(this);
187		- clearItem = menu.add(new MenuItem("Clear"));
188		- clearItem.addActionListener(this);
	540	+ menu.add("-");
	541	+ deleteItem = menu.add(new MenuItem("Delete"));
	542	+ deleteItem.addActionListener(this);
	543	+
	544	+ if (Globals.ADVANCED)
	545	+ {
	546	+ // Deletes the cameras...
189	547	clearAllItem = menu.add(new MenuItem("Clear All"));
190	548	clearAllItem.addActionListener(this);
	549	+ }
	550	+
	551	+ menuBar.add(cameraMenu = new Menu("View"));
	552	+ //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
	553	+ //zBufferItem.addActionListener(this);
	554	+ //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
	555	+ //normalLensItem.addActionListener(this);
	556	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	557	+ restoreCameraItem.addActionListener(this);
	558	+
	559	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	560	+// toggleFullScreenItem.addItemListener(this);
	561	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	562	+// cameraMenu.add("-");
	563	+//
	564	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	565	+// toggleTextureItem.addItemListener(this);
	566	+// toggleTextureItem.setState(CameraPane.textureon);
	567	+//
	568	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	569	+// toggleSwitchItem.addItemListener(this);
	570	+// toggleSwitchItem.setState(CameraPane.SWITCH);
	571	+
	572	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
	573	+ toggleHandleItem.addItemListener(this);
	574	+ toggleHandleItem.setState(CameraPane.HANDLES);
	575	+
	576	+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
	577	+ togglePaintItem.addItemListener(this);
	578	+ togglePaintItem.setState(CameraPane.PAINTMODE);
	579	+
	580	+ if (Globals.ADVANCED)
	581	+ {
	582	+ cameraMenu.add("-");
	583	+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
	584	+ toggleLiveItem.addItemListener(this);
	585	+ toggleLiveItem.setState(Globals.isLIVE());
191	586
	587	+ cameraMenu.add(stepItem = new MenuItem("Step"));
	588	+ stepItem.addActionListener(this);
	589	+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
	590	+ // toggleDLItem.addItemListener(this);
	591	+ // toggleDLItem.setState(false);
	592	+
	593	+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
	594	+ toggleRenderItem.addItemListener(this);
	595	+ toggleRenderItem.setState(!CameraPane.frozen);
	596	+
	597	+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
	598	+ toggleDebugItem.addItemListener(this);
	599	+ toggleDebugItem.setState(Globals.DEBUG);
	600	+
	601	+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
	602	+ toggleFrustumItem.addItemListener(this);
	603	+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
	604	+
	605	+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
	606	+ toggleFootContactItem.addItemListener(this);
	607	+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
	608	+
	609	+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
	610	+ toggleTimelineItem.addItemListener(this);
	611	+ }
	612	+
	613	+// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
	614	+// toggleRootItem.addItemListener(this);
	615	+// toggleRootItem.setState(false);
	616	+// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
	617	+// animationItem.addItemListener(this);
	618	+// animationItem.setState(CameraPane.ANIMATION);
	619	+ cameraMenu.add("-");
	620	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
	621	+ editCameraItem.addActionListener(this);
	622	+
	623	+ if (Globals.ADVANCED)
	624	+ {
	625	+ oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
	626	+ //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
	627	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
	628	+ editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
	629	+ oe.cameraMenu.add("-");
	630	+ openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
	631	+ openWindowItem.addActionListener(this);
	632	+ editLeafItem.addActionListener(this);
	633	+ lookAtItem.addActionListener(this);
	634	+ //lookFromItem.addActinoListener(this);
	635	+ //switchViewItem.addActionListener(this);
	636	+ }
	637	+
192	638	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);
	639	+ if (Globals.ADVANCED)
	640	+ {
197	641	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
198	642	revertMeshItem.addActionListener(this);
199	643	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
200	644	resetreferencesItem.addActionListener(this);
201	645	menu.add("-");
	646	+ }
202	647	overwriteGeoItem = menu.add(new MenuItem("Overwrite Geometry"));
203	648	overwriteGeoItem.addActionListener(this);
204	649	overwriteMatItem = menu.add(new MenuItem("Overwrite Material"));
..	..	@@ -210,79 +655,104 @@
210	655	overwriteUVItem = menu.add(new MenuItem("Overwrite UV"));
211	656	overwriteUVItem.addActionListener(this);
212	657	menu.add("-");
	658	+ if (Globals.ADVANCED)
	659	+ {
213	660	generateMeshItem = menu.add(new MenuItem("Generate Meshes"));
214	661	generateMeshItem.addActionListener(this);
215	662	poseMeshItem = menu.add(new MenuItem("Set Pose Meshes"));
216	663	poseMeshItem.addActionListener(this);
217	664	menu.add("-");
	665	+ }
218	666	resetsupportItem = menu.add(new MenuItem("Reset support"));
219	667	resetsupportItem.addActionListener(this);
220	668	linkverticesItem = menu.add(new MenuItem("Link to Support"));
221	669	linkverticesItem.addActionListener(this);
222	670	relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
223	671	relinkverticesItem.addActionListener(this);
	672	+
	673	+ if (Globals.ADVANCED)
	674	+ {
224	675	setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
225	676	setMasterItem.addActionListener(this);
	677	+ }
226	678
227	679	oe.menuBar.add(menu = new Menu("Group"));
228		- grabItem = menu.add(new MenuItem("Grab"));
229		- grabItem.addActionListener(this);
	680	+// grabItem = menu.add(new MenuItem("Grab"));
	681	+// grabItem.addActionListener(this);
230	682	backItem = menu.add(new MenuItem("Back"));
231	683	backItem.addActionListener(this);
232	684	frontItem = menu.add(new MenuItem("Front"));
233	685	frontItem.addActionListener(this);
234		- compositeItem = menu.add(new MenuItem("Composite"));
235		- compositeItem.addActionListener(this);
236		- hideItem = menu.add(new MenuItem("Hide"));
	686	+// compositeItem = menu.add(new MenuItem("Composite"));
	687	+// compositeItem.addActionListener(this);
	688	+
	689	+ if (Globals.ADVANCED)
	690	+ {
	691	+ hideItem = menu.add(new MenuItem("Hidden Group"));
237	692	hideItem.addActionListener(this);
	693	+ }
238	694	ungroupItem = menu.add(new MenuItem("Ungroup"));
239	695	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);
	696	+
	697	+// menu.add("-");
	698	+//
	699	+// switchItem = menu.add(new MenuItem("Switch node"));
	700	+// switchItem.addActionListener(this);
	701	+ if (Globals.ADVANCED)
	702	+ {
247	703	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
248	704	switchGeoItem.addActionListener(this);
249	705	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
250	706	switchTransfoItem.addActionListener(this);
251		- morphItem = menu.add(new MenuItem("Morph"));
	707	+ morphItem = menu.add(new MenuItem("Morph Group"));
252	708	morphItem.addActionListener(this);
	709	+
	710	+ menu.add("-");
	711	+ physicsItem = menu.add(new MenuItem("Physics"));
	712	+ physicsItem.addActionListener(this);
	713	+ frameselectorItem = menu.add(new MenuItem("Frame Selector"));
	714	+ frameselectorItem.addActionListener(this);
253	715	scriptNodeItem = menu.add(new MenuItem("Script Node"));
254	716	scriptNodeItem.addActionListener(this);
255		- cameraItem = menu.add(new MenuItem("Camera"));
256		- cameraItem.addActionListener(this);
	717	+ }
257	718
258	719	oe.menuBar.add(menu = new Menu("Object"));
259		- textureItem = menu.add(new MenuItem("Texture"));
260		- textureItem.addActionListener(this);
	720	+// textureItem = menu.add(new MenuItem("Texture"));
	721	+// textureItem.addActionListener(this);
261	722	billboardItem = menu.add(new MenuItem("Billboard"));
262	723	billboardItem.addActionListener(this);
263	724	csgItem = menu.add(new MenuItem("CSG"));
264	725	csgItem.addActionListener(this);
265		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	726	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
266	727	shadowXItem.addActionListener(this);
267		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	728	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
268	729	shadowYItem.addActionListener(this);
269		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	730	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
270	731	shadowZItem.addActionListener(this);
	732	+ attributeItem = menu.add(new MenuItem("Attribute"));
	733	+ attributeItem.addActionListener(this);
	734	+
	735	+ if (Globals.ADVANCED)
	736	+ {
	737	+ menu.add("-");
271	738	linkerItem = menu.add(new MenuItem("Linker"));
272	739	linkerItem.addActionListener(this);
273	740	templateItem = menu.add(new MenuItem("Template"));
274	741	templateItem.addActionListener(this);
275		- attributeItem = menu.add(new MenuItem("Attribute"));
276		- attributeItem.addActionListener(this);
277	742	pointflowItem = menu.add(new MenuItem("Point Flow"));
278	743	pointflowItem.addActionListener(this);
	744	+ }
279	745	menu.add("-");
280	746	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
281	747	resetTransformItem.addActionListener(this);
282	748	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
283	749	resetCentroidItem.addActionListener(this);
284		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
285		- transformgeometryItem.addActionListener(this);
	750	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	751	+ resetCentroidXZItem.addActionListener(this);
	752	+ transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
	753	+ transformGeometryItem.addActionListener(this);
	754	+ transformChildrenItem = menu.add(new MenuItem("Transform Children"));
	755	+ transformChildrenItem.addActionListener(this);
286	756
287	757	oe.menuBar.add(menu = new Menu("Geometry"));
288	758	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -293,8 +763,11 @@
293	763	genNormalsCADItem.addActionListener(this);
294	764	genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
295	765	genNormalsMESHItem.addActionListener(this);
296		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	766	+ if (Globals.ADVANCED)
	767	+ {
	768	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
297	769	genNormalsMINEItem.addActionListener(this);
	770	+ }
298	771	stripifyItem = menu.add(new MenuItem("Stripify"));
299	772	stripifyItem.addActionListener(this);
300	773	unstripifyItem = menu.add(new MenuItem("Unstripify"));
..	..	@@ -316,23 +789,34 @@
316	789	reduce34MeshItem.addActionListener(this);
317	790	increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
318	791	increaseMeshItem.addActionListener(this);
319		- smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
320		- smoothMeshItem.addActionListener(this);
321	792	clipMeshItem = menu.add(new MenuItem("Clip mesh"));
322	793	clipMeshItem.addActionListener(this);
	794	+
	795	+ if (Globals.ADVANCED)
	796	+ {
	797	+ smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
	798	+ smoothMeshItem.addActionListener(this);
	799	+ }
323	800
324	801	oe.menuBar.add(menu = new Menu("Attributes"));
325	802	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
326	803	clearMaterialsItem.addActionListener(this);
	804	+ resetAllItem = menu.add(new MenuItem("Reset All"));
	805	+ resetAllItem.addActionListener(this);
	806	+ stepAllItem = menu.add(new MenuItem("Step All"));
	807	+ stepAllItem.addActionListener(this);
327	808	menu.add("-");
328	809	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
329	810	liveleavesItem.addActionListener(this);
330	811	unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
331	812	unliveleavesItem.addActionListener(this);
	813	+ if (Globals.ADVANCED)
	814	+ {
332	815	supportleavesItem = menu.add(new MenuItem("Support Leaves"));
333	816	supportleavesItem.addActionListener(this);
334	817	unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
335	818	unsupportleavesItem.addActionListener(this);
	819	+ }
336	820	hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
337	821	hideleavesItem.addActionListener(this);
338	822	showleavesItem = menu.add(new MenuItem("Show Leaves"));
..	..	@@ -341,6 +825,14 @@
341	825	markleavesItem.addActionListener(this);
342	826	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
343	827	unmarkleavesItem.addActionListener(this);
	828	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	829	+ rewindleavesItem.addActionListener(this);
	830	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	831	+ unrewindleavesItem.addActionListener(this);
	832	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	833	+ randomleavesItem.addActionListener(this);
	834	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	835	+ unrandomleavesItem.addActionListener(this);
344	836	menu.add("-");
345	837	flipVItem = menu.add(new MenuItem("Flip V"));
346	838	flipVItem.addActionListener(this);
..	..	@@ -366,45 +858,117 @@
366	858	attachBumpItem.addActionListener(this);
367	859	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
368	860	pigmentBumpItem.addActionListener(this);
	861	+ //embedTexturesItem
369	862	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
370	863	detachPigmentItem.addActionListener(this);
371	864	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
372	865	detachBumpItem.addActionListener(this);
	866	+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
	867	+ embedTexturesItem.addActionListener(this);
	868	+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
	869	+ deEmbedTexturesItem.addActionListener(this);
373	870	menu.add("-");
374	871	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
375	872	sortbysizeItem.addActionListener(this);
376	873	sortbynameItem = menu.add(new MenuItem("Sort by name"));
377	874	sortbynameItem.addActionListener(this);
378	875	menu.add("-");
	876	+ shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
	877	+ shareGeometriesItem.addActionListener(this);
	878	+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
	879	+ mergeGeometriesItem.addActionListener(this);
	880	+ if (Globals.ADVANCED)
	881	+ {
	882	+ // Pretty much the same as duplicate and clone.
379	883	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
380	884	extractGeometriesItem.addActionListener(this);
381	885	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
382	886	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);
	887	+ }
387	888
388	889	oe.menuBar.add(menu = new Menu("Insert"));
389	890	buildCreateMenu(menu);
390	891
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	892	oe.menuBar.add(menu = new Menu("Tools"));
403	893	buildToolsMenu(menu);
404	894	}
405	895
	896	+ JTabbedPane resourcecontainer;
	897	+ cGridBag currenttab;
	898	+ boolean added; // patch for jar
	899	+
	900	+ int tabcount = 0;
	901	+ int colcount = 0;
	902	+ int rowcount = 0;
	903	+
	904	+ int columns = 5;
	905	+ int rows = 7;
	906	+
	907	+ public void ResourceCallBack(String[] path)
	908	+ {
	909	+ for (int i = 0; i < path.length; i++)
	910	+ System.out.print(path[i] + "/");
	911	+ System.out.println();
	912	+ if (rowcount == 0)
	913	+ {
	914	+ currenttab = new cGridBag();
	915	+ added = false;
	916	+ String tabname = String.valueOf((char)('A'+tabcount));
	917	+ currenttab.setName(tabname);
	918	+ rowcount = 1;
	919	+ }
	920	+
	921	+ if (path.length > 1 && path[1].toLowerCase().endsWith(".jpg"))
	922	+ {
	923	+ if (!added)
	924	+ {
	925	+ added = true;
	926	+ resourcecontainer.add(currenttab);
	927	+ String tabname = String.valueOf((char)('A'+tabcount));
	928	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
	929	+ }
	930	+
	931	+ AddTextureButton(path[0], path[1], currenttab);
	932	+ if (++colcount >= columns)
	933	+ {
	934	+ colcount = 0;
	935	+ currenttab.Return();
	936	+
	937	+ if (rowcount++ >= rows)
	938	+ {
	939	+ rowcount = 0;
	940	+ }
	941	+ }
	942	+ }
	943	+ else
	944	+ {
	945	+// if (!path[path.length-1].equals("icons"))
	946	+// resourcecontainer.Return();
	947	+ }
	948	+ }
	949	+
	950	+ void CreateTexturePanel(cGridBag container)
	951	+ {
	952	+ resourcecontainer = new JTabbedPane();
	953	+ container.add(resourcecontainer);
	954	+
	955	+ Grafreed.ParseResources("textures", this);
	956	+ }
	957	+
406	958	void SetupUI2(ObjEditor oe)
407	959	{
	960	+ // June 2019
	961	+ if (oe == null)
	962	+ {
	963	+ //super.SetupUI2(this);
	964	+ //return;
	965	+ }
	966	+
	967	+ if (copy != group)
	968	+ {
	969	+ //super.SetupUI2(this);
	970	+ }
	971	+
408	972	//new Exception().printStackTrace();
409	973
410	974	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -433,150 +997,239 @@
433	997	oe.radioPanel.add(dummyButton);
434	998	oe.buttonGroup.add(dummyButton);
435	999	*/
436		- aConstraints.gridy += 1;
437		- oe.aConstraints.gridwidth = 1;
438		- oe.aConstraints.gridx = 0;
	1000	+ cGridBag copyOptionsPanel = new cGridBag();
	1001	+
	1002	+ copyOptionsPanel.preferredHeight = 2;
439	1003
440		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", CameraPane.isLIVE()), oe.aConstraints);
	1004	+ //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
	1005	+
	1006	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1007	+ //minButton.setToolTipText("Minimize window");
	1008	+ //minButton.addActionListener(this);
	1009	+
	1010	+ if (Globals.ADVANCED)
	1011	+ {
	1012	+ oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1013	+ maxButton.setToolTipText("Maximize window");
	1014	+ maxButton.addActionListener(this);
	1015	+ }
	1016	+
	1017	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1018	+ fullButton.setToolTipText("Full-screen window");
	1019	+ fullButton.addActionListener(this);
	1020	+
	1021	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1022	+ screenfitButton.setToolTipText("Screen fit");
	1023	+ screenfitButton.addActionListener(this);
	1024	+
	1025	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1026	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	1027	+ restoreCameraButton.addActionListener(this);
	1028	+
	1029	+ copyOptionsPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1030	+ saveVersionButton.setToolTipText("Duplicate current version");
	1031	+ saveVersionButton.addActionListener(this);
	1032	+
	1033	+ copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1034	+ deleteVersionButton.setToolTipText("Delete current version");
	1035	+ deleteVersionButton.addActionListener(this);
	1036	+
	1037	+ copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1038	+ previousVersionButton.setToolTipText("Previous version");
	1039	+ previousVersionButton.addActionListener(this);
	1040	+ previousVersionButton.setEnabled(false);
	1041	+
	1042	+ cGridBag updown = new cGridBag().setVertical(true);
	1043	+ updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1044	+ restoreButton.setToolTipText("Undo (restore current version)");
	1045	+ restoreButton.addActionListener(this);
	1046	+ //restoreButton.setEnabled(false);
	1047	+
	1048	+ updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1049	+ replaceButton.setToolTipText("Save (replace current version)");
	1050	+ replaceButton.addActionListener(this);
	1051	+ //replaceButton.setEnabled(false);
	1052	+
	1053	+ copyOptionsPanel.add(updown);
	1054	+
	1055	+ copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1056	+ nextVersionButton.setToolTipText("Next version");
	1057	+ nextVersionButton.addActionListener(this);
	1058	+ nextVersionButton.setEnabled(false);
	1059	+
	1060	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	1061	+ liveCB.setToolTipText("Enable animation");
441	1062	liveCB.addItemListener(this);
442	1063
443		- oe.aConstraints.gridx += 1;
444		- oe.toolbarPanel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT), oe.aConstraints);
445		- supportCB.addItemListener(this);
446		-
447		- // oe.aConstraints.gridx += 1;
448		- // oe.toolbarPanel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), oe.aConstraints);
449		- // localCB.addItemListener(this);
450		-
451		- oe.aConstraints.gridx += 1;
452		- oe.toolbarPanel.add(crowdCB = new cCheckBox("Crowd", CameraPane.CROWD), oe.aConstraints);
453		- crowdCB.addItemListener(this);
454		-
455		- oe.aConstraints.gridx += 1;
456		- oe.toolbarPanel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA), oe.aConstraints);
457		- smoothCB.addItemListener(this);
458		-
459		- oe.aConstraints.gridx += 1;
460		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST), oe.aConstraints);
	1064	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1065	+ oneStepButton.setToolTipText("Animate one step forward");
	1066	+ oneStepButton.addActionListener(this);
	1067	+
	1068	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
	1069	+ fastCB.setToolTipText("Fast mode");
461	1070	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);
	1071	+
	1072	+ //oe.toolboxPanel.Return();
	1073	+
	1074	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	1075	+// trackCB.setToolTipText("Enable tracking");
	1076	+// trackCB.addItemListener(this);
468	1077
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	1078	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
510	1079	// 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	1080
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		- oe.aConstraints.gridx += 1;
524		- oe.aConstraints.weighty = 0;
525		- oe.aConstraints.gridwidth = 1;
526		-
527		- //
528		- oe.toolbarPanel.add(twoButton = new cButton(" \|+\| ")); //, oe.aConstraints);
529		- twoButton.addActionListener(this);
530		- oe.toolbarPanel.add(fourButton = new cButton("+\|\| ")); //, oe.aConstraints);
	1081	+ if (Globals.ADVANCED)
	1082	+ {
	1083	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1084	+ snapobjectButton.addActionListener(this);
	1085	+ snapobjectButton.setToolTipText("Snap Object");
	1086	+
	1087	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
531	1088	fourButton.addActionListener(this);
532		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\| ")); //, oe.aConstraints);
533		- sixButton.addActionListener(this);
534		- oe.toolbarPanel.add(threeButton = new cButton(" \|+\|+")); //, oe.aConstraints);
	1089	+ fourButton.setToolTipText("Show control panel only");
	1090	+ }
	1091	+
	1092	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
	1093	+
	1094	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1095	+ twoButton.setToolTipText("Show 3D view only");
	1096	+ twoButton.addActionListener(this);
	1097	+ this.fullscreenLayout = twoButton;
	1098	+
	1099	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1100	+ threeButton.setToolTipText("Show controls and 3D view");
535	1101	threeButton.addActionListener(this);
536		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+")); //, oe.aConstraints);
537		- sevenButton.addActionListener(this);
	1102	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1103	+ sixButton.setToolTipText("Show 3D view and controls");
	1104	+ sixButton.addActionListener(this);
	1105	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1106	+// sevenButton.setToolTipText("3-column layout");
	1107	+// sevenButton.addActionListener(this);
538	1108	//
539	1109
540		- oe.toolbarPanel.add(rootButton = new cButton(" o o o E ")); //, oe.aConstraints);
	1110	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1111	+ rootButton.setToolTipText("Open selection in new tab");
541	1112	rootButton.addActionListener(this);
542		- oe.aConstraints.gridx += 1;
543		- oe.toolbarPanel.add(closeButton = new cButton(" X ")); //, oe.aConstraints);
	1113	+
	1114	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1115	+ closeButton.setToolTipText("Close tab");
544	1116	closeButton.addActionListener(this);
545	1117	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
546	1118	//clearButton.addActionListener(this);
547		- oe.aConstraints.gridx += 1;
548		-
549		- oe.aConstraints.gridx = 1; //
550		- oe.treePanel.add(editButton = new cButton("+"), oe.aConstraints);
551		- editButton.addActionListener(this);
552		- oe.aConstraints.gridx += 1;
553		- oe.aConstraints.weighty = 0;
554		- oe.aConstraints.gridwidth = 1;
555	1119
556		- oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
	1120	+ cGridBag row1 = new cGridBag();
	1121	+
	1122	+ // INSERT
	1123	+ row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1124	+ gridButton.setToolTipText("Create grid");
	1125	+ gridButton.addActionListener(this);
	1126	+
	1127	+ row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1128	+ boxButton.setToolTipText("Create box");
	1129	+ boxButton.addActionListener(this);
	1130	+
	1131	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1132	+ sphereButton.setToolTipText("Create sphere");
	1133	+ sphereButton.addActionListener(this);
	1134	+
	1135	+ row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1136	+ coneButton.setToolTipText("Create cone");
	1137	+ coneButton.addActionListener(this);
	1138	+
	1139	+ row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1140	+ torusButton.setToolTipText("Create torus");
	1141	+ torusButton.addActionListener(this);
	1142	+
	1143	+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1144	+ superButton.setToolTipText("Create superellipsoid");
	1145	+ superButton.addActionListener(this);
	1146	+
	1147	+ if (Globals.ADVANCED)
	1148	+ {
	1149	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1150	+ kleinButton.setToolTipText("Create Klein bottle");
	1151	+ kleinButton.addActionListener(this);
	1152	+ }
	1153	+
	1154	+ row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1155	+ particlesButton.setToolTipText("Create particle system");
	1156	+ particlesButton.addActionListener(this);
	1157	+
	1158	+ oe.toolboxPanel.add(row1);
	1159	+
	1160	+ cGridBag row2 = new cGridBag();
	1161	+
	1162	+ row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1163	+ groupButton.setToolTipText("Create group");
	1164	+ groupButton.addActionListener(this);
	1165	+
	1166	+ row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1167	+ compositeButton.setToolTipText("Create composite");
	1168	+ compositeButton.addActionListener(this);
	1169	+
	1170	+ row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1171	+ switchButton.setToolTipText("Create item switcher");
	1172	+ switchButton.addActionListener(this);
	1173	+
	1174	+ row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1175	+ loopButton.setToolTipText("Create loop");
	1176	+ loopButton.addActionListener(this);
	1177	+
	1178	+ row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1179	+ textureButton.setToolTipText("Create texture");
	1180	+ textureButton.addActionListener(this);
	1181	+
	1182	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1183	+ overlayButton.setToolTipText("Create overlay");
	1184	+ overlayButton.addActionListener(this);
	1185	+
	1186	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1187	+ lightButton.setToolTipText("Create light");
	1188	+ lightButton.addActionListener(this);
	1189	+
	1190	+ oe.toolboxPanel.add(row2);
	1191	+
	1192	+ cGridBag textures = new cGridBag();
	1193	+
	1194	+ CreateTexturePanel(textures);
	1195	+
	1196	+ oe.toolboxPanel.add(textures);
	1197	+
	1198	+ textures.preferredHeight = 100;
	1199	+
	1200	+ CreateSkyboxPanel(oe.skyboxPanel);
	1201	+
	1202	+ // EDIT panel
	1203	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1204	+ editButton.setToolTipText("Pin selection controls");
	1205	+ editButton.addActionListener(this);
	1206	+
	1207	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1208	+ uneditButton.setToolTipText("Unpin and remove selection controls");
557	1209	uneditButton.addActionListener(this);
558	1210
559		- oe.aConstraints.gridx += 1;
560		- oe.aConstraints.weighty = 0;
561		- oe.aConstraints.gridwidth = 1;
562		-
563		- oe.treePanel.add(clearPanelButton = new cButton("C"), oe.aConstraints);
564		- clearPanelButton.addActionListener(this);
565		-
566		- oe.aConstraints.gridx += 1;
567		- oe.aConstraints.weighty = 0;
568		- oe.aConstraints.gridwidth = 1;
569		-
570		- oe.treePanel.add(allParamsButton = new cButton("A"), oe.aConstraints);
	1211	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	1212	+ allParamsButton.setToolTipText("Show all controls");
571	1213	allParamsButton.addActionListener(this);
572	1214
573		- oe.aConstraints.gridx += 1;
574		- oe.aConstraints.weighty = 0;
575		- oe.aConstraints.gridwidth = 1;
576		-
577		- oe.treePanel.add(unselectButton = new cButton("U"), oe.aConstraints);
578		- unselectButton.addActionListener(this);
	1215	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1216	+ clearPanelButton.setToolTipText("Clear all controls");
	1217	+ clearPanelButton.addActionListener(this);
579	1218
	1219	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1220	+ //unselectButton.setToolTipText("Unselect");
	1221	+ //unselectButton.addActionListener(this);
	1222	+
	1223	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1224	+ flashSelectionButton.setToolTipText("Highlight selection");
	1225	+ flashSelectionButton.addActionListener(this);
	1226	+
	1227	+ editCommandsPanel.preferredHeight = 1;
	1228	+
	1229	+ SetPinStates(false);
	1230	+// oe.treePanel.add(commandsPanel);
	1231	+// oe.treePanel.Return();
	1232	+
580	1233	// oe.aConstraints.gridx += 1;
581	1234	// oe.aConstraints.weighty = 0;
582	1235	// oe.aConstraints.gridwidth = 1;
..	..	@@ -588,47 +1241,32 @@
588	1241	// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
589	1242	// gcButton.addActionListener(this);
590	1243
591		- oe.aConstraints.gridx = 0;
592		- oe.aConstraints.gridy += 1;
593		-
594		- //ctrlPanel.add(objList = new List(5, true));
595		- oe.aConstraints.gridwidth = 100;
596		- // oe.aConstraints.gridheight = 100;
597		- oe.aConstraints.fill = GridBagConstraints.BOTH; // HORIZONTAL;
598		- oe.aConstraints.gridheight = 1;
599		- oe.aConstraints.weighty = 0.5;
600		- oe.aConstraints.gridx = 0;
601		- JScrollPane jSP;
	1244	+ cGridBag jSPPanel = new cGridBag();
	1245	+
	1246	+ JScrollPane jSP;
602	1247	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
603		- oe.treePanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null)), oe.aConstraints);
	1248	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
604	1249	ResetModel();
605		- oe.aConstraints.weighty = 0.5;
606		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
607		- oe.aConstraints.gridy += 1;
608		- oe.aConstraints.gridwidth = 1;
609		-
610		- oe.aConstraints.weighty = 0;
611		- oe.aConstraints.gridwidth = 2;
612		-
613		- oe.treePanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0), oe.aConstraints);
614		- colorCB.addItemListener(this);
615		- oe.aConstraints.gridx += 2;
616		- oe.treePanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0), oe.aConstraints);
617		- materialCB.addItemListener(this);
618		- oe.aConstraints.gridx += 2;
619		- oe.treePanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0), oe.aConstraints);
620		- textureCB.addItemListener(this);
621		-
622		- oe.aConstraints.gridx = 0;
623		- oe.aConstraints.gridy += 1;
624	1250
	1251	+ oe.treePanel.add(jSPPanel);
	1252	+ oe.treePanel.Return();
	1253	+
	1254	+ oe.treePanel.add(copyOptionsPanel);
	1255	+ oe.treePanel.Return();
	1256	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1257	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	1258	+ sliderPane.preferredHeight = 1;
	1259	+
	1260	+// mainPanel.setDividerLocation(0.1); //1.0);
	1261	+ mainPanel.setResizeWeight(0.4);
	1262	+
625	1263	//jList.addListSelectionListener(this);
626	1264	oe.jTree.addTreeSelectionListener(this);
627	1265	//jTree.setRootVisible(false);
628	1266	//jTree.setEditable(true);
629	1267	oe.jTree.setDragEnabled(true);
630	1268	//jTree.setPreferredSize(new Dimension(10,10));
631		- jSP.setPreferredSize(new Dimension(100,200));
	1269	+ //jSP.setPreferredSize(new Dimension(100,200));
632	1270
633	1271	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
634	1272
..	..	@@ -640,23 +1278,163 @@
640	1278	dgr.addDragGestureListener(this);
641	1279	}catch(Exception e) {}
642	1280	*/
643		- radio.layout = sevenButton;
	1281	+ radio.layout = threeButton; // sixButton;
644	1282	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
645	1283	}
	1284	+
	1285	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
	1286	+ {
	1287	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	1288	+ colorCB.setToolTipText("Copy color when dropped");
	1289	+ colorCB.addItemListener(this);
	1290	+
	1291	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	1292	+ materialCB.setToolTipText("Copy material when dropped");
	1293	+ materialCB.addItemListener(this);
	1294	+
	1295	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	1296	+ textureCB.setToolTipText("Copy texture when dropped");
	1297	+ textureCB.addItemListener(this);
	1298	+
	1299	+ panel.Return();
	1300	+
	1301	+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
	1302	+ boxCB.setToolTipText("Display bounding boxes");
	1303	+ boxCB.addItemListener(this);
	1304	+
	1305	+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
	1306	+ zoomBoxCB.setToolTipText("Display only for wheel");
	1307	+ zoomBoxCB.addItemListener(this);
	1308	+
	1309	+ if (true) // Globals.ADVANCED)
	1310	+ {
	1311	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	1312	+// supportCB.setToolTipText("Enable rigging");
	1313	+// supportCB.addItemListener(this);
	1314	+
	1315	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	1316	+ freezeCB.setToolTipText("Fast moving camera");
	1317	+ freezeCB.addItemListener(this);
	1318	+
	1319	+ // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
	1320	+ // localCB.addItemListener(this);
	1321	+
	1322	+ panel.Return();
	1323	+
	1324	+ panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
	1325	+ crowdCB.setToolTipText("Used for crowds");
	1326	+ crowdCB.addItemListener(this);
	1327	+
	1328	+ panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
	1329	+ smoothCB.setToolTipText("Snapping delay");
	1330	+ smoothCB.addItemListener(this);
	1331	+
	1332	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1333	+// slowCB.setToolTipText("Smooth interpolation");
	1334	+// slowCB.addItemListener(this);
	1335	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1336	+ minshaderCB.setToolTipText("Minimal fast shader");
	1337	+ minshaderCB.addItemListener(this);
	1338	+
	1339	+// constraints.gridy += 1;
	1340	+// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
	1341	+// speakerMocapCB.addItemListener(this);
	1342	+
	1343	+ panel.Return();
	1344	+
	1345	+ if (false)
	1346	+ {
	1347	+ // handled in scripts
	1348	+ //constraints.gridy += 1;
	1349	+ panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
	1350	+ speakerCameraCB.addItemListener(this);
	1351	+
	1352	+ //constraints.gridy += 1;
	1353	+ panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
	1354	+ speakerFocusCB.addItemListener(this);
	1355	+
	1356	+ //constraints.gridy += 1;
	1357	+ panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
	1358	+ smoothfocusCB.addItemListener(this);
	1359	+ panel.Return();
	1360	+ }
	1361	+
	1362	+//constraints.gridx += 1;
	1363	+//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
	1364	+// debugCB.addItemListener(this);
	1365	+
	1366	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	1367	+ trackCB.setToolTipText("Enable tracking target");
	1368	+ trackCB.addItemListener(this);
	1369	+
	1370	+ panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	1371	+ oeilCB.setToolTipText("Move camera when tracking");
	1372	+ oeilCB.addItemListener(this);
	1373	+
	1374	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	1375	+ shadowCB.setToolTipText("When live compute shadows");
	1376	+ shadowCB.addItemListener(this);
	1377	+
	1378	+ panel.Return();
	1379	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	1380	+ toggleTextureCB.setToolTipText("Load textures");
	1381	+ toggleTextureCB.addItemListener(this);
	1382	+
	1383	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	1384	+ toggleSwitchCB.setToolTipText("Choose a single item");
	1385	+ toggleSwitchCB.addItemListener(this);
	1386	+
	1387	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1388	+ autokeepCB.setToolTipText("On structure change");
	1389	+ autokeepCB.addItemListener(this);
	1390	+
	1391	+ panel.Return();
	1392	+ if (Globals.ADVANCED)
	1393	+ {
	1394	+ panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
	1395	+ lookAtCB.setToolTipText("Look-at target");
	1396	+ lookAtCB.addItemListener(this);
	1397	+ }
	1398	+
	1399	+ }
	1400	+
	1401	+ cGridBag fill = new cGridBag();
	1402	+ fill.preferredHeight = 200;
	1403	+ cGridBag fill2 = new cGridBag();
	1404	+ fill2.preferredHeight = 200;
	1405	+ cGridBag fill3 = new cGridBag();
	1406	+ fill3.preferredHeight = 200;
	1407	+
	1408	+ panel.add(fill);
	1409	+ panel.add(fill2);
	1410	+ panel.add(fill3);
	1411	+
	1412	+ }
646	1413
647	1414	void EditObject(Object3D obj)
648	1415	{
649		- cRadio dummyButton = new cRadio(obj.name);
650		- dummyButton.SetObject(obj);
651		- dummyButton.layout = sevenButton;
652		- dummyButton.SetCamera(cameraView.renderCamera, false);
653		- dummyButton.addActionListener(this);
654		- radioPanel.add(dummyButton);
655		- buttonGroup.add(dummyButton);
656		- dummyButton.doClick();
	1416	+ cRadio radioButton = new cRadio(obj.name);
	1417	+
	1418	+ // June 2019. Patch to avoid bug with transparency.
	1419	+ radioButton.hadMaterial = obj.material != null;
	1420	+ if (!radioButton.hadMaterial)
	1421	+ {
	1422	+ obj.material = new cMaterial();
	1423	+ }
	1424	+
	1425	+ radioButton.SetObject(obj);
	1426	+ radioButton.layout = threeButton; // sixButton;
	1427	+ radioButton.SetCamera(cameraView.renderCamera, false);
	1428	+ radioButton.addActionListener(this);
	1429	+ radioPanel.add(radioButton);
	1430	+ buttonGroup.add(radioButton);
	1431	+ radioButton.doClick();
657	1432	}
	1433	+
658	1434	void SetupViews(ObjEditor oe)
659	1435	{
	1436	+ theFrame = this;
	1437	+
660	1438	oe.SetupViews();
661	1439
662	1440	System.out.println("SetupViews");
..	..	@@ -665,22 +1443,30 @@
665	1443	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
666	1444	}
667	1445
668		- JCheckBox liveCB;
669		- JCheckBox supportCB;
670		- JCheckBox localCB;
671		- JCheckBox crowdCB;
672		- JCheckBox smoothCB;
673		- JCheckBox fastCB;
674		- JCheckBox slowCB;
675		- JCheckBox boxCB;
676		- JCheckBox trackCB;
677		- JCheckBox smoothfocusCB;
	1446	+ cToggleButton liveCB;
	1447	+ cCheckBox supportCB;
	1448	+ cCheckBox localCB;
	1449	+ cCheckBox crowdCB;
	1450	+ cCheckBox smoothCB;
	1451	+ cCheckBox minshaderCB;
	1452	+
	1453	+ cToggleButton fastCB;
	1454	+ cCheckBox slowCB;
	1455	+ cCheckBox boxCB;
	1456	+ cCheckBox zoomBoxCB;
	1457	+ cCheckBox freezeCB;
	1458	+ //cToggleButton trackCB;
	1459	+ cCheckBox trackCB;
	1460	+ cCheckBox smoothfocusCB;
678	1461	// JCheckBox speakerMocapCB;
679		- JCheckBox speakerCameraCB;
680		- JCheckBox speakerFocusCB;
681		- JCheckBox debugCB;
682		- JCheckBox oeilCB;
683		- JCheckBox lookAtCB;
	1462	+ cCheckBox speakerCameraCB;
	1463	+ cCheckBox speakerFocusCB;
	1464	+ cCheckBox debugCB;
	1465	+
	1466	+ cCheckBox oeilCB;
	1467	+ cCheckBox shadowCB;
	1468	+ cCheckBox autokeepCB;
	1469	+ cCheckBox lookAtCB;
684	1470
685	1471	// static int COLOR = 1;
686	1472	// static int MATERIAL = 2;
..	..	@@ -688,9 +1474,9 @@
688	1474
689	1475	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
690	1476
691		- JCheckBox colorCB;
692		- JCheckBox materialCB;
693		- JCheckBox textureCB;
	1477	+ cCheckBox colorCB;
	1478	+ cCheckBox materialCB;
	1479	+ cCheckBox textureCB;
694	1480
695	1481	public void itemStateChanged(ItemEvent e)
696	1482	{
..	..	@@ -715,10 +1501,10 @@
715	1501	dropAttributes \|= Object3D.TEXTURE;
716	1502	else
717	1503	dropAttributes &= ~Object3D.TEXTURE;
718		- }
719		- else if(e.getSource() == liveCB)
	1504	+ } else if(e.getSource() == liveCB)
720	1505	{
721	1506	cameraView.ToggleLive();
	1507	+ refreshContents(false);
722	1508	}
723	1509	else if(e.getSource() == supportCB)
724	1510	{
..	..	@@ -734,6 +1520,12 @@
734	1520	{
735	1521	cameraView.ToggleInertia();
736	1522	cameraView.repaint();
	1523	+ }
	1524	+ else if(e.getSource() == minshaderCB)
	1525	+ {
	1526	+ Globals.MINSHADER ^= true;
	1527	+ cameraView.programInitialized = false;
	1528	+ cameraView.repaint();
737	1529	}
738	1530	else if(e.getSource() == localCB)
739	1531	{
..	..	@@ -753,6 +1545,10 @@
753	1545	Recompile();
754	1546	cameraView.repaint();
755	1547	// refreshContents();
	1548	+ }
	1549	+ else if(e.getSource() == zoomBoxCB)
	1550	+ {
	1551	+ cameraView.ToggleZoomBoxMode();
756	1552	}
757	1553	else if(e.getSource() == smoothfocusCB)
758	1554	{
..	..	@@ -779,6 +1575,18 @@
779	1575	{
780	1576	cameraView.ToggleOeil();
781	1577	}
	1578	+ else if(e.getSource() == shadowCB)
	1579	+ {
	1580	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1581	+ }
	1582	+ else if(e.getSource() == freezeCB)
	1583	+ {
	1584	+ Globals.FREEZEONMOVE ^= true;
	1585	+ }
	1586	+ else if(e.getSource() == autokeepCB)
	1587	+ {
	1588	+ Globals.REPLACEONMAKE ^= true;
	1589	+ }
782	1590	else if(e.getSource() == lookAtCB)
783	1591	{
784	1592	cameraView.ToggleLookAt();
..	..	@@ -795,7 +1603,8 @@
795	1603
796	1604	/**/
797	1605	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
798		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1606	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1607	+ TreePath path = objEditor.jTree.getSelectionPath();
799	1608	if ((path == null) \|\| (path.getPathCount() <= 1)) {
800	1609	// We can't move the root node or an empty selection
801	1610	return;
..	..	@@ -858,8 +1667,6 @@
858	1667	}
859	1668	}
860	1669
861		- String string = (String) object;
862		-
863	1670	System.out.println("Transfer = " + object + "; drop : " + target);
864	1671	// if( object instanceof java.io.File[])
865	1672	// {
..	..	@@ -867,7 +1674,11 @@
867	1674	// objEditor.DropFile((java.io.File[]) object, true);
868	1675	// return;
869	1676	// }
870		- if (string.charAt(0) == '/')
	1677	+
	1678	+ String string = object.toString();
	1679	+
	1680	+ // File path for Mac and Windows
	1681	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
871	1682	{
872	1683	// file(s)
873	1684	String[] names = string.split("\n");
..	..	@@ -894,7 +1705,7 @@
894	1705
895	1706	flashIt = false;
896	1707	CameraPane pane = (CameraPane) target;
897		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1708	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
898	1709	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
899	1710
900	1711	if (group.selection.size() == 1)
..	..	@@ -910,23 +1721,33 @@
910	1721
911	1722	assert target == objEditor.jTree;
912	1723	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1724	+ Object3D destinationLeaf;
913	1725	try {
914		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1726	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
915	1727	} catch (Exception e) {
916	1728	System.out.println("destinationPath : " + destinationPath);
917	1729	return;
918	1730	}
919	1731
920		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1732	+ for (int i=group.selection.size(); --i>=0;)
921	1733	{
	1734	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1735	+
	1736	+ // Cannot move into itself
	1737	+ if (child == destinationLeaf)
	1738	+ return;
	1739	+ }
	1740	+
	1741	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1742	+// {
922	1743	loadClipboard(true);
923	1744	objEditor.jTree.setSelectionPath(destinationPath);
924		- pasteInto(false);
925		- } else {
926		- loadClipboard(false);
927		- objEditor.jTree.setSelectionPath(destinationPath);
928		- pasteInto(false); // true); // ???
929		- }
	1745	+ pasteInto(false, false);
	1746	+// } else {
	1747	+// loadClipboard(false);
	1748	+// objEditor.jTree.setSelectionPath(destinationPath);
	1749	+// pasteInto(false, false); // true); // ???
	1750	+// }
930	1751	}
931	1752	public void dropActionChanged(DropTargetDragEvent dtde)
932	1753	// Called if the user has modified the current drop gesture
..	..	@@ -1031,85 +1852,107 @@
1031	1852	{
1032	1853	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1033	1854	//heightFieldItem.addActionListener(this);
1034		- gridItem = menu.add(new MenuItem("Grid"));
1035		- gridItem.addActionListener(this);
1036		- rectoidItem = menu.add(new MenuItem("Box"));
1037		- rectoidItem.addActionListener(this);
1038		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1039		- ellipsoidItem.addActionListener(this);
1040		- coneItem = menu.add(new MenuItem("Cone"));
1041		- coneItem.addActionListener(this);
1042		- torusItem = menu.add(new MenuItem("Torus"));
1043		- torusItem.addActionListener(this);
1044		- superItem = menu.add(new MenuItem("Superellipsoid"));
1045		- superItem.addActionListener(this);
	1855	+// gridItem = menu.add(new MenuItem("Grid"));
	1856	+// gridItem.addActionListener(this);
	1857	+// rectoidItem = menu.add(new MenuItem("Box"));
	1858	+// rectoidItem.addActionListener(this);
	1859	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1860	+// ellipsoidItem.addActionListener(this);
	1861	+// coneItem = menu.add(new MenuItem("Cone"));
	1862	+// coneItem.addActionListener(this);
	1863	+// torusItem = menu.add(new MenuItem("Torus"));
	1864	+// torusItem.addActionListener(this);
	1865	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1866	+// superItem.addActionListener(this);
	1867	+
	1868	+ cameraItem = menu.add(new MenuItem("Camera"));
	1869	+ cameraItem.addActionListener(this);
	1870	+
	1871	+ if (!Globals.ADVANCED)
	1872	+ {
1046	1873	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1047	1874	kleinItem.addActionListener(this);
1048		- particleItem = menu.add(new MenuItem("Particle system"));
1049		- particleItem.addActionListener(this);
	1875	+ }
	1876	+
	1877	+// particleItem = menu.add(new MenuItem("Particle system"));
	1878	+// particleItem.addActionListener(this);
	1879	+ if (Globals.ADVANCED)
	1880	+ {
1050	1881	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1051	1882	ragdollItem.addActionListener(this);
1052	1883	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1053	1884	ragdoll2Item.addActionListener(this);
	1885	+ }
1054	1886	menu.add("-");
1055		- meshItem = menu.add(new MenuItem("Mesh"));
	1887	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1056	1888	meshItem.addActionListener(this);
1057	1889	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1058	1890	// meshGroupItem.addActionListener(this);
	1891	+ if (Globals.ADVANCED)
	1892	+ {
1059	1893	springItem = menu.add(new MenuItem("Spring"));
1060	1894	springItem.addActionListener(this);
1061	1895	flagItem = menu.add(new MenuItem("Flag"));
1062	1896	flagItem.addActionListener(this);
1063		- bezierItem = menu.add(new MenuItem("Patch"));
1064		- bezierItem.addActionListener(this);
1065		- checkerItem = menu.add(new MenuItem("Checker"));
1066		- checkerItem.addActionListener(this);
1067	1897	blobItem = menu.add(new MenuItem("Blob"));
1068	1898	blobItem.addActionListener(this);
1069	1899	latheItem = menu.add(new MenuItem("Lathe"));
1070	1900	latheItem.addActionListener(this);
1071		- lightItem = menu.add(new MenuItem("Light"));
1072		- lightItem.addActionListener(this);
	1901	+ }
	1902	+ bezierItem = menu.add(new MenuItem("Bezier Patch"));
	1903	+ bezierItem.addActionListener(this);
	1904	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1905	+// overlayItem.addActionListener(this);
	1906	+// lightItem = menu.add(new MenuItem("Light"));
	1907	+// lightItem.addActionListener(this);
1073	1908	menu.add("-");
1074	1909	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1075	1910	//superLoopItem.addActionListener(this);
1076		- loopItem = menu.add(new MenuItem("Loop"));
1077		- loopItem.addActionListener(this);
	1911	+// loopItem = menu.add(new MenuItem("Loop"));
	1912	+// loopItem.addActionListener(this);
1078	1913	doubleItem = menu.add(new MenuItem("Fork"));
1079	1914	doubleItem.addActionListener(this);
	1915	+ if (Globals.ADVANCED)
	1916	+ {
1080	1917	tripleItem = menu.add(new MenuItem("Trident"));
1081	1918	tripleItem.addActionListener(this);
	1919	+ }
1082	1920	}
1083	1921
1084	1922	void buildToolsMenu(Menu menu)
1085	1923	{
1086	1924	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1087	1925	animationItem.addItemListener(this);
1088		- animationItem.setState(CameraPane.ANIMATION);
	1926	+ animationItem.setState(Globals.ANIMATION);
	1927	+
	1928	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1929	+ archiveItem.addActionListener(this);
1089	1930
1090	1931	menu.add("-");
1091	1932	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1092	1933	parseverticesItem.addActionListener(this);
1093	1934	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1094	1935	textureFieldItem.addActionListener(this);
1095		- alignItem = menu.add(new MenuItem("Align"));
	1936	+ alignItem = menu.add(new MenuItem("Align Objects"));
1096	1937	alignItem.addActionListener(this);
1097		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1098		- mirrorItem.addActionListener(this);
1099	1938	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1100	1939	reduceMorphItem.addActionListener(this);
1101	1940	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1102	1941	reduce34MorphItem.addActionListener(this);
1103		-
1104		- menu.add(computeAOItem = new MenuItem("Compute AO"));
1105		- computeAOItem.addActionListener(this);
1106	1942	menu.add("-");
1107		-
1108	1943	menu.add(memoryItem = new MenuItem("Memory Usage"));
1109	1944	memoryItem.addActionListener(this);
	1945	+ menu.add(computeAOItem = new MenuItem("Compute AO"));
	1946	+ computeAOItem.addActionListener(this);
	1947	+
	1948	+ if (Globals.ADVANCED)
	1949	+ {
	1950	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	1951	+ mirrorItem.addActionListener(this);
	1952	+ menu.add("-");
1110	1953	menu.add(analyzeItem = new MenuItem("Analyze"));
1111	1954	analyzeItem.addActionListener(this);
1112		- menu.add(dumpItem = new MenuItem("Dump"));
	1955	+ menu.add(dumpItem = new MenuItem("Print"));
1113	1956	dumpItem.addActionListener(this);
1114	1957	// menu.add(pathItem = new MenuItem("From-to path"));
1115	1958	// pathItem.addActionListener(this);
..	..	@@ -1118,6 +1961,8 @@
1118	1961	resetParentItem.addActionListener(this);
1119	1962	repairParentItem = menu.add(new MenuItem("Repair Parent"));
1120	1963	repairParentItem.addActionListener(this);
	1964	+ repairShadowItem = menu.add(new MenuItem("Repair Shadow"));
	1965	+ repairShadowItem.addActionListener(this);
1121	1966	menu.add(invariantsItem = new MenuItem("Invariants"));
1122	1967	invariantsItem.addActionListener(this);
1123	1968	menu.add(recompileItem = new MenuItem("Recompile"));
..	..	@@ -1125,6 +1970,7 @@
1125	1970	menu.add("-");
1126	1971	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1127	1972	editScriptItem.addActionListener(this);
	1973	+ }
1128	1974	}
1129	1975
1130	1976	void ScreenFit()
..	..	@@ -1247,9 +2093,34 @@
1247	2093	shadow.material = new cMaterial(obj.material);
1248	2094	shadow.material.diffuse = 0.0001f;
1249	2095	shadow.material.specular = 0.0001f;
	2096	+ //shadow.projectedVertices[1].x = 300;
1250	2097
1251	2098	makeSomething(shadow);
1252	2099	}
	2100	+
	2101	+ private void ClearUnpinned()
	2102	+ {
	2103	+ //for (Object3D obj : listUI)
	2104	+ for (int i=listUI.size(); --i>=0;)
	2105	+ {
	2106	+ Object3D obj = listUI.elementAt(i);
	2107	+ if (!obj.pinned)
	2108	+ {
	2109	+ obj.CloseUI();
	2110	+ listUI.remove(i);
	2111	+ }
	2112	+ }
	2113	+ }
	2114	+
	2115	+ private void EditElement(Object3D elem, boolean newWindow)
	2116	+ {
	2117	+ // if (!(elem instanceof Composite))
	2118	+ // newWindow = false;
	2119	+ listUI.add(elem);
	2120	+ elem.openEditWindow(this, newWindow); //, false);
	2121	+ System.out.println("edit : " + elem);
	2122	+ elem.editWindow.refreshContents(true); // ? new
	2123	+ }
1253	2124
1254	2125	/**
1255	2126	* applyExample
..	..	@@ -1453,9 +2324,9 @@
1453	2324
1454	2325	void Overwrite(int mask)
1455	2326	{
1456		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2327	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1457	2328	{
1458		- Object3D content = GrafreeD.clipboard.get(0);
	2329	+ Object3D content = Grafreed.clipboard.get(0);
1459	2330
1460	2331	if (content instanceof cGroup && ((cGroup)content).transientlink )
1461	2332	content = ((cGroup)content).get(0);
..	..	@@ -1478,6 +2349,7 @@
1478	2349	//
1479	2350	public void actionPerformed(ActionEvent event) // , Object arg)
1480	2351	{
	2352	+ Object source = event.getSource();
1481	2353	/*
1482	2354	if (event.getSource() == nameField)
1483	2355	{
..	..	@@ -1489,11 +2361,11 @@
1489	2361	}
1490	2362	else
1491	2363	*/
1492		- if (event.getSource() == lookAtItem \|\| event.getSource() == lookFromItem)
	2364	+ if (source == lookAtItem \|\| source == lookFromItem)
1493	2365	{
1494	2366	ScreenFit();
1495	2367	} else
1496		- if (event.getSource() == switchItem)
	2368	+ if (source == switchViewItem)
1497	2369	{
1498	2370	cVector v1 = new cVector();
1499	2371	cVector v2 = new cVector();
..	..	@@ -1502,11 +2374,11 @@
1502	2374	objEditor.cameraView.renderCamera.setAim(v2, v1);
1503	2375	objEditor.cameraView.repaint();
1504	2376	} else
1505		- if (event.getSource() == rectoidItem)
	2377	+ if (source == rectoidItem \|\| source == boxButton)
1506	2378	{
1507	2379	makeSomething(new Box());
1508	2380	} else
1509		- if (event.getSource() == particleItem)
	2381	+ if (source == particleItem \|\| source == particlesButton)
1510	2382	{
1511	2383	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1512	2384	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1527,9 +2399,9 @@
1527	2399	applyExample(particleGeom, "SMOKE");
1528	2400	makeSomething(particleGeom);
1529	2401	} else
1530		- if (event.getSource() == ragdollItem \|\| event.getSource() == ragdoll2Item)
	2402	+ if (source == ragdollItem \|\| source == ragdoll2Item)
1531	2403	{
1532		- GenericJoint ragdoll = new GenericJoint(event.getSource() == ragdollItem);
	2404	+ GenericJoint ragdoll = new GenericJoint(source == ragdollItem);
1533	2405
1534	2406	ragdoll.toParent = LA.newMatrix();
1535	2407	ragdoll.fromParent = LA.newMatrix();
..	..	@@ -1547,7 +2419,7 @@
1547	2419	} else
1548	2420	/*
1549	2421	*/
1550		- if (event.getSource() == heightFieldItem)
	2422	+ if (source == heightFieldItem)
1551	2423	{
1552	2424	Object3D obj = new Object3D();
1553	2425
..	..	@@ -1585,31 +2457,31 @@
1585	2457
1586	2458	makeSomething(obj);
1587	2459	} else
1588		- if (event.getSource() == gridItem)
	2460	+ if (source == gridItem \|\| source == gridButton)
1589	2461	{
1590	2462	makeSomething(new Grid());
1591	2463	} else
1592		- if (event.getSource() == ellipsoidItem)
	2464	+ if (source == ellipsoidItem \|\| source == sphereButton)
1593	2465	{
1594	2466	makeSomething(new Sphere());
1595	2467	} else
1596		- if (event.getSource() == coneItem)
	2468	+ if (source == coneItem \|\| source == coneButton)
1597	2469	{
1598	2470	makeSomething(new Cone());
1599	2471	} else
1600		- if (event.getSource() == torusItem)
	2472	+ if (source == torusItem \|\| source == torusButton)
1601	2473	{
1602	2474	makeSomething(new Torus());
1603	2475	} else
1604		- if (event.getSource() == superItem)
	2476	+ if (source == superItem \|\| source == superButton)
1605	2477	{
1606	2478	makeSomething(new Superellipsoid());
1607	2479	} else
1608		- if (event.getSource() == kleinItem)
	2480	+ if (source == kleinItem \|\| source == kleinButton)
1609	2481	{
1610	2482	makeSomething(new Klein());
1611	2483	} else
1612		- if (event.getSource() == blobItem)
	2484	+ if (source == blobItem)
1613	2485	{
1614	2486	Blob blob = new Blob();
1615	2487	BlobComponent comp = new BlobComponent();
..	..	@@ -1617,15 +2489,15 @@
1617	2489	//blob.retile();
1618	2490	makeSomething(blob);
1619	2491	} else
1620		- if (event.getSource() == latheItem)
	2492	+ if (source == latheItem)
1621	2493	{
1622	2494	makeSomething(new Lathe());
1623	2495	} else
1624		- if (event.getSource() == bezierItem)
	2496	+ if (source == bezierItem)
1625	2497	{
1626	2498	makeSomething(new BezierSurface());
1627	2499	} else
1628		- if (event.getSource() == checkerItem)
	2500	+ if (source == overlayItem \|\| source == overlayButton)
1629	2501	{
1630	2502	/*
1631	2503	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1640,7 +2512,7 @@
1640	2512	*/
1641	2513	makeSomething(new Checker());
1642	2514	} else
1643		- if (event.getSource() == meshItem)
	2515	+ if (source == meshItem)
1644	2516	{
1645	2517	Object3D itemtomake = new Object3D();
1646	2518	Object3D child;
..	..	@@ -1661,35 +2533,52 @@
1661	2533	makeSomething(child);
1662	2534	}
1663	2535	} else
1664		- if (event.getSource() == springItem)
	2536	+ if (source == springItem)
1665	2537	{
1666	2538	cSpring s = new cSpring();
1667	2539	s.setup();
1668	2540	makeSomething(s);
1669	2541	} else
1670		- if (event.getSource() == flagItem)
	2542	+ if (source == flagItem)
1671	2543	{
1672	2544	cSpring s = new cFlag();
1673	2545	s.setup();
1674	2546	makeSomething(s);
1675	2547	} else
1676		- if (event.getSource() == lightItem)
	2548	+ if (source == lightItem \|\| source == lightButton)
1677	2549	{
1678	2550	makeSomething(new Light());
1679	2551	} else
1680		- if (event.getSource() == csgItem)
	2552	+// if (source == skybox1Button \|\|
	2553	+// source == skybox2Button \|\|
	2554	+// source == skybox3Button \|\|
	2555	+// source == skybox4Button \|\|
	2556	+// source == skybox5Button \|\|
	2557	+// source == skybox6Button \|\|
	2558	+// source == skybox7Button \|\|
	2559	+// source == skybox11Button \|\|
	2560	+// source == skybox12Button \|\|
	2561	+// source == skybox13Button \|\|
	2562	+// source == skybox14Button \|\|
	2563	+// source == skybox15Button \|\|
	2564	+// source == skybox16Button \|\|
	2565	+// source == skybox17Button)
	2566	+// {
	2567	+// ChangeSkybox(source);
	2568	+// } else
	2569	+ if (source == csgItem)
1681	2570	{
1682	2571	group(new CSG());
1683	2572	} else
1684		- if (event.getSource() == templateItem)
	2573	+ if (source == templateItem)
1685	2574	{
1686	2575	group(new cTemplate());
1687	2576	} else
1688		- if (event.getSource() == attributeItem)
	2577	+ if (source == attributeItem)
1689	2578	{
1690	2579	makeSomething(new Attribute());
1691	2580	} else
1692		- if (event.getSource() == pointflowItem)
	2581	+ if (source == pointflowItem)
1693	2582	{
1694	2583	makeSomething(new PointFlow());
1695	2584	} else
..	..	@@ -1701,7 +2590,7 @@
1701	2590	} else
1702	2591	*/
1703	2592
1704		- if (event.getSource() == superLoopItem)
	2593	+ if (source == superLoopItem)
1705	2594	{
1706	2595	Composite g = new cGroup();
1707	2596	for (int i=0; i<15; i++)
..	..	@@ -1723,30 +2612,30 @@
1723	2612
1724	2613	group(g);
1725	2614	} else
1726		- if (event.getSource() == loopItem)
	2615	+ if (source == loopItem \|\| source == loopButton)
1727	2616	{
1728	2617	Composite csg = new GroupLeaf();
1729	2618	csg.count = 5;
1730	2619	group(csg);
1731		- Composite child = new cGroup();
	2620	+ Composite child = new cGroup("Branch");
1732	2621	csg.addChild(child);
1733	2622	child.addChild(csg);
1734	2623	} else
1735		- if (event.getSource() == doubleItem)
	2624	+ if (source == doubleItem)
1736	2625	{
1737		- Composite csg = new GroupLeaf();
	2626	+ Composite csg = new GroupLeaf("Fork");
1738	2627	csg.count = 5;
1739	2628	group(csg);
1740		- Composite child = new cGroup();
	2629	+ Composite child = new cGroup("Branch A");
1741	2630	csg.addChild(child);
1742	2631	child.addChild(csg);
1743		- child = new cGroup();
	2632	+ child = new cGroup("Branch B");
1744	2633	csg.addChild(child);
1745	2634	child.addChild(csg);
1746	2635	} else
1747		- if (event.getSource() == tripleItem)
	2636	+ if (source == tripleItem)
1748	2637	{
1749		- Composite csg = new GroupLeaf();
	2638	+ Composite csg = new GroupLeaf("Trident");
1750	2639	csg.count = 4;
1751	2640	group(csg);
1752	2641	Composite child = new cGroup();
..	..	@@ -1759,73 +2648,105 @@
1759	2648	csg.addChild(child);
1760	2649	child.addChild(csg);
1761	2650	} else
1762		-
1763		- if (event.getSource() == importGFDItem)
	2651	+ if (source == computeAOItem)
1764	2652	{
1765		- ImportGFD();
	2653	+ Globals.drawMode = CameraPane.OCCLUSION;
	2654	+ cameraView.repaint();
1766	2655	} else
1767		- if (event.getSource() == importVRMLX3DItem)
1768		- {
1769		- ImportVRMLX3D();
1770		- } else
1771		- if (event.getSource() == import3DSItem)
1772		- {
1773		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1774		- } else
1775		- if (event.getSource() == importOBJItem)
1776		- {
1777		- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1778		- } else
1779		- if (event.getSource() == computeAOItem)
1780		- {
1781		- CameraPane.drawMode = CameraPane.OCCLUSION;
1782		- CameraPane.theRenderer.repaint();
1783		- } else
1784		- if (event.getSource() == recompileItem)
	2656	+ if (source == recompileItem)
1785	2657	{
1786	2658	Recompile();
1787	2659	refreshContents();
1788	2660	} else
1789		- if (event.getSource() == editScriptItem)
	2661	+ if (source == editScriptItem)
1790	2662	{
1791	2663	OpenDialog();
1792	2664	refreshContents();
1793	2665	} else
1794		- if (event.getSource() == invariantsItem)
	2666	+ if (source == invariantsItem)
1795	2667	{
1796	2668	System.out.println("Invariants:");
1797		- GrafreeD.theApplet3D.universe.invariants();
	2669	+ Grafreed.grafreed.universe.invariants();
1798	2670	} else
1799		- if (event.getSource() == memoryItem)
	2671	+ if (source == memoryItem)
1800	2672	{
1801	2673	//System.out.println("Invariants:");
1802	2674	PrintMemory();
1803	2675	} else
1804		- if (event.getSource() == pathItem)
	2676	+ if (source == pathItem)
1805	2677	{
1806	2678	PrintPath();
1807	2679	} else
1808		- if (event.getSource() == analyzeItem)
	2680	+ if (source == analyzeItem)
1809	2681	{
1810	2682	AnalyzeObject();
1811	2683	} else
1812		- if (event.getSource() == dumpItem)
	2684	+ if (source == dumpItem)
1813	2685	{
1814	2686	DumpObject();
1815	2687	} else
1816		- if (event.getSource() == screenfitButton)
	2688	+ if (source == minButton)
1817	2689	{
1818		- //Reload(lastConverter, lastFilename, true);
	2690	+ Minimize();
	2691	+ } else
	2692	+ if (source == maxButton)
	2693	+ {
	2694	+ Maximize();
	2695	+ } else
	2696	+ if (source == fullButton)
	2697	+ {
	2698	+ ToggleFullScreen();
	2699	+ } else
	2700	+ if (source == previousVersionButton)
	2701	+ {
	2702	+ // Go to previous version
	2703	+ //if (!Undo())
	2704	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2705	+ PreviousVersion();
	2706	+ } else
	2707	+ if (source == restoreButton)
	2708	+ {
	2709	+ // Restore current version
	2710	+ Restore();
	2711	+ //restoreButton.setEnabled(false);
	2712	+ } else
	2713	+ if (source == replaceButton)
	2714	+ {
	2715	+ // Overwrite current version
	2716	+ Replace();
	2717	+ //replaceButton.setEnabled(false);
	2718	+ } else
	2719	+ if (source == nextVersionButton)
	2720	+ {
	2721	+ // Go to next version
	2722	+ NextVersion();
	2723	+ } else
	2724	+ if (source == saveVersionButton)
	2725	+ {
	2726	+ // Save a new version
	2727	+ if (!Save(true))
	2728	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2729	+ } else
	2730	+ if (source == deleteVersionButton)
	2731	+ {
	2732	+ // Delete a new version
	2733	+ DeleteVersion();
	2734	+ } else
	2735	+ if (source == oneStepButton)
	2736	+ {
	2737	+ Globals.ONESTEP = true;
	2738	+ cameraView.repaint();
	2739	+ } else
	2740	+ if (source == screenfitButton)
	2741	+ {
1819	2742	ScreenFit();
1820	2743	} else
1821		- if (event.getSource() == screenfitpointButton)
	2744	+ if (source == screenfitpointButton)
1822	2745	{
1823		- //Reload(lastConverter, lastFilename, true);
1824	2746	ScreenFitPoint();
1825	2747	} else
1826		- if (event.getSource() == snapobjectButton)
	2748	+ if (source == snapobjectButton)
1827	2749	{
1828		- //Reload(lastConverter, lastFilename, true);
1829	2750	SnapObject();
1830	2751	} else
1831	2752	// if (event.getSource() == recompileButton)
..	..	@@ -1834,13 +2755,13 @@
1834	2755	// Recompile();
1835	2756	// refreshContents();
1836	2757	// } else
1837		- if (event.getSource() == gcButton)
	2758	+ if (source == gcButton)
1838	2759	{
1839	2760	System.out.println("Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1840	2761	System.gc();
1841	2762	System.out.println("GC Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1842	2763	} else
1843		- if (event.getSource() == editLeafItem)
	2764	+ if (source == editLeafItem)
1844	2765	{
1845	2766	Object3D obj;
1846	2767	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -1854,62 +2775,74 @@
1854	2775	}
1855	2776	refreshContents(true);
1856	2777	} else
1857		- if (event.getSource() == openWindowItem)
	2778	+ if (source == openWindowItem)
1858	2779	{
1859	2780	EditSelection(true);
1860	2781	} else
1861		- if (event.getSource() == cutItem \|\| event.getSource() == clearButton)
	2782	+ if (source == cutItem \|\| source == clearButton)
1862	2783	{
1863	2784	loadClipboard(true);
1864	2785	} else
1865		- if (event.getSource() == duplicateItem)
	2786	+ if (source == undoItem)
1866	2787	{
1867		- Object3D keep = GrafreeD.clipboard;
	2788	+ PreviousVersion();
	2789	+ } else
	2790	+ if (source == redoItem)
	2791	+ {
	2792	+ NextVersion();
	2793	+ } else
	2794	+ if (source == duplicateItem)
	2795	+ {
	2796	+ Object3D keep = Grafreed.clipboard;
1868	2797	loadClipboard(false);
1869	2798	paste(false);
1870		- GrafreeD.clipboard = keep;
	2799	+ Grafreed.clipboard = keep;
1871	2800	} else
1872		- if (event.getSource() == cloneItem)
	2801	+ if (source == cloneItem)
1873	2802	{
1874	2803	CloneSelection(false);
1875	2804	} else
1876		- if (event.getSource() == cloneSupportItem)
	2805	+ if (source == cloneSupportItem)
1877	2806	{
1878	2807	CloneSelection(true);
1879	2808	} else
1880		- if (event.getSource() == copyItem)
	2809	+ if (source == copyItem)
1881	2810	{
1882	2811	loadClipboard(false);
1883	2812	} else
1884		- if (event.getSource() == pasteItem)
	2813	+ if (source == pasteItem)
1885	2814	{
1886	2815	paste(false);
1887	2816	} else
1888		- if (event.getSource() == pasteLinkItem)
	2817	+ if (source == pasteIntoItem)
1889	2818	{
1890		- pasteInto(false);
	2819	+ pasteInto(true, false);
1891	2820	} else
1892		- if (event.getSource() == pasteCloneItem)
	2821	+ if (source == pasteLinkItem)
1893	2822	{
1894		- pasteInto(true);
	2823	+ pasteInto(false, false);
1895	2824	} else
1896		- if (event.getSource() == pasteExpandItem)
	2825	+ if (source == pasteCloneItem)
	2826	+ {
	2827	+ pasteInto(true, true);
	2828	+ } else
	2829	+ if (source == pasteExpandItem)
1897	2830	{
1898	2831	paste(true);
1899	2832	} else
1900		- if (event.getSource() == synchronizeItem)
	2833	+ if (source == synchronizeItem)
1901	2834	{
1902	2835	Overwrite(Object3D.TRANSFORM);
1903	2836	} else
1904		- if (event.getSource() == overwriteNameItem)
	2837	+ if (source == overwriteNameItem)
1905	2838	{
1906	2839	Overwrite(Object3D.NAME);
1907	2840	} else
1908		- if (event.getSource() == overwriteUVItem)
	2841	+ if (source == overwriteUVItem)
1909	2842	{
1910	2843	Overwrite(Object3D.UV);
1911	2844	} else
1912		- if (event.getSource() == overwriteMatItem)
	2845	+ if (source == overwriteMatItem)
1913	2846	{
1914	2847	/* july 2015
1915	2848	if ((dropAttributes & Object3D.TEXTURE) == 0)
..	..	@@ -1929,7 +2862,7 @@
1929	2862
1930	2863	Overwrite(dropAttributes);
1931	2864	}
1932		- if (event.getSource() == overwriteGeoItem)
	2865	+ if (source == overwriteGeoItem)
1933	2866	{
1934	2867	Overwrite(Object3D.GEOMETRY);
1935	2868	// if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
..	..	@@ -1946,7 +2879,7 @@
1946	2879	// refreshContents();
1947	2880	// }
1948	2881	} else
1949		- if (event.getSource() == generateMeshItem)
	2882	+ if (source == generateMeshItem)
1950	2883	{
1951	2884	//if (group.selection.size() == 1)
1952	2885	// for (int i=0; i<group.selection.size(); i++)
..	..	@@ -1957,7 +2890,7 @@
1957	2890	ResetModel();
1958	2891	refreshContents();
1959	2892	} else
1960		- if (event.getSource() == extractGeometriesItem)
	2893	+ if (source == extractGeometriesItem)
1961	2894	{
1962	2895	boolean one = false;
1963	2896
..	..	@@ -1984,7 +2917,7 @@
1984	2917	ResetModel();
1985	2918	refreshContents();
1986	2919	} else
1987		- if (event.getSource() == cloneGeometriesItem)
	2920	+ if (source == cloneGeometriesItem)
1988	2921	{
1989	2922	boolean one = false;
1990	2923
..	..	@@ -2010,7 +2943,7 @@
2010	2943	ResetModel();
2011	2944	refreshContents();
2012	2945	} else
2013		- if (event.getSource() == shareGeometriesItem)
	2946	+ if (source == shareGeometriesItem)
2014	2947	{
2015	2948	boolean one = false;
2016	2949
..	..	@@ -2040,7 +2973,7 @@
2040	2973	refreshContents();
2041	2974	}
2042	2975	} else
2043		- if (event.getSource() == mergeGeometriesItem)
	2976	+ if (source == mergeGeometriesItem)
2044	2977	{
2045	2978	boolean one = false;
2046	2979
..	..	@@ -2070,7 +3003,7 @@
2070	3003	ResetModel();
2071	3004	refreshContents();
2072	3005	} else
2073		- if (event.getSource() == linkverticesItem)
	3006	+ if (source == linkverticesItem)
2074	3007	{
2075	3008	// if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2076	3009	// {
..	..	@@ -2083,48 +3016,48 @@
2083	3016	// group.selection.get(0).setMasterThis(content); // should be identity
2084	3017	// refreshContents();
2085	3018	// }
2086		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	3019	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2087	3020	{
2088		- Object3D content = GrafreeD.clipboard.get(0);
	3021	+ Object3D content = Grafreed.clipboard.get(0);
2089	3022
2090	3023	if (content instanceof cGroup && ((cGroup)content).transientlink )
2091	3024	content = ((cGroup)content).get(0);
2092	3025
2093		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	3026	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2094	3027	for (int i=0; i<group.selection.size(); i++)
2095	3028	{
2096		- boolean random = CameraPane.RANDOM;
2097		- CameraPane.RANDOM = false; // parse all random nodes
	3029	+ boolean random = CameraPane.SWITCH;
	3030	+ CameraPane.SWITCH = false; // parse all random nodes
2098	3031	group.selection.get(i).linkVerticesThis(content);
2099	3032	// group.selection.get(i).setMasterThis(content); // should be identity
2100		- CameraPane.RANDOM = random;
	3033	+ CameraPane.SWITCH = random;
2101	3034	}
2102		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	3035	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2103	3036	refreshContents();
2104	3037	}
2105	3038	} else
2106		- if (event.getSource() == resetsupportItem)
	3039	+ if (source == resetsupportItem)
2107	3040	{
2108	3041	for (int i=0; i<group.selection.size(); i++)
2109	3042	{
2110		- boolean random = CameraPane.RANDOM;
2111		- CameraPane.RANDOM = false; // parse all random nodes
	3043	+ boolean random = CameraPane.SWITCH;
	3044	+ CameraPane.SWITCH = false; // parse all random nodes
2112	3045	group.selection.get(i).linkVerticesThis(null);
2113		- CameraPane.RANDOM = random;
	3046	+ CameraPane.SWITCH = random;
2114	3047	}
2115	3048
2116	3049	refreshContents();
2117	3050	} else
2118		- if (event.getSource() == relinkverticesItem)
	3051	+ if (source == relinkverticesItem)
2119	3052	{
2120		- boolean random = CameraPane.RANDOM;
2121		- CameraPane.RANDOM = false; // parse all random nodes
	3053	+ boolean random = CameraPane.SWITCH;
	3054	+ CameraPane.SWITCH = false; // parse all random nodes
2122	3055	group.selection.RelinkToSupport();
2123		- CameraPane.RANDOM = random;
	3056	+ CameraPane.SWITCH = random;
2124	3057
2125	3058	refreshContents();
2126	3059	} else
2127		- if (event.getSource() == resetreferencesItem)
	3060	+ if (source == resetreferencesItem)
2128	3061	{
2129	3062	for (int i=0; i<group.selection.size(); i++)
2130	3063	{
..	..	@@ -2133,11 +3066,11 @@
2133	3066
2134	3067	refreshContents();
2135	3068	} else
2136		- if (event.getSource() == setMasterItem)
	3069	+ if (source == setMasterItem)
2137	3070	{
2138		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	3071	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2139	3072	{
2140		- Object3D content = GrafreeD.clipboard.get(0);
	3073	+ Object3D content = Grafreed.clipboard.get(0);
2141	3074
2142	3075	if (content instanceof cGroup && ((cGroup)content).transientlink )
2143	3076	content = ((cGroup)content).get(0);
..	..	@@ -2146,13 +3079,13 @@
2146	3079	refreshContents();
2147	3080	}
2148	3081	} else
2149		- if (event.getSource() == poseMeshItem)
	3082	+ if (source == poseMeshItem)
2150	3083	{
2151	3084	if (group.selection.size() == 1)
2152	3085	{
2153		- if (GrafreeD.clipboard.size() == 1)
	3086	+ if (Grafreed.clipboard.size() == 1)
2154	3087	{
2155		- Object3D content = GrafreeD.clipboard.get(0);
	3088	+ Object3D content = Grafreed.clipboard.get(0);
2156	3089
2157	3090	if (content instanceof cGroup && ((cGroup)content).transientlink )
2158	3091	content = ((cGroup)content).get(0);
..	..	@@ -2165,19 +3098,19 @@
2165	3098	}
2166	3099
2167	3100	} else
2168		- if (event.getSource() == revertMeshItem)
	3101	+ if (source == revertMeshItem)
2169	3102	{
2170	3103	RevertMeshes();
2171	3104	} else
2172		- if (event.getSource() == resetMeshItem)
	3105	+ if (source == resetAllItem)
2173	3106	{
2174	3107	ResetAll();
2175	3108	} else
2176		- if (event.getSource() == stepAllItem)
	3109	+ if (source == stepAllItem)
2177	3110	{
2178	3111	StepAll();
2179	3112	} else
2180		- if (event.getSource() == clearItem) // \|\| event.getSource() == clearButton)
	3113	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2181	3114	{
2182	3115	//int indices[] = jList.getSelectedIndices();
2183	3116	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2185,46 +3118,46 @@
2185	3118
2186	3119	ClearSelection(false);
2187	3120	} else
2188		- if (event.getSource() == clearAllItem)
	3121	+ if (source == clearAllItem)
2189	3122	{
2190	3123	ClearSelection(true);
2191	3124	} else
2192		- if (event.getSource() == grabItem)
	3125	+ if (source == grabItem \|\| source == groupButton)
2193	3126	{
2194		- group(new cGroup(), true);
	3127	+ group(new cGroup(), false); // true);
2195	3128	} else
2196		- if (event.getSource() == hideItem)
	3129	+ if (source == hideItem)
2197	3130	{
2198	3131	group(new HiddenObject());
2199	3132	} else
2200		- if (event.getSource() == frontItem)
	3133	+ if (source == frontItem)
2201	3134	{
2202	3135	front();
2203	3136	} else
2204		- if (event.getSource() == backItem)
	3137	+ if (source == backItem)
2205	3138	{
2206	3139	back();
2207	3140	} else
2208		- if (event.getSource() == cameraItem)
	3141	+ if (source == cameraItem)
2209	3142	{
2210	3143	makeSomething(new Camera());
2211	3144	} else
2212		- if (event.getSource() == compositeItem)
	3145	+ if (source == compositeItem \|\| source == compositeButton)
2213	3146	{
2214	3147	group(new Composite());
2215	3148	} else
2216		- if (event.getSource() == randomItem)
	3149	+ if (source == switchItem \|\| source == switchButton)
2217	3150	{
2218	3151	RandomNode random = new RandomNode();
2219	3152	group(random);
2220	3153	if (random.size() > 0)
2221		- random.name = random.get(0).name + "Rnd";
	3154	+ random.name = random.get(0).name + "Switch";
2222	3155	} else
2223		- if (event.getSource() == physicsItem)
	3156	+ if (source == physicsItem)
2224	3157	{
2225	3158	group(new PhysicsNode());
2226	3159	} else
2227		- if (event.getSource() == frameselectorItem)
	3160	+ if (source == frameselectorItem)
2228	3161	{
2229	3162	for (int i=0; i<group.selection.size(); i++)
2230	3163	{
..	..	@@ -2236,7 +3169,7 @@
2236	3169	ResetModel();
2237	3170	refreshContents();
2238	3171	} else
2239		- if (event.getSource() == switchGeoItem)
	3172	+ if (source == switchGeoItem)
2240	3173	{
2241	3174	for (int i=0; i<group.selection.size(); i++)
2242	3175	{
..	..	@@ -2248,7 +3181,7 @@
2248	3181	ResetModel();
2249	3182	refreshContents();
2250	3183	} else
2251		- if (event.getSource() == switchTransfoItem)
	3184	+ if (source == switchTransfoItem)
2252	3185	{
2253	3186	for (int i=0; i<group.selection.size(); i++)
2254	3187	{
..	..	@@ -2260,7 +3193,7 @@
2260	3193	ResetModel();
2261	3194	refreshContents();
2262	3195	} else
2263		- if (event.getSource() == morphItem)
	3196	+ if (source == morphItem)
2264	3197	{
2265	3198	for (int i=0; i<group.selection.size(); i++)
2266	3199	{
..	..	@@ -2272,7 +3205,7 @@
2272	3205	ResetModel();
2273	3206	refreshContents();
2274	3207	} else
2275		- if (event.getSource() == scriptNodeItem)
	3208	+ if (source == scriptNodeItem)
2276	3209	{
2277	3210	boolean atleastone = false;
2278	3211
..	..	@@ -2311,215 +3244,252 @@
2311	3244	}
2312	3245	}
2313	3246	} else
2314		- if (event.getSource() == linkerItem)
	3247	+ if (source == linkerItem)
2315	3248	{
2316	3249	group(new cLinker());
2317	3250	} else
2318		- if (event.getSource() == textureItem)
	3251	+ if (source == textureItem \|\| source == textureButton)
2319	3252	{
2320	3253	group(new TextureNode());
2321	3254	} else
2322		- if (event.getSource() == billboardItem)
	3255	+ if (source == billboardItem)
2323	3256	{
2324	3257	group(new BillboardNode());
2325	3258	} else
2326		- if (event.getSource() == shadowXItem)
	3259	+ if (source == shadowXItem)
2327	3260	{
2328	3261	CastShadow(0);
2329	3262	} else
2330		- if (event.getSource() == shadowYItem)
	3263	+ if (source == shadowYItem)
2331	3264	{
2332	3265	CastShadow(1);
2333	3266	} else
2334		- if (event.getSource() == shadowZItem)
	3267	+ if (source == shadowZItem)
2335	3268	{
2336	3269	CastShadow(2);
2337	3270	} else
2338		- if (event.getSource() == ungroupItem)
	3271	+ if (source == ungroupItem \|\| source == ungroupButton)
2339	3272	{
2340		- //ungroup();
	3273	+ boolean hasRoot = false;
	3274	+
2341	3275	for (int i=0; i<group.selection.size(); i++)
2342	3276	{
2343		- Ungroup(group.selection.get(i));
	3277	+ if (group.selection.get(i) == group)
	3278	+ {
	3279	+ hasRoot = true;
	3280	+ break;
	3281	+ }
2344	3282	}
2345	3283
2346		- ClearSelection(false);
2347		-
2348		- refreshContents();
	3284	+ if (!hasRoot)
	3285	+ {
	3286	+ for (int i=0; i<group.selection.size(); i++)
	3287	+ {
	3288	+ Ungroup(group.selection.get(i));
	3289	+ }
	3290	+
	3291	+ ClearSelection(false);
	3292	+
	3293	+ refreshContents();
	3294	+ }
2349	3295	} else
2350		- if (event.getSource() == genUVItem)
	3296	+ if (source == genUVItem)
2351	3297	{
2352	3298	GenUV();
2353	3299	} else
2354		- if (event.getSource() == genNormalsCADItem)
	3300	+ if (source == genNormalsCADItem)
2355	3301	{
2356	3302	GenNormals(true);
2357	3303	} else
2358		- if (event.getSource() == genNormalsMESHItem)
	3304	+ if (source == genNormalsMESHItem)
2359	3305	{
2360		- GenNormals(true); // TODO
	3306	+ GenNormalsMESH();
2361	3307	} else
2362		- if (event.getSource() == genNormalsORGANItem)
	3308	+ if (source == genNormalsORGANItem)
2363	3309	{
2364	3310	GenNormals(false);
2365	3311	} else
2366		- if (event.getSource() == genNormalsMINEItem)
	3312	+ if (source == genNormalsMINEItem)
2367	3313	{
2368	3314	GenNormalsMINE();
2369	3315	} else
2370		- if (event.getSource() == stripifyItem)
	3316	+ if (source == stripifyItem)
2371	3317	{
2372	3318	Stripify();
2373	3319	} else
2374		- if (event.getSource() == unstripifyItem)
	3320	+ if (source == unstripifyItem)
2375	3321	{
2376	3322	Unstripify();
2377	3323	} else
2378		- if (event.getSource() == trimItem)
	3324	+ if (source == trimItem)
2379	3325	{
2380	3326	Trim();
2381	3327	} else
2382		- if (event.getSource() == untrimItem)
	3328	+ if (source == untrimItem)
2383	3329	{
2384	3330	Untrim();
2385	3331	} else
2386		- if (event.getSource() == clearColorsItem)
	3332	+ if (source == clearColorsItem)
2387	3333	{
2388	3334	ClearColors();
2389	3335	} else
2390		- if (event.getSource() == clearMaterialsItem)
	3336	+ if (source == clearMaterialsItem)
2391	3337	{
2392	3338	ClearMaterials();
2393	3339	} else
2394		- if (event.getSource() == liveleavesItem)
	3340	+ if (source == liveleavesItem)
2395	3341	{
2396	3342	LiveLeaves(true);
2397	3343	} else
2398		- if (event.getSource() == unliveleavesItem)
	3344	+ if (source == unliveleavesItem)
2399	3345	{
2400	3346	LiveLeaves(false);
2401	3347	} else
2402		- if (event.getSource() == supportleavesItem)
	3348	+ if (source == supportleavesItem)
2403	3349	{
2404	3350	SupportLeaves(true);
2405	3351	} else
2406		- if (event.getSource() == unsupportleavesItem)
	3352	+ if (source == unsupportleavesItem)
2407	3353	{
2408	3354	SupportLeaves(false);
2409	3355	} else
2410		- if (event.getSource() == hideleavesItem)
	3356	+ if (source == hideleavesItem)
2411	3357	{
2412	3358	HideLeaves(true);
2413	3359	} else
2414		- if (event.getSource() == showleavesItem)
	3360	+ if (source == showleavesItem)
2415	3361	{
2416	3362	HideLeaves(false);
2417	3363	} else
2418		- if (event.getSource() == markleavesItem)
	3364	+ if (source == markleavesItem)
2419	3365	{
2420	3366	MarkLeaves(true);
2421	3367	} else
2422		- if (event.getSource() == unmarkleavesItem)
	3368	+ if (source == unmarkleavesItem)
2423	3369	{
2424	3370	MarkLeaves(false);
2425	3371	} else
2426		- if (event.getSource() == flipVItem)
	3372	+ if (source == rewindleavesItem)
	3373	+ {
	3374	+ RewindLeaves(true);
	3375	+ } else
	3376	+ if (source == unrewindleavesItem)
	3377	+ {
	3378	+ RewindLeaves(false);
	3379	+ } else
	3380	+ if (source == randomleavesItem)
	3381	+ {
	3382	+ RandomLeaves(true);
	3383	+ } else
	3384	+ if (source == unrandomleavesItem)
	3385	+ {
	3386	+ RandomLeaves(false);
	3387	+ } else
	3388	+ if (source == flipVItem)
2427	3389	{
2428	3390	FlipV(true);
2429	3391	} else
2430		- if (event.getSource() == unflipVItem)
	3392	+ if (source == unflipVItem)
2431	3393	{
2432	3394	FlipV(false);
2433	3395	} else
2434		- if (event.getSource() == lowTexturesItem)
	3396	+ if (source == lowTexturesItem)
2435	3397	{
2436	3398	SetTexRes(0);
2437	3399	} else
2438		- if (event.getSource() == normalTexturesItem)
	3400	+ if (source == normalTexturesItem)
2439	3401	{
2440	3402	SetTexRes(1);
2441	3403	} else
2442		- if (event.getSource() == highTexturesItem)
	3404	+ if (source == highTexturesItem)
2443	3405	{
2444	3406	SetTexRes(2);
2445	3407	} else
2446		- if (event.getSource() == veryhighTexturesItem)
	3408	+ if (source == veryhighTexturesItem)
2447	3409	{
2448	3410	SetTexRes(3);
2449	3411	} else
2450		- if (event.getSource() == maxTexturesItem)
	3412	+ if (source == maxTexturesItem)
2451	3413	{
2452	3414	SetTexRes(4);
2453	3415	} else
2454		- if (event.getSource() == panoTexturesItem)
	3416	+ if (source == panoTexturesItem)
2455	3417	{
2456	3418	SetTexRes(5);
2457	3419	} else
2458		- if (event.getSource() == reverseNormalsItem)
	3420	+ if (source == reverseNormalsItem)
2459	3421	{
2460	3422	ReverseNormals();
2461	3423	} else
2462		- if (event.getSource() == parseverticesItem)
	3424	+ if (source == parseverticesItem)
2463	3425	{
2464	3426	ParseVertices();
2465	3427	} else
2466		- if (event.getSource() == textureFieldItem)
	3428	+ if (source == textureFieldItem)
2467	3429	{
2468	3430	TextureVertices();
2469	3431	} else
2470		- if (event.getSource() == alignItem)
	3432	+ if (source == alignItem)
2471	3433	{
2472	3434	Align();
2473	3435	} else
2474		- if (event.getSource() == mirrorItem)
	3436	+ if (source == mirrorItem)
2475	3437	{
2476	3438	MirrorPoses();
2477	3439	} else
2478		- if (event.getSource() == reduceMorphItem)
	3440	+ if (source == reduceMorphItem)
2479	3441	{
2480	3442	MeshReduction(false);
2481	3443	} else
2482		- if (event.getSource() == reduce34MorphItem)
	3444	+ if (source == reduce34MorphItem)
2483	3445	{
2484	3446	MeshReduction(true);
2485	3447	} else
2486		- if (event.getSource() == reverseTrianglesItem)
	3448	+ if (source == reverseTrianglesItem)
2487	3449	{
2488	3450	ReverseTriangles();
2489	3451	} else
2490		- if (event.getSource() == reduceMeshItem)
	3452	+ if (source == reduceMeshItem)
2491	3453	{
2492	3454	ReduceMesh(false);
2493	3455	} else
2494		- if (event.getSource() == reduce34MeshItem)
	3456	+ if (source == reduce34MeshItem)
2495	3457	{
2496	3458	ReduceMesh(true);
2497	3459	} else
2498		- if (event.getSource() == increaseMeshItem)
	3460	+ if (source == increaseMeshItem)
2499	3461	{
2500	3462	IncreaseMesh();
2501	3463	} else
2502		- if (event.getSource() == clipMeshItem)
	3464	+ if (source == clipMeshItem)
2503	3465	{
2504	3466	ClipMesh();
2505	3467	} else
2506		- if (event.getSource() == smoothMeshItem)
	3468	+ if (source == smoothMeshItem)
2507	3469	{
2508	3470	SmoothMesh();
2509	3471	} else
2510		- if (event.getSource() == transformgeometryItem)
	3472	+ if (source == transformGeometryItem)
2511	3473	{
2512	3474	TransformGeometry();
2513	3475	} else
2514		- if (event.getSource() == resetTransformItem)
	3476	+ if (source == transformChildrenItem)
	3477	+ {
	3478	+ TransformChildren();
	3479	+ } else
	3480	+ if (source == resetTransformItem)
2515	3481	{
2516	3482	ResetTransform();
2517	3483	} else
2518		- if (event.getSource() == resetCentroidItem)
	3484	+ if (source == resetCentroidItem)
2519	3485	{
2520		- ResetCentroid();
	3486	+ ResetCentroid(true);
2521	3487	} else
2522		- if (event.getSource() == resetParentItem)
	3488	+ if (source == resetCentroidXZItem)
	3489	+ {
	3490	+ ResetCentroid(false);
	3491	+ } else
	3492	+ if (source == resetParentItem)
2523	3493	{
2524	3494	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2525	3495	{
..	..	@@ -2529,7 +3499,7 @@
2529	3499
2530	3500	refreshContents();
2531	3501	} else
2532		- if (event.getSource() == repairParentItem)
	3502	+ if (source == repairParentItem)
2533	3503	{
2534	3504	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2535	3505	{
..	..	@@ -2543,7 +3513,21 @@
2543	3513
2544	3514	refreshContents();
2545	3515	} else
2546		- if (event.getSource() == sortbysizeItem)
	3516	+ if (source == repairShadowItem)
	3517	+ {
	3518	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3519	+ {
	3520	+ Object3D obj = (Object3D)e.nextElement();
	3521	+ obj.RepairShadow();
	3522	+// for (int i=0; i<obj.size(); i++)
	3523	+// {
	3524	+// obj.get(i).parent = obj;
	3525	+// }
	3526	+ }
	3527	+
	3528	+ refreshContents();
	3529	+ } else
	3530	+ if (source == sortbysizeItem)
2547	3531	{
2548	3532	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2549	3533	{
..	..	@@ -2555,7 +3539,7 @@
2555	3539	ResetModel();
2556	3540	refreshContents();
2557	3541	} else
2558		- if (event.getSource() == sortbynameItem)
	3542	+ if (source == sortbynameItem)
2559	3543	{
2560	3544	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2561	3545	{
..	..	@@ -2567,7 +3551,7 @@
2567	3551	ResetModel();
2568	3552	refreshContents();
2569	3553	} else
2570		- if (event.getSource() == attachPigmentItem)
	3554	+ if (source == attachPigmentItem)
2571	3555	{
2572	3556	String texture = GetFile("Attach pigment");
2573	3557	Object3D obj;
..	..	@@ -2579,7 +3563,7 @@
2579	3563
2580	3564	refreshContents();
2581	3565	} else
2582		- if (event.getSource() == detachPigmentItem)
	3566	+ if (source == detachPigmentItem)
2583	3567	{
2584	3568	Object3D obj;
2585	3569	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2590,7 +3574,7 @@
2590	3574
2591	3575	refreshContents();
2592	3576	} else
2593		- if (event.getSource() == attachBumpItem)
	3577	+ if (source == attachBumpItem)
2594	3578	{
2595	3579	String texture = GetFile("Attach bump");
2596	3580	Object3D obj;
..	..	@@ -2602,18 +3586,18 @@
2602	3586
2603	3587	refreshContents();
2604	3588	} else
2605		- if (event.getSource() == detachBumpItem)
	3589	+ if (source == detachBumpItem)
2606	3590	{
2607	3591	Object3D obj;
2608	3592	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2609	3593	{
2610	3594	obj = (Object3D)e.nextElement();
2611		- obj.SetBumpTexture(null);
	3595	+ obj.ResetBumpTexture();
2612	3596	}
2613	3597
2614	3598	refreshContents();
2615	3599	} else
2616		- if (event.getSource() == pigmentBumpItem)
	3600	+ if (source == pigmentBumpItem)
2617	3601	{
2618	3602	Object3D obj;
2619	3603	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2624,158 +3608,262 @@
2624	3608
2625	3609	refreshContents();
2626	3610	} else
2627		- if (event.getSource() == flashSelectionButton)
	3611	+ if (source == embedTexturesItem)
	3612	+ {
	3613	+ Object3D obj;
	3614	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3615	+ {
	3616	+ obj = (Object3D)e.nextElement();
	3617	+ obj.EmbedTextures(true);
	3618	+ }
	3619	+
	3620	+ refreshContents();
	3621	+ } else
	3622	+ if (source == deEmbedTexturesItem)
	3623	+ {
	3624	+ Object3D obj;
	3625	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3626	+ {
	3627	+ obj = (Object3D)e.nextElement();
	3628	+ obj.EmbedTextures(false);
	3629	+ }
	3630	+
	3631	+ CameraPane.texturepigment.clear();
	3632	+ CameraPane.texturebump.clear();
	3633	+
	3634	+ refreshContents();
	3635	+ } else
	3636	+ if (source == flashSelectionButton)
2628	3637	{
2629	3638	CameraPane.flash = true;
2630	3639	refreshContents();
2631	3640	} else
2632		- if (event.getSource() == oneButton)
	3641	+ if (source == oneButton)
2633	3642	{
2634	3643	} else
2635		- if (event.getSource() == twoButton)
	3644	+ if (source == twoButton)
2636	3645	{
2637	3646	radio.layout = twoButton;
	3647	+
	3648	+ if (CameraPane.FULLSCREEN)
	3649	+ fullscreenLayout = radio.layout;
	3650	+
2638	3651	// bug
2639	3652	//gridPanel.setDividerLocation(1.0);
2640	3653	//bigPanel.setDividerLocation(0.0);
2641		- bigThree.remove(jtp);
2642		- bigThree.remove(cameraPanel);
2643		- bigThree.remove(XYZPanel);
2644		- aWindowConstraints.gridx = 0;
2645		- aWindowConstraints.gridy = 0;
2646		- aWindowConstraints.gridwidth = 1;
2647		- // aConstraints.gridheight = 3;
2648		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2649		- aWindowConstraints.weightx = 0;
2650		- aWindowConstraints.weighty = 1;
2651		- //bigThree.add(jtp, aWindowConstraints);
2652		- aWindowConstraints.weightx = 1;
2653		- aWindowConstraints.gridwidth = 3;
2654		- // aConstraints.gridheight = 3;
2655		- aWindowConstraints.gridx = 1;
2656		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2657		- bigThree.add(cameraPanel, aWindowConstraints);
2658		- aWindowConstraints.weightx = 0;
2659		- aWindowConstraints.gridx = 4;
2660		- aWindowConstraints.gridwidth = 1;
2661		- // aConstraints.gridheight = 3;
2662		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2663		- //bigThree.add(XYZPanel, aWindowConstraints);
2664		- bigThree.revalidate();
	3654	+// bigThree.remove(scenePanel);
	3655	+// bigThree.remove(centralPanel);
	3656	+// bigThree.remove(XYZPanel);
	3657	+// aWindowConstraints.gridx = 0;
	3658	+// aWindowConstraints.gridy = 0;
	3659	+// aWindowConstraints.gridwidth = 1;
	3660	+// // aConstraints.gridheight = 3;
	3661	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3662	+// aWindowConstraints.weightx = 0;
	3663	+// aWindowConstraints.weighty = 1;
	3664	+// //bigThree.add(jtp, aWindowConstraints);
	3665	+// aWindowConstraints.weightx = 1;
	3666	+// aWindowConstraints.gridwidth = 3;
	3667	+// // aConstraints.gridheight = 3;
	3668	+// aWindowConstraints.gridx = 1;
	3669	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3670	+// bigThree.add(centralPanel, aWindowConstraints);
	3671	+// aWindowConstraints.weightx = 0;
	3672	+// aWindowConstraints.gridx = 4;
	3673	+// aWindowConstraints.gridwidth = 1;
	3674	+// // aConstraints.gridheight = 3;
	3675	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3676	+// //bigThree.add(XYZPanel, aWindowConstraints);
	3677	+// scenePanel.setVisible(false);
	3678	+// centralPanel.setVisible(true);
	3679	+// XYZPanel.setVisible(false);
	3680	+ bigThree.ClearUI();
	3681	+ bigThree.add(centralPanel);
	3682	+ bigThree.FlushUI();
	3683	+
	3684	+ cameraView.requestFocusInWindow();
	3685	+
	3686	+// refreshContents(true);
	3687	+//
	3688	+// try
	3689	+// {
	3690	+// java.awt.Robot bot = new java.awt.Robot();
	3691	+// int mask = InputEvent.BUTTON1_MASK;
	3692	+// bot.mouseMove(100, 100);
	3693	+// bot.mousePress(mask);
	3694	+// bot.mouseRelease(mask);
	3695	+// }
	3696	+// catch (Exception e)
	3697	+// {
	3698	+//
	3699	+// }
	3700	+
2665	3701	} else
2666		- if (event.getSource() == threeButton)
	3702	+ if (source == threeButton)
2667	3703	{
2668	3704	radio.layout = threeButton;
2669		- bigThree.remove(jtp);
2670		- bigThree.remove(cameraPanel);
2671		- bigThree.remove(XYZPanel);
2672		- aWindowConstraints.gridx = 0;
2673		- aWindowConstraints.gridy = 0;
2674		- aWindowConstraints.gridwidth = 1;
2675		- // aConstraints.gridheight = 3;
2676		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2677		- aWindowConstraints.weightx = 0;
2678		- aWindowConstraints.weighty = 1;
2679		- //bigThree.add(jtp, aWindowConstraints);
2680		- aWindowConstraints.weightx = 1;
2681		- aWindowConstraints.gridwidth = 3;
2682		- // aConstraints.gridheight = 3;
2683		- aWindowConstraints.gridx = 1;
2684		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2685		- bigThree.add(cameraPanel, aWindowConstraints);
2686		- aWindowConstraints.weightx = 0;
2687		- aWindowConstraints.gridx = 4;
2688		- aWindowConstraints.gridwidth = 1;
2689		- // aConstraints.gridheight = 3;
2690		- aConstraints.fill = GridBagConstraints.VERTICAL;
2691		- bigThree.add(XYZPanel, aWindowConstraints);
2692		- bigThree.revalidate();
	3705	+
	3706	+ if (CameraPane.FULLSCREEN)
	3707	+ fullscreenLayout = radio.layout;
	3708	+
	3709	+// bigThree.remove(scenePanel);
	3710	+// bigThree.remove(centralPanel);
	3711	+// bigThree.remove(XYZPanel);
	3712	+// aWindowConstraints.gridx = 0;
	3713	+// aWindowConstraints.gridy = 0;
	3714	+// aWindowConstraints.gridwidth = 1;
	3715	+// // aConstraints.gridheight = 3;
	3716	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3717	+// aWindowConstraints.weightx = 0;
	3718	+// aWindowConstraints.weighty = 1;
	3719	+// //bigThree.add(jtp, aWindowConstraints);
	3720	+// aWindowConstraints.weightx = 1;
	3721	+// aWindowConstraints.gridwidth = 3;
	3722	+// // aConstraints.gridheight = 3;
	3723	+// aWindowConstraints.gridx = 1;
	3724	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3725	+// bigThree.add(centralPanel, aWindowConstraints);
	3726	+// aWindowConstraints.weightx = 0;
	3727	+// aWindowConstraints.gridx = 4;
	3728	+// aWindowConstraints.gridwidth = 1;
	3729	+// // aConstraints.gridheight = 3;
	3730	+// aConstraints.fill = GridBagConstraints.VERTICAL;
	3731	+// bigThree.add(XYZPanel, aWindowConstraints);
	3732	+// bigThree.validate();
	3733	+// scenePanel.setVisible(false);
	3734	+// centralPanel.setVisible(true);
	3735	+// XYZPanel.setVisible(true);
	3736	+ bigThree.ClearUI();
	3737	+ bigThree.add(scenePanel);
	3738	+ bigThree.add(centralPanel);
	3739	+ bigThree.FlushUI();
	3740	+
	3741	+ cameraView.requestFocusInWindow();
2693	3742	} else
2694		- if (event.getSource() == fourButton)
	3743	+ if (source == fourButton)
2695	3744	{
2696	3745	radio.layout = fourButton;
2697		- bigThree.remove(jtp);
2698		- bigThree.remove(cameraPanel);
2699		- bigThree.remove(XYZPanel);
2700		- aWindowConstraints.gridx = 0;
2701		- aWindowConstraints.gridy = 0;
2702		- aWindowConstraints.gridwidth = 1;
2703		- // aWindowConstraints.gridheight = 3;
2704		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2705		- aWindowConstraints.weightx = 1;
2706		- aWindowConstraints.weighty = 1;
2707		- bigThree.add(jtp, aWindowConstraints);
2708		- aWindowConstraints.weightx = 1;
2709		- aWindowConstraints.gridwidth = 3;
2710		- // aConstraints.gridheight = 3;
2711		- aWindowConstraints.gridx = 1;
2712		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2713		- //bigThree.add(cameraPanel, aWindowConstraints);
2714		- aWindowConstraints.weightx = 0;
2715		- aWindowConstraints.gridx = 4;
2716		- aWindowConstraints.gridwidth = 1;
2717		- // aWindowConstraints.gridheight = 3;
2718		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2719		- //bigThree.add(XYZPanel, aWindowConstraints);
2720		- bigThree.revalidate();
	3746	+
	3747	+ if (CameraPane.FULLSCREEN)
	3748	+ fullscreenLayout = radio.layout;
	3749	+
	3750	+// bigThree.remove(scenePanel);
	3751	+// bigThree.remove(centralPanel);
	3752	+// bigThree.remove(XYZPanel);
	3753	+// aWindowConstraints.gridx = 0;
	3754	+// aWindowConstraints.gridy = 0;
	3755	+// aWindowConstraints.gridwidth = 1;
	3756	+// // aWindowConstraints.gridheight = 3;
	3757	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3758	+// aWindowConstraints.weightx = 1;
	3759	+// aWindowConstraints.weighty = 1;
	3760	+// bigThree.add(scenePanel, aWindowConstraints);
	3761	+// aWindowConstraints.weightx = 1;
	3762	+// aWindowConstraints.gridwidth = 3;
	3763	+// // aConstraints.gridheight = 3;
	3764	+// aWindowConstraints.gridx = 1;
	3765	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3766	+// //bigThree.add(cameraPanel, aWindowConstraints);
	3767	+// aWindowConstraints.weightx = 0;
	3768	+// aWindowConstraints.gridx = 4;
	3769	+// aWindowConstraints.gridwidth = 1;
	3770	+// // aWindowConstraints.gridheight = 3;
	3771	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3772	+// //bigThree.add(XYZPanel, aWindowConstraints);
	3773	+// bigThree.validate();
	3774	+// scenePanel.setVisible(true);
	3775	+// centralPanel.setVisible(false);
	3776	+// XYZPanel.setVisible(false);
	3777	+ bigThree.ClearUI();
	3778	+ bigThree.add(scenePanel);
	3779	+ bigThree.FlushUI();
	3780	+
	3781	+ cameraView.requestFocusInWindow();
2721	3782	} else
2722		- if (event.getSource() == sixButton)
	3783	+ if (source == sixButton)
2723	3784	{
2724	3785	radio.layout = sixButton;
2725		- bigThree.remove(jtp);
2726		- bigThree.remove(cameraPanel);
2727		- bigThree.remove(XYZPanel);
2728		- aWindowConstraints.gridx = 0;
2729		- aWindowConstraints.gridy = 0;
2730		- aWindowConstraints.gridwidth = 1;
2731		- // aConstraints.gridheight = 3;
2732		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2733		- aWindowConstraints.weightx = 0;
2734		- aWindowConstraints.weighty = 1;
2735		- bigThree.add(jtp, aWindowConstraints);
2736		- aWindowConstraints.weightx = 1;
2737		- aWindowConstraints.gridwidth = 3;
2738		- // aWindowConstraints.gridheight = 3;
2739		- aWindowConstraints.gridx = 1;
2740		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2741		- bigThree.add(cameraPanel, aWindowConstraints);
2742		- aWindowConstraints.weightx = 0;
2743		- aWindowConstraints.gridx = 4;
2744		- aWindowConstraints.gridwidth = 1;
2745		- // aWindowConstraints.gridheight = 3;
2746		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2747		- //bigThree.add(XYZPanel, aConstraints);
2748		- bigThree.revalidate();
	3786	+
	3787	+ if (CameraPane.FULLSCREEN)
	3788	+ fullscreenLayout = radio.layout;
	3789	+
	3790	+// bigThree.remove(scenePanel);
	3791	+// bigThree.remove(centralPanel);
	3792	+// bigThree.remove(XYZPanel);
	3793	+// aWindowConstraints.gridx = 0;
	3794	+// aWindowConstraints.gridy = 0;
	3795	+// aWindowConstraints.gridwidth = 1;
	3796	+// // aConstraints.gridheight = 3;
	3797	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3798	+// aWindowConstraints.weightx = 0;
	3799	+// aWindowConstraints.weighty = 1;
	3800	+// bigThree.add(scenePanel, aWindowConstraints);
	3801	+// aWindowConstraints.weightx = 1;
	3802	+// aWindowConstraints.gridwidth = 3;
	3803	+// // aWindowConstraints.gridheight = 3;
	3804	+// aWindowConstraints.gridx = 1;
	3805	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3806	+// bigThree.add(centralPanel, aWindowConstraints);
	3807	+// aWindowConstraints.weightx = 0;
	3808	+// aWindowConstraints.gridx = 4;
	3809	+// aWindowConstraints.gridwidth = 1;
	3810	+// // aWindowConstraints.gridheight = 3;
	3811	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3812	+// //bigThree.add(XYZPanel, aConstraints);
	3813	+// bigThree.validate();
	3814	+// scenePanel.setVisible(true);
	3815	+// centralPanel.setVisible(true);
	3816	+// XYZPanel.setVisible(false);
	3817	+ bigThree.ClearUI();
	3818	+ bigThree.add(centralPanel);
	3819	+ bigThree.add(scenePanel);
	3820	+ bigThree.FlushUI();
	3821	+
	3822	+ cameraView.requestFocusInWindow();
2749	3823	} else
2750		- if (event.getSource() == sevenButton)
	3824	+ if (source == sevenButton)
2751	3825	{
2752	3826	radio.layout = sevenButton;
2753		- bigThree.remove(jtp);
2754		- bigThree.remove(cameraPanel);
2755		- bigThree.remove(XYZPanel);
2756		- aWindowConstraints.gridx = 0;
2757		- aWindowConstraints.gridy = 0;
2758		- aWindowConstraints.gridwidth = 1;
2759		- // aWindowConstraints.gridheight = 3;
2760		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2761		- aWindowConstraints.weightx = 0;
2762		- aWindowConstraints.weighty = 1;
2763		- bigThree.add(jtp, aWindowConstraints);
2764		- aWindowConstraints.weightx = 1;
2765		- aWindowConstraints.gridwidth = 3;
2766		- // aWindowConstraints.gridheight = 3;
2767		- aWindowConstraints.gridx = 1;
2768		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2769		- bigThree.add(cameraPanel, aWindowConstraints);
2770		- aWindowConstraints.weightx = 0;
2771		- aWindowConstraints.gridx = 4;
2772		- aWindowConstraints.gridwidth = 1;
2773		- // aConstraints.gridheight = 3;
2774		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2775		- bigThree.add(XYZPanel, aWindowConstraints);
2776		- bigThree.revalidate();
	3827	+
	3828	+ if (CameraPane.FULLSCREEN)
	3829	+ fullscreenLayout = radio.layout;
	3830	+
	3831	+// bigThree.remove(scenePanel);
	3832	+// bigThree.remove(centralPanel);
	3833	+// bigThree.remove(XYZPanel);
	3834	+// aWindowConstraints.gridx = 0;
	3835	+// aWindowConstraints.gridy = 0;
	3836	+// aWindowConstraints.gridwidth = 1;
	3837	+// // aWindowConstraints.gridheight = 3;
	3838	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3839	+// aWindowConstraints.weightx = 0;
	3840	+// aWindowConstraints.weighty = 1;
	3841	+// bigThree.add(scenePanel, aWindowConstraints);
	3842	+// aWindowConstraints.weightx = 1;
	3843	+// aWindowConstraints.gridwidth = 3;
	3844	+// // aWindowConstraints.gridheight = 3;
	3845	+// aWindowConstraints.gridx = 1;
	3846	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3847	+// bigThree.add(centralPanel, aWindowConstraints);
	3848	+// aWindowConstraints.weightx = 0;
	3849	+// aWindowConstraints.gridx = 4;
	3850	+// aWindowConstraints.gridwidth = 1;
	3851	+// // aConstraints.gridheight = 3;
	3852	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3853	+// bigThree.add(XYZPanel, aWindowConstraints);
	3854	+// bigThree.validate();
	3855	+// scenePanel.setVisible(true);
	3856	+// centralPanel.setVisible(true);
	3857	+// XYZPanel.setVisible(true);
	3858	+ bigThree.ClearUI();
	3859	+ bigThree.add(scenePanel);
	3860	+ bigThree.add(centralPanel);
	3861	+ bigThree.add(XYZPanel);
	3862	+ bigThree.FlushUI();
	3863	+
	3864	+ cameraView.requestFocusInWindow();
2777	3865	} else
2778		- if (event.getSource() == rootButton)
	3866	+ if (source == rootButton)
2779	3867	{
2780	3868	Object3D obj;
2781	3869	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2785,66 +3873,85 @@
2785	3873	EditObject(obj);
2786	3874	}
2787	3875
	3876	+ cameraView.requestFocusInWindow();
2788	3877	refreshContents(true);
2789	3878	} else
2790		- if (event.getSource() == closeButton)
	3879	+ if (source == closeButton)
2791	3880	{
2792	3881	//System.out.println("CLOSE: " + buttonGroup.getSelection());
2793	3882	cRadio ab;
2794	3883	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2795	3884	{
2796	3885	ab = (cRadio)e.nextElement();
2797		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3886	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2798	3887	{
	3888	+ // Patch to avoid bug with transparency.
	3889	+ if (!ab.hadMaterial)
	3890	+ {
	3891	+ ab.object.material = null;
	3892	+ }
	3893	+
2799	3894	buttonGroup.remove(ab);
2800	3895	radioPanel.remove(ab);
2801	3896
2802		- ab.GetObject().editWindow = null;
	3897	+ //ab.GetObject().editWindow = null;
	3898	+ ab.GetObject().manipWindow = null;
2803	3899	// ab.GetObject().objectUI = null; // ?????????
2804	3900
2805	3901	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2806	3902	break;
2807	3903	}
2808	3904	}
	3905	+
	3906	+ cameraView.requestFocusInWindow();
2809	3907	refreshContents(true);
2810	3908	} else
2811		- if (event.getSource() == editItem \|\| event.getSource() == editButton)
	3909	+ if (source == editItem \|\| source == editButton)
2812	3910	{
	3911	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3912	+ {
	3913	+ Object3D child = (Object3D)e.nextElement();
	3914	+ child.pinned = true;
	3915	+ }
	3916	+
2813	3917	EditSelection(false);
2814	3918	} else
2815		- if (event.getSource() == uneditButton)
	3919	+ if (source == uneditButton)
2816	3920	{
2817	3921	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2818	3922	{
2819	3923	Object3D child = (Object3D)e.nextElement();
2820	3924	if(child.editWindow != null)
2821		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3925	+ child.pinned = false;
2822	3926	child.CloseUI();
2823	3927	listUI.remove(child);
	3928	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2824	3929
2825		- child.editWindow = null; // ???????????
	3930	+ //child.editWindow = null; // ???????????
2826	3931	}
2827		- objEditor.ctrlPanel.revalidate();
	3932	+ objEditor.ctrlPanel.FlushUI();
2828	3933	//objEditor.jTree.clearSelection();
2829	3934	//objEditor.ResetSliders();
2830	3935	refreshContents(true);
2831	3936	} else
2832		- if (event.getSource() == clearPanelButton)
	3937	+ if (source == clearPanelButton)
2833	3938	{
2834	3939	assert(copy == group);
2835	3940	//copy.ClearUI();
2836	3941	for (Object3D obj : listUI)
2837	3942	{
	3943	+ obj.pinned = false;
2838	3944	obj.CloseUI();
2839	3945	}
2840	3946	listUI.clear();
	3947	+ SetPinStates(group.selection.size() > 0);
2841	3948	refreshContents(true);
2842	3949	} else
2843		- if (event.getSource() == allParamsButton)
	3950	+ if (source == allParamsButton)
2844	3951	{
2845	3952	assert(copy == group);
2846	3953
2847		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3954	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2848	3955
2849	3956	for (Object3D obj : listUI)
2850	3957	{
..	..	@@ -2861,19 +3968,19 @@
2861	3968
2862	3969	refreshContents(true);
2863	3970	} else
2864		- if (event.getSource() == unselectButton)
	3971	+ if (source == unselectButton)
2865	3972	{
2866	3973	objEditor.jTree.clearSelection();
2867	3974	// ?? oct 2012 GrafreeD.clipboard.clear();
2868	3975	objEditor.ResetSliders();
2869	3976	refreshContents(true);
2870	3977	} else
2871		- if(event.getSource() instanceof cRadio)
	3978	+ if(source instanceof cRadio)
2872	3979	{
2873	3980	group.parent = keepparent;
2874	3981	group.attributes = 0;
2875	3982	//group.editWindow = null;
2876		- /cRadio/ radio = (cRadio)event.getSource();
	3983	+ /cRadio/ radio = (cRadio)source;
2877	3984	Object3D obj = radio.GetObject();
2878	3985	System.out.println("Edit " + obj);
2879	3986	if (true) // obj instanceof Composite) // obj.parent == null) // obj instanceof Composite)
..	..	@@ -2893,7 +4000,10 @@
2893	4000	}
2894	4001
2895	4002	copy = group;
2896		- //CameraPane.theRenderer.object = group;
	4003	+
	4004	+ SetUndoStates();
	4005	+
	4006	+ //Globals.theRenderer.object = group;
2897	4007	if(!useclient)
2898	4008	{
2899	4009	cameraView.renderCamera = radio.camera;
..	..	@@ -2902,25 +4012,55 @@
2902	4012	cameraView.cameras[cameraView.cameracount] = radio.camera;
2903	4013	cameraView.targetLookAt.set(radio.camera.lookAt);
2904	4014	cameraView.object = group;
2905		- cameraView.lighttouched = true;
	4015	+ //cameraView.lighttouched = true;
	4016	+ Globals.lighttouched = true;
2906	4017	topView.object = group;
2907	4018	frontView.object = group;
2908	4019	sideView.object = group;
2909	4020	}
2910		- group.editWindow = this;
	4021	+
	4022	+// fix "+" issue
	4023	+ //group.editWindow = this;
	4024	+ group.manipWindow = this;
	4025	+
2911	4026	/*
2912	4027	currentLayout = radio.layout;
2913	4028	if (currentLayout == null)
2914	4029	currentLayout = sevenButton;
2915	4030	*/
2916	4031	radio.layout.doClick();
	4032	+
	4033	+ ClearUnpinned();
	4034	+
	4035	+ //Grafreed.Assert(group != null);
	4036	+ //Grafreed.Assert(group.selection != null);
	4037	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	4038	+ if (group.selection == null \|\| group.selection.size() == 1)
	4039	+ EditSelection(false);
2917	4040	keepparent = group.parent;
2918	4041	// PARENT = NULL or not???
2919	4042	//group.parent = null; // ROOT
2920	4043	//group.attributes = -1;
2921	4044	ResetModel();
	4045	+
	4046	+ cameraView.requestFocusInWindow();
2922	4047	refreshContents(true);
2923		- }
	4048	+ } else if (event.getSource() == editCameraItem)
	4049	+ {
	4050	+ cameraView.ProtectCamera();
	4051	+ cameraView.requestFocusInWindow();
	4052	+ cameraView.repaint();
	4053	+ return;
	4054	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
	4055	+ {
	4056	+ cameraView.RevertCamera();
	4057	+ cameraView.requestFocusInWindow();
	4058	+ cameraView.repaint();
	4059	+ return;
	4060	+ // } else if (event.getSource() == textureButton)
	4061	+ // {
	4062	+ // return; // true;
	4063	+ }
2924	4064	else
2925	4065	{
2926	4066	//return super.action(event, arg);
..	..	@@ -2929,7 +4069,6 @@
2929	4069	}
2930	4070
2931	4071	boolean useclient = false;
2932		- cRadio radio;
2933	4072
2934	4073	void ToggleRoot()
2935	4074	{
..	..	@@ -2938,7 +4077,7 @@
2938	4077	if (useclient)
2939	4078	{
2940	4079	cameraView.object = client;
2941		- cameraView.lighttouched = true;
	4080	+ Globals.lighttouched = true;
2942	4081	//topView.object = client;
2943	4082	//frontView.object = client;
2944	4083	//sideView.object = client;
..	..	@@ -2946,7 +4085,7 @@
2946	4085	else
2947	4086	{
2948	4087	cameraView.object = group;
2949		- cameraView.lighttouched = true;
	4088	+ Globals.lighttouched = true;
2950	4089	//topView.object = group;
2951	4090	//frontView.object = group;
2952	4091	//sideView.object = group;
..	..	@@ -2981,6 +4120,28 @@
2981	4120	refreshContents();
2982	4121	}
2983	4122
	4123	+ void TransformChildren()
	4124	+ {
	4125	+ Object3D obj;
	4126	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4127	+ {
	4128	+ obj = (Object3D)e.nextElement();
	4129	+ obj.KeepTextureMatrices();
	4130	+ obj.TransformChildren();
	4131	+ obj.RestoreTextureMatrices();
	4132	+
	4133	+// if (obj.parent == null)
	4134	+// {
	4135	+// System.out.println("NULL PARENT!");
	4136	+// new Exception().printStackTrace();
	4137	+// }
	4138	+// else
	4139	+// TouchTransform(obj);
	4140	+// //obj.parent.Touch();
	4141	+ }
	4142	+
	4143	+ refreshContents();
	4144	+ }
2984	4145
2985	4146	void ResetTransform()
2986	4147	{
..	..	@@ -3093,7 +4254,7 @@
3093	4254	refreshContents();
3094	4255	}
3095	4256
3096		- void ResetCentroid()
	4257	+ void ResetCentroid(boolean full)
3097	4258	{
3098	4259	Object3D obj;
3099	4260	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3108,12 +4269,16 @@
3108	4269	LA.matIdentity(Object3D.mat);
3109	4270	obj.getBounds(minima, maxima, false);
3110	4271	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3111		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	4272	+ if (full)
	4273	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3112	4274	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3113	4275	obj.TransformMesh(Object3D.mat);
	4276	+
3114	4277	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3115		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	4278	+ if (full)
	4279	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3116	4280	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	4281	+
3117	4282	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3118	4283	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3119	4284	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3142,7 +4307,8 @@
3142	4307
3143	4308	int size = obj.MemorySize();
3144	4309
3145		- System.err.println((size/1024) + " KB is the size of " + obj);
	4310	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	4311	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3146	4312	}
3147	4313	}
3148	4314	catch (Exception e)
..	..	@@ -3179,9 +4345,9 @@
3179	4345	obj = (Object3D)e.nextElement();
3180	4346
3181	4347	System.out.println("Object is: " + obj);
3182		- GrafreeD.AnalyzeObject(obj);
	4348	+ Grafreed.AnalyzeObject(obj);
3183	4349	System.out.println("Boundary rep: " + obj.bRep);
3184		- GrafreeD.AnalyzeObject(obj.bRep);
	4350	+ Grafreed.AnalyzeObject(obj.bRep);
3185	4351
3186	4352	// System.err.println((size/1024) + " KB is the size of " + obj);
3187	4353	}
..	..	@@ -3223,6 +4389,13 @@
3223	4389	void GenNormals(boolean crease)
3224	4390	{
3225	4391	group.GenNormalsS(crease);
	4392	+
	4393	+ refreshContents();
	4394	+ }
	4395	+
	4396	+ void GenNormalsMESH()
	4397	+ {
	4398	+ group.GenNormalsMeshS();
3226	4399
3227	4400	refreshContents();
3228	4401	}
..	..	@@ -3395,8 +4568,8 @@
3395	4568
3396	4569	void ParseVertices()
3397	4570	{
3398		- boolean epsequal = GrafreeD.epsequal;
3399		- GrafreeD.epsequal = true;
	4571	+ boolean epsequal = Grafreed.epsequal;
	4572	+ Grafreed.epsequal = true;
3400	4573
3401	4574	for (int i=0; i<group.selection.size(); i++)
3402	4575	{
..	..	@@ -3421,7 +4594,7 @@
3421	4594	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3422	4595	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3423	4596
3424		- g.add(GrafreeD.clipboard);
	4597	+ g.add(Grafreed.clipboard);
3425	4598
3426	4599	buffer.add(g);
3427	4600	}
..	..	@@ -3436,7 +4609,7 @@
3436	4609	makeSomething(buffer, i==group.selection.size()-1);
3437	4610	}
3438	4611
3439		- GrafreeD.epsequal = epsequal;
	4612	+ Grafreed.epsequal = epsequal;
3440	4613
3441	4614	refreshContents();
3442	4615	}
..	..	@@ -3454,7 +4627,16 @@
3454	4627	String pigment = Object3D.GetPigment(tex);
3455	4628	//String bump = Object3D.GetBump(tex);
3456	4629
3457		- com.sun.opengl.util.texture.TextureData texturedata = CameraPane.theRenderer.GetTextureData(pigment, false, node.texres);
	4630	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	4631	+
	4632	+ try
	4633	+ {
	4634	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
	4635	+ }
	4636	+ catch (Exception e)
	4637	+ {
	4638	+ System.err.println("FAIL: " + node);
	4639	+ }
3458	4640
3459	4641	double s = v.s;
3460	4642
..	..	@@ -3542,11 +4724,11 @@
3542	4724
3543	4725	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3544	4726
3545		- boolean random = CameraPane.RANDOM;
3546		- CameraPane.RANDOM = false; // parse all random nodes
	4727	+ boolean random = CameraPane.SWITCH;
	4728	+ CameraPane.SWITCH = false; // parse all random nodes
3547	4729	lowres.linkVerticesThis(null);
3548	4730	lowres.linkVerticesThis(sn);
3549		- CameraPane.RANDOM = random;
	4731	+ CameraPane.SWITCH = random;
3550	4732
3551	4733	System.err.flush();
3552	4734
..	..	@@ -3586,7 +4768,7 @@
3586	4768	return;
3587	4769
3588	4770	Object3D poses = group.selection.get(0);
3589		- Object3D ref = GrafreeD.clipboard.get(0);
	4771	+ Object3D ref = Grafreed.clipboard.get(0);
3590	4772
3591	4773	Object3D newgroup = new Object3D("Po:" + poses.name);
3592	4774
..	..	@@ -3755,7 +4937,7 @@
3755	4937	group.selection.RelinkToSupport(); // july 2014
3756	4938	System.out.println("DONE.");
3757	4939	refreshContents();
3758		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	4940	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
3759	4941	}
3760	4942
3761	4943	void ReduceMesh(boolean reduction34)
..	..	@@ -3780,9 +4962,9 @@
3780	4962
3781	4963	void ClipMesh()
3782	4964	{
3783		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	4965	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3784	4966	{
3785		- Object3D content = GrafreeD.clipboard.get(0);
	4967	+ Object3D content = Grafreed.clipboard.get(0);
3786	4968
3787	4969	if (content instanceof cGroup && ((cGroup)content).transientlink )
3788	4970	content = ((cGroup)content).get(0);
..	..	@@ -3791,7 +4973,7 @@
3791	4973	// {
3792	4974	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3793	4975	// }
3794		- group.selection.ClipMesh(GrafreeD.clipboard);
	4976	+ group.selection.ClipMesh(Grafreed.clipboard);
3795	4977	}
3796	4978	// group.selection.ClipMesh(GrafreeD.clipboard);
3797	4979	System.out.println("DONE.");
..	..	@@ -3838,6 +5020,18 @@
3838	5020	void MarkLeaves(boolean hide)
3839	5021	{
3840	5022	group.selection.MarkLeaves(hide);
	5023	+ refreshContents();
	5024	+ }
	5025	+
	5026	+ void RewindLeaves(boolean hide)
	5027	+ {
	5028	+ group.selection.RewindLeaves(hide);
	5029	+ refreshContents();
	5030	+ }
	5031	+
	5032	+ void RandomLeaves(boolean hide)
	5033	+ {
	5034	+ group.selection.RandomLeaves(hide);
3841	5035	refreshContents();
3842	5036	}
3843	5037
..	..	@@ -3912,28 +5106,25 @@
3912	5106	// }
3913	5107	// }
3914	5108
3915		- static boolean allparams = true;
3916		-
3917		- static Vector<Object3D> listUI = new Vector<Object3D>();
3918		-
3919	5109	void EditSelection(boolean newWindow)
3920	5110	{
	5111	+ if (group.selection == null)
	5112	+ {
	5113	+ EditElement(group, newWindow); // ? new
	5114	+ return;
	5115	+ }
	5116	+
3921	5117	// aConstraints.gridy = 0;
3922	5118	for (int i=0; i<group.selection.size(); i++)
3923	5119	{
3924	5120	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
3925	5121	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
3926		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	5122	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3927	5123
3928	5124	Object3D elem = (Object3D)group.selection.elementAt(i);
3929		- if(elem != group)
	5125	+ if(elem != group \|\| !newWindow)
3930	5126	{
3931		- // if (!(elem instanceof Composite))
3932		- // newWindow = false;
3933		- listUI.add(elem);
3934		- elem.openEditWindow(this, newWindow); //, false);
3935		- System.out.println("edit : " + elem);
3936		- elem.editWindow.refreshContents(true); // ? new
	5127	+ EditElement(elem, newWindow); // ? new
3937	5128	}
3938	5129	}
3939	5130	}
..	..	@@ -3996,9 +5187,7 @@
3996	5187
3997	5188	freezemodel = false;
3998	5189	}
3999		-
4000		- boolean flashIt = true;
4001		-
	5190	+
4002	5191	public void valueChanged(TreeSelectionEvent e)
4003	5192	//public boolean handleEvent(Event event)
4004	5193	{
..	..	@@ -4008,7 +5197,8 @@
4008	5197	//new Exception().printStackTrace();
4009	5198
4010	5199	freezemodel = true;
4011		-
	5200	+ ClearUnpinned();
	5201	+
4012	5202	/**/
4013	5203	//switch (event.id)
4014	5204	{
..	..	@@ -4016,7 +5206,6 @@
4016	5206	//case 702: // Event.LIST_DESELECT
4017	5207	group.deselectAll();
4018	5208	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4019		- objEditor.ClearInfo(); // .GetMaterial());
4020	5209	if (tps != null)
4021	5210	{
4022	5211	for (int i=0; i < tps.length; i++)
..	..	@@ -4025,33 +5214,39 @@
4025	5214
4026	5215	//if (child.parent != null)
4027	5216	//child.parent.addSelectee(child);
	5217	+ objEditor.SetMaterial(child);
4028	5218	group.addSelectee(child);
4029		- objEditor.SetMaterial(child); // .GetMaterial());
4030		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4031		- System.err.println("info : " + child.GetPath());
4032	5219	}
4033	5220	}
4034		- else
4035		- {
4036		- objEditor.SetMaterial(group); // .GetMaterial());
4037		- objEditor.AddInfo(group, this, true); // .GetMaterial());
4038		- System.err.println("info : " + group.GetPath());
4039		- }
	5221	+// else
	5222	+// {
	5223	+// objEditor.SetMaterial(group); // .GetMaterial());
	5224	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	5225	+// System.err.println("info : " + group.GetPath());
	5226	+// }
4040	5227
4041		- objEditor.SetText(); // jan 2014
4042		-
4043		- if (flashIt && !CameraPane.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	5228	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4044	5229	CameraPane.flash = true;
4045	5230
4046		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	5231	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4047	5232	// a camera
4048	5233	{
4049		- CameraPane.camerachangeframe = 0; // don't refuse it
4050		- CameraPane.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
4051		- // CameraPane.theRenderer.renderCamera = CameraPane.theRenderer.manipCamera;
4052		- // CameraPane.theRenderer.eyeCamera = CameraPane.theRenderer.manipCamera;
	5234	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
	5235	+ {
	5236	+ CameraPane.camerachangeframe = 0; // don't refuse it
	5237	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	5238	+ }
	5239	+ // Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
	5240	+ // Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4053	5241	}
4054	5242
	5243	+ if (tps != null && tps.length == 1)
	5244	+ {
	5245	+ EditSelection(false);
	5246	+ }
	5247	+
	5248	+ SetPinStates(tps != null && tps.length > 0);
	5249	+
4055	5250	refreshContents();
4056	5251	//return true;
4057	5252	}
..	..	@@ -4060,6 +5255,37 @@
4060	5255
4061	5256	freezemodel = false;
4062	5257	}
	5258	+
	5259	+ void SetPinStates(boolean enabled)
	5260	+ {
	5261	+ editButton.setEnabled(enabled);
	5262	+ uneditButton.setEnabled(enabled);
	5263	+ //unselectButton.setEnabled(enabled);
	5264	+ flashSelectionButton.setEnabled(enabled);
	5265	+
	5266	+ clearPanelButton.setEnabled(!listUI.isEmpty());
	5267	+ }
	5268	+
	5269	+ void refreshContents(boolean cp)
	5270	+ {
	5271	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5272	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
	5273	+ {
	5274	+ objEditor.ClearInfo(); // .GetMaterial());
	5275	+
	5276	+ for (int i=0; i < group.selection.Size(); i++)
	5277	+ {
	5278	+ Object3D child = (Object3D) group.selection.get(i);
	5279	+
	5280	+ objEditor.AddInfo(child, this, true);
	5281	+ System.err.println("info : " + child.GetPath());
	5282	+ }
	5283	+
	5284	+ objEditor.SetText(); // jan 2014
	5285	+ }
	5286	+
	5287	+ super.refreshContents(cp);
	5288	+ }
4063	5289
4064	5290	void linkSomething(Object3D thing)
4065	5291	{
..	..	@@ -4131,16 +5357,19 @@
4131	5357	{
4132	5358	if (group.selection.isEmpty())
4133	5359	return;
4134		- GrafreeD.clipboardIsTempGroup = false;
	5360	+
	5361	+ Grafreed.clipboardIsTempGroup = false;
4135	5362	Composite tGroup = null;
4136	5363	if (group.selection.size() > 0) // 1)
4137	5364	{
4138	5365	tGroup = new cGroup();
4139		- GrafreeD.clipboardIsTempGroup = true;
	5366	+ Grafreed.clipboardIsTempGroup = true;
4140	5367	}
4141	5368
4142	5369	if (cut)
4143	5370	{
	5371	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5372	+// Save();
4144	5373	//int indices[] = jList.getSelectedIndices();
4145	5374	//for (int i = indices.length - 1; i >= 0; i--)
4146	5375	//jList.remove(indices[i]);
..	..	@@ -4176,16 +5405,16 @@
4176	5405	//System.out.println("cut " + child);
4177	5406	//System.out.println("parent = " + child.parent);
4178	5407	// tmp.addChild(child);
4179		- if (GrafreeD.clipboardIsTempGroup)
	5408	+ if (Grafreed.clipboardIsTempGroup)
4180	5409	tGroup.add/Child/(tmp);
4181	5410	else
4182		- GrafreeD.clipboard = tmp;
	5411	+ Grafreed.clipboard = tmp;
4183	5412	}
4184	5413	else
4185		- if (GrafreeD.clipboardIsTempGroup)
	5414	+ if (Grafreed.clipboardIsTempGroup)
4186	5415	tGroup.add/Child/(child);
4187	5416	else
4188		- GrafreeD.clipboard = child;
	5417	+ Grafreed.clipboard = child;
4189	5418	}
4190	5419
4191	5420	//ResetModel();
..	..	@@ -4217,21 +5446,23 @@
4217	5446	//System.out.println("cut " + elem);
4218	5447	//System.out.println("parent = " + elem.parent);
4219	5448	// tmp.addChild(elem);
4220		- if (GrafreeD.clipboardIsTempGroup)
	5449	+ if (Grafreed.clipboardIsTempGroup)
4221	5450	tGroup.add/Child/(tmp);
4222	5451	else
4223		- GrafreeD.clipboard = tmp;
	5452	+ Grafreed.clipboard = tmp;
4224	5453	}
4225	5454	else
4226		- if (GrafreeD.clipboardIsTempGroup)
	5455	+ if (Grafreed.clipboardIsTempGroup)
4227	5456	tGroup.add/Child/(child);
4228	5457	else
4229		- GrafreeD.clipboard = child;
	5458	+ Grafreed.clipboard = child;
4230	5459	}
4231	5460
4232	5461	}
4233		- if (GrafreeD.clipboardIsTempGroup)
4234		- GrafreeD.clipboard = tGroup;
	5462	+
	5463	+ if (Grafreed.clipboardIsTempGroup)
	5464	+ Grafreed.clipboard = tGroup;
	5465	+
4235	5466	if (cut)
4236	5467	{
4237	5468	ResetModel();
..	..	@@ -4241,11 +5472,15 @@
4241	5472
4242	5473	void paste(boolean expand)
4243	5474	{
	5475	+ if (Globals.REPLACEONMAKE)
	5476	+ Save();
	5477	+ boolean keep = Globals.REPLACEONMAKE;
	5478	+ Globals.REPLACEONMAKE = false;
4244	5479	// if (GrafreeD.clipboard == null)
4245	5480	// return;
4246	5481	boolean first = true;
4247	5482
4248		- if (GrafreeD.clipboardIsTempGroup)
	5483	+ if (Grafreed.clipboardIsTempGroup)
4249	5484	{
4250	5485	Composite temp;
4251	5486
..	..	@@ -4256,7 +5491,7 @@
4256	5491	temp = (Composite)Applet3D.clipboard.deepCopy();
4257	5492	*/
4258	5493	Object3D elem;
4259		- for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	5494	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4260	5495	{
4261	5496	Object3D child = (Object3D)e.nextElement();
4262	5497
..	..	@@ -4290,21 +5525,22 @@
4290	5525	//Object3D cb = Applet3D.clipboard;
4291	5526	//temp.addChild(cb);
4292	5527	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4293		- assert(GrafreeD.clipboard.parent == null);
4294		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
4295		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4296		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4297		- makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
	5528	+ assert(Grafreed.clipboard.parent == null);
	5529	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	5530	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	5531	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	5532	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4298	5533	else
4299		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4300		- GrafreeD.clipboard.get(0).parent = keepparent;
	5534	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	5535	+ Grafreed.clipboard.get(0).parent = keepparent;
4301	5536	}
4302	5537
	5538	+ Globals.REPLACEONMAKE = keep;
4303	5539	ResetModel();
4304	5540	refreshContents();
4305	5541	}
4306	5542
4307		- void pasteInto(boolean copyit)
	5543	+ void pasteInto(boolean copyit, boolean clone)
4308	5544	{
4309	5545	// if (GrafreeD.clipboard == null)
4310	5546	// return;
..	..	@@ -4333,15 +5569,22 @@
4333	5569	if (copyit)
4334	5570	{
4335	5571	// paste(false);
4336		- CloneClipboard(false); // sept 2014
	5572	+ if (clone)
	5573	+ {
	5574	+ CloneClipboard(false); // sept 2014
	5575	+ }
	5576	+ else
	5577	+ {
	5578	+ paste(false);
	5579	+ }
4337	5580	}
4338	5581	else
4339	5582	{
4340	5583	boolean first = true;
4341	5584
4342		- if (GrafreeD.clipboardIsTempGroup)
	5585	+ if (Grafreed.clipboardIsTempGroup)
4343	5586	{
4344		- Composite temp = (Composite)GrafreeD.clipboard;
	5587	+ Composite temp = (Composite)Grafreed.clipboard;
4345	5588	Object3D copy;
4346	5589	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4347	5590	{
..	..	@@ -4351,7 +5594,7 @@
4351	5594	}
4352	5595	} else
4353	5596	{
4354		- linkSomething(GrafreeD.clipboard); //.get(0));
	5597	+ linkSomething(Grafreed.clipboard); //.get(0));
4355	5598	}
4356	5599	}
4357	5600	}
..	..	@@ -4428,6 +5671,10 @@
4428	5671
4429	5672	void group(Object3D csg, boolean grab)
4430	5673	{
	5674	+ if (Globals.REPLACEONMAKE)
	5675	+ Save();
	5676	+ boolean keep = Globals.REPLACEONMAKE;
	5677	+ Globals.REPLACEONMAKE = false;
4431	5678	if (//false) // why??
4432	5679	!group.selection.isEmpty())
4433	5680	{
..	..	@@ -4541,10 +5788,15 @@
4541	5788	//node.add(csg);
4542	5789	//makeSomething(node);
4543	5790	makeSomething(csg);
	5791	+ Globals.REPLACEONMAKE = keep;
4544	5792	}
4545	5793
4546	5794	void Ungroup(Object3D g)
4547	5795	{
	5796	+ if (Globals.REPLACEONMAKE)
	5797	+ Save();
	5798	+ boolean keep = Globals.REPLACEONMAKE;
	5799	+ Globals.REPLACEONMAKE = false;
4548	5800	if (g instanceof HiddenObject)
4549	5801	{
4550	5802	HiddenObject h = (HiddenObject) g;
..	..	@@ -4561,6 +5813,7 @@
4561	5813	objEditor.makeSomething(g.get(i), false);
4562	5814	}
4563	5815	}
	5816	+ Globals.REPLACEONMAKE = keep;
4564	5817	}
4565	5818
4566	5819	void ungroup()
..	..	@@ -4756,21 +6009,6 @@
4756	6009	}
4757	6010	*/
4758	6011
4759		- void ImportGFD()
4760		- {
4761		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4762		- browser.show();
4763		- String filename = browser.getFile();
4764		- if (filename != null && filename.length() > 0)
4765		- {
4766		- String fullname = browser.getDirectory() + filename;
4767		-
4768		- //Object3D readobj =
4769		- objEditor.ReadGFD(fullname, objEditor);
4770		- //makeSomething(readobj);
4771		- }
4772		- }
4773		-
4774	6012	/*
4775	6013	public void Callback(Object obj)
4776	6014	{
..	..	@@ -4794,26 +6032,9 @@
4794	6032	}
4795	6033	*/
4796	6034
4797		- void ImportVRMLX3D()
4798		- {
4799		- if (GrafreeD.standAlone)
4800		- {
4801		- /**/
4802		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4803		- browser.show();
4804		- String filename = browser.getFile();
4805		- if (filename != null && filename.length() > 0)
4806		- {
4807		- String fullname = browser.getDirectory() + filename;
4808		- LoadVRMLX3D(fullname);
4809		- }
4810		- /**/
4811		- }
4812		- }
4813		-
4814	6035	String GetFile(String dialogName)
4815	6036	{
4816		- if (GrafreeD.standAlone)
	6037	+ if (Grafreed.standAlone)
4817	6038	{
4818	6039	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4819	6040	browser.show();
..	..	@@ -4877,10 +6098,48 @@
4877	6098	cButton flashSelectionButton;
4878	6099	cButton editButton;
4879	6100	cButton uneditButton;
	6101	+ JCheckBox allParamsButton;
4880	6102	cButton clearpanelButton;
4881		- cButton allParamsButton;
4882	6103	cButton unselectButton;
4883	6104
	6105	+ cButton restoreCameraButton;
	6106	+
	6107	+ cButton oneStepButton;
	6108	+
	6109	+ cButton groupButton;
	6110	+ cButton ungroupButton;
	6111	+ cButton compositeButton;
	6112	+ cButton switchButton;
	6113	+ cButton loopButton;
	6114	+ cButton textureButton;
	6115	+
	6116	+ cButton skybox1Button;
	6117	+ cButton skybox2Button;
	6118	+ cButton skybox3Button;
	6119	+ cButton skybox4Button;
	6120	+ cButton skybox5Button;
	6121	+ cButton skybox6Button;
	6122	+ cButton skybox7Button;
	6123	+
	6124	+ cButton skybox11Button;
	6125	+ cButton skybox12Button;
	6126	+ cButton skybox13Button;
	6127	+ cButton skybox14Button;
	6128	+ cButton skybox15Button;
	6129	+ cButton skybox16Button;
	6130	+ cButton skybox17Button;
	6131	+
	6132	+ cButton gridButton;
	6133	+ cButton boxButton;
	6134	+ cButton sphereButton;
	6135	+ cButton coneButton;
	6136	+ cButton torusButton;
	6137	+ cButton superButton;
	6138	+ cButton kleinButton;
	6139	+ cButton particlesButton;
	6140	+ cButton overlayButton;
	6141	+ cButton lightButton;
	6142	+
4884	6143	cButton screenfitButton;
4885	6144	cButton screenfitpointButton;
4886	6145	cButton snapobjectButton;
..	..	@@ -4892,14 +6151,6 @@
4892	6151
4893	6152	cButton setsupportButton;
4894	6153
4895		- cButton twoButton;
4896		- cButton sixButton;
4897		- cButton threeButton;
4898		- cButton sevenButton;
4899		- cButton fourButton; // full panel
4900		- cButton oneButton; // full XYZ
4901		- //cButton currentLayout;
4902		-
4903	6154	//
4904	6155	//Composite
4905	6156	Object3D // to do !!
..	..	@@ -4909,9 +6160,11 @@
4909	6160	//JTree jTree;
4910	6161	private MenuItem lookAtItem;
4911	6162	private MenuItem lookFromItem;
4912		- private MenuItem switchItem;
	6163	+ private MenuItem switchViewItem;
4913	6164	private MenuItem cutItem;
4914		- private MenuItem duplicateItem;
	6165	+ private MenuItem undoItem;
	6166	+ private MenuItem redoItem;
	6167	+ private JMenuItem duplicateItem;
4915	6168	private MenuItem cloneItem;
4916	6169	private MenuItem cloneSupportItem;
4917	6170	private MenuItem overwriteGeoItem;
..	..	@@ -4924,7 +6177,7 @@
4924	6177	private MenuItem linkverticesItem;
4925	6178	private MenuItem relinkverticesItem;
4926	6179	private MenuItem setMasterItem;
4927		- private MenuItem resetMeshItem;
	6180	+ private MenuItem resetAllItem;
4928	6181	private MenuItem stepAllItem;
4929	6182	private MenuItem revertMeshItem;
4930	6183	private MenuItem poseMeshItem;
..	..	@@ -4935,10 +6188,11 @@
4935	6188	private MenuItem mergeGeometriesItem;
4936	6189	private MenuItem copyItem;
4937	6190	private MenuItem pasteItem;
	6191	+ private MenuItem pasteIntoItem;
4938	6192	private MenuItem pasteLinkItem;
4939	6193	private MenuItem pasteCloneItem;
4940	6194	private MenuItem pasteExpandItem;
4941		- private MenuItem clearItem;
	6195	+ private MenuItem deleteItem;
4942	6196	private MenuItem clearAllItem;
4943	6197	private MenuItem genUVItem;
4944	6198	private MenuItem genNormalsMESHItem;
..	..	@@ -4973,6 +6227,10 @@
4973	6227	private MenuItem showleavesItem;
4974	6228	private MenuItem markleavesItem;
4975	6229	private MenuItem unmarkleavesItem;
	6230	+ private MenuItem rewindleavesItem;
	6231	+ private MenuItem unrewindleavesItem;
	6232	+ private MenuItem randomleavesItem;
	6233	+ private MenuItem unrandomleavesItem;
4976	6234
4977	6235	private MenuItem flipVItem;
4978	6236	private MenuItem unflipVItem;
..	..	@@ -4984,15 +6242,17 @@
4984	6242	private MenuItem panoTexturesItem;
4985	6243
4986	6244	private MenuItem resetCentroidItem;
4987		- private MenuItem transformgeometryItem;
	6245	+ private MenuItem resetCentroidXZItem;
4988	6246	private MenuItem resetTransformItem;
	6247	+ private MenuItem transformGeometryItem;
	6248	+ private MenuItem transformChildrenItem;
4989	6249	private MenuItem hideItem;
4990	6250	private MenuItem grabItem;
4991	6251	private MenuItem backItem;
4992	6252	private MenuItem frontItem;
4993	6253	private MenuItem cameraItem;
4994	6254	private MenuItem compositeItem;
4995		- private MenuItem randomItem;
	6255	+ private MenuItem switchItem;
4996	6256	private MenuItem physicsItem;
4997	6257	private MenuItem frameselectorItem;
4998	6258	private MenuItem scriptNodeItem;
..	..	@@ -5007,6 +6267,7 @@
5007	6267
5008	6268	private MenuItem resetParentItem;
5009	6269	private MenuItem repairParentItem;
	6270	+ private MenuItem repairShadowItem;
5010	6271	private MenuItem sortbysizeItem;
5011	6272	private MenuItem sortbynameItem;
5012	6273
..	..	@@ -5015,6 +6276,8 @@
5015	6276	private MenuItem attachBumpItem;
5016	6277	private MenuItem detachBumpItem;
5017	6278	private MenuItem pigmentBumpItem;
	6279	+ private MenuItem embedTexturesItem;
	6280	+ private MenuItem deEmbedTexturesItem;
5018	6281
5019	6282	private MenuItem particleItem;
5020	6283	private MenuItem ragdollItem;
..	..	@@ -5031,7 +6294,7 @@
5031	6294	private MenuItem blobItem;
5032	6295	private MenuItem latheItem;
5033	6296	private MenuItem bezierItem;
5034		- private MenuItem checkerItem;
	6297	+ private MenuItem overlayItem;
5035	6298	private MenuItem meshItem;
5036	6299	// private MenuItem meshGroupItem;
5037	6300	private MenuItem springItem;
..	..	@@ -5053,11 +6316,6 @@
5053	6316	private MenuItem doubleItem;
5054	6317	private MenuItem tripleItem;
5055	6318
5056		- private MenuItem importGFDItem;
5057		- private MenuItem importVRMLX3DItem;
5058		- private MenuItem import3DSItem;
5059		- private MenuItem importOBJItem;
5060		-
5061	6319	private MenuItem computeAOItem;
5062	6320	private MenuItem recompileItem;
5063	6321	private MenuItem editScriptItem;
..	..	@@ -5067,4 +6325,8 @@
5067	6325	private MenuItem analyzeItem;
5068	6326	private MenuItem dumpItem;
5069	6327	//boolean freezemodel = false;
	6328	+
	6329	+ Menu cameraMenu;
	6330	+ MenuItem editCameraItem;
	6331	+ MenuItem restoreCameraItem;
5070	6332	}