~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,40 +153,37 @@
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);
	172	+ cloneItem = menu.add(new MenuItem("Clone"));
	173	+ cloneItem.addActionListener(this);
	174	+ if (Globals.ADVANCED)
	175	+ {
	176	+ cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
	177	+ cloneSupportItem.addActionListener(this);
	178	+ }
	179	+ menu.add("-");
174	180	cutItem = menu.add(new MenuItem("Cut"));
175	181	cutItem.addActionListener(this);
176	182	copyItem = menu.add(new MenuItem("Copy"));
177	183	copyItem.addActionListener(this);
178	184	pasteItem = menu.add(new MenuItem("Paste"));
179	185	pasteItem.addActionListener(this);
180		- menu.add("-");
181		- cloneItem = menu.add(new MenuItem("Clone"));
182		- cloneItem.addActionListener(this);
183		- cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
184		- cloneSupportItem.addActionListener(this);
	186	+
185	187	menu.add("-");
186	188	pasteIntoItem = menu.add(new MenuItem("Paste into"));
187	189	pasteIntoItem.addActionListener(this);
..	..	@@ -201,14 +203,97 @@
201	203	clearAllItem = menu.add(new MenuItem("Clear All"));
202	204	clearAllItem.addActionListener(this);
203	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());
204	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	+
205	294	oe.menuBar.add(menu = new Menu("Setting"));
206	295	if (Globals.ADVANCED)
207	296	{
208		- resetMeshItem = menu.add(new MenuItem("Reset All"));
209		- resetMeshItem.addActionListener(this);
210		- stepAllItem = menu.add(new MenuItem("Step All"));
211		- stepAllItem.addActionListener(this);
212	297	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
213	298	revertMeshItem.addActionListener(this);
214	299	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
..	..	@@ -248,21 +333,29 @@
248	333	}
249	334
250	335	oe.menuBar.add(menu = new Menu("Group"));
251		- grabItem = menu.add(new MenuItem("Grab"));
252		- grabItem.addActionListener(this);
	336	+// grabItem = menu.add(new MenuItem("Grab"));
	337	+// grabItem.addActionListener(this);
253	338	backItem = menu.add(new MenuItem("Back"));
254	339	backItem.addActionListener(this);
255	340	frontItem = menu.add(new MenuItem("Front"));
256	341	frontItem.addActionListener(this);
257		- compositeItem = menu.add(new MenuItem("Composite"));
258		- compositeItem.addActionListener(this);
	342	+// compositeItem = menu.add(new MenuItem("Composite"));
	343	+// compositeItem.addActionListener(this);
	344	+
	345	+ if (Globals.ADVANCED)
	346	+ {
259	347	hideItem = menu.add(new MenuItem("Hidden Group"));
260	348	hideItem.addActionListener(this);
	349	+ }
261	350	ungroupItem = menu.add(new MenuItem("Ungroup"));
262	351	ungroupItem.addActionListener(this);
263		- menu.add("-");
264		- randomItem = menu.add(new MenuItem("Switch node"));
265		- 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	+ {
266	359	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
267	360	switchGeoItem.addActionListener(this);
268	361	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
..	..	@@ -270,49 +363,52 @@
270	363	morphItem = menu.add(new MenuItem("Morph Group"));
271	364	morphItem.addActionListener(this);
272	365
273		- if (Globals.ADVANCED)
274		- {
	366	+ menu.add("-");
275	367	physicsItem = menu.add(new MenuItem("Physics"));
276	368	physicsItem.addActionListener(this);
277	369	frameselectorItem = menu.add(new MenuItem("Frame Selector"));
278	370	frameselectorItem.addActionListener(this);
279	371	scriptNodeItem = menu.add(new MenuItem("Script Node"));
280	372	scriptNodeItem.addActionListener(this);
281		- cameraItem = menu.add(new MenuItem("Camera"));
282		- cameraItem.addActionListener(this);
283	373	}
284	374
285	375	oe.menuBar.add(menu = new Menu("Object"));
286		- textureItem = menu.add(new MenuItem("Texture"));
287		- textureItem.addActionListener(this);
	376	+// textureItem = menu.add(new MenuItem("Texture"));
	377	+// textureItem.addActionListener(this);
288	378	billboardItem = menu.add(new MenuItem("Billboard"));
289	379	billboardItem.addActionListener(this);
290	380	csgItem = menu.add(new MenuItem("CSG"));
291	381	csgItem.addActionListener(this);
292		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	382	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
293	383	shadowXItem.addActionListener(this);
294		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	384	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
295	385	shadowYItem.addActionListener(this);
296		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	386	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
297	387	shadowZItem.addActionListener(this);
298		- if (Globals.ADVANCED)
299		- {
300		- linkerItem = menu.add(new MenuItem("Linker"));
301		- linkerItem.addActionListener(this);
302	388	attributeItem = menu.add(new MenuItem("Attribute"));
303	389	attributeItem.addActionListener(this);
	390	+
	391	+ if (Globals.ADVANCED)
	392	+ {
	393	+ menu.add("-");
	394	+ linkerItem = menu.add(new MenuItem("Linker"));
	395	+ linkerItem.addActionListener(this);
304	396	templateItem = menu.add(new MenuItem("Template"));
305	397	templateItem.addActionListener(this);
306	398	pointflowItem = menu.add(new MenuItem("Point Flow"));
307	399	pointflowItem.addActionListener(this);
308		- menu.add("-");
309	400	}
	401	+ menu.add("-");
310	402	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
311	403	resetTransformItem.addActionListener(this);
312	404	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
313	405	resetCentroidItem.addActionListener(this);
314		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
315		- 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);
316	412
317	413	oe.menuBar.add(menu = new Menu("Geometry"));
318	414	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -361,6 +457,10 @@
361	457	oe.menuBar.add(menu = new Menu("Attributes"));
362	458	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
363	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);
364	464	menu.add("-");
365	465	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
366	466	liveleavesItem.addActionListener(this);
..	..	@@ -381,6 +481,14 @@
381	481	markleavesItem.addActionListener(this);
382	482	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
383	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);
384	492	menu.add("-");
385	493	flipVItem = menu.add(new MenuItem("Flip V"));
386	494	flipVItem.addActionListener(this);
..	..	@@ -415,38 +523,42 @@
415	523	sortbysizeItem.addActionListener(this);
416	524	sortbynameItem = menu.add(new MenuItem("Sort by name"));
417	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);
418	531	if (Globals.ADVANCED)
419	532	{
420		- menu.add("-");
	533	+ // Pretty much the same as duplicate and clone.
421	534	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
422	535	extractGeometriesItem.addActionListener(this);
423	536	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
424	537	cloneGeometriesItem.addActionListener(this);
425		- shareGeometriesItem = menu.add(new MenuItem("Share Geometry"));
426		- shareGeometriesItem.addActionListener(this);
427		- mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
428		- mergeGeometriesItem.addActionListener(this);
429	538	}
430	539
431	540	oe.menuBar.add(menu = new Menu("Insert"));
432	541	buildCreateMenu(menu);
433	542
434		- oe.menuBar.add(menu = new Menu("Include"));
435		- importGFDItem = menu.add(new MenuItem("GrafreeD Object..."));
436		- importGFDItem.addActionListener(this);
437		- importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D Object..."));
438		- importVRMLX3DItem.addActionListener(this);
439		- importOBJItem = menu.add(new MenuItem("OBJ Object..."));
440		- importOBJItem.addActionListener(this);
441		- import3DSItem = menu.add(new MenuItem("3DS Object..."));
442		- import3DSItem.addActionListener(this);
443		-
444	543	oe.menuBar.add(menu = new Menu("Tools"));
445	544	buildToolsMenu(menu);
446	545	}
447	546
	547	+
448	548	void SetupUI2(ObjEditor oe)
449	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	+
450	562	//new Exception().printStackTrace();
451	563
452	564	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -475,97 +587,229 @@
475	587	oe.radioPanel.add(dummyButton);
476	588	oe.buttonGroup.add(dummyButton);
477	589	*/
	590	+ cGridBag copyOptionsPanel = new cGridBag();
	591	+
	592	+ copyOptionsPanel.preferredHeight = 1;
	593	+
