~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -12,6 +12,7 @@
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,
..	..	@@ -22,6 +23,240 @@
22	23	DragGestureListener, DragSourceListener, DropTargetListener,
23	24	ItemListener // ListSelectionListener
24	25	{
	26	+
	27	+ public void AddSkyboxButton(String f, String s, cGridBag row)
	28	+ {
	29	+ cButton skyboxButton;
	30	+ final String path = "cubemaps/" + f + "-skyboxes/" + s;
	31	+ row.add(skyboxButton = GetButton(path + "/preview.jpg", !Grafreed.NIMBUSLAF));
	32	+ //row.add(skyboxButton = GetButton(path + "/negx.jpg", !Grafreed.NIMBUSLAF));
	33	+ skyboxButton.setToolTipText(s);
	34	+ skyboxButton.addActionListener(new ActionListener()
	35	+ {
	36	+ @Override
	37	+ public void actionPerformed(ActionEvent e)
	38	+ {
	39	+ ChangeSkybox(path);
	40	+ }
	41	+ });
	42	+ }
	43	+
	44	+ public void AddSkyboxTab0(JTabbedPane skyboxpanel)
	45	+ {
	46	+ cGridBag tab0 = new cGridBag().setVertical(true);
	47	+
	48	+ tab0.setName("Urban");
	49	+ skyboxpanel.add(tab0);
	50	+
	51	+ cGridBag row0 = new cGridBag();
	52	+ cGridBag row1 = new cGridBag();
	53	+ cGridBag row2 = new cGridBag();
	54	+ cGridBag row3 = new cGridBag();
	55	+ cGridBag row4 = new cGridBag();
	56	+ cGridBag row5 = new cGridBag();
	57	+ cGridBag row6 = new cGridBag();
	58	+
	59	+ AddSkyboxButton("default", "rgb", row0);
	60	+ //AddSkyboxButton("default", "cornell", row0);
	61	+ AddSkyboxButton("penguins", "dust", row0);
	62	+ AddSkyboxButton("penguins", "tropic", row0);
	63	+ AddSkyboxButton("default", "skycube", row0);
	64	+
	65	+ AddSkyboxButton("default", "uffizi", row1);
	66	+ AddSkyboxButton("bridge", "Bridge", row1);
	67	+ AddSkyboxButton("bridge", "Bridge2", row1);
	68	+ AddSkyboxButton("urban", "GamlaStan2", row1);
	69	+
	70	+ AddSkyboxButton("urban", "Parliament", row2);
	71	+ AddSkyboxButton("urban", "Roundabout", row2);
	72	+ AddSkyboxButton("urban", "SaintLazarusChurch", row2);
	73	+ AddSkyboxButton("urban", "SaintLazarusChurch2", row2);
	74	+
	75	+ AddSkyboxButton("urban", "SaintLazarusChurch3", row3);
	76	+ AddSkyboxButton("urban", "UnionSquare", row3);
	77	+ AddSkyboxButton("urban", "Medborgarplatsen", row3);
	78	+ AddSkyboxButton("park", "BerzeliiPark", row3);
	79	+
	80	+ AddSkyboxButton("park", "Buddha", row4);
	81	+ AddSkyboxButton("park", "CNTower2", row4);
	82	+ AddSkyboxButton("park", "NiagaraFalls1", row4);
	83	+ AddSkyboxButton("park", "NiagaraFalls3", row4);
	84	+
	85	+ AddSkyboxButton("park", "Park", row5);
	86	+ AddSkyboxButton("park", "Pond", row5);
	87	+ AddSkyboxButton("park", "Skansen", row5);
	88	+ AddSkyboxButton("park", "Skansen2", row5);
	89	+
	90	+ AddSkyboxButton("park", "Skansen3", row6);
	91	+ AddSkyboxButton("park", "Skansen4", row6);
	92	+ AddSkyboxButton("park", "Skansen5", row6);
	93	+ AddSkyboxButton("park", "Stairs", row6);
	94	+
	95	+ tab0.add(row0);
	96	+ tab0.add(row1);
	97	+ tab0.add(row2);
	98	+ tab0.add(row3);
	99	+ tab0.add(row4);
	100	+ tab0.add(row5);
	101	+ tab0.add(row6);
	102	+
	103	+ for (int i=5; --i>=0;)
	104	+ {
	105	+ //oe.toolboxPanel.Return();
	106	+ //tab0.add(new cGridBag());
	107	+ }
	108	+ }
	109	+
	110	+ public void AddSkyboxTab1(JTabbedPane skyboxpanel)
	111	+ {
	112	+ cGridBag tab0 = new cGridBag().setVertical(true);
	113	+
	114	+ tab0.setName("Nature");
	115	+ skyboxpanel.add(tab0);
	116	+
	117	+ cGridBag row0 = new cGridBag();
	118	+ cGridBag row1 = new cGridBag();
	119	+ cGridBag row2 = new cGridBag();
	120	+ cGridBag row3 = new cGridBag();
	121	+ cGridBag row4 = new cGridBag();
	122	+ cGridBag row5 = new cGridBag();
	123	+ cGridBag row6 = new cGridBag();
	124	+
	125	+ AddSkyboxButton("beach", "HeartInTheSand", row0);
	126	+ AddSkyboxButton("beach", "LarnacaBeach", row0);
	127	+ AddSkyboxButton("beach", "PalmTrees", row0);
	128	+ AddSkyboxButton("beach", "Tenerife", row0);
	129	+
	130	+ AddSkyboxButton("beach", "Tenerife2", row1);
	131	+ AddSkyboxButton("beach", "Tenerife3", row1);
	132	+ AddSkyboxButton("field", "FishPond", row1);
	133	+ AddSkyboxButton("field", "Footballfield", row1);
	134	+
	135	+ AddSkyboxButton("field", "Meadow", row2);
	136	+ AddSkyboxButton("field", "Sorsele", row2);
	137	+ AddSkyboxButton("field", "Sorsele2", row2);
	138	+ AddSkyboxButton("field", "Sorsele3", row2);
	139	+
	140	+ AddSkyboxButton("forest", "Brudslojan", row3);
	141	+ AddSkyboxButton("forest", "Langholmen2", row3);
	142	+ AddSkyboxButton("forest", "Plants", row3);
	143	+ AddSkyboxButton("mountain", "Maskonaive", row3);
	144	+
	145	+ AddSkyboxButton("mountain", "Maskonaive2", row4);
	146	+ AddSkyboxButton("mountain", "Maskonaive3", row4);
	147	+ AddSkyboxButton("mountain", "Ryfjallet", row4);
	148	+ AddSkyboxButton("mountain", "Teide", row4);
	149	+ AddSkyboxButton("park", "Tantolunden4", row4);
	150	+
	151	+ AddSkyboxButton("penguins", "wrath", row5);
	152	+ AddSkyboxButton("penguins", "yonder", row5);
	153	+ AddSkyboxButton("rocky", "Langholmen", row5);
	154	+ AddSkyboxButton("rocky", "Skinnarviksberget", row5);
	155	+ AddSkyboxButton("rocky", "Tantolunden6", row5);
	156	+
	157	+ AddSkyboxButton("default", "CloudyHills", row6);
	158	+ AddSkyboxButton("daz", "Autumn", row6);
	159	+ AddSkyboxButton("daz", "Greenlands", row6);
	160	+ AddSkyboxButton("daz", "MountainTrail", row6);
	161	+ AddSkyboxButton("daz", "Oasis", row6);
	162	+ /*
	163	+Autumn
	164	+Greenlands
	165	+MountainTrail
	166	+Oasis
	167	+TheRock
	168	+TopOfTheWorld
	169	+Winter
	170	+ */
	171	+
	172	+ tab0.add(row0);
	173	+ tab0.add(row1);
	174	+ tab0.add(row2);
	175	+ tab0.add(row3);
	176	+ tab0.add(row4);
	177	+ tab0.add(row5);
	178	+ tab0.add(row6);
	179	+
	180	+ for (int i=5; --i>=0;)
	181	+ {
	182	+ //oe.toolboxPanel.Return();
	183	+ //tab0.add(new cGridBag());
	184	+ }
	185	+ }
	186	+
	187	+ public void AddSkyboxTab2(JTabbedPane skyboxpanel)
	188	+ {
	189	+ cGridBag tab0 = new cGridBag().setVertical(true);
	190	+
	191	+ tab0.setName("Night");
	192	+ skyboxpanel.add(tab0);
	193	+
	194	+ cGridBag row0 = new cGridBag();
	195	+ cGridBag row1 = new cGridBag();
	196	+ cGridBag row2 = new cGridBag();
	197	+ cGridBag row3 = new cGridBag();
	198	+ cGridBag row4 = new cGridBag();
	199	+ cGridBag row5 = new cGridBag();
	200	+ cGridBag row6 = new cGridBag();
	201	+
	202	+ AddSkyboxButton("night", "NightPath", row0);
	203	+ AddSkyboxButton("night", "PondNight", row0);
	204	+ AddSkyboxButton("night", "Powerlines", row0);
	205	+ AddSkyboxButton("night", "SwedishRoyalCastle", row0);
	206	+
	207	+ AddSkyboxButton("urban", "CNTower", row1);
	208	+ AddSkyboxButton("bridge", "ArstaBridge", row1);
	209	+ AddSkyboxButton("rocky", "Riddarfjarden", row1);
	210	+ AddSkyboxButton("penguins", "sleepyhollow", row1);
	211	+
	212	+ AddSkyboxButton("penguins", "kenon_star", row2);
	213	+ AddSkyboxButton("indoors", "DallasW", row2);
	214	+ AddSkyboxButton("indoors", "MarriottMadisonWest", row2);
	215	+ AddSkyboxButton("indoors", "Vasa", row2);
	216	+
	217	+ AddSkyboxButton("winter", "Backyard", row3);
	218	+ AddSkyboxButton("winter", "Creek", row3);
	219	+ AddSkyboxButton("winter", "FootballField3", row3);
	220	+ AddSkyboxButton("winter", "Forest", row3);
	221	+
	222	+ AddSkyboxButton("winter", "HornstullsStrand2", row4);
	223	+ AddSkyboxButton("winter", "House", row4);
	224	+ AddSkyboxButton("winter", "IceLake", row4);
	225	+ AddSkyboxButton("winter", "IceRiver", row4);
	226	+
	227	+ AddSkyboxButton("winter", "Park3", row5);
	228	+ AddSkyboxButton("winter", "PondWinter", row5);
	229	+ AddSkyboxButton("winter", "Tantolunden5", row5);
	230	+ AddSkyboxButton("winter", "Vindelalven", row5);
	231	+
	232	+ AddSkyboxButton("daz", "TheRock", row6);
	233	+ AddSkyboxButton("daz", "TopOfTheWorld", row6);
	234	+ AddSkyboxButton("daz", "Winter", row6);
	235	+ AddSkyboxButton("penguins", "desertdawn", row6);
	236	+
	237	+ tab0.add(row0);
	238	+ tab0.add(row1);
	239	+ tab0.add(row2);
	240	+ tab0.add(row3);
	241	+ tab0.add(row4);
	242	+ tab0.add(row5);
	243	+ tab0.add(row6);
	244	+
	245	+ for (int i=5; --i>=0;)
	246	+ {
	247	+ //oe.toolboxPanel.Return();
	248	+ //tab0.add(new cGridBag());
	249	+ }
	250	+ }
	251	+
	252	+ public void ChangeSkybox(String name)
	253	+ {
	254	+ //cameraView.envyoff = false;
	255	+ group.skyboxname = name;
	256	+ group.skyboxext = "jpg";
	257	+ cameraView.repaint();
	258	+ }
	259	+
25	260	//ObjEditor objEditor;
26	261	public void closeUI2()
27	262	{
..	..	@@ -59,6 +294,12 @@
59	294	this.copy = this.group = group;
60	295	//selectees = this.group.selectees;
61	296
	297	+ if (copy.versions == null)
	298	+ {
	299	+ copy.versions = new byte[100][];
	300	+ copy.versionindex = -1;
	301	+ }
	302	+
62	303	if(ui)
63	304	SetupUI(objEditor);
64	305	}
..	..	@@ -73,16 +314,28 @@
73	314	this.copy = this.group = copy;
74	315	//selectees = this.group.selectees;
75	316
76		- SetupMenu2(objEditor);
	317	+ SetupMenu2(this); //objEditor);
77	318	SetupUI2(objEditor);
78	319	objEditor.SetupUI(true);
79	320	SetupViews(objEditor);
80	321
81	322	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
	323	+
	324	+ if (copy.versions == null)
	325	+ {
	326	+ copy.versions = new byte[100][];
	327	+ copy.versionindex = -1;
	328	+
	329	+ Save(true);
	330	+ }
82	331	}
83	332
84	333	void CloneSelection(boolean supports)
85	334	{
	335	+ if (Globals.REPLACEONMAKE)
	336	+ Save();
	337	+ boolean keep = Globals.REPLACEONMAKE;
	338	+ Globals.REPLACEONMAKE = false;
86	339	// Object3D keep = GrafreeD.clipboard;
87	340	//Object3D obj;
88	341	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -93,18 +346,19 @@
93	346
94	347	makeSomething(clone, i==group.selection.size()-1);
95	348	}
	349	+ Globals.REPLACEONMAKE = keep;
96	350	}
97	351
98	352	void CloneClipboard(boolean supports)
99	353	{
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));
	354	+ assert(Grafreed.clipboard.parent == null);
	355	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	356	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	357	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	358	+ makeSomething(CloneObject(Grafreed.clipboard.get(0), false));
105	359	else
106		- makeSomething(CloneObject(GrafreeD.clipboard, false));
107		- GrafreeD.clipboard.get(0).parent = keepparent;
	360	+ makeSomething(CloneObject(Grafreed.clipboard, false));
	361	+ Grafreed.clipboard.get(0).parent = keepparent;
108	362	}
109	363
110	364	static Object3D CloneObject(Object3D obj, boolean supports)
..	..	@@ -118,7 +372,7 @@
118	372	// obj.support = null;
119	373	if (!supports)
120	374	obj.SaveSupports();
121		- Object3D clone = (Object3D)GrafreeD.clone(obj);
	375	+ Object3D clone = (Object3D)Grafreed.clone(obj);
122	376	obj.parent = parent;
123	377	// obj.support = support;
124	378	// clone.support = support; // aout 2013
..	..	@@ -147,30 +401,29 @@
147	401
148	402	//JTextField nameField;
149	403
150		- void SetupMenu2(ObjEditor oe)
	404	+ void SetupMenu2(GroupEditor oe)
151	405	{
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);
	406	+ oe.jTree = new cTree();
	407	+
163	408	Menu menu;
164	409	oe.menuBar.add(menu = new Menu("Edit"));
165	410	//editItem = menu.add(new MenuItem("Edit"));
166	411	//editItem.addActionListener(this);
167		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	412	+
	413	+// undoItem = menu.add(new MenuItem("Undo"));
	414	+// undoItem.addActionListener(this);
	415	+// redoItem = menu.add(new MenuItem("Redo"));
	416	+// redoItem.addActionListener(this);
	417	+// menu.add("-");
	418	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
168	419	duplicateItem.addActionListener(this);
169		- menu.add("-");
170	420	cloneItem = menu.add(new MenuItem("Clone"));
171	421	cloneItem.addActionListener(this);
	422	+ if (Globals.ADVANCED)
	423	+ {
172	424	cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
173	425	cloneSupportItem.addActionListener(this);
	426	+ }
174	427	menu.add("-");
175	428	cutItem = menu.add(new MenuItem("Cut"));
176	429	cutItem.addActionListener(this);
..	..	@@ -178,27 +431,123 @@
178	431	copyItem.addActionListener(this);
179	432	pasteItem = menu.add(new MenuItem("Paste"));
180	433	pasteItem.addActionListener(this);
	434	+
	435	+ menu.add("-");
	436	+ pasteIntoItem = menu.add(new MenuItem("Paste into"));
	437	+ pasteIntoItem.addActionListener(this);
181	438	pasteLinkItem = menu.add(new MenuItem("Paste link"));
182	439	pasteLinkItem.addActionListener(this);
183	440	pasteCloneItem = menu.add(new MenuItem("Paste clone"));
184	441	pasteCloneItem.addActionListener(this);
185	442	// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
186	443	// pasteExpandItem.addActionListener(this);
187		- clearItem = menu.add(new MenuItem("Clear"));
188		- clearItem.addActionListener(this);
	444	+ menu.add("-");
	445	+ deleteItem = menu.add(new MenuItem("Delete"));
	446	+ deleteItem.addActionListener(this);
	447	+
	448	+ if (Globals.ADVANCED)
	449	+ {
	450	+ // Deletes the cameras...
189	451	clearAllItem = menu.add(new MenuItem("Clear All"));
190	452	clearAllItem.addActionListener(this);
	453	+ }
	454	+
	455	+ menuBar.add(cameraMenu = new Menu("View"));
	456	+ //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
	457	+ //zBufferItem.addActionListener(this);
	458	+ //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
	459	+ //normalLensItem.addActionListener(this);
	460	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	461	+ restoreCameraItem.addActionListener(this);
	462	+
	463	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	464	+// toggleFullScreenItem.addItemListener(this);
	465	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	466	+// cameraMenu.add("-");
	467	+//
	468	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	469	+// toggleTextureItem.addItemListener(this);
	470	+// toggleTextureItem.setState(CameraPane.textureon);
	471	+//
	472	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	473	+// toggleSwitchItem.addItemListener(this);
	474	+// toggleSwitchItem.setState(CameraPane.SWITCH);
	475	+
	476	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
	477	+ toggleHandleItem.addItemListener(this);
	478	+ toggleHandleItem.setState(CameraPane.HANDLES);
	479	+
	480	+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
	481	+ togglePaintItem.addItemListener(this);
	482	+ togglePaintItem.setState(CameraPane.PAINTMODE);
	483	+
	484	+ if (Globals.ADVANCED)
	485	+ {
	486	+ cameraMenu.add("-");
	487	+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
	488	+ toggleLiveItem.addItemListener(this);
	489	+ toggleLiveItem.setState(Globals.isLIVE());
191	490
	491	+ cameraMenu.add(stepItem = new MenuItem("Step"));
	492	+ stepItem.addActionListener(this);
	493	+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
	494	+ // toggleDLItem.addItemListener(this);
	495	+ // toggleDLItem.setState(false);
	496	+
	497	+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
	498	+ toggleRenderItem.addItemListener(this);
	499	+ toggleRenderItem.setState(!CameraPane.frozen);
	500	+
	501	+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
	502	+ toggleDebugItem.addItemListener(this);
	503	+ toggleDebugItem.setState(Globals.DEBUG);
	504	+
	505	+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
	506	+ toggleFrustumItem.addItemListener(this);
	507	+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
	508	+
	509	+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
	510	+ toggleFootContactItem.addItemListener(this);
	511	+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
	512	+
	513	+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
	514	+ toggleTimelineItem.addItemListener(this);
	515	+ }
	516	+
	517	+// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
	518	+// toggleRootItem.addItemListener(this);
	519	+// toggleRootItem.setState(false);
	520	+// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
	521	+// animationItem.addItemListener(this);
	522	+// animationItem.setState(CameraPane.ANIMATION);
	523	+ cameraMenu.add("-");
	524	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
	525	+ editCameraItem.addActionListener(this);
	526	+
	527	+ if (Globals.ADVANCED)
	528	+ {
	529	+ oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
	530	+ //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
	531	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
	532	+ editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
	533	+ oe.cameraMenu.add("-");
	534	+ openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
	535	+ openWindowItem.addActionListener(this);
	536	+ editLeafItem.addActionListener(this);
	537	+ lookAtItem.addActionListener(this);
	538	+ //lookFromItem.addActinoListener(this);
	539	+ //switchViewItem.addActionListener(this);
	540	+ }
	541	+
192	542	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);
	543	+ if (Globals.ADVANCED)
	544	+ {
197	545	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
198	546	revertMeshItem.addActionListener(this);
199	547	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
200	548	resetreferencesItem.addActionListener(this);
201	549	menu.add("-");
	550	+ }
202	551	overwriteGeoItem = menu.add(new MenuItem("Overwrite Geometry"));
203	552	overwriteGeoItem.addActionListener(this);
204	553	overwriteMatItem = menu.add(new MenuItem("Overwrite Material"));
..	..	@@ -210,73 +559,104 @@
210	559	overwriteUVItem = menu.add(new MenuItem("Overwrite UV"));
211	560	overwriteUVItem.addActionListener(this);
212	561	menu.add("-");
	562	+ if (Globals.ADVANCED)
	563	+ {
213	564	generateMeshItem = menu.add(new MenuItem("Generate Meshes"));
214	565	generateMeshItem.addActionListener(this);
215	566	poseMeshItem = menu.add(new MenuItem("Set Pose Meshes"));
216	567	poseMeshItem.addActionListener(this);
217	568	menu.add("-");
	569	+ }
218	570	resetsupportItem = menu.add(new MenuItem("Reset support"));
219	571	resetsupportItem.addActionListener(this);
220	572	linkverticesItem = menu.add(new MenuItem("Link to Support"));
221	573	linkverticesItem.addActionListener(this);
	574	+ relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
	575	+ relinkverticesItem.addActionListener(this);
	576	+
	577	+ if (Globals.ADVANCED)
	578	+ {
222	579	setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
223	580	setMasterItem.addActionListener(this);
	581	+ }
