~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,98 +586,217 @@
434	586	oe.radioPanel.add(dummyButton);
435	587	oe.buttonGroup.add(dummyButton);
436	588	*/
	589	+ cGridBag copyOptionsPanel = new cGridBag();
	590	+
	591	+ copyOptionsPanel.preferredHeight = 1;
	592	+
437	593	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
438	594
439		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE()), oe.aConstraints);
440		- liveCB.setToolTipText("Enabled animation");
441		- liveCB.addItemListener(this);
442		-
443		- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK), oe.aConstraints);
444		- trackCB.setToolTipText("Enable tracking");
445		- trackCB.addItemListener(this);
446		-
447		- oe.toolbarPanel.add(screenfitButton = new cButton("@", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	595	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	596	+ //minButton.setToolTipText("Minimize window");
	597	+ //minButton.addActionListener(this);
	598	+
	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);
448	611	screenfitButton.setToolTipText("Screen fit");
449	612	screenfitButton.addActionListener(this);
450	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	+
451	650	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
452	651	// screenfitpointButton.addActionListener(this);
453		-// oe.aConstraints.gridx += 1;
454		- oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
455		- snapobjectButton.addActionListener(this);
456		- snapobjectButton.setToolTipText("Snap Object");
457		- oe.aConstraints.gridx += 1;
458	652
459		- //aConstraints.gridx = 0;
460		- //aConstraints.gridy += 1;
461		- oe.aConstraints.weighty = 0;
462		- oe.aConstraints.gridwidth = 1;
463		-
464		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
465		- flashSelectionButton.setToolTipText("Show selection");
466		- 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));
467	661
468		- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
469		-
470		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	662	+ oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
471	663	twoButton.setToolTipText("Show center view only");
472	664	twoButton.addActionListener(this);
473		- oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	665	+ this.fullscreenLayout = twoButton;
	666	+
	667	+ oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
474	668	fourButton.addActionListener(this);
475	669	fourButton.setToolTipText("Show left panel only");
476		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	670	+ oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
477	671	sixButton.setToolTipText("2-column layout left");
478	672	sixButton.addActionListener(this);
479		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	673	+ oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
480	674	threeButton.setToolTipText("2-column layout right");
481	675	threeButton.addActionListener(this);
482		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	676	+ oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
483	677	sevenButton.setToolTipText("3-column layout");
484	678	sevenButton.addActionListener(this);
485	679	//
486	680
487		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
488		- 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");
489	683	rootButton.addActionListener(this);
490		- oe.aConstraints.gridx += 1;
491		- oe.toolbarPanel.add(closeButton = new cButton("X", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	684	+
	685	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
492	686	closeButton.setToolTipText("Close tab");
493	687	closeButton.addActionListener(this);
494	688	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
495	689	//clearButton.addActionListener(this);
496		- oe.aConstraints.gridx += 1;
497		-
498		- oe.aConstraints.gridx = 1; //
499		- oe.treePanel.add(editButton = new cButton("+"), oe.aConstraints);
500		- editButton.addActionListener(this);
501		- oe.aConstraints.gridx += 1;
502		- oe.aConstraints.weighty = 0;
503		- oe.aConstraints.gridwidth = 1;
504	690
505		- 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");
506	776	uneditButton.addActionListener(this);
507	777
508		- oe.aConstraints.gridx += 1;
509		- oe.aConstraints.weighty = 0;
510		- oe.aConstraints.gridwidth = 1;
511		-
512		- oe.treePanel.add(clearPanelButton = new cButton("C"), oe.aConstraints);
513		- clearPanelButton.addActionListener(this);
514		-
515		- oe.aConstraints.gridx += 1;
516		- oe.aConstraints.weighty = 0;
517		- oe.aConstraints.gridwidth = 1;
518		-
519		- 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");
520	780	allParamsButton.addActionListener(this);
521	781
522		- oe.aConstraints.gridx += 1;
523		- oe.aConstraints.weighty = 0;
524		- oe.aConstraints.gridwidth = 1;
525		-
526		- 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");
527	788	unselectButton.addActionListener(this);
528	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	+
529	800	// oe.aConstraints.gridx += 1;
530	801	// oe.aConstraints.weighty = 0;
531	802	// oe.aConstraints.gridwidth = 1;
..	..	@@ -537,40 +808,22 @@
537	808	// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
538	809	// gcButton.addActionListener(this);
539	810
540		- oe.aConstraints.gridx = 0;
541		- oe.aConstraints.gridy += 1;
542		-
543		- //ctrlPanel.add(objList = new List(5, true));
544		- oe.aConstraints.gridwidth = 100;
545		- // oe.aConstraints.gridheight = 100;
546		- oe.aConstraints.fill = GridBagConstraints.BOTH; // HORIZONTAL;
547		- oe.aConstraints.gridheight = 1;
548		- oe.aConstraints.weighty = 0.5;
549		- oe.aConstraints.gridx = 0;
550		- JScrollPane jSP;
	811	+ cGridBag jSPPanel = new cGridBag();
	812	+
	813	+ JScrollPane jSP;
551	814	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
552		- oe.treePanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null)), oe.aConstraints);
	815	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
553	816	ResetModel();
554		- oe.aConstraints.weighty = 0.5;
555		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
556		- oe.aConstraints.gridy += 1;
557		- oe.aConstraints.gridwidth = 1;
558		-
559		- oe.aConstraints.weighty = 0;
560		- oe.aConstraints.gridwidth = 2;
561		-
562		- oe.treePanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0), oe.aConstraints);
563		- colorCB.addItemListener(this);
564		- oe.aConstraints.gridx += 2;
565		- oe.treePanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0), oe.aConstraints);
566		- materialCB.addItemListener(this);
567		- oe.aConstraints.gridx += 2;
568		- oe.treePanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0), oe.aConstraints);
569		- textureCB.addItemListener(this);
570		-
571		- oe.aConstraints.gridx = 0;
572		- oe.aConstraints.gridy += 1;
573	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	+
574	827	//jList.addListSelectionListener(this);
575	828	oe.jTree.addTreeSelectionListener(this);
576	829	//jTree.setRootVisible(false);
..	..	@@ -595,47 +848,61 @@
595	848
596	849	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
597	850	{
598		- //constraints.gridx = 0;
599		- //constraints.gridy = 0;
600		- panel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
601		- fastCB.setToolTipText("Fast mode");
602		- fastCB.addItemListener(this);
603		- //constraints.gridy += 1;
604		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
605		- supportCB.setToolTipText("Enabled rigging");
606		- 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);
607	854
608		- // 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	+
609	883	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
610	884	// localCB.addItemListener(this);
611	885
612		- //constraints.gridy += 1;
	886	+ panel.Return();
	887	+
613	888	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
614	889	crowdCB.setToolTipText("Used for crowds");
615	890	crowdCB.addItemListener(this);
616	891
617		- //constraints.gridy += 1;
618	892	panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
619	893	smoothCB.setToolTipText("Snapping delay");
620	894	smoothCB.addItemListener(this);
621	895
622		- //constraints.gridy += 1;
623	896	panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
624	897	slowCB.setToolTipText("Smooth interpolation");
625	898	slowCB.addItemListener(this);
626		- //constraints.gridy += 1;
627		- panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
628		- boxCB.setToolTipText("Display bounding boxes");
629		- boxCB.addItemListener(this);
630		- //constraints.gridy += 1;
631		- panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
632		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
633		- zoomBoxCB.addItemListener(this);
634		-
	899	+
635	900	// constraints.gridy += 1;
636	901	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
637	902	// speakerMocapCB.addItemListener(this);
638	903
	904	+ panel.Return();
	905	+
639	906	if (false)
640	907	{
641	908	// handled in scripts
..	..	@@ -650,26 +917,72 @@
650	917	//constraints.gridy += 1;
651	918	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
652	919	smoothfocusCB.addItemListener(this);
	920	+ panel.Return();
653	921	}
654	922
655	923	//constraints.gridx += 1;
656	924	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
657	925	// debugCB.addItemListener(this);
658	926
659		- //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	+
660	931	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	932	+ oeilCB.setToolTipText("Move camera when tracking");
661	933	oeilCB.addItemListener(this);
662	934
663		- //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	+ {
664	955	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
665	956	lookAtCB.setToolTipText("Look-at target");
666	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);
667	972
668	973	}
669	974
670	975	void EditObject(Object3D obj)
671	976	{
672	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	+
673	986	radioButton.SetObject(obj);
674	987	radioButton.layout = sevenButton;
675	988	radioButton.SetCamera(cameraView.renderCamera, false);
..	..	@@ -678,8 +991,11 @@
678	991	buttonGroup.add(radioButton);
679	992	radioButton.doClick();
680	993	}
	994	+
