~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -74,7 +74,7 @@
74	74	this.copy = this.group = copy;
75	75	//selectees = this.group.selectees;
76	76
77		- SetupMenu2(objEditor);
	77	+ SetupMenu2(this); //objEditor);
78	78	SetupUI2(objEditor);
79	79	objEditor.SetupUI(true);
80	80	SetupViews(objEditor);
..	..	@@ -84,6 +84,10 @@
84	84
85	85	void CloneSelection(boolean supports)
86	86	{
	87	+ if (Globals.SAVEONMAKE)
	88	+ Save();
	89	+ boolean keep = Globals.SAVEONMAKE;
	90	+ Globals.SAVEONMAKE = false;
87	91	// Object3D keep = GrafreeD.clipboard;
88	92	//Object3D obj;
89	93	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -94,18 +98,19 @@
94	98
95	99	makeSomething(clone, i==group.selection.size()-1);
96	100	}
	101	+ Globals.SAVEONMAKE = keep;
97	102	}
98	103
99	104	void CloneClipboard(boolean supports)
100	105	{
101		- assert(GrafreeD.clipboard.parent == null);
102		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
103		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
104		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
105		- makeSomething(CloneObject(GrafreeD.clipboard.get(0), false));
	106	+ assert(Grafreed.clipboard.parent == null);
	107	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	108	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	109	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	110	+ makeSomething(CloneObject(Grafreed.clipboard.get(0), false));
106	111	else
107		- makeSomething(CloneObject(GrafreeD.clipboard, false));
108		- GrafreeD.clipboard.get(0).parent = keepparent;
	112	+ makeSomething(CloneObject(Grafreed.clipboard, false));
	113	+ Grafreed.clipboard.get(0).parent = keepparent;
109	114	}
110	115
111	116	static Object3D CloneObject(Object3D obj, boolean supports)
..	..	@@ -119,7 +124,7 @@
119	124	// obj.support = null;
120	125	if (!supports)
121	126	obj.SaveSupports();
122		- Object3D clone = (Object3D)GrafreeD.clone(obj);
	127	+ Object3D clone = (Object3D)Grafreed.clone(obj);
123	128	obj.parent = parent;
124	129	// obj.support = support;
125	130	// clone.support = support; // aout 2013
..	..	@@ -148,30 +153,29 @@
148	153
149	154	//JTextField nameField;
150	155
151		- void SetupMenu2(ObjEditor oe)
	156	+ void SetupMenu2(GroupEditor oe)
152	157	{
153		- oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
154		- //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
155		- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
156		- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
157		- oe.cameraMenu.add("-");
158		- openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
159		- openWindowItem.addActionListener(this);
160		- editLeafItem.addActionListener(this);
161		- lookAtItem.addActionListener(this);
162		- //lookFromItem.addActinoListener(this);
163		- //switchItem.addActionListener(this);
	158	+ oe.jTree = new cTree();
	159	+
164	160	Menu menu;
165	161	oe.menuBar.add(menu = new Menu("Edit"));
166	162	//editItem = menu.add(new MenuItem("Edit"));
167	163	//editItem.addActionListener(this);
168		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	164	+
	165	+// undoItem = menu.add(new MenuItem("Undo"));
	166	+// undoItem.addActionListener(this);
	167	+// redoItem = menu.add(new MenuItem("Redo"));
	168	+// redoItem.addActionListener(this);
	169	+// menu.add("-");
	170	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
169	171	duplicateItem.addActionListener(this);
170		- menu.add("-");
171	172	cloneItem = menu.add(new MenuItem("Clone"));
172	173	cloneItem.addActionListener(this);
	174	+ if (Globals.ADVANCED)
	175	+ {
173	176	cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
174	177	cloneSupportItem.addActionListener(this);
	178	+ }
175	179	menu.add("-");
176	180	cutItem = menu.add(new MenuItem("Cut"));
177	181	cutItem.addActionListener(this);
..	..	@@ -179,27 +183,123 @@
179	183	copyItem.addActionListener(this);
180	184	pasteItem = menu.add(new MenuItem("Paste"));
181	185	pasteItem.addActionListener(this);
	186	+
	187	+ menu.add("-");
	188	+ pasteIntoItem = menu.add(new MenuItem("Paste into"));
	189	+ pasteIntoItem.addActionListener(this);
182	190	pasteLinkItem = menu.add(new MenuItem("Paste link"));
183	191	pasteLinkItem.addActionListener(this);
184	192	pasteCloneItem = menu.add(new MenuItem("Paste clone"));
185	193	pasteCloneItem.addActionListener(this);
186	194	// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
187	195	// pasteExpandItem.addActionListener(this);
	196	+ menu.add("-");
188	197	clearItem = menu.add(new MenuItem("Clear"));
189	198	clearItem.addActionListener(this);
	199	+
	200	+ if (Globals.ADVANCED)
	201	+ {
	202	+ // Deletes the cameras...
190	203	clearAllItem = menu.add(new MenuItem("Clear All"));
191	204	clearAllItem.addActionListener(this);
	205	+ }
	206	+
	207	+ menuBar.add(cameraMenu = new Menu("View"));
	208	+ //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
	209	+ //zBufferItem.addActionListener(this);
	210	+ //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
	211	+ //normalLensItem.addActionListener(this);
	212	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	213	+ restoreCameraItem.addActionListener(this);
	214	+
	215	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	216	+// toggleFullScreenItem.addItemListener(this);
	217	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	218	+// cameraMenu.add("-");
	219	+//
	220	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	221	+// toggleTextureItem.addItemListener(this);
	222	+// toggleTextureItem.setState(CameraPane.textureon);
	223	+//
	224	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	225	+// toggleSwitchItem.addItemListener(this);
	226	+// toggleSwitchItem.setState(CameraPane.SWITCH);
	227	+
	228	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
	229	+ toggleHandleItem.addItemListener(this);
	230	+ toggleHandleItem.setState(CameraPane.HANDLES);
	231	+
	232	+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
	233	+ togglePaintItem.addItemListener(this);
	234	+ togglePaintItem.setState(CameraPane.PAINTMODE);
	235	+
	236	+ if (Globals.ADVANCED)
	237	+ {
	238	+ cameraMenu.add("-");
	239	+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
	240	+ toggleLiveItem.addItemListener(this);
	241	+ toggleLiveItem.setState(Globals.isLIVE());
192	242
	243	+ cameraMenu.add(stepItem = new MenuItem("Step"));
	244	+ stepItem.addActionListener(this);
	245	+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
	246	+ // toggleDLItem.addItemListener(this);
	247	+ // toggleDLItem.setState(false);
	248	+
	249	+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
	250	+ toggleRenderItem.addItemListener(this);
	251	+ toggleRenderItem.setState(!CameraPane.frozen);
	252	+
	253	+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
	254	+ toggleDebugItem.addItemListener(this);
	255	+ toggleDebugItem.setState(Globals.DEBUG);
	256	+
	257	+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
	258	+ toggleFrustumItem.addItemListener(this);
	259	+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
	260	+
	261	+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
	262	+ toggleFootContactItem.addItemListener(this);
	263	+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
	264	+
	265	+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
	266	+ toggleTimelineItem.addItemListener(this);
	267	+ }
	268	+
	269	+// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
	270	+// toggleRootItem.addItemListener(this);
	271	+// toggleRootItem.setState(false);
	272	+// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
	273	+// animationItem.addItemListener(this);
	274	+// animationItem.setState(CameraPane.ANIMATION);
	275	+ cameraMenu.add("-");
	276	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
	277	+ editCameraItem.addActionListener(this);
	278	+
	279	+ if (Globals.ADVANCED)
	280	+ {
	281	+ oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
	282	+ //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
	283	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
	284	+ editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
	285	+ oe.cameraMenu.add("-");
	286	+ openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
	287	+ openWindowItem.addActionListener(this);
	288	+ editLeafItem.addActionListener(this);
	289	+ lookAtItem.addActionListener(this);
	290	+ //lookFromItem.addActinoListener(this);
	291	+ //switchViewItem.addActionListener(this);
	292	+ }
	293	+
193	294	oe.menuBar.add(menu = new Menu("Setting"));
194		- resetMeshItem = menu.add(new MenuItem("Reset All"));
195		- resetMeshItem.addActionListener(this);
196		- stepAllItem = menu.add(new MenuItem("Step All"));
197		- stepAllItem.addActionListener(this);
	295	+ if (Globals.ADVANCED)
	296	+ {
198	297	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
199	298	revertMeshItem.addActionListener(this);
200	299	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
201	300	resetreferencesItem.addActionListener(this);
202	301	menu.add("-");
	302	+ }
203	303	overwriteGeoItem = menu.add(new MenuItem("Overwrite Geometry"));
204	304	overwriteGeoItem.addActionListener(this);
205	305	overwriteMatItem = menu.add(new MenuItem("Overwrite Material"));
..	..	@@ -211,79 +311,104 @@
211	311	overwriteUVItem = menu.add(new MenuItem("Overwrite UV"));
212	312	overwriteUVItem.addActionListener(this);
213	313	menu.add("-");
	314	+ if (Globals.ADVANCED)
	315	+ {
214	316	generateMeshItem = menu.add(new MenuItem("Generate Meshes"));
215	317	generateMeshItem.addActionListener(this);
216	318	poseMeshItem = menu.add(new MenuItem("Set Pose Meshes"));
217	319	poseMeshItem.addActionListener(this);
218	320	menu.add("-");
	321	+ }
219	322	resetsupportItem = menu.add(new MenuItem("Reset support"));
220	323	resetsupportItem.addActionListener(this);
221	324	linkverticesItem = menu.add(new MenuItem("Link to Support"));
222	325	linkverticesItem.addActionListener(this);
223	326	relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
224	327	relinkverticesItem.addActionListener(this);
	328	+
	329	+ if (Globals.ADVANCED)
	330	+ {
225	331	setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
226	332	setMasterItem.addActionListener(this);
	333	+ }
227	334
228	335	oe.menuBar.add(menu = new Menu("Group"));
229		- grabItem = menu.add(new MenuItem("Grab"));
230		- grabItem.addActionListener(this);
	336	+// grabItem = menu.add(new MenuItem("Grab"));
	337	+// grabItem.addActionListener(this);
231	338	backItem = menu.add(new MenuItem("Back"));
232	339	backItem.addActionListener(this);
233	340	frontItem = menu.add(new MenuItem("Front"));
234	341	frontItem.addActionListener(this);
235		- compositeItem = menu.add(new MenuItem("Composite"));
236		- compositeItem.addActionListener(this);
237		- hideItem = menu.add(new MenuItem("Hide"));
	342	+// compositeItem = menu.add(new MenuItem("Composite"));
	343	+// compositeItem.addActionListener(this);
	344	+
	345	+ if (Globals.ADVANCED)
	346	+ {
	347	+ hideItem = menu.add(new MenuItem("Hidden Group"));
238	348	hideItem.addActionListener(this);
	349	+ }
239	350	ungroupItem = menu.add(new MenuItem("Ungroup"));
240	351	ungroupItem.addActionListener(this);
241		- menu.add("-");
242		- randomItem = menu.add(new MenuItem("Random"));
243		- randomItem.addActionListener(this);
244		- physicsItem = menu.add(new MenuItem("Physics"));
245		- physicsItem.addActionListener(this);
246		- frameselectorItem = menu.add(new MenuItem("Frame Selector"));
247		- frameselectorItem.addActionListener(this);
	352	+
	353	+// menu.add("-");
	354	+//
	355	+// switchItem = menu.add(new MenuItem("Switch node"));
	356	+// switchItem.addActionListener(this);
	357	+ if (Globals.ADVANCED)
	358	+ {
248	359	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
249	360	switchGeoItem.addActionListener(this);
250	361	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
251	362	switchTransfoItem.addActionListener(this);
252		- morphItem = menu.add(new MenuItem("Morph"));
	363	+ morphItem = menu.add(new MenuItem("Morph Group"));
253	364	morphItem.addActionListener(this);
	365	+
	366	+ menu.add("-");
	367	+ physicsItem = menu.add(new MenuItem("Physics"));
	368	+ physicsItem.addActionListener(this);
	369	+ frameselectorItem = menu.add(new MenuItem("Frame Selector"));
	370	+ frameselectorItem.addActionListener(this);
254	371	scriptNodeItem = menu.add(new MenuItem("Script Node"));
255	372	scriptNodeItem.addActionListener(this);
256		- cameraItem = menu.add(new MenuItem("Camera"));
257		- cameraItem.addActionListener(this);
	373	+ }
258	374
259	375	oe.menuBar.add(menu = new Menu("Object"));
260		- textureItem = menu.add(new MenuItem("Texture"));
261		- textureItem.addActionListener(this);
	376	+// textureItem = menu.add(new MenuItem("Texture"));
	377	+// textureItem.addActionListener(this);
262	378	billboardItem = menu.add(new MenuItem("Billboard"));
263	379	billboardItem.addActionListener(this);
264	380	csgItem = menu.add(new MenuItem("CSG"));
265	381	csgItem.addActionListener(this);
266		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	382	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
267	383	shadowXItem.addActionListener(this);
268		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	384	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
269	385	shadowYItem.addActionListener(this);
270		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	386	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
271	387	shadowZItem.addActionListener(this);
	388	+ attributeItem = menu.add(new MenuItem("Attribute"));
	389	+ attributeItem.addActionListener(this);
	390	+
	391	+ if (Globals.ADVANCED)
	392	+ {
	393	+ menu.add("-");
272	394	linkerItem = menu.add(new MenuItem("Linker"));
273	395	linkerItem.addActionListener(this);
274	396	templateItem = menu.add(new MenuItem("Template"));
275	397	templateItem.addActionListener(this);
276		- attributeItem = menu.add(new MenuItem("Attribute"));
277		- attributeItem.addActionListener(this);
278	398	pointflowItem = menu.add(new MenuItem("Point Flow"));
279	399	pointflowItem.addActionListener(this);
	400	+ }
280	401	menu.add("-");
281	402	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
282	403	resetTransformItem.addActionListener(this);
283	404	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
284	405	resetCentroidItem.addActionListener(this);
285		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
286		- transformgeometryItem.addActionListener(this);
	406	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	407	+ resetCentroidXZItem.addActionListener(this);
	408	+ transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
	409	+ transformGeometryItem.addActionListener(this);
	410	+ transformChildrenItem = menu.add(new MenuItem("Transform Children"));
	411	+ transformChildrenItem.addActionListener(this);
287	412
288	413	oe.menuBar.add(menu = new Menu("Geometry"));
289	414	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -294,8 +419,11 @@
294	419	genNormalsCADItem.addActionListener(this);
295	420	genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
296	421	genNormalsMESHItem.addActionListener(this);
	422	+ if (Globals.ADVANCED)
	423	+ {
297	424	genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
298	425	genNormalsMINEItem.addActionListener(this);
	426	+ }
299	427	stripifyItem = menu.add(new MenuItem("Stripify"));
300	428	stripifyItem.addActionListener(this);
301	429	unstripifyItem = menu.add(new MenuItem("Unstripify"));
..	..	@@ -317,23 +445,34 @@
317	445	reduce34MeshItem.addActionListener(this);
318	446	increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
319	447	increaseMeshItem.addActionListener(this);
320		- smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
321		- smoothMeshItem.addActionListener(this);
322	448	clipMeshItem = menu.add(new MenuItem("Clip mesh"));
323	449	clipMeshItem.addActionListener(this);
	450	+
	451	+ if (Globals.ADVANCED)
	452	+ {
	453	+ smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
	454	+ smoothMeshItem.addActionListener(this);
	455	+ }
324	456
325	457	oe.menuBar.add(menu = new Menu("Attributes"));
326	458	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
327	459	clearMaterialsItem.addActionListener(this);
	460	+ resetAllItem = menu.add(new MenuItem("Reset All"));
	461	+ resetAllItem.addActionListener(this);
	462	+ stepAllItem = menu.add(new MenuItem("Step All"));
	463	+ stepAllItem.addActionListener(this);
328	464	menu.add("-");
329	465	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
330	466	liveleavesItem.addActionListener(this);
331	467	unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
332	468	unliveleavesItem.addActionListener(this);
	469	+ if (Globals.ADVANCED)
	470	+ {
333	471	supportleavesItem = menu.add(new MenuItem("Support Leaves"));
334	472	supportleavesItem.addActionListener(this);
335	473	unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
336	474	unsupportleavesItem.addActionListener(this);
	475	+ }
337	476	hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
338	477	hideleavesItem.addActionListener(this);
339	478	showleavesItem = menu.add(new MenuItem("Show Leaves"));
..	..	@@ -342,6 +481,14 @@
342	481	markleavesItem.addActionListener(this);
343	482	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
344	483	unmarkleavesItem.addActionListener(this);
	484	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	485	+ rewindleavesItem.addActionListener(this);
	486	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	487	+ unrewindleavesItem.addActionListener(this);
	488	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	489	+ randomleavesItem.addActionListener(this);
	490	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	491	+ unrandomleavesItem.addActionListener(this);
345	492	menu.add("-");
346	493	flipVItem = menu.add(new MenuItem("Flip V"));
347	494	flipVItem.addActionListener(this);
..	..	@@ -377,35 +524,40 @@
377	524	sortbynameItem = menu.add(new MenuItem("Sort by name"));
378	525	sortbynameItem.addActionListener(this);
379	526	menu.add("-");
	527	+ shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
	528	+ shareGeometriesItem.addActionListener(this);
	529	+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
	530	+ mergeGeometriesItem.addActionListener(this);
	531	+ if (Globals.ADVANCED)
	532	+ {
	533	+ // Pretty much the same as duplicate and clone.
380	534	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
381	535	extractGeometriesItem.addActionListener(this);
382	536	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
383	537	cloneGeometriesItem.addActionListener(this);
384		- shareGeometriesItem = menu.add(new MenuItem("Share Geometry"));
385		- shareGeometriesItem.addActionListener(this);
386		- mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
387		- mergeGeometriesItem.addActionListener(this);
	538	+ }
388	539
389	540	oe.menuBar.add(menu = new Menu("Insert"));
390	541	buildCreateMenu(menu);
391	542
392		-
393		- oe.menuBar.add(menu = new Menu("Include"));
394		- importGFDItem = menu.add(new MenuItem("GrafreeD Object..."));
395		- importGFDItem.addActionListener(this);
396		- importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D Object..."));
397		- importVRMLX3DItem.addActionListener(this);
398		- importOBJItem = menu.add(new MenuItem("OBJ Object..."));
399		- importOBJItem.addActionListener(this);
400		- import3DSItem = menu.add(new MenuItem("3DS Object..."));
401		- import3DSItem.addActionListener(this);
402		-
403	543	oe.menuBar.add(menu = new Menu("Tools"));
404	544	buildToolsMenu(menu);
405	545	}
406	546
407	547	void SetupUI2(ObjEditor oe)
408	548	{
	549	+ // June 2019
	550	+ if (oe == null)
	551	+ {
	552	+ //super.SetupUI2(this);
	553	+ //return;
	554	+ }
	555	+
	556	+ if (copy != group)
	557	+ {
	558	+ //super.SetupUI2(this);
	559	+ }
	560	+
409	561	//new Exception().printStackTrace();
410	562
411	563	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -434,110 +586,217 @@
434	586	oe.radioPanel.add(dummyButton);
435	587	oe.buttonGroup.add(dummyButton);
436	588	*/
437		- aConstraints.gridy += 1;
	589	+ cGridBag copyOptionsPanel = new cGridBag();
	590	+
	591	+ copyOptionsPanel.preferredHeight = 1;
438	592
439	593	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
440	594
441		- oe.aConstraints.gridwidth = 1;
442		- oe.aConstraints.gridx = 0;
	595	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	596	+ //minButton.setToolTipText("Minimize window");
	597	+ //minButton.addActionListener(this);
443	598
444		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE()), oe.aConstraints);
445		- liveCB.setToolTipText("Enabled animation");
446		- liveCB.addItemListener(this);
447		-
448		- oe.aConstraints.gridx += 1;
449		- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK), oe.aConstraints);
450		- trackCB.setToolTipText("Enable tracking");
451		- trackCB.addItemListener(this);
452		-
453		- oe.aConstraints.gridx += 1;
454		- oe.toolbarPanel.add(screenfitButton = new cButton("@ ")); //, oe.aConstraints);
	599	+ if (Globals.ADVANCED)
	600	+ {
	601	+ oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	602	+ maxButton.setToolTipText("Maximize window");
	603	+ maxButton.addActionListener(this);
	604	+ }
	605	+
	606	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	607	+ fullButton.setToolTipText("Full-screen window");
	608	+ fullButton.addActionListener(this);
	609	+
	610	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
