~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,314 @@
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 AddSkyboxTab0(JTabbedPane skyboxpanel)
	46	+ {
	47	+ cGridBag tab0 = new cGridBag().setVertical(true);
	48	+
	49	+ tab0.setName("Urban");
	50	+ skyboxpanel.add(tab0);
	51	+
	52	+ cGridBag row0 = new cGridBag();
	53	+ cGridBag row1 = new cGridBag();
	54	+ cGridBag row2 = new cGridBag();
	55	+ cGridBag row3 = new cGridBag();
	56	+ cGridBag row4 = new cGridBag();
	57	+ cGridBag row5 = new cGridBag();
	58	+ cGridBag row6 = new cGridBag();
	59	+
	60	+ AddSkyboxButton("default", "rgb", row0);
	61	+ //AddSkyboxButton("default", "cornell", row0);
	62	+ AddSkyboxButton("penguins", "dust", row0);
	63	+ AddSkyboxButton("penguins", "tropic", row0);
	64	+ AddSkyboxButton("penguins", "yonder", row0);
	65	+
	66	+ AddSkyboxButton("default", "uffizi", row1);
	67	+ AddSkyboxButton("bridge", "Bridge", row1);
	68	+ AddSkyboxButton("bridge", "Bridge2", row1);
	69	+ AddSkyboxButton("urban", "GamlaStan2", row1);
	70	+
	71	+ AddSkyboxButton("urban", "Parliament", row2);
	72	+ AddSkyboxButton("urban", "Roundabout", row2);
	73	+ AddSkyboxButton("urban", "SaintLazarusChurch", row2);
	74	+ AddSkyboxButton("urban", "SaintLazarusChurch2", row2);
	75	+
	76	+ AddSkyboxButton("urban", "SaintLazarusChurch3", row3);
	77	+ AddSkyboxButton("urban", "UnionSquare", row3);
	78	+ AddSkyboxButton("urban", "Medborgarplatsen", row3);
	79	+ AddSkyboxButton("park", "BerzeliiPark", row3);
	80	+
	81	+ AddSkyboxButton("park", "Buddha", row4);
	82	+ AddSkyboxButton("park", "CNTower2", row4);
	83	+ AddSkyboxButton("park", "NiagaraFalls1", row4);
	84	+ AddSkyboxButton("park", "NiagaraFalls3", row4);
	85	+
	86	+ AddSkyboxButton("park", "Park", row5);
	87	+ AddSkyboxButton("park", "Pond", row5);
	88	+ AddSkyboxButton("park", "Skansen", row5);
	89	+ AddSkyboxButton("park", "Skansen2", row5);
	90	+
	91	+ AddSkyboxButton("park", "Skansen3", row6);
	92	+ AddSkyboxButton("park", "Skansen4", row6);
	93	+ AddSkyboxButton("park", "Skansen5", row6);
	94	+ AddSkyboxButton("persson", "VancouverConventionCentre", row6);
	95	+
	96	+ tab0.add(row0);
	97	+ tab0.add(row1);
	98	+ tab0.add(row2);
	99	+ tab0.add(row3);
	100	+ tab0.add(row4);
	101	+ tab0.add(row5);
	102	+ tab0.add(row6);
	103	+
	104	+ for (int i=5; --i>=0;)
	105	+ {
	106	+ //oe.toolboxPanel.Return();
	107	+ //tab0.add(new cGridBag());
	108	+ }
	109	+ }
	110	+
	111	+ public void AddSkyboxTab1(JTabbedPane skyboxpanel)
	112	+ {
	113	+ cGridBag tab0 = new cGridBag().setVertical(true);
	114	+
	115	+ tab0.setName("Nature");
	116	+ skyboxpanel.add(tab0);
	117	+
	118	+ cGridBag row0 = new cGridBag();
	119	+ cGridBag row1 = new cGridBag();
	120	+ cGridBag row2 = new cGridBag();
	121	+ cGridBag row3 = new cGridBag();
	122	+ cGridBag row4 = new cGridBag();
	123	+ cGridBag row5 = new cGridBag();
	124	+ cGridBag row6 = new cGridBag();
	125	+
	126	+ AddSkyboxButton("beach", "HeartInTheSand", row0);
	127	+ AddSkyboxButton("beach", "LarnacaBeach", row0);
	128	+ AddSkyboxButton("beach", "PalmTrees", row0);
	129	+ AddSkyboxButton("beach", "Tenerife", row0);
	130	+
	131	+ AddSkyboxButton("beach", "Tenerife2", row1);
	132	+ AddSkyboxButton("beach", "Tenerife3", row1);
	133	+ AddSkyboxButton("field", "FishPond", row1);
	134	+ AddSkyboxButton("field", "Footballfield", row1);
	135	+
	136	+ AddSkyboxButton("field", "Meadow", row2);
	137	+ AddSkyboxButton("field", "Sorsele", row2);
	138	+ AddSkyboxButton("field", "Sorsele2", row2);
	139	+ AddSkyboxButton("field", "Sorsele3", row2);
	140	+
	141	+ AddSkyboxButton("forest", "Brudslojan", row3);
	142	+ AddSkyboxButton("forest", "Langholmen2", row3);
	143	+ AddSkyboxButton("forest", "Plants", row3);
	144	+ AddSkyboxButton("mountain", "Maskonaive", row3);
	145	+
	146	+ AddSkyboxButton("mountain", "Maskonaive2", row4);
	147	+ AddSkyboxButton("mountain", "Maskonaive3", row4);
	148	+ AddSkyboxButton("mountain", "Teide", row4);
	149	+ AddSkyboxButton("park", "Tantolunden4", row4);
	150	+
	151	+ AddSkyboxButton("park", "Stairs", row5);
	152	+ AddSkyboxButton("default", "skycube", row6);
	153	+ AddSkyboxButton("rocky", "Langholmen", row5);
	154	+ AddSkyboxButton("rocky", "Skinnarviksberget", row5);
	155	+
	156	+ AddSkyboxButton("rocky", "Tantolunden6", row5);
	157	+ AddSkyboxButton("default", "CloudyHills", row6);
	158	+ AddSkyboxButton("daz", "Autumn", row6);
	159	+ AddSkyboxButton("daz", "MountainTrail", row6);
	160	+ /*
	161	+Autumn
	162	+Greenlands
	163	+MountainTrail
	164	+Oasis
	165	+TheRock
	166	+TopOfTheWorld
	167	+Winter
	168	+ */
	169	+
	170	+ tab0.add(row0);
	171	+ tab0.add(row1);
	172	+ tab0.add(row2);
	173	+ tab0.add(row3);
	174	+ tab0.add(row4);
	175	+ tab0.add(row5);
	176	+ tab0.add(row6);
	177	+
	178	+ for (int i=5; --i>=0;)
	179	+ {
	180	+ //oe.toolboxPanel.Return();
	181	+ //tab0.add(new cGridBag());
	182	+ }
	183	+ }
	184	+
	185	+ public void AddSkyboxTab2(JTabbedPane skyboxpanel)
	186	+ {
	187	+ cGridBag tab0 = new cGridBag().setVertical(true);
	188	+
	189	+ tab0.setName("Night");
	190	+ skyboxpanel.add(tab0);
	191	+
	192	+ cGridBag row0 = new cGridBag();
	193	+ cGridBag row1 = new cGridBag();
	194	+ cGridBag row2 = new cGridBag();
	195	+ cGridBag row3 = new cGridBag();
	196	+ cGridBag row4 = new cGridBag();
	197	+ cGridBag row5 = new cGridBag();
	198	+ cGridBag row6 = new cGridBag();
	199	+
	200	+ AddSkyboxButton("night", "NightPath", row0);
	201	+ AddSkyboxButton("night", "PondNight", row0);
	202	+ AddSkyboxButton("night", "Powerlines", row0);
	203	+ AddSkyboxButton("night", "SwedishRoyalCastle", row0);
	204	+
	205	+ AddSkyboxButton("urban", "CNTower", row1);
	206	+ AddSkyboxButton("bridge", "ArstaBridge", row1);
	207	+ AddSkyboxButton("rocky", "Riddarfjarden", row1);
	208	+ AddSkyboxButton("penguins", "sleepyhollow", row1);
	209	+
	210	+ AddSkyboxButton("penguins", "kenon_star", row2);
	211	+ AddSkyboxButton("persson", "corona", row2);
	212	+ AddSkyboxButton("persson", "spaceskybox", row2);
	213	+ AddSkyboxButton("indoors", "Vasa", row2);
	214	+
	215	+ AddSkyboxButton("winter", "Backyard", row3);
	216	+ AddSkyboxButton("winter", "Creek", row3);
	217	+ AddSkyboxButton("winter", "FootballField3", row3);
	218	+ AddSkyboxButton("winter", "Forest", row3);
	219	+
	220	+ AddSkyboxButton("winter", "HornstullsStrand2", row4);
	221	+ AddSkyboxButton("winter", "House", row4);
	222	+ AddSkyboxButton("winter", "IceLake", row4);
	223	+ AddSkyboxButton("winter", "IceRiver", row4);
	224	+
	225	+ AddSkyboxButton("winter", "Park3", row5);
	226	+ AddSkyboxButton("winter", "PondWinter", row5);
	227	+ AddSkyboxButton("winter", "Tantolunden5", row5);
	228	+ AddSkyboxButton("winter", "Vindelalven", row5);
	229	+
	230	+ AddSkyboxButton("daz", "TheRock", row6);
	231	+ AddSkyboxButton("daz", "TopOfTheWorld", row6);
	232	+ AddSkyboxButton("daz", "Winter", row6);
	233	+ AddSkyboxButton("mountain", "Ryfjallet", row6);
	234	+
	235	+ tab0.add(row0);
	236	+ tab0.add(row1);
	237	+ tab0.add(row2);
	238	+ tab0.add(row3);
	239	+ tab0.add(row4);
	240	+ tab0.add(row5);
	241	+ tab0.add(row6);
	242	+
	243	+ for (int i=5; --i>=0;)
	244	+ {
	245	+ //oe.toolboxPanel.Return();
	246	+ //tab0.add(new cGridBag());
	247	+ }
	248	+ }
	249	+
	250	+ public void AddSkyboxTab3(JTabbedPane skyboxpanel)
	251	+ {
	252	+ cGridBag tab0 = new cGridBag().setVertical(true);
	253	+
	254	+ tab0.setName("Others");
	255	+ skyboxpanel.add(tab0);
	256	+
	257	+ cGridBag row0 = new cGridBag();
	258	+ cGridBag row1 = new cGridBag();
	259	+ cGridBag row2 = new cGridBag();
	260	+ cGridBag row3 = new cGridBag();
	261	+ cGridBag row4 = new cGridBag();
	262	+ cGridBag row5 = new cGridBag();
	263	+ cGridBag row6 = new cGridBag();
	264	+
	265	+ AddSkyboxButton("mayhem", "afterrain", row0);
	266	+ AddSkyboxButton("mayhem", "aqua4", row0);
	267	+ AddSkyboxButton("mayhem", "aqua9", row0);
	268	+ AddSkyboxButton("mayhem", "flame", row0);
	269	+
	270	+ AddSkyboxButton("mayhem", "h2s", row1);
	271	+ AddSkyboxButton("mayhem", "prehistoric", row1);
	272	+ AddSkyboxButton("mayhem", "scorched", row1);
	273	+ AddSkyboxButton("penguins", "desertdawn", row1);
	274	+
	275	+ AddSkyboxButton("persson", "Citadella", row2);
	276	+ AddSkyboxButton("persson", "Citadella2", row2);
	277	+ AddSkyboxButton("persson", "clouds1", row2);
	278	+ AddSkyboxButton("penguins", "wrath", row2);
	279	+
	280	+ AddSkyboxButton("persson", "FishermansBastion", row3);
	281	+ AddSkyboxButton("persson", "HeroesSquare", row3);
	282	+ AddSkyboxButton("indoors", "DallasW", row3);
	283	+ AddSkyboxButton("indoors", "MarriottMadisonWest", row3);
	284	+
	285	+ AddSkyboxButton("persson", "LancellottiChapel", row4);
	286	+ AddSkyboxButton("persson", "PereaBeach1", row4);
	287	+ AddSkyboxButton("persson", "PereaBeach2", row4);
	288	+ AddSkyboxButton("persson", "redeclipse", row4);
	289	+
	290	+ AddSkyboxButton("daz", "Greenlands", row5);
	291	+ AddSkyboxButton("daz", "Oasis", row5);
	292	+ AddSkyboxButton("elyvisions", "arch3", row5);
	293	+ AddSkyboxButton("elyvisions", "calm_sea", row5);
	294	+
	295	+ AddSkyboxButton("elyvisions", "rainbow", row6);
	296	+ AddSkyboxButton("elyvisions", "distant_sunset", row6);
	297	+ AddSkyboxButton("elyvisions", "heaven", row6);
	298	+ AddSkyboxButton("elyvisions", "hot", row6);
	299	+
	300	+ tab0.add(row0);
	301	+ tab0.add(row1);
	302	+ tab0.add(row2);
	303	+ tab0.add(row3);
	304	+ tab0.add(row4);
	305	+ tab0.add(row5);
	306	+ tab0.add(row6);
	307	+
	308	+ for (int i=5; --i>=0;)
	309	+ {
	310	+ //oe.toolboxPanel.Return();
	311	+ //tab0.add(new cGridBag());
	312	+ }
	313	+ }
	314	+
	315	+ public void CallBack(String[] path)
	316	+ {
	317	+ for (int i = 0; i < path.length; i++)
	318	+ {
	319	+ System.out.print(path[i] + "/");
	320	+ }
	321	+
	322	+ System.out.println();
	323	+ }
	324	+
	325	+ public void ChangeSkybox(String skybox)
	326	+ {
	327	+ //cameraView.envyoff = false;
	328	+ group.skyboxname = skybox;
	329	+ group.skyboxext = "jpg";
	330	+ cameraView.repaint();
	331	+
	332	+ Grafreed.ParseResources("textures", this);
	333	+ }
	334	+
25	335	//ObjEditor objEditor;
26	336	public void closeUI2()
27	337	{
..	..	@@ -59,6 +369,12 @@
59	369	this.copy = this.group = group;
60	370	//selectees = this.group.selectees;
61	371
	372	+ if (copy.versionlist == null)
	373	+ {
	374	+ copy.versionlist = new Object3D[100];
	375	+ copy.versionindex = -1;
	376	+ }
	377	+
62	378	if(ui)
63	379	SetupUI(objEditor);
64	380	}
..	..	@@ -73,16 +389,28 @@
73	389	this.copy = this.group = copy;
74	390	//selectees = this.group.selectees;
75	391
76		- SetupMenu2(objEditor);
	392	+ SetupMenu2(this); //objEditor);
77	393	SetupUI2(objEditor);
78	394	objEditor.SetupUI(true);
79	395	SetupViews(objEditor);
80	396
81	397	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
	398	+
	399	+ if (copy.versionlist == null)
	400	+ {
	401	+ copy.versionlist = new Object3D[100];
	402	+ copy.versionindex = -1;
	403	+
	404	+ Save(true);
	405	+ }
82	406	}
83	407
84	408	void CloneSelection(boolean supports)
85	409	{
	410	+ if (Globals.REPLACEONMAKE)
	411	+ Save();
	412	+ boolean keep = Globals.REPLACEONMAKE;
	413	+ Globals.REPLACEONMAKE = false;
86	414	// Object3D keep = GrafreeD.clipboard;
87	415	//Object3D obj;
88	416	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -93,18 +421,19 @@
93	421
94	422	makeSomething(clone, i==group.selection.size()-1);
95	423	}
	424	+ Globals.REPLACEONMAKE = keep;
96	425	}
97	426
98	427	void CloneClipboard(boolean supports)
99	428	{
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));
	429	+ assert(Grafreed.clipboard.parent == null);
	430	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	431	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	432	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	433	+ makeSomething(CloneObject(Grafreed.clipboard.get(0), false));
105	434	else
106		- makeSomething(CloneObject(GrafreeD.clipboard, false));
107		- GrafreeD.clipboard.get(0).parent = keepparent;
	435	+ makeSomething(CloneObject(Grafreed.clipboard, false));
	436	+ Grafreed.clipboard.get(0).parent = keepparent;
108	437	}
109	438
110	439	static Object3D CloneObject(Object3D obj, boolean supports)
..	..	@@ -118,7 +447,7 @@
118	447	// obj.support = null;
119	448	if (!supports)
120	449	obj.SaveSupports();
121		- Object3D clone = (Object3D)GrafreeD.clone(obj);
	450	+ Object3D clone = (Object3D)Grafreed.clone(obj);
122	451	obj.parent = parent;
123	452	// obj.support = support;
124	453	// clone.support = support; // aout 2013
..	..	@@ -147,30 +476,29 @@
147	476
148	477	//JTextField nameField;
149	478
150		- void SetupMenu2(ObjEditor oe)
	479	+ void SetupMenu2(GroupEditor oe)
151	480	{
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);
	481	+ oe.jTree = new cTree();
	482	+
163	483	Menu menu;
164	484	oe.menuBar.add(menu = new Menu("Edit"));
165	485	//editItem = menu.add(new MenuItem("Edit"));
166	486	//editItem.addActionListener(this);
167		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	487	+
	488	+// undoItem = menu.add(new MenuItem("Undo"));
	489	+// undoItem.addActionListener(this);
	490	+// redoItem = menu.add(new MenuItem("Redo"));
	491	+// redoItem.addActionListener(this);
	492	+// menu.add("-");
	493	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
168	494	duplicateItem.addActionListener(this);
169		- menu.add("-");
170	495	cloneItem = menu.add(new MenuItem("Clone"));
171	496	cloneItem.addActionListener(this);
	497	+ if (Globals.ADVANCED)
	498	+ {
172	499	cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
173	500	cloneSupportItem.addActionListener(this);
	501	+ }
174	502	menu.add("-");
175	503	cutItem = menu.add(new MenuItem("Cut"));
176	504	cutItem.addActionListener(this);
..	..	@@ -178,27 +506,123 @@
178	506	copyItem.addActionListener(this);
179	507	pasteItem = menu.add(new MenuItem("Paste"));
180	508	pasteItem.addActionListener(this);
	509	+
	510	+ menu.add("-");
	511	+ pasteIntoItem = menu.add(new MenuItem("Paste into"));
	512	+ pasteIntoItem.addActionListener(this);
181	513	pasteLinkItem = menu.add(new MenuItem("Paste link"));
182	514	pasteLinkItem.addActionListener(this);
183	515	pasteCloneItem = menu.add(new MenuItem("Paste clone"));
184	516	pasteCloneItem.addActionListener(this);
185	517	// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
186	518	// pasteExpandItem.addActionListener(this);
187		- clearItem = menu.add(new MenuItem("Clear"));
188		- clearItem.addActionListener(this);
	519	+ menu.add("-");
	520	+ deleteItem = menu.add(new MenuItem("Delete"));
	521	+ deleteItem.addActionListener(this);
	522	+
	523	+ if (Globals.ADVANCED)
	524	+ {
	525	+ // Deletes the cameras...
189	526	clearAllItem = menu.add(new MenuItem("Clear All"));
190	527	clearAllItem.addActionListener(this);
	528	+ }
	529	+
	530	+ menuBar.add(cameraMenu = new Menu("View"));
	531	+ //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
	532	+ //zBufferItem.addActionListener(this);
	533	+ //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
	534	+ //normalLensItem.addActionListener(this);
	535	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	536	+ restoreCameraItem.addActionListener(this);
	537	+
	538	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	539	+// toggleFullScreenItem.addItemListener(this);
	540	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	541	+// cameraMenu.add("-");
	542	+//
	543	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	544	+// toggleTextureItem.addItemListener(this);
	545	+// toggleTextureItem.setState(CameraPane.textureon);
	546	+//
	547	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	548	+// toggleSwitchItem.addItemListener(this);
	549	+// toggleSwitchItem.setState(CameraPane.SWITCH);
	550	+
	551	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
	552	+ toggleHandleItem.addItemListener(this);
	553	+ toggleHandleItem.setState(CameraPane.HANDLES);
	554	+
	555	+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
	556	+ togglePaintItem.addItemListener(this);
	557	+ togglePaintItem.setState(CameraPane.PAINTMODE);
	558	+
	559	+ if (Globals.ADVANCED)
	560	+ {
	561	+ cameraMenu.add("-");
	562	+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
	563	+ toggleLiveItem.addItemListener(this);
	564	+ toggleLiveItem.setState(Globals.isLIVE());
191	565
	566	+ cameraMenu.add(stepItem = new MenuItem("Step"));
	567	+ stepItem.addActionListener(this);
	568	+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
	569	+ // toggleDLItem.addItemListener(this);
	570	+ // toggleDLItem.setState(false);
	571	+
	572	+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
	573	+ toggleRenderItem.addItemListener(this);
	574	+ toggleRenderItem.setState(!CameraPane.frozen);
	575	+
	576	+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
	577	+ toggleDebugItem.addItemListener(this);
	578	+ toggleDebugItem.setState(Globals.DEBUG);
	579	+
	580	+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
	581	+ toggleFrustumItem.addItemListener(this);
	582	+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
	583	+
	584	+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
	585	+ toggleFootContactItem.addItemListener(this);
	586	+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
	587	+
	588	+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
	589	+ toggleTimelineItem.addItemListener(this);
	590	+ }
	591	+
	592	+// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
	593	+// toggleRootItem.addItemListener(this);
	594	+// toggleRootItem.setState(false);
	595	+// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
	596	+// animationItem.addItemListener(this);
	597	+// animationItem.setState(CameraPane.ANIMATION);
	598	+ cameraMenu.add("-");
	599	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
	600	+ editCameraItem.addActionListener(this);
	601	+
	602	+ if (Globals.ADVANCED)
	603	+ {
	604	+ oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
	605	+ //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
	606	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
	607	+ editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
	608	+ oe.cameraMenu.add("-");
	609	+ openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
	610	+ openWindowItem.addActionListener(this);
	611	+ editLeafItem.addActionListener(this);
	612	+ lookAtItem.addActionListener(this);
	613	+ //lookFromItem.addActinoListener(this);
	614	+ //switchViewItem.addActionListener(this);
	615	+ }
	616	+
