~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,6 +98,7 @@
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)
..	..	@@ -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"));
..	..	@@ -372,6 +457,10 @@
372	457	oe.menuBar.add(menu = new Menu("Attributes"));
373	458	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
374	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);
375	464	menu.add("-");
376	465	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
377	466	liveleavesItem.addActionListener(this);
..	..	@@ -392,6 +481,14 @@
392	481	markleavesItem.addActionListener(this);
393	482	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
394	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);
395	492	menu.add("-");
396	493	flipVItem = menu.add(new MenuItem("Flip V"));
397	494	flipVItem.addActionListener(this);
..	..	@@ -443,25 +540,25 @@
443	540	oe.menuBar.add(menu = new Menu("Insert"));
444	541	buildCreateMenu(menu);
445	542
446		- oe.menuBar.add(menu = new Menu("Include"));
447		- importOBJItem = menu.add(new MenuItem("OBJ file..."));
448		- importOBJItem.addActionListener(this);
449		- menu.add("-");
450		- import3DSItem = menu.add(new MenuItem("3DS file..."));
451		- import3DSItem.addActionListener(this);
452		- menu.add("-");
453		- importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
454		- importVRMLX3DItem.addActionListener(this);
455		- menu.add("-");
456		- importGFDItem = menu.add(new MenuItem("GrafreeD file..."));
457		- importGFDItem.addActionListener(this);
458		-
459	543	oe.menuBar.add(menu = new Menu("Tools"));
460	544	buildToolsMenu(menu);
461	545	}
462	546
	547	+
463	548	void SetupUI2(ObjEditor oe)
464	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	+
465	562	//new Exception().printStackTrace();
466	563
467	564	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -490,27 +587,79 @@
490	587	oe.radioPanel.add(dummyButton);
491	588	oe.buttonGroup.add(dummyButton);
492	589	*/
	590	+ cGridBag copyOptionsPanel = new cGridBag();
	591	+
	592	+ copyOptionsPanel.preferredHeight = 1;
	593	+
493	594	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
494	595
495		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
496		- 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");
497	648	liveCB.addItemListener(this);
498	649
499		- oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	650	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
500	651	oneStepButton.setToolTipText("Animate one step forward");
501	652	oneStepButton.addActionListener(this);
502	653
503		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	654	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
504	655	fastCB.setToolTipText("Fast mode");
505	656	fastCB.addItemListener(this);
506	657
507		- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
508		- trackCB.setToolTipText("Enable tracking");
509		- trackCB.addItemListener(this);
510		-
511		- oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
512		- screenfitButton.setToolTipText("Screen fit");
513		- 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);
514	663
515	664	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
516	665	// screenfitpointButton.addActionListener(this);
..	..	@@ -522,65 +671,145 @@
522	671	snapobjectButton.setToolTipText("Snap Object");
523	672	}
524	673
525		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
526		- flashSelectionButton.setToolTipText("Show selection");
527		- flashSelectionButton.addActionListener(this);
	674	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
528	675
529		- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
530		-
531		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	676	+ oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
532	677	twoButton.setToolTipText("Show center view only");
533	678	twoButton.addActionListener(this);
534		- 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);
535	682	fourButton.addActionListener(this);
536	683	fourButton.setToolTipText("Show left panel only");
537		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	684	+ oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
538	685	sixButton.setToolTipText("2-column layout left");
539	686	sixButton.addActionListener(this);
540		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	687	+ oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
541	688	threeButton.setToolTipText("2-column layout right");
542	689	threeButton.addActionListener(this);
543		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	690	+ oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
544	691	sevenButton.setToolTipText("3-column layout");
545	692	sevenButton.addActionListener(this);
546	693	//
547	694
548		- 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);
549	696	rootButton.setToolTipText("Edit selection in new tab");
550	697	rootButton.addActionListener(this);
551	698
552		- 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);
553	700	closeButton.setToolTipText("Close tab");
554	701	closeButton.addActionListener(this);
555	702	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
556	703	//clearButton.addActionListener(this);
557		-
558		- 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	+ }
559	736
560		- commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
561		- 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");
562	786	editButton.addActionListener(this);
563	787
564		- commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
565		- uneditButton.setToolTipText("Unedit selection");
	788	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	789	+ uneditButton.setToolTipText("Remove selection controls");
566	790	uneditButton.addActionListener(this);
567	791
568		- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
569		- allParamsButton.setToolTipText("Edit all params");
	792	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	793	+ allParamsButton.setToolTipText("Show all controle");
570	794	allParamsButton.addActionListener(this);
571	795
572		- commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	796	+ editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
573	797	clearPanelButton.setToolTipText("Clear edit panel");
574	798	clearPanelButton.addActionListener(this);
575	799
576		- commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	800	+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
577	801	unselectButton.setToolTipText("Unselect");
578	802	unselectButton.addActionListener(this);
579	803
580		- 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);
581	807
582		- oe.treePanel.add(commandsPanel);
583		- oe.treePanel.Return();
	808	+ editCommandsPanel.preferredHeight = 1;
	809	+
	810	+ SetPinStates(false);
	811	+// oe.treePanel.add(commandsPanel);
	812	+// oe.treePanel.Return();
584	813
585	814	// oe.aConstraints.gridx += 1;
586	815	// oe.aConstraints.weighty = 0;
..	..	@@ -597,29 +826,17 @@
597	826
598	827	JScrollPane jSP;
599	828	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
600		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	829	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
601	830	ResetModel();
602	831
603	832	oe.treePanel.add(jSPPanel);
604	833	oe.treePanel.Return();
605	834
606		- cGridBag copyOptionsPanel = new cGridBag();
607		-
608		- copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
609		- colorCB.setToolTipText("Copy color when dropped");
610		- colorCB.addItemListener(this);
611		-
612		- copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
613		- materialCB.setToolTipText("Copy material when dropped");
614		- materialCB.addItemListener(this);
615		-
616		- copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
617		- textureCB.setToolTipText("Copy texture when dropped");
618		- textureCB.addItemListener(this);
619		-
620		- copyOptionsPanel.preferredHeight = 1;
621	835	oe.treePanel.add(copyOptionsPanel);
622	836	oe.treePanel.Return();
	837	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 10, 0);
	838	+ versionField = (cNumberSlider)sliderPane.getComponent(1);
	839	+ sliderPane.preferredHeight = 1;