455	611	screenfitButton.setToolTipText("Screen fit");
456	612	screenfitButton.addActionListener(this);
457		- oe.aConstraints.gridx += 1;
	613	+
	614	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	615	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	616	+ restoreCameraButton.addActionListener(this);
	617	+
	618	+ copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	619	+ undoButton.setToolTipText("Undo changes");
	620	+ undoButton.addActionListener(this);
	621	+ undoButton.setEnabled(false);
	622	+
	623	+ copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	624	+ redoButton.setToolTipText("Redo changes");
	625	+ redoButton.addActionListener(this);
	626	+ redoButton.setEnabled(false);
	627	+
	628	+ copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	629	+ saveButton.setToolTipText("Save changes");
	630	+ saveButton.addActionListener(this);
	631	+
	632	+ copyOptionsPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	633	+ liveCB.setToolTipText("Enable animation");
	634	+ liveCB.addItemListener(this);
	635	+
	636	+ copyOptionsPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	637	+ oneStepButton.setToolTipText("Animate one step forward");
	638	+ oneStepButton.addActionListener(this);
	639	+
	640	+ copyOptionsPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
	641	+ fastCB.setToolTipText("Fast mode");
	642	+ fastCB.addItemListener(this);
	643	+
	644	+ //oe.toolboxPanel.Return();
	645	+
	646	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	647	+// trackCB.setToolTipText("Enable tracking");
	648	+// trackCB.addItemListener(this);
	649	+
458	650	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
459	651	// screenfitpointButton.addActionListener(this);
460		-// oe.aConstraints.gridx += 1;
461		- oe.toolbarPanel.add(snapobjectButton = new cButton(" O+ ")); //, oe.aConstraints);
462		- snapobjectButton.addActionListener(this);
463		- snapobjectButton.setToolTipText("Snap Object");
464		- oe.aConstraints.gridx += 1;
465	652
466		- //aConstraints.gridx = 0;
467		- //aConstraints.gridy += 1;
468		- oe.aConstraints.weighty = 0;
469		- oe.aConstraints.gridwidth = 1;
470		-
471		- oe.toolbarPanel.add(flashSelectionButton = new cButton(" ? ")); //, oe.aConstraints);
472		- flashSelectionButton.setToolTipText("Show selection");
473		- flashSelectionButton.addActionListener(this);
	653	+ if (Globals.ADVANCED)
	654	+ {
	655	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	656	+ snapobjectButton.addActionListener(this);
	657	+ snapobjectButton.setToolTipText("Snap Object");
	658	+ }
	659	+
	660	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
474	661
475		- oe.toolbarPanel.add(new cButton(" ", false));
476		-
477		- oe.aConstraints.gridx += 1;
478		- oe.aConstraints.weighty = 0;
479		- oe.aConstraints.gridwidth = 1;
480		-
481		- //
482		- oe.toolbarPanel.add(twoButton = new cButton(" \|+\| ")); //, oe.aConstraints);
	662	+ oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
483	663	twoButton.setToolTipText("Show center view only");
484	664	twoButton.addActionListener(this);
485		- oe.toolbarPanel.add(fourButton = new cButton("+\|\| ")); //, oe.aConstraints);
	665	+ this.fullscreenLayout = twoButton;
	666	+
	667	+ oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
486	668	fourButton.addActionListener(this);
487	669	fourButton.setToolTipText("Show left panel only");
488		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\| ")); //, oe.aConstraints);
	670	+ oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
489	671	sixButton.setToolTipText("2-column layout left");
490	672	sixButton.addActionListener(this);
491		- oe.toolbarPanel.add(threeButton = new cButton(" \|+\|+")); //, oe.aConstraints);
	673	+ oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
492	674	threeButton.setToolTipText("2-column layout right");
493	675	threeButton.addActionListener(this);
494		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+")); //, oe.aConstraints);
	676	+ oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