192	617	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);
	618	+ if (Globals.ADVANCED)
	619	+ {
197	620	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
198	621	revertMeshItem.addActionListener(this);
199	622	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
200	623	resetreferencesItem.addActionListener(this);
201	624	menu.add("-");
	625	+ }
202	626	overwriteGeoItem = menu.add(new MenuItem("Overwrite Geometry"));
203	627	overwriteGeoItem.addActionListener(this);
204	628	overwriteMatItem = menu.add(new MenuItem("Overwrite Material"));
..	..	@@ -210,79 +634,104 @@
210	634	overwriteUVItem = menu.add(new MenuItem("Overwrite UV"));
211	635	overwriteUVItem.addActionListener(this);
212	636	menu.add("-");
	637	+ if (Globals.ADVANCED)
	638	+ {
213	639	generateMeshItem = menu.add(new MenuItem("Generate Meshes"));
214	640	generateMeshItem.addActionListener(this);
215	641	poseMeshItem = menu.add(new MenuItem("Set Pose Meshes"));
216	642	poseMeshItem.addActionListener(this);
217	643	menu.add("-");
	644	+ }
218	645	resetsupportItem = menu.add(new MenuItem("Reset support"));
219	646	resetsupportItem.addActionListener(this);
220	647	linkverticesItem = menu.add(new MenuItem("Link to Support"));
221	648	linkverticesItem.addActionListener(this);
222	649	relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
223	650	relinkverticesItem.addActionListener(this);
	651	+
	652	+ if (Globals.ADVANCED)
	653	+ {
224	654	setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
225	655	setMasterItem.addActionListener(this);
	656	+ }
226	657
227	658	oe.menuBar.add(menu = new Menu("Group"));
228		- grabItem = menu.add(new MenuItem("Grab"));
229		- grabItem.addActionListener(this);
	659	+// grabItem = menu.add(new MenuItem("Grab"));
	660	+// grabItem.addActionListener(this);
230	661	backItem = menu.add(new MenuItem("Back"));
231	662	backItem.addActionListener(this);
232	663	frontItem = menu.add(new MenuItem("Front"));
233	664	frontItem.addActionListener(this);
234		- compositeItem = menu.add(new MenuItem("Composite"));
235		- compositeItem.addActionListener(this);
236		- hideItem = menu.add(new MenuItem("Hide"));
	665	+// compositeItem = menu.add(new MenuItem("Composite"));
	666	+// compositeItem.addActionListener(this);
	667	+
	668	+ if (Globals.ADVANCED)
	669	+ {
	670	+ hideItem = menu.add(new MenuItem("Hidden Group"));
237	671	hideItem.addActionListener(this);
	672	+ }
238	673	ungroupItem = menu.add(new MenuItem("Ungroup"));
239	674	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);
	675	+
	676	+// menu.add("-");
	677	+//
	678	+// switchItem = menu.add(new MenuItem("Switch node"));
	679	+// switchItem.addActionListener(this);
	680	+ if (Globals.ADVANCED)
	681	+ {
247	682	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
248	683	switchGeoItem.addActionListener(this);
249	684	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
250	685	switchTransfoItem.addActionListener(this);
251		- morphItem = menu.add(new MenuItem("Morph"));
	686	+ morphItem = menu.add(new MenuItem("Morph Group"));
252	687	morphItem.addActionListener(this);
	688	+
	689	+ menu.add("-");
	690	+ physicsItem = menu.add(new MenuItem("Physics"));
	691	+ physicsItem.addActionListener(this);
	692	+ frameselectorItem = menu.add(new MenuItem("Frame Selector"));
	693	+ frameselectorItem.addActionListener(this);
253	694	scriptNodeItem = menu.add(new MenuItem("Script Node"));
254	695	scriptNodeItem.addActionListener(this);
255		- cameraItem = menu.add(new MenuItem("Camera"));
256		- cameraItem.addActionListener(this);
	696	+ }
257	697
258	698	oe.menuBar.add(menu = new Menu("Object"));
259		- textureItem = menu.add(new MenuItem("Texture"));
260		- textureItem.addActionListener(this);
	699	+// textureItem = menu.add(new MenuItem("Texture"));
	700	+// textureItem.addActionListener(this);
261	701	billboardItem = menu.add(new MenuItem("Billboard"));
262	702	billboardItem.addActionListener(this);
263	703	csgItem = menu.add(new MenuItem("CSG"));
264	704	csgItem.addActionListener(this);
265		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	705	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
266	706	shadowXItem.addActionListener(this);
267		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	707	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
268	708	shadowYItem.addActionListener(this);
269		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	709	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
270	710	shadowZItem.addActionListener(this);
	711	+ attributeItem = menu.add(new MenuItem("Attribute"));
	712	+ attributeItem.addActionListener(this);
	713	+
	714	+ if (Globals.ADVANCED)
	715	+ {
	716	+ menu.add("-");
271	717	linkerItem = menu.add(new MenuItem("Linker"));
272	718	linkerItem.addActionListener(this);
273	719	templateItem = menu.add(new MenuItem("Template"));
274	720	templateItem.addActionListener(this);
275		- attributeItem = menu.add(new MenuItem("Attribute"));
276		- attributeItem.addActionListener(this);
277	721	pointflowItem = menu.add(new MenuItem("Point Flow"));
278	722	pointflowItem.addActionListener(this);
	723	+ }
279	724	menu.add("-");
280	725	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
281	726	resetTransformItem.addActionListener(this);
282	727	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
283	728	resetCentroidItem.addActionListener(this);
284		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
285		- transformgeometryItem.addActionListener(this);
	729	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	730	+ resetCentroidXZItem.addActionListener(this);
	731	+ transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
	732	+ transformGeometryItem.addActionListener(this);
	733	+ transformChildrenItem = menu.add(new MenuItem("Transform Children"));
	734	+ transformChildrenItem.addActionListener(this);
286	735
287	736	oe.menuBar.add(menu = new Menu("Geometry"));
288	737	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -293,8 +742,11 @@
293	742	genNormalsCADItem.addActionListener(this);
294	743	genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
295	744	genNormalsMESHItem.addActionListener(this);
296		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	745	+ if (Globals.ADVANCED)
	746	+ {
	747	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
297	748	genNormalsMINEItem.addActionListener(this);
	749	+ }
298	750	stripifyItem = menu.add(new MenuItem("Stripify"));
299	751	stripifyItem.addActionListener(this);
300	752	unstripifyItem = menu.add(new MenuItem("Unstripify"));
..	..	@@ -316,23 +768,34 @@
316	768	reduce34MeshItem.addActionListener(this);
317	769	increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
318	770	increaseMeshItem.addActionListener(this);
319		- smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
320		- smoothMeshItem.addActionListener(this);
321	771	clipMeshItem = menu.add(new MenuItem("Clip mesh"));
322	772	clipMeshItem.addActionListener(this);
	773	+
	774	+ if (Globals.ADVANCED)
	775	+ {
	776	+ smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
	777	+ smoothMeshItem.addActionListener(this);
	778	+ }
323	779
324	780	oe.menuBar.add(menu = new Menu("Attributes"));
325	781	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
326	782	clearMaterialsItem.addActionListener(this);
	783	+ resetAllItem = menu.add(new MenuItem("Reset All"));
	784	+ resetAllItem.addActionListener(this);
	785	+ stepAllItem = menu.add(new MenuItem("Step All"));
	786	+ stepAllItem.addActionListener(this);
327	787	menu.add("-");
328	788	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
329	789	liveleavesItem.addActionListener(this);
330	790	unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
331	791	unliveleavesItem.addActionListener(this);
	792	+ if (Globals.ADVANCED)
	793	+ {
332	794	supportleavesItem = menu.add(new MenuItem("Support Leaves"));
333	795	supportleavesItem.addActionListener(this);
334	796	unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
335	797	unsupportleavesItem.addActionListener(this);
	798	+ }
336	799	hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
337	800	hideleavesItem.addActionListener(this);
338	801	showleavesItem = menu.add(new MenuItem("Show Leaves"));
..	..	@@ -341,6 +804,14 @@
341	804	markleavesItem.addActionListener(this);
342	805	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
343	806	unmarkleavesItem.addActionListener(this);
	807	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	808	+ rewindleavesItem.addActionListener(this);
	809	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	810	+ unrewindleavesItem.addActionListener(this);
	811	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	812	+ randomleavesItem.addActionListener(this);
	813	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	814	+ unrandomleavesItem.addActionListener(this);
344	815	menu.add("-");
345	816	flipVItem = menu.add(new MenuItem("Flip V"));
346	817	flipVItem.addActionListener(this);
..	..	@@ -366,45 +837,56 @@
366	837	attachBumpItem.addActionListener(this);
367	838	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
368	839	pigmentBumpItem.addActionListener(this);
	840	+ //embedTexturesItem
369	841	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
370	842	detachPigmentItem.addActionListener(this);
371	843	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
372	844	detachBumpItem.addActionListener(this);
	845	+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
	846	+ embedTexturesItem.addActionListener(this);
	847	+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
	848	+ deEmbedTexturesItem.addActionListener(this);
373	849	menu.add("-");
374	850	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
375	851	sortbysizeItem.addActionListener(this);
376	852	sortbynameItem = menu.add(new MenuItem("Sort by name"));
377	853	sortbynameItem.addActionListener(this);
378	854	menu.add("-");
	855	+ shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
	856	+ shareGeometriesItem.addActionListener(this);
	857	+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
	858	+ mergeGeometriesItem.addActionListener(this);
	859	+ if (Globals.ADVANCED)
	860	+ {
	861	+ // Pretty much the same as duplicate and clone.
379	862	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
380	863	extractGeometriesItem.addActionListener(this);
381	864	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
382	865	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);
	866	+ }
387	867
388	868	oe.menuBar.add(menu = new Menu("Insert"));
389	869	buildCreateMenu(menu);
390	870
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	871	oe.menuBar.add(menu = new Menu("Tools"));
403	872	buildToolsMenu(menu);
404	873	}
405	874
	875	+
406	876	void SetupUI2(ObjEditor oe)
407	877	{
	878	+ // June 2019
	879	+ if (oe == null)
	880	+ {
	881	+ //super.SetupUI2(this);
	882	+ //return;
	883	+ }
	884	+
	885	+ if (copy != group)
	886	+ {
	887	+ //super.SetupUI2(this);
	888	+ }
	889	+
408	890	//new Exception().printStackTrace();
409	891
410	892	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -433,176 +915,243 @@
433	915	oe.radioPanel.add(dummyButton);
434	916	oe.buttonGroup.add(dummyButton);
435	917	*/
436		- aConstraints.gridy += 1;
437		- oe.aConstraints.gridwidth = 1;
438		- oe.aConstraints.gridx = 0;
	918	+ cGridBag copyOptionsPanel = new cGridBag();
	919	+
	920	+ copyOptionsPanel.preferredHeight = 2;
439	921
440		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE()), oe.aConstraints);
441		- liveCB.setToolTipText("Enabled animation");
442		- liveCB.addItemListener(this);
443		-
444		- oe.aConstraints.gridx += 1;
445		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST), oe.aConstraints);
446		- fastCB.setToolTipText("Fast mode");
447		- fastCB.addItemListener(this);
448		- oe.aConstraints.gridx += 1;
449		- oe.toolbarPanel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT), oe.aConstraints);
450		- supportCB.setToolTipText("Enabled rigging");
451		- supportCB.addItemListener(this);
452		-
453		- // oe.aConstraints.gridx += 1;
454		- // oe.toolbarPanel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), oe.aConstraints);
455		- // localCB.addItemListener(this);
456		-
457		- oe.aConstraints.gridx += 1;
458		- oe.toolbarPanel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD), oe.aConstraints);
459		- crowdCB.setToolTipText("Used for crowds");
460		- crowdCB.addItemListener(this);
461		-
462		- oe.aConstraints.gridx += 1;
463		- oe.toolbarPanel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA), oe.aConstraints);
464		- smoothCB.setToolTipText("Snapping delay");
465		- smoothCB.addItemListener(this);
466		-
467		- oe.aConstraints.gridx += 1;
468		- oe.toolbarPanel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE), oe.aConstraints);
469		- slowCB.setToolTipText("Smooth interpolation");
470		- slowCB.addItemListener(this);
471		- oe.aConstraints.gridx += 1;
472		- oe.toolbarPanel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE), oe.aConstraints);
473		- boxCB.setToolTipText("Display bounding boxes");
474		- boxCB.addItemListener(this);
475		- oe.aConstraints.gridx += 1;
476		- oe.toolbarPanel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE), oe.aConstraints);
477		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
478		- zoomBoxCB.addItemListener(this);
479		-
480		-// oe.aConstraints.gridx += 1;
481		-// oe.toolbarPanel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), oe.aConstraints);
482		-// speakerMocapCB.addItemListener(this);
483		-
484		- if (false)
485		- {
486		- // handled in scripts
487		- oe.aConstraints.gridx += 1;
488		- oe.toolbarPanel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA), oe.aConstraints);
489		- speakerCameraCB.addItemListener(this);
490		-
491		- oe.aConstraints.gridx += 1;
492		- oe.toolbarPanel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS), oe.aConstraints);
493		- speakerFocusCB.addItemListener(this);
494		-
495		- oe.aConstraints.gridx += 1;
496		- oe.toolbarPanel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS), oe.aConstraints);
497		- smoothfocusCB.addItemListener(this);
498		- }
499		-
500		-//oe.aConstraints.gridx += 1;
501		-//oe.toolbarPanel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), oe.aConstraints);
502		-// debugCB.addItemListener(this);
503		-
504		- oe.aConstraints.gridx += 1;
505		- oe.toolbarPanel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL), oe.aConstraints);
506		- oeilCB.addItemListener(this);
507		-
508		- oe.aConstraints.gridx += 1;
509		- oe.toolbarPanel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT), oe.aConstraints);
510		- lookAtCB.setToolTipText("Look-at target");
511		- lookAtCB.addItemListener(this);
512		-
513		- oe.aConstraints.gridx += 1;
514		- oe.toolbarPanel.add(trackCB = new cCheckBox(":", CameraPane.TRACK), oe.aConstraints);
515		- trackCB.setToolTipText("Enable tracking");
516		- trackCB.addItemListener(this);
517		-
518		- oe.aConstraints.gridx += 1;
519		- oe.toolbarPanel.add(screenfitButton = new cButton("@ ")); //, oe.aConstraints);
	922	+ //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
	923	+
	924	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	925	+ //minButton.setToolTipText("Minimize window");
	926	+ //minButton.addActionListener(this);
	927	+
	928	+ if (Globals.ADVANCED)
	929	+ {
	930	+ oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	931	+ maxButton.setToolTipText("Maximize window");
	932	+ maxButton.addActionListener(this);
	933	+ }
	934	+
	935	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	936	+ fullButton.setToolTipText("Full-screen window");
	937	+ fullButton.addActionListener(this);
	938	+
	939	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
520	940	screenfitButton.setToolTipText("Screen fit");
521	941	screenfitButton.addActionListener(this);
522		- oe.aConstraints.gridx += 1;
	942	+
	943	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	944	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	945	+ restoreCameraButton.addActionListener(this);
	946	+
	947	+ copyOptionsPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	948	+ saveVersionButton.setToolTipText("Duplicate current version");
	949	+ saveVersionButton.addActionListener(this);
	950	+
	951	+ copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	952	+ deleteVersionButton.setToolTipText("Delete current version");
	953	+ deleteVersionButton.addActionListener(this);
	954	+
	955	+ copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	956	+ previousVersionButton.setToolTipText("Previous version");
	957	+ previousVersionButton.addActionListener(this);
	958	+ previousVersionButton.setEnabled(false);
	959	+
	960	+ cGridBag updown = new cGridBag().setVertical(true);
	961	+ updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	962	+ restoreButton.setToolTipText("Undo (restore current version)");
	963	+ restoreButton.addActionListener(this);
	964	+ //restoreButton.setEnabled(false);
	965	+
	966	+ updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	967	+ replaceButton.setToolTipText("Save (replace current version)");
	968	+ replaceButton.addActionListener(this);
	969	+ //replaceButton.setEnabled(false);
	970	+
	971	+ copyOptionsPanel.add(updown);
	972	+
	973	+ copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	974	+ nextVersionButton.setToolTipText("Next version");
	975	+ nextVersionButton.addActionListener(this);
	976	+ nextVersionButton.setEnabled(false);
	977	+
	978	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	979	+ liveCB.setToolTipText("Enable animation");
	980	+ liveCB.addItemListener(this);
	981	+
	982	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	983	+ oneStepButton.setToolTipText("Animate one step forward");
	984	+ oneStepButton.addActionListener(this);
	985	+
	986	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
	987	+ fastCB.setToolTipText("Fast mode");
	988	+ fastCB.addItemListener(this);
	989	+
	990	+ //oe.toolboxPanel.Return();
	991	+
	992	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	993	+// trackCB.setToolTipText("Enable tracking");
	994	+// trackCB.addItemListener(this);
	995	+
523	996	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
524	997	// screenfitpointButton.addActionListener(this);
525		-// oe.aConstraints.gridx += 1;
526		- oe.toolbarPanel.add(snapobjectButton = new cButton(" O+ ")); //, oe.aConstraints);
527		- snapobjectButton.addActionListener(this);
528		- snapobjectButton.setToolTipText("Snap Object");
529		- oe.aConstraints.gridx += 1;
530	998
531		- //aConstraints.gridx = 0;
532		- //aConstraints.gridy += 1;
533		- oe.aConstraints.weighty = 0;
534		- oe.aConstraints.gridwidth = 1;
535		-
536		- oe.toolbarPanel.add(flashSelectionButton = new cButton(" ? ")); //, oe.aConstraints);
537		- flashSelectionButton.setToolTipText("Show selection");
538		- flashSelectionButton.addActionListener(this);
539		-
540		- oe.toolbarPanel.add(new cButton(" ", false));
541		-
542		- oe.aConstraints.gridx += 1;
543		- oe.aConstraints.weighty = 0;
544		- oe.aConstraints.gridwidth = 1;
545		-
546		- //
547		- oe.toolbarPanel.add(twoButton = new cButton(" \|+\| ")); //, oe.aConstraints);
548		- twoButton.setToolTipText("Show center view only");
549		- twoButton.addActionListener(this);
550		- oe.toolbarPanel.add(fourButton = new cButton("+\|\| ")); //, oe.aConstraints);
	999	+ if (Globals.ADVANCED)
	1000	+ {
	1001	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1002	+ snapobjectButton.addActionListener(this);
	1003	+ snapobjectButton.setToolTipText("Snap Object");
	1004	+
	1005	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
551	1006	fourButton.addActionListener(this);
552		- fourButton.setToolTipText("Show left panel only");
553		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\| ")); //, oe.aConstraints);
554		- sixButton.setToolTipText("2-column layout left");
555		- sixButton.addActionListener(this);
556		- oe.toolbarPanel.add(threeButton = new cButton(" \|+\|+")); //, oe.aConstraints);
557		- threeButton.setToolTipText("2-column layout right");
	1007	+ fourButton.setToolTipText("Show control panel only");
	1008	+ }
	1009	+
	1010	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
	1011	+
	1012	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1013	+ twoButton.setToolTipText("Show 3D view only");
	1014	+ twoButton.addActionListener(this);
	1015	+ this.fullscreenLayout = twoButton;
	1016	+
	1017	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1018	+ threeButton.setToolTipText("Show controls and 3D view");