224	582
225	583	oe.menuBar.add(menu = new Menu("Group"));
226		- grabItem = menu.add(new MenuItem("Grab"));
227		- grabItem.addActionListener(this);
	584	+// grabItem = menu.add(new MenuItem("Grab"));
	585	+// grabItem.addActionListener(this);
228	586	backItem = menu.add(new MenuItem("Back"));
229	587	backItem.addActionListener(this);
230	588	frontItem = menu.add(new MenuItem("Front"));
231	589	frontItem.addActionListener(this);
232		- compositeItem = menu.add(new MenuItem("Composite"));
233		- compositeItem.addActionListener(this);
234		- menu.add("-");
235		- randomItem = menu.add(new MenuItem("Random"));
236		- randomItem.addActionListener(this);
237		- physicsItem = menu.add(new MenuItem("Physics"));
238		- physicsItem.addActionListener(this);
239		- frameselectorItem = menu.add(new MenuItem("Frame Selector"));
240		- frameselectorItem.addActionListener(this);
	590	+// compositeItem = menu.add(new MenuItem("Composite"));
	591	+// compositeItem.addActionListener(this);
	592	+
	593	+ if (Globals.ADVANCED)
	594	+ {
	595	+ hideItem = menu.add(new MenuItem("Hidden Group"));
	596	+ hideItem.addActionListener(this);
	597	+ }
	598	+ ungroupItem = menu.add(new MenuItem("Ungroup"));
	599	+ ungroupItem.addActionListener(this);
	600	+
	601	+// menu.add("-");
	602	+//
	603	+// switchItem = menu.add(new MenuItem("Switch node"));
	604	+// switchItem.addActionListener(this);
	605	+ if (Globals.ADVANCED)
	606	+ {
241	607	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
242	608	switchGeoItem.addActionListener(this);
243	609	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
244	610	switchTransfoItem.addActionListener(this);
245		- morphItem = menu.add(new MenuItem("Morph"));
	611	+ morphItem = menu.add(new MenuItem("Morph Group"));
246	612	morphItem.addActionListener(this);
	613	+
	614	+ menu.add("-");
	615	+ physicsItem = menu.add(new MenuItem("Physics"));
	616	+ physicsItem.addActionListener(this);
	617	+ frameselectorItem = menu.add(new MenuItem("Frame Selector"));
	618	+ frameselectorItem.addActionListener(this);
247	619	scriptNodeItem = menu.add(new MenuItem("Script Node"));
248	620	scriptNodeItem.addActionListener(this);
249		- cameraItem = menu.add(new MenuItem("Camera"));
250		- cameraItem.addActionListener(this);
	621	+ }
251	622
252	623	oe.menuBar.add(menu = new Menu("Object"));
253		- textureItem = menu.add(new MenuItem("Texture"));
254		- textureItem.addActionListener(this);
	624	+// textureItem = menu.add(new MenuItem("Texture"));
	625	+// textureItem.addActionListener(this);
	626	+ billboardItem = menu.add(new MenuItem("Billboard"));
	627	+ billboardItem.addActionListener(this);
255	628	csgItem = menu.add(new MenuItem("CSG"));
256	629	csgItem.addActionListener(this);
257		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	630	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
258	631	shadowXItem.addActionListener(this);
259		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	632	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
260	633	shadowYItem.addActionListener(this);
261		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	634	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
262	635	shadowZItem.addActionListener(this);
	636	+ attributeItem = menu.add(new MenuItem("Attribute"));
	637	+ attributeItem.addActionListener(this);
	638	+
	639	+ if (Globals.ADVANCED)
	640	+ {
	641	+ menu.add("-");
263	642	linkerItem = menu.add(new MenuItem("Linker"));
264	643	linkerItem.addActionListener(this);
265	644	templateItem = menu.add(new MenuItem("Template"));
266	645	templateItem.addActionListener(this);
267		- attributeItem = menu.add(new MenuItem("Attribute"));
268		- attributeItem.addActionListener(this);
269	646	pointflowItem = menu.add(new MenuItem("Point Flow"));
270	647	pointflowItem.addActionListener(this);
	648	+ }
271	649	menu.add("-");
272		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
273		- transformgeometryItem.addActionListener(this);
274	650	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
275	651	resetTransformItem.addActionListener(this);
276	652	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
277	653	resetCentroidItem.addActionListener(this);
278		- ungroupItem = menu.add(new MenuItem("Ungroup"));
279		- ungroupItem.addActionListener(this);
	654	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	655	+ resetCentroidXZItem.addActionListener(this);
	656	+ transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
	657	+ transformGeometryItem.addActionListener(this);
	658	+ transformChildrenItem = menu.add(new MenuItem("Transform Children"));
	659	+ transformChildrenItem.addActionListener(this);
280	660
281	661	oe.menuBar.add(menu = new Menu("Geometry"));
282	662	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -287,6 +667,11 @@
287	667	genNormalsCADItem.addActionListener(this);
288	668	genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
289	669	genNormalsMESHItem.addActionListener(this);
	670	+ if (Globals.ADVANCED)
	671	+ {
	672	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
	673	+ genNormalsMINEItem.addActionListener(this);
	674	+ }
290	675	stripifyItem = menu.add(new MenuItem("Stripify"));
291	676	stripifyItem.addActionListener(this);
292	677	unstripifyItem = menu.add(new MenuItem("Unstripify"));
..	..	@@ -308,23 +693,34 @@
308	693	reduce34MeshItem.addActionListener(this);
309	694	increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
310	695	increaseMeshItem.addActionListener(this);
311		- smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
312		- smoothMeshItem.addActionListener(this);
313	696	clipMeshItem = menu.add(new MenuItem("Clip mesh"));
314	697	clipMeshItem.addActionListener(this);
	698	+
	699	+ if (Globals.ADVANCED)
	700	+ {
	701	+ smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
	702	+ smoothMeshItem.addActionListener(this);
	703	+ }
315	704
316	705	oe.menuBar.add(menu = new Menu("Attributes"));
317	706	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
318	707	clearMaterialsItem.addActionListener(this);
	708	+ resetAllItem = menu.add(new MenuItem("Reset All"));
	709	+ resetAllItem.addActionListener(this);
	710	+ stepAllItem = menu.add(new MenuItem("Step All"));
	711	+ stepAllItem.addActionListener(this);
319	712	menu.add("-");
320	713	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
321	714	liveleavesItem.addActionListener(this);
322	715	unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
323	716	unliveleavesItem.addActionListener(this);
	717	+ if (Globals.ADVANCED)
	718	+ {
324	719	supportleavesItem = menu.add(new MenuItem("Support Leaves"));
325	720	supportleavesItem.addActionListener(this);
326	721	unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
327	722	unsupportleavesItem.addActionListener(this);
	723	+ }
328	724	hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
329	725	hideleavesItem.addActionListener(this);
330	726	showleavesItem = menu.add(new MenuItem("Show Leaves"));
..	..	@@ -333,6 +729,14 @@
333	729	markleavesItem.addActionListener(this);
334	730	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
335	731	unmarkleavesItem.addActionListener(this);
	732	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	733	+ rewindleavesItem.addActionListener(this);
	734	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	735	+ unrewindleavesItem.addActionListener(this);
	736	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	737	+ randomleavesItem.addActionListener(this);
	738	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	739	+ unrandomleavesItem.addActionListener(this);
336	740	menu.add("-");
337	741	flipVItem = menu.add(new MenuItem("Flip V"));
338	742	flipVItem.addActionListener(this);
..	..	@@ -358,45 +762,56 @@
358	762	attachBumpItem.addActionListener(this);
359	763	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
360	764	pigmentBumpItem.addActionListener(this);
	765	+ //embedTexturesItem
361	766	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
362	767	detachPigmentItem.addActionListener(this);
363	768	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
364	769	detachBumpItem.addActionListener(this);
	770	+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
	771	+ embedTexturesItem.addActionListener(this);
	772	+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
	773	+ deEmbedTexturesItem.addActionListener(this);
365	774	menu.add("-");
366	775	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
367	776	sortbysizeItem.addActionListener(this);
368	777	sortbynameItem = menu.add(new MenuItem("Sort by name"));
369	778	sortbynameItem.addActionListener(this);
370	779	menu.add("-");
	780	+ shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
	781	+ shareGeometriesItem.addActionListener(this);
	782	+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
	783	+ mergeGeometriesItem.addActionListener(this);
	784	+ if (Globals.ADVANCED)
	785	+ {
	786	+ // Pretty much the same as duplicate and clone.
371	787	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
372	788	extractGeometriesItem.addActionListener(this);
373	789	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
374	790	cloneGeometriesItem.addActionListener(this);
375		- shareGeometriesItem = menu.add(new MenuItem("Share Geometry"));
376		- shareGeometriesItem.addActionListener(this);
377		- mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
378		- mergeGeometriesItem.addActionListener(this);
	791	+ }
379	792
380	793	oe.menuBar.add(menu = new Menu("Insert"));
381	794	buildCreateMenu(menu);
382	795
383		-
384		- oe.menuBar.add(menu = new Menu("Include"));
385		- importGFDItem = menu.add(new MenuItem("GrafreeD Object..."));
386		- importGFDItem.addActionListener(this);
387		- importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D Object..."));
388		- importVRMLX3DItem.addActionListener(this);
389		- importOBJItem = menu.add(new MenuItem("OBJ Object..."));
390		- importOBJItem.addActionListener(this);
391		- import3DSItem = menu.add(new MenuItem("3DS Object..."));
392		- import3DSItem.addActionListener(this);
393		-
394	796	oe.menuBar.add(menu = new Menu("Tools"));
395	797	buildToolsMenu(menu);
396	798	}
397	799
	800	+
398	801	void SetupUI2(ObjEditor oe)
399	802	{
	803	+ // June 2019
	804	+ if (oe == null)
	805	+ {
	806	+ //super.SetupUI2(this);
	807	+ //return;
	808	+ }
	809	+
	810	+ if (copy != group)
	811	+ {
	812	+ //super.SetupUI2(this);
	813	+ }
	814	+
400	815	//new Exception().printStackTrace();
401	816
402	817	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -425,150 +840,238 @@
425	840	oe.radioPanel.add(dummyButton);
426	841	oe.buttonGroup.add(dummyButton);
427	842	*/
428		- aConstraints.gridy += 1;
429		- oe.aConstraints.gridwidth = 1;
430		- oe.aConstraints.gridx = 0;
	843	+ cGridBag copyOptionsPanel = new cGridBag();
	844	+
	845	+ copyOptionsPanel.preferredHeight = 2;
431	846
432		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", CameraPane.isLIVE()), oe.aConstraints);
	847	+ //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
	848	+
	849	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	850	+ //minButton.setToolTipText("Minimize window");
	851	+ //minButton.addActionListener(this);
	852	+
	853	+ if (Globals.ADVANCED)
	854	+ {
	855	+ oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	856	+ maxButton.setToolTipText("Maximize window");
	857	+ maxButton.addActionListener(this);
	858	+ }
	859	+
	860	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	861	+ fullButton.setToolTipText("Full-screen window");
	862	+ fullButton.addActionListener(this);
	863	+
	864	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	865	+ screenfitButton.setToolTipText("Screen fit");
	866	+ screenfitButton.addActionListener(this);
	867	+
	868	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	869	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	870	+ restoreCameraButton.addActionListener(this);
	871	+
	872	+ copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	873	+ saveButton.setToolTipText("New version");
	874	+ saveButton.addActionListener(this);
	875	+
	876	+ copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	877	+ undoButton.setToolTipText("Previous version");
	878	+ undoButton.addActionListener(this);
	879	+ undoButton.setEnabled(false);
	880	+
	881	+ cGridBag updown = new cGridBag().setVertical(true);
	882	+ updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	883	+ restoreButton.setToolTipText("Restore current");
	884	+ restoreButton.addActionListener(this);
	885	+ restoreButton.setEnabled(false);
	886	+
	887	+ updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	888	+ replaceButton.setToolTipText("Replace current");
	889	+ replaceButton.addActionListener(this);
	890	+ replaceButton.setEnabled(false);
	891	+
	892	+ copyOptionsPanel.add(updown);
	893	+
	894	+ copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	895	+ redoButton.setToolTipText("Next version");
	896	+ redoButton.addActionListener(this);
	897	+ redoButton.setEnabled(false);
	898	+
	899	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	900	+ liveCB.setToolTipText("Enable animation");
433	901	liveCB.addItemListener(this);
434	902
435		- oe.aConstraints.gridx += 1;
436		- oe.toolbarPanel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT), oe.aConstraints);
437		- supportCB.addItemListener(this);
438		-
439		- // oe.aConstraints.gridx += 1;
440		- // oe.toolbarPanel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), oe.aConstraints);
441		- // localCB.addItemListener(this);
442		-
443		- oe.aConstraints.gridx += 1;
444		- oe.toolbarPanel.add(crowdCB = new cCheckBox("Crowd", CameraPane.CROWD), oe.aConstraints);
445		- crowdCB.addItemListener(this);
446		-
447		- oe.aConstraints.gridx += 1;
448		- oe.toolbarPanel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA), oe.aConstraints);
449		- smoothCB.addItemListener(this);
450		-
451		- oe.aConstraints.gridx += 1;
452		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST), oe.aConstraints);
	903	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	904	+ oneStepButton.setToolTipText("Animate one step forward");
	905	+ oneStepButton.addActionListener(this);
	906	+
	907	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
	908	+ fastCB.setToolTipText("Fast mode");
453	909	fastCB.addItemListener(this);
454		- oe.aConstraints.gridx += 1;
455		- oe.toolbarPanel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE), oe.aConstraints);
456		- slowCB.addItemListener(this);
457		- oe.aConstraints.gridx += 1;
458		- oe.toolbarPanel.add(boxCB = new cCheckBox("Box", CameraPane.FAST), oe.aConstraints);
459		- boxCB.addItemListener(this);
	910	+
	911	+ //oe.toolboxPanel.Return();
	912	+
	913	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	914	+// trackCB.setToolTipText("Enable tracking");
	915	+// trackCB.addItemListener(this);
460	916
461		-// oe.aConstraints.gridx += 1;
462		-// oe.toolbarPanel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), oe.aConstraints);
463		-// speakerMocapCB.addItemListener(this);
464		-
465		- if (false)
466		- {
467		- // handled in scripts
468		- oe.aConstraints.gridx += 1;
469		- oe.toolbarPanel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA), oe.aConstraints);
470		- speakerCameraCB.addItemListener(this);
471		-
472		- oe.aConstraints.gridx += 1;
473		- oe.toolbarPanel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS), oe.aConstraints);
474		- speakerFocusCB.addItemListener(this);
475		-
476		- oe.aConstraints.gridx += 1;
477		- oe.toolbarPanel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS), oe.aConstraints);
478		- smoothfocusCB.addItemListener(this);
479		- }
480		-
481		-//oe.aConstraints.gridx += 1;
482		-//oe.toolbarPanel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), oe.aConstraints);
483		-// debugCB.addItemListener(this);
484		-
485		- oe.aConstraints.gridx += 1;
486		- oe.toolbarPanel.add(oeilCB = new cCheckBox("O", CameraPane.OEIL), oe.aConstraints);
487		- oeilCB.addItemListener(this);
488		-
489		- oe.aConstraints.gridx += 1;
490		- oe.toolbarPanel.add(lookAtCB = new cCheckBox("T", CameraPane.LOOKAT), oe.aConstraints);
491		- lookAtCB.addItemListener(this);
492		-
493		- oe.aConstraints.gridx += 1;
494		- oe.toolbarPanel.add(trackCB = new cCheckBox(":", CameraPane.TRACK), oe.aConstraints);
495		- trackCB.addItemListener(this);
496		-
497		- oe.aConstraints.gridx += 1;
498		- oe.toolbarPanel.add(screenfitButton = new cButton("@ ")); //, oe.aConstraints);
499		- screenfitButton.addActionListener(this);
500		- oe.aConstraints.gridx += 1;
501	917	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
502	918	// screenfitpointButton.addActionListener(this);
503		-// oe.aConstraints.gridx += 1;
504		- oe.toolbarPanel.add(snapobjectButton = new cButton(" O+ ")); //, oe.aConstraints);
505		- snapobjectButton.addActionListener(this);
506		- oe.aConstraints.gridx += 1;
507	919
508		- //aConstraints.gridx = 0;
509		- //aConstraints.gridy += 1;
510		- oe.aConstraints.weighty = 0;
511		- oe.aConstraints.gridwidth = 1;
512		-
513		- oe.toolbarPanel.add(flashSelectionButton = new cButton(" ? ")); //, oe.aConstraints);
514		- flashSelectionButton.addActionListener(this);
515		- oe.aConstraints.gridx += 1;
516		- oe.aConstraints.weighty = 0;
517		- oe.aConstraints.gridwidth = 1;
518		-
519		- //
520		- oe.toolbarPanel.add(twoButton = new cButton(" \|+\| ")); //, oe.aConstraints);
521		- twoButton.addActionListener(this);
522		- oe.toolbarPanel.add(fourButton = new cButton("+\|\| ")); //, oe.aConstraints);
	920	+ if (Globals.ADVANCED)
	921	+ {
	922	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	923	+ snapobjectButton.addActionListener(this);
	924	+ snapobjectButton.setToolTipText("Snap Object");
	925	+
	926	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
523	927	fourButton.addActionListener(this);
524		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\| ")); //, oe.aConstraints);
525		- sixButton.addActionListener(this);
526		- oe.toolbarPanel.add(threeButton = new cButton(" \|+\|+")); //, oe.aConstraints);
	928	+ fourButton.setToolTipText("Show control panel only");
	929	+ }
	930	+
	931	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
	932	+
	933	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	934	+ twoButton.setToolTipText("Show 3D view only");
	935	+ twoButton.addActionListener(this);
	936	+ this.fullscreenLayout = twoButton;
	937	+
	938	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	939	+ threeButton.setToolTipText("Show controls and 3D view");
527	940	threeButton.addActionListener(this);
528		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+")); //, oe.aConstraints);
529		- sevenButton.addActionListener(this);
	941	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	942	+ sixButton.setToolTipText("Show 3D view and controls");
	943	+ sixButton.addActionListener(this);
	944	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	945	+// sevenButton.setToolTipText("3-column layout");
	946	+// sevenButton.addActionListener(this);
530	947	//
531	948
532		- oe.toolbarPanel.add(rootButton = new cButton(" o o o E ")); //, oe.aConstraints);
	949	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	950	+ rootButton.setToolTipText("Open selection in new tab");
533	951	rootButton.addActionListener(this);
534		- oe.aConstraints.gridx += 1;
535		- oe.toolbarPanel.add(closeButton = new cButton(" X ")); //, oe.aConstraints);
	952	+
	953	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	954	+ closeButton.setToolTipText("Close tab");
536	955	closeButton.addActionListener(this);
537	956	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
538	957	//clearButton.addActionListener(this);
539		- oe.aConstraints.gridx += 1;
540		-
541		- oe.aConstraints.gridx = 1; //
542		- oe.treePanel.add(editButton = new cButton("+"), oe.aConstraints);
543		- editButton.addActionListener(this);
544		- oe.aConstraints.gridx += 1;
545		- oe.aConstraints.weighty = 0;
546		- oe.aConstraints.gridwidth = 1;
547	958
548		- oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
	959	+ cGridBag row1 = new cGridBag();
	960	+
	961	+ // INSERT
	962	+ row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	963	+ gridButton.setToolTipText("Create grid");
	964	+ gridButton.addActionListener(this);
	965	+
	966	+ row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	967	+ boxButton.setToolTipText("Create box");
	968	+ boxButton.addActionListener(this);
	969	+
	970	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	971	+ sphereButton.setToolTipText("Create sphere");
	972	+ sphereButton.addActionListener(this);
	973	+
	974	+ row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	975	+ coneButton.setToolTipText("Create cone");
	976	+ coneButton.addActionListener(this);
	977	+
	978	+ row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	979	+ torusButton.setToolTipText("Create torus");
	980	+ torusButton.addActionListener(this);
	981	+
	982	+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	983	+ superButton.setToolTipText("Create superellipsoid");
	984	+ superButton.addActionListener(this);
	985	+
	986	+ if (Globals.ADVANCED)
	987	+ {
	988	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	989	+ kleinButton.setToolTipText("Create Klein bottle");
	990	+ kleinButton.addActionListener(this);
	991	+ }
	992	+
	993	+ row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	994	+ particlesButton.setToolTipText("Create particle system");
	995	+ particlesButton.addActionListener(this);
	996	+
	997	+ oe.toolboxPanel.add(row1);
	998	+
	999	+ cGridBag row2 = new cGridBag();
	1000	+
	1001	+ row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1002	+ groupButton.setToolTipText("Create group");
	1003	+ groupButton.addActionListener(this);
	1004	+
	1005	+ row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1006	+ compositeButton.setToolTipText("Create composite");
	1007	+ compositeButton.addActionListener(this);
	1008	+
	1009	+ row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1010	+ switchButton.setToolTipText("Create item switcher");
	1011	+ switchButton.addActionListener(this);
	1012	+
	1013	+ row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1014	+ loopButton.setToolTipText("Create loop");
	1015	+ loopButton.addActionListener(this);
	1016	+
	1017	+ row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1018	+ textureButton.setToolTipText("Create texture");
	1019	+ textureButton.addActionListener(this);
	1020	+
	1021	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1022	+ overlayButton.setToolTipText("Create overlay");
	1023	+ overlayButton.addActionListener(this);
	1024	+
	1025	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1026	+ lightButton.setToolTipText("Create light");
	1027	+ lightButton.addActionListener(this);
	1028	+
	1029	+ oe.toolboxPanel.add(row2);
	1030	+
	1031	+ // ENVYMAPS
	1032	+ cGridBag skyboxpane = new cGridBag();
	1033	+ skyboxpane.preferredHeight = 100;
	1034	+
	1035	+ oe.toolboxPanel.add(skyboxpane);
	1036	+
	1037	+ JTabbedPane skyboxpanel = new JTabbedPane();
	1038	+ skyboxpane.add(skyboxpanel);
	1039	+
	1040	+ AddSkyboxTab0(skyboxpanel);
	1041	+ AddSkyboxTab1(skyboxpanel);
	1042	+ AddSkyboxTab2(skyboxpanel);
	1043	+
	1044	+ // EDIT panel
	1045	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1046	+ editButton.setToolTipText("Pin selection controls");
	1047	+ editButton.addActionListener(this);
	1048	+
	1049	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1050	+ uneditButton.setToolTipText("Remove selection controls");
