~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.REPLACEONMAKE)
	88	+ Save();
	89	+ boolean keep = Globals.REPLACEONMAKE;
	90	+ Globals.REPLACEONMAKE = 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.REPLACEONMAKE = 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,28 +153,21 @@
148	153
149	154	//JTextField nameField;
150	155
151		- void SetupMenu2(ObjEditor oe)
	156	+ void SetupMenu2(GroupEditor oe)
152	157	{
153		- if (Globals.ADVANCED)
154		- {
155		- oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
156		- //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
157		- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
158		- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
159		- oe.cameraMenu.add("-");
160		- openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
161		- openWindowItem.addActionListener(this);
162		- editLeafItem.addActionListener(this);
163		- lookAtItem.addActionListener(this);
164		- //lookFromItem.addActinoListener(this);
165		- //switchItem.addActionListener(this);
166		- }
167		-
	158	+ oe.jTree = new cTree();
	159	+
168	160	Menu menu;
169	161	oe.menuBar.add(menu = new Menu("Edit"));
170	162	//editItem = menu.add(new MenuItem("Edit"));
171	163	//editItem.addActionListener(this);
172		- 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"));
173	171	duplicateItem.addActionListener(this);
174	172	cloneItem = menu.add(new MenuItem("Clone"));
175	173	cloneItem.addActionListener(this);
..	..	@@ -185,7 +183,6 @@
185	183	copyItem.addActionListener(this);
186	184	pasteItem = menu.add(new MenuItem("Paste"));
187	185	pasteItem.addActionListener(this);
188		- menu.add("-");
189	186
190	187	menu.add("-");
191	188	pasteIntoItem = menu.add(new MenuItem("Paste into"));
..	..	@@ -206,14 +203,97 @@
206	203	clearAllItem = menu.add(new MenuItem("Clear All"));
207	204	clearAllItem.addActionListener(this);
208	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());
209	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	+
210	294	oe.menuBar.add(menu = new Menu("Setting"));
211	295	if (Globals.ADVANCED)
212	296	{
213		- resetMeshItem = menu.add(new MenuItem("Reset All"));
214		- resetMeshItem.addActionListener(this);
215		- stepAllItem = menu.add(new MenuItem("Step All"));
216		- stepAllItem.addActionListener(this);
217	297	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
218	298	revertMeshItem.addActionListener(this);
219	299	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
..	..	@@ -253,21 +333,29 @@
253	333	}
254	334
255	335	oe.menuBar.add(menu = new Menu("Group"));
256		- grabItem = menu.add(new MenuItem("Grab"));
257		- grabItem.addActionListener(this);
	336	+// grabItem = menu.add(new MenuItem("Grab"));
	337	+// grabItem.addActionListener(this);
258	338	backItem = menu.add(new MenuItem("Back"));
259	339	backItem.addActionListener(this);
260	340	frontItem = menu.add(new MenuItem("Front"));
261	341	frontItem.addActionListener(this);
262		- compositeItem = menu.add(new MenuItem("Composite"));
263		- compositeItem.addActionListener(this);
	342	+// compositeItem = menu.add(new MenuItem("Composite"));
	343	+// compositeItem.addActionListener(this);
	344	+
	345	+ if (Globals.ADVANCED)
	346	+ {
264	347	hideItem = menu.add(new MenuItem("Hidden Group"));
265	348	hideItem.addActionListener(this);
	349	+ }
266	350	ungroupItem = menu.add(new MenuItem("Ungroup"));
267	351	ungroupItem.addActionListener(this);
268		- menu.add("-");
269		- randomItem = menu.add(new MenuItem("Switch node"));
270		- randomItem.addActionListener(this);
	352	+
	353	+// menu.add("-");
	354	+//
	355	+// switchItem = menu.add(new MenuItem("Switch node"));
	356	+// switchItem.addActionListener(this);
	357	+ if (Globals.ADVANCED)
	358	+ {
271	359	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
272	360	switchGeoItem.addActionListener(this);
273	361	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
..	..	@@ -275,8 +363,6 @@
275	363	morphItem = menu.add(new MenuItem("Morph Group"));
276	364	morphItem.addActionListener(this);
277	365
278		- if (Globals.ADVANCED)
279		- {
280	366	menu.add("-");
281	367	physicsItem = menu.add(new MenuItem("Physics"));
282	368	physicsItem.addActionListener(this);
..	..	@@ -284,30 +370,29 @@
284	370	frameselectorItem.addActionListener(this);
285	371	scriptNodeItem = menu.add(new MenuItem("Script Node"));
286	372	scriptNodeItem.addActionListener(this);
287		- cameraItem = menu.add(new MenuItem("Camera"));
288		- cameraItem.addActionListener(this);
289	373	}
290	374
291	375	oe.menuBar.add(menu = new Menu("Object"));
292		- textureItem = menu.add(new MenuItem("Texture"));
293		- textureItem.addActionListener(this);
	376	+// textureItem = menu.add(new MenuItem("Texture"));
	377	+// textureItem.addActionListener(this);
294	378	billboardItem = menu.add(new MenuItem("Billboard"));
295	379	billboardItem.addActionListener(this);
296	380	csgItem = menu.add(new MenuItem("CSG"));
297	381	csgItem.addActionListener(this);
298		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	382	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
299	383	shadowXItem.addActionListener(this);
300		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	384	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
301	385	shadowYItem.addActionListener(this);
302		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	386	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
303	387	shadowZItem.addActionListener(this);
	388	+ attributeItem = menu.add(new MenuItem("Attribute"));
	389	+ attributeItem.addActionListener(this);
	390	+
304	391	if (Globals.ADVANCED)
305	392	{
306	393	menu.add("-");
307	394	linkerItem = menu.add(new MenuItem("Linker"));
308	395	linkerItem.addActionListener(this);
309		- attributeItem = menu.add(new MenuItem("Attribute"));
310		- attributeItem.addActionListener(this);
311	396	templateItem = menu.add(new MenuItem("Template"));
312	397	templateItem.addActionListener(this);
313	398	pointflowItem = menu.add(new MenuItem("Point Flow"));
..	..	@@ -318,8 +403,12 @@
318	403	resetTransformItem.addActionListener(this);
319	404	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
320	405	resetCentroidItem.addActionListener(this);
321		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
322		- 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);
323	412
324	413	oe.menuBar.add(menu = new Menu("Geometry"));
325	414	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -368,6 +457,10 @@
368	457	oe.menuBar.add(menu = new Menu("Attributes"));
369	458	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
370	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);
371	464	menu.add("-");
372	465	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
373	466	liveleavesItem.addActionListener(this);
..	..	@@ -388,6 +481,14 @@
388	481	markleavesItem.addActionListener(this);
389	482	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
390	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);
391	492	menu.add("-");
392	493	flipVItem = menu.add(new MenuItem("Flip V"));
393	494	flipVItem.addActionListener(this);
..	..	@@ -422,38 +523,42 @@
422	523	sortbysizeItem.addActionListener(this);
423	524	sortbynameItem = menu.add(new MenuItem("Sort by name"));
424	525	sortbynameItem.addActionListener(this);
	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);
425	531	if (Globals.ADVANCED)
426	532	{
427		- menu.add("-");
	533	+ // Pretty much the same as duplicate and clone.
428	534	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
429	535	extractGeometriesItem.addActionListener(this);
430	536	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
431	537	cloneGeometriesItem.addActionListener(this);
432		- shareGeometriesItem = menu.add(new MenuItem("Share Geometry"));
433		- shareGeometriesItem.addActionListener(this);
434		- mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
435		- mergeGeometriesItem.addActionListener(this);
436	538	}
437	539
438	540	oe.menuBar.add(menu = new Menu("Insert"));
439	541	buildCreateMenu(menu);
440	542
441		- oe.menuBar.add(menu = new Menu("Include"));
442		- importGFDItem = menu.add(new MenuItem("GrafreeD Object..."));
443		- importGFDItem.addActionListener(this);
444		- importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D Object..."));
445		- importVRMLX3DItem.addActionListener(this);
446		- importOBJItem = menu.add(new MenuItem("OBJ Object..."));
447		- importOBJItem.addActionListener(this);
448		- import3DSItem = menu.add(new MenuItem("3DS Object..."));
449		- import3DSItem.addActionListener(this);
450		-
451	543	oe.menuBar.add(menu = new Menu("Tools"));
452	544	buildToolsMenu(menu);
453	545	}
454	546
	547	+