495	677	sevenButton.setToolTipText("3-column layout");
496	678	sevenButton.addActionListener(this);
497	679	//
498	680
499		- oe.toolbarPanel.add(rootButton = new cButton(" o o o ")); //, oe.aConstraints);
500		- rootButton.setToolTipText("Edit object in new tab");
	681	+ oe.toolbarPanel.add(rootButton = GetButton("icons/write.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	682	+ rootButton.setToolTipText("Edit selection in new tab");
501	683	rootButton.addActionListener(this);
502		- oe.aConstraints.gridx += 1;
503		- oe.toolbarPanel.add(closeButton = new cButton(" X ")); //, oe.aConstraints);
	684	+
	685	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
504	686	closeButton.setToolTipText("Close tab");
505	687	closeButton.addActionListener(this);
506	688	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
507	689	//clearButton.addActionListener(this);
508		- oe.aConstraints.gridx += 1;
509		-
510		- oe.aConstraints.gridx = 1; //
511		- oe.treePanel.add(editButton = new cButton("+"), oe.aConstraints);
512		- editButton.addActionListener(this);
513		- oe.aConstraints.gridx += 1;
514		- oe.aConstraints.weighty = 0;
515		- oe.aConstraints.gridwidth = 1;
516	690
517		- oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
	691	+ // INSERT
	692	+ oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	693	+ gridButton.setToolTipText("Create grid");
	694	+ gridButton.addActionListener(this);
	695	+
	696	+ oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	697	+ boxButton.setToolTipText("Create box");
	698	+ boxButton.addActionListener(this);
	699	+
	700	+ oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	701	+ sphereButton.setToolTipText("Create sphere");
	702	+ sphereButton.addActionListener(this);
	703	+
	704	+ oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	705	+ coneButton.setToolTipText("Create cone");
	706	+ coneButton.addActionListener(this);
	707	+
	708	+ oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	709	+ torusButton.setToolTipText("Create torus");
	710	+ torusButton.addActionListener(this);
	711	+
	712	+ oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	713	+ superButton.setToolTipText("Create superellipsoid");
	714	+ superButton.addActionListener(this);
	715	+
	716	+ if (Globals.ADVANCED)
	717	+ {
	718	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	719	+ kleinButton.setToolTipText("Create Klein bottle");
	720	+ kleinButton.addActionListener(this);
	721	+ }
	722	+
	723	+ oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	724	+ particlesButton.setToolTipText("Create particle system");
	725	+ particlesButton.addActionListener(this);
	726	+
	727	+ oe.toolboxPanel.Return();
	728	+
	729	+ oe.toolboxPanel.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	730	+ groupButton.setToolTipText("Create group");
	731	+ groupButton.addActionListener(this);
	732	+
	733	+ oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	734	+ compositeButton.setToolTipText("Create composite");
	735	+ compositeButton.addActionListener(this);
	736	+
	737	+ oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	738	+ switchButton.setToolTipText("Create item switcher");
	739	+ switchButton.addActionListener(this);
	740	+
	741	+ oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	742	+ loopButton.setToolTipText("Create loop");
	743	+ loopButton.addActionListener(this);
	744	+
	745	+ oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	746	+ textureButton.setToolTipText("Create texture");
	747	+ textureButton.addActionListener(this);
	748	+
	749	+ oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	750	+ overlayButton.setToolTipText("Create overlay");
	751	+ overlayButton.addActionListener(this);
	752	+
	753	+ oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	754	+ lightButton.setToolTipText("Create light");
	755	+ lightButton.addActionListener(this);
	756	+
	757	+ for (int i=6; --i>=0;)
	758	+ {
	759	+ oe.toolboxPanel.Return();
	760	+ oe.toolboxPanel.add(new cGridBag());
	761	+ oe.toolboxPanel.add(new cGridBag());
	762	+ oe.toolboxPanel.add(new cGridBag());
	763	+ oe.toolboxPanel.add(new cGridBag());
	764	+ oe.toolboxPanel.add(new cGridBag());
	765	+ oe.toolboxPanel.add(new cGridBag());
	766	+ oe.toolboxPanel.add(new cGridBag());
	767	+ }
	768	+
	769	+ // EDIT panel
	770	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	771	+ editButton.setToolTipText("Pin selection controls");
	772	+ editButton.addActionListener(this);
	773	+
	774	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	775	+ uneditButton.setToolTipText("Remove selection controls");
518	776	uneditButton.addActionListener(this);
519	777
520		- oe.aConstraints.gridx += 1;
521		- oe.aConstraints.weighty = 0;
522		- oe.aConstraints.gridwidth = 1;
523		-
524		- oe.treePanel.add(clearPanelButton = new cButton("C"), oe.aConstraints);
525		- clearPanelButton.addActionListener(this);
526		-
527		- oe.aConstraints.gridx += 1;
528		- oe.aConstraints.weighty = 0;
529		- oe.aConstraints.gridwidth = 1;
530		-
531		- oe.treePanel.add(allParamsButton = new cButton("A"), oe.aConstraints);
	778	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	779	+ allParamsButton.setToolTipText("Show all controle");
532	780	allParamsButton.addActionListener(this);
533	781
534		- oe.aConstraints.gridx += 1;
535		- oe.aConstraints.weighty = 0;
536		- oe.aConstraints.gridwidth = 1;
537		-
538		- oe.treePanel.add(unselectButton = new cButton("U"), oe.aConstraints);
	782	+ editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	783	+ clearPanelButton.setToolTipText("Clear edit panel");
	784	+ clearPanelButton.addActionListener(this);
	785	+
	786	+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	787	+ unselectButton.setToolTipText("Unselect");
539	788	unselectButton.addActionListener(this);
540	789
	790	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	791	+ flashSelectionButton.setToolTipText("Highlight selection");
	792	+ flashSelectionButton.addActionListener(this);
	793	+
	794	+ editCommandsPanel.preferredHeight = 1;
	795	+
	796	+ SetPinStates(false);
	797	+// oe.treePanel.add(commandsPanel);
	798	+// oe.treePanel.Return();
	799	+
541	800	// oe.aConstraints.gridx += 1;
542	801	// oe.aConstraints.weighty = 0;
543	802	// oe.aConstraints.gridwidth = 1;
..	..	@@ -549,40 +808,22 @@
549	808	// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
550	809	// gcButton.addActionListener(this);
551	810
552		- oe.aConstraints.gridx = 0;
553		- oe.aConstraints.gridy += 1;
554		-
555		- //ctrlPanel.add(objList = new List(5, true));
556		- oe.aConstraints.gridwidth = 100;
557		- // oe.aConstraints.gridheight = 100;
558		- oe.aConstraints.fill = GridBagConstraints.BOTH; // HORIZONTAL;
559		- oe.aConstraints.gridheight = 1;
560		- oe.aConstraints.weighty = 0.5;
561		- oe.aConstraints.gridx = 0;
562		- JScrollPane jSP;
	811	+ cGridBag jSPPanel = new cGridBag();
	812	+
	813	+ JScrollPane jSP;
563	814	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
564		- oe.treePanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null)), oe.aConstraints);
	815	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
565	816	ResetModel();
566		- oe.aConstraints.weighty = 0.5;
567		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
568		- oe.aConstraints.gridy += 1;
569		- oe.aConstraints.gridwidth = 1;
570		-
571		- oe.aConstraints.weighty = 0;
572		- oe.aConstraints.gridwidth = 2;
573		-
574		- oe.treePanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0), oe.aConstraints);
575		- colorCB.addItemListener(this);
576		- oe.aConstraints.gridx += 2;
577		- oe.treePanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0), oe.aConstraints);
578		- materialCB.addItemListener(this);
579		- oe.aConstraints.gridx += 2;
580		- oe.treePanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0), oe.aConstraints);
581		- textureCB.addItemListener(this);
582		-
583		- oe.aConstraints.gridx = 0;
584		- oe.aConstraints.gridy += 1;
585	817
	818	+ oe.treePanel.add(jSPPanel);
	819	+ oe.treePanel.Return();
	820	+
	821	+ oe.treePanel.add(copyOptionsPanel);
	822	+ oe.treePanel.Return();
	823	+
	824	+// mainPanel.setDividerLocation(0.5); //1.0);
	825	+// mainPanel.setResizeWeight(0.5);
	826	+
586	827	//jList.addListSelectionListener(this);
587	828	oe.jTree.addTreeSelectionListener(this);
588	829	//jTree.setRootVisible(false);
..	..	@@ -607,47 +848,61 @@
607	848
608	849	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
609	850	{
610		- //constraints.gridx = 0;
611		- //constraints.gridy = 0;
612		- panel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
613		- fastCB.setToolTipText("Fast mode");
614		- fastCB.addItemListener(this);
615		- //constraints.gridy += 1;
616		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
617		- supportCB.setToolTipText("Enabled rigging");
618		- supportCB.addItemListener(this);
	851	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	852	+ colorCB.setToolTipText("Copy color when dropped");
	853	+ colorCB.addItemListener(this);
619	854
620		- // constraints.gridy += 1;
	855	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	856	+ materialCB.setToolTipText("Copy material when dropped");
	857	+ materialCB.addItemListener(this);
	858	+
	859	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	860	+ textureCB.setToolTipText("Copy texture when dropped");
	861	+ textureCB.addItemListener(this);
	862	+
	863	+ panel.Return();
	864	+
	865	+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
	866	+ boxCB.setToolTipText("Display bounding boxes");
	867	+ boxCB.addItemListener(this);
	868	+
	869	+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
	870	+ zoomBoxCB.setToolTipText("Display only for wheel");
	871	+ zoomBoxCB.addItemListener(this);
	872	+
	873	+ if (true) // Globals.ADVANCED)
	874	+ {
	875	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	876	+// supportCB.setToolTipText("Enable rigging");
	877	+// supportCB.addItemListener(this);
	878	+
	879	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	880	+ freezeCB.setToolTipText("Fast moving camera");
	881	+ freezeCB.addItemListener(this);
	882	+
621	883	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
622	884	// localCB.addItemListener(this);
623	885
624		- //constraints.gridy += 1;
	886	+ panel.Return();
	887	+
625	888	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
626	889	crowdCB.setToolTipText("Used for crowds");
627	890	crowdCB.addItemListener(this);
628	891
629		- //constraints.gridy += 1;
630	892	panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
631	893	smoothCB.setToolTipText("Snapping delay");
632	894	smoothCB.addItemListener(this);
633	895
634		- //constraints.gridy += 1;
635	896	panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
636	897	slowCB.setToolTipText("Smooth interpolation");
637	898	slowCB.addItemListener(this);
638		- //constraints.gridy += 1;
639		- panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
640		- boxCB.setToolTipText("Display bounding boxes");
641		- boxCB.addItemListener(this);
642		- //constraints.gridy += 1;
643		- panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
644		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
645		- zoomBoxCB.addItemListener(this);
646		-
	899	+
647	900	// constraints.gridy += 1;
648	901	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
649	902	// speakerMocapCB.addItemListener(this);
650	903
	904	+ panel.Return();
	905	+
651	906	if (false)
652	907	{
653	908	// handled in scripts
..	..	@@ -662,26 +917,72 @@
662	917	//constraints.gridy += 1;
663	918	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
664	919	smoothfocusCB.addItemListener(this);
	920	+ panel.Return();
665	921	}
666	922
667	923	//constraints.gridx += 1;
668	924	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
669	925	// debugCB.addItemListener(this);
670	926
671		- //constraints.gridy += 1;
	927	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	928	+ trackCB.setToolTipText("Enable tracking target");
	929	+ trackCB.addItemListener(this);
	930	+
672	931	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	932	+ oeilCB.setToolTipText("Move camera when tracking");
673	933	oeilCB.addItemListener(this);
674	934
675		- //constraints.gridy += 1;
	935	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	936	+ shadowCB.setToolTipText("When live compute shadows");
	937	+ shadowCB.addItemListener(this);
	938	+
	939	+ panel.Return();
	940	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	941	+ toggleTextureCB.setToolTipText("Load textures");
	942	+ toggleTextureCB.addItemListener(this);
	943	+
	944	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	945	+ toggleSwitchCB.setToolTipText("Choose a single item");
	946	+ toggleSwitchCB.addItemListener(this);
	947	+
	948	+ panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
	949	+ autosaveCB.setToolTipText("On structure change");
	950	+ autosaveCB.addItemListener(this);
	951	+
	952	+ panel.Return();
	953	+ if (Globals.ADVANCED)
	954	+ {
676	955	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
677	956	lookAtCB.setToolTipText("Look-at target");
678	957	lookAtCB.addItemListener(this);
	958	+ }
	959	+
	960	+ }
	961	+
	962	+ cGridBag fill = new cGridBag();
	963	+ fill.preferredHeight = 200;
	964	+ cGridBag fill2 = new cGridBag();
	965	+ fill2.preferredHeight = 200;
	966	+ cGridBag fill3 = new cGridBag();
	967	+ fill3.preferredHeight = 200;
	968	+
	969	+ panel.add(fill);
	970	+ panel.add(fill2);
	971	+ panel.add(fill3);
679	972
680	973	}
681	974
682	975	void EditObject(Object3D obj)
683	976	{
684	977	cRadio radioButton = new cRadio(obj.name);
	978	+
	979	+ // June 2019. Patch to avoid bug with transparency.
	980	+ radioButton.hadMaterial = obj.material != null;
	981	+ if (!radioButton.hadMaterial)
	982	+ {
	983	+ obj.material = new cMaterial();
	984	+ }
	985	+
685	986	radioButton.SetObject(obj);
686	987	radioButton.layout = sevenButton;
687	988	radioButton.SetCamera(cameraView.renderCamera, false);
..	..	@@ -690,8 +991,11 @@
690	991	buttonGroup.add(radioButton);
691	992	radioButton.doClick();
692	993	}
	994	+
693	995	void SetupViews(ObjEditor oe)
694	996	{
	997	+ theFrame = this;
	998	+
695	999	oe.SetupViews();
696	1000
697	1001	System.out.println("SetupViews");
..	..	@@ -700,23 +1004,28 @@
700	1004	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
701	1005	}
702	1006
703		- JCheckBox liveCB;
704		- JCheckBox supportCB;
705		- JCheckBox localCB;
706		- JCheckBox crowdCB;
707		- JCheckBox smoothCB;
708		- JCheckBox fastCB;
709		- JCheckBox slowCB;
710		- JCheckBox boxCB;
711		- JCheckBox zoomBoxCB;
712		- JCheckBox trackCB;
713		- JCheckBox smoothfocusCB;
	1007	+ cToggleButton liveCB;
	1008	+ cCheckBox supportCB;
	1009	+ cCheckBox localCB;
	1010	+ cCheckBox crowdCB;
	1011	+ cCheckBox smoothCB;
	1012	+ cToggleButton fastCB;
	1013	+ cCheckBox slowCB;
	1014	+ cCheckBox boxCB;
	1015	+ cCheckBox zoomBoxCB;
	1016	+ cCheckBox freezeCB;
	1017	+ //cToggleButton trackCB;
	1018	+ cCheckBox trackCB;
	1019	+ cCheckBox smoothfocusCB;