549	1051	uneditButton.addActionListener(this);
550	1052
551		- oe.aConstraints.gridx += 1;
552		- oe.aConstraints.weighty = 0;
553		- oe.aConstraints.gridwidth = 1;
554		-
555		- oe.treePanel.add(clearPanelButton = new cButton("C"), oe.aConstraints);
556		- clearPanelButton.addActionListener(this);
557		-
558		- oe.aConstraints.gridx += 1;
559		- oe.aConstraints.weighty = 0;
560		- oe.aConstraints.gridwidth = 1;
561		-
562		- oe.treePanel.add(allParamsButton = new cButton("A"), oe.aConstraints);
	1053	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	1054	+ allParamsButton.setToolTipText("Show all controle");
563	1055	allParamsButton.addActionListener(this);
564	1056
565		- oe.aConstraints.gridx += 1;
566		- oe.aConstraints.weighty = 0;
567		- oe.aConstraints.gridwidth = 1;
568		-
569		- oe.treePanel.add(unselectButton = new cButton("U"), oe.aConstraints);
	1057	+ editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1058	+ clearPanelButton.setToolTipText("Clear edit panel");
	1059	+ clearPanelButton.addActionListener(this);
	1060	+
	1061	+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1062	+ unselectButton.setToolTipText("Unselect");
570	1063	unselectButton.addActionListener(this);
571	1064
	1065	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1066	+ flashSelectionButton.setToolTipText("Highlight selection");
	1067	+ flashSelectionButton.addActionListener(this);
	1068	+
	1069	+ editCommandsPanel.preferredHeight = 1;
	1070	+
	1071	+ SetPinStates(false);
	1072	+// oe.treePanel.add(commandsPanel);
	1073	+// oe.treePanel.Return();
	1074	+
572	1075	// oe.aConstraints.gridx += 1;
573	1076	// oe.aConstraints.weighty = 0;
574	1077	// oe.aConstraints.gridwidth = 1;
..	..	@@ -580,47 +1083,32 @@
580	1083	// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
581	1084	// gcButton.addActionListener(this);
582	1085
583		- oe.aConstraints.gridx = 0;
584		- oe.aConstraints.gridy += 1;
585		-
586		- //ctrlPanel.add(objList = new List(5, true));
587		- oe.aConstraints.gridwidth = 100;
588		- // oe.aConstraints.gridheight = 100;
589		- oe.aConstraints.fill = GridBagConstraints.BOTH; // HORIZONTAL;
590		- oe.aConstraints.gridheight = 1;
591		- oe.aConstraints.weighty = 0.5;
592		- oe.aConstraints.gridx = 0;
593		- JScrollPane jSP;
	1086	+ cGridBag jSPPanel = new cGridBag();
	1087	+
	1088	+ JScrollPane jSP;
594	1089	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
595		- oe.treePanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null)), oe.aConstraints);
	1090	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
596	1091	ResetModel();
597		- oe.aConstraints.weighty = 0.5;
598		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
599		- oe.aConstraints.gridy += 1;
600		- oe.aConstraints.gridwidth = 1;
601		-
602		- oe.aConstraints.weighty = 0;
603		- oe.aConstraints.gridwidth = 2;
604		-
605		- oe.treePanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0), oe.aConstraints);
606		- colorCB.addItemListener(this);
607		- oe.aConstraints.gridx += 2;
608		- oe.treePanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0), oe.aConstraints);
609		- materialCB.addItemListener(this);
610		- oe.aConstraints.gridx += 2;
611		- oe.treePanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0), oe.aConstraints);
612		- textureCB.addItemListener(this);
613		-
614		- oe.aConstraints.gridx = 0;
615		- oe.aConstraints.gridy += 1;
616	1092
	1093	+ oe.treePanel.add(jSPPanel);
	1094	+ oe.treePanel.Return();
	1095	+
	1096	+ oe.treePanel.add(copyOptionsPanel);
	1097	+ oe.treePanel.Return();
	1098	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1099	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	1100	+ sliderPane.preferredHeight = 1;
	1101	+
	1102	+// mainPanel.setDividerLocation(0.1); //1.0);
	1103	+ mainPanel.setResizeWeight(0.4);
	1104	+
617	1105	//jList.addListSelectionListener(this);
618	1106	oe.jTree.addTreeSelectionListener(this);
619	1107	//jTree.setRootVisible(false);
620	1108	//jTree.setEditable(true);
621	1109	oe.jTree.setDragEnabled(true);
622	1110	//jTree.setPreferredSize(new Dimension(10,10));
623		- jSP.setPreferredSize(new Dimension(100,200));
	1111	+ //jSP.setPreferredSize(new Dimension(100,200));
624	1112
625	1113	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
626	1114
..	..	@@ -632,23 +1120,160 @@
632	1120	dgr.addDragGestureListener(this);
633	1121	}catch(Exception e) {}
634	1122	*/
635		- radio.layout = sevenButton;
	1123	+ radio.layout = sixButton; // sevenButton;
636	1124	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
637	1125	}
	1126	+
	1127	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
	1128	+ {
	1129	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	1130	+ colorCB.setToolTipText("Copy color when dropped");
	1131	+ colorCB.addItemListener(this);
	1132	+
	1133	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	1134	+ materialCB.setToolTipText("Copy material when dropped");
	1135	+ materialCB.addItemListener(this);
	1136	+
	1137	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	1138	+ textureCB.setToolTipText("Copy texture when dropped");
	1139	+ textureCB.addItemListener(this);
	1140	+
	1141	+ panel.Return();
	1142	+
	1143	+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
	1144	+ boxCB.setToolTipText("Display bounding boxes");
	1145	+ boxCB.addItemListener(this);
	1146	+
	1147	+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
	1148	+ zoomBoxCB.setToolTipText("Display only for wheel");
	1149	+ zoomBoxCB.addItemListener(this);
	1150	+
	1151	+ if (true) // Globals.ADVANCED)
	1152	+ {
	1153	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	1154	+// supportCB.setToolTipText("Enable rigging");
	1155	+// supportCB.addItemListener(this);
	1156	+
	1157	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	1158	+ freezeCB.setToolTipText("Fast moving camera");
	1159	+ freezeCB.addItemListener(this);
	1160	+
	1161	+ // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
	1162	+ // localCB.addItemListener(this);
	1163	+
	1164	+ panel.Return();
	1165	+
	1166	+ panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
	1167	+ crowdCB.setToolTipText("Used for crowds");
	1168	+ crowdCB.addItemListener(this);
	1169	+
	1170	+ panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
	1171	+ smoothCB.setToolTipText("Snapping delay");
	1172	+ smoothCB.addItemListener(this);
	1173	+
	1174	+ panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1175	+ slowCB.setToolTipText("Smooth interpolation");
	1176	+ slowCB.addItemListener(this);
	1177	+
	1178	+// constraints.gridy += 1;
	1179	+// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
	1180	+// speakerMocapCB.addItemListener(this);
	1181	+
	1182	+ panel.Return();
	1183	+
	1184	+ if (false)
	1185	+ {
	1186	+ // handled in scripts
	1187	+ //constraints.gridy += 1;
	1188	+ panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
	1189	+ speakerCameraCB.addItemListener(this);
	1190	+
	1191	+ //constraints.gridy += 1;
	1192	+ panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
	1193	+ speakerFocusCB.addItemListener(this);
	1194	+
	1195	+ //constraints.gridy += 1;
	1196	+ panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
	1197	+ smoothfocusCB.addItemListener(this);
	1198	+ panel.Return();
	1199	+ }
	1200	+
	1201	+//constraints.gridx += 1;
	1202	+//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
	1203	+// debugCB.addItemListener(this);
	1204	+
	1205	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	1206	+ trackCB.setToolTipText("Enable tracking target");
	1207	+ trackCB.addItemListener(this);
	1208	+
	1209	+ panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	1210	+ oeilCB.setToolTipText("Move camera when tracking");
	1211	+ oeilCB.addItemListener(this);
	1212	+
	1213	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	1214	+ shadowCB.setToolTipText("When live compute shadows");
	1215	+ shadowCB.addItemListener(this);
	1216	+
	1217	+ panel.Return();
	1218	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	1219	+ toggleTextureCB.setToolTipText("Load textures");
	1220	+ toggleTextureCB.addItemListener(this);
	1221	+
	1222	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	1223	+ toggleSwitchCB.setToolTipText("Choose a single item");
	1224	+ toggleSwitchCB.addItemListener(this);
	1225	+
	1226	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1227	+ autokeepCB.setToolTipText("On structure change");
	1228	+ autokeepCB.addItemListener(this);
	1229	+
	1230	+ panel.Return();
	1231	+ if (Globals.ADVANCED)
	1232	+ {
	1233	+ panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
	1234	+ lookAtCB.setToolTipText("Look-at target");
	1235	+ lookAtCB.addItemListener(this);
	1236	+ }
	1237	+
	1238	+ }
	1239	+
	1240	+ cGridBag fill = new cGridBag();
	1241	+ fill.preferredHeight = 200;
	1242	+ cGridBag fill2 = new cGridBag();
	1243	+ fill2.preferredHeight = 200;
	1244	+ cGridBag fill3 = new cGridBag();
	1245	+ fill3.preferredHeight = 200;
	1246	+
	1247	+ panel.add(fill);
	1248	+ panel.add(fill2);
	1249	+ panel.add(fill3);
	1250	+
	1251	+ }
638	1252
639	1253	void EditObject(Object3D obj)
640	1254	{
641		- cRadio dummyButton = new cRadio(obj.name);
642		- dummyButton.SetObject(obj);
643		- dummyButton.layout = sevenButton;
644		- dummyButton.SetCamera(cameraView.renderCamera, false);
645		- dummyButton.addActionListener(this);
646		- radioPanel.add(dummyButton);
647		- buttonGroup.add(dummyButton);
648		- dummyButton.doClick();
	1255	+ cRadio radioButton = new cRadio(obj.name);
	1256	+
	1257	+ // June 2019. Patch to avoid bug with transparency.
	1258	+ radioButton.hadMaterial = obj.material != null;
	1259	+ if (!radioButton.hadMaterial)
	1260	+ {
	1261	+ obj.material = new cMaterial();
	1262	+ }
	1263	+
	1264	+ radioButton.SetObject(obj);
	1265	+ radioButton.layout = sixButton; // sevenButton;
	1266	+ radioButton.SetCamera(cameraView.renderCamera, false);
	1267	+ radioButton.addActionListener(this);
	1268	+ radioPanel.add(radioButton);
	1269	+ buttonGroup.add(radioButton);
	1270	+ radioButton.doClick();
649	1271	}
	1272	+
650	1273	void SetupViews(ObjEditor oe)
651	1274	{
	1275	+ theFrame = this;
	1276	+
652	1277	oe.SetupViews();
653	1278
654	1279	System.out.println("SetupViews");
..	..	@@ -657,22 +1282,28 @@
657	1282	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
658	1283	}
659	1284
660		- JCheckBox liveCB;
661		- JCheckBox supportCB;
662		- JCheckBox localCB;
663		- JCheckBox crowdCB;
664		- JCheckBox smoothCB;
665		- JCheckBox fastCB;
666		- JCheckBox slowCB;
667		- JCheckBox boxCB;
668		- JCheckBox trackCB;
669		- JCheckBox smoothfocusCB;
	1285	+ cToggleButton liveCB;
	1286	+ cCheckBox supportCB;
	1287	+ cCheckBox localCB;
	1288	+ cCheckBox crowdCB;
	1289	+ cCheckBox smoothCB;
	1290	+ cToggleButton fastCB;
	1291	+ cCheckBox slowCB;
	1292	+ cCheckBox boxCB;
	1293	+ cCheckBox zoomBoxCB;
	1294	+ cCheckBox freezeCB;
	1295	+ //cToggleButton trackCB;
	1296	+ cCheckBox trackCB;
	1297	+ cCheckBox smoothfocusCB;
670	1298	// JCheckBox speakerMocapCB;
671		- JCheckBox speakerCameraCB;
672		- JCheckBox speakerFocusCB;
673		- JCheckBox debugCB;
674		- JCheckBox oeilCB;
675		- JCheckBox lookAtCB;
	1299	+ cCheckBox speakerCameraCB;
	1300	+ cCheckBox speakerFocusCB;
	1301	+ cCheckBox debugCB;
	1302	+
	1303	+ cCheckBox oeilCB;
	1304	+ cCheckBox shadowCB;
	1305	+ cCheckBox autokeepCB;
	1306	+ cCheckBox lookAtCB;
676	1307
677	1308	// static int COLOR = 1;
678	1309	// static int MATERIAL = 2;
..	..	@@ -680,9 +1311,9 @@
680	1311
681	1312	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
682	1313
683		- JCheckBox colorCB;
684		- JCheckBox materialCB;
685		- JCheckBox textureCB;
	1314	+ cCheckBox colorCB;
	1315	+ cCheckBox materialCB;
	1316	+ cCheckBox textureCB;
686	1317
687	1318	public void itemStateChanged(ItemEvent e)
688	1319	{
..	..	@@ -707,10 +1338,10 @@
707	1338	dropAttributes \|= Object3D.TEXTURE;
708	1339	else
709	1340	dropAttributes &= ~Object3D.TEXTURE;
710		- }
711		- else if(e.getSource() == liveCB)
	1341	+ } else if(e.getSource() == liveCB)
712	1342	{
713	1343	cameraView.ToggleLive();
	1344	+ refreshContents(false);
714	1345	}
715	1346	else if(e.getSource() == supportCB)
716	1347	{
..	..	@@ -746,6 +1377,10 @@
746	1377	cameraView.repaint();
747	1378	// refreshContents();
748	1379	}
	1380	+ else if(e.getSource() == zoomBoxCB)
	1381	+ {
	1382	+ cameraView.ToggleZoomBoxMode();
	1383	+ }
749	1384	else if(e.getSource() == smoothfocusCB)
750	1385	{
751	1386	cameraView.ToggleSmoothFocus();
..	..	@@ -771,6 +1406,18 @@
771	1406	{
772	1407	cameraView.ToggleOeil();
773	1408	}
	1409	+ else if(e.getSource() == shadowCB)
	1410	+ {
	1411	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1412	+ }
	1413	+ else if(e.getSource() == freezeCB)
	1414	+ {
	1415	+ Globals.FREEZEONMOVE ^= true;
	1416	+ }
	1417	+ else if(e.getSource() == autokeepCB)
	1418	+ {
	1419	+ Globals.REPLACEONMAKE ^= true;
	1420	+ }
774	1421	else if(e.getSource() == lookAtCB)
775	1422	{
776	1423	cameraView.ToggleLookAt();
..	..	@@ -787,7 +1434,8 @@
787	1434
788	1435	/**/
789	1436	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
790		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1437	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1438	+ TreePath path = objEditor.jTree.getSelectionPath();
791	1439	if ((path == null) \|\| (path.getPathCount() <= 1)) {
792	1440	// We can't move the root node or an empty selection
793	1441	return;
..	..	@@ -850,8 +1498,6 @@
850	1498	}
851	1499	}
852	1500
853		- String string = (String) object;
854		-
855	1501	System.out.println("Transfer = " + object + "; drop : " + target);
856	1502	// if( object instanceof java.io.File[])
857	1503	// {
..	..	@@ -859,7 +1505,11 @@
859	1505	// objEditor.DropFile((java.io.File[]) object, true);
860	1506	// return;
861	1507	// }
862		- if (string.charAt(0) == '/')
	1508	+
	1509	+ String string = object.toString();
	1510	+
	1511	+ // File path for Mac and Windows
	1512	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
863	1513	{
864	1514	// file(s)
865	1515	String[] names = string.split("\n");
..	..	@@ -886,7 +1536,7 @@
886	1536
887	1537	flashIt = false;
888	1538	CameraPane pane = (CameraPane) target;
889		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1539	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
890	1540	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
891	1541
892	1542	if (group.selection.size() == 1)
..	..	@@ -902,23 +1552,33 @@
902	1552
903	1553	assert target == objEditor.jTree;
904	1554	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1555	+ Object3D destinationLeaf;
905	1556	try {
906		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1557	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
907	1558	} catch (Exception e) {
908	1559	System.out.println("destinationPath : " + destinationPath);
909	1560	return;
910	1561	}
911	1562
912		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1563	+ for (int i=group.selection.size(); --i>=0;)
913	1564	{
	1565	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1566	+
	1567	+ // Cannot move into itself
	1568	+ if (child == destinationLeaf)
	1569	+ return;
	1570	+ }
	1571	+
	1572	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1573	+// {
914	1574	loadClipboard(true);
915	1575	objEditor.jTree.setSelectionPath(destinationPath);
916		- pasteInto(false);
917		- } else {
918		- loadClipboard(false);
919		- objEditor.jTree.setSelectionPath(destinationPath);
920		- pasteInto(false); // true); // ???
921		- }
	1576	+ pasteInto(false, false);
	1577	+// } else {
	1578	+// loadClipboard(false);
	1579	+// objEditor.jTree.setSelectionPath(destinationPath);
	1580	+// pasteInto(false, false); // true); // ???
	1581	+// }
922	1582	}
923	1583	public void dropActionChanged(DropTargetDragEvent dtde)
924	1584	// Called if the user has modified the current drop gesture
..	..	@@ -1023,83 +1683,107 @@
1023	1683	{
1024	1684	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1025	1685	//heightFieldItem.addActionListener(this);
1026		- gridItem = menu.add(new MenuItem("Grid"));
1027		- gridItem.addActionListener(this);
1028		- rectoidItem = menu.add(new MenuItem("Box"));
1029		- rectoidItem.addActionListener(this);
1030		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1031		- ellipsoidItem.addActionListener(this);
1032		- coneItem = menu.add(new MenuItem("Cone"));
1033		- coneItem.addActionListener(this);
1034		- torusItem = menu.add(new MenuItem("Torus"));
1035		- torusItem.addActionListener(this);
1036		- superItem = menu.add(new MenuItem("Superellipsoid"));
1037		- superItem.addActionListener(this);
1038		- particleItem = menu.add(new MenuItem("Particle system"));
1039		- particleItem.addActionListener(this);
	1686	+// gridItem = menu.add(new MenuItem("Grid"));
	1687	+// gridItem.addActionListener(this);
	1688	+// rectoidItem = menu.add(new MenuItem("Box"));
	1689	+// rectoidItem.addActionListener(this);
	1690	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1691	+// ellipsoidItem.addActionListener(this);
	1692	+// coneItem = menu.add(new MenuItem("Cone"));
	1693	+// coneItem.addActionListener(this);
	1694	+// torusItem = menu.add(new MenuItem("Torus"));
	1695	+// torusItem.addActionListener(this);
	1696	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1697	+// superItem.addActionListener(this);
	1698	+
	1699	+ cameraItem = menu.add(new MenuItem("Camera"));
	1700	+ cameraItem.addActionListener(this);
	1701	+
	1702	+ if (!Globals.ADVANCED)
	1703	+ {
	1704	+ kleinItem = menu.add(new MenuItem("Klein Bottle"));
	1705	+ kleinItem.addActionListener(this);
	1706	+ }
	1707	+
	1708	+// particleItem = menu.add(new MenuItem("Particle system"));
	1709	+// particleItem.addActionListener(this);
	1710	+ if (Globals.ADVANCED)
	1711	+ {
1040	1712	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1041	1713	ragdollItem.addActionListener(this);
1042	1714	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1043	1715	ragdoll2Item.addActionListener(this);
	1716	+ }
1044	1717	menu.add("-");
1045		- meshItem = menu.add(new MenuItem("Mesh"));
	1718	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1046	1719	meshItem.addActionListener(this);
1047	1720	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1048	1721	// meshGroupItem.addActionListener(this);
	1722	+ if (Globals.ADVANCED)
	1723	+ {
1049	1724	springItem = menu.add(new MenuItem("Spring"));
1050	1725	springItem.addActionListener(this);
1051	1726	flagItem = menu.add(new MenuItem("Flag"));
1052	1727	flagItem.addActionListener(this);
1053		- bezierItem = menu.add(new MenuItem("Patch"));
1054		- bezierItem.addActionListener(this);
1055		- checkerItem = menu.add(new MenuItem("Checker"));
1056		- checkerItem.addActionListener(this);
1057	1728	blobItem = menu.add(new MenuItem("Blob"));
1058	1729	blobItem.addActionListener(this);
1059	1730	latheItem = menu.add(new MenuItem("Lathe"));
1060	1731	latheItem.addActionListener(this);
1061		- lightItem = menu.add(new MenuItem("Light"));
1062		- lightItem.addActionListener(this);
	1732	+ }
	1733	+ bezierItem = menu.add(new MenuItem("Bezier Patch"));
	1734	+ bezierItem.addActionListener(this);
	1735	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1736	+// overlayItem.addActionListener(this);
	1737	+// lightItem = menu.add(new MenuItem("Light"));
	1738	+// lightItem.addActionListener(this);
1063	1739	menu.add("-");
1064	1740	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1065	1741	//superLoopItem.addActionListener(this);
1066		- loopItem = menu.add(new MenuItem("Loop"));
1067		- loopItem.addActionListener(this);
	1742	+// loopItem = menu.add(new MenuItem("Loop"));
	1743	+// loopItem.addActionListener(this);
1068	1744	doubleItem = menu.add(new MenuItem("Fork"));
1069	1745	doubleItem.addActionListener(this);
	1746	+ if (Globals.ADVANCED)
	1747	+ {
1070	1748	tripleItem = menu.add(new MenuItem("Trident"));
1071	1749	tripleItem.addActionListener(this);
	1750	+ }
1072	1751	}
1073	1752
1074	1753	void buildToolsMenu(Menu menu)
1075	1754	{
1076	1755	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1077	1756	animationItem.addItemListener(this);
1078		- animationItem.setState(CameraPane.ANIMATION);
	1757	+ animationItem.setState(Globals.ANIMATION);
	1758	+
	1759	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1760	+ archiveItem.addActionListener(this);
1079	1761
1080	1762	menu.add("-");
1081	1763	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1082	1764	parseverticesItem.addActionListener(this);
1083	1765	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1084	1766	textureFieldItem.addActionListener(this);
1085		- alignItem = menu.add(new MenuItem("Align"));
	1767	+ alignItem = menu.add(new MenuItem("Align Objects"));
1086	1768	alignItem.addActionListener(this);
1087		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1088		- mirrorItem.addActionListener(this);
1089	1769	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1090	1770	reduceMorphItem.addActionListener(this);
1091	1771	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1092	1772	reduce34MorphItem.addActionListener(this);
1093		-
1094		- menu.add(computeAOItem = new MenuItem("Compute AO"));
1095		- computeAOItem.addActionListener(this);
1096	1773	menu.add("-");
1097		-
1098	1774	menu.add(memoryItem = new MenuItem("Memory Usage"));
1099	1775	memoryItem.addActionListener(this);
	1776	+ menu.add(computeAOItem = new MenuItem("Compute AO"));
	1777	+ computeAOItem.addActionListener(this);
	1778	+
	1779	+ if (Globals.ADVANCED)
	1780	+ {
	1781	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	1782	+ mirrorItem.addActionListener(this);
	1783	+ menu.add("-");
1100	1784	menu.add(analyzeItem = new MenuItem("Analyze"));
1101	1785	analyzeItem.addActionListener(this);
1102		- menu.add(dumpItem = new MenuItem("Dump"));
	1786	+ menu.add(dumpItem = new MenuItem("Print"));
1103	1787	dumpItem.addActionListener(this);
1104	1788	// menu.add(pathItem = new MenuItem("From-to path"));
1105	1789	// pathItem.addActionListener(this);
..	..	@@ -1108,6 +1792,8 @@
1108	1792	resetParentItem.addActionListener(this);
1109	1793	repairParentItem = menu.add(new MenuItem("Repair Parent"));
1110	1794	repairParentItem.addActionListener(this);
	1795	+ repairShadowItem = menu.add(new MenuItem("Repair Shadow"));
	1796	+ repairShadowItem.addActionListener(this);
1111	1797	menu.add(invariantsItem = new MenuItem("Invariants"));
1112	1798	invariantsItem.addActionListener(this);
1113	1799	menu.add(recompileItem = new MenuItem("Recompile"));
..	..	@@ -1115,6 +1801,7 @@
1115	1801	menu.add("-");
1116	1802	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1117	1803	editScriptItem.addActionListener(this);
	1804	+ }
1118	1805	}
1119	1806
1120	1807	void ScreenFit()
..	..	@@ -1237,9 +1924,34 @@
1237	1924	shadow.material = new cMaterial(obj.material);
1238	1925	shadow.material.diffuse = 0.0001f;
1239	1926	shadow.material.specular = 0.0001f;
	1927	+ //shadow.projectedVertices[1].x = 300;