478	594	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
479	595
480		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
481		- 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");
482	648	liveCB.addItemListener(this);
483	649
484		- oe.toolbarPanel.add(oneStepButton = new cButton("Step", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	650	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
485	651	oneStepButton.setToolTipText("Animate one step forward");
486	652	oneStepButton.addActionListener(this);
487	653
488		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	654	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
489	655	fastCB.setToolTipText("Fast mode");
490	656	fastCB.addItemListener(this);
491	657
492		- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
493		- trackCB.setToolTipText("Enable tracking");
494		- trackCB.addItemListener(this);
495		-
496		- oe.toolbarPanel.add(screenfitButton = new cButton("@", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
497		- screenfitButton.setToolTipText("Screen fit");
498		- 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);
499	663
500	664	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
501	665	// screenfitpointButton.addActionListener(this);
502	666
503	667	if (Globals.ADVANCED)
504	668	{
505		- oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	669	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
506	670	snapobjectButton.addActionListener(this);
507	671	snapobjectButton.setToolTipText("Snap Object");
508	672	}
509	673
510		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
511		- flashSelectionButton.setToolTipText("Show selection");
512		- flashSelectionButton.addActionListener(this);
	674	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
513	675
514		- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
515		-
516		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	676	+ oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
517	677	twoButton.setToolTipText("Show center view only");
518	678	twoButton.addActionListener(this);
519		- 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);
520	682	fourButton.addActionListener(this);
521	683	fourButton.setToolTipText("Show left panel only");
522		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	684	+ oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
523	685	sixButton.setToolTipText("2-column layout left");
524	686	sixButton.addActionListener(this);
525		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	687	+ oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
526	688	threeButton.setToolTipText("2-column layout right");
527	689	threeButton.addActionListener(this);
528		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	690	+ oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
529	691	sevenButton.setToolTipText("3-column layout");
530	692	sevenButton.addActionListener(this);
531	693	//
532	694
533		- 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);
534	696	rootButton.setToolTipText("Edit selection in new tab");
535	697	rootButton.addActionListener(this);
536	698
537		- 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);
538	700	closeButton.setToolTipText("Close tab");
539	701	closeButton.addActionListener(this);
540	702	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
541	703	//clearButton.addActionListener(this);
542		-
543		- 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	+ }
544	736
545		- commandsPanel.add(editButton = new cButton("+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
546		- 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");
547	786	editButton.addActionListener(this);
548	787
549		- commandsPanel.add(uneditButton = new cButton("-", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
550		- uneditButton.setToolTipText("Unedit selection");
	788	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	789	+ uneditButton.setToolTipText("Remove selection controls");
551	790	uneditButton.addActionListener(this);
552	791
553		- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
554		- allParamsButton.setToolTipText("Edit all params");
	792	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	793	+ allParamsButton.setToolTipText("Show all controle");
555	794	allParamsButton.addActionListener(this);
556	795
557		- commandsPanel.add(clearPanelButton = new cButton("C", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	796	+ editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
558	797	clearPanelButton.setToolTipText("Clear edit panel");
559	798	clearPanelButton.addActionListener(this);
560	799
561		- commandsPanel.add(unselectButton = new cButton("U", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	800	+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
562	801	unselectButton.setToolTipText("Unselect");
563	802	unselectButton.addActionListener(this);
564	803
565		- 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);
566	807
567		- oe.treePanel.add(commandsPanel);
568		- oe.treePanel.Return();
	808	+ editCommandsPanel.preferredHeight = 1;
	809	+
	810	+ SetPinStates(false);
	811	+// oe.treePanel.add(commandsPanel);
	812	+// oe.treePanel.Return();
569	813
570	814	// oe.aConstraints.gridx += 1;
571	815	// oe.aConstraints.weighty = 0;
..	..	@@ -582,29 +826,17 @@
582	826
583	827	JScrollPane jSP;
584	828	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
585		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	829	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
586	830	ResetModel();
587	831
588	832	oe.treePanel.add(jSPPanel);
589	833	oe.treePanel.Return();
590	834
591		- cGridBag copyOptionsPanel = new cGridBag();
592		-
593		- copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
594		- colorCB.setToolTipText("Copy color when dropped");
595		- colorCB.addItemListener(this);
596		-
597		- copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
598		- materialCB.setToolTipText("Copy material when dropped");
599		- materialCB.addItemListener(this);
600		-
601		- copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
602		- textureCB.setToolTipText("Copy texture when dropped");
603		- textureCB.addItemListener(this);
604		-
605		- copyOptionsPanel.preferredHeight = 1;
606	835	oe.treePanel.add(copyOptionsPanel);
607	836	oe.treePanel.Return();
	837	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 10, 0);
	838	+ versionField = (cNumberSlider)sliderPane.getComponent(1);
	839	+ sliderPane.preferredHeight = 1;
608	840
609	841	// mainPanel.setDividerLocation(0.5); //1.0);
610	842	// mainPanel.setResizeWeight(0.5);
..	..	@@ -633,23 +865,43 @@
633	865
634	866	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
635	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	+
636	882	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
637	883	boxCB.setToolTipText("Display bounding boxes");
638	884	boxCB.addItemListener(this);
639	885
640	886	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
641		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	887	+ zoomBoxCB.setToolTipText("Display only for wheel");
642	888	zoomBoxCB.addItemListener(this);
643	889
644		- if (Globals.ADVANCED)
	890	+ if (true) // Globals.ADVANCED)
645	891	{
646		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
647		- supportCB.setToolTipText("Enable rigging");
648		- 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);
649	899
650	900	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
651	901	// localCB.addItemListener(this);
652	902
	903	+ panel.Return();
	904	+
653	905	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
654	906	crowdCB.setToolTipText("Used for crowds");
655	907	crowdCB.addItemListener(this);
..	..	@@ -666,6 +918,8 @@
666	918	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
667	919	// speakerMocapCB.addItemListener(this);
668	920
	921	+ panel.Return();
	922	+
669	923	if (false)
670	924	{
671	925	// handled in scripts
..	..	@@ -680,32 +934,72 @@
680	934	//constraints.gridy += 1;
681	935	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
682	936	smoothfocusCB.addItemListener(this);
	937	+ panel.Return();
683	938	}
684	939
685	940	//constraints.gridx += 1;
686	941	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
687	942	// debugCB.addItemListener(this);
688	943
	944	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	945	+ trackCB.setToolTipText("Enable tracking target");
	946	+ trackCB.addItemListener(this);
	947	+
689	948	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	949	+ oeilCB.setToolTipText("Move camera when tracking");
690	950	oeilCB.addItemListener(this);
691	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	+ {
692	972	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
693	973	lookAtCB.setToolTipText("Look-at target");
694	974	lookAtCB.addItemListener(this);
	975	+ }
695	976
696	977	}
697	978
698	979	cGridBag fill = new cGridBag();
699		-
700	980	fill.preferredHeight = 200;
	981	+ cGridBag fill2 = new cGridBag();
	982	+ fill2.preferredHeight = 200;
	983	+ cGridBag fill3 = new cGridBag();
	984	+ fill3.preferredHeight = 200;
701	985
702	986	panel.add(fill);
	987	+ panel.add(fill2);
	988	+ panel.add(fill3);
703	989
704	990	}
705	991
706	992	void EditObject(Object3D obj)
707	993	{
708	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	+
709	1003	radioButton.SetObject(obj);
710	1004	radioButton.layout = sevenButton;
711	1005	radioButton.SetCamera(cameraView.renderCamera, false);
..	..	@@ -714,8 +1008,11 @@
714	1008	buttonGroup.add(radioButton);
715	1009	radioButton.doClick();
716	1010	}
	1011	+
717	1012	void SetupViews(ObjEditor oe)
718	1013	{
	1014	+ theFrame = this;
	1015	+
719	1016	oe.SetupViews();
720	1017
721	1018	System.out.println("SetupViews");
..	..	@@ -724,23 +1021,28 @@
724	1021	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
725	1022	}
726	1023
727		- JCheckBox liveCB;
728		- JCheckBox supportCB;
729		- JCheckBox localCB;
730		- JCheckBox crowdCB;
731		- JCheckBox smoothCB;
732		- JCheckBox fastCB;
733		- JCheckBox slowCB;
734		- JCheckBox boxCB;
735		- JCheckBox zoomBoxCB;
736		- JCheckBox trackCB;
737		- 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;
738	1037	// JCheckBox speakerMocapCB;
739		- JCheckBox speakerCameraCB;
740		- JCheckBox speakerFocusCB;
741		- JCheckBox debugCB;
742		- JCheckBox oeilCB;
743		- JCheckBox lookAtCB;
	1038	+ cCheckBox speakerCameraCB;
	1039	+ cCheckBox speakerFocusCB;
	1040	+ cCheckBox debugCB;
	1041	+
	1042	+ cCheckBox oeilCB;
	1043	+ cCheckBox shadowCB;
	1044	+ cCheckBox autokeepCB;
	1045	+ cCheckBox lookAtCB;
744	1046
745	1047	// static int COLOR = 1;
746	1048	// static int MATERIAL = 2;
..	..	@@ -748,9 +1050,9 @@
748	1050
749	1051	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
750	1052
751		- JCheckBox colorCB;
752		- JCheckBox materialCB;
753		- JCheckBox textureCB;
	1053	+ cCheckBox colorCB;
	1054	+ cCheckBox materialCB;
	1055	+ cCheckBox textureCB;
754	1056
755	1057	public void itemStateChanged(ItemEvent e)
756	1058	{
..	..	@@ -778,6 +1080,7 @@
778	1080	} else if(e.getSource() == liveCB)
779	1081	{
780	1082	cameraView.ToggleLive();
	1083	+ refreshContents(false);
781	1084	}
782	1085	else if(e.getSource() == supportCB)
783	1086	{
..	..	@@ -842,6 +1145,18 @@
842	1145	{
843	1146	cameraView.ToggleOeil();
844	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	+ }
845	1160	else if(e.getSource() == lookAtCB)
846	1161	{
847	1162	cameraView.ToggleLookAt();
..	..	@@ -858,7 +1173,8 @@
858	1173
859	1174	/**/
860	1175	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
861		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1176	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1177	+ TreePath path = objEditor.jTree.getSelectionPath();
862	1178	if ((path == null) \|\| (path.getPathCount() <= 1)) {
863	1179	// We can't move the root node or an empty selection
864	1180	return;
..	..	@@ -921,8 +1237,6 @@
921	1237	}
922	1238	}
923	1239
924		- String string = (String) object;
925		-
926	1240	System.out.println("Transfer = " + object + "; drop : " + target);
927	1241	// if( object instanceof java.io.File[])
928	1242	// {
..	..	@@ -930,7 +1244,11 @@
930	1244	// objEditor.DropFile((java.io.File[]) object, true);
931	1245	// return;
932	1246	// }
933		- 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) == ':')
934	1252	{
935	1253	// file(s)
936	1254	String[] names = string.split("\n");
..	..	@@ -957,7 +1275,7 @@
957	1275
958	1276	flashIt = false;
959	1277	CameraPane pane = (CameraPane) target;
960		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1278	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
961	1279	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
962	1280
963	1281	if (group.selection.size() == 1)
..	..	@@ -973,23 +1291,33 @@
973	1291
974	1292	assert target == objEditor.jTree;
975	1293	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1294	+ Object3D destinationLeaf;
976	1295	try {
977		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1296	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
978	1297	} catch (Exception e) {
979	1298	System.out.println("destinationPath : " + destinationPath);
980	1299	return;
981	1300	}
982	1301
983		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1302	+ for (int i=group.selection.size(); --i>=0;)
984	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	+// {
985	1313	loadClipboard(true);
986	1314	objEditor.jTree.setSelectionPath(destinationPath);
987	1315	pasteInto(false, false);
988		- } else {
989		- loadClipboard(false);
990		- objEditor.jTree.setSelectionPath(destinationPath);
991		- pasteInto(false, false); // true); // ???
992		- }
	1316	+// } else {
	1317	+// loadClipboard(false);
	1318	+// objEditor.jTree.setSelectionPath(destinationPath);
	1319	+// pasteInto(false, false); // true); // ???
	1320	+// }
993	1321	}
994	1322	public void dropActionChanged(DropTargetDragEvent dtde)
995	1323	// Called if the user has modified the current drop gesture
..	..	@@ -1094,22 +1422,30 @@
1094	1422	{
1095	1423	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1096	1424	//heightFieldItem.addActionListener(this);
1097		- gridItem = menu.add(new MenuItem("Grid"));
1098		- gridItem.addActionListener(this);
1099		- rectoidItem = menu.add(new MenuItem("Box"));
1100		- rectoidItem.addActionListener(this);
1101		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1102		- ellipsoidItem.addActionListener(this);
1103		- coneItem = menu.add(new MenuItem("Cone"));
1104		- coneItem.addActionListener(this);
1105		- torusItem = menu.add(new MenuItem("Torus"));
1106		- torusItem.addActionListener(this);
1107		- superItem = menu.add(new MenuItem("Superellipsoid"));
1108		- 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	+ {
1109	1443	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1110	1444	kleinItem.addActionListener(this);
1111		- particleItem = menu.add(new MenuItem("Particle system"));
1112		- particleItem.addActionListener(this);
	1445	+ }
	1446	+
	1447	+// particleItem = menu.add(new MenuItem("Particle system"));
	1448	+// particleItem.addActionListener(this);
1113	1449	if (Globals.ADVANCED)
1114	1450	{
1115	1451	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1135,15 +1471,15 @@
1135	1471	}
1136	1472	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1137	1473	bezierItem.addActionListener(this);
1138		- overlayItem = menu.add(new MenuItem("Overlay"));
1139		- overlayItem.addActionListener(this);
1140		- lightItem = menu.add(new MenuItem("Light"));
1141		- 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);
1142	1478	menu.add("-");
1143	1479	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1144	1480	//superLoopItem.addActionListener(this);
1145		- loopItem = menu.add(new MenuItem("Loop"));
1146		- loopItem.addActionListener(this);
	1481	+// loopItem = menu.add(new MenuItem("Loop"));
	1482	+// loopItem.addActionListener(this);
1147	1483	doubleItem = menu.add(new MenuItem("Fork"));
1148	1484	doubleItem.addActionListener(this);
1149	1485	if (Globals.ADVANCED)
..	..	@@ -1159,18 +1495,23 @@
1159	1495	animationItem.addItemListener(this);
1160	1496	animationItem.setState(Globals.ANIMATION);
1161	1497
	1498	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1499	+ archiveItem.addActionListener(this);
	1500	+
1162	1501	menu.add("-");
1163	1502	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1164	1503	parseverticesItem.addActionListener(this);
1165	1504	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1166	1505	textureFieldItem.addActionListener(this);
1167		- alignItem = menu.add(new MenuItem("Align Object"));
	1506	+ alignItem = menu.add(new MenuItem("Align Objects"));
1168	1507	alignItem.addActionListener(this);
1169	1508	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1170	1509	reduceMorphItem.addActionListener(this);
1171	1510	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1172	1511	reduce34MorphItem.addActionListener(this);
1173		-
	1512	+ menu.add("-");
	1513	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	1514	+ memoryItem.addActionListener(this);
1174	1515	menu.add(computeAOItem = new MenuItem("Compute AO"));
1175	1516	computeAOItem.addActionListener(this);
1176	1517
..	..	@@ -1179,11 +1520,9 @@
1179	1520	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1180	1521	mirrorItem.addActionListener(this);
1181	1522	menu.add("-");
1182		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1183		- memoryItem.addActionListener(this);
1184	1523	menu.add(analyzeItem = new MenuItem("Analyze"));
1185	1524	analyzeItem.addActionListener(this);
1186		- menu.add(dumpItem = new MenuItem("Dump"));
	1525	+ menu.add(dumpItem = new MenuItem("Print"));
1187	1526	dumpItem.addActionListener(this);
1188	1527	// menu.add(pathItem = new MenuItem("From-to path"));
1189	1528	// pathItem.addActionListener(this);
..	..	@@ -1324,9 +1663,24 @@
1324	1663	shadow.material = new cMaterial(obj.material);
1325	1664	shadow.material.diffuse = 0.0001f;
1326	1665	shadow.material.specular = 0.0001f;
	1666	+ //shadow.projectedVertices[1].x = 300;
1327	1667
1328	1668	makeSomething(shadow);
1329	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	+ }
1330	1684
1331	1685	/**
1332	1686	* applyExample
..	..	@@ -1530,9 +1884,9 @@
1530	1884
1531	1885	void Overwrite(int mask)
1532	1886	{
1533		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	1887	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1534	1888	{
1535		- Object3D content = GrafreeD.clipboard.get(0);
	1889	+ Object3D content = Grafreed.clipboard.get(0);
1536	1890
1537	1891	if (content instanceof cGroup && ((cGroup)content).transientlink )
1538	1892	content = ((cGroup)content).get(0);
..	..	@@ -1571,7 +1925,7 @@
1571	1925	{
1572	1926	ScreenFit();
1573	1927	} else
1574		- if (source == switchItem)
	1928	+ if (source == switchViewItem)
1575	1929	{
1576	1930	cVector v1 = new cVector();
1577	1931	cVector v2 = new cVector();
..	..	@@ -1580,11 +1934,11 @@
1580	1934	objEditor.cameraView.renderCamera.setAim(v2, v1);
1581	1935	objEditor.cameraView.repaint();
1582	1936	} else
1583		- if (source == rectoidItem)
	1937	+ if (source == rectoidItem \|\| source == boxButton)
1584	1938	{
1585	1939	makeSomething(new Box());
1586	1940	} else
1587		- if (source == particleItem)
	1941	+ if (source == particleItem \|\| source == particlesButton)
1588	1942	{
1589	1943	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1590	1944	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1663,27 +2017,27 @@
1663	2017
1664	2018	makeSomething(obj);
1665	2019	} else
1666		- if (source == gridItem)
	2020	+ if (source == gridItem \|\| source == gridButton)
1667	2021	{
1668	2022	makeSomething(new Grid());
1669	2023	} else
1670		- if (source == ellipsoidItem)
	2024	+ if (source == ellipsoidItem \|\| source == sphereButton)
1671	2025	{
1672	2026	makeSomething(new Sphere());
1673	2027	} else
1674		- if (source == coneItem)
	2028	+ if (source == coneItem \|\| source == coneButton)
1675	2029	{
1676	2030	makeSomething(new Cone());
1677	2031	} else
1678		- if (source == torusItem)
	2032	+ if (source == torusItem \|\| source == torusButton)
1679	2033	{
1680	2034	makeSomething(new Torus());
1681	2035	} else
1682		- if (source == superItem)
	2036	+ if (source == superItem \|\| source == superButton)
1683	2037	{
1684	2038	makeSomething(new Superellipsoid());
1685	2039	} else
1686		- if (source == kleinItem)
	2040	+ if (source == kleinItem \|\| source == kleinButton)
1687	2041	{
1688	2042	makeSomething(new Klein());
1689	2043	} else
..	..	@@ -1703,7 +2057,7 @@
1703	2057	{
1704	2058	makeSomething(new BezierSurface());
1705	2059	} else
1706		- if (source == overlayItem)
	2060	+ if (source == overlayItem \|\| source == overlayButton)
1707	2061	{
1708	2062	/*
1709	2063	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1751,7 +2105,7 @@
1751	2105	s.setup();
1752	2106	makeSomething(s);
1753	2107	} else
1754		- if (source == lightItem)
	2108	+ if (source == lightItem \|\| source == lightButton)
1755	2109	{
1756	2110	makeSomething(new Light());
1757	2111	} else
..	..	@@ -1801,30 +2155,30 @@
1801	2155
1802	2156	group(g);
1803	2157	} else
1804		- if (source == loopItem)
	2158	+ if (source == loopItem \|\| source == loopButton)
1805	2159	{
1806	2160	Composite csg = new GroupLeaf();
1807	2161	csg.count = 5;
1808	2162	group(csg);
1809		- Composite child = new cGroup();
	2163	+ Composite child = new cGroup("Branch");
1810	2164	csg.addChild(child);
1811	2165	child.addChild(csg);
1812	2166	} else
1813	2167	if (source == doubleItem)
1814	2168	{
1815		- Composite csg = new GroupLeaf();
	2169	+ Composite csg = new GroupLeaf("Fork");
1816	2170	csg.count = 5;
1817	2171	group(csg);
1818		- Composite child = new cGroup();
	2172	+ Composite child = new cGroup("Branch A");
1819	2173	csg.addChild(child);
1820	2174	child.addChild(csg);
1821		- child = new cGroup();
	2175	+ child = new cGroup("Branch B");
1822	2176	csg.addChild(child);
1823	2177	child.addChild(csg);
1824	2178	} else
1825	2179	if (source == tripleItem)
1826	2180	{
1827		- Composite csg = new GroupLeaf();
	2181	+ Composite csg = new GroupLeaf("Trident");
1828	2182	csg.count = 4;
1829	2183	group(csg);
1830	2184	Composite child = new cGroup();
..	..	@@ -1836,23 +2190,6 @@
1836	2190	child = new cGroup();
1837	2191	csg.addChild(child);
1838	2192	child.addChild(csg);
1839		- } else
1840		-
1841		- if (source == importGFDItem)
1842		- {
1843		- ImportGFD();
1844		- } else
1845		- if (source == importVRMLX3DItem)
1846		- {
1847		- ImportVRMLX3D();
1848		- } else
1849		- if (source == import3DSItem)
1850		- {
1851		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1852		- } else
1853		- if (source == importOBJItem)
1854		- {
1855		- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1856	2193	} else
1857	2194	if (source == computeAOItem)
1858	2195	{
..	..	@@ -1872,7 +2209,7 @@
1872	2209	if (source == invariantsItem)
1873	2210	{
1874	2211	System.out.println("Invariants:");
1875		- GrafreeD.grafreeD.universe.invariants();
	2212	+ Grafreed.grafreeD.universe.invariants();
1876	2213	} else
1877	2214	if (source == memoryItem)
1878	2215	{
..	..	@@ -1891,6 +2228,46 @@
1891	2228	{
1892	2229	DumpObject();
1893	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
1894	2271	if (source == oneStepButton)
1895	2272	{
1896	2273	Globals.ONESTEP = true;
..	..	@@ -1898,17 +2275,14 @@
1898	2275	} else
1899	2276	if (source == screenfitButton)
1900	2277	{
1901		- //Reload(lastConverter, lastFilename, true);
1902	2278	ScreenFit();
1903	2279	} else
1904	2280	if (source == screenfitpointButton)
1905	2281	{
1906		- //Reload(lastConverter, lastFilename, true);
1907	2282	ScreenFitPoint();
1908	2283	} else
1909	2284	if (source == snapobjectButton)
1910	2285	{
1911		- //Reload(lastConverter, lastFilename, true);
1912	2286	SnapObject();
1913	2287	} else
1914	2288	// if (event.getSource() == recompileButton)
..	..	@@ -1945,12 +2319,20 @@
1945	2319	{
1946	2320	loadClipboard(true);
1947	2321	} else
	2322	+ if (source == undoItem)
	2323	+ {
	2324	+ Undo();
	2325	+ } else
	2326	+ if (source == redoItem)
	2327	+ {
	2328	+ Redo();
	2329	+ } else
1948	2330	if (source == duplicateItem)
1949	2331	{
1950		- Object3D keep = GrafreeD.clipboard;
	2332	+ Object3D keep = Grafreed.clipboard;
1951	2333	loadClipboard(false);
1952	2334	paste(false);
1953		- GrafreeD.clipboard = keep;
	2335	+ Grafreed.clipboard = keep;
1954	2336	} else
1955	2337	if (source == cloneItem)
1956	2338	{
..	..	@@ -2170,9 +2552,9 @@
2170	2552	// group.selection.get(0).setMasterThis(content); // should be identity
2171	2553	// refreshContents();
2172	2554	// }
2173		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2555	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2174	2556	{
2175		- Object3D content = GrafreeD.clipboard.get(0);
	2557	+ Object3D content = Grafreed.clipboard.get(0);
2176	2558
2177	2559	if (content instanceof cGroup && ((cGroup)content).transientlink )
2178	2560	content = ((cGroup)content).get(0);
..	..	@@ -2222,9 +2604,9 @@
2222	2604	} else
2223	2605	if (source == setMasterItem)
2224	2606	{
2225		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	2607	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2226	2608	{
2227		- Object3D content = GrafreeD.clipboard.get(0);
	2609	+ Object3D content = Grafreed.clipboard.get(0);
2228	2610
2229	2611	if (content instanceof cGroup && ((cGroup)content).transientlink )
2230	2612	content = ((cGroup)content).get(0);
..	..	@@ -2237,9 +2619,9 @@
2237	2619	{
2238	2620	if (group.selection.size() == 1)
2239	2621	{
2240		- if (GrafreeD.clipboard.size() == 1)
	2622	+ if (Grafreed.clipboard.size() == 1)
2241	2623	{
2242		- Object3D content = GrafreeD.clipboard.get(0);
	2624	+ Object3D content = Grafreed.clipboard.get(0);
2243	2625
2244	2626	if (content instanceof cGroup && ((cGroup)content).transientlink )
2245	2627	content = ((cGroup)content).get(0);
..	..	@@ -2256,7 +2638,7 @@
2256	2638	{
2257	2639	RevertMeshes();
2258	2640	} else
2259		- if (source == resetMeshItem)
	2641	+ if (source == resetAllItem)
2260	2642	{
2261	2643	ResetAll();
2262	2644	} else
..	..	@@ -2276,9 +2658,9 @@
2276	2658	{
2277	2659	ClearSelection(true);
2278	2660	} else
2279		- if (source == grabItem)
	2661	+ if (source == grabItem \|\| source == groupButton)
2280	2662	{
2281		- group(new cGroup(), true);
	2663	+ group(new cGroup(), false); // true);
2282	2664	} else
2283	2665	if (source == hideItem)
2284	2666	{
..	..	@@ -2296,11 +2678,11 @@
2296	2678	{
2297	2679	makeSomething(new Camera());
2298	2680	} else
2299		- if (source == compositeItem)
	2681	+ if (source == compositeItem \|\| source == compositeButton)
2300	2682	{
2301	2683	group(new Composite());
2302	2684	} else
2303		- if (source == randomItem)
	2685	+ if (source == switchItem \|\| source == switchButton)
2304	2686	{
2305	2687	RandomNode random = new RandomNode();
2306	2688	group(random);
..	..	@@ -2402,7 +2784,7 @@
2402	2784	{
2403	2785	group(new cLinker());
2404	2786	} else
2405		- if (source == textureItem)
	2787	+ if (source == textureItem \|\| source == textureButton)
2406	2788	{
2407	2789	group(new TextureNode());
2408	2790	} else
..	..	@@ -2422,17 +2804,30 @@
2422	2804	{
2423	2805	CastShadow(2);
2424	2806	} else
2425		- if (source == ungroupItem)
	2807	+ if (source == ungroupItem \|\| source == ungroupButton)
2426	2808	{
2427		- //ungroup();
	2809	+ boolean hasRoot = false;
	2810	+
2428	2811	for (int i=0; i<group.selection.size(); i++)
2429	2812	{
2430		- Ungroup(group.selection.get(i));
	2813	+ if (group.selection.get(i) == group)
	2814	+ {
	2815	+ hasRoot = true;
	2816	+ break;
	2817	+ }
2431	2818	}
2432	2819
2433		- ClearSelection(false);
2434		-
2435		- 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	+ }
2436	2831	} else
2437	2832	if (source == genUVItem)
2438	2833	{
..	..	@@ -2444,7 +2839,7 @@
2444	2839	} else
2445	2840	if (source == genNormalsMESHItem)
2446	2841	{
2447		- GenNormals(true); // TODO
	2842	+ GenNormalsMESH();
2448	2843	} else
2449	2844	if (source == genNormalsORGANItem)
2450	2845	{
..	..	@@ -2509,6 +2904,22 @@
2509	2904	if (source == unmarkleavesItem)
2510	2905	{
2511	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);
2512	2923	} else
2513	2924	if (source == flipVItem)
2514	2925	{
..	..	@@ -2594,9 +3005,13 @@
2594	3005	{
2595	3006	SmoothMesh();
2596	3007	} else
2597		- if (source == transformgeometryItem)
	3008	+ if (source == transformGeometryItem)
2598	3009	{
2599	3010	TransformGeometry();
	3011	+ } else
	3012	+ if (source == transformChildrenItem)
	3013	+ {
	3014	+ TransformChildren();
2600	3015	} else
2601	3016	if (source == resetTransformItem)
2602	3017	{
..	..	@@ -2604,7 +3019,11 @@
2604	3019	} else
2605	3020	if (source == resetCentroidItem)
2606	3021	{
2607		- ResetCentroid();
	3022	+ ResetCentroid(true);
	3023	+ } else
	3024	+ if (source == resetCentroidXZItem)
	3025	+ {
	3026	+ ResetCentroid(false);
2608	3027	} else
2609	3028	if (source == resetParentItem)
2610	3029	{
..	..	@@ -2736,6 +3155,10 @@
2736	3155	if (source == twoButton)
2737	3156	{
2738	3157	radio.layout = twoButton;
	3158	+
	3159	+ if (CameraPane.FULLSCREEN)
	3160	+ fullscreenLayout = radio.layout;
	3161	+
2739	3162	// bug
2740	3163	//gridPanel.setDividerLocation(1.0);
2741	3164	//bigPanel.setDividerLocation(0.0);
..	..	@@ -2768,10 +3191,31 @@
2768	3191	bigThree.ClearUI();
2769	3192	bigThree.add(centralPanel);
2770	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	+
2771	3212	} else
2772	3213	if (source == threeButton)
2773	3214	{
2774	3215	radio.layout = threeButton;
	3216	+
	3217	+ if (CameraPane.FULLSCREEN)
	3218	+ fullscreenLayout = radio.layout;
2775	3219
2776	3220	// bigThree.remove(scenePanel);
2777	3221	// bigThree.remove(centralPanel);
..	..	@@ -2804,10 +3248,15 @@
2804	3248	bigThree.add(centralPanel);
2805	3249	bigThree.add(XYZPanel);
2806	3250	bigThree.FlushUI();
	3251	+
	3252	+ cameraView.requestFocusInWindow();
2807	3253	} else
2808	3254	if (source == fourButton)
2809	3255	{
2810	3256	radio.layout = fourButton;
	3257	+
	3258	+ if (CameraPane.FULLSCREEN)
	3259	+ fullscreenLayout = radio.layout;
2811	3260
2812	3261	// bigThree.remove(scenePanel);
2813	3262	// bigThree.remove(centralPanel);
..	..	@@ -2839,10 +3288,15 @@
2839	3288	bigThree.ClearUI();
2840	3289	bigThree.add(scenePanel);
2841	3290	bigThree.FlushUI();
	3291	+
	3292	+ cameraView.requestFocusInWindow();
2842	3293	} else
2843	3294	if (source == sixButton)
2844	3295	{
2845	3296	radio.layout = sixButton;
	3297	+
	3298	+ if (CameraPane.FULLSCREEN)
	3299	+ fullscreenLayout = radio.layout;
2846	3300
2847	3301	// bigThree.remove(scenePanel);
2848	3302	// bigThree.remove(centralPanel);
..	..	@@ -2875,10 +3329,15 @@
2875	3329	bigThree.add(scenePanel);
2876	3330	bigThree.add(centralPanel);
2877	3331	bigThree.FlushUI();
	3332	+
	3333	+ cameraView.requestFocusInWindow();
2878	3334	} else
2879	3335	if (source == sevenButton)
2880	3336	{
2881	3337	radio.layout = sevenButton;
	3338	+
	3339	+ if (CameraPane.FULLSCREEN)
	3340	+ fullscreenLayout = radio.layout;
2882	3341
2883	3342	// bigThree.remove(scenePanel);
2884	3343	// bigThree.remove(centralPanel);
..	..	@@ -2912,6 +3371,8 @@
2912	3371	bigThree.add(centralPanel);
2913	3372	bigThree.add(XYZPanel);
2914	3373	bigThree.FlushUI();
	3374	+
	3375	+ cameraView.requestFocusInWindow();
2915	3376	} else
2916	3377	if (source == rootButton)
2917	3378	{
..	..	@@ -2923,6 +3384,7 @@
2923	3384	EditObject(obj);
2924	3385	}
2925	3386
	3387	+ cameraView.requestFocusInWindow();
2926	3388	refreshContents(true);
2927	3389	} else
2928	3390	if (source == closeButton)
..	..	@@ -2932,22 +3394,37 @@
2932	3394	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2933	3395	{
2934	3396	ab = (cRadio)e.nextElement();
2935		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3397	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2936	3398	{
	3399	+ // Patch to avoid bug with transparency.
	3400	+ if (!ab.hadMaterial)
	3401	+ {
	3402	+ ab.object.material = null;
	3403	+ }
	3404	+
2937	3405	buttonGroup.remove(ab);
2938	3406	radioPanel.remove(ab);
2939	3407
2940		- ab.GetObject().editWindow = null;
	3408	+ //ab.GetObject().editWindow = null;
	3409	+ ab.GetObject().manipWindow = null;
2941	3410	// ab.GetObject().objectUI = null; // ?????????
2942	3411
2943	3412	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2944	3413	break;
2945	3414	}
2946	3415	}
	3416	+
	3417	+ cameraView.requestFocusInWindow();
2947	3418	refreshContents(true);
2948	3419	} else
2949	3420	if (source == editItem \|\| source == editButton)
2950	3421	{
	3422	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3423	+ {
	3424	+ Object3D child = (Object3D)e.nextElement();
	3425	+ child.pinned = true;
	3426	+ }
	3427	+
2951	3428	EditSelection(false);
2952	3429	} else
2953	3430	if (source == uneditButton)
..	..	@@ -2957,10 +3434,11 @@
2957	3434	Object3D child = (Object3D)e.nextElement();
2958	3435	if(child.editWindow != null)
2959	3436	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3437	+ child.pinned = false;
2960	3438	child.CloseUI();
2961	3439	listUI.remove(child);
2962	3440
2963		- child.editWindow = null; // ???????????
	3441	+ //child.editWindow = null; // ???????????
2964	3442	}
2965	3443	objEditor.ctrlPanel.FlushUI();
2966	3444	//objEditor.jTree.clearSelection();
..	..	@@ -2973,6 +3451,7 @@
2973	3451	//copy.ClearUI();
2974	3452	for (Object3D obj : listUI)
2975	3453	{
	3454	+ obj.pinned = false;
2976	3455	obj.CloseUI();
2977	3456	}
2978	3457	listUI.clear();
..	..	@@ -2982,7 +3461,7 @@
2982	3461	{
2983	3462	assert(copy == group);
2984	3463
2985		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3464	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2986	3465
2987	3466	for (Object3D obj : listUI)
2988	3467	{
..	..	@@ -3031,6 +3510,9 @@
3031	3510	}
3032	3511
3033	3512	copy = group;
	3513	+
	3514	+ SetUndoStates();
	3515	+
3034	3516	//Globals.theRenderer.object = group;
3035	3517	if(!useclient)
3036	3518	{
..	..	@@ -3046,20 +3528,44 @@
3046	3528	frontView.object = group;
3047	3529	sideView.object = group;
3048	3530	}
3049		- group.editWindow = this;
	3531	+
	3532	+// fix "+" issue
	3533	+ //group.editWindow = this;
	3534	+ group.manipWindow = this;
	3535	+
3050	3536	/*
3051	3537	currentLayout = radio.layout;
3052	3538	if (currentLayout == null)
3053	3539	currentLayout = sevenButton;
3054	3540	*/
3055	3541	radio.layout.doClick();
	3542	+
	3543	+ ClearUnpinned();
	3544	+ SetPinStates(group.selection.size() > 0);
	3545	+ if (group.selection.size() == 1)
	3546	+ EditSelection(false);
3056	3547	keepparent = group.parent;
3057	3548	// PARENT = NULL or not???
3058	3549	//group.parent = null; // ROOT
3059	3550	//group.attributes = -1;
3060	3551	ResetModel();
	3552	+
	3553	+ cameraView.requestFocusInWindow();
3061	3554	refreshContents(true);
3062		- }
	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	+ }