681	995	void SetupViews(ObjEditor oe)
682	996	{
	997	+ theFrame = this;
	998	+
683	999	oe.SetupViews();
684	1000
685	1001	System.out.println("SetupViews");
..	..	@@ -688,23 +1004,28 @@
688	1004	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
689	1005	}
690	1006
691		- JCheckBox liveCB;
692		- JCheckBox supportCB;
693		- JCheckBox localCB;
694		- JCheckBox crowdCB;
695		- JCheckBox smoothCB;
696		- JCheckBox fastCB;
697		- JCheckBox slowCB;
698		- JCheckBox boxCB;
699		- JCheckBox zoomBoxCB;
700		- JCheckBox trackCB;
701		- 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;
702	1020	// JCheckBox speakerMocapCB;
703		- JCheckBox speakerCameraCB;
704		- JCheckBox speakerFocusCB;
705		- JCheckBox debugCB;
706		- JCheckBox oeilCB;
707		- JCheckBox lookAtCB;
	1021	+ cCheckBox speakerCameraCB;
	1022	+ cCheckBox speakerFocusCB;
	1023	+ cCheckBox debugCB;
	1024	+
	1025	+ cCheckBox oeilCB;
	1026	+ cCheckBox shadowCB;
	1027	+ cCheckBox autosaveCB;
	1028	+ cCheckBox lookAtCB;
708	1029
709	1030	// static int COLOR = 1;
710	1031	// static int MATERIAL = 2;
..	..	@@ -712,9 +1033,9 @@
712	1033
713	1034	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
714	1035
715		- JCheckBox colorCB;
716		- JCheckBox materialCB;
717		- JCheckBox textureCB;
	1036	+ cCheckBox colorCB;
	1037	+ cCheckBox materialCB;
	1038	+ cCheckBox textureCB;
718	1039
719	1040	public void itemStateChanged(ItemEvent e)
720	1041	{
..	..	@@ -742,6 +1063,7 @@
742	1063	} else if(e.getSource() == liveCB)
743	1064	{
744	1065	cameraView.ToggleLive();
	1066	+ refreshContents(false);
745	1067	}
746	1068	else if(e.getSource() == supportCB)
747	1069	{
..	..	@@ -806,6 +1128,18 @@
806	1128	{
807	1129	cameraView.ToggleOeil();
808	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	+ }
809	1143	else if(e.getSource() == lookAtCB)
810	1144	{
811	1145	cameraView.ToggleLookAt();
..	..	@@ -822,7 +1156,8 @@
822	1156
823	1157	/**/
824	1158	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
825		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1159	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1160	+ TreePath path = objEditor.jTree.getSelectionPath();
826	1161	if ((path == null) \|\| (path.getPathCount() <= 1)) {
827	1162	// We can't move the root node or an empty selection
828	1163	return;
..	..	@@ -885,8 +1220,6 @@
885	1220	}
886	1221	}
887	1222
888		- String string = (String) object;
889		-
890	1223	System.out.println("Transfer = " + object + "; drop : " + target);
891	1224	// if( object instanceof java.io.File[])
892	1225	// {
..	..	@@ -894,7 +1227,11 @@
894	1227	// objEditor.DropFile((java.io.File[]) object, true);
895	1228	// return;
896	1229	// }
897		- 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) == ':')
898	1235	{
899	1236	// file(s)
900	1237	String[] names = string.split("\n");
..	..	@@ -921,7 +1258,7 @@
921	1258
922	1259	flashIt = false;
923	1260	CameraPane pane = (CameraPane) target;
924		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1261	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
925	1262	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
926	1263
927	1264	if (group.selection.size() == 1)
..	..	@@ -937,23 +1274,33 @@
937	1274
938	1275	assert target == objEditor.jTree;
939	1276	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1277	+ Object3D destinationLeaf;
940	1278	try {
941		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1279	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
942	1280	} catch (Exception e) {
943	1281	System.out.println("destinationPath : " + destinationPath);
944	1282	return;
945	1283	}
946	1284
947		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1285	+ for (int i=group.selection.size(); --i>=0;)
948	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	+// {
949	1296	loadClipboard(true);
950	1297	objEditor.jTree.setSelectionPath(destinationPath);
951		- pasteInto(false);
952		- } else {
953		- loadClipboard(false);
954		- objEditor.jTree.setSelectionPath(destinationPath);
955		- pasteInto(false); // true); // ???
956		- }
	1298	+ pasteInto(false, false);
	1299	+// } else {
	1300	+// loadClipboard(false);
	1301	+// objEditor.jTree.setSelectionPath(destinationPath);
	1302	+// pasteInto(false, false); // true); // ???
	1303	+// }
957	1304	}
958	1305	public void dropActionChanged(DropTargetDragEvent dtde)
959	1306	// Called if the user has modified the current drop gesture
..	..	@@ -1058,85 +1405,107 @@
1058	1405	{
1059	1406	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1060	1407	//heightFieldItem.addActionListener(this);
1061		- gridItem = menu.add(new MenuItem("Grid"));
1062		- gridItem.addActionListener(this);
1063		- rectoidItem = menu.add(new MenuItem("Box"));
1064		- rectoidItem.addActionListener(this);
1065		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1066		- ellipsoidItem.addActionListener(this);
1067		- coneItem = menu.add(new MenuItem("Cone"));
1068		- coneItem.addActionListener(this);
1069		- torusItem = menu.add(new MenuItem("Torus"));
1070		- torusItem.addActionListener(this);
1071		- superItem = menu.add(new MenuItem("Superellipsoid"));
1072		- 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	+ {
1073	1426	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1074	1427	kleinItem.addActionListener(this);
1075		- particleItem = menu.add(new MenuItem("Particle system"));
1076		- particleItem.addActionListener(this);
	1428	+ }
	1429	+
	1430	+// particleItem = menu.add(new MenuItem("Particle system"));
	1431	+// particleItem.addActionListener(this);
	1432	+ if (Globals.ADVANCED)
	1433	+ {
1077	1434	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1078	1435	ragdollItem.addActionListener(this);
1079	1436	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1080	1437	ragdoll2Item.addActionListener(this);
	1438	+ }
1081	1439	menu.add("-");
1082		- meshItem = menu.add(new MenuItem("Mesh"));
	1440	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1083	1441	meshItem.addActionListener(this);
1084	1442	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1085	1443	// meshGroupItem.addActionListener(this);
	1444	+ if (Globals.ADVANCED)
	1445	+ {
1086	1446	springItem = menu.add(new MenuItem("Spring"));
1087	1447	springItem.addActionListener(this);
1088	1448	flagItem = menu.add(new MenuItem("Flag"));
1089	1449	flagItem.addActionListener(this);
1090		- bezierItem = menu.add(new MenuItem("Patch"));
1091		- bezierItem.addActionListener(this);
1092		- checkerItem = menu.add(new MenuItem("Checker"));
1093		- checkerItem.addActionListener(this);
1094	1450	blobItem = menu.add(new MenuItem("Blob"));
1095	1451	blobItem.addActionListener(this);
1096	1452	latheItem = menu.add(new MenuItem("Lathe"));
1097	1453	latheItem.addActionListener(this);
1098		- lightItem = menu.add(new MenuItem("Light"));
1099		- 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);
1100	1461	menu.add("-");
1101	1462	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1102	1463	//superLoopItem.addActionListener(this);
1103		- loopItem = menu.add(new MenuItem("Loop"));
1104		- loopItem.addActionListener(this);
	1464	+// loopItem = menu.add(new MenuItem("Loop"));
	1465	+// loopItem.addActionListener(this);
1105	1466	doubleItem = menu.add(new MenuItem("Fork"));
1106	1467	doubleItem.addActionListener(this);
	1468	+ if (Globals.ADVANCED)
	1469	+ {
1107	1470	tripleItem = menu.add(new MenuItem("Trident"));
1108	1471	tripleItem.addActionListener(this);
	1472	+ }
1109	1473	}
1110	1474
1111	1475	void buildToolsMenu(Menu menu)
1112	1476	{
1113	1477	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1114	1478	animationItem.addItemListener(this);
1115		- animationItem.setState(CameraPane.ANIMATION);
	1479	+ animationItem.setState(Globals.ANIMATION);
	1480	+
	1481	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1482	+ archiveItem.addActionListener(this);
1116	1483
1117	1484	menu.add("-");
1118	1485	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1119	1486	parseverticesItem.addActionListener(this);
1120	1487	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1121	1488	textureFieldItem.addActionListener(this);
1122		- alignItem = menu.add(new MenuItem("Align"));
	1489	+ alignItem = menu.add(new MenuItem("Align Objects"));
1123	1490	alignItem.addActionListener(this);
1124		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1125		- mirrorItem.addActionListener(this);
1126	1491	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1127	1492	reduceMorphItem.addActionListener(this);
1128	1493	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1129	1494	reduce34MorphItem.addActionListener(this);
1130		-
1131		- menu.add(computeAOItem = new MenuItem("Compute AO"));
1132		- computeAOItem.addActionListener(this);
1133	1495	menu.add("-");
1134		-
1135	1496	menu.add(memoryItem = new MenuItem("Memory Usage"));
1136	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("-");
1137	1506	menu.add(analyzeItem = new MenuItem("Analyze"));
1138	1507	analyzeItem.addActionListener(this);
1139		- menu.add(dumpItem = new MenuItem("Dump"));
	1508	+ menu.add(dumpItem = new MenuItem("Print"));
1140	1509	dumpItem.addActionListener(this);
1141	1510	// menu.add(pathItem = new MenuItem("From-to path"));
1142	1511	// pathItem.addActionListener(this);
..	..	@@ -1154,6 +1523,7 @@
1154	1523	menu.add("-");
1155	1524	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1156	1525	editScriptItem.addActionListener(this);
	1526	+ }