1240	1928
1241	1929	makeSomething(shadow);
1242	1930	}
	1931	+
	1932	+ private void ClearUnpinned()
	1933	+ {
	1934	+ //for (Object3D obj : listUI)
	1935	+ for (int i=listUI.size(); --i>=0;)
	1936	+ {
	1937	+ Object3D obj = listUI.elementAt(i);
	1938	+ if (!obj.pinned)
	1939	+ {
	1940	+ obj.CloseUI();
	1941	+ listUI.remove(i);
	1942	+ }
	1943	+ }
	1944	+ }
	1945	+
	1946	+ private void EditElement(Object3D elem, boolean newWindow)
	1947	+ {
	1948	+ // if (!(elem instanceof Composite))
	1949	+ // newWindow = false;
	1950	+ listUI.add(elem);
	1951	+ elem.openEditWindow(this, newWindow); //, false);
	1952	+ System.out.println("edit : " + elem);
	1953	+ elem.editWindow.refreshContents(true); // ? new
	1954	+ }
1243	1955
1244	1956	/**
1245	1957	* applyExample
..	..	@@ -1443,9 +2155,9 @@
1443	2155
1444	2156	void Overwrite(int mask)
1445	2157	{
1446		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2158	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1447	2159	{
1448		- Object3D content = GrafreeD.clipboard.get(0);
	2160	+ Object3D content = Grafreed.clipboard.get(0);
1449	2161
1450	2162	if (content instanceof cGroup && ((cGroup)content).transientlink )
1451	2163	content = ((cGroup)content).get(0);
..	..	@@ -1468,6 +2180,7 @@
1468	2180	//
1469	2181	public void actionPerformed(ActionEvent event) // , Object arg)
1470	2182	{
	2183	+ Object source = event.getSource();
1471	2184	/*
1472	2185	if (event.getSource() == nameField)
1473	2186	{
..	..	@@ -1479,11 +2192,11 @@
1479	2192	}
1480	2193	else
1481	2194	*/
1482		- if (event.getSource() == lookAtItem \|\| event.getSource() == lookFromItem)
	2195	+ if (source == lookAtItem \|\| source == lookFromItem)
1483	2196	{
1484	2197	ScreenFit();
1485	2198	} else
1486		- if (event.getSource() == switchItem)
	2199	+ if (source == switchViewItem)
1487	2200	{
1488	2201	cVector v1 = new cVector();
1489	2202	cVector v2 = new cVector();
..	..	@@ -1492,11 +2205,11 @@
1492	2205	objEditor.cameraView.renderCamera.setAim(v2, v1);
1493	2206	objEditor.cameraView.repaint();
1494	2207	} else
1495		- if (event.getSource() == rectoidItem)
	2208	+ if (source == rectoidItem \|\| source == boxButton)
1496	2209	{
1497	2210	makeSomething(new Box());
1498	2211	} else
1499		- if (event.getSource() == particleItem)
	2212	+ if (source == particleItem \|\| source == particlesButton)
1500	2213	{
1501	2214	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1502	2215	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1517,9 +2230,9 @@
1517	2230	applyExample(particleGeom, "SMOKE");
1518	2231	makeSomething(particleGeom);
1519	2232	} else
1520		- if (event.getSource() == ragdollItem \|\| event.getSource() == ragdoll2Item)
	2233	+ if (source == ragdollItem \|\| source == ragdoll2Item)
1521	2234	{
1522		- GenericJoint ragdoll = new GenericJoint(event.getSource() == ragdollItem);
	2235	+ GenericJoint ragdoll = new GenericJoint(source == ragdollItem);
1523	2236
1524	2237	ragdoll.toParent = LA.newMatrix();
1525	2238	ragdoll.fromParent = LA.newMatrix();
..	..	@@ -1537,7 +2250,7 @@
1537	2250	} else
1538	2251	/*
1539	2252	*/
1540		- if (event.getSource() == heightFieldItem)
	2253	+ if (source == heightFieldItem)
1541	2254	{
1542	2255	Object3D obj = new Object3D();
1543	2256
..	..	@@ -1575,27 +2288,31 @@
1575	2288
1576	2289	makeSomething(obj);
1577	2290	} else
1578		- if (event.getSource() == gridItem)
	2291	+ if (source == gridItem \|\| source == gridButton)
1579	2292	{
1580	2293	makeSomething(new Grid());
1581	2294	} else
1582		- if (event.getSource() == ellipsoidItem)
	2295	+ if (source == ellipsoidItem \|\| source == sphereButton)
1583	2296	{
1584	2297	makeSomething(new Sphere());
1585	2298	} else
1586		- if (event.getSource() == coneItem)
	2299	+ if (source == coneItem \|\| source == coneButton)
1587	2300	{
1588	2301	makeSomething(new Cone());
1589	2302	} else
1590		- if (event.getSource() == torusItem)
	2303	+ if (source == torusItem \|\| source == torusButton)
1591	2304	{
1592	2305	makeSomething(new Torus());
1593	2306	} else
1594		- if (event.getSource() == superItem)
	2307	+ if (source == superItem \|\| source == superButton)
1595	2308	{
1596	2309	makeSomething(new Superellipsoid());
1597	2310	} else
1598		- if (event.getSource() == blobItem)
	2311	+ if (source == kleinItem \|\| source == kleinButton)
	2312	+ {
	2313	+ makeSomething(new Klein());
	2314	+ } else
	2315	+ if (source == blobItem)
1599	2316	{
1600	2317	Blob blob = new Blob();
1601	2318	BlobComponent comp = new BlobComponent();
..	..	@@ -1603,15 +2320,15 @@
1603	2320	//blob.retile();
1604	2321	makeSomething(blob);
1605	2322	} else
1606		- if (event.getSource() == latheItem)
	2323	+ if (source == latheItem)
1607	2324	{
1608	2325	makeSomething(new Lathe());
1609	2326	} else
1610		- if (event.getSource() == bezierItem)
	2327	+ if (source == bezierItem)
1611	2328	{
1612	2329	makeSomething(new BezierSurface());
1613	2330	} else
1614		- if (event.getSource() == checkerItem)
	2331	+ if (source == overlayItem \|\| source == overlayButton)
1615	2332	{
1616	2333	/*
1617	2334	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1626,7 +2343,7 @@
1626	2343	*/
1627	2344	makeSomething(new Checker());
1628	2345	} else
1629		- if (event.getSource() == meshItem)
	2346	+ if (source == meshItem)
1630	2347	{
1631	2348	Object3D itemtomake = new Object3D();
1632	2349	Object3D child;
..	..	@@ -1647,35 +2364,52 @@
1647	2364	makeSomething(child);
1648	2365	}
1649	2366	} else
1650		- if (event.getSource() == springItem)
	2367	+ if (source == springItem)
1651	2368	{
1652	2369	cSpring s = new cSpring();
1653	2370	s.setup();
1654	2371	makeSomething(s);
1655	2372	} else
1656		- if (event.getSource() == flagItem)
	2373	+ if (source == flagItem)
1657	2374	{
1658	2375	cSpring s = new cFlag();
1659	2376	s.setup();
1660	2377	makeSomething(s);
1661	2378	} else
1662		- if (event.getSource() == lightItem)
	2379	+ if (source == lightItem \|\| source == lightButton)
1663	2380	{
1664	2381	makeSomething(new Light());
1665	2382	} else
1666		- if (event.getSource() == csgItem)
	2383	+// if (source == skybox1Button \|\|
	2384	+// source == skybox2Button \|\|
	2385	+// source == skybox3Button \|\|
	2386	+// source == skybox4Button \|\|
	2387	+// source == skybox5Button \|\|
	2388	+// source == skybox6Button \|\|
	2389	+// source == skybox7Button \|\|
	2390	+// source == skybox11Button \|\|
	2391	+// source == skybox12Button \|\|
	2392	+// source == skybox13Button \|\|
	2393	+// source == skybox14Button \|\|
	2394	+// source == skybox15Button \|\|
	2395	+// source == skybox16Button \|\|
	2396	+// source == skybox17Button)
	2397	+// {
	2398	+// ChangeSkybox(source);
	2399	+// } else
	2400	+ if (source == csgItem)
1667	2401	{
1668	2402	group(new CSG());
1669	2403	} else
1670		- if (event.getSource() == templateItem)
	2404	+ if (source == templateItem)
1671	2405	{
1672	2406	group(new cTemplate());
1673	2407	} else
1674		- if (event.getSource() == attributeItem)
	2408	+ if (source == attributeItem)
1675	2409	{
1676	2410	makeSomething(new Attribute());
1677	2411	} else
1678		- if (event.getSource() == pointflowItem)
	2412	+ if (source == pointflowItem)
1679	2413	{
1680	2414	makeSomething(new PointFlow());
1681	2415	} else
..	..	@@ -1687,7 +2421,7 @@
1687	2421	} else
1688	2422	*/
1689	2423
1690		- if (event.getSource() == superLoopItem)
	2424	+ if (source == superLoopItem)
1691	2425	{
1692	2426	Composite g = new cGroup();
1693	2427	for (int i=0; i<15; i++)
..	..	@@ -1709,30 +2443,30 @@
1709	2443
1710	2444	group(g);
1711	2445	} else
1712		- if (event.getSource() == loopItem)
	2446	+ if (source == loopItem \|\| source == loopButton)
1713	2447	{
1714	2448	Composite csg = new GroupLeaf();
1715	2449	csg.count = 5;
1716	2450	group(csg);
1717		- Composite child = new cGroup();
	2451	+ Composite child = new cGroup("Branch");
1718	2452	csg.addChild(child);
1719	2453	child.addChild(csg);
1720	2454	} else
1721		- if (event.getSource() == doubleItem)
	2455	+ if (source == doubleItem)
1722	2456	{
1723		- Composite csg = new GroupLeaf();
	2457	+ Composite csg = new GroupLeaf("Fork");
1724	2458	csg.count = 5;
1725	2459	group(csg);
1726		- Composite child = new cGroup();
	2460	+ Composite child = new cGroup("Branch A");
1727	2461	csg.addChild(child);
1728	2462	child.addChild(csg);
1729		- child = new cGroup();
	2463	+ child = new cGroup("Branch B");
1730	2464	csg.addChild(child);
1731	2465	child.addChild(csg);
1732	2466	} else
1733		- if (event.getSource() == tripleItem)
	2467	+ if (source == tripleItem)
1734	2468	{
1735		- Composite csg = new GroupLeaf();
	2469	+ Composite csg = new GroupLeaf("Trident");
1736	2470	csg.count = 4;
1737	2471	group(csg);
1738	2472	Composite child = new cGroup();
..	..	@@ -1745,73 +2479,98 @@
1745	2479	csg.addChild(child);
1746	2480	child.addChild(csg);
1747	2481	} else
1748		-
1749		- if (event.getSource() == importGFDItem)
	2482	+ if (source == computeAOItem)
1750	2483	{
1751		- ImportGFD();
	2484	+ Globals.drawMode = CameraPane.OCCLUSION;
	2485	+ cameraView.repaint();
1752	2486	} else
1753		- if (event.getSource() == importVRMLX3DItem)
1754		- {
1755		- ImportVRMLX3D();
1756		- } else
1757		- if (event.getSource() == import3DSItem)
1758		- {
1759		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1760		- } else
1761		- if (event.getSource() == importOBJItem)
1762		- {
1763		- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1764		- } else
1765		- if (event.getSource() == computeAOItem)
1766		- {
1767		- CameraPane.drawMode = CameraPane.OCCLUSION;
1768		- CameraPane.theRenderer.repaint();
1769		- } else
1770		- if (event.getSource() == recompileItem)
	2487	+ if (source == recompileItem)
1771	2488	{
1772	2489	Recompile();
1773	2490	refreshContents();
1774	2491	} else
1775		- if (event.getSource() == editScriptItem)
	2492	+ if (source == editScriptItem)
1776	2493	{
1777	2494	OpenDialog();
1778	2495	refreshContents();
1779	2496	} else
1780		- if (event.getSource() == invariantsItem)
	2497	+ if (source == invariantsItem)
1781	2498	{
1782	2499	System.out.println("Invariants:");
1783		- GrafreeD.theApplet3D.universe.invariants();
	2500	+ Grafreed.grafreeD.universe.invariants();
1784	2501	} else
1785		- if (event.getSource() == memoryItem)
	2502	+ if (source == memoryItem)
1786	2503	{
1787	2504	//System.out.println("Invariants:");
1788	2505	PrintMemory();
1789	2506	} else
1790		- if (event.getSource() == pathItem)
	2507	+ if (source == pathItem)
1791	2508	{
1792	2509	PrintPath();
1793	2510	} else
1794		- if (event.getSource() == analyzeItem)
	2511	+ if (source == analyzeItem)
1795	2512	{
1796	2513	AnalyzeObject();
1797	2514	} else
1798		- if (event.getSource() == dumpItem)
	2515	+ if (source == dumpItem)
1799	2516	{
1800	2517	DumpObject();
1801	2518	} else
1802		- if (event.getSource() == screenfitButton)
	2519	+ if (source == minButton)
1803	2520	{
1804		- //Reload(lastConverter, lastFilename, true);
	2521	+ Minimize();
	2522	+ } else
	2523	+ if (source == maxButton)
	2524	+ {
	2525	+ Maximize();
	2526	+ } else
	2527	+ if (source == fullButton)
	2528	+ {
	2529	+ ToggleFullScreen();
	2530	+ } else
	2531	+ if (source == undoButton)
	2532	+ {
	2533	+ // Go to previous version
	2534	+ //if (!Undo())
	2535	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2536	+ Undo();
	2537	+ } else
	2538	+ if (source == restoreButton)
	2539	+ {
	2540	+ // Restore current version
	2541	+ Restore();
	2542	+ } else
	2543	+ if (source == replaceButton)
	2544	+ {
	2545	+ // Overwrite current version
	2546	+ Replace();
	2547	+ } else
	2548	+ if (source == redoButton)
	2549	+ {
	2550	+ // Go to next version
	2551	+ Redo();
	2552	+ } else
	2553	+ if (source == saveButton)
	2554	+ {
	2555	+ // Save a new version
	2556	+ if (!Save(true))
	2557	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2558	+ } else
	2559	+ if (source == oneStepButton)
	2560	+ {
	2561	+ Globals.ONESTEP = true;
	2562	+ cameraView.repaint();
	2563	+ } else
	2564	+ if (source == screenfitButton)
	2565	+ {
1805	2566	ScreenFit();
1806	2567	} else
1807		- if (event.getSource() == screenfitpointButton)
	2568	+ if (source == screenfitpointButton)
1808	2569	{
1809		- //Reload(lastConverter, lastFilename, true);
1810	2570	ScreenFitPoint();
1811	2571	} else
1812		- if (event.getSource() == snapobjectButton)
	2572	+ if (source == snapobjectButton)
1813	2573	{
1814		- //Reload(lastConverter, lastFilename, true);
1815	2574	SnapObject();
1816	2575	} else
1817	2576	// if (event.getSource() == recompileButton)
..	..	@@ -1820,13 +2579,13 @@
1820	2579	// Recompile();
1821	2580	// refreshContents();
1822	2581	// } else
1823		- if (event.getSource() == gcButton)
	2582	+ if (source == gcButton)