3063	3569	else
3064	3570	{
3065	3571	//return super.action(event, arg);
..	..	@@ -3068,7 +3574,6 @@
3068	3574	}
3069	3575
3070	3576	boolean useclient = false;
3071		- cRadio radio;
3072	3577
3073	3578	void ToggleRoot()
3074	3579	{
..	..	@@ -3120,6 +3625,28 @@
3120	3625	refreshContents();
3121	3626	}
3122	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	+ }
3123	3650
3124	3651	void ResetTransform()
3125	3652	{
..	..	@@ -3232,7 +3759,7 @@
3232	3759	refreshContents();
3233	3760	}
3234	3761
3235		- void ResetCentroid()
	3762	+ void ResetCentroid(boolean full)
3236	3763	{
3237	3764	Object3D obj;
3238	3765	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3247,12 +3774,16 @@
3247	3774	LA.matIdentity(Object3D.mat);
3248	3775	obj.getBounds(minima, maxima, false);
3249	3776	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3250		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	3777	+ if (full)
	3778	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3251	3779	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3252	3780	obj.TransformMesh(Object3D.mat);
	3781	+
3253	3782	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3254		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	3783	+ if (full)
	3784	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3255	3785	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	3786	+
3256	3787	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3257	3788	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3258	3789	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3281,7 +3812,8 @@
3281	3812
3282	3813	int size = obj.MemorySize();
3283	3814
3284		- 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)");
3285	3817	}
3286	3818	}
3287	3819	catch (Exception e)
..	..	@@ -3318,9 +3850,9 @@
3318	3850	obj = (Object3D)e.nextElement();
3319	3851
3320	3852	System.out.println("Object is: " + obj);
3321		- GrafreeD.AnalyzeObject(obj);
	3853	+ Grafreed.AnalyzeObject(obj);