714	1020	// JCheckBox speakerMocapCB;
715		- JCheckBox speakerCameraCB;
716		- JCheckBox speakerFocusCB;
717		- JCheckBox debugCB;
718		- JCheckBox oeilCB;
719		- JCheckBox lookAtCB;
	1021	+ cCheckBox speakerCameraCB;
	1022	+ cCheckBox speakerFocusCB;
	1023	+ cCheckBox debugCB;
	1024	+
	1025	+ cCheckBox oeilCB;
	1026	+ cCheckBox shadowCB;
	1027	+ cCheckBox autosaveCB;
	1028	+ cCheckBox lookAtCB;
720	1029
721	1030	// static int COLOR = 1;
722	1031	// static int MATERIAL = 2;
..	..	@@ -724,9 +1033,9 @@
724	1033
725	1034	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
726	1035
727		- JCheckBox colorCB;
728		- JCheckBox materialCB;
729		- JCheckBox textureCB;
	1036	+ cCheckBox colorCB;
	1037	+ cCheckBox materialCB;
	1038	+ cCheckBox textureCB;
730	1039
731	1040	public void itemStateChanged(ItemEvent e)
732	1041	{
..	..	@@ -754,6 +1063,7 @@
754	1063	} else if(e.getSource() == liveCB)
755	1064	{
756	1065	cameraView.ToggleLive();
	1066	+ refreshContents(false);
757	1067	}
758	1068	else if(e.getSource() == supportCB)
759	1069	{
..	..	@@ -818,6 +1128,18 @@
818	1128	{
819	1129	cameraView.ToggleOeil();
820	1130	}
	1131	+ else if(e.getSource() == shadowCB)
	1132	+ {
	1133	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1134	+ }
	1135	+ else if(e.getSource() == freezeCB)
	1136	+ {
	1137	+ Globals.FREEZEONMOVE ^= true;
	1138	+ }
	1139	+ else if(e.getSource() == autosaveCB)
	1140	+ {
	1141	+ Globals.SAVEONMAKE ^= true;
	1142	+ }
821	1143	else if(e.getSource() == lookAtCB)
822	1144	{
823	1145	cameraView.ToggleLookAt();
..	..	@@ -834,7 +1156,8 @@
834	1156
835	1157	/**/
836	1158	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
837		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1159	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1160	+ TreePath path = objEditor.jTree.getSelectionPath();
838	1161	if ((path == null) \|\| (path.getPathCount() <= 1)) {
839	1162	// We can't move the root node or an empty selection
840	1163	return;
..	..	@@ -897,8 +1220,6 @@
897	1220	}
898	1221	}
899	1222
900		- String string = (String) object;
901		-
902	1223	System.out.println("Transfer = " + object + "; drop : " + target);
903	1224	// if( object instanceof java.io.File[])
904	1225	// {
..	..	@@ -906,7 +1227,11 @@
906	1227	// objEditor.DropFile((java.io.File[]) object, true);
907	1228	// return;
908	1229	// }
909		- if (string.charAt(0) == '/')
	1230	+
	1231	+ String string = object.toString();
	1232	+
	1233	+ // File path for Mac and Windows
	1234	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
910	1235	{
911	1236	// file(s)
912	1237	String[] names = string.split("\n");
..	..	@@ -933,7 +1258,7 @@
933	1258
934	1259	flashIt = false;
935	1260	CameraPane pane = (CameraPane) target;
936		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1261	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
937	1262	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
938	1263
939	1264	if (group.selection.size() == 1)
..	..	@@ -949,23 +1274,33 @@
949	1274
950	1275	assert target == objEditor.jTree;
951	1276	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1277	+ Object3D destinationLeaf;
952	1278	try {
953		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1279	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
954	1280	} catch (Exception e) {
955	1281	System.out.println("destinationPath : " + destinationPath);
956	1282	return;
957	1283	}
958	1284
959		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1285	+ for (int i=group.selection.size(); --i>=0;)
960	1286	{
	1287	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1288	+
	1289	+ // Cannot move into itself
	1290	+ if (child == destinationLeaf)
	1291	+ return;
	1292	+ }
	1293	+
	1294	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1295	+// {
961	1296	loadClipboard(true);
962	1297	objEditor.jTree.setSelectionPath(destinationPath);
963		- pasteInto(false);
964		- } else {
965		- loadClipboard(false);
966		- objEditor.jTree.setSelectionPath(destinationPath);
967		- pasteInto(false); // true); // ???
968		- }
	1298	+ pasteInto(false, false);
	1299	+// } else {
	1300	+// loadClipboard(false);
	1301	+// objEditor.jTree.setSelectionPath(destinationPath);
	1302	+// pasteInto(false, false); // true); // ???
	1303	+// }
969	1304	}
970	1305	public void dropActionChanged(DropTargetDragEvent dtde)
971	1306	// Called if the user has modified the current drop gesture
..	..	@@ -1070,85 +1405,107 @@
1070	1405	{
1071	1406	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1072	1407	//heightFieldItem.addActionListener(this);
1073		- gridItem = menu.add(new MenuItem("Grid"));
1074		- gridItem.addActionListener(this);
1075		- rectoidItem = menu.add(new MenuItem("Box"));
1076		- rectoidItem.addActionListener(this);
1077		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1078		- ellipsoidItem.addActionListener(this);
1079		- coneItem = menu.add(new MenuItem("Cone"));
1080		- coneItem.addActionListener(this);
1081		- torusItem = menu.add(new MenuItem("Torus"));
1082		- torusItem.addActionListener(this);
1083		- superItem = menu.add(new MenuItem("Superellipsoid"));
1084		- superItem.addActionListener(this);
	1408	+// gridItem = menu.add(new MenuItem("Grid"));
	1409	+// gridItem.addActionListener(this);
	1410	+// rectoidItem = menu.add(new MenuItem("Box"));
	1411	+// rectoidItem.addActionListener(this);
	1412	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1413	+// ellipsoidItem.addActionListener(this);
	1414	+// coneItem = menu.add(new MenuItem("Cone"));
	1415	+// coneItem.addActionListener(this);
	1416	+// torusItem = menu.add(new MenuItem("Torus"));
	1417	+// torusItem.addActionListener(this);
	1418	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1419	+// superItem.addActionListener(this);
	1420	+
	1421	+ cameraItem = menu.add(new MenuItem("Camera"));
	1422	+ cameraItem.addActionListener(this);
	1423	+
	1424	+ if (!Globals.ADVANCED)
	1425	+ {
1085	1426	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1086	1427	kleinItem.addActionListener(this);
1087		- particleItem = menu.add(new MenuItem("Particle system"));
1088		- particleItem.addActionListener(this);
	1428	+ }
	1429	+
	1430	+// particleItem = menu.add(new MenuItem("Particle system"));
	1431	+// particleItem.addActionListener(this);
	1432	+ if (Globals.ADVANCED)
	1433	+ {
1089	1434	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1090	1435	ragdollItem.addActionListener(this);
1091	1436	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1092	1437	ragdoll2Item.addActionListener(this);
	1438	+ }
1093	1439	menu.add("-");
1094		- meshItem = menu.add(new MenuItem("Mesh"));
	1440	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1095	1441	meshItem.addActionListener(this);
1096	1442	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1097	1443	// meshGroupItem.addActionListener(this);
	1444	+ if (Globals.ADVANCED)
	1445	+ {
1098	1446	springItem = menu.add(new MenuItem("Spring"));
1099	1447	springItem.addActionListener(this);
1100	1448	flagItem = menu.add(new MenuItem("Flag"));
1101	1449	flagItem.addActionListener(this);
1102		- bezierItem = menu.add(new MenuItem("Patch"));
1103		- bezierItem.addActionListener(this);
1104		- checkerItem = menu.add(new MenuItem("Checker"));
1105		- checkerItem.addActionListener(this);
1106	1450	blobItem = menu.add(new MenuItem("Blob"));
1107	1451	blobItem.addActionListener(this);
1108	1452	latheItem = menu.add(new MenuItem("Lathe"));
1109	1453	latheItem.addActionListener(this);
1110		- lightItem = menu.add(new MenuItem("Light"));
1111		- lightItem.addActionListener(this);
	1454	+ }
	1455	+ bezierItem = menu.add(new MenuItem("Bezier Patch"));
	1456	+ bezierItem.addActionListener(this);
	1457	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1458	+// overlayItem.addActionListener(this);
	1459	+// lightItem = menu.add(new MenuItem("Light"));
	1460	+// lightItem.addActionListener(this);
1112	1461	menu.add("-");
1113	1462	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1114	1463	//superLoopItem.addActionListener(this);
1115		- loopItem = menu.add(new MenuItem("Loop"));
1116		- loopItem.addActionListener(this);
	1464	+// loopItem = menu.add(new MenuItem("Loop"));
	1465	+// loopItem.addActionListener(this);
1117	1466	doubleItem = menu.add(new MenuItem("Fork"));
1118	1467	doubleItem.addActionListener(this);
	1468	+ if (Globals.ADVANCED)
	1469	+ {
1119	1470	tripleItem = menu.add(new MenuItem("Trident"));
1120	1471	tripleItem.addActionListener(this);
	1472	+ }
1121	1473	}
1122	1474
1123	1475	void buildToolsMenu(Menu menu)
1124	1476	{
1125	1477	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1126	1478	animationItem.addItemListener(this);
1127		- animationItem.setState(CameraPane.ANIMATION);
	1479	+ animationItem.setState(Globals.ANIMATION);
	1480	+
	1481	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1482	+ archiveItem.addActionListener(this);
1128	1483
1129	1484	menu.add("-");
1130	1485	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1131	1486	parseverticesItem.addActionListener(this);
1132	1487	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1133	1488	textureFieldItem.addActionListener(this);
1134		- alignItem = menu.add(new MenuItem("Align"));
	1489	+ alignItem = menu.add(new MenuItem("Align Objects"));
1135	1490	alignItem.addActionListener(this);
1136		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1137		- mirrorItem.addActionListener(this);
1138	1491	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1139	1492	reduceMorphItem.addActionListener(this);
1140	1493	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1141	1494	reduce34MorphItem.addActionListener(this);
1142		-
1143		- menu.add(computeAOItem = new MenuItem("Compute AO"));
1144		- computeAOItem.addActionListener(this);
1145	1495	menu.add("-");
1146		-
1147	1496	menu.add(memoryItem = new MenuItem("Memory Usage"));
1148	1497	memoryItem.addActionListener(this);
	1498	+ menu.add(computeAOItem = new MenuItem("Compute AO"));
	1499	+ computeAOItem.addActionListener(this);
	1500	+
	1501	+ if (Globals.ADVANCED)
	1502	+ {
	1503	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	1504	+ mirrorItem.addActionListener(this);
	1505	+ menu.add("-");
1149	1506	menu.add(analyzeItem = new MenuItem("Analyze"));
1150	1507	analyzeItem.addActionListener(this);
1151		- menu.add(dumpItem = new MenuItem("Dump"));
	1508	+ menu.add(dumpItem = new MenuItem("Print"));
1152	1509	dumpItem.addActionListener(this);
1153	1510	// menu.add(pathItem = new MenuItem("From-to path"));
1154	1511	// pathItem.addActionListener(this);
..	..	@@ -1166,6 +1523,7 @@
1166	1523	menu.add("-");
1167	1524	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1168	1525	editScriptItem.addActionListener(this);
	1526	+ }
1169	1527	}
1170	1528
1171	1529	void ScreenFit()
..	..	@@ -1288,9 +1646,24 @@
1288	1646	shadow.material = new cMaterial(obj.material);
1289	1647	shadow.material.diffuse = 0.0001f;
1290	1648	shadow.material.specular = 0.0001f;
	1649	+ //shadow.projectedVertices[1].x = 300;
1291	1650
1292	1651	makeSomething(shadow);
1293	1652	}
	1653	+
	1654	+ private void ClearUnpinned()
	1655	+ {
	1656	+ //for (Object3D obj : listUI)
	1657	+ for (int i=listUI.size(); --i>=0;)
	1658	+ {
	1659	+ Object3D obj = listUI.elementAt(i);
	1660	+ if (!obj.pinned)
	1661	+ {
	1662	+ obj.CloseUI();
	1663	+ listUI.remove(i);
	1664	+ }
	1665	+ }
	1666	+ }