1157	1527	}
1158	1528
1159	1529	void ScreenFit()
..	..	@@ -1276,9 +1646,24 @@
1276	1646	shadow.material = new cMaterial(obj.material);
1277	1647	shadow.material.diffuse = 0.0001f;
1278	1648	shadow.material.specular = 0.0001f;
	1649	+ //shadow.projectedVertices[1].x = 300;
1279	1650
1280	1651	makeSomething(shadow);
1281	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	+ }
1282	1667
1283	1668	/**
1284	1669	* applyExample
..	..	@@ -1482,9 +1867,9 @@
1482	1867
1483	1868	void Overwrite(int mask)
1484	1869	{
1485		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	1870	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1486	1871	{
1487		- Object3D content = GrafreeD.clipboard.get(0);
	1872	+ Object3D content = Grafreed.clipboard.get(0);
1488	1873
1489	1874	if (content instanceof cGroup && ((cGroup)content).transientlink )
1490	1875	content = ((cGroup)content).get(0);
..	..	@@ -1523,7 +1908,7 @@
1523	1908	{
1524	1909	ScreenFit();
1525	1910	} else
1526		- if (source == switchItem)
	1911	+ if (source == switchViewItem)
1527	1912	{
1528	1913	cVector v1 = new cVector();
1529	1914	cVector v2 = new cVector();
..	..	@@ -1532,11 +1917,11 @@
1532	1917	objEditor.cameraView.renderCamera.setAim(v2, v1);
1533	1918	objEditor.cameraView.repaint();
1534	1919	} else
1535		- if (source == rectoidItem)
	1920	+ if (source == rectoidItem \|\| source == boxButton)
1536	1921	{
1537	1922	makeSomething(new Box());
1538	1923	} else
1539		- if (source == particleItem)
	1924	+ if (source == particleItem \|\| source == particlesButton)
1540	1925	{
1541	1926	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1542	1927	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1615,27 +2000,27 @@
1615	2000
1616	2001	makeSomething(obj);
1617	2002	} else
1618		- if (source == gridItem)
	2003	+ if (source == gridItem \|\| source == gridButton)
1619	2004	{
1620	2005	makeSomething(new Grid());
1621	2006	} else
1622		- if (source == ellipsoidItem)
	2007	+ if (source == ellipsoidItem \|\| source == sphereButton)
1623	2008	{
1624	2009	makeSomething(new Sphere());
1625	2010	} else
1626		- if (source == coneItem)
	2011	+ if (source == coneItem \|\| source == coneButton)
1627	2012	{
1628	2013	makeSomething(new Cone());
1629	2014	} else
1630		- if (source == torusItem)
	2015	+ if (source == torusItem \|\| source == torusButton)
1631	2016	{
1632	2017	makeSomething(new Torus());
1633	2018	} else
1634		- if (source == superItem)
	2019	+ if (source == superItem \|\| source == superButton)
1635	2020	{
1636	2021	makeSomething(new Superellipsoid());
1637	2022	} else
1638		- if (source == kleinItem)
	2023	+ if (source == kleinItem \|\| source == kleinButton)
1639	2024	{
1640	2025	makeSomething(new Klein());
1641	2026	} else
..	..	@@ -1655,7 +2040,7 @@
1655	2040	{
1656	2041	makeSomething(new BezierSurface());
1657	2042	} else
1658		- if (source == checkerItem)
	2043	+ if (source == overlayItem \|\| source == overlayButton)
1659	2044	{
1660	2045	/*
1661	2046	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1703,7 +2088,7 @@
1703	2088	s.setup();
1704	2089	makeSomething(s);
1705	2090	} else
1706		- if (source == lightItem)
	2091	+ if (source == lightItem \|\| source == lightButton)
1707	2092	{
1708	2093	makeSomething(new Light());
1709	2094	} else
..	..	@@ -1753,30 +2138,30 @@
1753	2138
1754	2139	group(g);
1755	2140	} else
1756		- if (source == loopItem)
	2141	+ if (source == loopItem \|\| source == loopButton)
1757	2142	{
1758	2143	Composite csg = new GroupLeaf();
1759	2144	csg.count = 5;
1760	2145	group(csg);
1761		- Composite child = new cGroup();
	2146	+ Composite child = new cGroup("Branch");
1762	2147	csg.addChild(child);
1763	2148	child.addChild(csg);
1764	2149	} else
1765	2150	if (source == doubleItem)
1766	2151	{
1767		- Composite csg = new GroupLeaf();
	2152	+ Composite csg = new GroupLeaf("Fork");
1768	2153	csg.count = 5;
1769	2154	group(csg);
1770		- Composite child = new cGroup();
	2155	+ Composite child = new cGroup("Branch A");
1771	2156	csg.addChild(child);
1772	2157	child.addChild(csg);
1773		- child = new cGroup();
	2158	+ child = new cGroup("Branch B");
1774	2159	csg.addChild(child);
1775	2160	child.addChild(csg);
1776	2161	} else
1777	2162	if (source == tripleItem)
1778	2163	{
1779		- Composite csg = new GroupLeaf();
	2164	+ Composite csg = new GroupLeaf("Trident");
1780	2165	csg.count = 4;
1781	2166	group(csg);
1782	2167	Composite child = new cGroup();
..	..	@@ -1788,23 +2173,6 @@
1788	2173	child = new cGroup();
1789	2174	csg.addChild(child);
1790	2175	child.addChild(csg);
1791		- } else
1792		-
1793		- if (source == importGFDItem)
1794		- {
1795		- ImportGFD();
1796		- } else
1797		- if (source == importVRMLX3DItem)
1798		- {
1799		- ImportVRMLX3D();
1800		- } else
1801		- if (source == import3DSItem)
1802		- {
1803		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1804		- } else
1805		- if (source == importOBJItem)
1806		- {
1807		- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1808	2176	} else
1809	2177	if (source == computeAOItem)
1810	2178	{
..	..	@@ -1824,7 +2192,7 @@
1824	2192	if (source == invariantsItem)
1825	2193	{
1826	2194	System.out.println("Invariants:");
1827		- GrafreeD.grafreeD.universe.invariants();
	2195	+ Grafreed.grafreeD.universe.invariants();
1828	2196	} else
1829	2197	if (source == memoryItem)
1830	2198	{
..	..	@@ -1843,19 +2211,47 @@
1843	2211	{
1844	2212	DumpObject();
1845	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
1846	2245	if (source == screenfitButton)
1847	2246	{
1848		- //Reload(lastConverter, lastFilename, true);
1849	2247	ScreenFit();
1850	2248	} else
1851	2249	if (source == screenfitpointButton)
1852	2250	{
1853		- //Reload(lastConverter, lastFilename, true);
1854	2251	ScreenFitPoint();
1855	2252	} else
1856	2253	if (source == snapobjectButton)
1857	2254	{
1858		- //Reload(lastConverter, lastFilename, true);
1859	2255	SnapObject();
1860	2256	} else
1861	2257	// if (event.getSource() == recompileButton)
..	..	@@ -1892,12 +2288,20 @@
1892	2288	{
1893	2289	loadClipboard(true);
1894	2290	} else
	2291	+ if (source == undoItem)
	2292	+ {
	2293	+ Undo();
	2294	+ } else
	2295	+ if (source == redoItem)
	2296	+ {
	2297	+ Redo();
	2298	+ } else
1895	2299	if (source == duplicateItem)
1896	2300	{
1897		- Object3D keep = GrafreeD.clipboard;
	2301	+ Object3D keep = Grafreed.clipboard;
1898	2302	loadClipboard(false);
1899	2303	paste(false);
1900		- GrafreeD.clipboard = keep;
	2304	+ Grafreed.clipboard = keep;
1901	2305	} else
1902	2306	if (source == cloneItem)
1903	2307	{
..	..	@@ -1915,13 +2319,17 @@
1915	2319	{
1916	2320	paste(false);
1917	2321	} else
	2322	+ if (source == pasteIntoItem)
	2323	+ {
	2324	+ pasteInto(true, false);
	2325	+ } else
1918	2326	if (source == pasteLinkItem)
1919	2327	{
1920		- pasteInto(false);
	2328	+ pasteInto(false, false);
1921	2329	} else
1922	2330	if (source == pasteCloneItem)
1923	2331	{
1924		- pasteInto(true);
	2332	+ pasteInto(true, true);
1925	2333	} else
1926	2334	if (source == pasteExpandItem)
1927	2335	{
..	..	@@ -2113,9 +2521,9 @@
2113	2521	// group.selection.get(0).setMasterThis(content); // should be identity
2114	2522	// refreshContents();
2115	2523	// }
2116		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2524	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2117	2525	{
2118		- Object3D content = GrafreeD.clipboard.get(0);
	2526	+ Object3D content = Grafreed.clipboard.get(0);
2119	2527
2120	2528	if (content instanceof cGroup && ((cGroup)content).transientlink )
2121	2529	content = ((cGroup)content).get(0);
..	..	@@ -2123,11 +2531,11 @@
2123	2531	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2124	2532	for (int i=0; i<group.selection.size(); i++)
2125	2533	{
2126		- boolean random = CameraPane.RANDOM;
2127		- CameraPane.RANDOM = false; // parse all random nodes
	2534	+ boolean random = CameraPane.SWITCH;
	2535	+ CameraPane.SWITCH = false; // parse all random nodes
2128	2536	group.selection.get(i).linkVerticesThis(content);
2129	2537	// group.selection.get(i).setMasterThis(content); // should be identity
2130		- CameraPane.RANDOM = random;
	2538	+ CameraPane.SWITCH = random;
2131	2539	}
2132	2540	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2133	2541	refreshContents();
..	..	@@ -2137,20 +2545,20 @@
2137	2545	{
2138	2546	for (int i=0; i<group.selection.size(); i++)
2139	2547	{
2140		- boolean random = CameraPane.RANDOM;
2141		- CameraPane.RANDOM = false; // parse all random nodes
	2548	+ boolean random = CameraPane.SWITCH;
	2549	+ CameraPane.SWITCH = false; // parse all random nodes
2142	2550	group.selection.get(i).linkVerticesThis(null);
2143		- CameraPane.RANDOM = random;
	2551	+ CameraPane.SWITCH = random;
2144	2552	}
2145	2553
2146	2554	refreshContents();
2147	2555	} else
2148	2556	if (source == relinkverticesItem)
2149	2557	{
2150		- boolean random = CameraPane.RANDOM;
2151		- CameraPane.RANDOM = false; // parse all random nodes
	2558	+ boolean random = CameraPane.SWITCH;
	2559	+ CameraPane.SWITCH = false; // parse all random nodes
2152	2560	group.selection.RelinkToSupport();
2153		- CameraPane.RANDOM = random;
	2561	+ CameraPane.SWITCH = random;
2154	2562
2155	2563	refreshContents();
2156	2564	} else
..	..	@@ -2165,9 +2573,9 @@
2165	2573	} else
2166	2574	if (source == setMasterItem)
2167	2575	{
2168		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	2576	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2169	2577	{
2170		- Object3D content = GrafreeD.clipboard.get(0);
	2578	+ Object3D content = Grafreed.clipboard.get(0);
2171	2579
2172	2580	if (content instanceof cGroup && ((cGroup)content).transientlink )
2173	2581	content = ((cGroup)content).get(0);
..	..	@@ -2180,9 +2588,9 @@
2180	2588	{
2181	2589	if (group.selection.size() == 1)
2182	2590	{
2183		- if (GrafreeD.clipboard.size() == 1)
	2591	+ if (Grafreed.clipboard.size() == 1)
2184	2592	{
2185		- Object3D content = GrafreeD.clipboard.get(0);
	2593	+ Object3D content = Grafreed.clipboard.get(0);
2186	2594
2187	2595	if (content instanceof cGroup && ((cGroup)content).transientlink )
2188	2596	content = ((cGroup)content).get(0);
..	..	@@ -2199,7 +2607,7 @@
2199	2607	{
2200	2608	RevertMeshes();
2201	2609	} else
2202		- if (source == resetMeshItem)
	2610	+ if (source == resetAllItem)
2203	2611	{
2204	2612	ResetAll();
2205	2613	} else
..	..	@@ -2219,9 +2627,9 @@
2219	2627	{
2220	2628	ClearSelection(true);
2221	2629	} else
2222		- if (source == grabItem)
	2630	+ if (source == grabItem \|\| source == groupButton)
2223	2631	{
2224		- group(new cGroup(), true);
	2632	+ group(new cGroup(), false); // true);
2225	2633	} else
2226	2634	if (source == hideItem)
2227	2635	{
..	..	@@ -2239,16 +2647,16 @@
2239	2647	{
2240	2648	makeSomething(new Camera());
2241	2649	} else
2242		- if (source == compositeItem)
	2650	+ if (source == compositeItem \|\| source == compositeButton)
2243	2651	{
2244	2652	group(new Composite());
2245	2653	} else
2246		- if (source == randomItem)
	2654	+ if (source == switchItem \|\| source == switchButton)
2247	2655	{
2248	2656	RandomNode random = new RandomNode();
2249	2657	group(random);
2250	2658	if (random.size() > 0)
2251		- random.name = random.get(0).name + "Rnd";
	2659	+ random.name = random.get(0).name + "Switch";
2252	2660	} else
2253	2661	if (source == physicsItem)
2254	2662	{
..	..	@@ -2345,7 +2753,7 @@
2345	2753	{
2346	2754	group(new cLinker());
2347	2755	} else
2348		- if (source == textureItem)
	2756	+ if (source == textureItem \|\| source == textureButton)
2349	2757	{
2350	2758	group(new TextureNode());
2351	2759	} else
..	..	@@ -2365,17 +2773,30 @@
2365	2773	{
2366	2774	CastShadow(2);
2367	2775	} else
2368		- if (source == ungroupItem)
	2776	+ if (source == ungroupItem \|\| source == ungroupButton)
2369	2777	{
2370		- //ungroup();
	2778	+ boolean hasRoot = false;
	2779	+
2371	2780	for (int i=0; i<group.selection.size(); i++)
2372	2781	{
2373		- Ungroup(group.selection.get(i));
	2782	+ if (group.selection.get(i) == group)
	2783	+ {
	2784	+ hasRoot = true;
	2785	+ break;
	2786	+ }
2374	2787	}
2375	2788
2376		- ClearSelection(false);
2377		-
2378		- 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	+ }
2379	2800	} else
2380	2801	if (source == genUVItem)
2381	2802	{
..	..	@@ -2387,7 +2808,7 @@
2387	2808	} else
2388	2809	if (source == genNormalsMESHItem)
2389	2810	{
2390		- GenNormals(true); // TODO
	2811	+ GenNormalsMESH();
2391	2812	} else
2392	2813	if (source == genNormalsORGANItem)
2393	2814	{
..	..	@@ -2452,6 +2873,22 @@
2452	2873	if (source == unmarkleavesItem)
2453	2874	{
2454	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);
2455	2892	} else
2456	2893	if (source == flipVItem)
2457	2894	{
..	..	@@ -2537,9 +2974,13 @@
2537	2974	{
2538	2975	SmoothMesh();
2539	2976	} else
2540		- if (source == transformgeometryItem)
	2977	+ if (source == transformGeometryItem)
2541	2978	{
2542	2979	TransformGeometry();
	2980	+ } else
	2981	+ if (source == transformChildrenItem)
	2982	+ {
	2983	+ TransformChildren();
2543	2984	} else
2544	2985	if (source == resetTransformItem)
2545	2986	{
..	..	@@ -2547,7 +2988,11 @@
2547	2988	} else
2548	2989	if (source == resetCentroidItem)
2549	2990	{
2550		- ResetCentroid();
	2991	+ ResetCentroid(true);
	2992	+ } else
	2993	+ if (source == resetCentroidXZItem)
	2994	+ {
	2995	+ ResetCentroid(false);
2551	2996	} else
2552	2997	if (source == resetParentItem)
2553	2998	{
..	..	@@ -2679,6 +3124,10 @@
2679	3124	if (source == twoButton)
2680	3125	{
2681	3126	radio.layout = twoButton;
	3127	+
	3128	+ if (CameraPane.FULLSCREEN)
	3129	+ fullscreenLayout = radio.layout;
	3130	+
2682	3131	// bug
2683	3132	//gridPanel.setDividerLocation(1.0);
2684	3133	//bigPanel.setDividerLocation(0.0);
..	..	@@ -2711,10 +3160,31 @@
2711	3160	bigThree.ClearUI();
2712	3161	bigThree.add(centralPanel);
2713	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	+
2714	3181	} else
2715	3182	if (source == threeButton)
2716	3183	{
2717	3184	radio.layout = threeButton;
	3185	+
	3186	+ if (CameraPane.FULLSCREEN)
	3187	+ fullscreenLayout = radio.layout;
2718	3188
2719	3189	// bigThree.remove(scenePanel);
2720	3190	// bigThree.remove(centralPanel);
..	..	@@ -2747,10 +3217,15 @@
2747	3217	bigThree.add(centralPanel);
2748	3218	bigThree.add(XYZPanel);
2749	3219	bigThree.FlushUI();
	3220	+
	3221	+ cameraView.requestFocusInWindow();
2750	3222	} else
2751	3223	if (source == fourButton)
2752	3224	{
2753	3225	radio.layout = fourButton;
	3226	+
	3227	+ if (CameraPane.FULLSCREEN)
	3228	+ fullscreenLayout = radio.layout;
2754	3229
2755	3230	// bigThree.remove(scenePanel);
2756	3231	// bigThree.remove(centralPanel);
..	..	@@ -2782,10 +3257,15 @@
2782	3257	bigThree.ClearUI();
2783	3258	bigThree.add(scenePanel);
2784	3259	bigThree.FlushUI();
	3260	+
	3261	+ cameraView.requestFocusInWindow();
2785	3262	} else
2786	3263	if (source == sixButton)
2787	3264	{
2788	3265	radio.layout = sixButton;
	3266	+
	3267	+ if (CameraPane.FULLSCREEN)
	3268	+ fullscreenLayout = radio.layout;
2789	3269
2790	3270	// bigThree.remove(scenePanel);
2791	3271	// bigThree.remove(centralPanel);
..	..	@@ -2818,10 +3298,15 @@
2818	3298	bigThree.add(scenePanel);
2819	3299	bigThree.add(centralPanel);
2820	3300	bigThree.FlushUI();
	3301	+
	3302	+ cameraView.requestFocusInWindow();
2821	3303	} else
2822	3304	if (source == sevenButton)
2823	3305	{
2824	3306	radio.layout = sevenButton;
	3307	+
	3308	+ if (CameraPane.FULLSCREEN)
	3309	+ fullscreenLayout = radio.layout;
2825	3310
2826	3311	// bigThree.remove(scenePanel);
2827	3312	// bigThree.remove(centralPanel);
..	..	@@ -2855,6 +3340,8 @@
2855	3340	bigThree.add(centralPanel);
2856	3341	bigThree.add(XYZPanel);
2857	3342	bigThree.FlushUI();
	3343	+
	3344	+ cameraView.requestFocusInWindow();
2858	3345	} else
2859	3346	if (source == rootButton)
2860	3347	{
..	..	@@ -2866,6 +3353,7 @@
2866	3353	EditObject(obj);
2867	3354	}
2868	3355
	3356	+ cameraView.requestFocusInWindow();
2869	3357	refreshContents(true);
2870	3358	} else
2871	3359	if (source == closeButton)
..	..	@@ -2875,22 +3363,37 @@
2875	3363	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2876	3364	{
2877	3365	ab = (cRadio)e.nextElement();
2878		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3366	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2879	3367	{
	3368	+ // Patch to avoid bug with transparency.
	3369	+ if (!ab.hadMaterial)
	3370	+ {
	3371	+ ab.object.material = null;
	3372	+ }
	3373	+
2880	3374	buttonGroup.remove(ab);
2881	3375	radioPanel.remove(ab);
2882	3376
2883		- ab.GetObject().editWindow = null;
	3377	+ //ab.GetObject().editWindow = null;
	3378	+ ab.GetObject().manipWindow = null;
2884	3379	// ab.GetObject().objectUI = null; // ?????????
2885	3380
2886	3381	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2887	3382	break;
2888	3383	}
2889	3384	}
	3385	+
	3386	+ cameraView.requestFocusInWindow();
2890	3387	refreshContents(true);
2891	3388	} else
2892	3389	if (source == editItem \|\| source == editButton)
2893	3390	{
	3391	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3392	+ {
	3393	+ Object3D child = (Object3D)e.nextElement();
	3394	+ child.pinned = true;
	3395	+ }
	3396	+
2894	3397	EditSelection(false);
2895	3398	} else
2896	3399	if (source == uneditButton)
..	..	@@ -2900,12 +3403,13 @@
2900	3403	Object3D child = (Object3D)e.nextElement();
2901	3404	if(child.editWindow != null)
2902	3405	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3406	+ child.pinned = false;
2903	3407	child.CloseUI();
2904	3408	listUI.remove(child);
2905	3409
2906		- child.editWindow = null; // ???????????
	3410	+ //child.editWindow = null; // ???????????
2907	3411	}
2908		- objEditor.ctrlPanel.validate();
	3412	+ objEditor.ctrlPanel.FlushUI();
2909	3413	//objEditor.jTree.clearSelection();
2910	3414	//objEditor.ResetSliders();
2911	3415	refreshContents(true);
..	..	@@ -2916,6 +3420,7 @@
2916	3420	//copy.ClearUI();
2917	3421	for (Object3D obj : listUI)
2918	3422	{
	3423	+ obj.pinned = false;
2919	3424	obj.CloseUI();
2920	3425	}
2921	3426	listUI.clear();
..	..	@@ -2925,7 +3430,7 @@
2925	3430	{
2926	3431	assert(copy == group);
2927	3432
2928		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3433	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2929	3434
2930	3435	for (Object3D obj : listUI)
2931	3436	{
..	..	@@ -2989,20 +3494,44 @@
2989	3494	frontView.object = group;
2990	3495	sideView.object = group;
2991	3496	}
2992		- group.editWindow = this;
	3497	+
	3498	+// fix "+" issue
	3499	+ //group.editWindow = this;
	3500	+ group.manipWindow = this;
	3501	+
2993	3502	/*
2994	3503	currentLayout = radio.layout;
2995	3504	if (currentLayout == null)
2996	3505	currentLayout = sevenButton;
2997	3506	*/
2998	3507	radio.layout.doClick();
	3508	+
	3509	+ ClearUnpinned();
	3510	+ SetPinStates(group.selection.size() > 0);
	3511	+ if (group.selection.size() == 1)
	3512	+ EditSelection(false);