3322	3854	System.out.println("Boundary rep: " + obj.bRep);
3323		- GrafreeD.AnalyzeObject(obj.bRep);
	3855	+ Grafreed.AnalyzeObject(obj.bRep);
3324	3856
3325	3857	// System.err.println((size/1024) + " KB is the size of " + obj);
3326	3858	}
..	..	@@ -3362,6 +3894,13 @@
3362	3894	void GenNormals(boolean crease)
3363	3895	{
3364	3896	group.GenNormalsS(crease);
	3897	+
	3898	+ refreshContents();
	3899	+ }
	3900	+
	3901	+ void GenNormalsMESH()
	3902	+ {
	3903	+ group.GenNormalsMeshS();
3365	3904
3366	3905	refreshContents();
3367	3906	}
..	..	@@ -3534,8 +4073,8 @@
3534	4073
3535	4074	void ParseVertices()
3536	4075	{
3537		- boolean epsequal = GrafreeD.epsequal;
3538		- GrafreeD.epsequal = true;
	4076	+ boolean epsequal = Grafreed.epsequal;
	4077	+ Grafreed.epsequal = true;
3539	4078
3540	4079	for (int i=0; i<group.selection.size(); i++)
3541	4080	{
..	..	@@ -3560,7 +4099,7 @@
3560	4099	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3561	4100	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3562	4101
3563		- g.add(GrafreeD.clipboard);
	4102	+ g.add(Grafreed.clipboard);
3564	4103
3565	4104	buffer.add(g);
3566	4105	}
..	..	@@ -3575,7 +4114,7 @@
3575	4114	makeSomething(buffer, i==group.selection.size()-1);
3576	4115	}
3577	4116
3578		- GrafreeD.epsequal = epsequal;
	4117	+ Grafreed.epsequal = epsequal;