623	840
624	841	// mainPanel.setDividerLocation(0.5); //1.0);
625	842	// mainPanel.setResizeWeight(0.5);
..	..	@@ -648,23 +865,43 @@
648	865
649	866	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
650	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	+
651	882	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
652	883	boxCB.setToolTipText("Display bounding boxes");
653	884	boxCB.addItemListener(this);
654	885
655	886	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
656		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	887	+ zoomBoxCB.setToolTipText("Display only for wheel");
657	888	zoomBoxCB.addItemListener(this);
658	889
659	890	if (true) // Globals.ADVANCED)
660	891	{
661		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
662		- supportCB.setToolTipText("Enable rigging");
663		- 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);
664	899
665	900	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
666	901	// localCB.addItemListener(this);
667	902
	903	+ panel.Return();
	904	+
668	905	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
669	906	crowdCB.setToolTipText("Used for crowds");
670	907	crowdCB.addItemListener(this);
..	..	@@ -681,6 +918,8 @@
681	918	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
682	919	// speakerMocapCB.addItemListener(this);
683	920
	921	+ panel.Return();
	922	+
684	923	if (false)
685	924	{
686	925	// handled in scripts
..	..	@@ -695,32 +934,72 @@
695	934	//constraints.gridy += 1;
696	935	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
697	936	smoothfocusCB.addItemListener(this);
	937	+ panel.Return();
698	938	}
699	939
700	940	//constraints.gridx += 1;
701	941	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
702	942	// debugCB.addItemListener(this);
703	943
	944	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	945	+ trackCB.setToolTipText("Enable tracking target");
	946	+ trackCB.addItemListener(this);
	947	+
704	948	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	949	+ oeilCB.setToolTipText("Move camera when tracking");
705	950	oeilCB.addItemListener(this);
706	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	+ {
707	972	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
708	973	lookAtCB.setToolTipText("Look-at target");
709	974	lookAtCB.addItemListener(this);
	975	+ }
710	976
711	977	}
712	978
713	979	cGridBag fill = new cGridBag();
714		-
715	980	fill.preferredHeight = 200;
	981	+ cGridBag fill2 = new cGridBag();
	982	+ fill2.preferredHeight = 200;
	983	+ cGridBag fill3 = new cGridBag();
	984	+ fill3.preferredHeight = 200;
716	985
717	986	panel.add(fill);
	987	+ panel.add(fill2);
	988	+ panel.add(fill3);
718	989
719	990	}
720	991
721	992	void EditObject(Object3D obj)
722	993	{
723	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	+
724	1003	radioButton.SetObject(obj);
725	1004	radioButton.layout = sevenButton;
726	1005	radioButton.SetCamera(cameraView.renderCamera, false);
..	..	@@ -729,8 +1008,11 @@
729	1008	buttonGroup.add(radioButton);
730	1009	radioButton.doClick();
731	1010	}
	1011	+
732	1012	void SetupViews(ObjEditor oe)
733	1013	{
	1014	+ theFrame = this;
	1015	+
734	1016	oe.SetupViews();
735	1017
736	1018	System.out.println("SetupViews");
..	..	@@ -739,23 +1021,28 @@
739	1021	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
740	1022	}
741	1023
742		- JCheckBox liveCB;
743		- JCheckBox supportCB;
744		- JCheckBox localCB;
745		- JCheckBox crowdCB;
746		- JCheckBox smoothCB;
747		- JCheckBox fastCB;
748		- JCheckBox slowCB;
749		- JCheckBox boxCB;
750		- JCheckBox zoomBoxCB;
751		- JCheckBox trackCB;
752		- 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;
753	1037	// JCheckBox speakerMocapCB;
754		- JCheckBox speakerCameraCB;
755		- JCheckBox speakerFocusCB;
756		- JCheckBox debugCB;
757		- JCheckBox oeilCB;
758		- JCheckBox lookAtCB;
	1038	+ cCheckBox speakerCameraCB;
	1039	+ cCheckBox speakerFocusCB;
	1040	+ cCheckBox debugCB;
	1041	+
	1042	+ cCheckBox oeilCB;
	1043	+ cCheckBox shadowCB;
	1044	+ cCheckBox autokeepCB;
	1045	+ cCheckBox lookAtCB;
759	1046
760	1047	// static int COLOR = 1;
761	1048	// static int MATERIAL = 2;
..	..	@@ -763,9 +1050,9 @@
763	1050
764	1051	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
765	1052
766		- JCheckBox colorCB;
767		- JCheckBox materialCB;
768		- JCheckBox textureCB;
	1053	+ cCheckBox colorCB;
	1054	+ cCheckBox materialCB;
	1055	+ cCheckBox textureCB;