455	548	void SetupUI2(ObjEditor oe)
456	549	{
	550	+ // June 2019
	551	+ if (oe == null)
	552	+ {
	553	+ //super.SetupUI2(this);
	554	+ //return;
	555	+ }
	556	+
	557	+ if (copy != group)
	558	+ {
	559	+ //super.SetupUI2(this);
	560	+ }
	561	+
457	562	//new Exception().printStackTrace();
458	563
459	564	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -482,97 +587,229 @@
482	587	oe.radioPanel.add(dummyButton);
483	588	oe.buttonGroup.add(dummyButton);
484	589	*/
	590	+ cGridBag copyOptionsPanel = new cGridBag();
	591	+
	592	+ copyOptionsPanel.preferredHeight = 1;
	593	+
485	594	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
486	595
487		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
488		- liveCB.setToolTipText("Enabled animation");
	596	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	597	+ //minButton.setToolTipText("Minimize window");
	598	+ //minButton.addActionListener(this);
	599	+
	600	+ if (Globals.ADVANCED)
	601	+ {
	602	+ oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	603	+ maxButton.setToolTipText("Maximize window");
	604	+ maxButton.addActionListener(this);
	605	+ }
	606	+
	607	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	608	+ fullButton.setToolTipText("Full-screen window");
	609	+ fullButton.addActionListener(this);
	610	+
	611	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	612	+ screenfitButton.setToolTipText("Screen fit");
	613	+ screenfitButton.addActionListener(this);
	614	+
	615	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	616	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	617	+ restoreCameraButton.addActionListener(this);
	618	+
	619	+ copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	620	+ saveButton.setToolTipText("New version");
	621	+ saveButton.addActionListener(this);
	622	+
	623	+ copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	624	+ undoButton.setToolTipText("Previous version");
	625	+ undoButton.addActionListener(this);
	626	+ undoButton.setEnabled(false);
	627	+
	628	+ cGridBag updown = new cGridBag().setVertical(true);
	629	+ updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	630	+ restoreButton.setToolTipText("Restore current");
	631	+ restoreButton.addActionListener(this);
	632	+ restoreButton.setEnabled(false);
	633	+
	634	+ updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	635	+ replaceButton.setToolTipText("Replace current");
	636	+ replaceButton.addActionListener(this);
	637	+ replaceButton.setEnabled(false);
	638	+
	639	+ copyOptionsPanel.add(updown);
	640	+
	641	+ copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	642	+ redoButton.setToolTipText("Next version");
	643	+ redoButton.addActionListener(this);
	644	+ redoButton.setEnabled(false);
	645	+
	646	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	647	+ liveCB.setToolTipText("Enable animation");
489	648	liveCB.addItemListener(this);
490	649
491		- oe.toolbarPanel.add(oneStepButton = new cButton("Step", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	650	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
492	651	oneStepButton.setToolTipText("Animate one step forward");
493	652	oneStepButton.addActionListener(this);
494	653
495		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	654	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
496	655	fastCB.setToolTipText("Fast mode");
497	656	fastCB.addItemListener(this);
498	657
499		- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
500		- trackCB.setToolTipText("Enable tracking");
501		- trackCB.addItemListener(this);
502		-
503		- oe.toolbarPanel.add(screenfitButton = new cButton("@", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
504		- screenfitButton.setToolTipText("Screen fit");
505		- screenfitButton.addActionListener(this);
	658	+ //oe.toolboxPanel.Return();
	659	+
	660	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	661	+// trackCB.setToolTipText("Enable tracking");
	662	+// trackCB.addItemListener(this);
506	663
507	664	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
508	665	// screenfitpointButton.addActionListener(this);
509	666
510	667	if (Globals.ADVANCED)
511	668	{
512		- oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	669	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
513	670	snapobjectButton.addActionListener(this);
514	671	snapobjectButton.setToolTipText("Snap Object");
515	672	}
516	673
517		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
518		- flashSelectionButton.setToolTipText("Show selection");
519		- flashSelectionButton.addActionListener(this);
	674	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
520	675
521		- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
522		-
523		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	676	+ oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
524	677	twoButton.setToolTipText("Show center view only");
525	678	twoButton.addActionListener(this);
526		- oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	679	+ this.fullscreenLayout = twoButton;
	680	+
	681	+ oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
527	682	fourButton.addActionListener(this);
528	683	fourButton.setToolTipText("Show left panel only");
529		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	684	+ oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
530	685	sixButton.setToolTipText("2-column layout left");
531	686	sixButton.addActionListener(this);
532		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	687	+ oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
533	688	threeButton.setToolTipText("2-column layout right");
534	689	threeButton.addActionListener(this);
535		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	690	+ oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
536	691	sevenButton.setToolTipText("3-column layout");
537	692	sevenButton.addActionListener(this);
538	693	//
539	694
540		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	695	+ oe.toolbarPanel.add(rootButton = GetButton("icons/write.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
541	696	rootButton.setToolTipText("Edit selection in new tab");
542	697	rootButton.addActionListener(this);
543	698
544		- oe.toolbarPanel.add(closeButton = new cButton("X", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	699	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
545	700	closeButton.setToolTipText("Close tab");
546	701	closeButton.addActionListener(this);
547	702	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
548	703	//clearButton.addActionListener(this);
549		-
550		- cGridBag commandsPanel = new cGridBag();
	704	+
	705	+ // INSERT
	706	+ oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	707	+ gridButton.setToolTipText("Create grid");
	708	+ gridButton.addActionListener(this);
	709	+
	710	+ oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	711	+ boxButton.setToolTipText("Create box");
	712	+ boxButton.addActionListener(this);
	713	+
	714	+ oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	715	+ sphereButton.setToolTipText("Create sphere");
	716	+ sphereButton.addActionListener(this);
	717	+
	718	+ oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	719	+ coneButton.setToolTipText("Create cone");
	720	+ coneButton.addActionListener(this);
	721	+
	722	+ oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	723	+ torusButton.setToolTipText("Create torus");
	724	+ torusButton.addActionListener(this);
	725	+
	726	+ oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	727	+ superButton.setToolTipText("Create superellipsoid");
	728	+ superButton.addActionListener(this);
	729	+
	730	+ if (Globals.ADVANCED)
	731	+ {
	732	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	733	+ kleinButton.setToolTipText("Create Klein bottle");
	734	+ kleinButton.addActionListener(this);
	735	+ }
551	736
552		- commandsPanel.add(editButton = new cButton("+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
553		- editButton.setToolTipText("Edit selection");
	737	+ oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	738	+ particlesButton.setToolTipText("Create particle system");
	739	+ particlesButton.addActionListener(this);
	740	+
	741	+ oe.toolboxPanel.Return();
	742	+
	743	+ oe.toolboxPanel.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	744	+ groupButton.setToolTipText("Create group");
	745	+ groupButton.addActionListener(this);
	746	+
	747	+ oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	748	+ compositeButton.setToolTipText("Create composite");
	749	+ compositeButton.addActionListener(this);
	750	+
	751	+ oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	752	+ switchButton.setToolTipText("Create item switcher");
	753	+ switchButton.addActionListener(this);
	754	+
	755	+ oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	756	+ loopButton.setToolTipText("Create loop");
	757	+ loopButton.addActionListener(this);
	758	+
	759	+ oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	760	+ textureButton.setToolTipText("Create texture");
	761	+ textureButton.addActionListener(this);
	762	+
	763	+ oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	764	+ overlayButton.setToolTipText("Create overlay");
	765	+ overlayButton.addActionListener(this);
	766	+
	767	+ oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	768	+ lightButton.setToolTipText("Create light");
	769	+ lightButton.addActionListener(this);
	770	+
	771	+ for (int i=6; --i>=0;)
	772	+ {
	773	+ oe.toolboxPanel.Return();
	774	+ oe.toolboxPanel.add(new cGridBag());
	775	+ oe.toolboxPanel.add(new cGridBag());
	776	+ oe.toolboxPanel.add(new cGridBag());
	777	+ oe.toolboxPanel.add(new cGridBag());
	778	+ oe.toolboxPanel.add(new cGridBag());
	779	+ oe.toolboxPanel.add(new cGridBag());
	780	+ oe.toolboxPanel.add(new cGridBag());
	781	+ }
	782	+
	783	+ // EDIT panel
	784	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	785	+ editButton.setToolTipText("Pin selection controls");
554	786	editButton.addActionListener(this);
555	787
556		- commandsPanel.add(uneditButton = new cButton("-", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
557		- uneditButton.setToolTipText("Unedit selection");
	788	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	789	+ uneditButton.setToolTipText("Remove selection controls");
558	790	uneditButton.addActionListener(this);
559	791
560		- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
561		- allParamsButton.setToolTipText("Edit all params");
	792	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	793	+ allParamsButton.setToolTipText("Show all controle");
562	794	allParamsButton.addActionListener(this);
563	795
564		- commandsPanel.add(clearPanelButton = new cButton("C", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	796	+ editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
565	797	clearPanelButton.setToolTipText("Clear edit panel");
566	798	clearPanelButton.addActionListener(this);
567	799
568		- commandsPanel.add(unselectButton = new cButton("U", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	800	+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
569	801	unselectButton.setToolTipText("Unselect");
570	802	unselectButton.addActionListener(this);
571	803
572		- commandsPanel.preferredHeight = 1;
	804	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	805	+ flashSelectionButton.setToolTipText("Highlight selection");
	806	+ flashSelectionButton.addActionListener(this);
573	807
574		- oe.treePanel.add(commandsPanel);
575		- oe.treePanel.Return();
	808	+ editCommandsPanel.preferredHeight = 1;
	809	+
	810	+ SetPinStates(false);
	811	+// oe.treePanel.add(commandsPanel);
	812	+// oe.treePanel.Return();
576	813
577	814	// oe.aConstraints.gridx += 1;
578	815	// oe.aConstraints.weighty = 0;
..	..	@@ -589,29 +826,17 @@
589	826
590	827	JScrollPane jSP;
591	828	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
592		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	829	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
593	830	ResetModel();
594	831
595	832	oe.treePanel.add(jSPPanel);
596	833	oe.treePanel.Return();
597	834
598		- cGridBag copyOptionsPanel = new cGridBag();
599		-
600		- copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
601		- colorCB.setToolTipText("Copy color when dropped");
602		- colorCB.addItemListener(this);
603		-
604		- copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
605		- materialCB.setToolTipText("Copy material when dropped");
606		- materialCB.addItemListener(this);
607		-
608		- copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
609		- textureCB.setToolTipText("Copy texture when dropped");
610		- textureCB.addItemListener(this);
611		-
612		- copyOptionsPanel.preferredHeight = 1;
613	835	oe.treePanel.add(copyOptionsPanel);
614	836	oe.treePanel.Return();
	837	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 10, 0);
	838	+ versionField = (cNumberSlider)sliderPane.getComponent(1);
	839	+ sliderPane.preferredHeight = 1;
615	840
616	841	// mainPanel.setDividerLocation(0.5); //1.0);
617	842	// mainPanel.setResizeWeight(0.5);
..	..	@@ -640,23 +865,43 @@
640	865
641	866	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
642	867	{
	868	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	869	+ colorCB.setToolTipText("Copy color when dropped");
	870	+ colorCB.addItemListener(this);
	871	+
	872	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	873	+ materialCB.setToolTipText("Copy material when dropped");
	874	+ materialCB.addItemListener(this);
	875	+
	876	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	877	+ textureCB.setToolTipText("Copy texture when dropped");
	878	+ textureCB.addItemListener(this);
	879	+
	880	+ panel.Return();
	881	+
643	882	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
644	883	boxCB.setToolTipText("Display bounding boxes");
645	884	boxCB.addItemListener(this);
646	885
647	886	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
648		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	887	+ zoomBoxCB.setToolTipText("Display only for wheel");
649	888	zoomBoxCB.addItemListener(this);
650	889
651		- if (Globals.ADVANCED)
	890	+ if (true) // Globals.ADVANCED)
652	891	{
653		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
654		- supportCB.setToolTipText("Enable rigging");
655		- supportCB.addItemListener(this);
	892	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	893	+// supportCB.setToolTipText("Enable rigging");
	894	+// supportCB.addItemListener(this);
	895	+
	896	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	897	+ freezeCB.setToolTipText("Fast moving camera");
	898	+ freezeCB.addItemListener(this);
656	899
657	900	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
658	901	// localCB.addItemListener(this);
659	902
	903	+ panel.Return();
	904	+
660	905	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
661	906	crowdCB.setToolTipText("Used for crowds");
662	907	crowdCB.addItemListener(this);
..	..	@@ -673,6 +918,8 @@
673	918	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
674	919	// speakerMocapCB.addItemListener(this);
675	920
	921	+ panel.Return();
	922	+
676	923	if (false)
677	924	{
678	925	// handled in scripts
..	..	@@ -687,32 +934,72 @@
687	934	//constraints.gridy += 1;
688	935	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
689	936	smoothfocusCB.addItemListener(this);
	937	+ panel.Return();
690	938	}
691	939
692	940	//constraints.gridx += 1;
693	941	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
694	942	// debugCB.addItemListener(this);
695	943
	944	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	945	+ trackCB.setToolTipText("Enable tracking target");
	946	+ trackCB.addItemListener(this);
	947	+
696	948	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	949	+ oeilCB.setToolTipText("Move camera when tracking");
697	950	oeilCB.addItemListener(this);
698	951
	952	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	953	+ shadowCB.setToolTipText("When live compute shadows");
	954	+ shadowCB.addItemListener(this);
	955	+
	956	+ panel.Return();
	957	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	958	+ toggleTextureCB.setToolTipText("Load textures");
	959	+ toggleTextureCB.addItemListener(this);
	960	+
	961	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	962	+ toggleSwitchCB.setToolTipText("Choose a single item");
	963	+ toggleSwitchCB.addItemListener(this);
	964	+
	965	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	966	+ autokeepCB.setToolTipText("On structure change");
	967	+ autokeepCB.addItemListener(this);
	968	+
	969	+ panel.Return();
	970	+ if (Globals.ADVANCED)
	971	+ {
699	972	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
700	973	lookAtCB.setToolTipText("Look-at target");
701	974	lookAtCB.addItemListener(this);
	975	+ }
702	976
703	977	}
704	978
705	979	cGridBag fill = new cGridBag();
706		-
707	980	fill.preferredHeight = 200;
	981	+ cGridBag fill2 = new cGridBag();
	982	+ fill2.preferredHeight = 200;
	983	+ cGridBag fill3 = new cGridBag();
	984	+ fill3.preferredHeight = 200;
708	985
709	986	panel.add(fill);
	987	+ panel.add(fill2);
	988	+ panel.add(fill3);
710	989
711	990	}
712	991
713	992	void EditObject(Object3D obj)
714	993	{
715	994	cRadio radioButton = new cRadio(obj.name);
	995	+
	996	+ // June 2019. Patch to avoid bug with transparency.
	997	+ radioButton.hadMaterial = obj.material != null;
	998	+ if (!radioButton.hadMaterial)
	999	+ {
	1000	+ obj.material = new cMaterial();
	1001	+ }
	1002	+
716	1003	radioButton.SetObject(obj);
717	1004	radioButton.layout = sevenButton;
718	1005	radioButton.SetCamera(cameraView.renderCamera, false);
..	..	@@ -721,8 +1008,11 @@
721	1008	buttonGroup.add(radioButton);
722	1009	radioButton.doClick();
723	1010	}
	1011	+
724	1012	void SetupViews(ObjEditor oe)
725	1013	{
	1014	+ theFrame = this;
	1015	+
726	1016	oe.SetupViews();
727	1017
728	1018	System.out.println("SetupViews");
..	..	@@ -731,23 +1021,28 @@
731	1021	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
732	1022	}
733	1023
734		- JCheckBox liveCB;
735		- JCheckBox supportCB;
736		- JCheckBox localCB;
737		- JCheckBox crowdCB;
738		- JCheckBox smoothCB;
739		- JCheckBox fastCB;
740		- JCheckBox slowCB;
741		- JCheckBox boxCB;
742		- JCheckBox zoomBoxCB;
743		- JCheckBox trackCB;
744		- JCheckBox smoothfocusCB;
	1024	+ cToggleButton liveCB;
	1025	+ cCheckBox supportCB;
	1026	+ cCheckBox localCB;
	1027	+ cCheckBox crowdCB;
	1028	+ cCheckBox smoothCB;
	1029	+ cToggleButton fastCB;
	1030	+ cCheckBox slowCB;
	1031	+ cCheckBox boxCB;
	1032	+ cCheckBox zoomBoxCB;
	1033	+ cCheckBox freezeCB;
	1034	+ //cToggleButton trackCB;
	1035	+ cCheckBox trackCB;
	1036	+ cCheckBox smoothfocusCB;
745	1037	// JCheckBox speakerMocapCB;
746		- JCheckBox speakerCameraCB;
747		- JCheckBox speakerFocusCB;
748		- JCheckBox debugCB;
749		- JCheckBox oeilCB;
750		- JCheckBox lookAtCB;
	1038	+ cCheckBox speakerCameraCB;
	1039	+ cCheckBox speakerFocusCB;
	1040	+ cCheckBox debugCB;
	1041	+
	1042	+ cCheckBox oeilCB;
	1043	+ cCheckBox shadowCB;
	1044	+ cCheckBox autokeepCB;
	1045	+ cCheckBox lookAtCB;
751	1046
752	1047	// static int COLOR = 1;
753	1048	// static int MATERIAL = 2;
..	..	@@ -755,9 +1050,9 @@
755	1050
756	1051	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
757	1052
758		- JCheckBox colorCB;
759		- JCheckBox materialCB;
760		- JCheckBox textureCB;
	1053	+ cCheckBox colorCB;
	1054	+ cCheckBox materialCB;
	1055	+ cCheckBox textureCB;
761	1056
762	1057	public void itemStateChanged(ItemEvent e)
763	1058	{
..	..	@@ -785,6 +1080,7 @@
785	1080	} else if(e.getSource() == liveCB)
786	1081	{
787	1082	cameraView.ToggleLive();
	1083	+ refreshContents(false);
788	1084	}
789	1085	else if(e.getSource() == supportCB)
790	1086	{
..	..	@@ -849,6 +1145,18 @@
849	1145	{
850	1146	cameraView.ToggleOeil();
851	1147	}
	1148	+ else if(e.getSource() == shadowCB)
	1149	+ {
	1150	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1151	+ }
	1152	+ else if(e.getSource() == freezeCB)
	1153	+ {
	1154	+ Globals.FREEZEONMOVE ^= true;
	1155	+ }
	1156	+ else if(e.getSource() == autokeepCB)
	1157	+ {
	1158	+ Globals.REPLACEONMAKE ^= true;
	1159	+ }
852	1160	else if(e.getSource() == lookAtCB)
853	1161	{
854	1162	cameraView.ToggleLookAt();
..	..	@@ -865,7 +1173,8 @@
865	1173
866	1174	/**/
867	1175	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
868		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1176	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1177	+ TreePath path = objEditor.jTree.getSelectionPath();
869	1178	if ((path == null) \|\| (path.getPathCount() <= 1)) {
870	1179	// We can't move the root node or an empty selection
871	1180	return;
..	..	@@ -928,8 +1237,6 @@
928	1237	}
929	1238	}
930	1239
931		- String string = (String) object;
932		-
933	1240	System.out.println("Transfer = " + object + "; drop : " + target);
934	1241	// if( object instanceof java.io.File[])
935	1242	// {
..	..	@@ -937,7 +1244,11 @@
937	1244	// objEditor.DropFile((java.io.File[]) object, true);
938	1245	// return;
939	1246	// }
940		- if (string.charAt(0) == '/')
	1247	+
	1248	+ String string = object.toString();
	1249	+
	1250	+ // File path for Mac and Windows
	1251	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
941	1252	{
942	1253	// file(s)
943	1254	String[] names = string.split("\n");
..	..	@@ -964,7 +1275,7 @@
964	1275
965	1276	flashIt = false;
966	1277	CameraPane pane = (CameraPane) target;
967		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1278	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
968	1279	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
969	1280
970	1281	if (group.selection.size() == 1)
..	..	@@ -980,23 +1291,33 @@
980	1291
981	1292	assert target == objEditor.jTree;
982	1293	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1294	+ Object3D destinationLeaf;
983	1295	try {
984		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1296	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
985	1297	} catch (Exception e) {
986	1298	System.out.println("destinationPath : " + destinationPath);
987	1299	return;
988	1300	}
989	1301
990		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1302	+ for (int i=group.selection.size(); --i>=0;)
991	1303	{
	1304	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1305	+
	1306	+ // Cannot move into itself
	1307	+ if (child == destinationLeaf)
	1308	+ return;
	1309	+ }
	1310	+
	1311	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1312	+// {
992	1313	loadClipboard(true);
993	1314	objEditor.jTree.setSelectionPath(destinationPath);
994	1315	pasteInto(false, false);
995		- } else {
996		- loadClipboard(false);
997		- objEditor.jTree.setSelectionPath(destinationPath);
998		- pasteInto(false, false); // true); // ???
999		- }
	1316	+// } else {
	1317	+// loadClipboard(false);
	1318	+// objEditor.jTree.setSelectionPath(destinationPath);
	1319	+// pasteInto(false, false); // true); // ???
	1320	+// }
1000	1321	}
1001	1322	public void dropActionChanged(DropTargetDragEvent dtde)
1002	1323	// Called if the user has modified the current drop gesture
..	..	@@ -1101,22 +1422,30 @@
1101	1422	{
1102	1423	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1103	1424	//heightFieldItem.addActionListener(this);
1104		- gridItem = menu.add(new MenuItem("Grid"));
1105		- gridItem.addActionListener(this);
1106		- rectoidItem = menu.add(new MenuItem("Box"));
1107		- rectoidItem.addActionListener(this);
1108		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1109		- ellipsoidItem.addActionListener(this);
1110		- coneItem = menu.add(new MenuItem("Cone"));
1111		- coneItem.addActionListener(this);
1112		- torusItem = menu.add(new MenuItem("Torus"));
1113		- torusItem.addActionListener(this);
1114		- superItem = menu.add(new MenuItem("Superellipsoid"));
1115		- superItem.addActionListener(this);
	1425	+// gridItem = menu.add(new MenuItem("Grid"));
	1426	+// gridItem.addActionListener(this);
	1427	+// rectoidItem = menu.add(new MenuItem("Box"));
	1428	+// rectoidItem.addActionListener(this);
	1429	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1430	+// ellipsoidItem.addActionListener(this);
	1431	+// coneItem = menu.add(new MenuItem("Cone"));
	1432	+// coneItem.addActionListener(this);
	1433	+// torusItem = menu.add(new MenuItem("Torus"));
	1434	+// torusItem.addActionListener(this);
	1435	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1436	+// superItem.addActionListener(this);
	1437	+
	1438	+ cameraItem = menu.add(new MenuItem("Camera"));
	1439	+ cameraItem.addActionListener(this);
	1440	+
	1441	+ if (!Globals.ADVANCED)
	1442	+ {
1116	1443	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1117	1444	kleinItem.addActionListener(this);
1118		- particleItem = menu.add(new MenuItem("Particle system"));
1119		- particleItem.addActionListener(this);
	1445	+ }
	1446	+
	1447	+// particleItem = menu.add(new MenuItem("Particle system"));
	1448	+// particleItem.addActionListener(this);
1120	1449	if (Globals.ADVANCED)
1121	1450	{
1122	1451	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1142,15 +1471,15 @@
1142	1471	}
1143	1472	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1144	1473	bezierItem.addActionListener(this);
1145		- overlayItem = menu.add(new MenuItem("Overlay"));
1146		- overlayItem.addActionListener(this);
1147		- lightItem = menu.add(new MenuItem("Light"));
1148		- lightItem.addActionListener(this);
	1474	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1475	+// overlayItem.addActionListener(this);
	1476	+// lightItem = menu.add(new MenuItem("Light"));
	1477	+// lightItem.addActionListener(this);
1149	1478	menu.add("-");
1150	1479	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1151	1480	//superLoopItem.addActionListener(this);
1152		- loopItem = menu.add(new MenuItem("Loop"));
1153		- loopItem.addActionListener(this);
	1481	+// loopItem = menu.add(new MenuItem("Loop"));
	1482	+// loopItem.addActionListener(this);
1154	1483	doubleItem = menu.add(new MenuItem("Fork"));
1155	1484	doubleItem.addActionListener(this);
1156	1485	if (Globals.ADVANCED)
..	..	@@ -1166,6 +1495,9 @@
1166	1495	animationItem.addItemListener(this);
1167	1496	animationItem.setState(Globals.ANIMATION);
1168	1497
	1498	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1499	+ archiveItem.addActionListener(this);
	1500	+
1169	1501	menu.add("-");
1170	1502	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1171	1503	parseverticesItem.addActionListener(this);
..	..	@@ -1178,6 +1510,8 @@
1178	1510	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1179	1511	reduce34MorphItem.addActionListener(this);
1180	1512	menu.add("-");
	1513	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	1514	+ memoryItem.addActionListener(this);
1181	1515	menu.add(computeAOItem = new MenuItem("Compute AO"));
1182	1516	computeAOItem.addActionListener(this);
1183	1517
..	..	@@ -1186,11 +1520,9 @@
1186	1520	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1187	1521	mirrorItem.addActionListener(this);
1188	1522	menu.add("-");
1189		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1190		- memoryItem.addActionListener(this);
1191	1523	menu.add(analyzeItem = new MenuItem("Analyze"));
1192	1524	analyzeItem.addActionListener(this);
1193		- menu.add(dumpItem = new MenuItem("Dump"));
	1525	+ menu.add(dumpItem = new MenuItem("Print"));
1194	1526	dumpItem.addActionListener(this);
1195	1527	// menu.add(pathItem = new MenuItem("From-to path"));
1196	1528	// pathItem.addActionListener(this);
..	..	@@ -1331,9 +1663,24 @@
1331	1663	shadow.material = new cMaterial(obj.material);
1332	1664	shadow.material.diffuse = 0.0001f;
1333	1665	shadow.material.specular = 0.0001f;
	1666	+ //shadow.projectedVertices[1].x = 300;
1334	1667
1335	1668	makeSomething(shadow);
1336	1669	}
	1670	+
	1671	+ private void ClearUnpinned()
	1672	+ {
	1673	+ //for (Object3D obj : listUI)
	1674	+ for (int i=listUI.size(); --i>=0;)
	1675	+ {
	1676	+ Object3D obj = listUI.elementAt(i);
	1677	+ if (!obj.pinned)
	1678	+ {
	1679	+ obj.CloseUI();
	1680	+ listUI.remove(i);
	1681	+ }
	1682	+ }
	1683	+ }
1337	1684
1338	1685	/**
1339	1686	* applyExample
..	..	@@ -1537,9 +1884,9 @@
1537	1884
1538	1885	void Overwrite(int mask)
1539	1886	{
1540		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	1887	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1541	1888	{
1542		- Object3D content = GrafreeD.clipboard.get(0);
	1889	+ Object3D content = Grafreed.clipboard.get(0);
1543	1890
1544	1891	if (content instanceof cGroup && ((cGroup)content).transientlink )
1545	1892	content = ((cGroup)content).get(0);
..	..	@@ -1578,7 +1925,7 @@
1578	1925	{
1579	1926	ScreenFit();
1580	1927	} else
1581		- if (source == switchItem)
	1928	+ if (source == switchViewItem)
1582	1929	{
1583	1930	cVector v1 = new cVector();
1584	1931	cVector v2 = new cVector();
..	..	@@ -1587,11 +1934,11 @@
1587	1934	objEditor.cameraView.renderCamera.setAim(v2, v1);
1588	1935	objEditor.cameraView.repaint();
1589	1936	} else
1590		- if (source == rectoidItem)
	1937	+ if (source == rectoidItem \|\| source == boxButton)
1591	1938	{
1592	1939	makeSomething(new Box());
1593	1940	} else
1594		- if (source == particleItem)
	1941	+ if (source == particleItem \|\| source == particlesButton)
1595	1942	{
1596	1943	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1597	1944	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1670,27 +2017,27 @@
1670	2017
1671	2018	makeSomething(obj);
1672	2019	} else
1673		- if (source == gridItem)
	2020	+ if (source == gridItem \|\| source == gridButton)
1674	2021	{
1675	2022	makeSomething(new Grid());
1676	2023	} else
1677		- if (source == ellipsoidItem)
	2024	+ if (source == ellipsoidItem \|\| source == sphereButton)
1678	2025	{
1679	2026	makeSomething(new Sphere());
1680	2027	} else
1681		- if (source == coneItem)
	2028	+ if (source == coneItem \|\| source == coneButton)
1682	2029	{
1683	2030	makeSomething(new Cone());
1684	2031	} else
1685		- if (source == torusItem)
	2032	+ if (source == torusItem \|\| source == torusButton)
1686	2033	{
1687	2034	makeSomething(new Torus());
1688	2035	} else
1689		- if (source == superItem)
	2036	+ if (source == superItem \|\| source == superButton)
1690	2037	{
1691	2038	makeSomething(new Superellipsoid());
1692	2039	} else
1693		- if (source == kleinItem)
	2040	+ if (source == kleinItem \|\| source == kleinButton)
1694	2041	{
1695	2042	makeSomething(new Klein());
1696	2043	} else
..	..	@@ -1710,7 +2057,7 @@
1710	2057	{
1711	2058	makeSomething(new BezierSurface());
1712	2059	} else
1713		- if (source == overlayItem)
	2060	+ if (source == overlayItem \|\| source == overlayButton)
1714	2061	{
1715	2062	/*
1716	2063	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1758,7 +2105,7 @@
1758	2105	s.setup();
1759	2106	makeSomething(s);
1760	2107	} else
1761		- if (source == lightItem)
	2108	+ if (source == lightItem \|\| source == lightButton)
1762	2109	{
1763	2110	makeSomething(new Light());
1764	2111	} else
..	..	@@ -1808,30 +2155,30 @@
1808	2155
1809	2156	group(g);
1810	2157	} else
1811		- if (source == loopItem)
	2158	+ if (source == loopItem \|\| source == loopButton)
1812	2159	{
1813	2160	Composite csg = new GroupLeaf();
1814	2161	csg.count = 5;
1815	2162	group(csg);
1816		- Composite child = new cGroup();
	2163	+ Composite child = new cGroup("Branch");
1817	2164	csg.addChild(child);
1818	2165	child.addChild(csg);
1819	2166	} else
1820	2167	if (source == doubleItem)
1821	2168	{
1822		- Composite csg = new GroupLeaf();
	2169	+ Composite csg = new GroupLeaf("Fork");
1823	2170	csg.count = 5;
1824	2171	group(csg);
1825		- Composite child = new cGroup();
	2172	+ Composite child = new cGroup("Branch A");
1826	2173	csg.addChild(child);
1827	2174	child.addChild(csg);
1828		- child = new cGroup();
	2175	+ child = new cGroup("Branch B");
1829	2176	csg.addChild(child);
1830	2177	child.addChild(csg);
1831	2178	} else
1832	2179	if (source == tripleItem)
1833	2180	{
1834		- Composite csg = new GroupLeaf();
	2181	+ Composite csg = new GroupLeaf("Trident");
1835	2182	csg.count = 4;
1836	2183	group(csg);
1837	2184	Composite child = new cGroup();
..	..	@@ -1843,23 +2190,6 @@
1843	2190	child = new cGroup();
1844	2191	csg.addChild(child);
1845	2192	child.addChild(csg);
1846		- } else
1847		-
1848		- if (source == importGFDItem)
1849		- {
1850		- ImportGFD();
1851		- } else
1852		- if (source == importVRMLX3DItem)
1853		- {
1854		- ImportVRMLX3D();
1855		- } else
1856		- if (source == import3DSItem)
1857		- {
1858		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1859		- } else
1860		- if (source == importOBJItem)
1861		- {
1862		- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1863	2193	} else
1864	2194	if (source == computeAOItem)
1865	2195	{
..	..	@@ -1879,7 +2209,7 @@
1879	2209	if (source == invariantsItem)
1880	2210	{
1881	2211	System.out.println("Invariants:");
1882		- GrafreeD.grafreeD.universe.invariants();
	2212	+ Grafreed.grafreeD.universe.invariants();
1883	2213	} else
1884	2214	if (source == memoryItem)
1885	2215	{
..	..	@@ -1898,6 +2228,46 @@
1898	2228	{
1899	2229	DumpObject();
1900	2230	} else
	2231	+ if (source == minButton)
	2232	+ {
	2233	+ Minimize();
	2234	+ } else
	2235	+ if (source == maxButton)
	2236	+ {
	2237	+ Maximize();
	2238	+ } else
	2239	+ if (source == fullButton)
	2240	+ {
	2241	+ ToggleFullScreen();
	2242	+ } else
	2243	+ if (source == undoButton)
	2244	+ {
	2245	+ // Go to previous version
	2246	+ //if (!Undo())
	2247	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2248	+ Undo();
	2249	+ } else
	2250	+ if (source == restoreButton)
	2251	+ {
	2252	+ // Restore current version
	2253	+ Restore();
	2254	+ } else
	2255	+ if (source == replaceButton)
	2256	+ {
	2257	+ // Overwrite current version
	2258	+ Replace();
	2259	+ } else
	2260	+ if (source == redoButton)
	2261	+ {
	2262	+ // Go to next version
	2263	+ Redo();
	2264	+ } else
	2265	+ if (source == saveButton)
	2266	+ {
	2267	+ // Save a new version
	2268	+ if (!Save(true))
	2269	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2270	+ } else
1901	2271	if (source == oneStepButton)
1902	2272	{
1903	2273	Globals.ONESTEP = true;
..	..	@@ -1905,17 +2275,14 @@
1905	2275	} else
1906	2276	if (source == screenfitButton)
1907	2277	{
1908		- //Reload(lastConverter, lastFilename, true);
1909	2278	ScreenFit();
1910	2279	} else
1911	2280	if (source == screenfitpointButton)
1912	2281	{
1913		- //Reload(lastConverter, lastFilename, true);
1914	2282	ScreenFitPoint();
1915	2283	} else
1916	2284	if (source == snapobjectButton)
1917	2285	{
1918		- //Reload(lastConverter, lastFilename, true);
1919	2286	SnapObject();
1920	2287	} else
1921	2288	// if (event.getSource() == recompileButton)
..	..	@@ -1952,12 +2319,20 @@
1952	2319	{
1953	2320	loadClipboard(true);
1954	2321	} else
	2322	+ if (source == undoItem)
	2323	+ {
	2324	+ Undo();
	2325	+ } else
	2326	+ if (source == redoItem)
	2327	+ {
	2328	+ Redo();
	2329	+ } else
1955	2330	if (source == duplicateItem)
1956	2331	{
1957		- Object3D keep = GrafreeD.clipboard;
	2332	+ Object3D keep = Grafreed.clipboard;
1958	2333	loadClipboard(false);
1959	2334	paste(false);
1960		- GrafreeD.clipboard = keep;
	2335	+ Grafreed.clipboard = keep;
1961	2336	} else
1962	2337	if (source == cloneItem)
1963	2338	{
..	..	@@ -2177,9 +2552,9 @@
2177	2552	// group.selection.get(0).setMasterThis(content); // should be identity
2178	2553	// refreshContents();
2179	2554	// }
2180		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2555	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2181	2556	{
2182		- Object3D content = GrafreeD.clipboard.get(0);
	2557	+ Object3D content = Grafreed.clipboard.get(0);
2183	2558
2184	2559	if (content instanceof cGroup && ((cGroup)content).transientlink )
2185	2560	content = ((cGroup)content).get(0);
..	..	@@ -2229,9 +2604,9 @@
2229	2604	} else
2230	2605	if (source == setMasterItem)
2231	2606	{
2232		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	2607	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2233	2608	{
2234		- Object3D content = GrafreeD.clipboard.get(0);
	2609	+ Object3D content = Grafreed.clipboard.get(0);
2235	2610
2236	2611	if (content instanceof cGroup && ((cGroup)content).transientlink )
2237	2612	content = ((cGroup)content).get(0);
..	..	@@ -2244,9 +2619,9 @@
2244	2619	{
2245	2620	if (group.selection.size() == 1)
2246	2621	{
2247		- if (GrafreeD.clipboard.size() == 1)
	2622	+ if (Grafreed.clipboard.size() == 1)
2248	2623	{
2249		- Object3D content = GrafreeD.clipboard.get(0);
	2624	+ Object3D content = Grafreed.clipboard.get(0);
2250	2625
2251	2626	if (content instanceof cGroup && ((cGroup)content).transientlink )
2252	2627	content = ((cGroup)content).get(0);
..	..	@@ -2263,7 +2638,7 @@
2263	2638	{
2264	2639	RevertMeshes();
2265	2640	} else
2266		- if (source == resetMeshItem)
	2641	+ if (source == resetAllItem)
2267	2642	{
2268	2643	ResetAll();
2269	2644	} else
..	..	@@ -2283,9 +2658,9 @@
2283	2658	{
2284	2659	ClearSelection(true);
2285	2660	} else
2286		- if (source == grabItem)
	2661	+ if (source == grabItem \|\| source == groupButton)
2287	2662	{
2288		- group(new cGroup(), true);
	2663	+ group(new cGroup(), false); // true);
2289	2664	} else
2290	2665	if (source == hideItem)
2291	2666	{
..	..	@@ -2303,11 +2678,11 @@
2303	2678	{
2304	2679	makeSomething(new Camera());
2305	2680	} else
2306		- if (source == compositeItem)
	2681	+ if (source == compositeItem \|\| source == compositeButton)
2307	2682	{
2308	2683	group(new Composite());
2309	2684	} else
2310		- if (source == randomItem)
	2685	+ if (source == switchItem \|\| source == switchButton)
2311	2686	{
2312	2687	RandomNode random = new RandomNode();
2313	2688	group(random);
..	..	@@ -2409,7 +2784,7 @@
2409	2784	{
2410	2785	group(new cLinker());
2411	2786	} else
2412		- if (source == textureItem)
	2787	+ if (source == textureItem \|\| source == textureButton)
2413	2788	{
2414	2789	group(new TextureNode());
2415	2790	} else
..	..	@@ -2429,17 +2804,30 @@
2429	2804	{
2430	2805	CastShadow(2);
2431	2806	} else
2432		- if (source == ungroupItem)
	2807	+ if (source == ungroupItem \|\| source == ungroupButton)
2433	2808	{
2434		- //ungroup();
	2809	+ boolean hasRoot = false;
	2810	+
2435	2811	for (int i=0; i<group.selection.size(); i++)
2436	2812	{
2437		- Ungroup(group.selection.get(i));
	2813	+ if (group.selection.get(i) == group)
	2814	+ {
	2815	+ hasRoot = true;
	2816	+ break;
	2817	+ }
2438	2818	}
2439	2819
2440		- ClearSelection(false);
2441		-
2442		- refreshContents();
	2820	+ if (!hasRoot)
	2821	+ {
	2822	+ for (int i=0; i<group.selection.size(); i++)
	2823	+ {
	2824	+ Ungroup(group.selection.get(i));
	2825	+ }
	2826	+
	2827	+ ClearSelection(false);
	2828	+
	2829	+ refreshContents();
	2830	+ }
2443	2831	} else
2444	2832	if (source == genUVItem)
2445	2833	{
..	..	@@ -2451,7 +2839,7 @@
2451	2839	} else
2452	2840	if (source == genNormalsMESHItem)
2453	2841	{
2454		- GenNormals(true); // TODO
	2842	+ GenNormalsMESH();
2455	2843	} else
2456	2844	if (source == genNormalsORGANItem)
2457	2845	{
..	..	@@ -2516,6 +2904,22 @@
2516	2904	if (source == unmarkleavesItem)
2517	2905	{
2518	2906	MarkLeaves(false);
	2907	+ } else
	2908	+ if (source == rewindleavesItem)
	2909	+ {
	2910	+ RewindLeaves(true);
	2911	+ } else
	2912	+ if (source == unrewindleavesItem)
	2913	+ {
	2914	+ RewindLeaves(false);
	2915	+ } else
	2916	+ if (source == randomleavesItem)
	2917	+ {
	2918	+ RandomLeaves(true);
	2919	+ } else
	2920	+ if (source == unrandomleavesItem)
	2921	+ {
	2922	+ RandomLeaves(false);
2519	2923	} else
2520	2924	if (source == flipVItem)
2521	2925	{
..	..	@@ -2601,9 +3005,13 @@
2601	3005	{
2602	3006	SmoothMesh();
2603	3007	} else
2604		- if (source == transformgeometryItem)
	3008	+ if (source == transformGeometryItem)
2605	3009	{
2606	3010	TransformGeometry();
	3011	+ } else
	3012	+ if (source == transformChildrenItem)
	3013	+ {
	3014	+ TransformChildren();
2607	3015	} else
2608	3016	if (source == resetTransformItem)
2609	3017	{
..	..	@@ -2611,7 +3019,11 @@
2611	3019	} else
2612	3020	if (source == resetCentroidItem)
2613	3021	{
2614		- ResetCentroid();
	3022	+ ResetCentroid(true);
	3023	+ } else
	3024	+ if (source == resetCentroidXZItem)
	3025	+ {
	3026	+ ResetCentroid(false);
2615	3027	} else
2616	3028	if (source == resetParentItem)
2617	3029	{
..	..	@@ -2743,6 +3155,10 @@
2743	3155	if (source == twoButton)
2744	3156	{
2745	3157	radio.layout = twoButton;
	3158	+
	3159	+ if (CameraPane.FULLSCREEN)
	3160	+ fullscreenLayout = radio.layout;
	3161	+
2746	3162	// bug
2747	3163	//gridPanel.setDividerLocation(1.0);
2748	3164	//bigPanel.setDividerLocation(0.0);
..	..	@@ -2775,10 +3191,31 @@
2775	3191	bigThree.ClearUI();
2776	3192	bigThree.add(centralPanel);
2777	3193	bigThree.FlushUI();
	3194	+
	3195	+ cameraView.requestFocusInWindow();
	3196	+
	3197	+// refreshContents(true);
	3198	+//
	3199	+// try
	3200	+// {
	3201	+// java.awt.Robot bot = new java.awt.Robot();
	3202	+// int mask = InputEvent.BUTTON1_MASK;
	3203	+// bot.mouseMove(100, 100);
	3204	+// bot.mousePress(mask);
	3205	+// bot.mouseRelease(mask);
	3206	+// }
	3207	+// catch (Exception e)
	3208	+// {
	3209	+//
	3210	+// }
	3211	+
2778	3212	} else
2779	3213	if (source == threeButton)
2780	3214	{
2781	3215	radio.layout = threeButton;
	3216	+
	3217	+ if (CameraPane.FULLSCREEN)
	3218	+ fullscreenLayout = radio.layout;
2782	3219
2783	3220	// bigThree.remove(scenePanel);
2784	3221	// bigThree.remove(centralPanel);
..	..	@@ -2811,10 +3248,15 @@
2811	3248	bigThree.add(centralPanel);
2812	3249	bigThree.add(XYZPanel);
2813	3250	bigThree.FlushUI();
	3251	+
	3252	+ cameraView.requestFocusInWindow();
2814	3253	} else
2815	3254	if (source == fourButton)
2816	3255	{
2817	3256	radio.layout = fourButton;
	3257	+
	3258	+ if (CameraPane.FULLSCREEN)
	3259	+ fullscreenLayout = radio.layout;
2818	3260
2819	3261	// bigThree.remove(scenePanel);
2820	3262	// bigThree.remove(centralPanel);
..	..	@@ -2846,10 +3288,15 @@
2846	3288	bigThree.ClearUI();
2847	3289	bigThree.add(scenePanel);
2848	3290	bigThree.FlushUI();
	3291	+
	3292	+ cameraView.requestFocusInWindow();
2849	3293	} else
2850	3294	if (source == sixButton)
2851	3295	{
2852	3296	radio.layout = sixButton;
	3297	+
	3298	+ if (CameraPane.FULLSCREEN)
	3299	+ fullscreenLayout = radio.layout;
2853	3300
2854	3301	// bigThree.remove(scenePanel);
2855	3302	// bigThree.remove(centralPanel);
..	..	@@ -2882,10 +3329,15 @@
2882	3329	bigThree.add(scenePanel);
2883	3330	bigThree.add(centralPanel);
2884	3331	bigThree.FlushUI();
	3332	+
	3333	+ cameraView.requestFocusInWindow();
2885	3334	} else
2886	3335	if (source == sevenButton)
2887	3336	{
2888	3337	radio.layout = sevenButton;
	3338	+
	3339	+ if (CameraPane.FULLSCREEN)
	3340	+ fullscreenLayout = radio.layout;
2889	3341
2890	3342	// bigThree.remove(scenePanel);
2891	3343	// bigThree.remove(centralPanel);
..	..	@@ -2919,6 +3371,8 @@
2919	3371	bigThree.add(centralPanel);
2920	3372	bigThree.add(XYZPanel);
2921	3373	bigThree.FlushUI();
	3374	+
	3375	+ cameraView.requestFocusInWindow();
2922	3376	} else
2923	3377	if (source == rootButton)
2924	3378	{
..	..	@@ -2930,6 +3384,7 @@
2930	3384	EditObject(obj);
2931	3385	}
2932	3386
	3387	+ cameraView.requestFocusInWindow();
2933	3388	refreshContents(true);
2934	3389	} else
2935	3390	if (source == closeButton)
..	..	@@ -2939,22 +3394,37 @@
2939	3394	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2940	3395	{
2941	3396	ab = (cRadio)e.nextElement();
2942		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3397	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2943	3398	{
	3399	+ // Patch to avoid bug with transparency.
	3400	+ if (!ab.hadMaterial)
	3401	+ {
	3402	+ ab.object.material = null;
	3403	+ }
	3404	+
2944	3405	buttonGroup.remove(ab);
2945	3406	radioPanel.remove(ab);
2946	3407
2947		- ab.GetObject().editWindow = null;
	3408	+ //ab.GetObject().editWindow = null;
	3409	+ ab.GetObject().manipWindow = null;
2948	3410	// ab.GetObject().objectUI = null; // ?????????
2949	3411
2950	3412	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2951	3413	break;
2952	3414	}
2953	3415	}
	3416	+
	3417	+ cameraView.requestFocusInWindow();
2954	3418	refreshContents(true);
2955	3419	} else
2956	3420	if (source == editItem \|\| source == editButton)
2957	3421	{
	3422	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3423	+ {
	3424	+ Object3D child = (Object3D)e.nextElement();
	3425	+ child.pinned = true;
	3426	+ }
	3427	+
2958	3428	EditSelection(false);
2959	3429	} else
2960	3430	if (source == uneditButton)
..	..	@@ -2964,10 +3434,11 @@
2964	3434	Object3D child = (Object3D)e.nextElement();
2965	3435	if(child.editWindow != null)
2966	3436	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3437	+ child.pinned = false;
2967	3438	child.CloseUI();
2968	3439	listUI.remove(child);
2969	3440
2970		- child.editWindow = null; // ???????????
	3441	+ //child.editWindow = null; // ???????????
2971	3442	}
2972	3443	objEditor.ctrlPanel.FlushUI();
2973	3444	//objEditor.jTree.clearSelection();
..	..	@@ -2980,6 +3451,7 @@
2980	3451	//copy.ClearUI();
2981	3452	for (Object3D obj : listUI)
2982	3453	{
	3454	+ obj.pinned = false;
2983	3455	obj.CloseUI();
2984	3456	}
2985	3457	listUI.clear();
..	..	@@ -2989,7 +3461,7 @@
2989	3461	{
2990	3462	assert(copy == group);
2991	3463
2992		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3464	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2993	3465
2994	3466	for (Object3D obj : listUI)
2995	3467	{
..	..	@@ -3038,6 +3510,9 @@
3038	3510	}
3039	3511
3040	3512	copy = group;
	3513	+
	3514	+ SetUndoStates();
	3515	+
3041	3516	//Globals.theRenderer.object = group;
3042	3517	if(!useclient)
3043	3518	{
..	..	@@ -3053,20 +3528,44 @@
3053	3528	frontView.object = group;
3054	3529	sideView.object = group;
3055	3530	}
3056		- group.editWindow = this;
	3531	+
	3532	+// fix "+" issue
	3533	+ //group.editWindow = this;
	3534	+ group.manipWindow = this;
	3535	+
3057	3536	/*
3058	3537	currentLayout = radio.layout;
3059	3538	if (currentLayout == null)
3060	3539	currentLayout = sevenButton;
3061	3540	*/
3062	3541	radio.layout.doClick();
	3542	+
	3543	+ ClearUnpinned();
	3544	+ SetPinStates(group.selection.size() > 0);
	3545	+ if (group.selection.size() == 1)
	3546	+ EditSelection(false);
3063	3547	keepparent = group.parent;
3064	3548	// PARENT = NULL or not???
3065	3549	//group.parent = null; // ROOT
3066	3550	//group.attributes = -1;
3067	3551	ResetModel();
	3552	+
	3553	+ cameraView.requestFocusInWindow();
3068	3554	refreshContents(true);
3069		- }
	3555	+ } else if (event.getSource() == editCameraItem)
	3556	+ {
	3557	+ cameraView.ProtectCamera();
	3558	+ cameraView.repaint();
	3559	+ return;
	3560	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
	3561	+ {
	3562	+ cameraView.RevertCamera();
	3563	+ cameraView.repaint();
	3564	+ return;
	3565	+ // } else if (event.getSource() == textureButton)
	3566	+ // {
	3567	+ // return; // true;
	3568	+ }
3070	3569	else
3071	3570	{
3072	3571	//return super.action(event, arg);
..	..	@@ -3075,7 +3574,6 @@
3075	3574	}
3076	3575
3077	3576	boolean useclient = false;
3078		- cRadio radio;
3079	3577
3080	3578	void ToggleRoot()
3081	3579	{
..	..	@@ -3127,6 +3625,28 @@
3127	3625	refreshContents();
3128	3626	}
3129	3627
	3628	+ void TransformChildren()
	3629	+ {
	3630	+ Object3D obj;
	3631	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3632	+ {
	3633	+ obj = (Object3D)e.nextElement();
	3634	+ obj.KeepTextureMatrices();
	3635	+ obj.TransformChildren();
	3636	+ obj.RestoreTextureMatrices();
	3637	+
	3638	+// if (obj.parent == null)
	3639	+// {
	3640	+// System.out.println("NULL PARENT!");
	3641	+// new Exception().printStackTrace();
	3642	+// }
	3643	+// else
	3644	+// TouchTransform(obj);
	3645	+// //obj.parent.Touch();
	3646	+ }
	3647	+
	3648	+ refreshContents();
	3649	+ }
3130	3650
3131	3651	void ResetTransform()
3132	3652	{
..	..	@@ -3239,7 +3759,7 @@
3239	3759	refreshContents();
3240	3760	}
3241	3761
3242		- void ResetCentroid()
	3762	+ void ResetCentroid(boolean full)
3243	3763	{
3244	3764	Object3D obj;
3245	3765	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3254,12 +3774,16 @@
3254	3774	LA.matIdentity(Object3D.mat);
3255	3775	obj.getBounds(minima, maxima, false);
3256	3776	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3257		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	3777	+ if (full)
	3778	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3258	3779	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3259	3780	obj.TransformMesh(Object3D.mat);
	3781	+
3260	3782	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3261		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	3783	+ if (full)
	3784	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3262	3785	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	3786	+
3263	3787	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3264	3788	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3265	3789	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3288,7 +3812,8 @@
3288	3812
3289	3813	int size = obj.MemorySize();
3290	3814
3291		- System.err.println((size/1024) + " KB is the size of " + obj);
	3815	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	3816	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3292	3817	}
3293	3818	}
3294	3819	catch (Exception e)
..	..	@@ -3325,9 +3850,9 @@
3325	3850	obj = (Object3D)e.nextElement();
3326	3851
3327	3852	System.out.println("Object is: " + obj);
3328		- GrafreeD.AnalyzeObject(obj);
	3853	+ Grafreed.AnalyzeObject(obj);
3329	3854	System.out.println("Boundary rep: " + obj.bRep);
3330		- GrafreeD.AnalyzeObject(obj.bRep);
	3855	+ Grafreed.AnalyzeObject(obj.bRep);
3331	3856
3332	3857	// System.err.println((size/1024) + " KB is the size of " + obj);
3333	3858	}
..	..	@@ -3369,6 +3894,13 @@
3369	3894	void GenNormals(boolean crease)
3370	3895	{
3371	3896	group.GenNormalsS(crease);
	3897	+
	3898	+ refreshContents();
	3899	+ }
	3900	+
	3901	+ void GenNormalsMESH()
	3902	+ {
	3903	+ group.GenNormalsMeshS();
3372	3904
3373	3905	refreshContents();
3374	3906	}
..	..	@@ -3541,8 +4073,8 @@
3541	4073
3542	4074	void ParseVertices()
3543	4075	{
3544		- boolean epsequal = GrafreeD.epsequal;
3545		- GrafreeD.epsequal = true;
	4076	+ boolean epsequal = Grafreed.epsequal;
	4077	+ Grafreed.epsequal = true;
3546	4078
3547	4079	for (int i=0; i<group.selection.size(); i++)
3548	4080	{
..	..	@@ -3567,7 +4099,7 @@
3567	4099	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3568	4100	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3569	4101
3570		- g.add(GrafreeD.clipboard);
	4102	+ g.add(Grafreed.clipboard);
3571	4103
3572	4104	buffer.add(g);
3573	4105	}
..	..	@@ -3582,7 +4114,7 @@
3582	4114	makeSomething(buffer, i==group.selection.size()-1);
3583	4115	}
3584	4116
3585		- GrafreeD.epsequal = epsequal;
	4117	+ Grafreed.epsequal = epsequal;
3586	4118
3587	4119	refreshContents();
3588	4120	}
..	..	@@ -3600,7 +4132,16 @@
3600	4132	String pigment = Object3D.GetPigment(tex);
3601	4133	//String bump = Object3D.GetBump(tex);
3602	4134
3603		- com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4135	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	4136	+
	4137	+ try
	4138	+ {
	4139	+ texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4140	+ }
	4141	+ catch (Exception e)
	4142	+ {
	4143	+ System.err.println("FAIL: " + node);
	4144	+ }
3604	4145
3605	4146	double s = v.s;
3606	4147
..	..	@@ -3732,7 +4273,7 @@
3732	4273	return;
3733	4274
3734	4275	Object3D poses = group.selection.get(0);
3735		- Object3D ref = GrafreeD.clipboard.get(0);
	4276	+ Object3D ref = Grafreed.clipboard.get(0);
3736	4277
3737	4278	Object3D newgroup = new Object3D("Po:" + poses.name);
3738	4279
..	..	@@ -3926,9 +4467,9 @@
3926	4467
3927	4468	void ClipMesh()
3928	4469	{
3929		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	4470	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3930	4471	{
3931		- Object3D content = GrafreeD.clipboard.get(0);
	4472	+ Object3D content = Grafreed.clipboard.get(0);
3932	4473
3933	4474	if (content instanceof cGroup && ((cGroup)content).transientlink )
3934	4475	content = ((cGroup)content).get(0);
..	..	@@ -3937,7 +4478,7 @@
3937	4478	// {
3938	4479	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3939	4480	// }
3940		- group.selection.ClipMesh(GrafreeD.clipboard);
	4481	+ group.selection.ClipMesh(Grafreed.clipboard);
3941	4482	}
3942	4483	// group.selection.ClipMesh(GrafreeD.clipboard);
3943	4484	System.out.println("DONE.");
..	..	@@ -3984,6 +4525,18 @@
3984	4525	void MarkLeaves(boolean hide)
3985	4526	{
3986	4527	group.selection.MarkLeaves(hide);
	4528	+ refreshContents();
	4529	+ }
	4530	+
	4531	+ void RewindLeaves(boolean hide)
	4532	+ {
	4533	+ group.selection.RewindLeaves(hide);
	4534	+ refreshContents();
	4535	+ }
	4536	+
	4537	+ void RandomLeaves(boolean hide)
	4538	+ {
	4539	+ group.selection.RandomLeaves(hide);
3987	4540	refreshContents();
3988	4541	}
3989	4542
..	..	@@ -4058,10 +4611,6 @@
4058	4611	// }
4059	4612	// }
4060	4613
4061		- static boolean allparams = true;
4062		-
4063		- static Vector<Object3D> listUI = new Vector<Object3D>();
4064		-
4065	4614	void EditSelection(boolean newWindow)
4066	4615	{
4067	4616	// aConstraints.gridy = 0;
..	..	@@ -4069,10 +4618,10 @@
4069	4618	{
4070	4619	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4071	4620	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4072		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4621	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4073	4622
4074	4623	Object3D elem = (Object3D)group.selection.elementAt(i);
4075		- if(elem != group)
	4624	+ if(elem != group \|\| !newWindow)
4076	4625	{
4077	4626	// if (!(elem instanceof Composite))
4078	4627	// newWindow = false;
..	..	@@ -4154,7 +4703,8 @@
4154	4703	//new Exception().printStackTrace();
4155	4704
4156	4705	freezemodel = true;
4157		-
	4706	+ ClearUnpinned();
	4707	+
4158	4708	/**/
4159	4709	//switch (event.id)
4160	4710	{
..	..	@@ -4162,7 +4712,6 @@
4162	4712	//case 702: // Event.LIST_DESELECT
4163	4713	group.deselectAll();
4164	4714	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4165		- objEditor.ClearInfo(); // .GetMaterial());
4166	4715	if (tps != null)
4167	4716	{
4168	4717	for (int i=0; i < tps.length; i++)
..	..	@@ -4171,10 +4720,8 @@
4171	4720
4172	4721	//if (child.parent != null)
4173	4722	//child.parent.addSelectee(child);
	4723	+ objEditor.SetMaterial(child);
4174	4724	group.addSelectee(child);
4175		- objEditor.SetMaterial(child); // .GetMaterial());
4176		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4177		- System.err.println("info : " + child.GetPath());
4178	4725	}
4179	4726	}
4180	4727	// else
..	..	@@ -4184,20 +4731,28 @@
4184	4731	// System.err.println("info : " + group.GetPath());
4185	4732	// }
4186	4733
4187		- objEditor.SetText(); // jan 2014
4188		-
4189		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4734	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4190	4735	CameraPane.flash = true;
4191	4736
4192		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4737	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4193	4738	// a camera
4194	4739	{
4195		- CameraPane.camerachangeframe = 0; // don't refuse it
4196		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4740	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
	4741	+ {
	4742	+ CameraPane.camerachangeframe = 0; // don't refuse it
	4743	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4744	+ }
4197	4745	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4198	4746	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4199	4747	}
4200	4748
	4749	+ if (tps != null && tps.length == 1)
	4750	+ {
	4751	+ EditSelection(false);
	4752	+ }
	4753	+
	4754	+ SetPinStates(tps != null && tps.length > 0);
	4755	+
4201	4756	refreshContents();
4202	4757	//return true;
4203	4758	}
..	..	@@ -4206,6 +4761,35 @@
4206	4761
4207	4762	freezemodel = false;
4208	4763	}
	4764	+
	4765	+ void SetPinStates(boolean enabled)
	4766	+ {
	4767	+ editButton.setEnabled(enabled);
	4768	+ uneditButton.setEnabled(enabled);
	4769	+ unselectButton.setEnabled(enabled);
	4770	+ flashSelectionButton.setEnabled(enabled);
	4771	+ }
	4772	+
	4773	+ void refreshContents(boolean cp)
	4774	+ {
	4775	+ if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
	4776	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
	4777	+ {
	4778	+ objEditor.ClearInfo(); // .GetMaterial());
	4779	+
	4780	+ for (int i=0; i < group.selection.Size(); i++)
	4781	+ {
	4782	+ Object3D child = (Object3D) group.selection.get(i);
	4783	+
	4784	+ objEditor.AddInfo(child, this, true);
	4785	+ System.err.println("info : " + child.GetPath());
	4786	+ }
	4787	+
	4788	+ objEditor.SetText(); // jan 2014
	4789	+ }
	4790	+
	4791	+ super.refreshContents(cp);
	4792	+ }
4209	4793
4210	4794	void linkSomething(Object3D thing)
4211	4795	{
..	..	@@ -4277,16 +4861,19 @@
4277	4861	{
4278	4862	if (group.selection.isEmpty())
4279	4863	return;
4280		- GrafreeD.clipboardIsTempGroup = false;
	4864	+
	4865	+ Grafreed.clipboardIsTempGroup = false;
4281	4866	Composite tGroup = null;
4282	4867	if (group.selection.size() > 0) // 1)
4283	4868	{
4284	4869	tGroup = new cGroup();
4285		- GrafreeD.clipboardIsTempGroup = true;
	4870	+ Grafreed.clipboardIsTempGroup = true;
4286	4871	}
4287	4872
4288	4873	if (cut)
4289	4874	{
	4875	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	4876	+// Save();
4290	4877	//int indices[] = jList.getSelectedIndices();
4291	4878	//for (int i = indices.length - 1; i >= 0; i--)
4292	4879	//jList.remove(indices[i]);
..	..	@@ -4322,16 +4909,16 @@
4322	4909	//System.out.println("cut " + child);
4323	4910	//System.out.println("parent = " + child.parent);
4324	4911	// tmp.addChild(child);
4325		- if (GrafreeD.clipboardIsTempGroup)
	4912	+ if (Grafreed.clipboardIsTempGroup)
4326	4913	tGroup.add/Child/(tmp);
4327	4914	else
4328		- GrafreeD.clipboard = tmp;
	4915	+ Grafreed.clipboard = tmp;
4329	4916	}
4330	4917	else
4331		- if (GrafreeD.clipboardIsTempGroup)
	4918	+ if (Grafreed.clipboardIsTempGroup)
4332	4919	tGroup.add/Child/(child);
4333	4920	else
4334		- GrafreeD.clipboard = child;
	4921	+ Grafreed.clipboard = child;
4335	4922	}
4336	4923
4337	4924	//ResetModel();
..	..	@@ -4363,21 +4950,23 @@
4363	4950	//System.out.println("cut " + elem);
4364	4951	//System.out.println("parent = " + elem.parent);
4365	4952	// tmp.addChild(elem);
4366		- if (GrafreeD.clipboardIsTempGroup)
	4953	+ if (Grafreed.clipboardIsTempGroup)
4367	4954	tGroup.add/Child/(tmp);
4368	4955	else
4369		- GrafreeD.clipboard = tmp;
	4956	+ Grafreed.clipboard = tmp;
4370	4957	}
4371	4958	else
4372		- if (GrafreeD.clipboardIsTempGroup)
	4959	+ if (Grafreed.clipboardIsTempGroup)
4373	4960	tGroup.add/Child/(child);
4374	4961	else
4375		- GrafreeD.clipboard = child;
	4962	+ Grafreed.clipboard = child;
4376	4963	}
4377	4964
4378	4965	}
4379		- if (GrafreeD.clipboardIsTempGroup)
4380		- GrafreeD.clipboard = tGroup;
	4966	+
	4967	+ if (Grafreed.clipboardIsTempGroup)
	4968	+ Grafreed.clipboard = tGroup;
	4969	+
4381	4970	if (cut)
4382	4971	{
4383	4972	ResetModel();
..	..	@@ -4387,11 +4976,15 @@
4387	4976
4388	4977	void paste(boolean expand)
4389	4978	{
	4979	+ if (Globals.REPLACEONMAKE)
	4980	+ Save();
	4981	+ boolean keep = Globals.REPLACEONMAKE;
	4982	+ Globals.REPLACEONMAKE = false;
4390	4983	// if (GrafreeD.clipboard == null)
4391	4984	// return;
4392	4985	boolean first = true;
4393	4986
4394		- if (GrafreeD.clipboardIsTempGroup)
	4987	+ if (Grafreed.clipboardIsTempGroup)
4395	4988	{
4396	4989	Composite temp;
4397	4990
..	..	@@ -4402,7 +4995,7 @@
4402	4995	temp = (Composite)Applet3D.clipboard.deepCopy();
4403	4996	*/
4404	4997	Object3D elem;
4405		- for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	4998	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4406	4999	{
4407	5000	Object3D child = (Object3D)e.nextElement();
4408	5001
..	..	@@ -4436,16 +5029,17 @@
4436	5029	//Object3D cb = Applet3D.clipboard;
4437	5030	//temp.addChild(cb);
4438	5031	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4439		- assert(GrafreeD.clipboard.parent == null);
4440		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
4441		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4442		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4443		- makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
	5032	+ assert(Grafreed.clipboard.parent == null);
	5033	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	5034	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	5035	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	5036	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4444	5037	else
4445		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4446		- GrafreeD.clipboard.get(0).parent = keepparent;
	5038	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	5039	+ Grafreed.clipboard.get(0).parent = keepparent;
4447	5040	}
4448	5041
	5042	+ Globals.REPLACEONMAKE = keep;
4449	5043	ResetModel();
4450	5044	refreshContents();
4451	5045	}
..	..	@@ -4492,9 +5086,9 @@
4492	5086	{
4493	5087	boolean first = true;
4494	5088
4495		- if (GrafreeD.clipboardIsTempGroup)
	5089	+ if (Grafreed.clipboardIsTempGroup)
4496	5090	{
4497		- Composite temp = (Composite)GrafreeD.clipboard;
	5091	+ Composite temp = (Composite)Grafreed.clipboard;
4498	5092	Object3D copy;
4499	5093	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4500	5094	{
..	..	@@ -4504,7 +5098,7 @@
4504	5098	}
4505	5099	} else
4506	5100	{
4507		- linkSomething(GrafreeD.clipboard); //.get(0));
	5101	+ linkSomething(Grafreed.clipboard); //.get(0));
4508	5102	}
4509	5103	}
4510	5104	}
..	..	@@ -4581,6 +5175,10 @@
4581	5175
4582	5176	void group(Object3D csg, boolean grab)
4583	5177	{
	5178	+ if (Globals.REPLACEONMAKE)
	5179	+ Save();
	5180	+ boolean keep = Globals.REPLACEONMAKE;
	5181	+ Globals.REPLACEONMAKE = false;
4584	5182	if (//false) // why??
4585	5183	!group.selection.isEmpty())
4586	5184	{
..	..	@@ -4694,10 +5292,15 @@
4694	5292	//node.add(csg);
4695	5293	//makeSomething(node);
4696	5294	makeSomething(csg);
	5295	+ Globals.REPLACEONMAKE = keep;
4697	5296	}
4698	5297
4699	5298	void Ungroup(Object3D g)
4700	5299	{
	5300	+ if (Globals.REPLACEONMAKE)
	5301	+ Save();
	5302	+ boolean keep = Globals.REPLACEONMAKE;
	5303	+ Globals.REPLACEONMAKE = false;
4701	5304	if (g instanceof HiddenObject)
4702	5305	{
4703	5306	HiddenObject h = (HiddenObject) g;
..	..	@@ -4714,6 +5317,7 @@
4714	5317	objEditor.makeSomething(g.get(i), false);
4715	5318	}
4716	5319	}
	5320	+ Globals.REPLACEONMAKE = keep;
4717	5321	}
4718	5322
4719	5323	void ungroup()
..	..	@@ -4909,21 +5513,6 @@
4909	5513	}
4910	5514	*/
4911	5515
4912		- void ImportGFD()
4913		- {
4914		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4915		- browser.show();
4916		- String filename = browser.getFile();
4917		- if (filename != null && filename.length() > 0)
4918		- {
4919		- String fullname = browser.getDirectory() + filename;
4920		-
4921		- //Object3D readobj =
4922		- objEditor.ReadGFD(fullname, objEditor);
4923		- //makeSomething(readobj);
4924		- }
4925		- }
4926		-
4927	5516	/*
4928	5517	public void Callback(Object obj)
4929	5518	{
..	..	@@ -4947,26 +5536,9 @@
4947	5536	}
4948	5537	*/
4949	5538
4950		- void ImportVRMLX3D()
4951		- {
4952		- if (GrafreeD.standAlone)
4953		- {
4954		- /**/
4955		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4956		- browser.show();
4957		- String filename = browser.getFile();
4958		- if (filename != null && filename.length() > 0)
4959		- {
4960		- String fullname = browser.getDirectory() + filename;
4961		- LoadVRMLX3D(fullname);
4962		- }
4963		- /**/
4964		- }
4965		- }
4966		-
4967	5539	String GetFile(String dialogName)
4968	5540	{
4969		- if (GrafreeD.standAlone)
	5541	+ if (Grafreed.standAlone)
4970	5542	{
4971	5543	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4972	5544	browser.show();
..	..	@@ -5034,7 +5606,28 @@
5034	5606	cButton clearpanelButton;
5035	5607	cButton unselectButton;
5036	5608
	5609	+ cButton restoreCameraButton;
	5610	+
	5611	+ cButton saveButton;
5037	5612	cButton oneStepButton;
	5613	+
	5614	+ cButton groupButton;
	5615	+ cButton ungroupButton;
	5616	+ cButton compositeButton;
	5617	+ cButton switchButton;
	5618	+ cButton loopButton;
	5619	+ cButton textureButton;
	5620	+
	5621	+ cButton gridButton;
	5622	+ cButton boxButton;
	5623	+ cButton sphereButton;
	5624	+ cButton coneButton;
	5625	+ cButton torusButton;
	5626	+ cButton superButton;
	5627	+ cButton kleinButton;
	5628	+ cButton particlesButton;
	5629	+ cButton overlayButton;
	5630	+ cButton lightButton;
5038	5631
5039	5632	cButton screenfitButton;
5040	5633	cButton screenfitpointButton;
..	..	@@ -5047,14 +5640,6 @@
5047	5640
5048	5641	cButton setsupportButton;
5049	5642
5050		- cButton twoButton;
5051		- cButton sixButton;
5052		- cButton threeButton;
5053		- cButton sevenButton;
5054		- cButton fourButton; // full panel
5055		- cButton oneButton; // full XYZ
5056		- //cButton currentLayout;
5057		-
5058	5643	//
5059	5644	//Composite
5060	5645	Object3D // to do !!
..	..	@@ -5064,9 +5649,11 @@
5064	5649	//JTree jTree;
5065	5650	private MenuItem lookAtItem;
5066	5651	private MenuItem lookFromItem;
5067		- private MenuItem switchItem;
	5652	+ private MenuItem switchViewItem;
5068	5653	private MenuItem cutItem;
5069		- private MenuItem duplicateItem;
	5654	+ private MenuItem undoItem;
	5655	+ private MenuItem redoItem;
	5656	+ private JMenuItem duplicateItem;
5070	5657	private MenuItem cloneItem;
5071	5658	private MenuItem cloneSupportItem;
5072	5659	private MenuItem overwriteGeoItem;
..	..	@@ -5079,7 +5666,7 @@
5079	5666	private MenuItem linkverticesItem;
5080	5667	private MenuItem relinkverticesItem;
5081	5668	private MenuItem setMasterItem;
5082		- private MenuItem resetMeshItem;
	5669	+ private MenuItem resetAllItem;
5083	5670	private MenuItem stepAllItem;
5084	5671	private MenuItem revertMeshItem;
5085	5672	private MenuItem poseMeshItem;
..	..	@@ -5129,6 +5716,10 @@
5129	5716	private MenuItem showleavesItem;
5130	5717	private MenuItem markleavesItem;
5131	5718	private MenuItem unmarkleavesItem;
	5719	+ private MenuItem rewindleavesItem;
	5720	+ private MenuItem unrewindleavesItem;
	5721	+ private MenuItem randomleavesItem;
	5722	+ private MenuItem unrandomleavesItem;
5132	5723
5133	5724	private MenuItem flipVItem;
5134	5725	private MenuItem unflipVItem;
..	..	@@ -5140,15 +5731,17 @@
5140	5731	private MenuItem panoTexturesItem;
5141	5732
5142	5733	private MenuItem resetCentroidItem;
5143		- private MenuItem transformgeometryItem;
	5734	+ private MenuItem resetCentroidXZItem;
5144	5735	private MenuItem resetTransformItem;
	5736	+ private MenuItem transformGeometryItem;
	5737	+ private MenuItem transformChildrenItem;
5145	5738	private MenuItem hideItem;
5146	5739	private MenuItem grabItem;
5147	5740	private MenuItem backItem;
5148	5741	private MenuItem frontItem;
5149	5742	private MenuItem cameraItem;
5150	5743	private MenuItem compositeItem;
5151		- private MenuItem randomItem;
	5744	+ private MenuItem switchItem;
5152	5745	private MenuItem physicsItem;
5153	5746	private MenuItem frameselectorItem;
5154	5747	private MenuItem scriptNodeItem;
..	..	@@ -5210,11 +5803,6 @@
5210	5803	private MenuItem doubleItem;
5211	5804	private MenuItem tripleItem;
5212	5805
5213		- private MenuItem importGFDItem;
5214		- private MenuItem importVRMLX3DItem;
5215		- private MenuItem import3DSItem;
5216		- private MenuItem importOBJItem;
5217		-
5218	5806	private MenuItem computeAOItem;
5219	5807	private MenuItem recompileItem;
5220	5808	private MenuItem editScriptItem;
..	..	@@ -5224,4 +5812,8 @@
5224	5812	private MenuItem analyzeItem;
5225	5813	private MenuItem dumpItem;
5226	5814	//boolean freezemodel = false;
	5815	+
	5816	+ Menu cameraMenu;
	5817	+ MenuItem editCameraItem;
	5818	+ MenuItem restoreCameraItem;
5227	5819	}