3579	4118
3580	4119	refreshContents();
3581	4120	}
..	..	@@ -3593,7 +4132,16 @@
3593	4132	String pigment = Object3D.GetPigment(tex);
3594	4133	//String bump = Object3D.GetBump(tex);
3595	4134
3596		- 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	+ }
3597	4145
3598	4146	double s = v.s;
3599	4147
..	..	@@ -3725,7 +4273,7 @@
3725	4273	return;
3726	4274
3727	4275	Object3D poses = group.selection.get(0);
3728		- Object3D ref = GrafreeD.clipboard.get(0);
	4276	+ Object3D ref = Grafreed.clipboard.get(0);
3729	4277
3730	4278	Object3D newgroup = new Object3D("Po:" + poses.name);
3731	4279
..	..	@@ -3919,9 +4467,9 @@
3919	4467
3920	4468	void ClipMesh()
3921	4469	{
3922		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	4470	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3923	4471	{
3924		- Object3D content = GrafreeD.clipboard.get(0);
	4472	+ Object3D content = Grafreed.clipboard.get(0);
3925	4473
3926	4474	if (content instanceof cGroup && ((cGroup)content).transientlink )
3927	4475	content = ((cGroup)content).get(0);
..	..	@@ -3930,7 +4478,7 @@
3930	4478	// {
3931	4479	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3932	4480	// }
3933		- group.selection.ClipMesh(GrafreeD.clipboard);
	4481	+ group.selection.ClipMesh(Grafreed.clipboard);
3934	4482	}
3935	4483	// group.selection.ClipMesh(GrafreeD.clipboard);
3936	4484	System.out.println("DONE.");
..	..	@@ -3977,6 +4525,18 @@
3977	4525	void MarkLeaves(boolean hide)
3978	4526	{
3979	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);
3980	4540	refreshContents();
3981	4541	}
3982	4542
..	..	@@ -4051,10 +4611,6 @@
4051	4611	// }
4052	4612	// }
4053	4613
4054		- static boolean allparams = true;
4055		-
4056		- static Vector<Object3D> listUI = new Vector<Object3D>();
4057		-
4058	4614	void EditSelection(boolean newWindow)
4059	4615	{
4060	4616	// aConstraints.gridy = 0;
..	..	@@ -4062,10 +4618,10 @@
4062	4618	{
4063	4619	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4064	4620	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4065		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4621	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4066	4622
4067	4623	Object3D elem = (Object3D)group.selection.elementAt(i);
4068		- if(elem != group)
	4624	+ if(elem != group \|\| !newWindow)
4069	4625	{
4070	4626	// if (!(elem instanceof Composite))
4071	4627	// newWindow = false;
..	..	@@ -4147,7 +4703,8 @@
4147	4703	//new Exception().printStackTrace();
4148	4704
4149	4705	freezemodel = true;
4150		-
	4706	+ ClearUnpinned();
	4707	+
4151	4708	/**/
4152	4709	//switch (event.id)
4153	4710	{
..	..	@@ -4155,7 +4712,6 @@
4155	4712	//case 702: // Event.LIST_DESELECT
4156	4713	group.deselectAll();
4157	4714	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4158		- objEditor.ClearInfo(); // .GetMaterial());
4159	4715	if (tps != null)
4160	4716	{
4161	4717	for (int i=0; i < tps.length; i++)
..	..	@@ -4164,10 +4720,8 @@
4164	4720
4165	4721	//if (child.parent != null)
4166	4722	//child.parent.addSelectee(child);
	4723	+ objEditor.SetMaterial(child);
4167	4724	group.addSelectee(child);
4168		- objEditor.SetMaterial(child); // .GetMaterial());
4169		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4170		- System.err.println("info : " + child.GetPath());
4171	4725	}
4172	4726	}
4173	4727	// else
..	..	@@ -4177,20 +4731,28 @@
4177	4731	// System.err.println("info : " + group.GetPath());
4178	4732	// }
4179	4733
4180		- objEditor.SetText(); // jan 2014
4181		-
4182		- 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))
4183	4735	CameraPane.flash = true;
4184	4736
4185		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4737	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4186	4738	// a camera
4187	4739	{
4188		- CameraPane.camerachangeframe = 0; // don't refuse it
4189		- 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	+ }
4190	4745	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4191	4746	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4192	4747	}
4193	4748
	4749	+ if (tps != null && tps.length == 1)
	4750	+ {
	4751	+ EditSelection(false);
	4752	+ }
	4753	+
	4754	+ SetPinStates(tps != null && tps.length > 0);
	4755	+