769	1056
770	1057	public void itemStateChanged(ItemEvent e)
771	1058	{
..	..	@@ -793,6 +1080,7 @@
793	1080	} else if(e.getSource() == liveCB)
794	1081	{
795	1082	cameraView.ToggleLive();
	1083	+ refreshContents(false);
796	1084	}
797	1085	else if(e.getSource() == supportCB)
798	1086	{
..	..	@@ -857,6 +1145,18 @@
857	1145	{
858	1146	cameraView.ToggleOeil();
859	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	+ }
860	1160	else if(e.getSource() == lookAtCB)
861	1161	{
862	1162	cameraView.ToggleLookAt();
..	..	@@ -873,7 +1173,8 @@
873	1173
874	1174	/**/
875	1175	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
876		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1176	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1177	+ TreePath path = objEditor.jTree.getSelectionPath();
877	1178	if ((path == null) \|\| (path.getPathCount() <= 1)) {
878	1179	// We can't move the root node or an empty selection
879	1180	return;
..	..	@@ -936,8 +1237,6 @@
936	1237	}
937	1238	}
938	1239
939		- String string = (String) object;
940		-
941	1240	System.out.println("Transfer = " + object + "; drop : " + target);
942	1241	// if( object instanceof java.io.File[])
943	1242	// {
..	..	@@ -945,6 +1244,8 @@
945	1244	// objEditor.DropFile((java.io.File[]) object, true);
946	1245	// return;
947	1246	// }
	1247	+
	1248	+ String string = object.toString();
948	1249
949	1250	// File path for Mac and Windows
950	1251	if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
..	..	@@ -990,23 +1291,33 @@
990	1291
991	1292	assert target == objEditor.jTree;
992	1293	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1294	+ Object3D destinationLeaf;
993	1295	try {
994		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1296	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
995	1297	} catch (Exception e) {
996	1298	System.out.println("destinationPath : " + destinationPath);
997	1299	return;
998	1300	}
999	1301
1000		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1302	+ for (int i=group.selection.size(); --i>=0;)
1001	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	+// {
1002	1313	loadClipboard(true);
1003	1314	objEditor.jTree.setSelectionPath(destinationPath);
1004	1315	pasteInto(false, false);
1005		- } else {
1006		- loadClipboard(false);
1007		- objEditor.jTree.setSelectionPath(destinationPath);
1008		- pasteInto(false, false); // true); // ???
1009		- }
	1316	+// } else {
	1317	+// loadClipboard(false);
	1318	+// objEditor.jTree.setSelectionPath(destinationPath);
	1319	+// pasteInto(false, false); // true); // ???
	1320	+// }
1010	1321	}
1011	1322	public void dropActionChanged(DropTargetDragEvent dtde)
1012	1323	// Called if the user has modified the current drop gesture
..	..	@@ -1111,22 +1422,30 @@
1111	1422	{
1112	1423	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1113	1424	//heightFieldItem.addActionListener(this);
1114		- gridItem = menu.add(new MenuItem("Grid"));
1115		- gridItem.addActionListener(this);
1116		- rectoidItem = menu.add(new MenuItem("Box"));
1117		- rectoidItem.addActionListener(this);
1118		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1119		- ellipsoidItem.addActionListener(this);
1120		- coneItem = menu.add(new MenuItem("Cone"));
1121		- coneItem.addActionListener(this);
1122		- torusItem = menu.add(new MenuItem("Torus"));
1123		- torusItem.addActionListener(this);
1124		- superItem = menu.add(new MenuItem("Superellipsoid"));
1125		- 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	+ {
1126	1443	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1127	1444	kleinItem.addActionListener(this);
1128		- particleItem = menu.add(new MenuItem("Particle system"));
1129		- particleItem.addActionListener(this);
	1445	+ }
	1446	+
	1447	+// particleItem = menu.add(new MenuItem("Particle system"));
	1448	+// particleItem.addActionListener(this);
1130	1449	if (Globals.ADVANCED)
1131	1450	{
1132	1451	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1152,15 +1471,15 @@
1152	1471	}
1153	1472	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1154	1473	bezierItem.addActionListener(this);
1155		- overlayItem = menu.add(new MenuItem("Overlay"));
1156		- overlayItem.addActionListener(this);
1157		- lightItem = menu.add(new MenuItem("Light"));
1158		- 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);
1159	1478	menu.add("-");
1160	1479	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1161	1480	//superLoopItem.addActionListener(this);
1162		- loopItem = menu.add(new MenuItem("Loop"));
1163		- loopItem.addActionListener(this);
	1481	+// loopItem = menu.add(new MenuItem("Loop"));
	1482	+// loopItem.addActionListener(this);
1164	1483	doubleItem = menu.add(new MenuItem("Fork"));
1165	1484	doubleItem.addActionListener(this);
1166	1485	if (Globals.ADVANCED)
..	..	@@ -1176,6 +1495,9 @@
1176	1495	animationItem.addItemListener(this);
1177	1496	animationItem.setState(Globals.ANIMATION);
1178	1497
	1498	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1499	+ archiveItem.addActionListener(this);
	1500	+
1179	1501	menu.add("-");
1180	1502	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1181	1503	parseverticesItem.addActionListener(this);
..	..	@@ -1188,6 +1510,8 @@
1188	1510	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1189	1511	reduce34MorphItem.addActionListener(this);
1190	1512	menu.add("-");
	1513	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	1514	+ memoryItem.addActionListener(this);
1191	1515	menu.add(computeAOItem = new MenuItem("Compute AO"));
1192	1516	computeAOItem.addActionListener(this);
1193	1517
..	..	@@ -1196,11 +1520,9 @@
1196	1520	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1197	1521	mirrorItem.addActionListener(this);
1198	1522	menu.add("-");
1199		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1200		- memoryItem.addActionListener(this);
1201	1523	menu.add(analyzeItem = new MenuItem("Analyze"));
1202	1524	analyzeItem.addActionListener(this);
1203		- menu.add(dumpItem = new MenuItem("Dump"));
	1525	+ menu.add(dumpItem = new MenuItem("Print"));
1204	1526	dumpItem.addActionListener(this);
1205	1527	// menu.add(pathItem = new MenuItem("From-to path"));
1206	1528	// pathItem.addActionListener(this);
..	..	@@ -1341,9 +1663,24 @@
1341	1663	shadow.material = new cMaterial(obj.material);
1342	1664	shadow.material.diffuse = 0.0001f;
1343	1665	shadow.material.specular = 0.0001f;
	1666	+ //shadow.projectedVertices[1].x = 300;