1294	1667
1295	1668	/**
1296	1669	* applyExample
..	..	@@ -1494,9 +1867,9 @@
1494	1867
1495	1868	void Overwrite(int mask)
1496	1869	{
1497		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	1870	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1498	1871	{
1499		- Object3D content = GrafreeD.clipboard.get(0);
	1872	+ Object3D content = Grafreed.clipboard.get(0);
1500	1873
1501	1874	if (content instanceof cGroup && ((cGroup)content).transientlink )
1502	1875	content = ((cGroup)content).get(0);
..	..	@@ -1535,7 +1908,7 @@
1535	1908	{
1536	1909	ScreenFit();
1537	1910	} else
1538		- if (source == switchItem)
	1911	+ if (source == switchViewItem)
1539	1912	{
1540	1913	cVector v1 = new cVector();
1541	1914	cVector v2 = new cVector();
..	..	@@ -1544,11 +1917,11 @@
1544	1917	objEditor.cameraView.renderCamera.setAim(v2, v1);
1545	1918	objEditor.cameraView.repaint();
1546	1919	} else
1547		- if (source == rectoidItem)
	1920	+ if (source == rectoidItem \|\| source == boxButton)
1548	1921	{
1549	1922	makeSomething(new Box());
1550	1923	} else
1551		- if (source == particleItem)
	1924	+ if (source == particleItem \|\| source == particlesButton)
1552	1925	{
1553	1926	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1554	1927	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1627,27 +2000,27 @@
1627	2000
1628	2001	makeSomething(obj);
1629	2002	} else
1630		- if (source == gridItem)
	2003	+ if (source == gridItem \|\| source == gridButton)
1631	2004	{
1632	2005	makeSomething(new Grid());
1633	2006	} else
1634		- if (source == ellipsoidItem)
	2007	+ if (source == ellipsoidItem \|\| source == sphereButton)
1635	2008	{
1636	2009	makeSomething(new Sphere());
1637	2010	} else
1638		- if (source == coneItem)
	2011	+ if (source == coneItem \|\| source == coneButton)
1639	2012	{
1640	2013	makeSomething(new Cone());
1641	2014	} else
1642		- if (source == torusItem)
	2015	+ if (source == torusItem \|\| source == torusButton)
1643	2016	{
1644	2017	makeSomething(new Torus());
1645	2018	} else
1646		- if (source == superItem)
	2019	+ if (source == superItem \|\| source == superButton)
1647	2020	{
1648	2021	makeSomething(new Superellipsoid());
1649	2022	} else
1650		- if (source == kleinItem)
	2023	+ if (source == kleinItem \|\| source == kleinButton)
1651	2024	{
1652	2025	makeSomething(new Klein());
1653	2026	} else
..	..	@@ -1667,7 +2040,7 @@
1667	2040	{
1668	2041	makeSomething(new BezierSurface());
1669	2042	} else
1670		- if (source == checkerItem)
	2043	+ if (source == overlayItem \|\| source == overlayButton)
1671	2044	{
1672	2045	/*
1673	2046	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1715,7 +2088,7 @@
1715	2088	s.setup();
1716	2089	makeSomething(s);
1717	2090	} else
1718		- if (source == lightItem)
	2091	+ if (source == lightItem \|\| source == lightButton)
1719	2092	{
1720	2093	makeSomething(new Light());
1721	2094	} else
..	..	@@ -1765,30 +2138,30 @@
1765	2138
1766	2139	group(g);
1767	2140	} else
1768		- if (source == loopItem)
	2141	+ if (source == loopItem \|\| source == loopButton)
1769	2142	{
1770	2143	Composite csg = new GroupLeaf();
1771	2144	csg.count = 5;
1772	2145	group(csg);
1773		- Composite child = new cGroup();
	2146	+ Composite child = new cGroup("Branch");
1774	2147	csg.addChild(child);
1775	2148	child.addChild(csg);
1776	2149	} else
1777	2150	if (source == doubleItem)
1778	2151	{
1779		- Composite csg = new GroupLeaf();
	2152	+ Composite csg = new GroupLeaf("Fork");
1780	2153	csg.count = 5;
1781	2154	group(csg);
1782		- Composite child = new cGroup();
	2155	+ Composite child = new cGroup("Branch A");
1783	2156	csg.addChild(child);
1784	2157	child.addChild(csg);
1785		- child = new cGroup();
	2158	+ child = new cGroup("Branch B");
1786	2159	csg.addChild(child);
1787	2160	child.addChild(csg);
1788	2161	} else
1789	2162	if (source == tripleItem)
1790	2163	{
1791		- Composite csg = new GroupLeaf();
	2164	+ Composite csg = new GroupLeaf("Trident");
1792	2165	csg.count = 4;
1793	2166	group(csg);
1794	2167	Composite child = new cGroup();
..	..	@@ -1800,23 +2173,6 @@
1800	2173	child = new cGroup();
1801	2174	csg.addChild(child);
1802	2175	child.addChild(csg);
1803		- } else
1804		-
1805		- if (source == importGFDItem)
1806		- {
1807		- ImportGFD();
1808		- } else
1809		- if (source == importVRMLX3DItem)
1810		- {
1811		- ImportVRMLX3D();
1812		- } else
1813		- if (source == import3DSItem)
1814		- {
1815		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1816		- } else
1817		- if (source == importOBJItem)
1818		- {
1819		- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1820	2176	} else
1821	2177	if (source == computeAOItem)
1822	2178	{
..	..	@@ -1836,7 +2192,7 @@
1836	2192	if (source == invariantsItem)
1837	2193	{
1838	2194	System.out.println("Invariants:");
1839		- GrafreeD.grafreeD.universe.invariants();
	2195	+ Grafreed.grafreeD.universe.invariants();
1840	2196	} else
1841	2197	if (source == memoryItem)
1842	2198	{
..	..	@@ -1855,19 +2211,47 @@
1855	2211	{
1856	2212	DumpObject();
1857	2213	} else
	2214	+ if (source == minButton)
	2215	+ {
	2216	+ Minimize();
	2217	+ } else
	2218	+ if (source == maxButton)
	2219	+ {
	2220	+ Maximize();
	2221	+ } else
	2222	+ if (source == fullButton)
	2223	+ {
	2224	+ ToggleFullScreen();
	2225	+ } else
	2226	+ if (source == undoButton)
	2227	+ {
	2228	+ if (!Undo())
	2229	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2230	+ } else
	2231	+ if (source == redoButton)
	2232	+ {
	2233	+ Redo();
	2234	+ } else
	2235	+ if (source == saveButton)
	2236	+ {
	2237	+ if (!Save(true))
	2238	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2239	+ } else
	2240	+ if (source == oneStepButton)
	2241	+ {
	2242	+ Globals.ONESTEP = true;
	2243	+ cameraView.repaint();
	2244	+ } else
1858	2245	if (source == screenfitButton)
1859	2246	{
1860		- //Reload(lastConverter, lastFilename, true);
1861	2247	ScreenFit();
1862	2248	} else
1863	2249	if (source == screenfitpointButton)
1864	2250	{
1865		- //Reload(lastConverter, lastFilename, true);
1866	2251	ScreenFitPoint();
1867	2252	} else
1868	2253	if (source == snapobjectButton)
1869	2254	{
1870		- //Reload(lastConverter, lastFilename, true);
1871	2255	SnapObject();
1872	2256	} else
1873	2257	// if (event.getSource() == recompileButton)
..	..	@@ -1904,12 +2288,20 @@
1904	2288	{
1905	2289	loadClipboard(true);
1906	2290	} else
	2291	+ if (source == undoItem)
	2292	+ {
	2293	+ Undo();
	2294	+ } else
	2295	+ if (source == redoItem)
	2296	+ {
	2297	+ Redo();
	2298	+ } else
1907	2299	if (source == duplicateItem)
1908	2300	{
1909		- Object3D keep = GrafreeD.clipboard;
	2301	+ Object3D keep = Grafreed.clipboard;
1910	2302	loadClipboard(false);
1911	2303	paste(false);
1912		- GrafreeD.clipboard = keep;
	2304	+ Grafreed.clipboard = keep;
1913	2305	} else
1914	2306	if (source == cloneItem)
1915	2307	{
..	..	@@ -1927,13 +2319,17 @@
1927	2319	{
1928	2320	paste(false);
1929	2321	} else
	2322	+ if (source == pasteIntoItem)
	2323	+ {
	2324	+ pasteInto(true, false);
	2325	+ } else
1930	2326	if (source == pasteLinkItem)
1931	2327	{
1932		- pasteInto(false);
	2328	+ pasteInto(false, false);
1933	2329	} else
1934	2330	if (source == pasteCloneItem)
1935	2331	{
1936		- pasteInto(true);
	2332	+ pasteInto(true, true);
1937	2333	} else
1938	2334	if (source == pasteExpandItem)
1939	2335	{
..	..	@@ -2125,9 +2521,9 @@
2125	2521	// group.selection.get(0).setMasterThis(content); // should be identity
2126	2522	// refreshContents();
2127	2523	// }
2128		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2524	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2129	2525	{
2130		- Object3D content = GrafreeD.clipboard.get(0);
	2526	+ Object3D content = Grafreed.clipboard.get(0);
2131	2527
2132	2528	if (content instanceof cGroup && ((cGroup)content).transientlink )
2133	2529	content = ((cGroup)content).get(0);
..	..	@@ -2135,11 +2531,11 @@
2135	2531	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2136	2532	for (int i=0; i<group.selection.size(); i++)
2137	2533	{
2138		- boolean random = CameraPane.RANDOM;
2139		- CameraPane.RANDOM = false; // parse all random nodes
	2534	+ boolean random = CameraPane.SWITCH;
	2535	+ CameraPane.SWITCH = false; // parse all random nodes
2140	2536	group.selection.get(i).linkVerticesThis(content);
2141	2537	// group.selection.get(i).setMasterThis(content); // should be identity
2142		- CameraPane.RANDOM = random;
	2538	+ CameraPane.SWITCH = random;
2143	2539	}
2144	2540	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2145	2541	refreshContents();
..	..	@@ -2149,20 +2545,20 @@
2149	2545	{
2150	2546	for (int i=0; i<group.selection.size(); i++)
2151	2547	{
2152		- boolean random = CameraPane.RANDOM;
2153		- CameraPane.RANDOM = false; // parse all random nodes
	2548	+ boolean random = CameraPane.SWITCH;
	2549	+ CameraPane.SWITCH = false; // parse all random nodes
2154	2550	group.selection.get(i).linkVerticesThis(null);
2155		- CameraPane.RANDOM = random;
	2551	+ CameraPane.SWITCH = random;
2156	2552	}
2157	2553
2158	2554	refreshContents();
2159	2555	} else
2160	2556	if (source == relinkverticesItem)
2161	2557	{
2162		- boolean random = CameraPane.RANDOM;
2163		- CameraPane.RANDOM = false; // parse all random nodes
	2558	+ boolean random = CameraPane.SWITCH;
	2559	+ CameraPane.SWITCH = false; // parse all random nodes
2164	2560	group.selection.RelinkToSupport();
2165		- CameraPane.RANDOM = random;
	2561	+ CameraPane.SWITCH = random;
2166	2562
2167	2563	refreshContents();
2168	2564	} else
..	..	@@ -2177,9 +2573,9 @@
2177	2573	} else
2178	2574	if (source == setMasterItem)
2179	2575	{
2180		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	2576	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2181	2577	{
2182		- Object3D content = GrafreeD.clipboard.get(0);
	2578	+ Object3D content = Grafreed.clipboard.get(0);
2183	2579
2184	2580	if (content instanceof cGroup && ((cGroup)content).transientlink )
2185	2581	content = ((cGroup)content).get(0);
..	..	@@ -2192,9 +2588,9 @@
2192	2588	{
2193	2589	if (group.selection.size() == 1)
2194	2590	{
2195		- if (GrafreeD.clipboard.size() == 1)
	2591	+ if (Grafreed.clipboard.size() == 1)
2196	2592	{
2197		- Object3D content = GrafreeD.clipboard.get(0);
	2593	+ Object3D content = Grafreed.clipboard.get(0);
2198	2594
2199	2595	if (content instanceof cGroup && ((cGroup)content).transientlink )
2200	2596	content = ((cGroup)content).get(0);
..	..	@@ -2211,7 +2607,7 @@
2211	2607	{
2212	2608	RevertMeshes();
2213	2609	} else
2214		- if (source == resetMeshItem)
	2610	+ if (source == resetAllItem)
2215	2611	{
2216	2612	ResetAll();
2217	2613	} else
..	..	@@ -2231,9 +2627,9 @@
2231	2627	{
2232	2628	ClearSelection(true);
2233	2629	} else
2234		- if (source == grabItem)
	2630	+ if (source == grabItem \|\| source == groupButton)
2235	2631	{
2236		- group(new cGroup(), true);
	2632	+ group(new cGroup(), false); // true);
2237	2633	} else
2238	2634	if (source == hideItem)
2239	2635	{
..	..	@@ -2251,16 +2647,16 @@
2251	2647	{
2252	2648	makeSomething(new Camera());
2253	2649	} else
2254		- if (source == compositeItem)
	2650	+ if (source == compositeItem \|\| source == compositeButton)
2255	2651	{
2256	2652	group(new Composite());
2257	2653	} else
2258		- if (source == randomItem)
	2654	+ if (source == switchItem \|\| source == switchButton)
2259	2655	{
2260	2656	RandomNode random = new RandomNode();
2261	2657	group(random);
2262	2658	if (random.size() > 0)
2263		- random.name = random.get(0).name + "Rnd";
	2659	+ random.name = random.get(0).name + "Switch";
2264	2660	} else
2265	2661	if (source == physicsItem)
2266	2662	{
..	..	@@ -2357,7 +2753,7 @@
2357	2753	{
2358	2754	group(new cLinker());
2359	2755	} else
2360		- if (source == textureItem)
	2756	+ if (source == textureItem \|\| source == textureButton)
2361	2757	{
2362	2758	group(new TextureNode());
2363	2759	} else
..	..	@@ -2377,17 +2773,30 @@
2377	2773	{
2378	2774	CastShadow(2);
2379	2775	} else
2380		- if (source == ungroupItem)
	2776	+ if (source == ungroupItem \|\| source == ungroupButton)
2381	2777	{
2382		- //ungroup();
	2778	+ boolean hasRoot = false;
	2779	+
2383	2780	for (int i=0; i<group.selection.size(); i++)
2384	2781	{
2385		- Ungroup(group.selection.get(i));
	2782	+ if (group.selection.get(i) == group)
	2783	+ {
	2784	+ hasRoot = true;
	2785	+ break;
	2786	+ }
2386	2787	}
2387	2788
2388		- ClearSelection(false);
2389		-
2390		- refreshContents();
	2789	+ if (!hasRoot)
	2790	+ {
	2791	+ for (int i=0; i<group.selection.size(); i++)
	2792	+ {
	2793	+ Ungroup(group.selection.get(i));
	2794	+ }
	2795	+
	2796	+ ClearSelection(false);
	2797	+
	2798	+ refreshContents();
	2799	+ }
2391	2800	} else
2392	2801	if (source == genUVItem)
2393	2802	{
..	..	@@ -2399,7 +2808,7 @@
2399	2808	} else
2400	2809	if (source == genNormalsMESHItem)
2401	2810	{
2402		- GenNormals(true); // TODO
	2811	+ GenNormalsMESH();
2403	2812	} else
2404	2813	if (source == genNormalsORGANItem)
2405	2814	{
..	..	@@ -2464,6 +2873,22 @@
2464	2873	if (source == unmarkleavesItem)
2465	2874	{
2466	2875	MarkLeaves(false);
	2876	+ } else
	2877	+ if (source == rewindleavesItem)
	2878	+ {
	2879	+ RewindLeaves(true);
	2880	+ } else
	2881	+ if (source == unrewindleavesItem)
	2882	+ {
	2883	+ RewindLeaves(false);
	2884	+ } else
	2885	+ if (source == randomleavesItem)
	2886	+ {
	2887	+ RandomLeaves(true);
	2888	+ } else
	2889	+ if (source == unrandomleavesItem)
	2890	+ {
	2891	+ RandomLeaves(false);
2467	2892	} else
2468	2893	if (source == flipVItem)
2469	2894	{
..	..	@@ -2549,9 +2974,13 @@
2549	2974	{
2550	2975	SmoothMesh();
2551	2976	} else
2552		- if (source == transformgeometryItem)
	2977	+ if (source == transformGeometryItem)
2553	2978	{
2554	2979	TransformGeometry();
	2980	+ } else
	2981	+ if (source == transformChildrenItem)
	2982	+ {
	2983	+ TransformChildren();
2555	2984	} else
2556	2985	if (source == resetTransformItem)
2557	2986	{
..	..	@@ -2559,7 +2988,11 @@
2559	2988	} else
2560	2989	if (source == resetCentroidItem)
2561	2990	{
2562		- ResetCentroid();
	2991	+ ResetCentroid(true);
	2992	+ } else
	2993	+ if (source == resetCentroidXZItem)
	2994	+ {
	2995	+ ResetCentroid(false);
2563	2996	} else
2564	2997	if (source == resetParentItem)
2565	2998	{
..	..	@@ -2691,6 +3124,10 @@
2691	3124	if (source == twoButton)
2692	3125	{
2693	3126	radio.layout = twoButton;
	3127	+
	3128	+ if (CameraPane.FULLSCREEN)
	3129	+ fullscreenLayout = radio.layout;
	3130	+
2694	3131	// bug
2695	3132	//gridPanel.setDividerLocation(1.0);
2696	3133	//bigPanel.setDividerLocation(0.0);
..	..	@@ -2723,10 +3160,31 @@
2723	3160	bigThree.ClearUI();
2724	3161	bigThree.add(centralPanel);
2725	3162	bigThree.FlushUI();
	3163	+
	3164	+ cameraView.requestFocusInWindow();
	3165	+
	3166	+// refreshContents(true);
	3167	+//
	3168	+// try
	3169	+// {
	3170	+// java.awt.Robot bot = new java.awt.Robot();
	3171	+// int mask = InputEvent.BUTTON1_MASK;
	3172	+// bot.mouseMove(100, 100);
	3173	+// bot.mousePress(mask);
	3174	+// bot.mouseRelease(mask);
	3175	+// }
	3176	+// catch (Exception e)
	3177	+// {
	3178	+//
	3179	+// }
	3180	+
2726	3181	} else
2727	3182	if (source == threeButton)
2728	3183	{
2729	3184	radio.layout = threeButton;
	3185	+
	3186	+ if (CameraPane.FULLSCREEN)
	3187	+ fullscreenLayout = radio.layout;
2730	3188
2731	3189	// bigThree.remove(scenePanel);
2732	3190	// bigThree.remove(centralPanel);
..	..	@@ -2759,10 +3217,15 @@
2759	3217	bigThree.add(centralPanel);
2760	3218	bigThree.add(XYZPanel);
2761	3219	bigThree.FlushUI();
	3220	+
	3221	+ cameraView.requestFocusInWindow();
2762	3222	} else
2763	3223	if (source == fourButton)
2764	3224	{
2765	3225	radio.layout = fourButton;
	3226	+
	3227	+ if (CameraPane.FULLSCREEN)
	3228	+ fullscreenLayout = radio.layout;
2766	3229
2767	3230	// bigThree.remove(scenePanel);
2768	3231	// bigThree.remove(centralPanel);
..	..	@@ -2794,10 +3257,15 @@
2794	3257	bigThree.ClearUI();
2795	3258	bigThree.add(scenePanel);
2796	3259	bigThree.FlushUI();
	3260	+
	3261	+ cameraView.requestFocusInWindow();
2797	3262	} else
2798	3263	if (source == sixButton)
2799	3264	{
2800	3265	radio.layout = sixButton;
	3266	+
	3267	+ if (CameraPane.FULLSCREEN)
	3268	+ fullscreenLayout = radio.layout;
2801	3269
2802	3270	// bigThree.remove(scenePanel);
2803	3271	// bigThree.remove(centralPanel);
..	..	@@ -2830,10 +3298,15 @@
2830	3298	bigThree.add(scenePanel);
2831	3299	bigThree.add(centralPanel);
2832	3300	bigThree.FlushUI();
	3301	+
	3302	+ cameraView.requestFocusInWindow();
2833	3303	} else
2834	3304	if (source == sevenButton)
2835	3305	{
2836	3306	radio.layout = sevenButton;
	3307	+
	3308	+ if (CameraPane.FULLSCREEN)
	3309	+ fullscreenLayout = radio.layout;
2837	3310
2838	3311	// bigThree.remove(scenePanel);
2839	3312	// bigThree.remove(centralPanel);
..	..	@@ -2867,6 +3340,8 @@
2867	3340	bigThree.add(centralPanel);
2868	3341	bigThree.add(XYZPanel);
2869	3342	bigThree.FlushUI();
	3343	+
	3344	+ cameraView.requestFocusInWindow();
2870	3345	} else
2871	3346	if (source == rootButton)
2872	3347	{
..	..	@@ -2878,6 +3353,7 @@
2878	3353	EditObject(obj);
2879	3354	}
2880	3355
	3356	+ cameraView.requestFocusInWindow();
2881	3357	refreshContents(true);
2882	3358	} else
2883	3359	if (source == closeButton)
..	..	@@ -2887,22 +3363,37 @@
2887	3363	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2888	3364	{
2889	3365	ab = (cRadio)e.nextElement();
2890		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3366	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2891	3367	{
	3368	+ // Patch to avoid bug with transparency.
	3369	+ if (!ab.hadMaterial)
	3370	+ {
	3371	+ ab.object.material = null;
	3372	+ }
	3373	+
2892	3374	buttonGroup.remove(ab);
2893	3375	radioPanel.remove(ab);
2894	3376
2895		- ab.GetObject().editWindow = null;
	3377	+ //ab.GetObject().editWindow = null;
	3378	+ ab.GetObject().manipWindow = null;
2896	3379	// ab.GetObject().objectUI = null; // ?????????
2897	3380
2898	3381	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2899	3382	break;
2900	3383	}
2901	3384	}
	3385	+
	3386	+ cameraView.requestFocusInWindow();
2902	3387	refreshContents(true);
2903	3388	} else
2904	3389	if (source == editItem \|\| source == editButton)
2905	3390	{
	3391	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3392	+ {
	3393	+ Object3D child = (Object3D)e.nextElement();
	3394	+ child.pinned = true;
	3395	+ }
	3396	+
2906	3397	EditSelection(false);
2907	3398	} else
2908	3399	if (source == uneditButton)
..	..	@@ -2912,12 +3403,13 @@
2912	3403	Object3D child = (Object3D)e.nextElement();
2913	3404	if(child.editWindow != null)
2914	3405	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3406	+ child.pinned = false;
2915	3407	child.CloseUI();
2916	3408	listUI.remove(child);
2917	3409
2918		- child.editWindow = null; // ???????????
	3410	+ //child.editWindow = null; // ???????????
2919	3411	}
2920		- objEditor.ctrlPanel.validate();
	3412	+ objEditor.ctrlPanel.FlushUI();
2921	3413	//objEditor.jTree.clearSelection();
2922	3414	//objEditor.ResetSliders();
2923	3415	refreshContents(true);
..	..	@@ -2928,6 +3420,7 @@
2928	3420	//copy.ClearUI();
2929	3421	for (Object3D obj : listUI)
2930	3422	{
	3423	+ obj.pinned = false;
2931	3424	obj.CloseUI();
2932	3425	}
2933	3426	listUI.clear();
..	..	@@ -2937,7 +3430,7 @@
2937	3430	{
2938	3431	assert(copy == group);
2939	3432
2940		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3433	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2941	3434
2942	3435	for (Object3D obj : listUI)
2943	3436	{
..	..	@@ -3001,20 +3494,44 @@
3001	3494	frontView.object = group;
3002	3495	sideView.object = group;
3003	3496	}
3004		- group.editWindow = this;
	3497	+
	3498	+// fix "+" issue
	3499	+ //group.editWindow = this;
	3500	+ group.manipWindow = this;
	3501	+
3005	3502	/*
3006	3503	currentLayout = radio.layout;
3007	3504	if (currentLayout == null)
3008	3505	currentLayout = sevenButton;
3009	3506	*/
3010	3507	radio.layout.doClick();
	3508	+
	3509	+ ClearUnpinned();
	3510	+ SetPinStates(group.selection.size() > 0);
	3511	+ if (group.selection.size() == 1)
	3512	+ EditSelection(false);