4194	4756	refreshContents();
4195	4757	//return true;
4196	4758	}
..	..	@@ -4199,6 +4761,35 @@
4199	4761
4200	4762	freezemodel = false;
4201	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	+ }
4202	4793
4203	4794	void linkSomething(Object3D thing)
4204	4795	{
..	..	@@ -4270,16 +4861,19 @@
4270	4861	{
4271	4862	if (group.selection.isEmpty())
4272	4863	return;
4273		- GrafreeD.clipboardIsTempGroup = false;
	4864	+
	4865	+ Grafreed.clipboardIsTempGroup = false;
4274	4866	Composite tGroup = null;
4275	4867	if (group.selection.size() > 0) // 1)
4276	4868	{
4277	4869	tGroup = new cGroup();
4278		- GrafreeD.clipboardIsTempGroup = true;
	4870	+ Grafreed.clipboardIsTempGroup = true;
4279	4871	}
4280	4872
4281	4873	if (cut)
4282	4874	{
	4875	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	4876	+// Save();
4283	4877	//int indices[] = jList.getSelectedIndices();
4284	4878	//for (int i = indices.length - 1; i >= 0; i--)
4285	4879	//jList.remove(indices[i]);
..	..	@@ -4315,16 +4909,16 @@
4315	4909	//System.out.println("cut " + child);
4316	4910	//System.out.println("parent = " + child.parent);
4317	4911	// tmp.addChild(child);
4318		- if (GrafreeD.clipboardIsTempGroup)
	4912	+ if (Grafreed.clipboardIsTempGroup)
4319	4913	tGroup.add/Child/(tmp);
4320	4914	else
4321		- GrafreeD.clipboard = tmp;
	4915	+ Grafreed.clipboard = tmp;
4322	4916	}
4323	4917	else
4324		- if (GrafreeD.clipboardIsTempGroup)
	4918	+ if (Grafreed.clipboardIsTempGroup)
4325	4919	tGroup.add/Child/(child);
4326	4920	else
4327		- GrafreeD.clipboard = child;
	4921	+ Grafreed.clipboard = child;
4328	4922	}
4329	4923
4330	4924	//ResetModel();
..	..	@@ -4356,21 +4950,23 @@
4356	4950	//System.out.println("cut " + elem);
4357	4951	//System.out.println("parent = " + elem.parent);
4358	4952	// tmp.addChild(elem);
4359		- if (GrafreeD.clipboardIsTempGroup)
	4953	+ if (Grafreed.clipboardIsTempGroup)
4360	4954	tGroup.add/Child/(tmp);
4361	4955	else
4362		- GrafreeD.clipboard = tmp;
	4956	+ Grafreed.clipboard = tmp;
4363	4957	}
4364	4958	else
4365		- if (GrafreeD.clipboardIsTempGroup)
	4959	+ if (Grafreed.clipboardIsTempGroup)