1344	1667
1345	1668	makeSomething(shadow);
1346	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	+ }
1347	1684
1348	1685	/**
1349	1686	* applyExample
..	..	@@ -1588,7 +1925,7 @@
1588	1925	{
1589	1926	ScreenFit();
1590	1927	} else
1591		- if (source == switchItem)
	1928	+ if (source == switchViewItem)
1592	1929	{
1593	1930	cVector v1 = new cVector();
1594	1931	cVector v2 = new cVector();
..	..	@@ -1597,11 +1934,11 @@
1597	1934	objEditor.cameraView.renderCamera.setAim(v2, v1);
1598	1935	objEditor.cameraView.repaint();
1599	1936	} else
1600		- if (source == rectoidItem)
	1937	+ if (source == rectoidItem \|\| source == boxButton)
1601	1938	{
1602	1939	makeSomething(new Box());
1603	1940	} else
1604		- if (source == particleItem)
	1941	+ if (source == particleItem \|\| source == particlesButton)
1605	1942	{
1606	1943	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1607	1944	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1680,27 +2017,27 @@
1680	2017
1681	2018	makeSomething(obj);
1682	2019	} else
1683		- if (source == gridItem)
	2020	+ if (source == gridItem \|\| source == gridButton)
1684	2021	{
1685	2022	makeSomething(new Grid());
1686	2023	} else
1687		- if (source == ellipsoidItem)
	2024	+ if (source == ellipsoidItem \|\| source == sphereButton)
1688	2025	{
1689	2026	makeSomething(new Sphere());
1690	2027	} else
1691		- if (source == coneItem)
	2028	+ if (source == coneItem \|\| source == coneButton)
1692	2029	{
1693	2030	makeSomething(new Cone());
1694	2031	} else
1695		- if (source == torusItem)
	2032	+ if (source == torusItem \|\| source == torusButton)
1696	2033	{
1697	2034	makeSomething(new Torus());
1698	2035	} else
1699		- if (source == superItem)
	2036	+ if (source == superItem \|\| source == superButton)
1700	2037	{
1701	2038	makeSomething(new Superellipsoid());
1702	2039	} else
1703		- if (source == kleinItem)
	2040	+ if (source == kleinItem \|\| source == kleinButton)
1704	2041	{
1705	2042	makeSomething(new Klein());
1706	2043	} else
..	..	@@ -1720,7 +2057,7 @@
1720	2057	{
1721	2058	makeSomething(new BezierSurface());
1722	2059	} else
1723		- if (source == overlayItem)
	2060	+ if (source == overlayItem \|\| source == overlayButton)
1724	2061	{
1725	2062	/*
1726	2063	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1768,7 +2105,7 @@
1768	2105	s.setup();
1769	2106	makeSomething(s);
1770	2107	} else
1771		- if (source == lightItem)
	2108	+ if (source == lightItem \|\| source == lightButton)
1772	2109	{
1773	2110	makeSomething(new Light());
1774	2111	} else
..	..	@@ -1818,30 +2155,30 @@
1818	2155
1819	2156	group(g);
1820	2157	} else
1821		- if (source == loopItem)
	2158	+ if (source == loopItem \|\| source == loopButton)
1822	2159	{
1823	2160	Composite csg = new GroupLeaf();
1824	2161	csg.count = 5;
1825	2162	group(csg);
1826		- Composite child = new cGroup();
	2163	+ Composite child = new cGroup("Branch");
1827	2164	csg.addChild(child);
1828	2165	child.addChild(csg);
1829	2166	} else
1830	2167	if (source == doubleItem)
1831	2168	{
1832		- Composite csg = new GroupLeaf();
	2169	+ Composite csg = new GroupLeaf("Fork");
1833	2170	csg.count = 5;
1834	2171	group(csg);
1835		- Composite child = new cGroup();
	2172	+ Composite child = new cGroup("Branch A");
1836	2173	csg.addChild(child);
1837	2174	child.addChild(csg);
1838		- child = new cGroup();
	2175	+ child = new cGroup("Branch B");
1839	2176	csg.addChild(child);
1840	2177	child.addChild(csg);
1841	2178	} else
1842	2179	if (source == tripleItem)
1843	2180	{
1844		- Composite csg = new GroupLeaf();
	2181	+ Composite csg = new GroupLeaf("Trident");
1845	2182	csg.count = 4;
1846	2183	group(csg);
1847	2184	Composite child = new cGroup();
..	..	@@ -1853,31 +2190,6 @@
1853	2190	child = new cGroup();
1854	2191	csg.addChild(child);
1855	2192	child.addChild(csg);
1856		- } else
1857		-
1858		- if (source == importGFDItem)
1859		- {
1860		- ImportGFD();
1861		- } else
1862		- if (source == importVRMLX3DItem)
1863		- {
1864		- ImportVRMLX3D();
1865		- } else
1866		- if (source == import3DSItem)
1867		- {
1868		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1869		- } else
1870		- if (source == importOBJItem)
1871		- {
1872		- //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1873		- FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
1874		- browser.setVisible(true);
1875		- String filename = browser.getFile();
1876		- if (filename != null && filename.length() > 0)
1877		- {
1878		- String fullname = browser.getDirectory() + filename;
1879		- makeSomething(ReadOBJ(fullname), true);
1880		- }
1881	2193	} else
1882	2194	if (source == computeAOItem)
1883	2195	{
..	..	@@ -1916,6 +2228,46 @@
1916	2228	{
1917	2229	DumpObject();
1918	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
1919	2271	if (source == oneStepButton)
1920	2272	{
1921	2273	Globals.ONESTEP = true;
..	..	@@ -1923,17 +2275,14 @@
1923	2275	} else
1924	2276	if (source == screenfitButton)
1925	2277	{
1926		- //Reload(lastConverter, lastFilename, true);
1927	2278	ScreenFit();
1928	2279	} else
1929	2280	if (source == screenfitpointButton)
1930	2281	{
1931		- //Reload(lastConverter, lastFilename, true);
1932	2282	ScreenFitPoint();
1933	2283	} else
1934	2284	if (source == snapobjectButton)
1935	2285	{
1936		- //Reload(lastConverter, lastFilename, true);
1937	2286	SnapObject();
1938	2287	} else
1939	2288	// if (event.getSource() == recompileButton)
..	..	@@ -1969,6 +2318,14 @@
1969	2318	if (source == cutItem \|\| source == clearButton)
1970	2319	{
1971	2320	loadClipboard(true);
	2321	+ } else
	2322	+ if (source == undoItem)
	2323	+ {
	2324	+ Undo();
	2325	+ } else
	2326	+ if (source == redoItem)
	2327	+ {
	2328	+ Redo();
1972	2329	} else
1973	2330	if (source == duplicateItem)
1974	2331	{
..	..	@@ -2281,7 +2638,7 @@
2281	2638	{
2282	2639	RevertMeshes();
2283	2640	} else
2284		- if (source == resetMeshItem)
	2641	+ if (source == resetAllItem)
2285	2642	{
2286	2643	ResetAll();
2287	2644	} else
..	..	@@ -2301,9 +2658,9 @@
2301	2658	{
2302	2659	ClearSelection(true);
2303	2660	} else
2304		- if (source == grabItem)
	2661	+ if (source == grabItem \|\| source == groupButton)
2305	2662	{
2306		- group(new cGroup(), true);
	2663	+ group(new cGroup(), false); // true);
2307	2664	} else
2308	2665	if (source == hideItem)
2309	2666	{
..	..	@@ -2321,11 +2678,11 @@
2321	2678	{
2322	2679	makeSomething(new Camera());
2323	2680	} else
2324		- if (source == compositeItem)
	2681	+ if (source == compositeItem \|\| source == compositeButton)
2325	2682	{
2326	2683	group(new Composite());
2327	2684	} else
2328		- if (source == randomItem)
	2685	+ if (source == switchItem \|\| source == switchButton)
2329	2686	{
2330	2687	RandomNode random = new RandomNode();
2331	2688	group(random);
..	..	@@ -2427,7 +2784,7 @@
2427	2784	{
2428	2785	group(new cLinker());
2429	2786	} else
2430		- if (source == textureItem)
	2787	+ if (source == textureItem \|\| source == textureButton)
2431	2788	{
2432	2789	group(new TextureNode());
2433	2790	} else
..	..	@@ -2447,17 +2804,30 @@
2447	2804	{
2448	2805	CastShadow(2);
2449	2806	} else
2450		- if (source == ungroupItem)
	2807	+ if (source == ungroupItem \|\| source == ungroupButton)
2451	2808	{
2452		- //ungroup();
	2809	+ boolean hasRoot = false;
	2810	+
2453	2811	for (int i=0; i<group.selection.size(); i++)
2454	2812	{
2455		- Ungroup(group.selection.get(i));
	2813	+ if (group.selection.get(i) == group)
	2814	+ {
	2815	+ hasRoot = true;
	2816	+ break;
	2817	+ }
2456	2818	}
2457	2819
2458		- ClearSelection(false);
2459		-
2460		- 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	+ }
2461	2831	} else
2462	2832	if (source == genUVItem)
2463	2833	{
..	..	@@ -2469,7 +2839,7 @@
2469	2839	} else
2470	2840	if (source == genNormalsMESHItem)
2471	2841	{
2472		- GenNormals(true); // TODO
	2842	+ GenNormalsMESH();
2473	2843	} else
2474	2844	if (source == genNormalsORGANItem)
2475	2845	{
..	..	@@ -2534,6 +2904,22 @@
2534	2904	if (source == unmarkleavesItem)
2535	2905	{
2536	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);
2537	2923	} else
2538	2924	if (source == flipVItem)
2539	2925	{
..	..	@@ -2769,6 +3155,10 @@
2769	3155	if (source == twoButton)
2770	3156	{
2771	3157	radio.layout = twoButton;
	3158	+
	3159	+ if (CameraPane.FULLSCREEN)
	3160	+ fullscreenLayout = radio.layout;
	3161	+
2772	3162	// bug
2773	3163	//gridPanel.setDividerLocation(1.0);
2774	3164	//bigPanel.setDividerLocation(0.0);
..	..	@@ -2801,10 +3191,31 @@
2801	3191	bigThree.ClearUI();
2802	3192	bigThree.add(centralPanel);
2803	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	+
2804	3212	} else
2805	3213	if (source == threeButton)
2806	3214	{
2807	3215	radio.layout = threeButton;
	3216	+
	3217	+ if (CameraPane.FULLSCREEN)
	3218	+ fullscreenLayout = radio.layout;
2808	3219
2809	3220	// bigThree.remove(scenePanel);
2810	3221	// bigThree.remove(centralPanel);
..	..	@@ -2837,10 +3248,15 @@
2837	3248	bigThree.add(centralPanel);
2838	3249	bigThree.add(XYZPanel);
2839	3250	bigThree.FlushUI();
	3251	+
	3252	+ cameraView.requestFocusInWindow();
2840	3253	} else
2841	3254	if (source == fourButton)
2842	3255	{
2843	3256	radio.layout = fourButton;
	3257	+
	3258	+ if (CameraPane.FULLSCREEN)
	3259	+ fullscreenLayout = radio.layout;
2844	3260
2845	3261	// bigThree.remove(scenePanel);
2846	3262	// bigThree.remove(centralPanel);
..	..	@@ -2872,10 +3288,15 @@
2872	3288	bigThree.ClearUI();
2873	3289	bigThree.add(scenePanel);
2874	3290	bigThree.FlushUI();
	3291	+
	3292	+ cameraView.requestFocusInWindow();
2875	3293	} else
2876	3294	if (source == sixButton)
2877	3295	{
2878	3296	radio.layout = sixButton;
	3297	+
	3298	+ if (CameraPane.FULLSCREEN)
	3299	+ fullscreenLayout = radio.layout;
2879	3300
2880	3301	// bigThree.remove(scenePanel);
2881	3302	// bigThree.remove(centralPanel);
..	..	@@ -2908,10 +3329,15 @@
2908	3329	bigThree.add(scenePanel);
2909	3330	bigThree.add(centralPanel);
2910	3331	bigThree.FlushUI();
	3332	+
	3333	+ cameraView.requestFocusInWindow();
2911	3334	} else
2912	3335	if (source == sevenButton)
2913	3336	{
2914	3337	radio.layout = sevenButton;
	3338	+
	3339	+ if (CameraPane.FULLSCREEN)
	3340	+ fullscreenLayout = radio.layout;
2915	3341
2916	3342	// bigThree.remove(scenePanel);
2917	3343	// bigThree.remove(centralPanel);
..	..	@@ -2945,6 +3371,8 @@
2945	3371	bigThree.add(centralPanel);
2946	3372	bigThree.add(XYZPanel);
2947	3373	bigThree.FlushUI();
	3374	+
	3375	+ cameraView.requestFocusInWindow();
2948	3376	} else
2949	3377	if (source == rootButton)
2950	3378	{
..	..	@@ -2956,6 +3384,7 @@
2956	3384	EditObject(obj);
2957	3385	}
2958	3386
	3387	+ cameraView.requestFocusInWindow();
2959	3388	refreshContents(true);
2960	3389	} else
2961	3390	if (source == closeButton)
..	..	@@ -2965,22 +3394,37 @@
2965	3394	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2966	3395	{
2967	3396	ab = (cRadio)e.nextElement();
2968		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3397	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2969	3398	{
	3399	+ // Patch to avoid bug with transparency.
	3400	+ if (!ab.hadMaterial)
	3401	+ {
	3402	+ ab.object.material = null;
	3403	+ }
	3404	+
2970	3405	buttonGroup.remove(ab);
2971	3406	radioPanel.remove(ab);
2972	3407
2973		- ab.GetObject().editWindow = null;
	3408	+ //ab.GetObject().editWindow = null;
	3409	+ ab.GetObject().manipWindow = null;
2974	3410	// ab.GetObject().objectUI = null; // ?????????
2975	3411
2976	3412	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2977	3413	break;
2978	3414	}
2979	3415	}
	3416	+
	3417	+ cameraView.requestFocusInWindow();
2980	3418	refreshContents(true);
2981	3419	} else
2982	3420	if (source == editItem \|\| source == editButton)
2983	3421	{
	3422	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3423	+ {
	3424	+ Object3D child = (Object3D)e.nextElement();
	3425	+ child.pinned = true;
	3426	+ }
	3427	+
2984	3428	EditSelection(false);
2985	3429	} else
2986	3430	if (source == uneditButton)
..	..	@@ -2990,10 +3434,11 @@
2990	3434	Object3D child = (Object3D)e.nextElement();
2991	3435	if(child.editWindow != null)
2992	3436	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3437	+ child.pinned = false;
2993	3438	child.CloseUI();
2994	3439	listUI.remove(child);
2995	3440
2996		- child.editWindow = null; // ???????????
	3441	+ //child.editWindow = null; // ???????????
2997	3442	}
2998	3443	objEditor.ctrlPanel.FlushUI();
2999	3444	//objEditor.jTree.clearSelection();
..	..	@@ -3006,6 +3451,7 @@
3006	3451	//copy.ClearUI();
3007	3452	for (Object3D obj : listUI)
3008	3453	{
	3454	+ obj.pinned = false;
3009	3455	obj.CloseUI();
3010	3456	}
3011	3457	listUI.clear();
..	..	@@ -3015,7 +3461,7 @@
3015	3461	{
3016	3462	assert(copy == group);
3017	3463
3018		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3464	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3019	3465
3020	3466	for (Object3D obj : listUI)
3021	3467	{
..	..	@@ -3064,6 +3510,9 @@
3064	3510	}
3065	3511
3066	3512	copy = group;
	3513	+
	3514	+ SetUndoStates();
	3515	+
3067	3516	//Globals.theRenderer.object = group;
3068	3517	if(!useclient)
3069	3518	{
..	..	@@ -3079,20 +3528,44 @@
3079	3528	frontView.object = group;
3080	3529	sideView.object = group;
3081	3530	}
3082		- group.editWindow = this;
	3531	+
	3532	+// fix "+" issue
	3533	+ //group.editWindow = this;
	3534	+ group.manipWindow = this;
	3535	+
3083	3536	/*
3084	3537	currentLayout = radio.layout;
3085	3538	if (currentLayout == null)
3086	3539	currentLayout = sevenButton;
3087	3540	*/
3088	3541	radio.layout.doClick();
	3542	+
	3543	+ ClearUnpinned();
	3544	+ SetPinStates(group.selection.size() > 0);
	3545	+ if (group.selection.size() == 1)
	3546	+ EditSelection(false);