558	1019	threeButton.addActionListener(this);
559		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+")); //, oe.aConstraints);
560		- sevenButton.setToolTipText("3-column layout");
561		- sevenButton.addActionListener(this);
	1020	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1021	+ sixButton.setToolTipText("Show 3D view and controls");
	1022	+ sixButton.addActionListener(this);
	1023	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1024	+// sevenButton.setToolTipText("3-column layout");
	1025	+// sevenButton.addActionListener(this);
562	1026	//
563	1027
564		- oe.toolbarPanel.add(rootButton = new cButton(" o o o ")); //, oe.aConstraints);
565		- rootButton.setToolTipText("Edit object in new tab");
	1028	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1029	+ rootButton.setToolTipText("Open selection in new tab");
566	1030	rootButton.addActionListener(this);
567		- oe.aConstraints.gridx += 1;
568		- oe.toolbarPanel.add(closeButton = new cButton(" X ")); //, oe.aConstraints);
	1031	+
	1032	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
569	1033	closeButton.setToolTipText("Close tab");
570	1034	closeButton.addActionListener(this);
571	1035	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
572	1036	//clearButton.addActionListener(this);
573		- oe.aConstraints.gridx += 1;
574		-
575		- oe.aConstraints.gridx = 1; //
576		- oe.treePanel.add(editButton = new cButton("+"), oe.aConstraints);
577		- editButton.addActionListener(this);
578		- oe.aConstraints.gridx += 1;
579		- oe.aConstraints.weighty = 0;
580		- oe.aConstraints.gridwidth = 1;
581	1037
582		- oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
	1038	+ cGridBag row1 = new cGridBag();
	1039	+
	1040	+ // INSERT
	1041	+ row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1042	+ gridButton.setToolTipText("Create grid");
	1043	+ gridButton.addActionListener(this);
	1044	+
	1045	+ row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1046	+ boxButton.setToolTipText("Create box");
	1047	+ boxButton.addActionListener(this);
	1048	+
	1049	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1050	+ sphereButton.setToolTipText("Create sphere");
	1051	+ sphereButton.addActionListener(this);
	1052	+
	1053	+ row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1054	+ coneButton.setToolTipText("Create cone");
	1055	+ coneButton.addActionListener(this);
	1056	+
	1057	+ row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1058	+ torusButton.setToolTipText("Create torus");
	1059	+ torusButton.addActionListener(this);
	1060	+
	1061	+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1062	+ superButton.setToolTipText("Create superellipsoid");
	1063	+ superButton.addActionListener(this);
	1064	+
	1065	+ if (Globals.ADVANCED)
	1066	+ {
	1067	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1068	+ kleinButton.setToolTipText("Create Klein bottle");
	1069	+ kleinButton.addActionListener(this);
	1070	+ }
	1071	+
	1072	+ row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1073	+ particlesButton.setToolTipText("Create particle system");
	1074	+ particlesButton.addActionListener(this);
	1075	+
	1076	+ oe.toolboxPanel.add(row1);
	1077	+
	1078	+ cGridBag row2 = new cGridBag();
	1079	+
	1080	+ row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1081	+ groupButton.setToolTipText("Create group");
	1082	+ groupButton.addActionListener(this);
	1083	+
	1084	+ row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1085	+ compositeButton.setToolTipText("Create composite");
	1086	+ compositeButton.addActionListener(this);
	1087	+
	1088	+ row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1089	+ switchButton.setToolTipText("Create item switcher");
	1090	+ switchButton.addActionListener(this);
	1091	+
	1092	+ row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1093	+ loopButton.setToolTipText("Create loop");
	1094	+ loopButton.addActionListener(this);
	1095	+
	1096	+ row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1097	+ textureButton.setToolTipText("Create texture");
	1098	+ textureButton.addActionListener(this);
	1099	+
	1100	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1101	+ overlayButton.setToolTipText("Create overlay");
	1102	+ overlayButton.addActionListener(this);
	1103	+
	1104	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1105	+ lightButton.setToolTipText("Create light");
	1106	+ lightButton.addActionListener(this);
	1107	+
	1108	+ oe.toolboxPanel.add(row2);
	1109	+
	1110	+ // ENVYMAPS
	1111	+ cGridBag skyboxpane = new cGridBag();
	1112	+ skyboxpane.preferredHeight = 100;
	1113	+
	1114	+ oe.skyboxPanel.add(skyboxpane);
	1115	+
	1116	+ JTabbedPane skyboxpanel = new JTabbedPane();
	1117	+ skyboxpane.add(skyboxpanel);
	1118	+
	1119	+ AddSkyboxTab0(skyboxpanel);
	1120	+ AddSkyboxTab1(skyboxpanel);
	1121	+ AddSkyboxTab2(skyboxpanel);
	1122	+ AddSkyboxTab3(skyboxpanel);
	1123	+
	1124	+ // EDIT panel
	1125	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1126	+ editButton.setToolTipText("Pin selection controls");
	1127	+ editButton.addActionListener(this);
	1128	+
	1129	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1130	+ uneditButton.setToolTipText("Unpin and remove selection controls");
583	1131	uneditButton.addActionListener(this);
584	1132
585		- oe.aConstraints.gridx += 1;
586		- oe.aConstraints.weighty = 0;
587		- oe.aConstraints.gridwidth = 1;
588		-
589		- oe.treePanel.add(clearPanelButton = new cButton("C"), oe.aConstraints);
590		- clearPanelButton.addActionListener(this);
591		-
592		- oe.aConstraints.gridx += 1;
593		- oe.aConstraints.weighty = 0;
594		- oe.aConstraints.gridwidth = 1;
595		-
596		- oe.treePanel.add(allParamsButton = new cButton("A"), oe.aConstraints);
	1133	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	1134	+ allParamsButton.setToolTipText("Show all controle");
597	1135	allParamsButton.addActionListener(this);
598	1136
599		- oe.aConstraints.gridx += 1;
600		- oe.aConstraints.weighty = 0;
601		- oe.aConstraints.gridwidth = 1;
602		-
603		- oe.treePanel.add(unselectButton = new cButton("U"), oe.aConstraints);
604		- unselectButton.addActionListener(this);
	1137	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1138	+ clearPanelButton.setToolTipText("Clear edit panel");
	1139	+ clearPanelButton.addActionListener(this);
605	1140
	1141	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1142	+ //unselectButton.setToolTipText("Unselect");
	1143	+ //unselectButton.addActionListener(this);
	1144	+
	1145	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1146	+ flashSelectionButton.setToolTipText("Highlight selection");
	1147	+ flashSelectionButton.addActionListener(this);
	1148	+
	1149	+ editCommandsPanel.preferredHeight = 1;
	1150	+
	1151	+ SetPinStates(false);
	1152	+// oe.treePanel.add(commandsPanel);
	1153	+// oe.treePanel.Return();
	1154	+
606	1155	// oe.aConstraints.gridx += 1;
607	1156	// oe.aConstraints.weighty = 0;
608	1157	// oe.aConstraints.gridwidth = 1;
..	..	@@ -614,47 +1163,32 @@
614	1163	// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
615	1164	// gcButton.addActionListener(this);
616	1165
617		- oe.aConstraints.gridx = 0;
618		- oe.aConstraints.gridy += 1;
619		-
620		- //ctrlPanel.add(objList = new List(5, true));
621		- oe.aConstraints.gridwidth = 100;
622		- // oe.aConstraints.gridheight = 100;
623		- oe.aConstraints.fill = GridBagConstraints.BOTH; // HORIZONTAL;
624		- oe.aConstraints.gridheight = 1;
625		- oe.aConstraints.weighty = 0.5;
626		- oe.aConstraints.gridx = 0;
627		- JScrollPane jSP;
	1166	+ cGridBag jSPPanel = new cGridBag();
	1167	+
	1168	+ JScrollPane jSP;
628	1169	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
629		- oe.treePanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null)), oe.aConstraints);
	1170	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
630	1171	ResetModel();
631		- oe.aConstraints.weighty = 0.5;
632		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
633		- oe.aConstraints.gridy += 1;
634		- oe.aConstraints.gridwidth = 1;
635		-
636		- oe.aConstraints.weighty = 0;
637		- oe.aConstraints.gridwidth = 2;
638		-
639		- oe.treePanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0), oe.aConstraints);
640		- colorCB.addItemListener(this);
641		- oe.aConstraints.gridx += 2;
642		- oe.treePanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0), oe.aConstraints);
643		- materialCB.addItemListener(this);
644		- oe.aConstraints.gridx += 2;
645		- oe.treePanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0), oe.aConstraints);
646		- textureCB.addItemListener(this);
647		-
648		- oe.aConstraints.gridx = 0;
649		- oe.aConstraints.gridy += 1;
650	1172
	1173	+ oe.treePanel.add(jSPPanel);
	1174	+ oe.treePanel.Return();
	1175	+
	1176	+ oe.treePanel.add(copyOptionsPanel);
	1177	+ oe.treePanel.Return();
	1178	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1179	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	1180	+ sliderPane.preferredHeight = 1;
	1181	+
	1182	+// mainPanel.setDividerLocation(0.1); //1.0);
	1183	+ mainPanel.setResizeWeight(0.4);
	1184	+
651	1185	//jList.addListSelectionListener(this);
652	1186	oe.jTree.addTreeSelectionListener(this);
653	1187	//jTree.setRootVisible(false);
654	1188	//jTree.setEditable(true);
655	1189	oe.jTree.setDragEnabled(true);
656	1190	//jTree.setPreferredSize(new Dimension(10,10));
657		- jSP.setPreferredSize(new Dimension(100,200));
	1191	+ //jSP.setPreferredSize(new Dimension(100,200));
658	1192
659	1193	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
660	1194
..	..	@@ -666,23 +1200,163 @@
666	1200	dgr.addDragGestureListener(this);
667	1201	}catch(Exception e) {}
668	1202	*/
669		- radio.layout = sevenButton;
	1203	+ radio.layout = threeButton; // sixButton;
670	1204	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
671	1205	}
	1206	+
	1207	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
	1208	+ {
	1209	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	1210	+ colorCB.setToolTipText("Copy color when dropped");
	1211	+ colorCB.addItemListener(this);
	1212	+
	1213	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	1214	+ materialCB.setToolTipText("Copy material when dropped");
	1215	+ materialCB.addItemListener(this);
	1216	+
	1217	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	1218	+ textureCB.setToolTipText("Copy texture when dropped");
	1219	+ textureCB.addItemListener(this);
	1220	+
	1221	+ panel.Return();
	1222	+
	1223	+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
	1224	+ boxCB.setToolTipText("Display bounding boxes");
	1225	+ boxCB.addItemListener(this);
	1226	+
	1227	+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
	1228	+ zoomBoxCB.setToolTipText("Display only for wheel");
	1229	+ zoomBoxCB.addItemListener(this);
	1230	+
	1231	+ if (true) // Globals.ADVANCED)
	1232	+ {
	1233	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	1234	+// supportCB.setToolTipText("Enable rigging");
	1235	+// supportCB.addItemListener(this);
	1236	+
	1237	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	1238	+ freezeCB.setToolTipText("Fast moving camera");
	1239	+ freezeCB.addItemListener(this);
	1240	+
	1241	+ // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
	1242	+ // localCB.addItemListener(this);
	1243	+
	1244	+ panel.Return();
	1245	+
	1246	+ panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
	1247	+ crowdCB.setToolTipText("Used for crowds");
	1248	+ crowdCB.addItemListener(this);
	1249	+
	1250	+ panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
	1251	+ smoothCB.setToolTipText("Snapping delay");
	1252	+ smoothCB.addItemListener(this);
	1253	+
	1254	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1255	+// slowCB.setToolTipText("Smooth interpolation");
	1256	+// slowCB.addItemListener(this);
	1257	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1258	+ minshaderCB.setToolTipText("Minimal fast shader");
	1259	+ minshaderCB.addItemListener(this);
	1260	+
	1261	+// constraints.gridy += 1;
	1262	+// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
	1263	+// speakerMocapCB.addItemListener(this);
	1264	+
	1265	+ panel.Return();
	1266	+
	1267	+ if (false)
	1268	+ {
	1269	+ // handled in scripts
	1270	+ //constraints.gridy += 1;
	1271	+ panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
	1272	+ speakerCameraCB.addItemListener(this);
	1273	+
	1274	+ //constraints.gridy += 1;
	1275	+ panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
	1276	+ speakerFocusCB.addItemListener(this);
	1277	+
	1278	+ //constraints.gridy += 1;
	1279	+ panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
	1280	+ smoothfocusCB.addItemListener(this);
	1281	+ panel.Return();
	1282	+ }
	1283	+
	1284	+//constraints.gridx += 1;
	1285	+//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
	1286	+// debugCB.addItemListener(this);
	1287	+
	1288	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	1289	+ trackCB.setToolTipText("Enable tracking target");
	1290	+ trackCB.addItemListener(this);
	1291	+
	1292	+ panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	1293	+ oeilCB.setToolTipText("Move camera when tracking");
	1294	+ oeilCB.addItemListener(this);
	1295	+
	1296	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	1297	+ shadowCB.setToolTipText("When live compute shadows");
	1298	+ shadowCB.addItemListener(this);
	1299	+
	1300	+ panel.Return();
	1301	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	1302	+ toggleTextureCB.setToolTipText("Load textures");
	1303	+ toggleTextureCB.addItemListener(this);
	1304	+
	1305	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	1306	+ toggleSwitchCB.setToolTipText("Choose a single item");
	1307	+ toggleSwitchCB.addItemListener(this);
	1308	+
	1309	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1310	+ autokeepCB.setToolTipText("On structure change");
	1311	+ autokeepCB.addItemListener(this);
	1312	+
	1313	+ panel.Return();
	1314	+ if (Globals.ADVANCED)
	1315	+ {
	1316	+ panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
	1317	+ lookAtCB.setToolTipText("Look-at target");
	1318	+ lookAtCB.addItemListener(this);
	1319	+ }
	1320	+
	1321	+ }
	1322	+
	1323	+ cGridBag fill = new cGridBag();
	1324	+ fill.preferredHeight = 200;
	1325	+ cGridBag fill2 = new cGridBag();
	1326	+ fill2.preferredHeight = 200;
	1327	+ cGridBag fill3 = new cGridBag();
	1328	+ fill3.preferredHeight = 200;
	1329	+
	1330	+ panel.add(fill);
	1331	+ panel.add(fill2);
	1332	+ panel.add(fill3);
	1333	+
	1334	+ }
672	1335
673	1336	void EditObject(Object3D obj)
674	1337	{
675	1338	cRadio radioButton = new cRadio(obj.name);
	1339	+
	1340	+ // June 2019. Patch to avoid bug with transparency.
	1341	+ radioButton.hadMaterial = obj.material != null;
	1342	+ if (!radioButton.hadMaterial)
	1343	+ {
	1344	+ obj.material = new cMaterial();
	1345	+ }
	1346	+
676	1347	radioButton.SetObject(obj);
677		- radioButton.layout = sevenButton;
	1348	+ radioButton.layout = threeButton; // sixButton;
678	1349	radioButton.SetCamera(cameraView.renderCamera, false);
679	1350	radioButton.addActionListener(this);
680	1351	radioPanel.add(radioButton);
681	1352	buttonGroup.add(radioButton);
682	1353	radioButton.doClick();
683	1354	}
	1355	+
684	1356	void SetupViews(ObjEditor oe)
685	1357	{
	1358	+ theFrame = this;
	1359	+
686	1360	oe.SetupViews();
687	1361
688	1362	System.out.println("SetupViews");
..	..	@@ -691,23 +1365,30 @@
691	1365	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
692	1366	}
693	1367
694		- JCheckBox liveCB;
695		- JCheckBox supportCB;
696		- JCheckBox localCB;
697		- JCheckBox crowdCB;
698		- JCheckBox smoothCB;
699		- JCheckBox fastCB;
700		- JCheckBox slowCB;
701		- JCheckBox boxCB;
702		- JCheckBox zoomBoxCB;
703		- JCheckBox trackCB;
704		- JCheckBox smoothfocusCB;
	1368	+ cToggleButton liveCB;
	1369	+ cCheckBox supportCB;
	1370	+ cCheckBox localCB;
	1371	+ cCheckBox crowdCB;
	1372	+ cCheckBox smoothCB;
	1373	+ cCheckBox minshaderCB;
	1374	+
	1375	+ cToggleButton fastCB;
	1376	+ cCheckBox slowCB;
	1377	+ cCheckBox boxCB;
	1378	+ cCheckBox zoomBoxCB;
	1379	+ cCheckBox freezeCB;
	1380	+ //cToggleButton trackCB;
	1381	+ cCheckBox trackCB;
	1382	+ cCheckBox smoothfocusCB;
705	1383	// JCheckBox speakerMocapCB;
706		- JCheckBox speakerCameraCB;
707		- JCheckBox speakerFocusCB;
708		- JCheckBox debugCB;
709		- JCheckBox oeilCB;
710		- JCheckBox lookAtCB;
	1384	+ cCheckBox speakerCameraCB;
	1385	+ cCheckBox speakerFocusCB;
	1386	+ cCheckBox debugCB;
	1387	+
	1388	+ cCheckBox oeilCB;
	1389	+ cCheckBox shadowCB;
	1390	+ cCheckBox autokeepCB;
	1391	+ cCheckBox lookAtCB;
711	1392
712	1393	// static int COLOR = 1;
713	1394	// static int MATERIAL = 2;
..	..	@@ -715,9 +1396,9 @@
715	1396
716	1397	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
717	1398
718		- JCheckBox colorCB;
719		- JCheckBox materialCB;
720		- JCheckBox textureCB;
	1399	+ cCheckBox colorCB;
	1400	+ cCheckBox materialCB;
	1401	+ cCheckBox textureCB;