4366	4960	tGroup.add/Child/(child);
4367	4961	else
4368		- GrafreeD.clipboard = child;
	4962	+ Grafreed.clipboard = child;
4369	4963	}
4370	4964
4371	4965	}
4372		- if (GrafreeD.clipboardIsTempGroup)
4373		- GrafreeD.clipboard = tGroup;
	4966	+
	4967	+ if (Grafreed.clipboardIsTempGroup)
	4968	+ Grafreed.clipboard = tGroup;
	4969	+
4374	4970	if (cut)
4375	4971	{
4376	4972	ResetModel();
..	..	@@ -4380,11 +4976,15 @@
4380	4976
4381	4977	void paste(boolean expand)
4382	4978	{
	4979	+ if (Globals.REPLACEONMAKE)
	4980	+ Save();
	4981	+ boolean keep = Globals.REPLACEONMAKE;
	4982	+ Globals.REPLACEONMAKE = false;
4383	4983	// if (GrafreeD.clipboard == null)
4384	4984	// return;
4385	4985	boolean first = true;
4386	4986
4387		- if (GrafreeD.clipboardIsTempGroup)
	4987	+ if (Grafreed.clipboardIsTempGroup)
4388	4988	{
4389	4989	Composite temp;
4390	4990
..	..	@@ -4395,7 +4995,7 @@
4395	4995	temp = (Composite)Applet3D.clipboard.deepCopy();
4396	4996	*/
4397	4997	Object3D elem;
4398		- 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))
4399	4999	{
4400	5000	Object3D child = (Object3D)e.nextElement();
4401	5001
..	..	@@ -4429,16 +5029,17 @@
4429	5029	//Object3D cb = Applet3D.clipboard;
4430	5030	//temp.addChild(cb);
4431	5031	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4432		- assert(GrafreeD.clipboard.parent == null);
4433		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
4434		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4435		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4436		- 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());
4437	5037	else
4438		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4439		- GrafreeD.clipboard.get(0).parent = keepparent;
	5038	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	5039	+ Grafreed.clipboard.get(0).parent = keepparent;
4440	5040	}
4441	5041
	5042	+ Globals.REPLACEONMAKE = keep;