1824	2583	{
1825	2584	System.out.println("Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1826	2585	System.gc();
1827	2586	System.out.println("GC Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1828	2587	} else
1829		- if (event.getSource() == editLeafItem)
	2588	+ if (source == editLeafItem)
1830	2589	{
1831	2590	Object3D obj;
1832	2591	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -1840,62 +2599,74 @@
1840	2599	}
1841	2600	refreshContents(true);
1842	2601	} else
1843		- if (event.getSource() == openWindowItem)
	2602	+ if (source == openWindowItem)
1844	2603	{
1845	2604	EditSelection(true);
1846	2605	} else
1847		- if (event.getSource() == cutItem \|\| event.getSource() == clearButton)
	2606	+ if (source == cutItem \|\| source == clearButton)
1848	2607	{
1849	2608	loadClipboard(true);
1850	2609	} else
1851		- if (event.getSource() == duplicateItem)
	2610	+ if (source == undoItem)
1852	2611	{
1853		- Object3D keep = GrafreeD.clipboard;
	2612	+ Undo();
	2613	+ } else
	2614	+ if (source == redoItem)
	2615	+ {
	2616	+ Redo();
	2617	+ } else
	2618	+ if (source == duplicateItem)
	2619	+ {
	2620	+ Object3D keep = Grafreed.clipboard;
1854	2621	loadClipboard(false);
1855	2622	paste(false);
1856		- GrafreeD.clipboard = keep;
	2623	+ Grafreed.clipboard = keep;
1857	2624	} else
1858		- if (event.getSource() == cloneItem)
	2625	+ if (source == cloneItem)
1859	2626	{
1860	2627	CloneSelection(false);
1861	2628	} else
1862		- if (event.getSource() == cloneSupportItem)
	2629	+ if (source == cloneSupportItem)
1863	2630	{
1864	2631	CloneSelection(true);
1865	2632	} else
1866		- if (event.getSource() == copyItem)
	2633	+ if (source == copyItem)
1867	2634	{
1868	2635	loadClipboard(false);
1869	2636	} else
1870		- if (event.getSource() == pasteItem)
	2637	+ if (source == pasteItem)
1871	2638	{
1872	2639	paste(false);
1873	2640	} else
1874		- if (event.getSource() == pasteLinkItem)
	2641	+ if (source == pasteIntoItem)
1875	2642	{
1876		- pasteInto(false);
	2643	+ pasteInto(true, false);
1877	2644	} else
1878		- if (event.getSource() == pasteCloneItem)
	2645	+ if (source == pasteLinkItem)
1879	2646	{
1880		- pasteInto(true);
	2647	+ pasteInto(false, false);
1881	2648	} else
1882		- if (event.getSource() == pasteExpandItem)
	2649	+ if (source == pasteCloneItem)
	2650	+ {
	2651	+ pasteInto(true, true);
	2652	+ } else
	2653	+ if (source == pasteExpandItem)
1883	2654	{
1884	2655	paste(true);
1885	2656	} else
1886		- if (event.getSource() == synchronizeItem)
	2657	+ if (source == synchronizeItem)
1887	2658	{
1888	2659	Overwrite(Object3D.TRANSFORM);
1889	2660	} else
1890		- if (event.getSource() == overwriteNameItem)
	2661	+ if (source == overwriteNameItem)
1891	2662	{
1892	2663	Overwrite(Object3D.NAME);
1893	2664	} else
1894		- if (event.getSource() == overwriteUVItem)
	2665	+ if (source == overwriteUVItem)
1895	2666	{
1896	2667	Overwrite(Object3D.UV);
1897	2668	} else
1898		- if (event.getSource() == overwriteMatItem)
	2669	+ if (source == overwriteMatItem)
1899	2670	{
1900	2671	/* july 2015
1901	2672	if ((dropAttributes & Object3D.TEXTURE) == 0)
..	..	@@ -1915,7 +2686,7 @@
1915	2686
1916	2687	Overwrite(dropAttributes);
1917	2688	}
1918		- if (event.getSource() == overwriteGeoItem)
	2689	+ if (source == overwriteGeoItem)
1919	2690	{
1920	2691	Overwrite(Object3D.GEOMETRY);
1921	2692	// if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
..	..	@@ -1932,7 +2703,7 @@
1932	2703	// refreshContents();
1933	2704	// }
1934	2705	} else
1935		- if (event.getSource() == generateMeshItem)
	2706	+ if (source == generateMeshItem)
1936	2707	{
1937	2708	//if (group.selection.size() == 1)
1938	2709	// for (int i=0; i<group.selection.size(); i++)
..	..	@@ -1943,7 +2714,7 @@
1943	2714	ResetModel();
1944	2715	refreshContents();
1945	2716	} else
1946		- if (event.getSource() == extractGeometriesItem)
	2717	+ if (source == extractGeometriesItem)
1947	2718	{
1948	2719	boolean one = false;
1949	2720
..	..	@@ -1970,7 +2741,7 @@
1970	2741	ResetModel();
1971	2742	refreshContents();
1972	2743	} else
1973		- if (event.getSource() == cloneGeometriesItem)
	2744	+ if (source == cloneGeometriesItem)
1974	2745	{
1975	2746	boolean one = false;
1976	2747
..	..	@@ -1996,32 +2767,37 @@
1996	2767	ResetModel();
1997	2768	refreshContents();
1998	2769	} else
1999		- if (event.getSource() == shareGeometriesItem)
	2770	+ if (source == shareGeometriesItem)
2000	2771	{
2001	2772	boolean one = false;
2002	2773
2003	2774	if (group.selection.size() == 1)
2004	2775	one = true;
2005	2776
	2777	+ Object3D merge = null;
	2778	+
2006	2779	Object3D content = new cGroup();
2007	2780
2008	2781	for (int i=0; i<group.selection.size(); i++)
2009	2782	{
2010		- Object3D sel = new Merge(group.selection.get(i));
	2783	+ merge = new Merge(group.selection.get(i));
2011	2784
2012	2785	if (one)
2013		- makeSomething(sel, false);
	2786	+ makeSomething(merge, false);
2014	2787	else
2015		- content.addChild(sel);
	2788	+ content.addChild(merge);
2016	2789	}
2017	2790
2018	2791	if (!one)
2019		- makeSomething(content, false);
2020		-
2021		- ResetModel();
2022		- refreshContents();
	2792	+ makeSomething(content, true);
	2793	+ else
	2794	+ {
	2795	+ ResetModel();
	2796	+ Select(merge.GetTreePath(), true, false); // unselect... false);
	2797	+ refreshContents();
	2798	+ }
2023	2799	} else
2024		- if (event.getSource() == mergeGeometriesItem)
	2800	+ if (source == mergeGeometriesItem)
2025	2801	{
2026	2802	boolean one = false;
2027	2803
..	..	@@ -2051,7 +2827,7 @@
2051	2827	ResetModel();
2052	2828	refreshContents();
2053	2829	} else
2054		- if (event.getSource() == linkverticesItem)
	2830	+ if (source == linkverticesItem)
2055	2831	{
2056	2832	// if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2057	2833	// {
..	..	@@ -2064,39 +2840,48 @@
2064	2840	// group.selection.get(0).setMasterThis(content); // should be identity
2065	2841	// refreshContents();
2066	2842	// }
2067		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2843	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2068	2844	{
2069		- Object3D content = GrafreeD.clipboard.get(0);
	2845	+ Object3D content = Grafreed.clipboard.get(0);
2070	2846
2071	2847	if (content instanceof cGroup && ((cGroup)content).transientlink )
2072	2848	content = ((cGroup)content).get(0);
2073	2849
2074		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	2850	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2075	2851	for (int i=0; i<group.selection.size(); i++)
2076	2852	{
2077		- boolean random = CameraPane.RANDOM;
2078		- CameraPane.RANDOM = false; // parse all random nodes
	2853	+ boolean random = CameraPane.SWITCH;
	2854	+ CameraPane.SWITCH = false; // parse all random nodes
2079	2855	group.selection.get(i).linkVerticesThis(content);
2080	2856	// group.selection.get(i).setMasterThis(content); // should be identity
2081		- CameraPane.RANDOM = random;
	2857	+ CameraPane.SWITCH = random;
2082	2858	}
2083		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	2859	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2084	2860	refreshContents();
2085	2861	}
2086	2862	} else
2087		- if (event.getSource() == resetsupportItem)
	2863	+ if (source == resetsupportItem)
2088	2864	{
2089	2865	for (int i=0; i<group.selection.size(); i++)
2090	2866	{
2091		- boolean random = CameraPane.RANDOM;
2092		- CameraPane.RANDOM = false; // parse all random nodes
	2867	+ boolean random = CameraPane.SWITCH;
	2868	+ CameraPane.SWITCH = false; // parse all random nodes
2093	2869	group.selection.get(i).linkVerticesThis(null);
2094		- CameraPane.RANDOM = random;
	2870	+ CameraPane.SWITCH = random;
2095	2871	}
2096	2872
2097	2873	refreshContents();
2098	2874	} else
2099		- if (event.getSource() == resetreferencesItem)
	2875	+ if (source == relinkverticesItem)
	2876	+ {
	2877	+ boolean random = CameraPane.SWITCH;
	2878	+ CameraPane.SWITCH = false; // parse all random nodes
	2879	+ group.selection.RelinkToSupport();
	2880	+ CameraPane.SWITCH = random;
	2881	+
	2882	+ refreshContents();
	2883	+ } else
	2884	+ if (source == resetreferencesItem)
2100	2885	{
2101	2886	for (int i=0; i<group.selection.size(); i++)
2102	2887	{
..	..	@@ -2105,11 +2890,11 @@
2105	2890
2106	2891	refreshContents();
2107	2892	} else
2108		- if (event.getSource() == setMasterItem)
	2893	+ if (source == setMasterItem)
2109	2894	{
2110		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	2895	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2111	2896	{
2112		- Object3D content = GrafreeD.clipboard.get(0);
	2897	+ Object3D content = Grafreed.clipboard.get(0);
2113	2898
2114	2899	if (content instanceof cGroup && ((cGroup)content).transientlink )
2115	2900	content = ((cGroup)content).get(0);
..	..	@@ -2118,13 +2903,13 @@
2118	2903	refreshContents();
2119	2904	}
2120	2905	} else
2121		- if (event.getSource() == poseMeshItem)
	2906	+ if (source == poseMeshItem)
2122	2907	{
2123	2908	if (group.selection.size() == 1)
2124	2909	{
2125		- if (GrafreeD.clipboard.size() == 1)
	2910	+ if (Grafreed.clipboard.size() == 1)
2126	2911	{
2127		- Object3D content = GrafreeD.clipboard.get(0);
	2912	+ Object3D content = Grafreed.clipboard.get(0);
2128	2913
2129	2914	if (content instanceof cGroup && ((cGroup)content).transientlink )
2130	2915	content = ((cGroup)content).get(0);
..	..	@@ -2137,19 +2922,19 @@
2137	2922	}
2138	2923
2139	2924	} else
2140		- if (event.getSource() == revertMeshItem)
	2925	+ if (source == revertMeshItem)
2141	2926	{
2142	2927	RevertMeshes();
2143	2928	} else
2144		- if (event.getSource() == resetMeshItem)
	2929	+ if (source == resetAllItem)
2145	2930	{
2146	2931	ResetAll();
2147	2932	} else
2148		- if (event.getSource() == stepAllItem)
	2933	+ if (source == stepAllItem)
2149	2934	{
2150	2935	StepAll();
2151	2936	} else
2152		- if (event.getSource() == clearItem) // \|\| event.getSource() == clearButton)
	2937	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2153	2938	{
2154	2939	//int indices[] = jList.getSelectedIndices();
2155	2940	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2157,42 +2942,46 @@
2157	2942
2158	2943	ClearSelection(false);
2159	2944	} else
2160		- if (event.getSource() == clearAllItem)
	2945	+ if (source == clearAllItem)
2161	2946	{
2162	2947	ClearSelection(true);
2163	2948	} else
2164		- if (event.getSource() == grabItem)
	2949	+ if (source == grabItem \|\| source == groupButton)
2165	2950	{
2166		- group(new cGroup(), true);
	2951	+ group(new cGroup(), false); // true);
2167	2952	} else
2168		- if (event.getSource() == frontItem)
	2953	+ if (source == hideItem)
	2954	+ {
	2955	+ group(new HiddenObject());
	2956	+ } else
	2957	+ if (source == frontItem)
2169	2958	{
2170	2959	front();
2171	2960	} else
2172		- if (event.getSource() == backItem)
	2961	+ if (source == backItem)
2173	2962	{
2174	2963	back();
2175	2964	} else
2176		- if (event.getSource() == cameraItem)
	2965	+ if (source == cameraItem)
2177	2966	{
2178	2967	makeSomething(new Camera());
2179	2968	} else
2180		- if (event.getSource() == compositeItem)
	2969	+ if (source == compositeItem \|\| source == compositeButton)
2181	2970	{
2182	2971	group(new Composite());
2183	2972	} else
2184		- if (event.getSource() == randomItem)
	2973	+ if (source == switchItem \|\| source == switchButton)
2185	2974	{
2186	2975	RandomNode random = new RandomNode();
2187	2976	group(random);
2188	2977	if (random.size() > 0)
2189		- random.name = random.get(0).name + "Rnd";
	2978	+ random.name = random.get(0).name + "Switch";
2190	2979	} else
2191		- if (event.getSource() == physicsItem)
	2980	+ if (source == physicsItem)
2192	2981	{
2193	2982	group(new PhysicsNode());
2194	2983	} else
2195		- if (event.getSource() == frameselectorItem)
	2984	+ if (source == frameselectorItem)
2196	2985	{
2197	2986	for (int i=0; i<group.selection.size(); i++)
2198	2987	{
..	..	@@ -2204,7 +2993,7 @@
2204	2993	ResetModel();
2205	2994	refreshContents();
2206	2995	} else
2207		- if (event.getSource() == switchGeoItem)
	2996	+ if (source == switchGeoItem)
2208	2997	{
2209	2998	for (int i=0; i<group.selection.size(); i++)
2210	2999	{
..	..	@@ -2216,7 +3005,7 @@
2216	3005	ResetModel();
2217	3006	refreshContents();
2218	3007	} else
2219		- if (event.getSource() == switchTransfoItem)
	3008	+ if (source == switchTransfoItem)
2220	3009	{
2221	3010	for (int i=0; i<group.selection.size(); i++)
2222	3011	{
..	..	@@ -2228,7 +3017,7 @@
2228	3017	ResetModel();
2229	3018	refreshContents();
2230	3019	} else
2231		- if (event.getSource() == morphItem)
	3020	+ if (source == morphItem)
2232	3021	{
2233	3022	for (int i=0; i<group.selection.size(); i++)
2234	3023	{
..	..	@@ -2240,7 +3029,7 @@
2240	3029	ResetModel();
2241	3030	refreshContents();
2242	3031	} else
2243		- if (event.getSource() == scriptNodeItem)
	3032	+ if (source == scriptNodeItem)
2244	3033	{
2245	3034	boolean atleastone = false;
2246	3035
..	..	@@ -2279,199 +3068,252 @@
2279	3068	}
2280	3069	}
2281	3070	} else
2282		- if (event.getSource() == linkerItem)
	3071	+ if (source == linkerItem)
2283	3072	{
2284	3073	group(new cLinker());
2285	3074	} else
2286		- if (event.getSource() == textureItem)
	3075	+ if (source == textureItem \|\| source == textureButton)
2287	3076	{
2288	3077	group(new TextureNode());
2289	3078	} else
2290		- if (event.getSource() == shadowXItem)
	3079	+ if (source == billboardItem)
	3080	+ {
	3081	+ group(new BillboardNode());
	3082	+ } else
	3083	+ if (source == shadowXItem)
2291	3084	{
2292	3085	CastShadow(0);
2293	3086	} else
2294		- if (event.getSource() == shadowYItem)
	3087	+ if (source == shadowYItem)
2295	3088	{
2296	3089	CastShadow(1);
2297	3090	} else
2298		- if (event.getSource() == shadowZItem)
	3091	+ if (source == shadowZItem)
2299	3092	{
2300	3093	CastShadow(2);
2301	3094	} else
2302		- if (event.getSource() == ungroupItem)
	3095	+ if (source == ungroupItem \|\| source == ungroupButton)
2303	3096	{
2304		- ungroup();
	3097	+ boolean hasRoot = false;
	3098	+
	3099	+ for (int i=0; i<group.selection.size(); i++)
	3100	+ {
	3101	+ if (group.selection.get(i) == group)
	3102	+ {
	3103	+ hasRoot = true;
	3104	+ break;
	3105	+ }
	3106	+ }
	3107	+
	3108	+ if (!hasRoot)
	3109	+ {
	3110	+ for (int i=0; i<group.selection.size(); i++)
	3111	+ {
	3112	+ Ungroup(group.selection.get(i));
	3113	+ }
	3114	+
	3115	+ ClearSelection(false);
	3116	+
	3117	+ refreshContents();
	3118	+ }
2305	3119	} else
2306		- if (event.getSource() == genUVItem)
	3120	+ if (source == genUVItem)
2307	3121	{
2308	3122	GenUV();
2309	3123	} else
2310		- if (event.getSource() == genNormalsCADItem)
	3124	+ if (source == genNormalsCADItem)
2311	3125	{
2312	3126	GenNormals(true);
2313	3127	} else
2314		- if (event.getSource() == genNormalsMESHItem)
	3128	+ if (source == genNormalsMESHItem)
2315	3129	{
2316		- GenNormals(true); // TODO
	3130	+ GenNormalsMESH();
2317	3131	} else
2318		- if (event.getSource() == genNormalsORGANItem)
	3132	+ if (source == genNormalsORGANItem)
2319	3133	{
2320	3134	GenNormals(false);
2321	3135	} else
2322		- if (event.getSource() == stripifyItem)
	3136	+ if (source == genNormalsMINEItem)
	3137	+ {
	3138	+ GenNormalsMINE();
	3139	+ } else
	3140	+ if (source == stripifyItem)
2323	3141	{
2324	3142	Stripify();
2325	3143	} else
2326		- if (event.getSource() == unstripifyItem)
	3144	+ if (source == unstripifyItem)
2327	3145	{
2328	3146	Unstripify();
2329	3147	} else
2330		- if (event.getSource() == trimItem)
	3148	+ if (source == trimItem)
2331	3149	{
2332	3150	Trim();
2333	3151	} else
2334		- if (event.getSource() == untrimItem)
	3152	+ if (source == untrimItem)
2335	3153	{
2336	3154	Untrim();
2337	3155	} else
2338		- if (event.getSource() == clearColorsItem)
	3156	+ if (source == clearColorsItem)
2339	3157	{
2340	3158	ClearColors();
2341	3159	} else
2342		- if (event.getSource() == clearMaterialsItem)
	3160	+ if (source == clearMaterialsItem)
2343	3161	{
2344	3162	ClearMaterials();
2345	3163	} else
2346		- if (event.getSource() == liveleavesItem)
	3164	+ if (source == liveleavesItem)
2347	3165	{
2348	3166	LiveLeaves(true);
2349	3167	} else
2350		- if (event.getSource() == unliveleavesItem)
	3168	+ if (source == unliveleavesItem)
2351	3169	{
2352	3170	LiveLeaves(false);
2353	3171	} else
2354		- if (event.getSource() == supportleavesItem)
	3172	+ if (source == supportleavesItem)
2355	3173	{
2356	3174	SupportLeaves(true);
2357	3175	} else
2358		- if (event.getSource() == unsupportleavesItem)
	3176	+ if (source == unsupportleavesItem)
2359	3177	{
2360	3178	SupportLeaves(false);
2361	3179	} else
2362		- if (event.getSource() == hideleavesItem)
	3180	+ if (source == hideleavesItem)
2363	3181	{
2364	3182	HideLeaves(true);
2365	3183	} else
2366		- if (event.getSource() == showleavesItem)
	3184	+ if (source == showleavesItem)
2367	3185	{
2368	3186	HideLeaves(false);
2369	3187	} else
2370		- if (event.getSource() == markleavesItem)
	3188	+ if (source == markleavesItem)
2371	3189	{
2372	3190	MarkLeaves(true);
2373	3191	} else
2374		- if (event.getSource() == unmarkleavesItem)
	3192	+ if (source == unmarkleavesItem)
2375	3193	{
2376	3194	MarkLeaves(false);
2377	3195	} else
2378		- if (event.getSource() == flipVItem)
	3196	+ if (source == rewindleavesItem)
	3197	+ {
	3198	+ RewindLeaves(true);
	3199	+ } else
	3200	+ if (source == unrewindleavesItem)
	3201	+ {
	3202	+ RewindLeaves(false);
	3203	+ } else
	3204	+ if (source == randomleavesItem)
	3205	+ {
	3206	+ RandomLeaves(true);
	3207	+ } else
	3208	+ if (source == unrandomleavesItem)
	3209	+ {
	3210	+ RandomLeaves(false);
	3211	+ } else
	3212	+ if (source == flipVItem)
2379	3213	{
2380	3214	FlipV(true);
2381	3215	} else
2382		- if (event.getSource() == unflipVItem)
	3216	+ if (source == unflipVItem)
2383	3217	{
2384	3218	FlipV(false);
2385	3219	} else
2386		- if (event.getSource() == lowTexturesItem)
	3220	+ if (source == lowTexturesItem)
2387	3221	{
2388	3222	SetTexRes(0);
2389	3223	} else
2390		- if (event.getSource() == normalTexturesItem)
	3224	+ if (source == normalTexturesItem)
2391	3225	{
2392	3226	SetTexRes(1);
2393	3227	} else
2394		- if (event.getSource() == highTexturesItem)
	3228	+ if (source == highTexturesItem)
2395	3229	{
2396	3230	SetTexRes(2);
2397	3231	} else
2398		- if (event.getSource() == veryhighTexturesItem)
	3232	+ if (source == veryhighTexturesItem)
2399	3233	{
2400	3234	SetTexRes(3);
2401	3235	} else
2402		- if (event.getSource() == maxTexturesItem)
	3236	+ if (source == maxTexturesItem)
2403	3237	{
2404	3238	SetTexRes(4);
2405	3239	} else
2406		- if (event.getSource() == panoTexturesItem)
	3240	+ if (source == panoTexturesItem)
2407	3241	{
2408	3242	SetTexRes(5);
2409	3243	} else
2410		- if (event.getSource() == reverseNormalsItem)
	3244	+ if (source == reverseNormalsItem)
2411	3245	{
2412	3246	ReverseNormals();
2413	3247	} else
2414		- if (event.getSource() == parseverticesItem)
	3248	+ if (source == parseverticesItem)
2415	3249	{
2416	3250	ParseVertices();
2417	3251	} else
2418		- if (event.getSource() == textureFieldItem)
	3252	+ if (source == textureFieldItem)
2419	3253	{
2420	3254	TextureVertices();
2421	3255	} else
2422		- if (event.getSource() == alignItem)
	3256	+ if (source == alignItem)
2423	3257	{
2424	3258	Align();
2425	3259	} else
2426		- if (event.getSource() == mirrorItem)
	3260	+ if (source == mirrorItem)
2427	3261	{
2428	3262	MirrorPoses();
2429	3263	} else
2430		- if (event.getSource() == reduceMorphItem)
	3264	+ if (source == reduceMorphItem)
2431	3265	{
2432	3266	MeshReduction(false);
2433	3267	} else
2434		- if (event.getSource() == reduce34MorphItem)
	3268	+ if (source == reduce34MorphItem)
2435	3269	{
2436	3270	MeshReduction(true);
2437	3271	} else
2438		- if (event.getSource() == reverseTrianglesItem)
	3272	+ if (source == reverseTrianglesItem)
2439	3273	{
2440	3274	ReverseTriangles();
2441	3275	} else
2442		- if (event.getSource() == reduceMeshItem)
	3276	+ if (source == reduceMeshItem)
2443	3277	{
2444	3278	ReduceMesh(false);
2445	3279	} else
2446		- if (event.getSource() == reduce34MeshItem)
	3280	+ if (source == reduce34MeshItem)
2447	3281	{
2448	3282	ReduceMesh(true);
2449	3283	} else
2450		- if (event.getSource() == increaseMeshItem)
	3284	+ if (source == increaseMeshItem)
2451	3285	{
2452	3286	IncreaseMesh();
2453	3287	} else
2454		- if (event.getSource() == clipMeshItem)
	3288	+ if (source == clipMeshItem)
2455	3289	{
2456	3290	ClipMesh();
2457	3291	} else
2458		- if (event.getSource() == smoothMeshItem)
	3292	+ if (source == smoothMeshItem)
2459	3293	{
2460	3294	SmoothMesh();
2461	3295	} else
2462		- if (event.getSource() == transformgeometryItem)
	3296	+ if (source == transformGeometryItem)
2463	3297	{
2464	3298	TransformGeometry();
2465	3299	} else
2466		- if (event.getSource() == resetTransformItem)
	3300	+ if (source == transformChildrenItem)
	3301	+ {
	3302	+ TransformChildren();
	3303	+ } else
	3304	+ if (source == resetTransformItem)
2467	3305	{
2468	3306	ResetTransform();
2469	3307	} else
2470		- if (event.getSource() == resetCentroidItem)
	3308	+ if (source == resetCentroidItem)
2471	3309	{
2472		- ResetCentroid();
	3310	+ ResetCentroid(true);
2473	3311	} else
2474		- if (event.getSource() == resetParentItem)
	3312	+ if (source == resetCentroidXZItem)
	3313	+ {
	3314	+ ResetCentroid(false);
	3315	+ } else
	3316	+ if (source == resetParentItem)
2475	3317	{
2476	3318	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2477	3319	{
..	..	@@ -2481,7 +3323,7 @@
2481	3323
2482	3324	refreshContents();
2483	3325	} else
2484		- if (event.getSource() == repairParentItem)
	3326	+ if (source == repairParentItem)
2485	3327	{
2486	3328	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2487	3329	{
..	..	@@ -2495,7 +3337,21 @@
2495	3337
2496	3338	refreshContents();
2497	3339	} else
2498		- if (event.getSource() == sortbysizeItem)
	3340	+ if (source == repairShadowItem)
	3341	+ {
	3342	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3343	+ {
	3344	+ Object3D obj = (Object3D)e.nextElement();
	3345	+ obj.RepairShadow();
	3346	+// for (int i=0; i<obj.size(); i++)
	3347	+// {
	3348	+// obj.get(i).parent = obj;
	3349	+// }
	3350	+ }
	3351	+
	3352	+ refreshContents();
	3353	+ } else
	3354	+ if (source == sortbysizeItem)
2499	3355	{
2500	3356	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2501	3357	{
..	..	@@ -2507,7 +3363,7 @@
2507	3363	ResetModel();
2508	3364	refreshContents();
2509	3365	} else
2510		- if (event.getSource() == sortbynameItem)
	3366	+ if (source == sortbynameItem)
2511	3367	{
2512	3368	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2513	3369	{
..	..	@@ -2519,7 +3375,7 @@
2519	3375	ResetModel();
2520	3376	refreshContents();
2521	3377	} else
2522		- if (event.getSource() == attachPigmentItem)
	3378	+ if (source == attachPigmentItem)
2523	3379	{
2524	3380	String texture = GetFile("Attach pigment");
2525	3381	Object3D obj;
..	..	@@ -2531,7 +3387,7 @@
2531	3387
2532	3388	refreshContents();
2533	3389	} else
2534		- if (event.getSource() == detachPigmentItem)
	3390	+ if (source == detachPigmentItem)
2535	3391	{
2536	3392	Object3D obj;
2537	3393	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2542,7 +3398,7 @@
2542	3398
2543	3399	refreshContents();
2544	3400	} else
2545		- if (event.getSource() == attachBumpItem)
	3401	+ if (source == attachBumpItem)
2546	3402	{
2547	3403	String texture = GetFile("Attach bump");
2548	3404	Object3D obj;
..	..	@@ -2554,18 +3410,18 @@
2554	3410
2555	3411	refreshContents();
2556	3412	} else
2557		- if (event.getSource() == detachBumpItem)
	3413	+ if (source == detachBumpItem)
2558	3414	{
2559	3415	Object3D obj;
2560	3416	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2561	3417	{
2562	3418	obj = (Object3D)e.nextElement();
2563		- obj.SetBumpTexture(null);
	3419	+ obj.ResetBumpTexture();
2564	3420	}
2565	3421
2566	3422	refreshContents();
2567	3423	} else
2568		- if (event.getSource() == pigmentBumpItem)
	3424	+ if (source == pigmentBumpItem)
2569	3425	{
2570	3426	Object3D obj;
2571	3427	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2576,158 +3432,262 @@
2576	3432
2577	3433	refreshContents();
2578	3434	} else
2579		- if (event.getSource() == flashSelectionButton)
	3435	+ if (source == embedTexturesItem)
	3436	+ {
	3437	+ Object3D obj;
	3438	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3439	+ {
	3440	+ obj = (Object3D)e.nextElement();
	3441	+ obj.EmbedTextures(true);
	3442	+ }
	3443	+
	3444	+ refreshContents();
	3445	+ } else
	3446	+ if (source == deEmbedTexturesItem)
	3447	+ {
	3448	+ Object3D obj;
	3449	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3450	+ {
	3451	+ obj = (Object3D)e.nextElement();
	3452	+ obj.EmbedTextures(false);
	3453	+ }
	3454	+
	3455	+ CameraPane.texturepigment.clear();
	3456	+ CameraPane.texturebump.clear();
	3457	+
	3458	+ refreshContents();
	3459	+ } else
	3460	+ if (source == flashSelectionButton)
2580	3461	{
2581	3462	CameraPane.flash = true;
2582	3463	refreshContents();
2583	3464	} else
2584		- if (event.getSource() == oneButton)
	3465	+ if (source == oneButton)
2585	3466	{
2586	3467	} else
2587		- if (event.getSource() == twoButton)
	3468	+ if (source == twoButton)
2588	3469	{
2589	3470	radio.layout = twoButton;
	3471	+
	3472	+ if (CameraPane.FULLSCREEN)
	3473	+ fullscreenLayout = radio.layout;
	3474	+
2590	3475	// bug
2591	3476	//gridPanel.setDividerLocation(1.0);
2592	3477	//bigPanel.setDividerLocation(0.0);
2593		- bigThree.remove(jtp);
2594		- bigThree.remove(cameraPanel);
2595		- bigThree.remove(XYZPanel);
2596		- aWindowConstraints.gridx = 0;
2597		- aWindowConstraints.gridy = 0;
2598		- aWindowConstraints.gridwidth = 1;
2599		- // aConstraints.gridheight = 3;
2600		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2601		- aWindowConstraints.weightx = 0;
2602		- aWindowConstraints.weighty = 1;
2603		- //bigThree.add(jtp, aWindowConstraints);
2604		- aWindowConstraints.weightx = 1;
2605		- aWindowConstraints.gridwidth = 3;
2606		- // aConstraints.gridheight = 3;
2607		- aWindowConstraints.gridx = 1;
2608		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2609		- bigThree.add(cameraPanel, aWindowConstraints);
2610		- aWindowConstraints.weightx = 0;
2611		- aWindowConstraints.gridx = 4;
2612		- aWindowConstraints.gridwidth = 1;
2613		- // aConstraints.gridheight = 3;
2614		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2615		- //bigThree.add(XYZPanel, aWindowConstraints);
2616		- bigThree.revalidate();
	3478	+// bigThree.remove(scenePanel);
	3479	+// bigThree.remove(centralPanel);
	3480	+// bigThree.remove(XYZPanel);
	3481	+// aWindowConstraints.gridx = 0;
	3482	+// aWindowConstraints.gridy = 0;
	3483	+// aWindowConstraints.gridwidth = 1;
	3484	+// // aConstraints.gridheight = 3;
	3485	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3486	+// aWindowConstraints.weightx = 0;
	3487	+// aWindowConstraints.weighty = 1;
	3488	+// //bigThree.add(jtp, aWindowConstraints);
	3489	+// aWindowConstraints.weightx = 1;
	3490	+// aWindowConstraints.gridwidth = 3;
	3491	+// // aConstraints.gridheight = 3;
	3492	+// aWindowConstraints.gridx = 1;
	3493	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3494	+// bigThree.add(centralPanel, aWindowConstraints);
	3495	+// aWindowConstraints.weightx = 0;
	3496	+// aWindowConstraints.gridx = 4;
	3497	+// aWindowConstraints.gridwidth = 1;
	3498	+// // aConstraints.gridheight = 3;
	3499	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3500	+// //bigThree.add(XYZPanel, aWindowConstraints);
	3501	+// scenePanel.setVisible(false);
	3502	+// centralPanel.setVisible(true);
	3503	+// XYZPanel.setVisible(false);
	3504	+ bigThree.ClearUI();
	3505	+ bigThree.add(centralPanel);
	3506	+ bigThree.FlushUI();
	3507	+
	3508	+ cameraView.requestFocusInWindow();
	3509	+
	3510	+// refreshContents(true);
	3511	+//
	3512	+// try
	3513	+// {
	3514	+// java.awt.Robot bot = new java.awt.Robot();
	3515	+// int mask = InputEvent.BUTTON1_MASK;
	3516	+// bot.mouseMove(100, 100);
	3517	+// bot.mousePress(mask);
	3518	+// bot.mouseRelease(mask);
	3519	+// }
	3520	+// catch (Exception e)
	3521	+// {
	3522	+//
	3523	+// }
	3524	+
2617	3525	} else
2618		- if (event.getSource() == threeButton)
	3526	+ if (source == threeButton)
2619	3527	{
2620	3528	radio.layout = threeButton;
2621		- bigThree.remove(jtp);
2622		- bigThree.remove(cameraPanel);
2623		- bigThree.remove(XYZPanel);
2624		- aWindowConstraints.gridx = 0;
2625		- aWindowConstraints.gridy = 0;
2626		- aWindowConstraints.gridwidth = 1;
2627		- // aConstraints.gridheight = 3;
2628		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2629		- aWindowConstraints.weightx = 0;
2630		- aWindowConstraints.weighty = 1;
2631		- //bigThree.add(jtp, aWindowConstraints);
2632		- aWindowConstraints.weightx = 1;
2633		- aWindowConstraints.gridwidth = 3;
2634		- // aConstraints.gridheight = 3;
2635		- aWindowConstraints.gridx = 1;
2636		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2637		- bigThree.add(cameraPanel, aWindowConstraints);
2638		- aWindowConstraints.weightx = 0;
2639		- aWindowConstraints.gridx = 4;
2640		- aWindowConstraints.gridwidth = 1;
2641		- // aConstraints.gridheight = 3;
2642		- aConstraints.fill = GridBagConstraints.VERTICAL;
2643		- bigThree.add(XYZPanel, aWindowConstraints);
2644		- bigThree.revalidate();
	3529	+
	3530	+ if (CameraPane.FULLSCREEN)
	3531	+ fullscreenLayout = radio.layout;
	3532	+
	3533	+// bigThree.remove(scenePanel);
	3534	+// bigThree.remove(centralPanel);
	3535	+// bigThree.remove(XYZPanel);
	3536	+// aWindowConstraints.gridx = 0;
	3537	+// aWindowConstraints.gridy = 0;
	3538	+// aWindowConstraints.gridwidth = 1;
	3539	+// // aConstraints.gridheight = 3;
	3540	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3541	+// aWindowConstraints.weightx = 0;
	3542	+// aWindowConstraints.weighty = 1;
	3543	+// //bigThree.add(jtp, aWindowConstraints);
	3544	+// aWindowConstraints.weightx = 1;
	3545	+// aWindowConstraints.gridwidth = 3;
	3546	+// // aConstraints.gridheight = 3;
	3547	+// aWindowConstraints.gridx = 1;
	3548	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3549	+// bigThree.add(centralPanel, aWindowConstraints);
	3550	+// aWindowConstraints.weightx = 0;
	3551	+// aWindowConstraints.gridx = 4;
	3552	+// aWindowConstraints.gridwidth = 1;
	3553	+// // aConstraints.gridheight = 3;
	3554	+// aConstraints.fill = GridBagConstraints.VERTICAL;
	3555	+// bigThree.add(XYZPanel, aWindowConstraints);
	3556	+// bigThree.validate();
	3557	+// scenePanel.setVisible(false);
	3558	+// centralPanel.setVisible(true);
	3559	+// XYZPanel.setVisible(true);
	3560	+ bigThree.ClearUI();
	3561	+ bigThree.add(scenePanel);
	3562	+ bigThree.add(centralPanel);
	3563	+ bigThree.FlushUI();
	3564	+
	3565	+ cameraView.requestFocusInWindow();
2645	3566	} else
2646		- if (event.getSource() == fourButton)
	3567	+ if (source == fourButton)
2647	3568	{
2648	3569	radio.layout = fourButton;
2649		- bigThree.remove(jtp);
2650		- bigThree.remove(cameraPanel);
2651		- bigThree.remove(XYZPanel);
2652		- aWindowConstraints.gridx = 0;
2653		- aWindowConstraints.gridy = 0;
2654		- aWindowConstraints.gridwidth = 1;
2655		- // aWindowConstraints.gridheight = 3;
2656		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2657		- aWindowConstraints.weightx = 1;
2658		- aWindowConstraints.weighty = 1;
2659		- bigThree.add(jtp, aWindowConstraints);
2660		- aWindowConstraints.weightx = 1;
2661		- aWindowConstraints.gridwidth = 3;
2662		- // aConstraints.gridheight = 3;
2663		- aWindowConstraints.gridx = 1;
2664		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2665		- //bigThree.add(cameraPanel, aWindowConstraints);
2666		- aWindowConstraints.weightx = 0;
2667		- aWindowConstraints.gridx = 4;
2668		- aWindowConstraints.gridwidth = 1;
2669		- // aWindowConstraints.gridheight = 3;
2670		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2671		- //bigThree.add(XYZPanel, aWindowConstraints);
2672		- bigThree.revalidate();
	3570	+
	3571	+ if (CameraPane.FULLSCREEN)
	3572	+ fullscreenLayout = radio.layout;
	3573	+
	3574	+// bigThree.remove(scenePanel);
	3575	+// bigThree.remove(centralPanel);
	3576	+// bigThree.remove(XYZPanel);
	3577	+// aWindowConstraints.gridx = 0;
	3578	+// aWindowConstraints.gridy = 0;
	3579	+// aWindowConstraints.gridwidth = 1;
	3580	+// // aWindowConstraints.gridheight = 3;
	3581	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3582	+// aWindowConstraints.weightx = 1;
	3583	+// aWindowConstraints.weighty = 1;
	3584	+// bigThree.add(scenePanel, aWindowConstraints);
	3585	+// aWindowConstraints.weightx = 1;
	3586	+// aWindowConstraints.gridwidth = 3;
	3587	+// // aConstraints.gridheight = 3;
	3588	+// aWindowConstraints.gridx = 1;
	3589	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3590	+// //bigThree.add(cameraPanel, aWindowConstraints);
	3591	+// aWindowConstraints.weightx = 0;
	3592	+// aWindowConstraints.gridx = 4;
	3593	+// aWindowConstraints.gridwidth = 1;
	3594	+// // aWindowConstraints.gridheight = 3;
	3595	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3596	+// //bigThree.add(XYZPanel, aWindowConstraints);
	3597	+// bigThree.validate();
	3598	+// scenePanel.setVisible(true);
	3599	+// centralPanel.setVisible(false);
	3600	+// XYZPanel.setVisible(false);
	3601	+ bigThree.ClearUI();
	3602	+ bigThree.add(scenePanel);
	3603	+ bigThree.FlushUI();
	3604	+
	3605	+ cameraView.requestFocusInWindow();
2673	3606	} else
2674		- if (event.getSource() == sixButton)
	3607	+ if (source == sixButton)
2675	3608	{
2676	3609	radio.layout = sixButton;
2677		- bigThree.remove(jtp);
2678		- bigThree.remove(cameraPanel);
2679		- bigThree.remove(XYZPanel);
2680		- aWindowConstraints.gridx = 0;
2681		- aWindowConstraints.gridy = 0;
2682		- aWindowConstraints.gridwidth = 1;
2683		- // aConstraints.gridheight = 3;
2684		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2685		- aWindowConstraints.weightx = 0;
2686		- aWindowConstraints.weighty = 1;
2687		- bigThree.add(jtp, aWindowConstraints);
2688		- aWindowConstraints.weightx = 1;
2689		- aWindowConstraints.gridwidth = 3;
2690		- // aWindowConstraints.gridheight = 3;
2691		- aWindowConstraints.gridx = 1;
2692		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2693		- bigThree.add(cameraPanel, aWindowConstraints);
2694		- aWindowConstraints.weightx = 0;
2695		- aWindowConstraints.gridx = 4;
2696		- aWindowConstraints.gridwidth = 1;
2697		- // aWindowConstraints.gridheight = 3;
2698		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2699		- //bigThree.add(XYZPanel, aConstraints);
2700		- bigThree.revalidate();
	3610	+
	3611	+ if (CameraPane.FULLSCREEN)
	3612	+ fullscreenLayout = radio.layout;
	3613	+
	3614	+// bigThree.remove(scenePanel);
	3615	+// bigThree.remove(centralPanel);
	3616	+// bigThree.remove(XYZPanel);
	3617	+// aWindowConstraints.gridx = 0;
	3618	+// aWindowConstraints.gridy = 0;
	3619	+// aWindowConstraints.gridwidth = 1;
	3620	+// // aConstraints.gridheight = 3;
	3621	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3622	+// aWindowConstraints.weightx = 0;
	3623	+// aWindowConstraints.weighty = 1;
	3624	+// bigThree.add(scenePanel, aWindowConstraints);
	3625	+// aWindowConstraints.weightx = 1;
	3626	+// aWindowConstraints.gridwidth = 3;
	3627	+// // aWindowConstraints.gridheight = 3;
	3628	+// aWindowConstraints.gridx = 1;
	3629	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3630	+// bigThree.add(centralPanel, aWindowConstraints);
	3631	+// aWindowConstraints.weightx = 0;
	3632	+// aWindowConstraints.gridx = 4;
	3633	+// aWindowConstraints.gridwidth = 1;
	3634	+// // aWindowConstraints.gridheight = 3;
	3635	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3636	+// //bigThree.add(XYZPanel, aConstraints);
	3637	+// bigThree.validate();
	3638	+// scenePanel.setVisible(true);
	3639	+// centralPanel.setVisible(true);
	3640	+// XYZPanel.setVisible(false);
	3641	+ bigThree.ClearUI();
	3642	+ bigThree.add(centralPanel);
	3643	+ bigThree.add(scenePanel);
	3644	+ bigThree.FlushUI();
	3645	+
	3646	+ cameraView.requestFocusInWindow();
2701	3647	} else
2702		- if (event.getSource() == sevenButton)
	3648	+ if (source == sevenButton)
2703	3649	{
2704	3650	radio.layout = sevenButton;
2705		- bigThree.remove(jtp);
2706		- bigThree.remove(cameraPanel);
2707		- bigThree.remove(XYZPanel);
2708		- aWindowConstraints.gridx = 0;
2709		- aWindowConstraints.gridy = 0;
2710		- aWindowConstraints.gridwidth = 1;
2711		- // aWindowConstraints.gridheight = 3;
2712		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2713		- aWindowConstraints.weightx = 0;
2714		- aWindowConstraints.weighty = 1;
2715		- bigThree.add(jtp, aWindowConstraints);
2716		- aWindowConstraints.weightx = 1;
2717		- aWindowConstraints.gridwidth = 3;
2718		- // aWindowConstraints.gridheight = 3;
2719		- aWindowConstraints.gridx = 1;
2720		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2721		- bigThree.add(cameraPanel, aWindowConstraints);
2722		- aWindowConstraints.weightx = 0;
2723		- aWindowConstraints.gridx = 4;
2724		- aWindowConstraints.gridwidth = 1;
2725		- // aConstraints.gridheight = 3;
2726		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2727		- bigThree.add(XYZPanel, aWindowConstraints);
2728		- bigThree.revalidate();
	3651	+
	3652	+ if (CameraPane.FULLSCREEN)
	3653	+ fullscreenLayout = radio.layout;
	3654	+
	3655	+// bigThree.remove(scenePanel);
	3656	+// bigThree.remove(centralPanel);
	3657	+// bigThree.remove(XYZPanel);
	3658	+// aWindowConstraints.gridx = 0;
	3659	+// aWindowConstraints.gridy = 0;
	3660	+// aWindowConstraints.gridwidth = 1;
	3661	+// // aWindowConstraints.gridheight = 3;
	3662	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3663	+// aWindowConstraints.weightx = 0;
	3664	+// aWindowConstraints.weighty = 1;
	3665	+// bigThree.add(scenePanel, aWindowConstraints);
	3666	+// aWindowConstraints.weightx = 1;
	3667	+// aWindowConstraints.gridwidth = 3;
	3668	+// // aWindowConstraints.gridheight = 3;
	3669	+// aWindowConstraints.gridx = 1;
	3670	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3671	+// bigThree.add(centralPanel, aWindowConstraints);
	3672	+// aWindowConstraints.weightx = 0;
	3673	+// aWindowConstraints.gridx = 4;
	3674	+// aWindowConstraints.gridwidth = 1;
	3675	+// // aConstraints.gridheight = 3;
	3676	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3677	+// bigThree.add(XYZPanel, aWindowConstraints);
	3678	+// bigThree.validate();
	3679	+// scenePanel.setVisible(true);
	3680	+// centralPanel.setVisible(true);
	3681	+// XYZPanel.setVisible(true);
	3682	+ bigThree.ClearUI();
	3683	+ bigThree.add(scenePanel);
	3684	+ bigThree.add(centralPanel);
	3685	+ bigThree.add(XYZPanel);
	3686	+ bigThree.FlushUI();
	3687	+
	3688	+ cameraView.requestFocusInWindow();
2729	3689	} else
2730		- if (event.getSource() == rootButton)
	3690	+ if (source == rootButton)
2731	3691	{
2732	3692	Object3D obj;
2733	3693	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2737,66 +3697,84 @@
2737	3697	EditObject(obj);
2738	3698	}
2739	3699
	3700	+ cameraView.requestFocusInWindow();
2740	3701	refreshContents(true);
2741	3702	} else
2742		- if (event.getSource() == closeButton)
	3703	+ if (source == closeButton)
2743	3704	{
2744	3705	//System.out.println("CLOSE: " + buttonGroup.getSelection());
2745	3706	cRadio ab;
2746	3707	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2747	3708	{
2748	3709	ab = (cRadio)e.nextElement();
2749		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3710	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2750	3711	{
	3712	+ // Patch to avoid bug with transparency.
	3713	+ if (!ab.hadMaterial)
	3714	+ {
	3715	+ ab.object.material = null;
	3716	+ }
	3717	+
2751	3718	buttonGroup.remove(ab);
2752	3719	radioPanel.remove(ab);
2753	3720
2754		- ab.GetObject().editWindow = null;
	3721	+ //ab.GetObject().editWindow = null;
	3722	+ ab.GetObject().manipWindow = null;
2755	3723	// ab.GetObject().objectUI = null; // ?????????
2756	3724
2757	3725	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2758	3726	break;
2759	3727	}
2760	3728	}
	3729	+
	3730	+ cameraView.requestFocusInWindow();
2761	3731	refreshContents(true);
2762	3732	} else
2763		- if (event.getSource() == editItem \|\| event.getSource() == editButton)
	3733	+ if (source == editItem \|\| source == editButton)
2764	3734	{
	3735	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3736	+ {
	3737	+ Object3D child = (Object3D)e.nextElement();
	3738	+ child.pinned = true;
	3739	+ }
	3740	+
2765	3741	EditSelection(false);
2766	3742	} else
2767		- if (event.getSource() == uneditButton)
	3743	+ if (source == uneditButton)
2768	3744	{
2769	3745	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2770	3746	{
2771	3747	Object3D child = (Object3D)e.nextElement();
2772	3748	if(child.editWindow != null)
2773	3749	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3750	+ child.pinned = false;
2774	3751	child.CloseUI();
2775	3752	listUI.remove(child);
2776	3753
2777		- child.editWindow = null; // ???????????
	3754	+ //child.editWindow = null; // ???????????
2778	3755	}
2779		- objEditor.ctrlPanel.revalidate();
	3756	+ objEditor.ctrlPanel.FlushUI();
2780	3757	//objEditor.jTree.clearSelection();
2781	3758	//objEditor.ResetSliders();
2782	3759	refreshContents(true);
2783	3760	} else
2784		- if (event.getSource() == clearPanelButton)
	3761	+ if (source == clearPanelButton)
2785	3762	{
2786	3763	assert(copy == group);
2787	3764	//copy.ClearUI();
2788	3765	for (Object3D obj : listUI)
2789	3766	{
	3767	+ obj.pinned = false;
2790	3768	obj.CloseUI();
2791	3769	}
2792	3770	listUI.clear();
2793	3771	refreshContents(true);
2794	3772	} else
2795		- if (event.getSource() == allParamsButton)
	3773	+ if (source == allParamsButton)
2796	3774	{
2797	3775	assert(copy == group);
2798	3776
2799		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3777	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2800	3778
2801	3779	for (Object3D obj : listUI)
2802	3780	{
..	..	@@ -2813,19 +3791,19 @@
2813	3791
2814	3792	refreshContents(true);
2815	3793	} else
2816		- if (event.getSource() == unselectButton)
	3794	+ if (source == unselectButton)
2817	3795	{
2818	3796	objEditor.jTree.clearSelection();
2819	3797	// ?? oct 2012 GrafreeD.clipboard.clear();
2820	3798	objEditor.ResetSliders();
2821	3799	refreshContents(true);
2822	3800	} else
2823		- if(event.getSource() instanceof cRadio)
	3801	+ if(source instanceof cRadio)
2824	3802	{
2825	3803	group.parent = keepparent;
2826	3804	group.attributes = 0;
2827	3805	//group.editWindow = null;
2828		- /cRadio/ radio = (cRadio)event.getSource();
	3806	+ /cRadio/ radio = (cRadio)source;
2829	3807	Object3D obj = radio.GetObject();
2830	3808	System.out.println("Edit " + obj);
2831	3809	if (true) // obj instanceof Composite) // obj.parent == null) // obj instanceof Composite)
..	..	@@ -2845,7 +3823,10 @@
2845	3823	}
2846	3824
2847	3825	copy = group;
2848		- //CameraPane.theRenderer.object = group;
	3826	+
	3827	+ SetUndoStates();
	3828	+
	3829	+ //Globals.theRenderer.object = group;
2849	3830	if(!useclient)
2850	3831	{
2851	3832	cameraView.renderCamera = radio.camera;
..	..	@@ -2854,25 +3835,52 @@
2854	3835	cameraView.cameras[cameraView.cameracount] = radio.camera;
2855	3836	cameraView.targetLookAt.set(radio.camera.lookAt);
2856	3837	cameraView.object = group;
2857		- cameraView.lighttouched = true;
	3838	+ //cameraView.lighttouched = true;
	3839	+ Globals.lighttouched = true;
2858	3840	topView.object = group;
2859	3841	frontView.object = group;
2860	3842	sideView.object = group;
2861	3843	}
2862		- group.editWindow = this;
	3844	+
	3845	+// fix "+" issue
	3846	+ //group.editWindow = this;
	3847	+ group.manipWindow = this;
	3848	+
2863	3849	/*
2864	3850	currentLayout = radio.layout;
2865	3851	if (currentLayout == null)
2866	3852	currentLayout = sevenButton;
2867	3853	*/
2868	3854	radio.layout.doClick();
	3855	+
	3856	+ ClearUnpinned();
	3857	+ //Grafreed.Assert(group != null);
	3858	+ //Grafreed.Assert(group.selection != null);
	3859	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	3860	+ if (group.selection == null \|\| group.selection.size() == 1)
	3861	+ EditSelection(false);
2869	3862	keepparent = group.parent;
2870	3863	// PARENT = NULL or not???
2871	3864	//group.parent = null; // ROOT
2872	3865	//group.attributes = -1;
2873	3866	ResetModel();
	3867	+
	3868	+ cameraView.requestFocusInWindow();
2874	3869	refreshContents(true);
2875		- }
	3870	+ } else if (event.getSource() == editCameraItem)
	3871	+ {
	3872	+ cameraView.ProtectCamera();
	3873	+ cameraView.repaint();
	3874	+ return;
	3875	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
	3876	+ {
	3877	+ cameraView.RevertCamera();
	3878	+ cameraView.repaint();
	3879	+ return;
	3880	+ // } else if (event.getSource() == textureButton)
	3881	+ // {
	3882	+ // return; // true;
	3883	+ }
2876	3884	else
2877	3885	{
2878	3886	//return super.action(event, arg);
..	..	@@ -2881,7 +3889,6 @@
2881	3889	}
2882	3890
2883	3891	boolean useclient = false;
2884		- cRadio radio;
2885	3892
2886	3893	void ToggleRoot()
2887	3894	{
..	..	@@ -2890,7 +3897,7 @@
2890	3897	if (useclient)
2891	3898	{
2892	3899	cameraView.object = client;
2893		- cameraView.lighttouched = true;
	3900	+ Globals.lighttouched = true;
2894	3901	//topView.object = client;
2895	3902	//frontView.object = client;
2896	3903	//sideView.object = client;
..	..	@@ -2898,7 +3905,7 @@
2898	3905	else
2899	3906	{
2900	3907	cameraView.object = group;
2901		- cameraView.lighttouched = true;
	3908	+ Globals.lighttouched = true;
2902	3909	//topView.object = group;
2903	3910	//frontView.object = group;
2904	3911	//sideView.object = group;
..	..	@@ -2933,6 +3940,28 @@
2933	3940	refreshContents();
2934	3941	}
2935	3942
	3943	+ void TransformChildren()
	3944	+ {
	3945	+ Object3D obj;
	3946	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3947	+ {
	3948	+ obj = (Object3D)e.nextElement();
	3949	+ obj.KeepTextureMatrices();
	3950	+ obj.TransformChildren();
	3951	+ obj.RestoreTextureMatrices();
	3952	+
	3953	+// if (obj.parent == null)
	3954	+// {
	3955	+// System.out.println("NULL PARENT!");
	3956	+// new Exception().printStackTrace();
	3957	+// }
	3958	+// else
	3959	+// TouchTransform(obj);
	3960	+// //obj.parent.Touch();
	3961	+ }
	3962	+
	3963	+ refreshContents();
	3964	+ }
2936	3965
2937	3966	void ResetTransform()
2938	3967	{
..	..	@@ -3045,7 +4074,7 @@
3045	4074	refreshContents();
3046	4075	}
3047	4076
3048		- void ResetCentroid()
	4077	+ void ResetCentroid(boolean full)
3049	4078	{
3050	4079	Object3D obj;
3051	4080	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3060,12 +4089,16 @@
3060	4089	LA.matIdentity(Object3D.mat);
3061	4090	obj.getBounds(minima, maxima, false);
3062	4091	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3063		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	4092	+ if (full)
	4093	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3064	4094	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3065	4095	obj.TransformMesh(Object3D.mat);
	4096	+
3066	4097	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3067		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	4098	+ if (full)
	4099	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3068	4100	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	4101	+
3069	4102	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3070	4103	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3071	4104	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3094,7 +4127,8 @@
3094	4127
3095	4128	int size = obj.MemorySize();
3096	4129
3097		- System.err.println((size/1024) + " KB is the size of " + obj);
	4130	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	4131	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3098	4132	}
3099	4133	}
3100	4134	catch (Exception e)
..	..	@@ -3131,9 +4165,9 @@
3131	4165	obj = (Object3D)e.nextElement();
3132	4166
3133	4167	System.out.println("Object is: " + obj);
3134		- GrafreeD.AnalyzeObject(obj);
	4168	+ Grafreed.AnalyzeObject(obj);
3135	4169	System.out.println("Boundary rep: " + obj.bRep);
3136		- GrafreeD.AnalyzeObject(obj.bRep);
	4170	+ Grafreed.AnalyzeObject(obj.bRep);
3137	4171
3138	4172	// System.err.println((size/1024) + " KB is the size of " + obj);
3139	4173	}
..	..	@@ -3175,6 +4209,20 @@
3175	4209	void GenNormals(boolean crease)
3176	4210	{
3177	4211	group.GenNormalsS(crease);
	4212	+
	4213	+ refreshContents();
	4214	+ }
	4215	+
	4216	+ void GenNormalsMESH()
	4217	+ {
	4218	+ group.GenNormalsMeshS();
	4219	+
	4220	+ refreshContents();
	4221	+ }
	4222	+
	4223	+ void GenNormalsMINE()
	4224	+ {
	4225	+ group.selection.GenNormalsMINE();
3178	4226
3179	4227	refreshContents();
3180	4228	}
..	..	@@ -3340,8 +4388,8 @@
3340	4388
3341	4389	void ParseVertices()
3342	4390	{
3343		- boolean epsequal = GrafreeD.epsequal;
3344		- GrafreeD.epsequal = true;
	4391	+ boolean epsequal = Grafreed.epsequal;
	4392	+ Grafreed.epsequal = true;
3345	4393
3346	4394	for (int i=0; i<group.selection.size(); i++)
3347	4395	{
..	..	@@ -3366,7 +4414,7 @@
3366	4414	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3367	4415	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3368	4416
3369		- g.add(GrafreeD.clipboard);
	4417	+ g.add(Grafreed.clipboard);
3370	4418
3371	4419	buffer.add(g);
3372	4420	}
..	..	@@ -3381,7 +4429,7 @@
3381	4429	makeSomething(buffer, i==group.selection.size()-1);
3382	4430	}
3383	4431
3384		- GrafreeD.epsequal = epsequal;
	4432	+ Grafreed.epsequal = epsequal;
3385	4433
3386	4434	refreshContents();
3387	4435	}
..	..	@@ -3399,7 +4447,16 @@
3399	4447	String pigment = Object3D.GetPigment(tex);
3400	4448	//String bump = Object3D.GetBump(tex);
3401	4449
3402		- com.sun.opengl.util.texture.TextureData texturedata = CameraPane.theRenderer.GetTextureData(pigment, false, node.texres);
	4450	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	4451	+
	4452	+ try
	4453	+ {
	4454	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
	4455	+ }
	4456	+ catch (Exception e)
	4457	+ {
	4458	+ System.err.println("FAIL: " + node);
	4459	+ }
3403	4460
3404	4461	double s = v.s;
3405	4462
..	..	@@ -3447,12 +4504,26 @@
3447	4504
3448	4505	void Align()
3449	4506	{
	4507	+ if (group.selection.size() == 0)
	4508	+ return;
	4509	+
	4510	+ cVector bbmin = new cVector();
	4511	+ cVector bbmax = new cVector();
	4512	+
	4513	+ group.selection.get(0).getBounds(bbmin, bbmax, true);
	4514	+
	4515	+ double dx = bbmax.x - bbmin.x;
	4516	+ double dy = bbmax.y - bbmin.y;
	4517	+ double dz = bbmax.z - bbmin.z;
	4518	+
	4519	+ double scale = Math.sqrt(dxdx + dydy + dz*dz);
	4520	+
3450	4521	for (int i=0; i<group.selection.size(); i++)
3451	4522	{
3452	4523	Object3D obj = group.selection.get(i);
3453	4524
3454		- LA.matTranslate(obj.toParent, i/2f, 0, 0);
3455		- LA.matTranslateInv(obj.fromParent, -i/2f, 0, 0);
	4525	+ LA.matTranslate(obj.toParent, i * scale, 0, 0);
	4526	+ LA.matTranslateInv(obj.fromParent, -i * scale, 0, 0);
3456	4527	}
3457	4528
3458	4529	refreshContents();
..	..	@@ -3473,11 +4544,11 @@
3473	4544
3474	4545	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3475	4546
3476		- boolean random = CameraPane.RANDOM;
3477		- CameraPane.RANDOM = false; // parse all random nodes
	4547	+ boolean random = CameraPane.SWITCH;
	4548	+ CameraPane.SWITCH = false; // parse all random nodes
3478	4549	lowres.linkVerticesThis(null);
3479	4550	lowres.linkVerticesThis(sn);
3480		- CameraPane.RANDOM = random;
	4551	+ CameraPane.SWITCH = random;
3481	4552
3482	4553	System.err.flush();
3483	4554
..	..	@@ -3517,7 +4588,7 @@
3517	4588	return;
3518	4589
3519	4590	Object3D poses = group.selection.get(0);
3520		- Object3D ref = GrafreeD.clipboard.get(0);
	4591	+ Object3D ref = Grafreed.clipboard.get(0);
3521	4592
3522	4593	Object3D newgroup = new Object3D("Po:" + poses.name);
3523	4594
..	..	@@ -3686,7 +4757,7 @@
3686	4757	group.selection.RelinkToSupport(); // july 2014
3687	4758	System.out.println("DONE.");
3688	4759	refreshContents();
3689		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	4760	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
3690	4761	}
3691	4762
3692	4763	void ReduceMesh(boolean reduction34)
..	..	@@ -3711,9 +4782,9 @@
3711	4782
3712	4783	void ClipMesh()
3713	4784	{
3714		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	4785	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3715	4786	{
3716		- Object3D content = GrafreeD.clipboard.get(0);
	4787	+ Object3D content = Grafreed.clipboard.get(0);
3717	4788
3718	4789	if (content instanceof cGroup && ((cGroup)content).transientlink )
3719	4790	content = ((cGroup)content).get(0);
..	..	@@ -3722,7 +4793,7 @@
3722	4793	// {
3723	4794	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3724	4795	// }
3725		- group.selection.ClipMesh(GrafreeD.clipboard);
	4796	+ group.selection.ClipMesh(Grafreed.clipboard);
3726	4797	}
3727	4798	// group.selection.ClipMesh(GrafreeD.clipboard);
3728	4799	System.out.println("DONE.");
..	..	@@ -3769,6 +4840,18 @@
3769	4840	void MarkLeaves(boolean hide)
3770	4841	{
3771	4842	group.selection.MarkLeaves(hide);
	4843	+ refreshContents();
	4844	+ }
	4845	+
	4846	+ void RewindLeaves(boolean hide)
	4847	+ {
	4848	+ group.selection.RewindLeaves(hide);
	4849	+ refreshContents();
	4850	+ }
	4851	+
	4852	+ void RandomLeaves(boolean hide)
	4853	+ {
	4854	+ group.selection.RandomLeaves(hide);
3772	4855	refreshContents();
3773	4856	}
3774	4857
..	..	@@ -3843,28 +4926,25 @@
3843	4926	// }
3844	4927	// }
3845	4928
3846		- static boolean allparams = true;
3847		-
3848		- static Vector<Object3D> listUI = new Vector<Object3D>();
3849		-
3850	4929	void EditSelection(boolean newWindow)
3851	4930	{
	4931	+ if (group.selection == null)
	4932	+ {
	4933	+ EditElement(group, newWindow); // ? new
	4934	+ return;
	4935	+ }
	4936	+
3852	4937	// aConstraints.gridy = 0;
3853	4938	for (int i=0; i<group.selection.size(); i++)
3854	4939	{
3855	4940	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
3856	4941	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
3857		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4942	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3858	4943
3859	4944	Object3D elem = (Object3D)group.selection.elementAt(i);
3860		- if(elem != group)
	4945	+ if(elem != group \|\| !newWindow)
3861	4946	{
3862		- // if (!(elem instanceof Composite))
3863		- // newWindow = false;
3864		- listUI.add(elem);
3865		- elem.openEditWindow(this, newWindow); //, false);
3866		- System.out.println("edit : " + elem);
3867		- elem.editWindow.refreshContents(true); // ? new
	4947	+ EditElement(elem, newWindow); // ? new
3868	4948	}
3869	4949	}
3870	4950	}
..	..	@@ -3939,7 +5019,8 @@
3939	5019	//new Exception().printStackTrace();
3940	5020
3941	5021	freezemodel = true;
3942		-
	5022	+ ClearUnpinned();
	5023	+
3943	5024	/**/
3944	5025	//switch (event.id)
3945	5026	{
..	..	@@ -3947,7 +5028,6 @@
3947	5028	//case 702: // Event.LIST_DESELECT
3948	5029	group.deselectAll();
3949	5030	TreePath tps[] = objEditor.jTree.getSelectionPaths();
3950		- objEditor.ClearInfo(); // .GetMaterial());
3951	5031	if (tps != null)
3952	5032	{
3953	5033	for (int i=0; i < tps.length; i++)
..	..	@@ -3956,33 +5036,39 @@
3956	5036
3957	5037	//if (child.parent != null)
3958	5038	//child.parent.addSelectee(child);
	5039	+ objEditor.SetMaterial(child);
3959	5040	group.addSelectee(child);
3960		- objEditor.SetMaterial(child); // .GetMaterial());
3961		- objEditor.AddInfo(child, this, true); // .GetMaterial());
3962		- System.err.println("info : " + child.GetPath());
3963	5041	}
3964	5042	}
3965		- else
3966		- {
3967		- objEditor.SetMaterial(group); // .GetMaterial());
3968		- objEditor.AddInfo(group, this, true); // .GetMaterial());
3969		- System.err.println("info : " + group.GetPath());
3970		- }
	5043	+// else
	5044	+// {
	5045	+// objEditor.SetMaterial(group); // .GetMaterial());
	5046	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	5047	+// System.err.println("info : " + group.GetPath());
	5048	+// }
3971	5049
3972		- objEditor.SetText(); // jan 2014
3973		-
3974		- if (flashIt && !CameraPane.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	5050	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
3975	5051	CameraPane.flash = true;
3976	5052
3977		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	5053	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
3978	5054	// a camera
3979	5055	{
3980		- CameraPane.camerachangeframe = 0; // don't refuse it
3981		- CameraPane.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
3982		- // CameraPane.theRenderer.renderCamera = CameraPane.theRenderer.manipCamera;
3983		- // CameraPane.theRenderer.eyeCamera = CameraPane.theRenderer.manipCamera;
	5056	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
	5057	+ {
	5058	+ CameraPane.camerachangeframe = 0; // don't refuse it
	5059	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	5060	+ }
	5061	+ // Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
	5062	+ // Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
3984	5063	}
3985	5064
	5065	+ if (tps != null && tps.length == 1)
	5066	+ {
	5067	+ EditSelection(false);
	5068	+ }
	5069	+
	5070	+ SetPinStates(tps != null && tps.length > 0);
	5071	+
3986	5072	refreshContents();
3987	5073	//return true;
3988	5074	}
..	..	@@ -3991,6 +5077,35 @@
3991	5077
3992	5078	freezemodel = false;
3993	5079	}
	5080	+
	5081	+ void SetPinStates(boolean enabled)
	5082	+ {
	5083	+ editButton.setEnabled(enabled);
	5084	+ uneditButton.setEnabled(enabled);
	5085	+ unselectButton.setEnabled(enabled);
	5086	+ flashSelectionButton.setEnabled(enabled);
	5087	+ }
	5088	+
	5089	+ void refreshContents(boolean cp)
	5090	+ {
	5091	+ if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5092	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
	5093	+ {
	5094	+ objEditor.ClearInfo(); // .GetMaterial());
	5095	+
	5096	+ for (int i=0; i < group.selection.Size(); i++)
	5097	+ {
	5098	+ Object3D child = (Object3D) group.selection.get(i);
	5099	+
	5100	+ objEditor.AddInfo(child, this, true);
	5101	+ System.err.println("info : " + child.GetPath());
	5102	+ }
	5103	+
	5104	+ objEditor.SetText(); // jan 2014
	5105	+ }
	5106	+
	5107	+ super.refreshContents(cp);
	5108	+ }
3994	5109
3995	5110	void linkSomething(Object3D thing)
3996	5111	{
..	..	@@ -4062,16 +5177,19 @@
4062	5177	{
4063	5178	if (group.selection.isEmpty())
4064	5179	return;
4065		- GrafreeD.clipboardIsTempGroup = false;
	5180	+
	5181	+ Grafreed.clipboardIsTempGroup = false;
4066	5182	Composite tGroup = null;
4067	5183	if (group.selection.size() > 0) // 1)
4068	5184	{
4069	5185	tGroup = new cGroup();
4070		- GrafreeD.clipboardIsTempGroup = true;
	5186	+ Grafreed.clipboardIsTempGroup = true;
4071	5187	}
4072	5188
4073	5189	if (cut)
4074	5190	{
	5191	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5192	+// Save();
4075	5193	//int indices[] = jList.getSelectedIndices();
4076	5194	//for (int i = indices.length - 1; i >= 0; i--)
4077	5195	//jList.remove(indices[i]);
..	..	@@ -4107,16 +5225,16 @@
4107	5225	//System.out.println("cut " + child);
4108	5226	//System.out.println("parent = " + child.parent);
4109	5227	// tmp.addChild(child);
4110		- if (GrafreeD.clipboardIsTempGroup)
	5228	+ if (Grafreed.clipboardIsTempGroup)
4111	5229	tGroup.add/Child/(tmp);
4112	5230	else
4113		- GrafreeD.clipboard = tmp;
	5231	+ Grafreed.clipboard = tmp;
4114	5232	}
4115	5233	else
4116		- if (GrafreeD.clipboardIsTempGroup)
	5234	+ if (Grafreed.clipboardIsTempGroup)
4117	5235	tGroup.add/Child/(child);
4118	5236	else
4119		- GrafreeD.clipboard = child;
	5237	+ Grafreed.clipboard = child;
4120	5238	}
4121	5239
4122	5240	//ResetModel();
..	..	@@ -4148,21 +5266,23 @@
4148	5266	//System.out.println("cut " + elem);
4149	5267	//System.out.println("parent = " + elem.parent);
4150	5268	// tmp.addChild(elem);
4151		- if (GrafreeD.clipboardIsTempGroup)
	5269	+ if (Grafreed.clipboardIsTempGroup)
4152	5270	tGroup.add/Child/(tmp);
4153	5271	else
4154		- GrafreeD.clipboard = tmp;
	5272	+ Grafreed.clipboard = tmp;
4155	5273	}
4156	5274	else
4157		- if (GrafreeD.clipboardIsTempGroup)
	5275	+ if (Grafreed.clipboardIsTempGroup)
4158	5276	tGroup.add/Child/(child);
4159	5277	else
4160		- GrafreeD.clipboard = child;
	5278	+ Grafreed.clipboard = child;
4161	5279	}
4162	5280
4163	5281	}
4164		- if (GrafreeD.clipboardIsTempGroup)
4165		- GrafreeD.clipboard = tGroup;
	5282	+
	5283	+ if (Grafreed.clipboardIsTempGroup)
	5284	+ Grafreed.clipboard = tGroup;
	5285	+