721	1402
722	1403	public void itemStateChanged(ItemEvent e)
723	1404	{
..	..	@@ -745,6 +1426,7 @@
745	1426	} else if(e.getSource() == liveCB)
746	1427	{
747	1428	cameraView.ToggleLive();
	1429	+ refreshContents(false);
748	1430	}
749	1431	else if(e.getSource() == supportCB)
750	1432	{
..	..	@@ -760,6 +1442,12 @@
760	1442	{
761	1443	cameraView.ToggleInertia();
762	1444	cameraView.repaint();
	1445	+ }
	1446	+ else if(e.getSource() == minshaderCB)
	1447	+ {
	1448	+ Globals.MINSHADER ^= true;
	1449	+ cameraView.programInitialized = false;
	1450	+ cameraView.repaint();
763	1451	}
764	1452	else if(e.getSource() == localCB)
765	1453	{
..	..	@@ -809,6 +1497,18 @@
809	1497	{
810	1498	cameraView.ToggleOeil();
811	1499	}
	1500	+ else if(e.getSource() == shadowCB)
	1501	+ {
	1502	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1503	+ }
	1504	+ else if(e.getSource() == freezeCB)
	1505	+ {
	1506	+ Globals.FREEZEONMOVE ^= true;
	1507	+ }
	1508	+ else if(e.getSource() == autokeepCB)
	1509	+ {
	1510	+ Globals.REPLACEONMAKE ^= true;
	1511	+ }
812	1512	else if(e.getSource() == lookAtCB)
813	1513	{
814	1514	cameraView.ToggleLookAt();
..	..	@@ -825,7 +1525,8 @@
825	1525
826	1526	/**/
827	1527	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
828		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1528	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1529	+ TreePath path = objEditor.jTree.getSelectionPath();
829	1530	if ((path == null) \|\| (path.getPathCount() <= 1)) {
830	1531	// We can't move the root node or an empty selection
831	1532	return;
..	..	@@ -888,8 +1589,6 @@
888	1589	}
889	1590	}
890	1591
891		- String string = (String) object;
892		-
893	1592	System.out.println("Transfer = " + object + "; drop : " + target);
894	1593	// if( object instanceof java.io.File[])
895	1594	// {
..	..	@@ -897,7 +1596,11 @@
897	1596	// objEditor.DropFile((java.io.File[]) object, true);
898	1597	// return;
899	1598	// }
900		- if (string.charAt(0) == '/')
	1599	+
	1600	+ String string = object.toString();
	1601	+
	1602	+ // File path for Mac and Windows
	1603	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
901	1604	{
902	1605	// file(s)
903	1606	String[] names = string.split("\n");
..	..	@@ -924,7 +1627,7 @@
924	1627
925	1628	flashIt = false;
926	1629	CameraPane pane = (CameraPane) target;
927		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1630	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
928	1631	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
929	1632
930	1633	if (group.selection.size() == 1)
..	..	@@ -940,23 +1643,33 @@
940	1643
941	1644	assert target == objEditor.jTree;
942	1645	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1646	+ Object3D destinationLeaf;
943	1647	try {
944		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1648	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
945	1649	} catch (Exception e) {
946	1650	System.out.println("destinationPath : " + destinationPath);
947	1651	return;
948	1652	}
949	1653
950		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1654	+ for (int i=group.selection.size(); --i>=0;)
951	1655	{
	1656	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1657	+
	1658	+ // Cannot move into itself
	1659	+ if (child == destinationLeaf)
	1660	+ return;
	1661	+ }
	1662	+
	1663	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1664	+// {
952	1665	loadClipboard(true);
953	1666	objEditor.jTree.setSelectionPath(destinationPath);
954		- pasteInto(false);
955		- } else {
956		- loadClipboard(false);
957		- objEditor.jTree.setSelectionPath(destinationPath);
958		- pasteInto(false); // true); // ???
959		- }
	1667	+ pasteInto(false, false);
	1668	+// } else {
	1669	+// loadClipboard(false);
	1670	+// objEditor.jTree.setSelectionPath(destinationPath);
	1671	+// pasteInto(false, false); // true); // ???
	1672	+// }
960	1673	}
961	1674	public void dropActionChanged(DropTargetDragEvent dtde)
962	1675	// Called if the user has modified the current drop gesture
..	..	@@ -1061,85 +1774,107 @@
1061	1774	{
1062	1775	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1063	1776	//heightFieldItem.addActionListener(this);
1064		- gridItem = menu.add(new MenuItem("Grid"));
1065		- gridItem.addActionListener(this);
1066		- rectoidItem = menu.add(new MenuItem("Box"));
1067		- rectoidItem.addActionListener(this);
1068		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1069		- ellipsoidItem.addActionListener(this);
1070		- coneItem = menu.add(new MenuItem("Cone"));
1071		- coneItem.addActionListener(this);
1072		- torusItem = menu.add(new MenuItem("Torus"));
1073		- torusItem.addActionListener(this);
1074		- superItem = menu.add(new MenuItem("Superellipsoid"));
1075		- superItem.addActionListener(this);
	1777	+// gridItem = menu.add(new MenuItem("Grid"));
	1778	+// gridItem.addActionListener(this);
	1779	+// rectoidItem = menu.add(new MenuItem("Box"));
	1780	+// rectoidItem.addActionListener(this);
	1781	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1782	+// ellipsoidItem.addActionListener(this);
	1783	+// coneItem = menu.add(new MenuItem("Cone"));
	1784	+// coneItem.addActionListener(this);
	1785	+// torusItem = menu.add(new MenuItem("Torus"));
	1786	+// torusItem.addActionListener(this);
	1787	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1788	+// superItem.addActionListener(this);
	1789	+
	1790	+ cameraItem = menu.add(new MenuItem("Camera"));
	1791	+ cameraItem.addActionListener(this);
	1792	+
	1793	+ if (!Globals.ADVANCED)
	1794	+ {
1076	1795	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1077	1796	kleinItem.addActionListener(this);
1078		- particleItem = menu.add(new MenuItem("Particle system"));
1079		- particleItem.addActionListener(this);
	1797	+ }
	1798	+
	1799	+// particleItem = menu.add(new MenuItem("Particle system"));
	1800	+// particleItem.addActionListener(this);
	1801	+ if (Globals.ADVANCED)
	1802	+ {
1080	1803	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1081	1804	ragdollItem.addActionListener(this);
1082	1805	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1083	1806	ragdoll2Item.addActionListener(this);
	1807	+ }
1084	1808	menu.add("-");
1085		- meshItem = menu.add(new MenuItem("Mesh"));
	1809	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1086	1810	meshItem.addActionListener(this);
1087	1811	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1088	1812	// meshGroupItem.addActionListener(this);
	1813	+ if (Globals.ADVANCED)
	1814	+ {
1089	1815	springItem = menu.add(new MenuItem("Spring"));
1090	1816	springItem.addActionListener(this);
1091	1817	flagItem = menu.add(new MenuItem("Flag"));
1092	1818	flagItem.addActionListener(this);
1093		- bezierItem = menu.add(new MenuItem("Patch"));
1094		- bezierItem.addActionListener(this);
1095		- checkerItem = menu.add(new MenuItem("Checker"));
1096		- checkerItem.addActionListener(this);
1097	1819	blobItem = menu.add(new MenuItem("Blob"));
1098	1820	blobItem.addActionListener(this);
1099	1821	latheItem = menu.add(new MenuItem("Lathe"));
1100	1822	latheItem.addActionListener(this);
1101		- lightItem = menu.add(new MenuItem("Light"));
1102		- lightItem.addActionListener(this);
	1823	+ }
	1824	+ bezierItem = menu.add(new MenuItem("Bezier Patch"));
	1825	+ bezierItem.addActionListener(this);
	1826	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1827	+// overlayItem.addActionListener(this);
	1828	+// lightItem = menu.add(new MenuItem("Light"));
	1829	+// lightItem.addActionListener(this);
1103	1830	menu.add("-");
1104	1831	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1105	1832	//superLoopItem.addActionListener(this);
1106		- loopItem = menu.add(new MenuItem("Loop"));
1107		- loopItem.addActionListener(this);
	1833	+// loopItem = menu.add(new MenuItem("Loop"));
	1834	+// loopItem.addActionListener(this);
1108	1835	doubleItem = menu.add(new MenuItem("Fork"));
1109	1836	doubleItem.addActionListener(this);
	1837	+ if (Globals.ADVANCED)
	1838	+ {
1110	1839	tripleItem = menu.add(new MenuItem("Trident"));
1111	1840	tripleItem.addActionListener(this);
	1841	+ }
1112	1842	}
1113	1843
1114	1844	void buildToolsMenu(Menu menu)
1115	1845	{
1116	1846	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1117	1847	animationItem.addItemListener(this);
1118		- animationItem.setState(CameraPane.ANIMATION);
	1848	+ animationItem.setState(Globals.ANIMATION);
	1849	+
	1850	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1851	+ archiveItem.addActionListener(this);
1119	1852
1120	1853	menu.add("-");
1121	1854	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1122	1855	parseverticesItem.addActionListener(this);
1123	1856	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1124	1857	textureFieldItem.addActionListener(this);
1125		- alignItem = menu.add(new MenuItem("Align"));
	1858	+ alignItem = menu.add(new MenuItem("Align Objects"));
1126	1859	alignItem.addActionListener(this);
1127		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1128		- mirrorItem.addActionListener(this);
1129	1860	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1130	1861	reduceMorphItem.addActionListener(this);
1131	1862	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1132	1863	reduce34MorphItem.addActionListener(this);
1133		-
1134		- menu.add(computeAOItem = new MenuItem("Compute AO"));
1135		- computeAOItem.addActionListener(this);
1136	1864	menu.add("-");
1137		-
1138	1865	menu.add(memoryItem = new MenuItem("Memory Usage"));
1139	1866	memoryItem.addActionListener(this);
	1867	+ menu.add(computeAOItem = new MenuItem("Compute AO"));
	1868	+ computeAOItem.addActionListener(this);
	1869	+
	1870	+ if (Globals.ADVANCED)
	1871	+ {
	1872	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	1873	+ mirrorItem.addActionListener(this);
	1874	+ menu.add("-");
1140	1875	menu.add(analyzeItem = new MenuItem("Analyze"));
1141	1876	analyzeItem.addActionListener(this);
1142		- menu.add(dumpItem = new MenuItem("Dump"));
	1877	+ menu.add(dumpItem = new MenuItem("Print"));
1143	1878	dumpItem.addActionListener(this);
1144	1879	// menu.add(pathItem = new MenuItem("From-to path"));
1145	1880	// pathItem.addActionListener(this);
..	..	@@ -1157,6 +1892,7 @@
1157	1892	menu.add("-");
1158	1893	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1159	1894	editScriptItem.addActionListener(this);
	1895	+ }
1160	1896	}
1161	1897
1162	1898	void ScreenFit()
..	..	@@ -1279,9 +2015,34 @@
1279	2015	shadow.material = new cMaterial(obj.material);
1280	2016	shadow.material.diffuse = 0.0001f;
1281	2017	shadow.material.specular = 0.0001f;
	2018	+ //shadow.projectedVertices[1].x = 300;
1282	2019
1283	2020	makeSomething(shadow);
1284	2021	}
	2022	+
	2023	+ private void ClearUnpinned()
	2024	+ {
	2025	+ //for (Object3D obj : listUI)
	2026	+ for (int i=listUI.size(); --i>=0;)
	2027	+ {
	2028	+ Object3D obj = listUI.elementAt(i);
	2029	+ if (!obj.pinned)
	2030	+ {
	2031	+ obj.CloseUI();
	2032	+ listUI.remove(i);
	2033	+ }
	2034	+ }
	2035	+ }
	2036	+
	2037	+ private void EditElement(Object3D elem, boolean newWindow)
	2038	+ {
	2039	+ // if (!(elem instanceof Composite))
	2040	+ // newWindow = false;
	2041	+ listUI.add(elem);
	2042	+ elem.openEditWindow(this, newWindow); //, false);
	2043	+ System.out.println("edit : " + elem);
	2044	+ elem.editWindow.refreshContents(true); // ? new
	2045	+ }
1285	2046
1286	2047	/**
1287	2048	* applyExample
..	..	@@ -1485,9 +2246,9 @@
1485	2246
1486	2247	void Overwrite(int mask)
1487	2248	{
1488		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2249	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1489	2250	{
1490		- Object3D content = GrafreeD.clipboard.get(0);
	2251	+ Object3D content = Grafreed.clipboard.get(0);
1491	2252
1492	2253	if (content instanceof cGroup && ((cGroup)content).transientlink )
1493	2254	content = ((cGroup)content).get(0);
..	..	@@ -1510,6 +2271,7 @@
1510	2271	//
1511	2272	public void actionPerformed(ActionEvent event) // , Object arg)
1512	2273	{
	2274	+ Object source = event.getSource();
1513	2275	/*
1514	2276	if (event.getSource() == nameField)
1515	2277	{
..	..	@@ -1521,11 +2283,11 @@
1521	2283	}
1522	2284	else
1523	2285	*/
1524		- if (event.getSource() == lookAtItem \|\| event.getSource() == lookFromItem)
	2286	+ if (source == lookAtItem \|\| source == lookFromItem)
1525	2287	{
1526	2288	ScreenFit();
1527	2289	} else
1528		- if (event.getSource() == switchItem)
	2290	+ if (source == switchViewItem)
1529	2291	{
1530	2292	cVector v1 = new cVector();
1531	2293	cVector v2 = new cVector();
..	..	@@ -1534,11 +2296,11 @@
1534	2296	objEditor.cameraView.renderCamera.setAim(v2, v1);
1535	2297	objEditor.cameraView.repaint();
1536	2298	} else
1537		- if (event.getSource() == rectoidItem)
	2299	+ if (source == rectoidItem \|\| source == boxButton)
1538	2300	{
1539	2301	makeSomething(new Box());
1540	2302	} else
1541		- if (event.getSource() == particleItem)
	2303	+ if (source == particleItem \|\| source == particlesButton)
1542	2304	{
1543	2305	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1544	2306	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1559,9 +2321,9 @@
1559	2321	applyExample(particleGeom, "SMOKE");
1560	2322	makeSomething(particleGeom);
1561	2323	} else
1562		- if (event.getSource() == ragdollItem \|\| event.getSource() == ragdoll2Item)
	2324	+ if (source == ragdollItem \|\| source == ragdoll2Item)
1563	2325	{
1564		- GenericJoint ragdoll = new GenericJoint(event.getSource() == ragdollItem);
	2326	+ GenericJoint ragdoll = new GenericJoint(source == ragdollItem);
1565	2327
1566	2328	ragdoll.toParent = LA.newMatrix();
1567	2329	ragdoll.fromParent = LA.newMatrix();
..	..	@@ -1579,7 +2341,7 @@
1579	2341	} else
1580	2342	/*
1581	2343	*/
1582		- if (event.getSource() == heightFieldItem)
	2344	+ if (source == heightFieldItem)
1583	2345	{
1584	2346	Object3D obj = new Object3D();
1585	2347
..	..	@@ -1617,31 +2379,31 @@
1617	2379
1618	2380	makeSomething(obj);
1619	2381	} else
1620		- if (event.getSource() == gridItem)
	2382	+ if (source == gridItem \|\| source == gridButton)
1621	2383	{
1622	2384	makeSomething(new Grid());
1623	2385	} else
1624		- if (event.getSource() == ellipsoidItem)
	2386	+ if (source == ellipsoidItem \|\| source == sphereButton)
1625	2387	{
1626	2388	makeSomething(new Sphere());
1627	2389	} else
1628		- if (event.getSource() == coneItem)
	2390	+ if (source == coneItem \|\| source == coneButton)
1629	2391	{
1630	2392	makeSomething(new Cone());
1631	2393	} else
1632		- if (event.getSource() == torusItem)
	2394	+ if (source == torusItem \|\| source == torusButton)
1633	2395	{
1634	2396	makeSomething(new Torus());
1635	2397	} else
1636		- if (event.getSource() == superItem)
	2398	+ if (source == superItem \|\| source == superButton)
1637	2399	{
1638	2400	makeSomething(new Superellipsoid());
1639	2401	} else
1640		- if (event.getSource() == kleinItem)
	2402	+ if (source == kleinItem \|\| source == kleinButton)
1641	2403	{
1642	2404	makeSomething(new Klein());
1643	2405	} else
1644		- if (event.getSource() == blobItem)
	2406	+ if (source == blobItem)
1645	2407	{
1646	2408	Blob blob = new Blob();
1647	2409	BlobComponent comp = new BlobComponent();
..	..	@@ -1649,15 +2411,15 @@
1649	2411	//blob.retile();
1650	2412	makeSomething(blob);
1651	2413	} else
1652		- if (event.getSource() == latheItem)
	2414	+ if (source == latheItem)
1653	2415	{
1654	2416	makeSomething(new Lathe());
1655	2417	} else
1656		- if (event.getSource() == bezierItem)
	2418	+ if (source == bezierItem)
1657	2419	{
1658	2420	makeSomething(new BezierSurface());
1659	2421	} else
1660		- if (event.getSource() == checkerItem)
	2422	+ if (source == overlayItem \|\| source == overlayButton)
1661	2423	{
1662	2424	/*
1663	2425	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1672,7 +2434,7 @@
1672	2434	*/
1673	2435	makeSomething(new Checker());
1674	2436	} else
1675		- if (event.getSource() == meshItem)
	2437	+ if (source == meshItem)
1676	2438	{
1677	2439	Object3D itemtomake = new Object3D();
1678	2440	Object3D child;
..	..	@@ -1693,35 +2455,52 @@
1693	2455	makeSomething(child);
1694	2456	}
1695	2457	} else
1696		- if (event.getSource() == springItem)
	2458	+ if (source == springItem)
1697	2459	{
1698	2460	cSpring s = new cSpring();
1699	2461	s.setup();
1700	2462	makeSomething(s);
1701	2463	} else
1702		- if (event.getSource() == flagItem)
	2464	+ if (source == flagItem)
1703	2465	{
1704	2466	cSpring s = new cFlag();
1705	2467	s.setup();
1706	2468	makeSomething(s);
1707	2469	} else
1708		- if (event.getSource() == lightItem)
	2470	+ if (source == lightItem \|\| source == lightButton)
1709	2471	{
1710	2472	makeSomething(new Light());
1711	2473	} else
1712		- if (event.getSource() == csgItem)
	2474	+// if (source == skybox1Button \|\|
	2475	+// source == skybox2Button \|\|
	2476	+// source == skybox3Button \|\|
	2477	+// source == skybox4Button \|\|
	2478	+// source == skybox5Button \|\|
	2479	+// source == skybox6Button \|\|
	2480	+// source == skybox7Button \|\|
	2481	+// source == skybox11Button \|\|
	2482	+// source == skybox12Button \|\|
	2483	+// source == skybox13Button \|\|
	2484	+// source == skybox14Button \|\|
	2485	+// source == skybox15Button \|\|
	2486	+// source == skybox16Button \|\|
	2487	+// source == skybox17Button)
	2488	+// {
	2489	+// ChangeSkybox(source);
	2490	+// } else
	2491	+ if (source == csgItem)
1713	2492	{
1714	2493	group(new CSG());
1715	2494	} else
1716		- if (event.getSource() == templateItem)
	2495	+ if (source == templateItem)
1717	2496	{
1718	2497	group(new cTemplate());
1719	2498	} else
1720		- if (event.getSource() == attributeItem)
	2499	+ if (source == attributeItem)
1721	2500	{
1722	2501	makeSomething(new Attribute());
1723	2502	} else
1724		- if (event.getSource() == pointflowItem)
	2503	+ if (source == pointflowItem)
1725	2504	{
1726	2505	makeSomething(new PointFlow());
1727	2506	} else
..	..	@@ -1733,7 +2512,7 @@
1733	2512	} else
1734	2513	*/
1735	2514
1736		- if (event.getSource() == superLoopItem)
	2515	+ if (source == superLoopItem)
1737	2516	{
1738	2517	Composite g = new cGroup();
1739	2518	for (int i=0; i<15; i++)
..	..	@@ -1755,30 +2534,30 @@
1755	2534
1756	2535	group(g);
1757	2536	} else
1758		- if (event.getSource() == loopItem)
	2537	+ if (source == loopItem \|\| source == loopButton)
1759	2538	{
1760	2539	Composite csg = new GroupLeaf();
1761	2540	csg.count = 5;
1762	2541	group(csg);
1763		- Composite child = new cGroup();
	2542	+ Composite child = new cGroup("Branch");
1764	2543	csg.addChild(child);
1765	2544	child.addChild(csg);
1766	2545	} else
1767		- if (event.getSource() == doubleItem)
	2546	+ if (source == doubleItem)
1768	2547	{
1769		- Composite csg = new GroupLeaf();
	2548	+ Composite csg = new GroupLeaf("Fork");
1770	2549	csg.count = 5;
1771	2550	group(csg);
1772		- Composite child = new cGroup();
	2551	+ Composite child = new cGroup("Branch A");
1773	2552	csg.addChild(child);
1774	2553	child.addChild(csg);
1775		- child = new cGroup();
	2554	+ child = new cGroup("Branch B");
1776	2555	csg.addChild(child);
1777	2556	child.addChild(csg);
1778	2557	} else
1779		- if (event.getSource() == tripleItem)
	2558	+ if (source == tripleItem)
1780	2559	{
1781		- Composite csg = new GroupLeaf();
	2560	+ Composite csg = new GroupLeaf("Trident");
1782	2561	csg.count = 4;
1783	2562	group(csg);
1784	2563	Composite child = new cGroup();
..	..	@@ -1791,73 +2570,105 @@
1791	2570	csg.addChild(child);
1792	2571	child.addChild(csg);
1793	2572	} else
1794		-
1795		- if (event.getSource() == importGFDItem)
1796		- {
1797		- ImportGFD();
1798		- } else
1799		- if (event.getSource() == importVRMLX3DItem)
1800		- {
1801		- ImportVRMLX3D();
1802		- } else
1803		- if (event.getSource() == import3DSItem)
1804		- {
1805		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1806		- } else
1807		- if (event.getSource() == importOBJItem)
1808		- {
1809		- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1810		- } else
1811		- if (event.getSource() == computeAOItem)
	2573	+ if (source == computeAOItem)
1812	2574	{
1813	2575	Globals.drawMode = CameraPane.OCCLUSION;
1814		- Globals.theRenderer.repaint();
	2576	+ cameraView.repaint();
1815	2577	} else
1816		- if (event.getSource() == recompileItem)
	2578	+ if (source == recompileItem)
1817	2579	{
1818	2580	Recompile();
1819	2581	refreshContents();
1820	2582	} else
1821		- if (event.getSource() == editScriptItem)
	2583	+ if (source == editScriptItem)
1822	2584	{
1823	2585	OpenDialog();
1824	2586	refreshContents();
1825	2587	} else
1826		- if (event.getSource() == invariantsItem)
	2588	+ if (source == invariantsItem)
1827	2589	{
1828	2590	System.out.println("Invariants:");
1829		- GrafreeD.grafreeD.universe.invariants();
	2591	+ Grafreed.grafreed.universe.invariants();
1830	2592	} else
1831		- if (event.getSource() == memoryItem)
	2593	+ if (source == memoryItem)
1832	2594	{
1833	2595	//System.out.println("Invariants:");
1834	2596	PrintMemory();
1835	2597	} else
1836		- if (event.getSource() == pathItem)
	2598	+ if (source == pathItem)
1837	2599	{
1838	2600	PrintPath();
1839	2601	} else
1840		- if (event.getSource() == analyzeItem)
	2602	+ if (source == analyzeItem)
1841	2603	{
1842	2604	AnalyzeObject();
1843	2605	} else
1844		- if (event.getSource() == dumpItem)
	2606	+ if (source == dumpItem)
1845	2607	{
1846	2608	DumpObject();
1847	2609	} else
1848		- if (event.getSource() == screenfitButton)
	2610	+ if (source == minButton)