4442	5043	ResetModel();
4443	5044	refreshContents();
4444	5045	}
..	..	@@ -4485,9 +5086,9 @@
4485	5086	{
4486	5087	boolean first = true;
4487	5088
4488		- if (GrafreeD.clipboardIsTempGroup)
	5089	+ if (Grafreed.clipboardIsTempGroup)
4489	5090	{
4490		- Composite temp = (Composite)GrafreeD.clipboard;
	5091	+ Composite temp = (Composite)Grafreed.clipboard;
4491	5092	Object3D copy;
4492	5093	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4493	5094	{
..	..	@@ -4497,7 +5098,7 @@
4497	5098	}
4498	5099	} else
4499	5100	{
4500		- linkSomething(GrafreeD.clipboard); //.get(0));
	5101	+ linkSomething(Grafreed.clipboard); //.get(0));
4501	5102	}
4502	5103	}
4503	5104	}
..	..	@@ -4574,6 +5175,10 @@
4574	5175
4575	5176	void group(Object3D csg, boolean grab)
4576	5177	{
	5178	+ if (Globals.REPLACEONMAKE)
	5179	+ Save();
	5180	+ boolean keep = Globals.REPLACEONMAKE;
	5181	+ Globals.REPLACEONMAKE = false;
4577	5182	if (//false) // why??
4578	5183	!group.selection.isEmpty())
4579	5184	{
..	..	@@ -4687,10 +5292,15 @@
4687	5292	//node.add(csg);
4688	5293	//makeSomething(node);
4689	5294	makeSomething(csg);
	5295	+ Globals.REPLACEONMAKE = keep;
4690	5296	}
4691	5297
4692	5298	void Ungroup(Object3D g)
4693	5299	{
	5300	+ if (Globals.REPLACEONMAKE)
	5301	+ Save();
	5302	+ boolean keep = Globals.REPLACEONMAKE;
	5303	+ Globals.REPLACEONMAKE = false;
4694	5304	if (g instanceof HiddenObject)
4695	5305	{
4696	5306	HiddenObject h = (HiddenObject) g;
..	..	@@ -4707,6 +5317,7 @@
4707	5317	objEditor.makeSomething(g.get(i), false);
4708	5318	}
4709	5319	}
	5320	+ Globals.REPLACEONMAKE = keep;
4710	5321	}
4711	5322
4712	5323	void ungroup()
..	..	@@ -4902,21 +5513,6 @@
4902	5513	}
4903	5514	*/
4904	5515
4905		- void ImportGFD()
4906		- {
4907		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4908		- browser.show();
4909		- String filename = browser.getFile();
4910		- if (filename != null && filename.length() > 0)
4911		- {
4912		- String fullname = browser.getDirectory() + filename;
4913		-
4914		- //Object3D readobj =
4915		- objEditor.ReadGFD(fullname, objEditor);
4916		- //makeSomething(readobj);
4917		- }
4918		- }
4919		-
4920	5516	/*
4921	5517	public void Callback(Object obj)
4922	5518	{
..	..	@@ -4940,26 +5536,9 @@
4940	5536	}
4941	5537	*/
4942	5538
4943		- void ImportVRMLX3D()
4944		- {
4945		- if (GrafreeD.standAlone)
4946		- {
4947		- /**/
4948		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4949		- browser.show();
4950		- String filename = browser.getFile();
4951		- if (filename != null && filename.length() > 0)
4952		- {
4953		- String fullname = browser.getDirectory() + filename;
4954		- LoadVRMLX3D(fullname);
4955		- }
4956		- /**/
4957		- }
4958		- }
4959		-
4960	5539	String GetFile(String dialogName)
4961	5540	{
4962		- if (GrafreeD.standAlone)
	5541	+ if (Grafreed.standAlone)
4963	5542	{
4964	5543	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4965	5544	browser.show();
..	..	@@ -5027,7 +5606,28 @@
5027	5606	cButton clearpanelButton;
5028	5607	cButton unselectButton;
5029	5608
	5609	+ cButton restoreCameraButton;
	5610	+
	5611	+ cButton saveButton;
5030	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;
5031	5631
5032	5632	cButton screenfitButton;
5033	5633	cButton screenfitpointButton;
..	..	@@ -5040,14 +5640,6 @@
5040	5640
5041	5641	cButton setsupportButton;
5042	5642
5043		- cButton twoButton;
5044		- cButton sixButton;
5045		- cButton threeButton;
5046		- cButton sevenButton;
5047		- cButton fourButton; // full panel
5048		- cButton oneButton; // full XYZ
5049		- //cButton currentLayout;
5050		-
5051	5643	//
5052	5644	//Composite
5053	5645	Object3D // to do !!
..	..	@@ -5057,9 +5649,11 @@
5057	5649	//JTree jTree;
5058	5650	private MenuItem lookAtItem;
5059	5651	private MenuItem lookFromItem;
5060		- private MenuItem switchItem;
	5652	+ private MenuItem switchViewItem;
5061	5653	private MenuItem cutItem;
5062		- private MenuItem duplicateItem;
	5654	+ private MenuItem undoItem;
	5655	+ private MenuItem redoItem;
	5656	+ private JMenuItem duplicateItem;
5063	5657	private MenuItem cloneItem;
5064	5658	private MenuItem cloneSupportItem;
5065	5659	private MenuItem overwriteGeoItem;
..	..	@@ -5072,7 +5666,7 @@
5072	5666	private MenuItem linkverticesItem;
5073	5667	private MenuItem relinkverticesItem;
5074	5668	private MenuItem setMasterItem;
5075		- private MenuItem resetMeshItem;
	5669	+ private MenuItem resetAllItem;
5076	5670	private MenuItem stepAllItem;
5077	5671	private MenuItem revertMeshItem;
5078	5672	private MenuItem poseMeshItem;
..	..	@@ -5122,6 +5716,10 @@
5122	5716	private MenuItem showleavesItem;
5123	5717	private MenuItem markleavesItem;
5124	5718	private MenuItem unmarkleavesItem;
	5719	+ private MenuItem rewindleavesItem;
	5720	+ private MenuItem unrewindleavesItem;
	5721	+ private MenuItem randomleavesItem;
	5722	+ private MenuItem unrandomleavesItem;
5125	5723
5126	5724	private MenuItem flipVItem;
5127	5725	private MenuItem unflipVItem;
..	..	@@ -5133,15 +5731,17 @@
5133	5731	private MenuItem panoTexturesItem;
5134	5732
5135	5733	private MenuItem resetCentroidItem;
5136		- private MenuItem transformgeometryItem;
	5734	+ private MenuItem resetCentroidXZItem;
5137	5735	private MenuItem resetTransformItem;
	5736	+ private MenuItem transformGeometryItem;
	5737	+ private MenuItem transformChildrenItem;
5138	5738	private MenuItem hideItem;
5139	5739	private MenuItem grabItem;
5140	5740	private MenuItem backItem;
5141	5741	private MenuItem frontItem;
5142	5742	private MenuItem cameraItem;
5143	5743	private MenuItem compositeItem;
5144		- private MenuItem randomItem;
	5744	+ private MenuItem switchItem;
5145	5745	private MenuItem physicsItem;
5146	5746	private MenuItem frameselectorItem;
5147	5747	private MenuItem scriptNodeItem;
..	..	@@ -5203,11 +5803,6 @@
5203	5803	private MenuItem doubleItem;
5204	5804	private MenuItem tripleItem;
5205	5805
5206		- private MenuItem importGFDItem;
5207		- private MenuItem importVRMLX3DItem;
5208		- private MenuItem import3DSItem;
5209		- private MenuItem importOBJItem;
5210		-
5211	5806	private MenuItem computeAOItem;
5212	5807	private MenuItem recompileItem;
5213	5808	private MenuItem editScriptItem;
..	..	@@ -5217,4 +5812,8 @@
5217	5812	private MenuItem analyzeItem;
5218	5813	private MenuItem dumpItem;
5219	5814	//boolean freezemodel = false;
	5815	+
	5816	+ Menu cameraMenu;
	5817	+ MenuItem editCameraItem;
	5818	+ MenuItem restoreCameraItem;
5220	5819	}