2999	3513	keepparent = group.parent;
3000	3514	// PARENT = NULL or not???
3001	3515	//group.parent = null; // ROOT
3002	3516	//group.attributes = -1;
3003	3517	ResetModel();
	3518	+
	3519	+ cameraView.requestFocusInWindow();
3004	3520	refreshContents(true);
3005		- }
	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	+ }
3006	3535	else
3007	3536	{
3008	3537	//return super.action(event, arg);
..	..	@@ -3011,7 +3540,6 @@
3011	3540	}
3012	3541
3013	3542	boolean useclient = false;
3014		- cRadio radio;
3015	3543
3016	3544	void ToggleRoot()
3017	3545	{
..	..	@@ -3063,6 +3591,28 @@
3063	3591	refreshContents();
3064	3592	}
3065	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	+ }
3066	3616
3067	3617	void ResetTransform()
3068	3618	{
..	..	@@ -3175,7 +3725,7 @@
3175	3725	refreshContents();
3176	3726	}
3177	3727
3178		- void ResetCentroid()
	3728	+ void ResetCentroid(boolean full)
3179	3729	{
3180	3730	Object3D obj;
3181	3731	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3190,12 +3740,16 @@
3190	3740	LA.matIdentity(Object3D.mat);
3191	3741	obj.getBounds(minima, maxima, false);
3192	3742	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3193		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	3743	+ if (full)
	3744	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3194	3745	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3195	3746	obj.TransformMesh(Object3D.mat);
	3747	+
3196	3748	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3197		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	3749	+ if (full)
	3750	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3198	3751	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	3752	+
3199	3753	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3200	3754	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3201	3755	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3224,7 +3778,8 @@
3224	3778
3225	3779	int size = obj.MemorySize();
3226	3780
3227		- 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)");
3228	3783	}
3229	3784	}
3230	3785	catch (Exception e)
..	..	@@ -3261,9 +3816,9 @@
3261	3816	obj = (Object3D)e.nextElement();
3262	3817
3263	3818	System.out.println("Object is: " + obj);
3264		- GrafreeD.AnalyzeObject(obj);
	3819	+ Grafreed.AnalyzeObject(obj);