1849	2611	{
1850		- //Reload(lastConverter, lastFilename, true);
	2612	+ Minimize();
	2613	+ } else
	2614	+ if (source == maxButton)
	2615	+ {
	2616	+ Maximize();
	2617	+ } else
	2618	+ if (source == fullButton)
	2619	+ {
	2620	+ ToggleFullScreen();
	2621	+ } else
	2622	+ if (source == previousVersionButton)
	2623	+ {
	2624	+ // Go to previous version
	2625	+ //if (!Undo())
	2626	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2627	+ PreviousVersion();
	2628	+ } else
	2629	+ if (source == restoreButton)
	2630	+ {
	2631	+ // Restore current version
	2632	+ Restore();
	2633	+ //restoreButton.setEnabled(false);
	2634	+ } else
	2635	+ if (source == replaceButton)
	2636	+ {
	2637	+ // Overwrite current version
	2638	+ Replace();
	2639	+ //replaceButton.setEnabled(false);
	2640	+ } else
	2641	+ if (source == nextVersionButton)
	2642	+ {
	2643	+ // Go to next version
	2644	+ NextVersion();
	2645	+ } else
	2646	+ if (source == saveVersionButton)
	2647	+ {
	2648	+ // Save a new version
	2649	+ if (!Save(true))
	2650	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2651	+ } else
	2652	+ if (source == deleteVersionButton)
	2653	+ {
	2654	+ // Delete a new version
	2655	+ DeleteVersion();
	2656	+ } else
	2657	+ if (source == oneStepButton)
	2658	+ {
	2659	+ Globals.ONESTEP = true;
	2660	+ cameraView.repaint();
	2661	+ } else
	2662	+ if (source == screenfitButton)
	2663	+ {
1851	2664	ScreenFit();
1852	2665	} else
1853		- if (event.getSource() == screenfitpointButton)
	2666	+ if (source == screenfitpointButton)
1854	2667	{
1855		- //Reload(lastConverter, lastFilename, true);
1856	2668	ScreenFitPoint();
1857	2669	} else
1858		- if (event.getSource() == snapobjectButton)
	2670	+ if (source == snapobjectButton)
1859	2671	{
1860		- //Reload(lastConverter, lastFilename, true);
1861	2672	SnapObject();
1862	2673	} else
1863	2674	// if (event.getSource() == recompileButton)
..	..	@@ -1866,13 +2677,13 @@
1866	2677	// Recompile();
1867	2678	// refreshContents();
1868	2679	// } else
1869		- if (event.getSource() == gcButton)
	2680	+ if (source == gcButton)