3011	3513	keepparent = group.parent;
3012	3514	// PARENT = NULL or not???
3013	3515	//group.parent = null; // ROOT
3014	3516	//group.attributes = -1;
3015	3517	ResetModel();
	3518	+
	3519	+ cameraView.requestFocusInWindow();
3016	3520	refreshContents(true);
3017		- }
	3521	+ } else if (event.getSource() == editCameraItem)
	3522	+ {
	3523	+ cameraView.ProtectCamera();
	3524	+ cameraView.repaint();
	3525	+ return;
	3526	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
	3527	+ {
	3528	+ cameraView.RevertCamera();
	3529	+ cameraView.repaint();
	3530	+ return;
	3531	+ // } else if (event.getSource() == textureButton)
	3532	+ // {
	3533	+ // return; // true;
	3534	+ }
3018	3535	else
3019	3536	{
3020	3537	//return super.action(event, arg);
..	..	@@ -3023,7 +3540,6 @@
3023	3540	}
3024	3541
3025	3542	boolean useclient = false;
3026		- cRadio radio;
3027	3543
3028	3544	void ToggleRoot()
3029	3545	{
..	..	@@ -3075,6 +3591,28 @@
3075	3591	refreshContents();
3076	3592	}
3077	3593
	3594	+ void TransformChildren()
	3595	+ {
	3596	+ Object3D obj;
	3597	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3598	+ {
	3599	+ obj = (Object3D)e.nextElement();
	3600	+ obj.KeepTextureMatrices();
	3601	+ obj.TransformChildren();
	3602	+ obj.RestoreTextureMatrices();
	3603	+
	3604	+// if (obj.parent == null)
	3605	+// {
	3606	+// System.out.println("NULL PARENT!");
	3607	+// new Exception().printStackTrace();
	3608	+// }
	3609	+// else
	3610	+// TouchTransform(obj);
	3611	+// //obj.parent.Touch();
	3612	+ }
	3613	+
	3614	+ refreshContents();
	3615	+ }
3078	3616
3079	3617	void ResetTransform()
3080	3618	{
..	..	@@ -3187,7 +3725,7 @@
3187	3725	refreshContents();
3188	3726	}
3189	3727
3190		- void ResetCentroid()
	3728	+ void ResetCentroid(boolean full)
3191	3729	{
3192	3730	Object3D obj;
3193	3731	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3202,12 +3740,16 @@
3202	3740	LA.matIdentity(Object3D.mat);
3203	3741	obj.getBounds(minima, maxima, false);
3204	3742	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3205		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	3743	+ if (full)
	3744	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3206	3745	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3207	3746	obj.TransformMesh(Object3D.mat);
	3747	+
3208	3748	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3209		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	3749	+ if (full)
	3750	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3210	3751	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	3752	+
3211	3753	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3212	3754	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3213	3755	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3236,7 +3778,8 @@
3236	3778
3237	3779	int size = obj.MemorySize();
3238	3780
3239		- System.err.println((size/1024) + " KB is the size of " + obj);
	3781	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	3782	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3240	3783	}
3241	3784	}
3242	3785	catch (Exception e)
..	..	@@ -3273,9 +3816,9 @@
3273	3816	obj = (Object3D)e.nextElement();
3274	3817
3275	3818	System.out.println("Object is: " + obj);
3276		- GrafreeD.AnalyzeObject(obj);
	3819	+ Grafreed.AnalyzeObject(obj);