3089	3547	keepparent = group.parent;
3090	3548	// PARENT = NULL or not???
3091	3549	//group.parent = null; // ROOT
3092	3550	//group.attributes = -1;
3093	3551	ResetModel();
	3552	+
	3553	+ cameraView.requestFocusInWindow();
3094	3554	refreshContents(true);
3095		- }
	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	+ }
3096	3569	else
3097	3570	{
3098	3571	//return super.action(event, arg);
..	..	@@ -3101,7 +3574,6 @@
3101	3574	}
3102	3575
3103	3576	boolean useclient = false;
3104		- cRadio radio;
3105	3577
3106	3578	void ToggleRoot()
3107	3579	{
..	..	@@ -3340,7 +3812,8 @@
3340	3812
3341	3813	int size = obj.MemorySize();
3342	3814
3343		- 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)");
3344	3817	}
3345	3818	}
3346	3819	catch (Exception e)
..	..	@@ -3421,6 +3894,13 @@
3421	3894	void GenNormals(boolean crease)
3422	3895	{
3423	3896	group.GenNormalsS(crease);
	3897	+
	3898	+ refreshContents();
	3899	+ }
	3900	+
	3901	+ void GenNormalsMESH()
	3902	+ {
	3903	+ group.GenNormalsMeshS();
3424	3904
3425	3905	refreshContents();
3426	3906	}
..	..	@@ -3652,7 +4132,16 @@
3652	4132	String pigment = Object3D.GetPigment(tex);
3653	4133	//String bump = Object3D.GetBump(tex);
3654	4134
3655		- 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	+ }
3656	4145
3657	4146	double s = v.s;
3658	4147
..	..	@@ -4039,6 +4528,18 @@
4039	4528	refreshContents();
4040	4529	}
4041	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);
	4540	+ refreshContents();
	4541	+ }
	4542	+