1870	2681	{
1871	2682	System.out.println("Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1872	2683	System.gc();
1873	2684	System.out.println("GC Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1874	2685	} else
1875		- if (event.getSource() == editLeafItem)
	2686	+ if (source == editLeafItem)
1876	2687	{
1877	2688	Object3D obj;
1878	2689	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -1886,62 +2697,74 @@
1886	2697	}
1887	2698	refreshContents(true);
1888	2699	} else
1889		- if (event.getSource() == openWindowItem)
	2700	+ if (source == openWindowItem)
1890	2701	{
1891	2702	EditSelection(true);
1892	2703	} else
1893		- if (event.getSource() == cutItem \|\| event.getSource() == clearButton)
	2704	+ if (source == cutItem \|\| source == clearButton)
1894	2705	{
1895	2706	loadClipboard(true);
1896	2707	} else
1897		- if (event.getSource() == duplicateItem)
	2708	+ if (source == undoItem)
1898	2709	{
1899		- Object3D keep = GrafreeD.clipboard;
	2710	+ PreviousVersion();
	2711	+ } else
	2712	+ if (source == redoItem)
	2713	+ {
	2714	+ NextVersion();
	2715	+ } else
	2716	+ if (source == duplicateItem)
	2717	+ {
	2718	+ Object3D keep = Grafreed.clipboard;
1900	2719	loadClipboard(false);
1901	2720	paste(false);
1902		- GrafreeD.clipboard = keep;
	2721	+ Grafreed.clipboard = keep;
1903	2722	} else
1904		- if (event.getSource() == cloneItem)
	2723	+ if (source == cloneItem)
1905	2724	{
1906	2725	CloneSelection(false);
1907	2726	} else
1908		- if (event.getSource() == cloneSupportItem)
	2727	+ if (source == cloneSupportItem)
1909	2728	{
1910	2729	CloneSelection(true);
1911	2730	} else
1912		- if (event.getSource() == copyItem)
	2731	+ if (source == copyItem)
1913	2732	{
1914	2733	loadClipboard(false);
1915	2734	} else
1916		- if (event.getSource() == pasteItem)
	2735	+ if (source == pasteItem)
1917	2736	{
1918	2737	paste(false);
1919	2738	} else
1920		- if (event.getSource() == pasteLinkItem)
	2739	+ if (source == pasteIntoItem)
1921	2740	{
1922		- pasteInto(false);
	2741	+ pasteInto(true, false);
1923	2742	} else
1924		- if (event.getSource() == pasteCloneItem)
	2743	+ if (source == pasteLinkItem)
1925	2744	{
1926		- pasteInto(true);
	2745	+ pasteInto(false, false);
1927	2746	} else
1928		- if (event.getSource() == pasteExpandItem)
	2747	+ if (source == pasteCloneItem)
	2748	+ {
	2749	+ pasteInto(true, true);
	2750	+ } else
	2751	+ if (source == pasteExpandItem)
1929	2752	{
1930	2753	paste(true);
1931	2754	} else
1932		- if (event.getSource() == synchronizeItem)
	2755	+ if (source == synchronizeItem)
1933	2756	{
1934	2757	Overwrite(Object3D.TRANSFORM);
1935	2758	} else
1936		- if (event.getSource() == overwriteNameItem)
	2759	+ if (source == overwriteNameItem)
1937	2760	{
1938	2761	Overwrite(Object3D.NAME);
1939	2762	} else
1940		- if (event.getSource() == overwriteUVItem)
	2763	+ if (source == overwriteUVItem)
1941	2764	{
1942	2765	Overwrite(Object3D.UV);
1943	2766	} else
1944		- if (event.getSource() == overwriteMatItem)
	2767	+ if (source == overwriteMatItem)
1945	2768	{
1946	2769	/* july 2015
1947	2770	if ((dropAttributes & Object3D.TEXTURE) == 0)
..	..	@@ -1961,7 +2784,7 @@
1961	2784
1962	2785	Overwrite(dropAttributes);
1963	2786	}
1964		- if (event.getSource() == overwriteGeoItem)
	2787	+ if (source == overwriteGeoItem)
1965	2788	{
1966	2789	Overwrite(Object3D.GEOMETRY);
1967	2790	// if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
..	..	@@ -1978,7 +2801,7 @@
1978	2801	// refreshContents();
1979	2802	// }
1980	2803	} else
1981		- if (event.getSource() == generateMeshItem)
	2804	+ if (source == generateMeshItem)
1982	2805	{
1983	2806	//if (group.selection.size() == 1)
1984	2807	// for (int i=0; i<group.selection.size(); i++)
..	..	@@ -1989,7 +2812,7 @@
1989	2812	ResetModel();
1990	2813	refreshContents();
1991	2814	} else
1992		- if (event.getSource() == extractGeometriesItem)
	2815	+ if (source == extractGeometriesItem)
1993	2816	{
1994	2817	boolean one = false;
1995	2818
..	..	@@ -2016,7 +2839,7 @@
2016	2839	ResetModel();
2017	2840	refreshContents();
2018	2841	} else
2019		- if (event.getSource() == cloneGeometriesItem)
	2842	+ if (source == cloneGeometriesItem)
2020	2843	{
2021	2844	boolean one = false;
2022	2845
..	..	@@ -2042,7 +2865,7 @@
2042	2865	ResetModel();
2043	2866	refreshContents();
2044	2867	} else
2045		- if (event.getSource() == shareGeometriesItem)
	2868	+ if (source == shareGeometriesItem)
2046	2869	{
2047	2870	boolean one = false;
2048	2871
..	..	@@ -2072,7 +2895,7 @@
2072	2895	refreshContents();
2073	2896	}
2074	2897	} else
2075		- if (event.getSource() == mergeGeometriesItem)
	2898	+ if (source == mergeGeometriesItem)
2076	2899	{
2077	2900	boolean one = false;
2078	2901
..	..	@@ -2102,7 +2925,7 @@
2102	2925	ResetModel();
2103	2926	refreshContents();
2104	2927	} else
2105		- if (event.getSource() == linkverticesItem)
	2928	+ if (source == linkverticesItem)
2106	2929	{
2107	2930	// if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2108	2931	// {
..	..	@@ -2115,9 +2938,9 @@
2115	2938	// group.selection.get(0).setMasterThis(content); // should be identity
2116	2939	// refreshContents();
2117	2940	// }
2118		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2941	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2119	2942	{
2120		- Object3D content = GrafreeD.clipboard.get(0);
	2943	+ Object3D content = Grafreed.clipboard.get(0);
2121	2944
2122	2945	if (content instanceof cGroup && ((cGroup)content).transientlink )
2123	2946	content = ((cGroup)content).get(0);
..	..	@@ -2125,38 +2948,38 @@
2125	2948	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2126	2949	for (int i=0; i<group.selection.size(); i++)
2127	2950	{
2128		- boolean random = CameraPane.RANDOM;
2129		- CameraPane.RANDOM = false; // parse all random nodes
	2951	+ boolean random = CameraPane.SWITCH;
	2952	+ CameraPane.SWITCH = false; // parse all random nodes
2130	2953	group.selection.get(i).linkVerticesThis(content);
2131	2954	// group.selection.get(i).setMasterThis(content); // should be identity
2132		- CameraPane.RANDOM = random;
	2955	+ CameraPane.SWITCH = random;
2133	2956	}
2134	2957	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2135	2958	refreshContents();
2136	2959	}
2137	2960	} else
2138		- if (event.getSource() == resetsupportItem)
	2961	+ if (source == resetsupportItem)
2139	2962	{
2140	2963	for (int i=0; i<group.selection.size(); i++)
2141	2964	{
2142		- boolean random = CameraPane.RANDOM;
2143		- CameraPane.RANDOM = false; // parse all random nodes
	2965	+ boolean random = CameraPane.SWITCH;
	2966	+ CameraPane.SWITCH = false; // parse all random nodes
2144	2967	group.selection.get(i).linkVerticesThis(null);
2145		- CameraPane.RANDOM = random;
	2968	+ CameraPane.SWITCH = random;
2146	2969	}
2147	2970
2148	2971	refreshContents();
2149	2972	} else
2150		- if (event.getSource() == relinkverticesItem)
	2973	+ if (source == relinkverticesItem)
2151	2974	{
2152		- boolean random = CameraPane.RANDOM;
2153		- CameraPane.RANDOM = false; // parse all random nodes
	2975	+ boolean random = CameraPane.SWITCH;
	2976	+ CameraPane.SWITCH = false; // parse all random nodes
2154	2977	group.selection.RelinkToSupport();
2155		- CameraPane.RANDOM = random;
	2978	+ CameraPane.SWITCH = random;
2156	2979
2157	2980	refreshContents();
2158	2981	} else
2159		- if (event.getSource() == resetreferencesItem)
	2982	+ if (source == resetreferencesItem)
2160	2983	{
2161	2984	for (int i=0; i<group.selection.size(); i++)
2162	2985	{
..	..	@@ -2165,11 +2988,11 @@
2165	2988
2166	2989	refreshContents();
2167	2990	} else
2168		- if (event.getSource() == setMasterItem)
	2991	+ if (source == setMasterItem)
2169	2992	{
2170		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	2993	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2171	2994	{
2172		- Object3D content = GrafreeD.clipboard.get(0);
	2995	+ Object3D content = Grafreed.clipboard.get(0);
2173	2996
2174	2997	if (content instanceof cGroup && ((cGroup)content).transientlink )
2175	2998	content = ((cGroup)content).get(0);
..	..	@@ -2178,13 +3001,13 @@
2178	3001	refreshContents();
2179	3002	}
2180	3003	} else
2181		- if (event.getSource() == poseMeshItem)
	3004	+ if (source == poseMeshItem)
2182	3005	{
2183	3006	if (group.selection.size() == 1)
2184	3007	{
2185		- if (GrafreeD.clipboard.size() == 1)
	3008	+ if (Grafreed.clipboard.size() == 1)
2186	3009	{
2187		- Object3D content = GrafreeD.clipboard.get(0);
	3010	+ Object3D content = Grafreed.clipboard.get(0);
2188	3011
2189	3012	if (content instanceof cGroup && ((cGroup)content).transientlink )
2190	3013	content = ((cGroup)content).get(0);
..	..	@@ -2197,19 +3020,19 @@
2197	3020	}
2198	3021
2199	3022	} else
2200		- if (event.getSource() == revertMeshItem)
	3023	+ if (source == revertMeshItem)
2201	3024	{
2202	3025	RevertMeshes();
2203	3026	} else
2204		- if (event.getSource() == resetMeshItem)
	3027	+ if (source == resetAllItem)
2205	3028	{
2206	3029	ResetAll();
2207	3030	} else
2208		- if (event.getSource() == stepAllItem)
	3031	+ if (source == stepAllItem)
2209	3032	{
2210	3033	StepAll();
2211	3034	} else
2212		- if (event.getSource() == clearItem) // \|\| event.getSource() == clearButton)
	3035	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2213	3036	{
2214	3037	//int indices[] = jList.getSelectedIndices();
2215	3038	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2217,46 +3040,46 @@
2217	3040
2218	3041	ClearSelection(false);
2219	3042	} else
2220		- if (event.getSource() == clearAllItem)
	3043	+ if (source == clearAllItem)
2221	3044	{
2222	3045	ClearSelection(true);
2223	3046	} else
2224		- if (event.getSource() == grabItem)
	3047	+ if (source == grabItem \|\| source == groupButton)
2225	3048	{
2226		- group(new cGroup(), true);
	3049	+ group(new cGroup(), false); // true);
2227	3050	} else
2228		- if (event.getSource() == hideItem)
	3051	+ if (source == hideItem)
2229	3052	{
2230	3053	group(new HiddenObject());
2231	3054	} else
2232		- if (event.getSource() == frontItem)
	3055	+ if (source == frontItem)
2233	3056	{
2234	3057	front();
2235	3058	} else
2236		- if (event.getSource() == backItem)
	3059	+ if (source == backItem)
2237	3060	{
2238	3061	back();
2239	3062	} else
2240		- if (event.getSource() == cameraItem)
	3063	+ if (source == cameraItem)
2241	3064	{
2242	3065	makeSomething(new Camera());
2243	3066	} else
2244		- if (event.getSource() == compositeItem)
	3067	+ if (source == compositeItem \|\| source == compositeButton)
2245	3068	{
2246	3069	group(new Composite());
2247	3070	} else
2248		- if (event.getSource() == randomItem)
	3071	+ if (source == switchItem \|\| source == switchButton)
2249	3072	{
2250	3073	RandomNode random = new RandomNode();
2251	3074	group(random);
2252	3075	if (random.size() > 0)
2253		- random.name = random.get(0).name + "Rnd";
	3076	+ random.name = random.get(0).name + "Switch";
2254	3077	} else
2255		- if (event.getSource() == physicsItem)
	3078	+ if (source == physicsItem)
2256	3079	{
2257	3080	group(new PhysicsNode());
2258	3081	} else
2259		- if (event.getSource() == frameselectorItem)
	3082	+ if (source == frameselectorItem)
2260	3083	{
2261	3084	for (int i=0; i<group.selection.size(); i++)
2262	3085	{
..	..	@@ -2268,7 +3091,7 @@
2268	3091	ResetModel();
2269	3092	refreshContents();
2270	3093	} else
2271		- if (event.getSource() == switchGeoItem)
	3094	+ if (source == switchGeoItem)
2272	3095	{
2273	3096	for (int i=0; i<group.selection.size(); i++)
2274	3097	{
..	..	@@ -2280,7 +3103,7 @@
2280	3103	ResetModel();
2281	3104	refreshContents();
2282	3105	} else
2283		- if (event.getSource() == switchTransfoItem)
	3106	+ if (source == switchTransfoItem)
2284	3107	{
2285	3108	for (int i=0; i<group.selection.size(); i++)
2286	3109	{
..	..	@@ -2292,7 +3115,7 @@
2292	3115	ResetModel();
2293	3116	refreshContents();
2294	3117	} else
2295		- if (event.getSource() == morphItem)
	3118	+ if (source == morphItem)
2296	3119	{
2297	3120	for (int i=0; i<group.selection.size(); i++)
2298	3121	{
..	..	@@ -2304,7 +3127,7 @@
2304	3127	ResetModel();
2305	3128	refreshContents();
2306	3129	} else
2307		- if (event.getSource() == scriptNodeItem)
	3130	+ if (source == scriptNodeItem)
2308	3131	{
2309	3132	boolean atleastone = false;
2310	3133
..	..	@@ -2343,215 +3166,252 @@
2343	3166	}
2344	3167	}
2345	3168	} else
2346		- if (event.getSource() == linkerItem)
	3169	+ if (source == linkerItem)
2347	3170	{
2348	3171	group(new cLinker());
2349	3172	} else
2350		- if (event.getSource() == textureItem)
	3173	+ if (source == textureItem \|\| source == textureButton)
2351	3174	{
2352	3175	group(new TextureNode());
2353	3176	} else
2354		- if (event.getSource() == billboardItem)
	3177	+ if (source == billboardItem)
2355	3178	{
2356	3179	group(new BillboardNode());
2357	3180	} else
2358		- if (event.getSource() == shadowXItem)
	3181	+ if (source == shadowXItem)
2359	3182	{
2360	3183	CastShadow(0);
2361	3184	} else
2362		- if (event.getSource() == shadowYItem)
	3185	+ if (source == shadowYItem)
2363	3186	{
2364	3187	CastShadow(1);
2365	3188	} else
2366		- if (event.getSource() == shadowZItem)
	3189	+ if (source == shadowZItem)
2367	3190	{
2368	3191	CastShadow(2);
2369	3192	} else
2370		- if (event.getSource() == ungroupItem)
	3193	+ if (source == ungroupItem \|\| source == ungroupButton)
2371	3194	{
2372		- //ungroup();
	3195	+ boolean hasRoot = false;
	3196	+
2373	3197	for (int i=0; i<group.selection.size(); i++)
2374	3198	{
2375		- Ungroup(group.selection.get(i));
	3199	+ if (group.selection.get(i) == group)
	3200	+ {
	3201	+ hasRoot = true;
	3202	+ break;
	3203	+ }
2376	3204	}
2377	3205
2378		- ClearSelection(false);
2379		-
2380		- refreshContents();
	3206	+ if (!hasRoot)
	3207	+ {
	3208	+ for (int i=0; i<group.selection.size(); i++)
	3209	+ {
	3210	+ Ungroup(group.selection.get(i));
	3211	+ }
	3212	+
	3213	+ ClearSelection(false);
	3214	+
	3215	+ refreshContents();
	3216	+ }
2381	3217	} else
2382		- if (event.getSource() == genUVItem)
	3218	+ if (source == genUVItem)
2383	3219	{
2384	3220	GenUV();
2385	3221	} else
2386		- if (event.getSource() == genNormalsCADItem)
	3222	+ if (source == genNormalsCADItem)
2387	3223	{
2388	3224	GenNormals(true);
2389	3225	} else
2390		- if (event.getSource() == genNormalsMESHItem)
	3226	+ if (source == genNormalsMESHItem)
2391	3227	{
2392		- GenNormals(true); // TODO
	3228	+ GenNormalsMESH();
2393	3229	} else
2394		- if (event.getSource() == genNormalsORGANItem)
	3230	+ if (source == genNormalsORGANItem)
2395	3231	{
2396	3232	GenNormals(false);
2397	3233	} else
2398		- if (event.getSource() == genNormalsMINEItem)
	3234	+ if (source == genNormalsMINEItem)
2399	3235	{
2400	3236	GenNormalsMINE();
2401	3237	} else
2402		- if (event.getSource() == stripifyItem)
	3238	+ if (source == stripifyItem)
2403	3239	{
2404	3240	Stripify();
2405	3241	} else
2406		- if (event.getSource() == unstripifyItem)
	3242	+ if (source == unstripifyItem)
2407	3243	{
2408	3244	Unstripify();
2409	3245	} else
2410		- if (event.getSource() == trimItem)
	3246	+ if (source == trimItem)
2411	3247	{
2412	3248	Trim();
2413	3249	} else
2414		- if (event.getSource() == untrimItem)
	3250	+ if (source == untrimItem)
2415	3251	{
2416	3252	Untrim();
2417	3253	} else
2418		- if (event.getSource() == clearColorsItem)
	3254	+ if (source == clearColorsItem)
2419	3255	{
2420	3256	ClearColors();
2421	3257	} else
2422		- if (event.getSource() == clearMaterialsItem)
	3258	+ if (source == clearMaterialsItem)
2423	3259	{
2424	3260	ClearMaterials();
2425	3261	} else
2426		- if (event.getSource() == liveleavesItem)
	3262	+ if (source == liveleavesItem)
2427	3263	{
2428	3264	LiveLeaves(true);
2429	3265	} else
2430		- if (event.getSource() == unliveleavesItem)
	3266	+ if (source == unliveleavesItem)
2431	3267	{
2432	3268	LiveLeaves(false);
2433	3269	} else
2434		- if (event.getSource() == supportleavesItem)
	3270	+ if (source == supportleavesItem)
2435	3271	{
2436	3272	SupportLeaves(true);
2437	3273	} else
2438		- if (event.getSource() == unsupportleavesItem)
	3274	+ if (source == unsupportleavesItem)
2439	3275	{
2440	3276	SupportLeaves(false);
2441	3277	} else
2442		- if (event.getSource() == hideleavesItem)
	3278	+ if (source == hideleavesItem)
2443	3279	{
2444	3280	HideLeaves(true);
2445	3281	} else
2446		- if (event.getSource() == showleavesItem)
	3282	+ if (source == showleavesItem)
2447	3283	{
2448	3284	HideLeaves(false);
2449	3285	} else
2450		- if (event.getSource() == markleavesItem)
	3286	+ if (source == markleavesItem)
2451	3287	{
2452	3288	MarkLeaves(true);
2453	3289	} else
2454		- if (event.getSource() == unmarkleavesItem)
	3290	+ if (source == unmarkleavesItem)
2455	3291	{
2456	3292	MarkLeaves(false);
2457	3293	} else
2458		- if (event.getSource() == flipVItem)
	3294	+ if (source == rewindleavesItem)
	3295	+ {
	3296	+ RewindLeaves(true);
	3297	+ } else
	3298	+ if (source == unrewindleavesItem)
	3299	+ {
	3300	+ RewindLeaves(false);
	3301	+ } else
	3302	+ if (source == randomleavesItem)
	3303	+ {
	3304	+ RandomLeaves(true);
	3305	+ } else
	3306	+ if (source == unrandomleavesItem)
	3307	+ {
	3308	+ RandomLeaves(false);
	3309	+ } else
	3310	+ if (source == flipVItem)
2459	3311	{
2460	3312	FlipV(true);
2461	3313	} else
2462		- if (event.getSource() == unflipVItem)
	3314	+ if (source == unflipVItem)
2463	3315	{
2464	3316	FlipV(false);
2465	3317	} else
2466		- if (event.getSource() == lowTexturesItem)
	3318	+ if (source == lowTexturesItem)
2467	3319	{
2468	3320	SetTexRes(0);
2469	3321	} else
2470		- if (event.getSource() == normalTexturesItem)
	3322	+ if (source == normalTexturesItem)
2471	3323	{
2472	3324	SetTexRes(1);
2473	3325	} else
2474		- if (event.getSource() == highTexturesItem)
	3326	+ if (source == highTexturesItem)
2475	3327	{
2476	3328	SetTexRes(2);
2477	3329	} else
2478		- if (event.getSource() == veryhighTexturesItem)
	3330	+ if (source == veryhighTexturesItem)
2479	3331	{
2480	3332	SetTexRes(3);
2481	3333	} else
2482		- if (event.getSource() == maxTexturesItem)
	3334	+ if (source == maxTexturesItem)
2483	3335	{
2484	3336	SetTexRes(4);
2485	3337	} else
2486		- if (event.getSource() == panoTexturesItem)
	3338	+ if (source == panoTexturesItem)
2487	3339	{
2488	3340	SetTexRes(5);
2489	3341	} else
2490		- if (event.getSource() == reverseNormalsItem)
	3342	+ if (source == reverseNormalsItem)
2491	3343	{
2492	3344	ReverseNormals();
2493	3345	} else
2494		- if (event.getSource() == parseverticesItem)
	3346	+ if (source == parseverticesItem)
2495	3347	{
2496	3348	ParseVertices();
2497	3349	} else
2498		- if (event.getSource() == textureFieldItem)
	3350	+ if (source == textureFieldItem)
2499	3351	{
2500	3352	TextureVertices();
2501	3353	} else
2502		- if (event.getSource() == alignItem)
	3354	+ if (source == alignItem)
2503	3355	{
2504	3356	Align();
2505	3357	} else
2506		- if (event.getSource() == mirrorItem)
	3358	+ if (source == mirrorItem)
2507	3359	{
2508	3360	MirrorPoses();
2509	3361	} else
2510		- if (event.getSource() == reduceMorphItem)
	3362	+ if (source == reduceMorphItem)
2511	3363	{
2512	3364	MeshReduction(false);
2513	3365	} else
2514		- if (event.getSource() == reduce34MorphItem)
	3366	+ if (source == reduce34MorphItem)
2515	3367	{
2516	3368	MeshReduction(true);
2517	3369	} else
2518		- if (event.getSource() == reverseTrianglesItem)
	3370	+ if (source == reverseTrianglesItem)
2519	3371	{
2520	3372	ReverseTriangles();
2521	3373	} else
2522		- if (event.getSource() == reduceMeshItem)
	3374	+ if (source == reduceMeshItem)
2523	3375	{
2524	3376	ReduceMesh(false);
2525	3377	} else
2526		- if (event.getSource() == reduce34MeshItem)
	3378	+ if (source == reduce34MeshItem)
2527	3379	{
2528	3380	ReduceMesh(true);
2529	3381	} else
2530		- if (event.getSource() == increaseMeshItem)
	3382	+ if (source == increaseMeshItem)
2531	3383	{
2532	3384	IncreaseMesh();
2533	3385	} else
2534		- if (event.getSource() == clipMeshItem)
	3386	+ if (source == clipMeshItem)
2535	3387	{
2536	3388	ClipMesh();
2537	3389	} else
2538		- if (event.getSource() == smoothMeshItem)
	3390	+ if (source == smoothMeshItem)
2539	3391	{
2540	3392	SmoothMesh();
2541	3393	} else
2542		- if (event.getSource() == transformgeometryItem)
	3394	+ if (source == transformGeometryItem)
2543	3395	{
2544	3396	TransformGeometry();
2545	3397	} else
2546		- if (event.getSource() == resetTransformItem)
	3398	+ if (source == transformChildrenItem)
	3399	+ {
	3400	+ TransformChildren();
	3401	+ } else
	3402	+ if (source == resetTransformItem)
2547	3403	{
2548	3404	ResetTransform();
2549	3405	} else
2550		- if (event.getSource() == resetCentroidItem)
	3406	+ if (source == resetCentroidItem)
2551	3407	{
2552		- ResetCentroid();
	3408	+ ResetCentroid(true);
2553	3409	} else
2554		- if (event.getSource() == resetParentItem)
	3410	+ if (source == resetCentroidXZItem)
	3411	+ {
	3412	+ ResetCentroid(false);
	3413	+ } else
	3414	+ if (source == resetParentItem)
2555	3415	{
2556	3416	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2557	3417	{
..	..	@@ -2561,7 +3421,7 @@
2561	3421
2562	3422	refreshContents();
2563	3423	} else
2564		- if (event.getSource() == repairParentItem)
	3424	+ if (source == repairParentItem)
2565	3425	{
2566	3426	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2567	3427	{
..	..	@@ -2575,7 +3435,7 @@
2575	3435
2576	3436	refreshContents();
2577	3437	} else
2578		- if (event.getSource() == repairShadowItem)
	3438	+ if (source == repairShadowItem)
2579	3439	{
2580	3440	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2581	3441	{
..	..	@@ -2589,7 +3449,7 @@
2589	3449
2590	3450	refreshContents();
2591	3451	} else
2592		- if (event.getSource() == sortbysizeItem)
	3452	+ if (source == sortbysizeItem)
2593	3453	{
2594	3454	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2595	3455	{
..	..	@@ -2601,7 +3461,7 @@
2601	3461	ResetModel();
2602	3462	refreshContents();
2603	3463	} else
2604		- if (event.getSource() == sortbynameItem)
	3464	+ if (source == sortbynameItem)
2605	3465	{
2606	3466	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2607	3467	{
..	..	@@ -2613,7 +3473,7 @@
2613	3473	ResetModel();
2614	3474	refreshContents();
2615	3475	} else
2616		- if (event.getSource() == attachPigmentItem)
	3476	+ if (source == attachPigmentItem)
2617	3477	{
2618	3478	String texture = GetFile("Attach pigment");
2619	3479	Object3D obj;
..	..	@@ -2625,7 +3485,7 @@
2625	3485
2626	3486	refreshContents();
2627	3487	} else
2628		- if (event.getSource() == detachPigmentItem)
	3488	+ if (source == detachPigmentItem)
2629	3489	{
2630	3490	Object3D obj;
2631	3491	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2636,7 +3496,7 @@
2636	3496
2637	3497	refreshContents();
2638	3498	} else
2639		- if (event.getSource() == attachBumpItem)
	3499	+ if (source == attachBumpItem)
2640	3500	{
2641	3501	String texture = GetFile("Attach bump");
2642	3502	Object3D obj;
..	..	@@ -2648,18 +3508,18 @@
2648	3508
2649	3509	refreshContents();
2650	3510	} else
2651		- if (event.getSource() == detachBumpItem)
	3511	+ if (source == detachBumpItem)
2652	3512	{
2653	3513	Object3D obj;
2654	3514	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2655	3515	{
2656	3516	obj = (Object3D)e.nextElement();
2657		- obj.SetBumpTexture(null);
	3517	+ obj.ResetBumpTexture();
2658	3518	}
2659	3519
2660	3520	refreshContents();
2661	3521	} else
2662		- if (event.getSource() == pigmentBumpItem)
	3522	+ if (source == pigmentBumpItem)
2663	3523	{
2664	3524	Object3D obj;
2665	3525	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2670,158 +3530,262 @@
2670	3530
2671	3531	refreshContents();
2672	3532	} else
2673		- if (event.getSource() == flashSelectionButton)
	3533	+ if (source == embedTexturesItem)
	3534	+ {
	3535	+ Object3D obj;
	3536	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3537	+ {
	3538	+ obj = (Object3D)e.nextElement();
	3539	+ obj.EmbedTextures(true);
	3540	+ }
	3541	+
	3542	+ refreshContents();
	3543	+ } else
	3544	+ if (source == deEmbedTexturesItem)
	3545	+ {
	3546	+ Object3D obj;
	3547	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3548	+ {
	3549	+ obj = (Object3D)e.nextElement();
	3550	+ obj.EmbedTextures(false);
	3551	+ }
	3552	+
	3553	+ CameraPane.texturepigment.clear();
	3554	+ CameraPane.texturebump.clear();
	3555	+
	3556	+ refreshContents();
	3557	+ } else
	3558	+ if (source == flashSelectionButton)
2674	3559	{
2675	3560	CameraPane.flash = true;
2676	3561	refreshContents();
2677	3562	} else
2678		- if (event.getSource() == oneButton)
	3563	+ if (source == oneButton)
2679	3564	{
2680	3565	} else
2681		- if (event.getSource() == twoButton)
	3566	+ if (source == twoButton)
2682	3567	{
2683	3568	radio.layout = twoButton;
	3569	+
	3570	+ if (CameraPane.FULLSCREEN)
	3571	+ fullscreenLayout = radio.layout;
	3572	+
2684	3573	// bug
2685	3574	//gridPanel.setDividerLocation(1.0);
2686	3575	//bigPanel.setDividerLocation(0.0);
2687		- bigThree.remove(scenePanel);
2688		- bigThree.remove(centralPanel);
2689		- bigThree.remove(XYZPanel);
2690		- aWindowConstraints.gridx = 0;
2691		- aWindowConstraints.gridy = 0;
2692		- aWindowConstraints.gridwidth = 1;
2693		- // aConstraints.gridheight = 3;
2694		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2695		- aWindowConstraints.weightx = 0;
2696		- aWindowConstraints.weighty = 1;
2697		- //bigThree.add(jtp, aWindowConstraints);
2698		- aWindowConstraints.weightx = 1;
2699		- aWindowConstraints.gridwidth = 3;
2700		- // aConstraints.gridheight = 3;
2701		- aWindowConstraints.gridx = 1;
2702		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2703		- bigThree.add(centralPanel, aWindowConstraints);
2704		- aWindowConstraints.weightx = 0;
2705		- aWindowConstraints.gridx = 4;
2706		- aWindowConstraints.gridwidth = 1;
2707		- // aConstraints.gridheight = 3;
2708		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2709		- //bigThree.add(XYZPanel, aWindowConstraints);
2710		- bigThree.revalidate();
	3576	+// bigThree.remove(scenePanel);
	3577	+// bigThree.remove(centralPanel);
	3578	+// bigThree.remove(XYZPanel);
	3579	+// aWindowConstraints.gridx = 0;
	3580	+// aWindowConstraints.gridy = 0;
	3581	+// aWindowConstraints.gridwidth = 1;
	3582	+// // aConstraints.gridheight = 3;
	3583	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3584	+// aWindowConstraints.weightx = 0;
	3585	+// aWindowConstraints.weighty = 1;
	3586	+// //bigThree.add(jtp, aWindowConstraints);
	3587	+// aWindowConstraints.weightx = 1;
	3588	+// aWindowConstraints.gridwidth = 3;
	3589	+// // aConstraints.gridheight = 3;
	3590	+// aWindowConstraints.gridx = 1;
	3591	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3592	+// bigThree.add(centralPanel, aWindowConstraints);
	3593	+// aWindowConstraints.weightx = 0;
	3594	+// aWindowConstraints.gridx = 4;
	3595	+// aWindowConstraints.gridwidth = 1;
	3596	+// // aConstraints.gridheight = 3;
	3597	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3598	+// //bigThree.add(XYZPanel, aWindowConstraints);
	3599	+// scenePanel.setVisible(false);
	3600	+// centralPanel.setVisible(true);
	3601	+// XYZPanel.setVisible(false);
	3602	+ bigThree.ClearUI();
	3603	+ bigThree.add(centralPanel);
	3604	+ bigThree.FlushUI();
	3605	+
	3606	+ cameraView.requestFocusInWindow();
	3607	+
	3608	+// refreshContents(true);
	3609	+//
	3610	+// try
	3611	+// {
	3612	+// java.awt.Robot bot = new java.awt.Robot();
	3613	+// int mask = InputEvent.BUTTON1_MASK;
	3614	+// bot.mouseMove(100, 100);
	3615	+// bot.mousePress(mask);
	3616	+// bot.mouseRelease(mask);
	3617	+// }
	3618	+// catch (Exception e)
	3619	+// {
	3620	+//
	3621	+// }
	3622	+
2711	3623	} else
2712		- if (event.getSource() == threeButton)
	3624	+ if (source == threeButton)
2713	3625	{
2714	3626	radio.layout = threeButton;
2715		- bigThree.remove(scenePanel);
2716		- bigThree.remove(centralPanel);
2717		- bigThree.remove(XYZPanel);
2718		- aWindowConstraints.gridx = 0;
2719		- aWindowConstraints.gridy = 0;
2720		- aWindowConstraints.gridwidth = 1;
2721		- // aConstraints.gridheight = 3;
2722		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2723		- aWindowConstraints.weightx = 0;
2724		- aWindowConstraints.weighty = 1;
2725		- //bigThree.add(jtp, aWindowConstraints);
2726		- aWindowConstraints.weightx = 1;
2727		- aWindowConstraints.gridwidth = 3;
2728		- // aConstraints.gridheight = 3;
2729		- aWindowConstraints.gridx = 1;
2730		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2731		- bigThree.add(centralPanel, aWindowConstraints);
2732		- aWindowConstraints.weightx = 0;
2733		- aWindowConstraints.gridx = 4;
2734		- aWindowConstraints.gridwidth = 1;
2735		- // aConstraints.gridheight = 3;
2736		- aConstraints.fill = GridBagConstraints.VERTICAL;
2737		- bigThree.add(XYZPanel, aWindowConstraints);
2738		- bigThree.revalidate();
	3627	+
	3628	+ if (CameraPane.FULLSCREEN)
	3629	+ fullscreenLayout = radio.layout;
	3630	+
	3631	+// bigThree.remove(scenePanel);
	3632	+// bigThree.remove(centralPanel);
	3633	+// bigThree.remove(XYZPanel);
	3634	+// aWindowConstraints.gridx = 0;
	3635	+// aWindowConstraints.gridy = 0;
	3636	+// aWindowConstraints.gridwidth = 1;
	3637	+// // aConstraints.gridheight = 3;
	3638	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3639	+// aWindowConstraints.weightx = 0;
	3640	+// aWindowConstraints.weighty = 1;
	3641	+// //bigThree.add(jtp, aWindowConstraints);
	3642	+// aWindowConstraints.weightx = 1;
	3643	+// aWindowConstraints.gridwidth = 3;
	3644	+// // aConstraints.gridheight = 3;
	3645	+// aWindowConstraints.gridx = 1;
	3646	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3647	+// bigThree.add(centralPanel, aWindowConstraints);
	3648	+// aWindowConstraints.weightx = 0;
	3649	+// aWindowConstraints.gridx = 4;
	3650	+// aWindowConstraints.gridwidth = 1;
	3651	+// // aConstraints.gridheight = 3;
	3652	+// aConstraints.fill = GridBagConstraints.VERTICAL;
	3653	+// bigThree.add(XYZPanel, aWindowConstraints);
	3654	+// bigThree.validate();
	3655	+// scenePanel.setVisible(false);
	3656	+// centralPanel.setVisible(true);
	3657	+// XYZPanel.setVisible(true);
	3658	+ bigThree.ClearUI();
	3659	+ bigThree.add(scenePanel);
	3660	+ bigThree.add(centralPanel);
	3661	+ bigThree.FlushUI();
	3662	+
	3663	+ cameraView.requestFocusInWindow();
2739	3664	} else
2740		- if (event.getSource() == fourButton)
	3665	+ if (source == fourButton)
2741	3666	{
2742	3667	radio.layout = fourButton;
2743		- bigThree.remove(scenePanel);
2744		- bigThree.remove(centralPanel);
2745		- bigThree.remove(XYZPanel);
2746		- aWindowConstraints.gridx = 0;
2747		- aWindowConstraints.gridy = 0;
2748		- aWindowConstraints.gridwidth = 1;
2749		- // aWindowConstraints.gridheight = 3;
2750		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2751		- aWindowConstraints.weightx = 1;
2752		- aWindowConstraints.weighty = 1;
2753		- bigThree.add(scenePanel, aWindowConstraints);
2754		- aWindowConstraints.weightx = 1;
2755		- aWindowConstraints.gridwidth = 3;
2756		- // aConstraints.gridheight = 3;
2757		- aWindowConstraints.gridx = 1;
2758		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2759		- //bigThree.add(cameraPanel, aWindowConstraints);
2760		- aWindowConstraints.weightx = 0;
2761		- aWindowConstraints.gridx = 4;
2762		- aWindowConstraints.gridwidth = 1;
2763		- // aWindowConstraints.gridheight = 3;
2764		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2765		- //bigThree.add(XYZPanel, aWindowConstraints);
2766		- bigThree.revalidate();
	3668	+
	3669	+ if (CameraPane.FULLSCREEN)
	3670	+ fullscreenLayout = radio.layout;
	3671	+
	3672	+// bigThree.remove(scenePanel);
	3673	+// bigThree.remove(centralPanel);
	3674	+// bigThree.remove(XYZPanel);
	3675	+// aWindowConstraints.gridx = 0;
	3676	+// aWindowConstraints.gridy = 0;
	3677	+// aWindowConstraints.gridwidth = 1;
	3678	+// // aWindowConstraints.gridheight = 3;
	3679	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3680	+// aWindowConstraints.weightx = 1;
	3681	+// aWindowConstraints.weighty = 1;
	3682	+// bigThree.add(scenePanel, aWindowConstraints);
	3683	+// aWindowConstraints.weightx = 1;
	3684	+// aWindowConstraints.gridwidth = 3;
	3685	+// // aConstraints.gridheight = 3;
	3686	+// aWindowConstraints.gridx = 1;
	3687	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3688	+// //bigThree.add(cameraPanel, aWindowConstraints);
	3689	+// aWindowConstraints.weightx = 0;
	3690	+// aWindowConstraints.gridx = 4;
	3691	+// aWindowConstraints.gridwidth = 1;
	3692	+// // aWindowConstraints.gridheight = 3;
	3693	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3694	+// //bigThree.add(XYZPanel, aWindowConstraints);
	3695	+// bigThree.validate();
	3696	+// scenePanel.setVisible(true);
	3697	+// centralPanel.setVisible(false);
	3698	+// XYZPanel.setVisible(false);
	3699	+ bigThree.ClearUI();
	3700	+ bigThree.add(scenePanel);
	3701	+ bigThree.FlushUI();
	3702	+
	3703	+ cameraView.requestFocusInWindow();
2767	3704	} else
2768		- if (event.getSource() == sixButton)
	3705	+ if (source == sixButton)
2769	3706	{
2770	3707	radio.layout = sixButton;
2771		- bigThree.remove(scenePanel);
2772		- bigThree.remove(centralPanel);
2773		- bigThree.remove(XYZPanel);
2774		- aWindowConstraints.gridx = 0;
2775		- aWindowConstraints.gridy = 0;
2776		- aWindowConstraints.gridwidth = 1;
2777		- // aConstraints.gridheight = 3;
2778		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2779		- aWindowConstraints.weightx = 0;
2780		- aWindowConstraints.weighty = 1;
2781		- bigThree.add(scenePanel, aWindowConstraints);
2782		- aWindowConstraints.weightx = 1;
2783		- aWindowConstraints.gridwidth = 3;
2784		- // aWindowConstraints.gridheight = 3;
2785		- aWindowConstraints.gridx = 1;
2786		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2787		- bigThree.add(centralPanel, aWindowConstraints);
2788		- aWindowConstraints.weightx = 0;
2789		- aWindowConstraints.gridx = 4;
2790		- aWindowConstraints.gridwidth = 1;
2791		- // aWindowConstraints.gridheight = 3;
2792		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2793		- //bigThree.add(XYZPanel, aConstraints);
2794		- bigThree.revalidate();
	3708	+
	3709	+ if (CameraPane.FULLSCREEN)
	3710	+ fullscreenLayout = radio.layout;
	3711	+
	3712	+// bigThree.remove(scenePanel);
	3713	+// bigThree.remove(centralPanel);
	3714	+// bigThree.remove(XYZPanel);
	3715	+// aWindowConstraints.gridx = 0;
	3716	+// aWindowConstraints.gridy = 0;
	3717	+// aWindowConstraints.gridwidth = 1;
	3718	+// // aConstraints.gridheight = 3;
	3719	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3720	+// aWindowConstraints.weightx = 0;
	3721	+// aWindowConstraints.weighty = 1;
	3722	+// bigThree.add(scenePanel, aWindowConstraints);
	3723	+// aWindowConstraints.weightx = 1;
	3724	+// aWindowConstraints.gridwidth = 3;
	3725	+// // aWindowConstraints.gridheight = 3;
	3726	+// aWindowConstraints.gridx = 1;
	3727	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3728	+// bigThree.add(centralPanel, aWindowConstraints);
	3729	+// aWindowConstraints.weightx = 0;
	3730	+// aWindowConstraints.gridx = 4;
	3731	+// aWindowConstraints.gridwidth = 1;
	3732	+// // aWindowConstraints.gridheight = 3;
	3733	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3734	+// //bigThree.add(XYZPanel, aConstraints);
	3735	+// bigThree.validate();
	3736	+// scenePanel.setVisible(true);
	3737	+// centralPanel.setVisible(true);
	3738	+// XYZPanel.setVisible(false);
	3739	+ bigThree.ClearUI();
	3740	+ bigThree.add(centralPanel);
	3741	+ bigThree.add(scenePanel);
	3742	+ bigThree.FlushUI();
	3743	+
	3744	+ cameraView.requestFocusInWindow();
2795	3745	} else
2796		- if (event.getSource() == sevenButton)
	3746	+ if (source == sevenButton)
2797	3747	{
2798	3748	radio.layout = sevenButton;
2799		- bigThree.remove(scenePanel);
2800		- bigThree.remove(centralPanel);
2801		- bigThree.remove(XYZPanel);
2802		- aWindowConstraints.gridx = 0;
2803		- aWindowConstraints.gridy = 0;
2804		- aWindowConstraints.gridwidth = 1;
2805		- // aWindowConstraints.gridheight = 3;
2806		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2807		- aWindowConstraints.weightx = 0;
2808		- aWindowConstraints.weighty = 1;
2809		- bigThree.add(scenePanel, aWindowConstraints);
2810		- aWindowConstraints.weightx = 1;
2811		- aWindowConstraints.gridwidth = 3;
2812		- // aWindowConstraints.gridheight = 3;
2813		- aWindowConstraints.gridx = 1;
2814		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2815		- bigThree.add(centralPanel, aWindowConstraints);
2816		- aWindowConstraints.weightx = 0;
2817		- aWindowConstraints.gridx = 4;
2818		- aWindowConstraints.gridwidth = 1;
2819		- // aConstraints.gridheight = 3;
2820		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2821		- bigThree.add(XYZPanel, aWindowConstraints);
2822		- bigThree.revalidate();
	3749	+
	3750	+ if (CameraPane.FULLSCREEN)
	3751	+ fullscreenLayout = radio.layout;
	3752	+
	3753	+// bigThree.remove(scenePanel);
	3754	+// bigThree.remove(centralPanel);
	3755	+// bigThree.remove(XYZPanel);
	3756	+// aWindowConstraints.gridx = 0;
	3757	+// aWindowConstraints.gridy = 0;
	3758	+// aWindowConstraints.gridwidth = 1;
	3759	+// // aWindowConstraints.gridheight = 3;
	3760	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3761	+// aWindowConstraints.weightx = 0;
	3762	+// aWindowConstraints.weighty = 1;
	3763	+// bigThree.add(scenePanel, aWindowConstraints);
	3764	+// aWindowConstraints.weightx = 1;
	3765	+// aWindowConstraints.gridwidth = 3;
	3766	+// // aWindowConstraints.gridheight = 3;
	3767	+// aWindowConstraints.gridx = 1;
	3768	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3769	+// bigThree.add(centralPanel, aWindowConstraints);
	3770	+// aWindowConstraints.weightx = 0;
	3771	+// aWindowConstraints.gridx = 4;
	3772	+// aWindowConstraints.gridwidth = 1;
	3773	+// // aConstraints.gridheight = 3;
	3774	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3775	+// bigThree.add(XYZPanel, aWindowConstraints);
	3776	+// bigThree.validate();
	3777	+// scenePanel.setVisible(true);
	3778	+// centralPanel.setVisible(true);
	3779	+// XYZPanel.setVisible(true);
	3780	+ bigThree.ClearUI();
	3781	+ bigThree.add(scenePanel);
	3782	+ bigThree.add(centralPanel);
	3783	+ bigThree.add(XYZPanel);
	3784	+ bigThree.FlushUI();
	3785	+
	3786	+ cameraView.requestFocusInWindow();
2823	3787	} else
2824		- if (event.getSource() == rootButton)
	3788	+ if (source == rootButton)
2825	3789	{
2826	3790	Object3D obj;
2827	3791	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2831,66 +3795,85 @@
2831	3795	EditObject(obj);
2832	3796	}
2833	3797
	3798	+ cameraView.requestFocusInWindow();
2834	3799	refreshContents(true);
2835	3800	} else
2836		- if (event.getSource() == closeButton)
	3801	+ if (source == closeButton)
2837	3802	{
2838	3803	//System.out.println("CLOSE: " + buttonGroup.getSelection());
2839	3804	cRadio ab;
2840	3805	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2841	3806	{
2842	3807	ab = (cRadio)e.nextElement();
2843		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3808	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2844	3809	{
	3810	+ // Patch to avoid bug with transparency.
	3811	+ if (!ab.hadMaterial)
	3812	+ {
	3813	+ ab.object.material = null;
	3814	+ }
	3815	+
2845	3816	buttonGroup.remove(ab);
2846	3817	radioPanel.remove(ab);
2847	3818
2848		- ab.GetObject().editWindow = null;
	3819	+ //ab.GetObject().editWindow = null;
	3820	+ ab.GetObject().manipWindow = null;
2849	3821	// ab.GetObject().objectUI = null; // ?????????
2850	3822
2851	3823	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2852	3824	break;
2853	3825	}
2854	3826	}
	3827	+
	3828	+ cameraView.requestFocusInWindow();
2855	3829	refreshContents(true);
2856	3830	} else
2857		- if (event.getSource() == editItem \|\| event.getSource() == editButton)
	3831	+ if (source == editItem \|\| source == editButton)
2858	3832	{
	3833	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3834	+ {
	3835	+ Object3D child = (Object3D)e.nextElement();
	3836	+ child.pinned = true;
	3837	+ }
	3838	+
2859	3839	EditSelection(false);
2860	3840	} else
2861		- if (event.getSource() == uneditButton)
	3841	+ if (source == uneditButton)
2862	3842	{
2863	3843	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2864	3844	{
2865	3845	Object3D child = (Object3D)e.nextElement();
2866	3846	if(child.editWindow != null)
2867		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3847	+ child.pinned = false;
2868	3848	child.CloseUI();
2869	3849	listUI.remove(child);
	3850	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2870	3851
2871		- child.editWindow = null; // ???????????
	3852	+ //child.editWindow = null; // ???????????
2872	3853	}
2873		- objEditor.ctrlPanel.revalidate();
	3854	+ objEditor.ctrlPanel.FlushUI();
2874	3855	//objEditor.jTree.clearSelection();
2875	3856	//objEditor.ResetSliders();
2876	3857	refreshContents(true);
2877	3858	} else
2878		- if (event.getSource() == clearPanelButton)
	3859	+ if (source == clearPanelButton)
2879	3860	{
2880	3861	assert(copy == group);
2881	3862	//copy.ClearUI();
2882	3863	for (Object3D obj : listUI)
2883	3864	{
	3865	+ obj.pinned = false;
2884	3866	obj.CloseUI();
2885	3867	}
2886	3868	listUI.clear();
	3869	+ SetPinStates(group.selection.size() > 0);
2887	3870	refreshContents(true);
2888	3871	} else
2889		- if (event.getSource() == allParamsButton)
	3872	+ if (source == allParamsButton)
2890	3873	{
2891	3874	assert(copy == group);
2892	3875
2893		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3876	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2894	3877
2895	3878	for (Object3D obj : listUI)
2896	3879	{
..	..	@@ -2907,19 +3890,19 @@
2907	3890
2908	3891	refreshContents(true);
2909	3892	} else
2910		- if (event.getSource() == unselectButton)
	3893	+ if (source == unselectButton)
2911	3894	{
2912	3895	objEditor.jTree.clearSelection();
2913	3896	// ?? oct 2012 GrafreeD.clipboard.clear();
2914	3897	objEditor.ResetSliders();
2915	3898	refreshContents(true);
2916	3899	} else
2917		- if(event.getSource() instanceof cRadio)
	3900	+ if(source instanceof cRadio)
2918	3901	{
2919	3902	group.parent = keepparent;
2920	3903	group.attributes = 0;
2921	3904	//group.editWindow = null;
2922		- /cRadio/ radio = (cRadio)event.getSource();
	3905	+ /cRadio/ radio = (cRadio)source;
2923	3906	Object3D obj = radio.GetObject();
2924	3907	System.out.println("Edit " + obj);
2925	3908	if (true) // obj instanceof Composite) // obj.parent == null) // obj instanceof Composite)
..	..	@@ -2939,6 +3922,9 @@
2939	3922	}
2940	3923
2941	3924	copy = group;
	3925	+
	3926	+ SetUndoStates();
	3927	+
2942	3928	//Globals.theRenderer.object = group;
2943	3929	if(!useclient)
2944	3930	{
..	..	@@ -2954,20 +3940,49 @@
2954	3940	frontView.object = group;
2955	3941	sideView.object = group;
2956	3942	}
2957		- group.editWindow = this;
	3943	+
	3944	+// fix "+" issue
	3945	+ //group.editWindow = this;
	3946	+ group.manipWindow = this;
	3947	+
2958	3948	/*
2959	3949	currentLayout = radio.layout;
2960	3950	if (currentLayout == null)
2961	3951	currentLayout = sevenButton;
2962	3952	*/
2963	3953	radio.layout.doClick();
	3954	+
	3955	+ ClearUnpinned();
	3956	+
	3957	+ //Grafreed.Assert(group != null);
	3958	+ //Grafreed.Assert(group.selection != null);
	3959	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	3960	+ if (group.selection == null \|\| group.selection.size() == 1)
	3961	+ EditSelection(false);
2964	3962	keepparent = group.parent;
2965	3963	// PARENT = NULL or not???
2966	3964	//group.parent = null; // ROOT
2967	3965	//group.attributes = -1;
2968	3966	ResetModel();
	3967	+
	3968	+ cameraView.requestFocusInWindow();
2969	3969	refreshContents(true);
2970		- }
	3970	+ } else if (event.getSource() == editCameraItem)
	3971	+ {
	3972	+ cameraView.ProtectCamera();
	3973	+ cameraView.requestFocusInWindow();
	3974	+ cameraView.repaint();
	3975	+ return;
	3976	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
	3977	+ {
	3978	+ cameraView.RevertCamera();
	3979	+ cameraView.requestFocusInWindow();
	3980	+ cameraView.repaint();
	3981	+ return;
	3982	+ // } else if (event.getSource() == textureButton)
	3983	+ // {
	3984	+ // return; // true;
	3985	+ }
2971	3986	else
2972	3987	{
2973	3988	//return super.action(event, arg);
..	..	@@ -2976,7 +3991,6 @@
2976	3991	}
2977	3992
2978	3993	boolean useclient = false;
2979		- cRadio radio;
2980	3994
2981	3995	void ToggleRoot()
2982	3996	{
..	..	@@ -3028,6 +4042,28 @@
3028	4042	refreshContents();
3029	4043	}
3030	4044
	4045	+ void TransformChildren()
	4046	+ {
	4047	+ Object3D obj;
	4048	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4049	+ {
	4050	+ obj = (Object3D)e.nextElement();
	4051	+ obj.KeepTextureMatrices();
	4052	+ obj.TransformChildren();
	4053	+ obj.RestoreTextureMatrices();
	4054	+
	4055	+// if (obj.parent == null)
	4056	+// {
	4057	+// System.out.println("NULL PARENT!");
	4058	+// new Exception().printStackTrace();
	4059	+// }
	4060	+// else
	4061	+// TouchTransform(obj);
	4062	+// //obj.parent.Touch();
	4063	+ }
	4064	+
	4065	+ refreshContents();
	4066	+ }
3031	4067
3032	4068	void ResetTransform()
3033	4069	{
..	..	@@ -3140,7 +4176,7 @@
3140	4176	refreshContents();
3141	4177	}
3142	4178
3143		- void ResetCentroid()
	4179	+ void ResetCentroid(boolean full)
3144	4180	{
3145	4181	Object3D obj;
3146	4182	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3155,12 +4191,16 @@
3155	4191	LA.matIdentity(Object3D.mat);
3156	4192	obj.getBounds(minima, maxima, false);
3157	4193	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3158		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	4194	+ if (full)
	4195	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3159	4196	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3160	4197	obj.TransformMesh(Object3D.mat);
	4198	+
3161	4199	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3162		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	4200	+ if (full)
	4201	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3163	4202	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	4203	+
3164	4204	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3165	4205	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3166	4206	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3189,7 +4229,8 @@
3189	4229
3190	4230	int size = obj.MemorySize();
3191	4231
3192		- System.err.println((size/1024) + " KB is the size of " + obj);
	4232	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	4233	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3193	4234	}
3194	4235	}
3195	4236	catch (Exception e)
..	..	@@ -3226,9 +4267,9 @@
3226	4267	obj = (Object3D)e.nextElement();
3227	4268
3228	4269	System.out.println("Object is: " + obj);
3229		- GrafreeD.AnalyzeObject(obj);
	4270	+ Grafreed.AnalyzeObject(obj);
3230	4271	System.out.println("Boundary rep: " + obj.bRep);
3231		- GrafreeD.AnalyzeObject(obj.bRep);
	4272	+ Grafreed.AnalyzeObject(obj.bRep);
3232	4273
3233	4274	// System.err.println((size/1024) + " KB is the size of " + obj);
3234	4275	}
..	..	@@ -3270,6 +4311,13 @@
3270	4311	void GenNormals(boolean crease)
3271	4312	{
3272	4313	group.GenNormalsS(crease);
	4314	+
	4315	+ refreshContents();
	4316	+ }
	4317	+
	4318	+ void GenNormalsMESH()
	4319	+ {
	4320	+ group.GenNormalsMeshS();
3273	4321
3274	4322	refreshContents();
3275	4323	}
..	..	@@ -3442,8 +4490,8 @@
3442	4490
3443	4491	void ParseVertices()
3444	4492	{
3445		- boolean epsequal = GrafreeD.epsequal;
3446		- GrafreeD.epsequal = true;
	4493	+ boolean epsequal = Grafreed.epsequal;
	4494	+ Grafreed.epsequal = true;
3447	4495
3448	4496	for (int i=0; i<group.selection.size(); i++)
3449	4497	{
..	..	@@ -3468,7 +4516,7 @@
3468	4516	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3469	4517	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3470	4518
3471		- g.add(GrafreeD.clipboard);
	4519	+ g.add(Grafreed.clipboard);
3472	4520
3473	4521	buffer.add(g);
3474	4522	}
..	..	@@ -3483,7 +4531,7 @@
3483	4531	makeSomething(buffer, i==group.selection.size()-1);
3484	4532	}
3485	4533
3486		- GrafreeD.epsequal = epsequal;
	4534	+ Grafreed.epsequal = epsequal;