3265	3820	System.out.println("Boundary rep: " + obj.bRep);
3266		- GrafreeD.AnalyzeObject(obj.bRep);
	3821	+ Grafreed.AnalyzeObject(obj.bRep);
3267	3822
3268	3823	// System.err.println((size/1024) + " KB is the size of " + obj);
3269	3824	}
..	..	@@ -3305,6 +3860,13 @@
3305	3860	void GenNormals(boolean crease)
3306	3861	{
3307	3862	group.GenNormalsS(crease);
	3863	+
	3864	+ refreshContents();
	3865	+ }
	3866	+
	3867	+ void GenNormalsMESH()
	3868	+ {
	3869	+ group.GenNormalsMeshS();
3308	3870
3309	3871	refreshContents();
3310	3872	}
..	..	@@ -3477,8 +4039,8 @@
3477	4039
3478	4040	void ParseVertices()
3479	4041	{
3480		- boolean epsequal = GrafreeD.epsequal;
3481		- GrafreeD.epsequal = true;
	4042	+ boolean epsequal = Grafreed.epsequal;
	4043	+ Grafreed.epsequal = true;
3482	4044
3483	4045	for (int i=0; i<group.selection.size(); i++)
3484	4046	{
..	..	@@ -3503,7 +4065,7 @@
3503	4065	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3504	4066	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3505	4067
3506		- g.add(GrafreeD.clipboard);
	4068	+ g.add(Grafreed.clipboard);
3507	4069
3508	4070	buffer.add(g);
3509	4071	}
..	..	@@ -3518,7 +4080,7 @@
3518	4080	makeSomething(buffer, i==group.selection.size()-1);
3519	4081	}
3520	4082
3521		- GrafreeD.epsequal = epsequal;
	4083	+ Grafreed.epsequal = epsequal;