4042	4543	void SetTexRes(int tr)
4043	4544	{
4044	4545	group.selection.SetTexRes(tr);
..	..	@@ -4110,10 +4611,6 @@
4110	4611	// }
4111	4612	// }
4112	4613
4113		- static boolean allparams = true;
4114		-
4115		- static Vector<Object3D> listUI = new Vector<Object3D>();
4116		-
4117	4614	void EditSelection(boolean newWindow)
4118	4615	{
4119	4616	// aConstraints.gridy = 0;
..	..	@@ -4121,10 +4618,10 @@
4121	4618	{
4122	4619	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4123	4620	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4124		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4621	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4125	4622
4126	4623	Object3D elem = (Object3D)group.selection.elementAt(i);
4127		- if(elem != group)
	4624	+ if(elem != group \|\| !newWindow)
4128	4625	{
4129	4626	// if (!(elem instanceof Composite))
4130	4627	// newWindow = false;
..	..	@@ -4206,7 +4703,8 @@
4206	4703	//new Exception().printStackTrace();
4207	4704
4208	4705	freezemodel = true;
4209		-
	4706	+ ClearUnpinned();
	4707	+
4210	4708	/**/
4211	4709	//switch (event.id)
4212	4710	{
..	..	@@ -4214,7 +4712,6 @@
4214	4712	//case 702: // Event.LIST_DESELECT
4215	4713	group.deselectAll();
4216	4714	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4217		- objEditor.ClearInfo(); // .GetMaterial());
4218	4715	if (tps != null)
4219	4716	{
4220	4717	for (int i=0; i < tps.length; i++)
..	..	@@ -4223,10 +4720,8 @@
4223	4720
4224	4721	//if (child.parent != null)
4225	4722	//child.parent.addSelectee(child);
	4723	+ objEditor.SetMaterial(child);
4226	4724	group.addSelectee(child);
4227		- objEditor.SetMaterial(child); // .GetMaterial());
4228		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4229		- System.err.println("info : " + child.GetPath());
4230	4725	}
4231	4726	}
4232	4727	// else
..	..	@@ -4236,20 +4731,28 @@
4236	4731	// System.err.println("info : " + group.GetPath());
4237	4732	// }
4238	4733
4239		- objEditor.SetText(); // jan 2014
4240		-
4241		- 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))
4242	4735	CameraPane.flash = true;
4243	4736
4244		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4737	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4245	4738	// a camera
4246	4739	{
4247		- CameraPane.camerachangeframe = 0; // don't refuse it
4248		- 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	+ }
4249	4745	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4250	4746	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4251	4747	}
4252	4748
	4749	+ if (tps != null && tps.length == 1)
	4750	+ {
	4751	+ EditSelection(false);
	4752	+ }
	4753	+
	4754	+ SetPinStates(tps != null && tps.length > 0);
	4755	+
4253	4756	refreshContents();
4254	4757	//return true;
4255	4758	}
..	..	@@ -4258,6 +4761,35 @@
4258	4761
4259	4762	freezemodel = false;
4260	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	+ }
4261	4793
4262	4794	void linkSomething(Object3D thing)
4263	4795	{
..	..	@@ -4329,6 +4861,7 @@
4329	4861	{
4330	4862	if (group.selection.isEmpty())
4331	4863	return;
	4864	+
4332	4865	Grafreed.clipboardIsTempGroup = false;
4333	4866	Composite tGroup = null;
4334	4867	if (group.selection.size() > 0) // 1)
..	..	@@ -4339,6 +4872,8 @@
4339	4872
4340	4873	if (cut)
4341	4874	{
	4875	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	4876	+// Save();
4342	4877	//int indices[] = jList.getSelectedIndices();
4343	4878	//for (int i = indices.length - 1; i >= 0; i--)
4344	4879	//jList.remove(indices[i]);
..	..	@@ -4428,8 +4963,10 @@
4428	4963	}
4429	4964
4430	4965	}
	4966	+
4431	4967	if (Grafreed.clipboardIsTempGroup)
4432	4968	Grafreed.clipboard = tGroup;
	4969	+
4433	4970	if (cut)
4434	4971	{
4435	4972	ResetModel();
..	..	@@ -4439,6 +4976,10 @@
4439	4976
4440	4977	void paste(boolean expand)
4441	4978	{
	4979	+ if (Globals.REPLACEONMAKE)
	4980	+ Save();
	4981	+ boolean keep = Globals.REPLACEONMAKE;
	4982	+ Globals.REPLACEONMAKE = false;
4442	4983	// if (GrafreeD.clipboard == null)
4443	4984	// return;
4444	4985	boolean first = true;
..	..	@@ -4498,6 +5039,7 @@
4498	5039	Grafreed.clipboard.get(0).parent = keepparent;
4499	5040	}
4500	5041
	5042	+ Globals.REPLACEONMAKE = keep;
4501	5043	ResetModel();
4502	5044	refreshContents();
4503	5045	}
..	..	@@ -4633,6 +5175,10 @@
4633	5175
4634	5176	void group(Object3D csg, boolean grab)
4635	5177	{
	5178	+ if (Globals.REPLACEONMAKE)
	5179	+ Save();
	5180	+ boolean keep = Globals.REPLACEONMAKE;
	5181	+ Globals.REPLACEONMAKE = false;
4636	5182	if (//false) // why??
4637	5183	!group.selection.isEmpty())
4638	5184	{
..	..	@@ -4746,10 +5292,15 @@
4746	5292	//node.add(csg);
4747	5293	//makeSomething(node);
4748	5294	makeSomething(csg);
	5295	+ Globals.REPLACEONMAKE = keep;
4749	5296	}
4750	5297
4751	5298	void Ungroup(Object3D g)
4752	5299	{
	5300	+ if (Globals.REPLACEONMAKE)
	5301	+ Save();
	5302	+ boolean keep = Globals.REPLACEONMAKE;
	5303	+ Globals.REPLACEONMAKE = false;
4753	5304	if (g instanceof HiddenObject)
4754	5305	{
4755	5306	HiddenObject h = (HiddenObject) g;
..	..	@@ -4766,6 +5317,7 @@
4766	5317	objEditor.makeSomething(g.get(i), false);
4767	5318	}
4768	5319	}
	5320	+ Globals.REPLACEONMAKE = keep;
4769	5321	}
4770	5322
4771	5323	void ungroup()
..	..	@@ -4961,21 +5513,6 @@
4961	5513	}
4962	5514	*/
4963	5515
4964		- void ImportGFD()
4965		- {
4966		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4967		- browser.show();
4968		- String filename = browser.getFile();
4969		- if (filename != null && filename.length() > 0)
4970		- {
4971		- String fullname = browser.getDirectory() + filename;
4972		-
4973		- //Object3D readobj =
4974		- objEditor.ReadGFD(fullname, objEditor);
4975		- //makeSomething(readobj);
4976		- }
4977		- }
4978		-
4979	5516	/*
4980	5517	public void Callback(Object obj)
4981	5518	{
..	..	@@ -4999,23 +5536,6 @@
4999	5536	}
5000	5537	*/
5001	5538
5002		- void ImportVRMLX3D()
5003		- {
5004		- if (Grafreed.standAlone)
5005		- {
5006		- /**/
5007		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
5008		- browser.show();
5009		- String filename = browser.getFile();
5010		- if (filename != null && filename.length() > 0)
5011		- {
5012		- String fullname = browser.getDirectory() + filename;
5013		- LoadVRMLX3D(fullname);
5014		- }
5015		- /**/
5016		- }
5017		- }
5018		-
5019	5539	String GetFile(String dialogName)
5020	5540	{
5021	5541	if (Grafreed.standAlone)
..	..	@@ -5086,7 +5606,28 @@
5086	5606	cButton clearpanelButton;
5087	5607	cButton unselectButton;
5088	5608
	5609	+ cButton restoreCameraButton;
	5610	+
	5611	+ cButton saveButton;
5089	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;
5090	5631
5091	5632	cButton screenfitButton;
5092	5633	cButton screenfitpointButton;
..	..	@@ -5099,14 +5640,6 @@
5099	5640
5100	5641	cButton setsupportButton;
5101	5642
5102		- cButton twoButton;
5103		- cButton sixButton;
5104		- cButton threeButton;
5105		- cButton sevenButton;
5106		- cButton fourButton; // full panel
5107		- cButton oneButton; // full XYZ
5108		- //cButton currentLayout;
5109		-
5110	5643	//
5111	5644	//Composite
5112	5645	Object3D // to do !!
..	..	@@ -5116,9 +5649,11 @@
5116	5649	//JTree jTree;
5117	5650	private MenuItem lookAtItem;
5118	5651	private MenuItem lookFromItem;
5119		- private MenuItem switchItem;
	5652	+ private MenuItem switchViewItem;
5120	5653	private MenuItem cutItem;
5121		- private MenuItem duplicateItem;
	5654	+ private MenuItem undoItem;
	5655	+ private MenuItem redoItem;
	5656	+ private JMenuItem duplicateItem;
5122	5657	private MenuItem cloneItem;
5123	5658	private MenuItem cloneSupportItem;
5124	5659	private MenuItem overwriteGeoItem;
..	..	@@ -5131,7 +5666,7 @@
5131	5666	private MenuItem linkverticesItem;
5132	5667	private MenuItem relinkverticesItem;
5133	5668	private MenuItem setMasterItem;
5134		- private MenuItem resetMeshItem;
	5669	+ private MenuItem resetAllItem;
5135	5670	private MenuItem stepAllItem;
5136	5671	private MenuItem revertMeshItem;
5137	5672	private MenuItem poseMeshItem;
..	..	@@ -5181,6 +5716,10 @@
5181	5716	private MenuItem showleavesItem;
5182	5717	private MenuItem markleavesItem;
5183	5718	private MenuItem unmarkleavesItem;
	5719	+ private MenuItem rewindleavesItem;
	5720	+ private MenuItem unrewindleavesItem;
	5721	+ private MenuItem randomleavesItem;
	5722	+ private MenuItem unrandomleavesItem;
5184	5723
5185	5724	private MenuItem flipVItem;
5186	5725	private MenuItem unflipVItem;
..	..	@@ -5202,7 +5741,7 @@
5202	5741	private MenuItem frontItem;
5203	5742	private MenuItem cameraItem;
5204	5743	private MenuItem compositeItem;
5205		- private MenuItem randomItem;
	5744	+ private MenuItem switchItem;
5206	5745	private MenuItem physicsItem;
5207	5746	private MenuItem frameselectorItem;
5208	5747	private MenuItem scriptNodeItem;
..	..	@@ -5264,11 +5803,6 @@
5264	5803	private MenuItem doubleItem;
5265	5804	private MenuItem tripleItem;
5266	5805
5267		- private MenuItem importGFDItem;
5268		- private MenuItem importVRMLX3DItem;
5269		- private MenuItem import3DSItem;
5270		- private MenuItem importOBJItem;
5271		-
5272	5806	private MenuItem computeAOItem;
5273	5807	private MenuItem recompileItem;
5274	5808	private MenuItem editScriptItem;
..	..	@@ -5278,4 +5812,8 @@
5278	5812	private MenuItem analyzeItem;
5279	5813	private MenuItem dumpItem;
5280	5814	//boolean freezemodel = false;
	5815	+
	5816	+ Menu cameraMenu;
	5817	+ MenuItem editCameraItem;
	5818	+ MenuItem restoreCameraItem;
5281	5819	}