3487	4535
3488	4536	refreshContents();
3489	4537	}
..	..	@@ -3501,7 +4549,16 @@
3501	4549	String pigment = Object3D.GetPigment(tex);
3502	4550	//String bump = Object3D.GetBump(tex);
3503	4551
3504		- com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4552	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	4553	+
	4554	+ try
	4555	+ {
	4556	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
	4557	+ }
	4558	+ catch (Exception e)
	4559	+ {
	4560	+ System.err.println("FAIL: " + node);
	4561	+ }
3505	4562
3506	4563	double s = v.s;
3507	4564
..	..	@@ -3589,11 +4646,11 @@
3589	4646
3590	4647	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3591	4648
3592		- boolean random = CameraPane.RANDOM;
3593		- CameraPane.RANDOM = false; // parse all random nodes
	4649	+ boolean random = CameraPane.SWITCH;
	4650	+ CameraPane.SWITCH = false; // parse all random nodes
3594	4651	lowres.linkVerticesThis(null);
3595	4652	lowres.linkVerticesThis(sn);
3596		- CameraPane.RANDOM = random;
	4653	+ CameraPane.SWITCH = random;
3597	4654
3598	4655	System.err.flush();
3599	4656
..	..	@@ -3633,7 +4690,7 @@
3633	4690	return;
3634	4691
3635	4692	Object3D poses = group.selection.get(0);
3636		- Object3D ref = GrafreeD.clipboard.get(0);
	4693	+ Object3D ref = Grafreed.clipboard.get(0);
3637	4694
3638	4695	Object3D newgroup = new Object3D("Po:" + poses.name);
3639	4696
..	..	@@ -3827,9 +4884,9 @@
3827	4884
3828	4885	void ClipMesh()
3829	4886	{
3830		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	4887	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3831	4888	{
3832		- Object3D content = GrafreeD.clipboard.get(0);
	4889	+ Object3D content = Grafreed.clipboard.get(0);
3833	4890
3834	4891	if (content instanceof cGroup && ((cGroup)content).transientlink )
3835	4892	content = ((cGroup)content).get(0);
..	..	@@ -3838,7 +4895,7 @@
3838	4895	// {
3839	4896	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3840	4897	// }
3841		- group.selection.ClipMesh(GrafreeD.clipboard);
	4898	+ group.selection.ClipMesh(Grafreed.clipboard);
3842	4899	}
3843	4900	// group.selection.ClipMesh(GrafreeD.clipboard);
3844	4901	System.out.println("DONE.");
..	..	@@ -3885,6 +4942,18 @@
3885	4942	void MarkLeaves(boolean hide)
3886	4943	{
3887	4944	group.selection.MarkLeaves(hide);
	4945	+ refreshContents();
	4946	+ }
	4947	+
	4948	+ void RewindLeaves(boolean hide)
	4949	+ {
	4950	+ group.selection.RewindLeaves(hide);
	4951	+ refreshContents();
	4952	+ }
	4953	+
	4954	+ void RandomLeaves(boolean hide)
	4955	+ {
	4956	+ group.selection.RandomLeaves(hide);
3888	4957	refreshContents();
3889	4958	}
3890	4959
..	..	@@ -3959,28 +5028,25 @@
3959	5028	// }
3960	5029	// }
3961	5030
3962		- static boolean allparams = true;
3963		-
3964		- static Vector<Object3D> listUI = new Vector<Object3D>();
3965		-
3966	5031	void EditSelection(boolean newWindow)
3967	5032	{
	5033	+ if (group.selection == null)
	5034	+ {
	5035	+ EditElement(group, newWindow); // ? new
	5036	+ return;
	5037	+ }
	5038	+
3968	5039	// aConstraints.gridy = 0;
3969	5040	for (int i=0; i<group.selection.size(); i++)
3970	5041	{
3971	5042	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
3972	5043	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
3973		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	5044	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3974	5045
3975	5046	Object3D elem = (Object3D)group.selection.elementAt(i);
3976		- if(elem != group)
	5047	+ if(elem != group \|\| !newWindow)
3977	5048	{
3978		- // if (!(elem instanceof Composite))
3979		- // newWindow = false;
3980		- listUI.add(elem);
3981		- elem.openEditWindow(this, newWindow); //, false);
3982		- System.out.println("edit : " + elem);
3983		- elem.editWindow.refreshContents(true); // ? new
	5049	+ EditElement(elem, newWindow); // ? new
3984	5050	}
3985	5051	}
3986	5052	}
..	..	@@ -4043,9 +5109,7 @@
4043	5109
4044	5110	freezemodel = false;
4045	5111	}
4046		-
4047		- boolean flashIt = true;
4048		-
	5112	+