3522	4084
3523	4085	refreshContents();
3524	4086	}
..	..	@@ -3536,7 +4098,16 @@
3536	4098	String pigment = Object3D.GetPigment(tex);
3537	4099	//String bump = Object3D.GetBump(tex);
3538	4100
3539		- 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	+ }
3540	4111
3541	4112	double s = v.s;
3542	4113
..	..	@@ -3624,11 +4195,11 @@
3624	4195
3625	4196	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3626	4197
3627		- boolean random = CameraPane.RANDOM;
3628		- CameraPane.RANDOM = false; // parse all random nodes
	4198	+ boolean random = CameraPane.SWITCH;
	4199	+ CameraPane.SWITCH = false; // parse all random nodes
3629	4200	lowres.linkVerticesThis(null);
3630	4201	lowres.linkVerticesThis(sn);
3631		- CameraPane.RANDOM = random;
	4202	+ CameraPane.SWITCH = random;
3632	4203
3633	4204	System.err.flush();
3634	4205
..	..	@@ -3668,7 +4239,7 @@
3668	4239	return;
3669	4240
3670	4241	Object3D poses = group.selection.get(0);
3671		- Object3D ref = GrafreeD.clipboard.get(0);
	4242	+ Object3D ref = Grafreed.clipboard.get(0);
3672	4243
3673	4244	Object3D newgroup = new Object3D("Po:" + poses.name);
3674	4245
..	..	@@ -3862,9 +4433,9 @@
3862	4433
3863	4434	void ClipMesh()
3864	4435	{
3865		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	4436	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3866	4437	{
3867		- Object3D content = GrafreeD.clipboard.get(0);
	4438	+ Object3D content = Grafreed.clipboard.get(0);
3868	4439
3869	4440	if (content instanceof cGroup && ((cGroup)content).transientlink )
3870	4441	content = ((cGroup)content).get(0);
..	..	@@ -3873,7 +4444,7 @@
3873	4444	// {
3874	4445	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3875	4446	// }
3876		- group.selection.ClipMesh(GrafreeD.clipboard);
	4447	+ group.selection.ClipMesh(Grafreed.clipboard);
3877	4448	}
3878	4449	// group.selection.ClipMesh(GrafreeD.clipboard);
3879	4450	System.out.println("DONE.");
..	..	@@ -3920,6 +4491,18 @@
3920	4491	void MarkLeaves(boolean hide)
3921	4492	{
3922	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);
3923	4506	refreshContents();
3924	4507	}
3925	4508
..	..	@@ -3994,10 +4577,6 @@
3994	4577	// }
3995	4578	// }
3996	4579
3997		- static boolean allparams = true;
3998		-
3999		- static Vector<Object3D> listUI = new Vector<Object3D>();
4000		-
4001	4580	void EditSelection(boolean newWindow)
4002	4581	{
4003	4582	// aConstraints.gridy = 0;
..	..	@@ -4005,10 +4584,10 @@
4005	4584	{
4006	4585	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4007	4586	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4008		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4587	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4009	4588
4010	4589	Object3D elem = (Object3D)group.selection.elementAt(i);
4011		- if(elem != group)
	4590	+ if(elem != group \|\| !newWindow)
4012	4591	{
4013	4592	// if (!(elem instanceof Composite))
4014	4593	// newWindow = false;
..	..	@@ -4090,7 +4669,8 @@
4090	4669	//new Exception().printStackTrace();
4091	4670
4092	4671	freezemodel = true;
4093		-
	4672	+ ClearUnpinned();
	4673	+
4094	4674	/**/
4095	4675	//switch (event.id)
4096	4676	{
..	..	@@ -4098,7 +4678,6 @@
4098	4678	//case 702: // Event.LIST_DESELECT
4099	4679	group.deselectAll();
4100	4680	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4101		- objEditor.ClearInfo(); // .GetMaterial());
4102	4681	if (tps != null)
4103	4682	{
4104	4683	for (int i=0; i < tps.length; i++)
..	..	@@ -4107,33 +4686,39 @@
4107	4686
4108	4687	//if (child.parent != null)
4109	4688	//child.parent.addSelectee(child);
	4689	+ objEditor.SetMaterial(child);
4110	4690	group.addSelectee(child);
4111		- objEditor.SetMaterial(child); // .GetMaterial());
4112		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4113		- System.err.println("info : " + child.GetPath());
4114	4691	}
4115	4692	}
4116		- else
4117		- {
4118		- objEditor.SetMaterial(group); // .GetMaterial());
4119		- objEditor.AddInfo(group, this, true); // .GetMaterial());
4120		- System.err.println("info : " + group.GetPath());
4121		- }
	4693	+// else
	4694	+// {
	4695	+// objEditor.SetMaterial(group); // .GetMaterial());
	4696	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	4697	+// System.err.println("info : " + group.GetPath());
	4698	+// }
4122	4699
4123		- objEditor.SetText(); // jan 2014
4124		-
4125		- 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))
4126	4701	CameraPane.flash = true;
4127	4702
4128		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4703	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4129	4704	// a camera
4130	4705	{
4131		- CameraPane.camerachangeframe = 0; // don't refuse it
4132		- 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	+ }
4133	4711	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4134	4712	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4135	4713	}
4136	4714
	4715	+ if (tps != null && tps.length == 1)
	4716	+ {
	4717	+ EditSelection(false);
	4718	+ }
	4719	+
	4720	+ SetPinStates(tps != null && tps.length > 0);
	4721	+