3277	3820	System.out.println("Boundary rep: " + obj.bRep);
3278		- GrafreeD.AnalyzeObject(obj.bRep);
	3821	+ Grafreed.AnalyzeObject(obj.bRep);
3279	3822
3280	3823	// System.err.println((size/1024) + " KB is the size of " + obj);
3281	3824	}
..	..	@@ -3317,6 +3860,13 @@
3317	3860	void GenNormals(boolean crease)
3318	3861	{
3319	3862	group.GenNormalsS(crease);
	3863	+
	3864	+ refreshContents();
	3865	+ }
	3866	+
	3867	+ void GenNormalsMESH()
	3868	+ {
	3869	+ group.GenNormalsMeshS();
3320	3870
3321	3871	refreshContents();
3322	3872	}
..	..	@@ -3489,8 +4039,8 @@
3489	4039
3490	4040	void ParseVertices()
3491	4041	{
3492		- boolean epsequal = GrafreeD.epsequal;
3493		- GrafreeD.epsequal = true;
	4042	+ boolean epsequal = Grafreed.epsequal;
	4043	+ Grafreed.epsequal = true;
3494	4044
3495	4045	for (int i=0; i<group.selection.size(); i++)
3496	4046	{
..	..	@@ -3515,7 +4065,7 @@
3515	4065	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3516	4066	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3517	4067
3518		- g.add(GrafreeD.clipboard);
	4068	+ g.add(Grafreed.clipboard);
3519	4069
3520	4070	buffer.add(g);
3521	4071	}
..	..	@@ -3530,7 +4080,7 @@
3530	4080	makeSomething(buffer, i==group.selection.size()-1);
3531	4081	}
3532	4082
3533		- GrafreeD.epsequal = epsequal;
	4083	+ Grafreed.epsequal = epsequal;
3534	4084
3535	4085	refreshContents();
3536	4086	}
..	..	@@ -3548,7 +4098,16 @@
3548	4098	String pigment = Object3D.GetPigment(tex);
3549	4099	//String bump = Object3D.GetBump(tex);
3550	4100
3551		- com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4101	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	4102	+
	4103	+ try
	4104	+ {
	4105	+ texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4106	+ }
	4107	+ catch (Exception e)
	4108	+ {
	4109	+ System.err.println("FAIL: " + node);
	4110	+ }
3552	4111
3553	4112	double s = v.s;
3554	4113
..	..	@@ -3636,11 +4195,11 @@
3636	4195
3637	4196	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3638	4197
3639		- boolean random = CameraPane.RANDOM;
3640		- CameraPane.RANDOM = false; // parse all random nodes
	4198	+ boolean random = CameraPane.SWITCH;
	4199	+ CameraPane.SWITCH = false; // parse all random nodes
3641	4200	lowres.linkVerticesThis(null);
3642	4201	lowres.linkVerticesThis(sn);
3643		- CameraPane.RANDOM = random;
	4202	+ CameraPane.SWITCH = random;
3644	4203
3645	4204	System.err.flush();
3646	4205
..	..	@@ -3680,7 +4239,7 @@
3680	4239	return;
3681	4240
3682	4241	Object3D poses = group.selection.get(0);
3683		- Object3D ref = GrafreeD.clipboard.get(0);
	4242	+ Object3D ref = Grafreed.clipboard.get(0);
3684	4243
3685	4244	Object3D newgroup = new Object3D("Po:" + poses.name);
3686	4245
..	..	@@ -3874,9 +4433,9 @@
3874	4433
3875	4434	void ClipMesh()
3876	4435	{
3877		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	4436	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3878	4437	{
3879		- Object3D content = GrafreeD.clipboard.get(0);
	4438	+ Object3D content = Grafreed.clipboard.get(0);
3880	4439
3881	4440	if (content instanceof cGroup && ((cGroup)content).transientlink )
3882	4441	content = ((cGroup)content).get(0);
..	..	@@ -3885,7 +4444,7 @@
3885	4444	// {
3886	4445	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3887	4446	// }
3888		- group.selection.ClipMesh(GrafreeD.clipboard);
	4447	+ group.selection.ClipMesh(Grafreed.clipboard);
3889	4448	}
3890	4449	// group.selection.ClipMesh(GrafreeD.clipboard);
3891	4450	System.out.println("DONE.");
..	..	@@ -3932,6 +4491,18 @@
3932	4491	void MarkLeaves(boolean hide)
3933	4492	{
3934	4493	group.selection.MarkLeaves(hide);
	4494	+ refreshContents();
	4495	+ }
	4496	+
	4497	+ void RewindLeaves(boolean hide)
	4498	+ {
	4499	+ group.selection.RewindLeaves(hide);
	4500	+ refreshContents();
	4501	+ }
	4502	+
	4503	+ void RandomLeaves(boolean hide)
	4504	+ {
	4505	+ group.selection.RandomLeaves(hide);
3935	4506	refreshContents();
3936	4507	}
3937	4508
..	..	@@ -4006,10 +4577,6 @@
4006	4577	// }
4007	4578	// }
4008	4579
4009		- static boolean allparams = true;
4010		-
4011		- static Vector<Object3D> listUI = new Vector<Object3D>();
4012		-
4013	4580	void EditSelection(boolean newWindow)
4014	4581	{
4015	4582	// aConstraints.gridy = 0;
..	..	@@ -4017,10 +4584,10 @@
4017	4584	{
4018	4585	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4019	4586	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4020		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4587	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4021	4588
4022	4589	Object3D elem = (Object3D)group.selection.elementAt(i);
4023		- if(elem != group)
	4590	+ if(elem != group \|\| !newWindow)
4024	4591	{
4025	4592	// if (!(elem instanceof Composite))
4026	4593	// newWindow = false;
..	..	@@ -4102,7 +4669,8 @@
4102	4669	//new Exception().printStackTrace();
4103	4670
4104	4671	freezemodel = true;
4105		-
	4672	+ ClearUnpinned();
	4673	+
4106	4674	/**/
4107	4675	//switch (event.id)
4108	4676	{
..	..	@@ -4110,7 +4678,6 @@
4110	4678	//case 702: // Event.LIST_DESELECT
4111	4679	group.deselectAll();
4112	4680	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4113		- objEditor.ClearInfo(); // .GetMaterial());
4114	4681	if (tps != null)
4115	4682	{
4116	4683	for (int i=0; i < tps.length; i++)
..	..	@@ -4119,33 +4686,39 @@
4119	4686
4120	4687	//if (child.parent != null)
4121	4688	//child.parent.addSelectee(child);
	4689	+ objEditor.SetMaterial(child);
4122	4690	group.addSelectee(child);
4123		- objEditor.SetMaterial(child); // .GetMaterial());
4124		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4125		- System.err.println("info : " + child.GetPath());
4126	4691	}
4127	4692	}
4128		- else
4129		- {
4130		- objEditor.SetMaterial(group); // .GetMaterial());
4131		- objEditor.AddInfo(group, this, true); // .GetMaterial());
4132		- System.err.println("info : " + group.GetPath());
4133		- }
	4693	+// else
	4694	+// {
	4695	+// objEditor.SetMaterial(group); // .GetMaterial());
	4696	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	4697	+// System.err.println("info : " + group.GetPath());
	4698	+// }
4134	4699
4135		- objEditor.SetText(); // jan 2014
4136		-
4137		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4700	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4138	4701	CameraPane.flash = true;
4139	4702
4140		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4703	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4141	4704	// a camera
4142	4705	{
4143		- CameraPane.camerachangeframe = 0; // don't refuse it
4144		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4706	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
	4707	+ {
	4708	+ CameraPane.camerachangeframe = 0; // don't refuse it
	4709	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4710	+ }
4145	4711	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4146	4712	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4147	4713	}
4148	4714
	4715	+ if (tps != null && tps.length == 1)
	4716	+ {
	4717	+ EditSelection(false);
	4718	+ }
	4719	+
	4720	+ SetPinStates(tps != null && tps.length > 0);
	4721	+
4149	4722	refreshContents();
4150	4723	//return true;
4151	4724	}
..	..	@@ -4154,6 +4727,35 @@
4154	4727
4155	4728	freezemodel = false;
4156	4729	}
	4730	+
	4731	+ void SetPinStates(boolean enabled)
	4732	+ {
	4733	+ editButton.setEnabled(enabled);
	4734	+ uneditButton.setEnabled(enabled);
	4735	+ unselectButton.setEnabled(enabled);
	4736	+ flashSelectionButton.setEnabled(enabled);
	4737	+ }
	4738	+
	4739	+ void refreshContents(boolean cp)
	4740	+ {
	4741	+ if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
	4742	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
	4743	+ {
	4744	+ objEditor.ClearInfo(); // .GetMaterial());
	4745	+
	4746	+ for (int i=0; i < group.selection.Size(); i++)
	4747	+ {
	4748	+ Object3D child = (Object3D) group.selection.get(i);
	4749	+
	4750	+ objEditor.AddInfo(child, this, true);
	4751	+ System.err.println("info : " + child.GetPath());
	4752	+ }
	4753	+
	4754	+ objEditor.SetText(); // jan 2014
	4755	+ }
	4756	+
	4757	+ super.refreshContents(cp);
	4758	+ }
4157	4759
4158	4760	void linkSomething(Object3D thing)
4159	4761	{
..	..	@@ -4225,16 +4827,19 @@
4225	4827	{
4226	4828	if (group.selection.isEmpty())
4227	4829	return;
4228		- GrafreeD.clipboardIsTempGroup = false;
	4830	+
	4831	+ Grafreed.clipboardIsTempGroup = false;
4229	4832	Composite tGroup = null;
4230	4833	if (group.selection.size() > 0) // 1)
4231	4834	{
4232	4835	tGroup = new cGroup();
4233		- GrafreeD.clipboardIsTempGroup = true;
	4836	+ Grafreed.clipboardIsTempGroup = true;
4234	4837	}
4235	4838
4236	4839	if (cut)
4237	4840	{
	4841	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	4842	+// Save();
4238	4843	//int indices[] = jList.getSelectedIndices();
4239	4844	//for (int i = indices.length - 1; i >= 0; i--)
4240	4845	//jList.remove(indices[i]);
..	..	@@ -4270,16 +4875,16 @@
4270	4875	//System.out.println("cut " + child);
4271	4876	//System.out.println("parent = " + child.parent);
4272	4877	// tmp.addChild(child);
4273		- if (GrafreeD.clipboardIsTempGroup)
	4878	+ if (Grafreed.clipboardIsTempGroup)
4274	4879	tGroup.add/Child/(tmp);
4275	4880	else
4276		- GrafreeD.clipboard = tmp;
	4881	+ Grafreed.clipboard = tmp;
4277	4882	}
4278	4883	else
4279		- if (GrafreeD.clipboardIsTempGroup)
	4884	+ if (Grafreed.clipboardIsTempGroup)
4280	4885	tGroup.add/Child/(child);
4281	4886	else
4282		- GrafreeD.clipboard = child;
	4887	+ Grafreed.clipboard = child;
4283	4888	}
4284	4889
4285	4890	//ResetModel();
..	..	@@ -4311,21 +4916,23 @@
4311	4916	//System.out.println("cut " + elem);
4312	4917	//System.out.println("parent = " + elem.parent);
4313	4918	// tmp.addChild(elem);
4314		- if (GrafreeD.clipboardIsTempGroup)
	4919	+ if (Grafreed.clipboardIsTempGroup)
4315	4920	tGroup.add/Child/(tmp);
4316	4921	else
4317		- GrafreeD.clipboard = tmp;
	4922	+ Grafreed.clipboard = tmp;
4318	4923	}
4319	4924	else
4320		- if (GrafreeD.clipboardIsTempGroup)
	4925	+ if (Grafreed.clipboardIsTempGroup)
4321	4926	tGroup.add/Child/(child);
4322	4927	else
4323		- GrafreeD.clipboard = child;
	4928	+ Grafreed.clipboard = child;
4324	4929	}
4325	4930
4326	4931	}
4327		- if (GrafreeD.clipboardIsTempGroup)
4328		- GrafreeD.clipboard = tGroup;
	4932	+
	4933	+ if (Grafreed.clipboardIsTempGroup)
	4934	+ Grafreed.clipboard = tGroup;
	4935	+