4049	5113	public void valueChanged(TreeSelectionEvent e)
4050	5114	//public boolean handleEvent(Event event)
4051	5115	{
..	..	@@ -4055,7 +5119,8 @@
4055	5119	//new Exception().printStackTrace();
4056	5120
4057	5121	freezemodel = true;
4058		-
	5122	+ ClearUnpinned();
	5123	+
4059	5124	/**/
4060	5125	//switch (event.id)
4061	5126	{
..	..	@@ -4063,7 +5128,6 @@
4063	5128	//case 702: // Event.LIST_DESELECT
4064	5129	group.deselectAll();
4065	5130	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4066		- objEditor.ClearInfo(); // .GetMaterial());
4067	5131	if (tps != null)
4068	5132	{
4069	5133	for (int i=0; i < tps.length; i++)
..	..	@@ -4072,33 +5136,39 @@
4072	5136
4073	5137	//if (child.parent != null)
4074	5138	//child.parent.addSelectee(child);
	5139	+ objEditor.SetMaterial(child);
4075	5140	group.addSelectee(child);
4076		- objEditor.SetMaterial(child); // .GetMaterial());
4077		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4078		- System.err.println("info : " + child.GetPath());
4079	5141	}
4080	5142	}
4081		- else
4082		- {
4083		- objEditor.SetMaterial(group); // .GetMaterial());
4084		- objEditor.AddInfo(group, this, true); // .GetMaterial());
4085		- System.err.println("info : " + group.GetPath());
4086		- }
	5143	+// else
	5144	+// {
	5145	+// objEditor.SetMaterial(group); // .GetMaterial());
	5146	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	5147	+// System.err.println("info : " + group.GetPath());
	5148	+// }
4087	5149
4088		- objEditor.SetText(); // jan 2014
4089		-
4090		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	5150	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4091	5151	CameraPane.flash = true;
4092	5152
4093		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	5153	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4094	5154	// a camera
4095	5155	{
4096		- CameraPane.camerachangeframe = 0; // don't refuse it
4097		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	5156	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
	5157	+ {
	5158	+ CameraPane.camerachangeframe = 0; // don't refuse it
	5159	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	5160	+ }
4098	5161	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4099	5162	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4100	5163	}
4101	5164
	5165	+ if (tps != null && tps.length == 1)
	5166	+ {
	5167	+ EditSelection(false);
	5168	+ }
	5169	+
	5170	+ SetPinStates(tps != null && tps.length > 0);
	5171	+
4102	5172	refreshContents();
4103	5173	//return true;
4104	5174	}
..	..	@@ -4107,6 +5177,37 @@
4107	5177
4108	5178	freezemodel = false;
4109	5179	}
	5180	+
	5181	+ void SetPinStates(boolean enabled)
	5182	+ {
	5183	+ editButton.setEnabled(enabled);
	5184	+ uneditButton.setEnabled(enabled);
	5185	+ //unselectButton.setEnabled(enabled);
	5186	+ flashSelectionButton.setEnabled(enabled);
	5187	+
	5188	+ clearPanelButton.setEnabled(!listUI.isEmpty());
	5189	+ }
	5190	+
	5191	+ void refreshContents(boolean cp)
	5192	+ {
	5193	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5194	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
	5195	+ {
	5196	+ objEditor.ClearInfo(); // .GetMaterial());
	5197	+
	5198	+ for (int i=0; i < group.selection.Size(); i++)
	5199	+ {
	5200	+ Object3D child = (Object3D) group.selection.get(i);
	5201	+
	5202	+ objEditor.AddInfo(child, this, true);
	5203	+ System.err.println("info : " + child.GetPath());
	5204	+ }
	5205	+
	5206	+ objEditor.SetText(); // jan 2014
	5207	+ }
	5208	+
	5209	+ super.refreshContents(cp);
	5210	+ }
4110	5211
4111	5212	void linkSomething(Object3D thing)
4112	5213	{
..	..	@@ -4178,16 +5279,19 @@
4178	5279	{
4179	5280	if (group.selection.isEmpty())
4180	5281	return;
4181		- GrafreeD.clipboardIsTempGroup = false;
	5282	+
	5283	+ Grafreed.clipboardIsTempGroup = false;
4182	5284	Composite tGroup = null;
4183	5285	if (group.selection.size() > 0) // 1)
4184	5286	{
4185	5287	tGroup = new cGroup();
4186		- GrafreeD.clipboardIsTempGroup = true;
	5288	+ Grafreed.clipboardIsTempGroup = true;
4187	5289	}
4188	5290
4189	5291	if (cut)
4190	5292	{
	5293	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5294	+// Save();
4191	5295	//int indices[] = jList.getSelectedIndices();
4192	5296	//for (int i = indices.length - 1; i >= 0; i--)
4193	5297	//jList.remove(indices[i]);
..	..	@@ -4223,16 +5327,16 @@
4223	5327	//System.out.println("cut " + child);
4224	5328	//System.out.println("parent = " + child.parent);
4225	5329	// tmp.addChild(child);
4226		- if (GrafreeD.clipboardIsTempGroup)
	5330	+ if (Grafreed.clipboardIsTempGroup)
4227	5331	tGroup.add/Child/(tmp);
4228	5332	else
4229		- GrafreeD.clipboard = tmp;
	5333	+ Grafreed.clipboard = tmp;
4230	5334	}
4231	5335	else
4232		- if (GrafreeD.clipboardIsTempGroup)
	5336	+ if (Grafreed.clipboardIsTempGroup)
4233	5337	tGroup.add/Child/(child);
4234	5338	else
4235		- GrafreeD.clipboard = child;
	5339	+ Grafreed.clipboard = child;
4236	5340	}
4237	5341
4238	5342	//ResetModel();
..	..	@@ -4264,21 +5368,23 @@
4264	5368	//System.out.println("cut " + elem);
4265	5369	//System.out.println("parent = " + elem.parent);
4266	5370	// tmp.addChild(elem);
4267		- if (GrafreeD.clipboardIsTempGroup)
	5371	+ if (Grafreed.clipboardIsTempGroup)
4268	5372	tGroup.add/Child/(tmp);
4269	5373	else
4270		- GrafreeD.clipboard = tmp;
	5374	+ Grafreed.clipboard = tmp;
4271	5375	}
4272	5376	else
4273		- if (GrafreeD.clipboardIsTempGroup)
	5377	+ if (Grafreed.clipboardIsTempGroup)
4274	5378	tGroup.add/Child/(child);
4275	5379	else
4276		- GrafreeD.clipboard = child;
	5380	+ Grafreed.clipboard = child;
4277	5381	}
4278	5382
4279	5383	}
4280		- if (GrafreeD.clipboardIsTempGroup)
4281		- GrafreeD.clipboard = tGroup;
	5384	+
	5385	+ if (Grafreed.clipboardIsTempGroup)
	5386	+ Grafreed.clipboard = tGroup;
	5387	+
4282	5388	if (cut)
4283	5389	{
4284	5390	ResetModel();
..	..	@@ -4288,11 +5394,15 @@
4288	5394
4289	5395	void paste(boolean expand)
4290	5396	{
	5397	+ if (Globals.REPLACEONMAKE)
	5398	+ Save();
	5399	+ boolean keep = Globals.REPLACEONMAKE;
	5400	+ Globals.REPLACEONMAKE = false;
4291	5401	// if (GrafreeD.clipboard == null)
4292	5402	// return;
4293	5403	boolean first = true;
4294	5404
4295		- if (GrafreeD.clipboardIsTempGroup)
	5405	+ if (Grafreed.clipboardIsTempGroup)
4296	5406	{
4297	5407	Composite temp;
4298	5408
..	..	@@ -4303,7 +5413,7 @@
4303	5413	temp = (Composite)Applet3D.clipboard.deepCopy();
4304	5414	*/
4305	5415	Object3D elem;
4306		- for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	5416	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4307	5417	{
4308	5418	Object3D child = (Object3D)e.nextElement();
4309	5419
..	..	@@ -4337,21 +5447,22 @@
4337	5447	//Object3D cb = Applet3D.clipboard;
4338	5448	//temp.addChild(cb);
4339	5449	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4340		- assert(GrafreeD.clipboard.parent == null);
4341		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
4342		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4343		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4344		- makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
	5450	+ assert(Grafreed.clipboard.parent == null);
	5451	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	5452	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	5453	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	5454	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4345	5455	else
4346		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4347		- GrafreeD.clipboard.get(0).parent = keepparent;
	5456	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	5457	+ Grafreed.clipboard.get(0).parent = keepparent;
4348	5458	}
4349	5459
	5460	+ Globals.REPLACEONMAKE = keep;
4350	5461	ResetModel();
4351	5462	refreshContents();
4352	5463	}
4353	5464
4354		- void pasteInto(boolean copyit)
	5465	+ void pasteInto(boolean copyit, boolean clone)
4355	5466	{
4356	5467	// if (GrafreeD.clipboard == null)
4357	5468	// return;
..	..	@@ -4380,15 +5491,22 @@
4380	5491	if (copyit)
4381	5492	{
4382	5493	// paste(false);
4383		- CloneClipboard(false); // sept 2014
	5494	+ if (clone)
	5495	+ {
	5496	+ CloneClipboard(false); // sept 2014
	5497	+ }
	5498	+ else
	5499	+ {
	5500	+ paste(false);
	5501	+ }
4384	5502	}
4385	5503	else
4386	5504	{
4387	5505	boolean first = true;
4388	5506
4389		- if (GrafreeD.clipboardIsTempGroup)
	5507	+ if (Grafreed.clipboardIsTempGroup)
4390	5508	{
4391		- Composite temp = (Composite)GrafreeD.clipboard;
	5509	+ Composite temp = (Composite)Grafreed.clipboard;
4392	5510	Object3D copy;
4393	5511	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4394	5512	{
..	..	@@ -4398,7 +5516,7 @@
4398	5516	}
4399	5517	} else
4400	5518	{
4401		- linkSomething(GrafreeD.clipboard); //.get(0));
	5519	+ linkSomething(Grafreed.clipboard); //.get(0));
4402	5520	}
4403	5521	}
4404	5522	}
..	..	@@ -4475,6 +5593,10 @@
4475	5593
4476	5594	void group(Object3D csg, boolean grab)
4477	5595	{
	5596	+ if (Globals.REPLACEONMAKE)
	5597	+ Save();
	5598	+ boolean keep = Globals.REPLACEONMAKE;
	5599	+ Globals.REPLACEONMAKE = false;
4478	5600	if (//false) // why??
4479	5601	!group.selection.isEmpty())
4480	5602	{
..	..	@@ -4588,10 +5710,15 @@
4588	5710	//node.add(csg);
4589	5711	//makeSomething(node);
4590	5712	makeSomething(csg);
	5713	+ Globals.REPLACEONMAKE = keep;
4591	5714	}
4592	5715
4593	5716	void Ungroup(Object3D g)
4594	5717	{
	5718	+ if (Globals.REPLACEONMAKE)
	5719	+ Save();
	5720	+ boolean keep = Globals.REPLACEONMAKE;
	5721	+ Globals.REPLACEONMAKE = false;
4595	5722	if (g instanceof HiddenObject)
4596	5723	{
4597	5724	HiddenObject h = (HiddenObject) g;
..	..	@@ -4608,6 +5735,7 @@
4608	5735	objEditor.makeSomething(g.get(i), false);
4609	5736	}
4610	5737	}
	5738	+ Globals.REPLACEONMAKE = keep;
4611	5739	}
4612	5740
4613	5741	void ungroup()
..	..	@@ -4803,21 +5931,6 @@
4803	5931	}
4804	5932	*/
4805	5933
4806		- void ImportGFD()
4807		- {
4808		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4809		- browser.show();
4810		- String filename = browser.getFile();
4811		- if (filename != null && filename.length() > 0)
4812		- {
4813		- String fullname = browser.getDirectory() + filename;
4814		-
4815		- //Object3D readobj =
4816		- objEditor.ReadGFD(fullname, objEditor);
4817		- //makeSomething(readobj);
4818		- }
4819		- }
4820		-
4821	5934	/*
4822	5935	public void Callback(Object obj)
4823	5936	{
..	..	@@ -4841,26 +5954,9 @@
4841	5954	}
4842	5955	*/
4843	5956
4844		- void ImportVRMLX3D()
4845		- {
4846		- if (GrafreeD.standAlone)
4847		- {
4848		- /**/
4849		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4850		- browser.show();
4851		- String filename = browser.getFile();
4852		- if (filename != null && filename.length() > 0)
4853		- {
4854		- String fullname = browser.getDirectory() + filename;
4855		- LoadVRMLX3D(fullname);
4856		- }
4857		- /**/
4858		- }
4859		- }
4860		-
4861	5957	String GetFile(String dialogName)
4862	5958	{
4863		- if (GrafreeD.standAlone)
	5959	+ if (Grafreed.standAlone)
4864	5960	{
4865	5961	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4866	5962	browser.show();
..	..	@@ -4924,10 +6020,48 @@
4924	6020	cButton flashSelectionButton;
4925	6021	cButton editButton;
4926	6022	cButton uneditButton;
	6023	+ JCheckBox allParamsButton;
4927	6024	cButton clearpanelButton;
4928		- cButton allParamsButton;
4929	6025	cButton unselectButton;
4930	6026
	6027	+ cButton restoreCameraButton;
	6028	+
	6029	+ cButton oneStepButton;
	6030	+
	6031	+ cButton groupButton;
	6032	+ cButton ungroupButton;
	6033	+ cButton compositeButton;
	6034	+ cButton switchButton;
	6035	+ cButton loopButton;
	6036	+ cButton textureButton;
	6037	+
	6038	+ cButton skybox1Button;
	6039	+ cButton skybox2Button;
	6040	+ cButton skybox3Button;
	6041	+ cButton skybox4Button;
	6042	+ cButton skybox5Button;
	6043	+ cButton skybox6Button;
	6044	+ cButton skybox7Button;
	6045	+
	6046	+ cButton skybox11Button;
	6047	+ cButton skybox12Button;
	6048	+ cButton skybox13Button;
	6049	+ cButton skybox14Button;
	6050	+ cButton skybox15Button;
	6051	+ cButton skybox16Button;
	6052	+ cButton skybox17Button;
	6053	+
	6054	+ cButton gridButton;
	6055	+ cButton boxButton;
	6056	+ cButton sphereButton;
	6057	+ cButton coneButton;
	6058	+ cButton torusButton;
	6059	+ cButton superButton;
	6060	+ cButton kleinButton;
	6061	+ cButton particlesButton;
	6062	+ cButton overlayButton;
	6063	+ cButton lightButton;
	6064	+
4931	6065	cButton screenfitButton;
4932	6066	cButton screenfitpointButton;
4933	6067	cButton snapobjectButton;
..	..	@@ -4939,14 +6073,6 @@
4939	6073
4940	6074	cButton setsupportButton;
4941	6075
4942		- cButton twoButton;
4943		- cButton sixButton;
4944		- cButton threeButton;
4945		- cButton sevenButton;
4946		- cButton fourButton; // full panel
4947		- cButton oneButton; // full XYZ
4948		- //cButton currentLayout;
4949		-
4950	6076	//
4951	6077	//Composite
4952	6078	Object3D // to do !!
..	..	@@ -4956,9 +6082,11 @@
4956	6082	//JTree jTree;
4957	6083	private MenuItem lookAtItem;
4958	6084	private MenuItem lookFromItem;
4959		- private MenuItem switchItem;
	6085	+ private MenuItem switchViewItem;
4960	6086	private MenuItem cutItem;
4961		- private MenuItem duplicateItem;
	6087	+ private MenuItem undoItem;
	6088	+ private MenuItem redoItem;
	6089	+ private JMenuItem duplicateItem;
4962	6090	private MenuItem cloneItem;
4963	6091	private MenuItem cloneSupportItem;
4964	6092	private MenuItem overwriteGeoItem;
..	..	@@ -4971,7 +6099,7 @@
4971	6099	private MenuItem linkverticesItem;
4972	6100	private MenuItem relinkverticesItem;
4973	6101	private MenuItem setMasterItem;
4974		- private MenuItem resetMeshItem;
	6102	+ private MenuItem resetAllItem;
4975	6103	private MenuItem stepAllItem;
4976	6104	private MenuItem revertMeshItem;
4977	6105	private MenuItem poseMeshItem;
..	..	@@ -4982,10 +6110,11 @@
4982	6110	private MenuItem mergeGeometriesItem;
4983	6111	private MenuItem copyItem;
4984	6112	private MenuItem pasteItem;
	6113	+ private MenuItem pasteIntoItem;
4985	6114	private MenuItem pasteLinkItem;
4986	6115	private MenuItem pasteCloneItem;
4987	6116	private MenuItem pasteExpandItem;
4988		- private MenuItem clearItem;
	6117	+ private MenuItem deleteItem;
4989	6118	private MenuItem clearAllItem;
4990	6119	private MenuItem genUVItem;
4991	6120	private MenuItem genNormalsMESHItem;
..	..	@@ -5020,6 +6149,10 @@
5020	6149	private MenuItem showleavesItem;
5021	6150	private MenuItem markleavesItem;
5022	6151	private MenuItem unmarkleavesItem;
	6152	+ private MenuItem rewindleavesItem;
	6153	+ private MenuItem unrewindleavesItem;
	6154	+ private MenuItem randomleavesItem;
	6155	+ private MenuItem unrandomleavesItem;
5023	6156
5024	6157	private MenuItem flipVItem;
5025	6158	private MenuItem unflipVItem;
..	..	@@ -5031,15 +6164,17 @@
5031	6164	private MenuItem panoTexturesItem;
5032	6165
5033	6166	private MenuItem resetCentroidItem;
5034		- private MenuItem transformgeometryItem;
	6167	+ private MenuItem resetCentroidXZItem;
5035	6168	private MenuItem resetTransformItem;
	6169	+ private MenuItem transformGeometryItem;
	6170	+ private MenuItem transformChildrenItem;
5036	6171	private MenuItem hideItem;
5037	6172	private MenuItem grabItem;
5038	6173	private MenuItem backItem;
5039	6174	private MenuItem frontItem;
5040	6175	private MenuItem cameraItem;
5041	6176	private MenuItem compositeItem;
5042		- private MenuItem randomItem;
	6177	+ private MenuItem switchItem;
5043	6178	private MenuItem physicsItem;
5044	6179	private MenuItem frameselectorItem;
5045	6180	private MenuItem scriptNodeItem;
..	..	@@ -5063,6 +6198,8 @@
5063	6198	private MenuItem attachBumpItem;
5064	6199	private MenuItem detachBumpItem;
5065	6200	private MenuItem pigmentBumpItem;
	6201	+ private MenuItem embedTexturesItem;
	6202	+ private MenuItem deEmbedTexturesItem;
5066	6203
5067	6204	private MenuItem particleItem;
5068	6205	private MenuItem ragdollItem;
..	..	@@ -5079,7 +6216,7 @@
5079	6216	private MenuItem blobItem;
5080	6217	private MenuItem latheItem;
5081	6218	private MenuItem bezierItem;
5082		- private MenuItem checkerItem;
	6219	+ private MenuItem overlayItem;
5083	6220	private MenuItem meshItem;
5084	6221	// private MenuItem meshGroupItem;
5085	6222	private MenuItem springItem;
..	..	@@ -5101,11 +6238,6 @@
5101	6238	private MenuItem doubleItem;
5102	6239	private MenuItem tripleItem;
5103	6240
5104		- private MenuItem importGFDItem;
5105		- private MenuItem importVRMLX3DItem;
5106		- private MenuItem import3DSItem;
5107		- private MenuItem importOBJItem;
5108		-
5109	6241	private MenuItem computeAOItem;
5110	6242	private MenuItem recompileItem;
5111	6243	private MenuItem editScriptItem;
..	..	@@ -5115,4 +6247,8 @@
5115	6247	private MenuItem analyzeItem;
5116	6248	private MenuItem dumpItem;
5117	6249	//boolean freezemodel = false;
	6250	+
	6251	+ Menu cameraMenu;
	6252	+ MenuItem editCameraItem;
	6253	+ MenuItem restoreCameraItem;
5118	6254	}