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