4137	4722	refreshContents();
4138	4723	//return true;
4139	4724	}
..	..	@@ -4142,6 +4727,35 @@
4142	4727
4143	4728	freezemodel = false;
4144	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	+ }
4145	4759
4146	4760	void linkSomething(Object3D thing)
4147	4761	{
..	..	@@ -4213,16 +4827,19 @@
4213	4827	{
4214	4828	if (group.selection.isEmpty())
4215	4829	return;
4216		- GrafreeD.clipboardIsTempGroup = false;
	4830	+
	4831	+ Grafreed.clipboardIsTempGroup = false;
4217	4832	Composite tGroup = null;
4218	4833	if (group.selection.size() > 0) // 1)
4219	4834	{
4220	4835	tGroup = new cGroup();
4221		- GrafreeD.clipboardIsTempGroup = true;
	4836	+ Grafreed.clipboardIsTempGroup = true;
4222	4837	}
4223	4838
4224	4839	if (cut)
4225	4840	{
	4841	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	4842	+// Save();
4226	4843	//int indices[] = jList.getSelectedIndices();
4227	4844	//for (int i = indices.length - 1; i >= 0; i--)
4228	4845	//jList.remove(indices[i]);
..	..	@@ -4258,16 +4875,16 @@
4258	4875	//System.out.println("cut " + child);
4259	4876	//System.out.println("parent = " + child.parent);
4260	4877	// tmp.addChild(child);
4261		- if (GrafreeD.clipboardIsTempGroup)
	4878	+ if (Grafreed.clipboardIsTempGroup)
4262	4879	tGroup.add/Child/(tmp);
4263	4880	else
4264		- GrafreeD.clipboard = tmp;
	4881	+ Grafreed.clipboard = tmp;
4265	4882	}
4266	4883	else
4267		- if (GrafreeD.clipboardIsTempGroup)
	4884	+ if (Grafreed.clipboardIsTempGroup)
4268	4885	tGroup.add/Child/(child);
4269	4886	else
4270		- GrafreeD.clipboard = child;
	4887	+ Grafreed.clipboard = child;
4271	4888	}
4272	4889
4273	4890	//ResetModel();
..	..	@@ -4299,21 +4916,23 @@
4299	4916	//System.out.println("cut " + elem);
4300	4917	//System.out.println("parent = " + elem.parent);
4301	4918	// tmp.addChild(elem);
4302		- if (GrafreeD.clipboardIsTempGroup)
	4919	+ if (Grafreed.clipboardIsTempGroup)
4303	4920	tGroup.add/Child/(tmp);
4304	4921	else
4305		- GrafreeD.clipboard = tmp;
	4922	+ Grafreed.clipboard = tmp;
4306	4923	}
4307	4924	else
4308		- if (GrafreeD.clipboardIsTempGroup)
	4925	+ if (Grafreed.clipboardIsTempGroup)
4309	4926	tGroup.add/Child/(child);
4310	4927	else
4311		- GrafreeD.clipboard = child;
	4928	+ Grafreed.clipboard = child;
4312	4929	}
4313	4930
4314	4931	}
4315		- if (GrafreeD.clipboardIsTempGroup)
4316		- GrafreeD.clipboard = tGroup;
	4932	+
	4933	+ if (Grafreed.clipboardIsTempGroup)
	4934	+ Grafreed.clipboard = tGroup;
	4935	+
4317	4936	if (cut)
4318	4937	{
4319	4938	ResetModel();
..	..	@@ -4323,11 +4942,15 @@
4323	4942
4324	4943	void paste(boolean expand)
4325	4944	{
	4945	+ if (Globals.SAVEONMAKE)
	4946	+ Save();
	4947	+ boolean keep = Globals.SAVEONMAKE;
	4948	+ Globals.SAVEONMAKE = false;
4326	4949	// if (GrafreeD.clipboard == null)
4327	4950	// return;
4328	4951	boolean first = true;
4329	4952
4330		- if (GrafreeD.clipboardIsTempGroup)
	4953	+ if (Grafreed.clipboardIsTempGroup)
4331	4954	{
4332	4955	Composite temp;
4333	4956
..	..	@@ -4338,7 +4961,7 @@
4338	4961	temp = (Composite)Applet3D.clipboard.deepCopy();
4339	4962	*/
4340	4963	Object3D elem;
4341		- 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))
4342	4965	{
4343	4966	Object3D child = (Object3D)e.nextElement();
4344	4967
..	..	@@ -4372,21 +4995,22 @@
4372	4995	//Object3D cb = Applet3D.clipboard;
4373	4996	//temp.addChild(cb);
4374	4997	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4375		- assert(GrafreeD.clipboard.parent == null);
4376		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
4377		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4378		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4379		- 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());
4380	5003	else
4381		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4382		- GrafreeD.clipboard.get(0).parent = keepparent;
	5004	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	5005	+ Grafreed.clipboard.get(0).parent = keepparent;
4383	5006	}
4384	5007
	5008	+ Globals.SAVEONMAKE = keep;
4385	5009	ResetModel();
4386	5010	refreshContents();
4387	5011	}
4388	5012
4389		- void pasteInto(boolean copyit)
	5013	+ void pasteInto(boolean copyit, boolean clone)