4166	5286	if (cut)
4167	5287	{
4168	5288	ResetModel();
..	..	@@ -4172,11 +5292,15 @@
4172	5292
4173	5293	void paste(boolean expand)
4174	5294	{
	5295	+ if (Globals.REPLACEONMAKE)
	5296	+ Save();
	5297	+ boolean keep = Globals.REPLACEONMAKE;
	5298	+ Globals.REPLACEONMAKE = false;
4175	5299	// if (GrafreeD.clipboard == null)
4176	5300	// return;
4177	5301	boolean first = true;
4178	5302
4179		- if (GrafreeD.clipboardIsTempGroup)
	5303	+ if (Grafreed.clipboardIsTempGroup)
4180	5304	{
4181	5305	Composite temp;
4182	5306
..	..	@@ -4187,7 +5311,7 @@
4187	5311	temp = (Composite)Applet3D.clipboard.deepCopy();
4188	5312	*/
4189	5313	Object3D elem;
4190		- for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	5314	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4191	5315	{
4192	5316	Object3D child = (Object3D)e.nextElement();
4193	5317
..	..	@@ -4221,21 +5345,22 @@
4221	5345	//Object3D cb = Applet3D.clipboard;
4222	5346	//temp.addChild(cb);
4223	5347	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4224		- assert(GrafreeD.clipboard.parent == null);
4225		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
4226		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4227		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4228		- makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
	5348	+ assert(Grafreed.clipboard.parent == null);
	5349	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	5350	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	5351	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	5352	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4229	5353	else
4230		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4231		- GrafreeD.clipboard.get(0).parent = keepparent;
	5354	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	5355	+ Grafreed.clipboard.get(0).parent = keepparent;
4232	5356	}
4233	5357
	5358	+ Globals.REPLACEONMAKE = keep;
4234	5359	ResetModel();
4235	5360	refreshContents();
4236	5361	}
4237	5362
4238		- void pasteInto(boolean copyit)
	5363	+ void pasteInto(boolean copyit, boolean clone)
4239	5364	{
4240	5365	// if (GrafreeD.clipboard == null)
4241	5366	// return;
..	..	@@ -4264,15 +5389,22 @@
4264	5389	if (copyit)
4265	5390	{
4266	5391	// paste(false);
4267		- CloneClipboard(false); // sept 2014
	5392	+ if (clone)
	5393	+ {
	5394	+ CloneClipboard(false); // sept 2014
	5395	+ }
	5396	+ else
	5397	+ {
	5398	+ paste(false);
	5399	+ }
4268	5400	}
4269	5401	else
4270	5402	{
4271	5403	boolean first = true;
4272	5404
4273		- if (GrafreeD.clipboardIsTempGroup)
	5405	+ if (Grafreed.clipboardIsTempGroup)
4274	5406	{
4275		- Composite temp = (Composite)GrafreeD.clipboard;
	5407	+ Composite temp = (Composite)Grafreed.clipboard;
4276	5408	Object3D copy;
4277	5409	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4278	5410	{
..	..	@@ -4282,7 +5414,7 @@
4282	5414	}
4283	5415	} else
4284	5416	{
4285		- linkSomething(GrafreeD.clipboard); //.get(0));
	5417	+ linkSomething(Grafreed.clipboard); //.get(0));
4286	5418	}
4287	5419	}
4288	5420	}
..	..	@@ -4359,6 +5491,10 @@
4359	5491
4360	5492	void group(Object3D csg, boolean grab)
4361	5493	{
	5494	+ if (Globals.REPLACEONMAKE)
	5495	+ Save();
	5496	+ boolean keep = Globals.REPLACEONMAKE;
	5497	+ Globals.REPLACEONMAKE = false;
4362	5498	if (//false) // why??
4363	5499	!group.selection.isEmpty())
4364	5500	{
..	..	@@ -4472,8 +5608,34 @@
4472	5608	//node.add(csg);
4473	5609	//makeSomething(node);
4474	5610	makeSomething(csg);
	5611	+ Globals.REPLACEONMAKE = keep;
4475	5612	}
4476	5613
	5614	+ void Ungroup(Object3D g)
	5615	+ {
	5616	+ if (Globals.REPLACEONMAKE)
	5617	+ Save();
	5618	+ boolean keep = Globals.REPLACEONMAKE;
	5619	+ Globals.REPLACEONMAKE = false;
	5620	+ if (g instanceof HiddenObject)
	5621	+ {
	5622	+ HiddenObject h = (HiddenObject) g;
	5623	+
	5624	+ for (int i=0; i<h.ActualSize(); i++)
	5625	+ {
	5626	+ objEditor.makeSomething(h.get(i), false);
	5627	+ }
	5628	+ }
	5629	+ else
	5630	+ {
	5631	+ for (int i=0; i<g.Size(); i++)
	5632	+ {
	5633	+ objEditor.makeSomething(g.get(i), false);
	5634	+ }
	5635	+ }
	5636	+ Globals.REPLACEONMAKE = keep;
	5637	+ }
	5638	+
4477	5639	void ungroup()
4478	5640	{
4479	5641	/*
..	..	@@ -4667,21 +5829,6 @@
4667	5829	}
4668	5830	*/
4669	5831
4670		- void ImportGFD()
4671		- {
4672		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4673		- browser.show();
4674		- String filename = browser.getFile();
4675		- if (filename != null && filename.length() > 0)
4676		- {
4677		- String fullname = browser.getDirectory() + filename;
4678		-
4679		- //Object3D readobj =
4680		- objEditor.ReadGFD(fullname, objEditor);
4681		- //makeSomething(readobj);
4682		- }
4683		- }
4684		-
4685	5832	/*
4686	5833	public void Callback(Object obj)
4687	5834	{
..	..	@@ -4705,26 +5852,9 @@
4705	5852	}
4706	5853	*/
4707	5854
4708		- void ImportVRMLX3D()
4709		- {
4710		- if (GrafreeD.standAlone)
4711		- {
4712		- /**/
4713		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4714		- browser.show();
4715		- String filename = browser.getFile();
4716		- if (filename != null && filename.length() > 0)
4717		- {
4718		- String fullname = browser.getDirectory() + filename;
4719		- LoadVRMLX3D(fullname);
4720		- }
4721		- /**/
4722		- }
4723		- }
4724		-
4725	5855	String GetFile(String dialogName)
4726	5856	{
4727		- if (GrafreeD.standAlone)
	5857	+ if (Grafreed.standAlone)
4728	5858	{
4729	5859	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4730	5860	browser.show();
..	..	@@ -4788,10 +5918,49 @@
4788	5918	cButton flashSelectionButton;
4789	5919	cButton editButton;
4790	5920	cButton uneditButton;
	5921	+ JCheckBox allParamsButton;
4791	5922	cButton clearpanelButton;
4792		- cButton allParamsButton;
4793	5923	cButton unselectButton;
4794	5924
	5925	+ cButton restoreCameraButton;
	5926	+
	5927	+ cButton saveButton;
	5928	+ cButton oneStepButton;
	5929	+
	5930	+ cButton groupButton;
	5931	+ cButton ungroupButton;
	5932	+ cButton compositeButton;
	5933	+ cButton switchButton;
	5934	+ cButton loopButton;
	5935	+ cButton textureButton;
	5936	+
	5937	+ cButton skybox1Button;
	5938	+ cButton skybox2Button;
	5939	+ cButton skybox3Button;
	5940	+ cButton skybox4Button;
	5941	+ cButton skybox5Button;
	5942	+ cButton skybox6Button;
	5943	+ cButton skybox7Button;
	5944	+
	5945	+ cButton skybox11Button;
	5946	+ cButton skybox12Button;
	5947	+ cButton skybox13Button;
	5948	+ cButton skybox14Button;
	5949	+ cButton skybox15Button;
	5950	+ cButton skybox16Button;
	5951	+ cButton skybox17Button;
	5952	+
	5953	+ cButton gridButton;
	5954	+ cButton boxButton;
	5955	+ cButton sphereButton;
	5956	+ cButton coneButton;
	5957	+ cButton torusButton;
	5958	+ cButton superButton;
	5959	+ cButton kleinButton;
	5960	+ cButton particlesButton;
	5961	+ cButton overlayButton;
	5962	+ cButton lightButton;
	5963	+
4795	5964	cButton screenfitButton;
4796	5965	cButton screenfitpointButton;
4797	5966	cButton snapobjectButton;
..	..	@@ -4803,14 +5972,6 @@
4803	5972
4804	5973	cButton setsupportButton;
4805	5974
4806		- cButton twoButton;
4807		- cButton sixButton;
4808		- cButton threeButton;
4809		- cButton sevenButton;
4810		- cButton fourButton; // full panel
4811		- cButton oneButton; // full XYZ
4812		- //cButton currentLayout;
4813		-
4814	5975	//
4815	5976	//Composite
4816	5977	Object3D // to do !!
..	..	@@ -4820,9 +5981,11 @@
4820	5981	//JTree jTree;
4821	5982	private MenuItem lookAtItem;
4822	5983	private MenuItem lookFromItem;
4823		- private MenuItem switchItem;
	5984	+ private MenuItem switchViewItem;
4824	5985	private MenuItem cutItem;
4825		- private MenuItem duplicateItem;
	5986	+ private MenuItem undoItem;
	5987	+ private MenuItem redoItem;
	5988	+ private JMenuItem duplicateItem;
4826	5989	private MenuItem cloneItem;
4827	5990	private MenuItem cloneSupportItem;
4828	5991	private MenuItem overwriteGeoItem;
..	..	@@ -4833,8 +5996,9 @@
4833	5996	private MenuItem resetsupportItem;
4834	5997	private MenuItem resetreferencesItem;
4835	5998	private MenuItem linkverticesItem;
	5999	+ private MenuItem relinkverticesItem;
4836	6000	private MenuItem setMasterItem;
4837		- private MenuItem resetMeshItem;
	6001	+ private MenuItem resetAllItem;
4838	6002	private MenuItem stepAllItem;
4839	6003	private MenuItem revertMeshItem;
4840	6004	private MenuItem poseMeshItem;
..	..	@@ -4845,15 +6009,17 @@
4845	6009	private MenuItem mergeGeometriesItem;
4846	6010	private MenuItem copyItem;
4847	6011	private MenuItem pasteItem;
	6012	+ private MenuItem pasteIntoItem;
4848	6013	private MenuItem pasteLinkItem;
4849	6014	private MenuItem pasteCloneItem;
4850	6015	private MenuItem pasteExpandItem;
4851		- private MenuItem clearItem;
	6016	+ private MenuItem deleteItem;
4852	6017	private MenuItem clearAllItem;
4853	6018	private MenuItem genUVItem;
4854	6019	private MenuItem genNormalsMESHItem;
4855	6020	private MenuItem genNormalsCADItem;
4856	6021	private MenuItem genNormalsORGANItem;
	6022	+ private MenuItem genNormalsMINEItem;
4857	6023	private MenuItem stripifyItem;
4858	6024	private MenuItem unstripifyItem;
4859	6025	private MenuItem trimItem;
..	..	@@ -4882,6 +6048,10 @@
4882	6048	private MenuItem showleavesItem;
4883	6049	private MenuItem markleavesItem;
4884	6050	private MenuItem unmarkleavesItem;
	6051	+ private MenuItem rewindleavesItem;
	6052	+ private MenuItem unrewindleavesItem;
	6053	+ private MenuItem randomleavesItem;
	6054	+ private MenuItem unrandomleavesItem;
4885	6055
4886	6056	private MenuItem flipVItem;
4887	6057	private MenuItem unflipVItem;
..	..	@@ -4893,14 +6063,17 @@
4893	6063	private MenuItem panoTexturesItem;
4894	6064
4895	6065	private MenuItem resetCentroidItem;
4896		- private MenuItem transformgeometryItem;
	6066	+ private MenuItem resetCentroidXZItem;
4897	6067	private MenuItem resetTransformItem;
	6068	+ private MenuItem transformGeometryItem;
	6069	+ private MenuItem transformChildrenItem;
	6070	+ private MenuItem hideItem;
4898	6071	private MenuItem grabItem;
4899	6072	private MenuItem backItem;
4900	6073	private MenuItem frontItem;
4901	6074	private MenuItem cameraItem;
4902	6075	private MenuItem compositeItem;
4903		- private MenuItem randomItem;
	6076	+ private MenuItem switchItem;
4904	6077	private MenuItem physicsItem;
4905	6078	private MenuItem frameselectorItem;
4906	6079	private MenuItem scriptNodeItem;
..	..	@@ -4915,6 +6088,7 @@
4915	6088
4916	6089	private MenuItem resetParentItem;
4917	6090	private MenuItem repairParentItem;
	6091	+ private MenuItem repairShadowItem;
4918	6092	private MenuItem sortbysizeItem;
4919	6093	private MenuItem sortbynameItem;
4920	6094
..	..	@@ -4923,6 +6097,8 @@
4923	6097	private MenuItem attachBumpItem;
4924	6098	private MenuItem detachBumpItem;
4925	6099	private MenuItem pigmentBumpItem;
	6100	+ private MenuItem embedTexturesItem;
	6101	+ private MenuItem deEmbedTexturesItem;
4926	6102
4927	6103	private MenuItem particleItem;
4928	6104	private MenuItem ragdollItem;
..	..	@@ -4935,10 +6111,11 @@
4935	6111	private MenuItem coneItem;
4936	6112	private MenuItem torusItem;
4937	6113	private MenuItem superItem;
	6114	+ private MenuItem kleinItem;
4938	6115	private MenuItem blobItem;
4939	6116	private MenuItem latheItem;
4940	6117	private MenuItem bezierItem;
4941		- private MenuItem checkerItem;
	6118	+ private MenuItem overlayItem;
4942	6119	private MenuItem meshItem;
4943	6120	// private MenuItem meshGroupItem;
4944	6121	private MenuItem springItem;
..	..	@@ -4947,6 +6124,7 @@
4947	6124	private MenuItem csgItem;
4948	6125	private MenuItem templateItem;
4949	6126	private MenuItem textureItem;
	6127	+ private MenuItem billboardItem;
4950	6128	private MenuItem shadowXItem;
4951	6129	private MenuItem shadowYItem;
4952	6130	private MenuItem shadowZItem;
..	..	@@ -4959,11 +6137,6 @@
4959	6137	private MenuItem doubleItem;
4960	6138	private MenuItem tripleItem;
4961	6139
4962		- private MenuItem importGFDItem;
4963		- private MenuItem importVRMLX3DItem;
4964		- private MenuItem import3DSItem;
4965		- private MenuItem importOBJItem;
4966		-
4967	6140	private MenuItem computeAOItem;
4968	6141	private MenuItem recompileItem;
4969	6142	private MenuItem editScriptItem;
..	..	@@ -4973,4 +6146,8 @@
4973	6146	private MenuItem analyzeItem;
4974	6147	private MenuItem dumpItem;
4975	6148	//boolean freezemodel = false;
	6149	+
	6150	+ Menu cameraMenu;
	6151	+ MenuItem editCameraItem;
	6152	+ MenuItem restoreCameraItem;
4976	6153	}