4329	4936	if (cut)
4330	4937	{
4331	4938	ResetModel();
..	..	@@ -4335,11 +4942,15 @@
4335	4942
4336	4943	void paste(boolean expand)
4337	4944	{
	4945	+ if (Globals.SAVEONMAKE)
	4946	+ Save();
	4947	+ boolean keep = Globals.SAVEONMAKE;
	4948	+ Globals.SAVEONMAKE = false;
4338	4949	// if (GrafreeD.clipboard == null)
4339	4950	// return;
4340	4951	boolean first = true;
4341	4952
4342		- if (GrafreeD.clipboardIsTempGroup)
	4953	+ if (Grafreed.clipboardIsTempGroup)
4343	4954	{
4344	4955	Composite temp;
4345	4956
..	..	@@ -4350,7 +4961,7 @@
4350	4961	temp = (Composite)Applet3D.clipboard.deepCopy();
4351	4962	*/
4352	4963	Object3D elem;
4353		- for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	4964	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4354	4965	{
4355	4966	Object3D child = (Object3D)e.nextElement();
4356	4967
..	..	@@ -4384,21 +4995,22 @@
4384	4995	//Object3D cb = Applet3D.clipboard;
4385	4996	//temp.addChild(cb);
4386	4997	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4387		- assert(GrafreeD.clipboard.parent == null);
4388		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
4389		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4390		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4391		- makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
	4998	+ assert(Grafreed.clipboard.parent == null);
	4999	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	5000	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	5001	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	5002	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4392	5003	else
4393		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4394		- GrafreeD.clipboard.get(0).parent = keepparent;
	5004	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	5005	+ Grafreed.clipboard.get(0).parent = keepparent;
4395	5006	}
4396	5007
	5008	+ Globals.SAVEONMAKE = keep;
4397	5009	ResetModel();
4398	5010	refreshContents();
4399	5011	}
4400	5012
4401		- void pasteInto(boolean copyit)
	5013	+ void pasteInto(boolean copyit, boolean clone)
4402	5014	{
4403	5015	// if (GrafreeD.clipboard == null)
4404	5016	// return;
..	..	@@ -4427,15 +5039,22 @@
4427	5039	if (copyit)
4428	5040	{
4429	5041	// paste(false);
4430		- CloneClipboard(false); // sept 2014
	5042	+ if (clone)
	5043	+ {
	5044	+ CloneClipboard(false); // sept 2014
	5045	+ }
	5046	+ else
	5047	+ {
	5048	+ paste(false);
	5049	+ }
4431	5050	}
4432	5051	else
4433	5052	{
4434	5053	boolean first = true;
4435	5054
4436		- if (GrafreeD.clipboardIsTempGroup)
	5055	+ if (Grafreed.clipboardIsTempGroup)
4437	5056	{
4438		- Composite temp = (Composite)GrafreeD.clipboard;
	5057	+ Composite temp = (Composite)Grafreed.clipboard;
4439	5058	Object3D copy;
4440	5059	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4441	5060	{
..	..	@@ -4445,7 +5064,7 @@
4445	5064	}
4446	5065	} else
4447	5066	{
4448		- linkSomething(GrafreeD.clipboard); //.get(0));
	5067	+ linkSomething(Grafreed.clipboard); //.get(0));
4449	5068	}
4450	5069	}
4451	5070	}
..	..	@@ -4522,6 +5141,10 @@
4522	5141
4523	5142	void group(Object3D csg, boolean grab)
4524	5143	{
	5144	+ if (Globals.SAVEONMAKE)
	5145	+ Save();
	5146	+ boolean keep = Globals.SAVEONMAKE;
	5147	+ Globals.SAVEONMAKE = false;
4525	5148	if (//false) // why??
4526	5149	!group.selection.isEmpty())
4527	5150	{
..	..	@@ -4635,10 +5258,15 @@
4635	5258	//node.add(csg);
4636	5259	//makeSomething(node);
4637	5260	makeSomething(csg);
	5261	+ Globals.SAVEONMAKE = keep;
4638	5262	}
4639	5263
4640	5264	void Ungroup(Object3D g)
4641	5265	{
	5266	+ if (Globals.SAVEONMAKE)
	5267	+ Save();
	5268	+ boolean keep = Globals.SAVEONMAKE;
	5269	+ Globals.SAVEONMAKE = false;
4642	5270	if (g instanceof HiddenObject)
4643	5271	{
4644	5272	HiddenObject h = (HiddenObject) g;
..	..	@@ -4655,6 +5283,7 @@
4655	5283	objEditor.makeSomething(g.get(i), false);
4656	5284	}
4657	5285	}
	5286	+ Globals.SAVEONMAKE = keep;
4658	5287	}
4659	5288
4660	5289	void ungroup()
..	..	@@ -4850,21 +5479,6 @@
4850	5479	}
4851	5480	*/
4852	5481
4853		- void ImportGFD()
4854		- {
4855		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4856		- browser.show();
4857		- String filename = browser.getFile();
4858		- if (filename != null && filename.length() > 0)
4859		- {
4860		- String fullname = browser.getDirectory() + filename;
4861		-
4862		- //Object3D readobj =
4863		- objEditor.ReadGFD(fullname, objEditor);
4864		- //makeSomething(readobj);
4865		- }
4866		- }
4867		-
4868	5482	/*
4869	5483	public void Callback(Object obj)
4870	5484	{
..	..	@@ -4888,26 +5502,9 @@
4888	5502	}
4889	5503	*/
4890	5504
4891		- void ImportVRMLX3D()
4892		- {
4893		- if (GrafreeD.standAlone)
4894		- {
4895		- /**/
4896		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4897		- browser.show();
4898		- String filename = browser.getFile();
4899		- if (filename != null && filename.length() > 0)
4900		- {
4901		- String fullname = browser.getDirectory() + filename;
4902		- LoadVRMLX3D(fullname);
4903		- }
4904		- /**/
4905		- }
4906		- }
4907		-
4908	5505	String GetFile(String dialogName)
4909	5506	{
4910		- if (GrafreeD.standAlone)
	5507	+ if (Grafreed.standAlone)
4911	5508	{
4912	5509	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4913	5510	browser.show();
..	..	@@ -4971,10 +5568,33 @@
4971	5568	cButton flashSelectionButton;
4972	5569	cButton editButton;
4973	5570	cButton uneditButton;
	5571	+ JCheckBox allParamsButton;
4974	5572	cButton clearpanelButton;
4975		- cButton allParamsButton;
4976	5573	cButton unselectButton;
4977	5574
	5575	+ cButton restoreCameraButton;
	5576	+
	5577	+ cButton saveButton;
	5578	+ cButton oneStepButton;
	5579	+
	5580	+ cButton groupButton;
	5581	+ cButton ungroupButton;
	5582	+ cButton compositeButton;
	5583	+ cButton switchButton;
	5584	+ cButton loopButton;
	5585	+ cButton textureButton;
	5586	+
	5587	+ cButton gridButton;
	5588	+ cButton boxButton;
	5589	+ cButton sphereButton;
	5590	+ cButton coneButton;
	5591	+ cButton torusButton;
	5592	+ cButton superButton;
	5593	+ cButton kleinButton;
	5594	+ cButton particlesButton;
	5595	+ cButton overlayButton;
	5596	+ cButton lightButton;
	5597	+
4978	5598	cButton screenfitButton;
4979	5599	cButton screenfitpointButton;
4980	5600	cButton snapobjectButton;
..	..	@@ -4986,14 +5606,6 @@
4986	5606
4987	5607	cButton setsupportButton;
4988	5608
4989		- cButton twoButton;
4990		- cButton sixButton;
4991		- cButton threeButton;
4992		- cButton sevenButton;
4993		- cButton fourButton; // full panel
4994		- cButton oneButton; // full XYZ
4995		- //cButton currentLayout;
4996		-
4997	5609	//
4998	5610	//Composite
4999	5611	Object3D // to do !!
..	..	@@ -5003,9 +5615,11 @@
5003	5615	//JTree jTree;
5004	5616	private MenuItem lookAtItem;
5005	5617	private MenuItem lookFromItem;
5006		- private MenuItem switchItem;
	5618	+ private MenuItem switchViewItem;
5007	5619	private MenuItem cutItem;
5008		- private MenuItem duplicateItem;
	5620	+ private MenuItem undoItem;
	5621	+ private MenuItem redoItem;
	5622	+ private JMenuItem duplicateItem;
5009	5623	private MenuItem cloneItem;
5010	5624	private MenuItem cloneSupportItem;
5011	5625	private MenuItem overwriteGeoItem;
..	..	@@ -5018,7 +5632,7 @@
5018	5632	private MenuItem linkverticesItem;
5019	5633	private MenuItem relinkverticesItem;
5020	5634	private MenuItem setMasterItem;
5021		- private MenuItem resetMeshItem;
	5635	+ private MenuItem resetAllItem;
5022	5636	private MenuItem stepAllItem;
5023	5637	private MenuItem revertMeshItem;
5024	5638	private MenuItem poseMeshItem;
..	..	@@ -5029,6 +5643,7 @@
5029	5643	private MenuItem mergeGeometriesItem;
5030	5644	private MenuItem copyItem;
5031	5645	private MenuItem pasteItem;
	5646	+ private MenuItem pasteIntoItem;
5032	5647	private MenuItem pasteLinkItem;
5033	5648	private MenuItem pasteCloneItem;
5034	5649	private MenuItem pasteExpandItem;
..	..	@@ -5067,6 +5682,10 @@
5067	5682	private MenuItem showleavesItem;
5068	5683	private MenuItem markleavesItem;
5069	5684	private MenuItem unmarkleavesItem;
	5685	+ private MenuItem rewindleavesItem;
	5686	+ private MenuItem unrewindleavesItem;
	5687	+ private MenuItem randomleavesItem;
	5688	+ private MenuItem unrandomleavesItem;
5070	5689
5071	5690	private MenuItem flipVItem;
5072	5691	private MenuItem unflipVItem;
..	..	@@ -5078,15 +5697,17 @@
5078	5697	private MenuItem panoTexturesItem;
5079	5698
5080	5699	private MenuItem resetCentroidItem;
5081		- private MenuItem transformgeometryItem;
	5700	+ private MenuItem resetCentroidXZItem;
5082	5701	private MenuItem resetTransformItem;
	5702	+ private MenuItem transformGeometryItem;
	5703	+ private MenuItem transformChildrenItem;
5083	5704	private MenuItem hideItem;
5084	5705	private MenuItem grabItem;
5085	5706	private MenuItem backItem;
5086	5707	private MenuItem frontItem;
5087	5708	private MenuItem cameraItem;
5088	5709	private MenuItem compositeItem;
5089		- private MenuItem randomItem;
	5710	+ private MenuItem switchItem;
5090	5711	private MenuItem physicsItem;
5091	5712	private MenuItem frameselectorItem;
5092	5713	private MenuItem scriptNodeItem;
..	..	@@ -5126,7 +5747,7 @@
5126	5747	private MenuItem blobItem;
5127	5748	private MenuItem latheItem;
5128	5749	private MenuItem bezierItem;
5129		- private MenuItem checkerItem;
	5750	+ private MenuItem overlayItem;
5130	5751	private MenuItem meshItem;
5131	5752	// private MenuItem meshGroupItem;
5132	5753	private MenuItem springItem;
..	..	@@ -5148,11 +5769,6 @@
5148	5769	private MenuItem doubleItem;
5149	5770	private MenuItem tripleItem;
5150	5771
5151		- private MenuItem importGFDItem;
5152		- private MenuItem importVRMLX3DItem;
5153		- private MenuItem import3DSItem;
5154		- private MenuItem importOBJItem;
5155		-
5156	5772	private MenuItem computeAOItem;
5157	5773	private MenuItem recompileItem;
5158	5774	private MenuItem editScriptItem;
..	..	@@ -5162,4 +5778,8 @@
5162	5778	private MenuItem analyzeItem;
5163	5779	private MenuItem dumpItem;
5164	5780	//boolean freezemodel = false;
	5781	+
	5782	+ Menu cameraMenu;
	5783	+ MenuItem editCameraItem;
	5784	+ MenuItem restoreCameraItem;
5165	5785	}