4390	5014	{
4391	5015	// if (GrafreeD.clipboard == null)
4392	5016	// return;
..	..	@@ -4415,15 +5039,22 @@
4415	5039	if (copyit)
4416	5040	{
4417	5041	// paste(false);
4418		- CloneClipboard(false); // sept 2014
	5042	+ if (clone)
	5043	+ {
	5044	+ CloneClipboard(false); // sept 2014
	5045	+ }
	5046	+ else
	5047	+ {
	5048	+ paste(false);
	5049	+ }
4419	5050	}
4420	5051	else
4421	5052	{
4422	5053	boolean first = true;
4423	5054
4424		- if (GrafreeD.clipboardIsTempGroup)
	5055	+ if (Grafreed.clipboardIsTempGroup)
4425	5056	{
4426		- Composite temp = (Composite)GrafreeD.clipboard;
	5057	+ Composite temp = (Composite)Grafreed.clipboard;
4427	5058	Object3D copy;
4428	5059	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4429	5060	{
..	..	@@ -4433,7 +5064,7 @@
4433	5064	}
4434	5065	} else
4435	5066	{
4436		- linkSomething(GrafreeD.clipboard); //.get(0));
	5067	+ linkSomething(Grafreed.clipboard); //.get(0));
4437	5068	}
4438	5069	}
4439	5070	}
..	..	@@ -4510,6 +5141,10 @@
4510	5141
4511	5142	void group(Object3D csg, boolean grab)
4512	5143	{
	5144	+ if (Globals.SAVEONMAKE)
	5145	+ Save();
	5146	+ boolean keep = Globals.SAVEONMAKE;
	5147	+ Globals.SAVEONMAKE = false;
4513	5148	if (//false) // why??
4514	5149	!group.selection.isEmpty())
4515	5150	{
..	..	@@ -4623,10 +5258,15 @@
4623	5258	//node.add(csg);
4624	5259	//makeSomething(node);
4625	5260	makeSomething(csg);
	5261	+ Globals.SAVEONMAKE = keep;
4626	5262	}
4627	5263
4628	5264	void Ungroup(Object3D g)
4629	5265	{
	5266	+ if (Globals.SAVEONMAKE)
	5267	+ Save();
	5268	+ boolean keep = Globals.SAVEONMAKE;
	5269	+ Globals.SAVEONMAKE = false;
4630	5270	if (g instanceof HiddenObject)
4631	5271	{
4632	5272	HiddenObject h = (HiddenObject) g;
..	..	@@ -4643,6 +5283,7 @@
4643	5283	objEditor.makeSomething(g.get(i), false);
4644	5284	}
4645	5285	}
	5286	+ Globals.SAVEONMAKE = keep;
4646	5287	}
4647	5288
4648	5289	void ungroup()
..	..	@@ -4838,21 +5479,6 @@
4838	5479	}
4839	5480	*/
4840	5481
4841		- void ImportGFD()
4842		- {
4843		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4844		- browser.show();
4845		- String filename = browser.getFile();
4846		- if (filename != null && filename.length() > 0)
4847		- {
4848		- String fullname = browser.getDirectory() + filename;
4849		-
4850		- //Object3D readobj =
4851		- objEditor.ReadGFD(fullname, objEditor);
4852		- //makeSomething(readobj);
4853		- }
4854		- }
4855		-
4856	5482	/*
4857	5483	public void Callback(Object obj)
4858	5484	{
..	..	@@ -4876,26 +5502,9 @@
4876	5502	}
4877	5503	*/
4878	5504
4879		- void ImportVRMLX3D()
4880		- {
4881		- if (GrafreeD.standAlone)
4882		- {
4883		- /**/
4884		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4885		- browser.show();
4886		- String filename = browser.getFile();
4887		- if (filename != null && filename.length() > 0)
4888		- {
4889		- String fullname = browser.getDirectory() + filename;
4890		- LoadVRMLX3D(fullname);
4891		- }
4892		- /**/
4893		- }
4894		- }
4895		-
4896	5505	String GetFile(String dialogName)
4897	5506	{
4898		- if (GrafreeD.standAlone)
	5507	+ if (Grafreed.standAlone)
4899	5508	{
4900	5509	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4901	5510	browser.show();
..	..	@@ -4959,10 +5568,33 @@
4959	5568	cButton flashSelectionButton;
4960	5569	cButton editButton;
4961	5570	cButton uneditButton;
	5571	+ JCheckBox allParamsButton;
4962	5572	cButton clearpanelButton;
4963		- cButton allParamsButton;
4964	5573	cButton unselectButton;
4965	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	+
4966	5598	cButton screenfitButton;
4967	5599	cButton screenfitpointButton;
4968	5600	cButton snapobjectButton;
..	..	@@ -4974,14 +5606,6 @@
4974	5606
4975	5607	cButton setsupportButton;
4976	5608
4977		- cButton twoButton;
4978		- cButton sixButton;
4979		- cButton threeButton;
4980		- cButton sevenButton;
4981		- cButton fourButton; // full panel
4982		- cButton oneButton; // full XYZ
4983		- //cButton currentLayout;
4984		-
4985	5609	//
4986	5610	//Composite
4987	5611	Object3D // to do !!
..	..	@@ -4991,9 +5615,11 @@
4991	5615	//JTree jTree;
4992	5616	private MenuItem lookAtItem;
4993	5617	private MenuItem lookFromItem;
4994		- private MenuItem switchItem;
	5618	+ private MenuItem switchViewItem;
4995	5619	private MenuItem cutItem;
4996		- private MenuItem duplicateItem;
	5620	+ private MenuItem undoItem;
	5621	+ private MenuItem redoItem;
	5622	+ private JMenuItem duplicateItem;
4997	5623	private MenuItem cloneItem;
4998	5624	private MenuItem cloneSupportItem;
4999	5625	private MenuItem overwriteGeoItem;
..	..	@@ -5006,7 +5632,7 @@
5006	5632	private MenuItem linkverticesItem;
5007	5633	private MenuItem relinkverticesItem;
5008	5634	private MenuItem setMasterItem;
5009		- private MenuItem resetMeshItem;
	5635	+ private MenuItem resetAllItem;
5010	5636	private MenuItem stepAllItem;
5011	5637	private MenuItem revertMeshItem;
5012	5638	private MenuItem poseMeshItem;
..	..	@@ -5017,6 +5643,7 @@
5017	5643	private MenuItem mergeGeometriesItem;
5018	5644	private MenuItem copyItem;
5019	5645	private MenuItem pasteItem;
	5646	+ private MenuItem pasteIntoItem;
5020	5647	private MenuItem pasteLinkItem;
5021	5648	private MenuItem pasteCloneItem;
5022	5649	private MenuItem pasteExpandItem;
..	..	@@ -5055,6 +5682,10 @@
5055	5682	private MenuItem showleavesItem;
5056	5683	private MenuItem markleavesItem;
5057	5684	private MenuItem unmarkleavesItem;
	5685	+ private MenuItem rewindleavesItem;
	5686	+ private MenuItem unrewindleavesItem;
	5687	+ private MenuItem randomleavesItem;
	5688	+ private MenuItem unrandomleavesItem;
5058	5689
5059	5690	private MenuItem flipVItem;
5060	5691	private MenuItem unflipVItem;
..	..	@@ -5066,15 +5697,17 @@
5066	5697	private MenuItem panoTexturesItem;
5067	5698
5068	5699	private MenuItem resetCentroidItem;
5069		- private MenuItem transformgeometryItem;
	5700	+ private MenuItem resetCentroidXZItem;
5070	5701	private MenuItem resetTransformItem;
	5702	+ private MenuItem transformGeometryItem;
	5703	+ private MenuItem transformChildrenItem;
5071	5704	private MenuItem hideItem;
5072	5705	private MenuItem grabItem;
5073	5706	private MenuItem backItem;
5074	5707	private MenuItem frontItem;
5075	5708	private MenuItem cameraItem;
5076	5709	private MenuItem compositeItem;
5077		- private MenuItem randomItem;
	5710	+ private MenuItem switchItem;
5078	5711	private MenuItem physicsItem;
5079	5712	private MenuItem frameselectorItem;
5080	5713	private MenuItem scriptNodeItem;
..	..	@@ -5114,7 +5747,7 @@
5114	5747	private MenuItem blobItem;
5115	5748	private MenuItem latheItem;
5116	5749	private MenuItem bezierItem;
5117		- private MenuItem checkerItem;
	5750	+ private MenuItem overlayItem;
5118	5751	private MenuItem meshItem;
5119	5752	// private MenuItem meshGroupItem;
5120	5753	private MenuItem springItem;
..	..	@@ -5136,11 +5769,6 @@
5136	5769	private MenuItem doubleItem;
5137	5770	private MenuItem tripleItem;
5138	5771
5139		- private MenuItem importGFDItem;
5140		- private MenuItem importVRMLX3DItem;
5141		- private MenuItem import3DSItem;
5142		- private MenuItem importOBJItem;
5143		-
5144	5772	private MenuItem computeAOItem;
5145	5773	private MenuItem recompileItem;
5146	5774	private MenuItem editScriptItem;
..	..	@@ -5150,4 +5778,8 @@
5150	5778	private MenuItem analyzeItem;
5151	5779	private MenuItem dumpItem;
5152	5780	//boolean freezemodel = false;
	5781	+
	5782	+ Menu cameraMenu;
	5783	+ MenuItem editCameraItem;
	5784	+ MenuItem restoreCameraItem;
5153	5785	}