~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);
..	..	@@ -148,28 +148,21 @@
148	148
149	149	//JTextField nameField;
150	150
151		- void SetupMenu2(ObjEditor oe)
	151	+ void SetupMenu2(GroupEditor oe)
152	152	{
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		-
	153	+ oe.jTree = new cTree();
	154	+
168	155	Menu menu;
169	156	oe.menuBar.add(menu = new Menu("Edit"));
170	157	//editItem = menu.add(new MenuItem("Edit"));
171	158	//editItem.addActionListener(this);
172		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	159	+
	160	+// undoItem = menu.add(new MenuItem("Undo"));
	161	+// undoItem.addActionListener(this);
	162	+// redoItem = menu.add(new MenuItem("Redo"));
	163	+// redoItem.addActionListener(this);
	164	+// menu.add("-");
	165	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
173	166	duplicateItem.addActionListener(this);
174	167	cloneItem = menu.add(new MenuItem("Clone"));
175	168	cloneItem.addActionListener(this);
..	..	@@ -185,7 +178,6 @@
185	178	copyItem.addActionListener(this);
186	179	pasteItem = menu.add(new MenuItem("Paste"));
187	180	pasteItem.addActionListener(this);
188		- menu.add("-");
189	181
190	182	menu.add("-");
191	183	pasteIntoItem = menu.add(new MenuItem("Paste into"));
..	..	@@ -206,14 +198,97 @@
206	198	clearAllItem = menu.add(new MenuItem("Clear All"));
207	199	clearAllItem.addActionListener(this);
208	200	}
	201	+
	202	+ menuBar.add(cameraMenu = new Menu("View"));
	203	+ //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
	204	+ //zBufferItem.addActionListener(this);
	205	+ //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
	206	+ //normalLensItem.addActionListener(this);
	207	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	208	+ restoreCameraItem.addActionListener(this);
	209	+
	210	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	211	+// toggleFullScreenItem.addItemListener(this);
	212	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	213	+// cameraMenu.add("-");
	214	+//
	215	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	216	+// toggleTextureItem.addItemListener(this);
	217	+// toggleTextureItem.setState(CameraPane.textureon);
	218	+//
	219	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	220	+// toggleSwitchItem.addItemListener(this);
	221	+// toggleSwitchItem.setState(CameraPane.SWITCH);
	222	+
	223	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
	224	+ toggleHandleItem.addItemListener(this);
	225	+ toggleHandleItem.setState(CameraPane.HANDLES);
	226	+
	227	+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
	228	+ togglePaintItem.addItemListener(this);
	229	+ togglePaintItem.setState(CameraPane.PAINTMODE);
	230	+
	231	+ if (Globals.ADVANCED)
	232	+ {
	233	+ cameraMenu.add("-");
	234	+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
	235	+ toggleLiveItem.addItemListener(this);
	236	+ toggleLiveItem.setState(Globals.isLIVE());
209	237
	238	+ cameraMenu.add(stepItem = new MenuItem("Step"));
	239	+ stepItem.addActionListener(this);
	240	+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
	241	+ // toggleDLItem.addItemListener(this);
	242	+ // toggleDLItem.setState(false);
	243	+
	244	+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
	245	+ toggleRenderItem.addItemListener(this);
	246	+ toggleRenderItem.setState(!CameraPane.frozen);
	247	+
	248	+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
	249	+ toggleDebugItem.addItemListener(this);
	250	+ toggleDebugItem.setState(Globals.DEBUG);
	251	+
	252	+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
	253	+ toggleFrustumItem.addItemListener(this);
	254	+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
	255	+
	256	+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
	257	+ toggleFootContactItem.addItemListener(this);
	258	+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
	259	+
	260	+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
	261	+ toggleTimelineItem.addItemListener(this);
	262	+ }
	263	+
	264	+// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
	265	+// toggleRootItem.addItemListener(this);
	266	+// toggleRootItem.setState(false);
	267	+// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
	268	+// animationItem.addItemListener(this);
	269	+// animationItem.setState(CameraPane.ANIMATION);
	270	+ cameraMenu.add("-");
	271	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
	272	+ editCameraItem.addActionListener(this);
	273	+
	274	+ if (Globals.ADVANCED)
	275	+ {
	276	+ oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
	277	+ //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
	278	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
	279	+ editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
	280	+ oe.cameraMenu.add("-");
	281	+ openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
	282	+ openWindowItem.addActionListener(this);
	283	+ editLeafItem.addActionListener(this);
	284	+ lookAtItem.addActionListener(this);
	285	+ //lookFromItem.addActinoListener(this);
	286	+ //switchViewItem.addActionListener(this);
	287	+ }
	288	+
210	289	oe.menuBar.add(menu = new Menu("Setting"));
211	290	if (Globals.ADVANCED)
212	291	{
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	292	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
218	293	revertMeshItem.addActionListener(this);
219	294	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
..	..	@@ -253,21 +328,29 @@
253	328	}
254	329
255	330	oe.menuBar.add(menu = new Menu("Group"));
256		- grabItem = menu.add(new MenuItem("Grab"));
257		- grabItem.addActionListener(this);
	331	+// grabItem = menu.add(new MenuItem("Grab"));
	332	+// grabItem.addActionListener(this);
258	333	backItem = menu.add(new MenuItem("Back"));
259	334	backItem.addActionListener(this);
260	335	frontItem = menu.add(new MenuItem("Front"));
261	336	frontItem.addActionListener(this);
262		- compositeItem = menu.add(new MenuItem("Composite"));
263		- compositeItem.addActionListener(this);
	337	+// compositeItem = menu.add(new MenuItem("Composite"));
	338	+// compositeItem.addActionListener(this);
	339	+
	340	+ if (Globals.ADVANCED)
	341	+ {
264	342	hideItem = menu.add(new MenuItem("Hidden Group"));
265	343	hideItem.addActionListener(this);
	344	+ }
266	345	ungroupItem = menu.add(new MenuItem("Ungroup"));
267	346	ungroupItem.addActionListener(this);
268		- menu.add("-");
269		- randomItem = menu.add(new MenuItem("Switch node"));
270		- randomItem.addActionListener(this);
	347	+
	348	+// menu.add("-");
	349	+//
	350	+// switchItem = menu.add(new MenuItem("Switch node"));
	351	+// switchItem.addActionListener(this);
	352	+ if (Globals.ADVANCED)
	353	+ {
271	354	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
272	355	switchGeoItem.addActionListener(this);
273	356	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
..	..	@@ -275,8 +358,6 @@
275	358	morphItem = menu.add(new MenuItem("Morph Group"));
276	359	morphItem.addActionListener(this);
277	360
278		- if (Globals.ADVANCED)
279		- {
280	361	menu.add("-");
281	362	physicsItem = menu.add(new MenuItem("Physics"));
282	363	physicsItem.addActionListener(this);
..	..	@@ -284,22 +365,20 @@
284	365	frameselectorItem.addActionListener(this);
285	366	scriptNodeItem = menu.add(new MenuItem("Script Node"));
286	367	scriptNodeItem.addActionListener(this);
287		- cameraItem = menu.add(new MenuItem("Camera"));
288		- cameraItem.addActionListener(this);
289	368	}
290	369
291	370	oe.menuBar.add(menu = new Menu("Object"));
292		- textureItem = menu.add(new MenuItem("Texture"));
293		- textureItem.addActionListener(this);
	371	+// textureItem = menu.add(new MenuItem("Texture"));
	372	+// textureItem.addActionListener(this);
294	373	billboardItem = menu.add(new MenuItem("Billboard"));
295	374	billboardItem.addActionListener(this);
296	375	csgItem = menu.add(new MenuItem("CSG"));
297	376	csgItem.addActionListener(this);
298		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	377	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
299	378	shadowXItem.addActionListener(this);
300		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	379	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
301	380	shadowYItem.addActionListener(this);
302		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	381	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
303	382	shadowZItem.addActionListener(this);
304	383	if (Globals.ADVANCED)
305	384	{
..	..	@@ -372,6 +451,10 @@
372	451	oe.menuBar.add(menu = new Menu("Attributes"));
373	452	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
374	453	clearMaterialsItem.addActionListener(this);
	454	+ resetAllItem = menu.add(new MenuItem("Reset All"));
	455	+ resetAllItem.addActionListener(this);
	456	+ stepAllItem = menu.add(new MenuItem("Step All"));
	457	+ stepAllItem.addActionListener(this);
375	458	menu.add("-");
376	459	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
377	460	liveleavesItem.addActionListener(this);
..	..	@@ -392,6 +475,14 @@
392	475	markleavesItem.addActionListener(this);
393	476	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
394	477	unmarkleavesItem.addActionListener(this);
	478	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	479	+ rewindleavesItem.addActionListener(this);
	480	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	481	+ unrewindleavesItem.addActionListener(this);
	482	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	483	+ randomleavesItem.addActionListener(this);
	484	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	485	+ unrandomleavesItem.addActionListener(this);
395	486	menu.add("-");
396	487	flipVItem = menu.add(new MenuItem("Flip V"));
397	488	flipVItem.addActionListener(this);
..	..	@@ -443,25 +534,24 @@
443	534	oe.menuBar.add(menu = new Menu("Insert"));
444	535	buildCreateMenu(menu);
445	536
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	537	oe.menuBar.add(menu = new Menu("Tools"));
460	538	buildToolsMenu(menu);
461	539	}
462	540
463	541	void SetupUI2(ObjEditor oe)
464	542	{
	543	+ // June 2019
	544	+ if (oe == null)
	545	+ {
	546	+ //super.SetupUI2(this);
	547	+ //return;
	548	+ }
	549	+
	550	+ if (copy != group)
	551	+ {
	552	+ //super.SetupUI2(this);
	553	+ }
	554	+
465	555	//new Exception().printStackTrace();
466	556
467	557	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -490,27 +580,63 @@
490	580	oe.radioPanel.add(dummyButton);
491	581	oe.buttonGroup.add(dummyButton);
492	582	*/
	583	+ cGridBag copyOptionsPanel = new cGridBag();
	584	+
	585	+ copyOptionsPanel.preferredHeight = 2;
	586	+
493	587	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
494	588
495		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
496		- liveCB.setToolTipText("Enabled animation");
	589	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	590	+ //minButton.setToolTipText("Minimize window");
	591	+ //minButton.addActionListener(this);
	592	+
	593	+ oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	594	+ maxButton.setToolTipText("Maximize window");
	595	+ maxButton.addActionListener(this);
	596	+
	597	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	598	+ fullButton.setToolTipText("Full-screen window");
	599	+ fullButton.addActionListener(this);
	600	+
	601	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	602	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	603	+ restoreCameraButton.addActionListener(this);
	604	+
	605	+ copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	606	+ undoButton.setToolTipText("Undo changes");
	607	+ undoButton.addActionListener(this);
	608	+ undoButton.setEnabled(false);
	609	+
	610	+ copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	611	+ redoButton.setToolTipText("Redo changes");
	612	+ redoButton.addActionListener(this);
	613	+ redoButton.setEnabled(false);
	614	+
	615	+ copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	616	+ saveButton.setToolTipText("Save changes");
	617	+ saveButton.addActionListener(this);
	618	+
	619	+ copyOptionsPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	620	+ liveCB.setToolTipText("Enable animation");
497	621	liveCB.addItemListener(this);
498	622
499		- oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	623	+ copyOptionsPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
500	624	oneStepButton.setToolTipText("Animate one step forward");
501	625	oneStepButton.addActionListener(this);
502	626
503		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	627	+ copyOptionsPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
504	628	fastCB.setToolTipText("Fast mode");
505	629	fastCB.addItemListener(this);
506	630
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);
	631	+ //oe.toolboxPanel.Return();
	632	+
	633	+ copyOptionsPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
512	634	screenfitButton.setToolTipText("Screen fit");
513	635	screenfitButton.addActionListener(this);
	636	+
	637	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	638	+// trackCB.setToolTipText("Enable tracking");
	639	+// trackCB.addItemListener(this);
514	640
515	641	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
516	642	// screenfitpointButton.addActionListener(this);
..	..	@@ -522,65 +648,145 @@
522	648	snapobjectButton.setToolTipText("Snap Object");
523	649	}
524	650
525		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
526		- flashSelectionButton.setToolTipText("Show selection");
527		- flashSelectionButton.addActionListener(this);
	651	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
528	652
529		- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
530		-
531		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	653	+ oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
532	654	twoButton.setToolTipText("Show center view only");
533	655	twoButton.addActionListener(this);
534		- oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	656	+ this.fullscreenLayout = twoButton;
	657	+
	658	+ oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
535	659	fourButton.addActionListener(this);
536	660	fourButton.setToolTipText("Show left panel only");
537		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	661	+ oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
538	662	sixButton.setToolTipText("2-column layout left");
539	663	sixButton.addActionListener(this);
540		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	664	+ oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
541	665	threeButton.setToolTipText("2-column layout right");
542	666	threeButton.addActionListener(this);
543		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	667	+ oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
544	668	sevenButton.setToolTipText("3-column layout");
545	669	sevenButton.addActionListener(this);
546	670	//
547	671
548		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	672	+ oe.toolbarPanel.add(rootButton = GetButton("icons/write.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
549	673	rootButton.setToolTipText("Edit selection in new tab");
550	674	rootButton.addActionListener(this);
551	675
552		- oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	676	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
553	677	closeButton.setToolTipText("Close tab");
554	678	closeButton.addActionListener(this);
555	679	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
556	680	//clearButton.addActionListener(this);
557		-
558		- cGridBag commandsPanel = new cGridBag();
	681	+
	682	+ // INSERT
	683	+ oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	684	+ gridButton.setToolTipText("Create grid");
	685	+ gridButton.addActionListener(this);
	686	+
	687	+ oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	688	+ boxButton.setToolTipText("Create box");
	689	+ boxButton.addActionListener(this);
	690	+
	691	+ oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	692	+ sphereButton.setToolTipText("Create sphere");
	693	+ sphereButton.addActionListener(this);
	694	+
	695	+ oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	696	+ coneButton.setToolTipText("Create cone");
	697	+ coneButton.addActionListener(this);
	698	+
	699	+ oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	700	+ torusButton.setToolTipText("Create torus");
	701	+ torusButton.addActionListener(this);
	702	+
	703	+ oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	704	+ superButton.setToolTipText("Create superellipsoid");
	705	+ superButton.addActionListener(this);
	706	+
	707	+ if (Globals.ADVANCED)
	708	+ {
	709	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	710	+ kleinButton.setToolTipText("Create Klein bottle");
	711	+ kleinButton.addActionListener(this);
	712	+ }
559	713
560		- commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
561		- editButton.setToolTipText("Edit selection");
	714	+ oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	715	+ particlesButton.setToolTipText("Create particle system");
	716	+ particlesButton.addActionListener(this);
	717	+
	718	+ oe.toolboxPanel.Return();
	719	+
	720	+ oe.toolboxPanel.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	721	+ groupButton.setToolTipText("Create group");
	722	+ groupButton.addActionListener(this);
	723	+
	724	+ oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	725	+ compositeButton.setToolTipText("Create composite");
	726	+ compositeButton.addActionListener(this);
	727	+
	728	+ oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	729	+ switchButton.setToolTipText("Create switch");
	730	+ switchButton.addActionListener(this);
	731	+
	732	+ oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	733	+ loopButton.setToolTipText("Create loop");
	734	+ loopButton.addActionListener(this);
	735	+
	736	+ oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	737	+ textureButton.setToolTipText("Create texture");
	738	+ textureButton.addActionListener(this);
	739	+
	740	+ oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	741	+ overlayButton.setToolTipText("Create overlay");
	742	+ overlayButton.addActionListener(this);
	743	+
	744	+ oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	745	+ lightButton.setToolTipText("Create light");
	746	+ lightButton.addActionListener(this);
	747	+
	748	+ for (int i=6; --i>=0;)
	749	+ {
	750	+ oe.toolboxPanel.Return();
	751	+ oe.toolboxPanel.add(new cGridBag());
	752	+ oe.toolboxPanel.add(new cGridBag());
	753	+ oe.toolboxPanel.add(new cGridBag());
	754	+ oe.toolboxPanel.add(new cGridBag());
	755	+ oe.toolboxPanel.add(new cGridBag());
	756	+ oe.toolboxPanel.add(new cGridBag());
	757	+ oe.toolboxPanel.add(new cGridBag());
	758	+ }
	759	+
	760	+ // EDIT panel
	761	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	762	+ editButton.setToolTipText("Pin selection controls");
562	763	editButton.addActionListener(this);
563	764
564		- commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
565		- uneditButton.setToolTipText("Unedit selection");
	765	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	766	+ uneditButton.setToolTipText("Remove selection controls");
566	767	uneditButton.addActionListener(this);
567	768
568		- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
569		- allParamsButton.setToolTipText("Edit all params");
	769	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	770	+ allParamsButton.setToolTipText("Show all controle");
570	771	allParamsButton.addActionListener(this);
571	772
572		- commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	773	+ editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
573	774	clearPanelButton.setToolTipText("Clear edit panel");
574	775	clearPanelButton.addActionListener(this);
575	776
576		- commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	777	+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
577	778	unselectButton.setToolTipText("Unselect");
578	779	unselectButton.addActionListener(this);
579	780
580		- commandsPanel.preferredHeight = 1;
	781	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	782	+ flashSelectionButton.setToolTipText("Highlight selection");
	783	+ flashSelectionButton.addActionListener(this);
581	784
582		- oe.treePanel.add(commandsPanel);
583		- oe.treePanel.Return();
	785	+ editCommandsPanel.preferredHeight = 1;
	786	+
	787	+ SetPinStates(false);
	788	+// oe.treePanel.add(commandsPanel);
	789	+// oe.treePanel.Return();
584	790
585	791	// oe.aConstraints.gridx += 1;
586	792	// oe.aConstraints.weighty = 0;
..	..	@@ -597,27 +803,12 @@
597	803
598	804	JScrollPane jSP;
599	805	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
600		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	806	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
601	807	ResetModel();
602	808
603	809	oe.treePanel.add(jSPPanel);
604	810	oe.treePanel.Return();
605	811
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	812	oe.treePanel.add(copyOptionsPanel);
622	813	oe.treePanel.Return();
623	814
..	..	@@ -648,12 +839,26 @@
648	839
649	840	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
650	841	{
	842	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	843	+ colorCB.setToolTipText("Copy color when dropped");
	844	+ colorCB.addItemListener(this);
	845	+
	846	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	847	+ materialCB.setToolTipText("Copy material when dropped");
	848	+ materialCB.addItemListener(this);
	849	+
	850	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	851	+ textureCB.setToolTipText("Copy texture when dropped");
	852	+ textureCB.addItemListener(this);
	853	+
	854	+ panel.Return();
	855	+
651	856	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
652	857	boxCB.setToolTipText("Display bounding boxes");
653	858	boxCB.addItemListener(this);
654	859
655	860	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
656		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	861	+ zoomBoxCB.setToolTipText("Display only for wheel");
657	862	zoomBoxCB.addItemListener(this);
658	863
659	864	if (true) // Globals.ADVANCED)
..	..	@@ -665,6 +870,8 @@
665	870	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
666	871	// localCB.addItemListener(this);
667	872
	873	+ panel.Return();
	874	+
668	875	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
669	876	crowdCB.setToolTipText("Used for crowds");
670	877	crowdCB.addItemListener(this);
..	..	@@ -681,6 +888,8 @@
681	888	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
682	889	// speakerMocapCB.addItemListener(this);
683	890
	891	+ panel.Return();
	892	+
684	893	if (false)
685	894	{
686	895	// handled in scripts
..	..	@@ -695,32 +904,72 @@
695	904	//constraints.gridy += 1;
696	905	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
697	906	smoothfocusCB.addItemListener(this);
	907	+ panel.Return();
698	908	}
699	909
700	910	//constraints.gridx += 1;
701	911	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
702	912	// debugCB.addItemListener(this);
703	913
	914	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	915	+ trackCB.setToolTipText("Enable tracking target");
	916	+ trackCB.addItemListener(this);
	917	+
704	918	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	919	+ oeilCB.setToolTipText("Move camera when tracking");
705	920	oeilCB.addItemListener(this);
706	921
	922	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	923	+ shadowCB.setToolTipText("When live compute shadows");
	924	+ shadowCB.addItemListener(this);
	925	+
	926	+ panel.Return();
	927	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	928	+ toggleTextureCB.setToolTipText("Load textures");
	929	+ toggleTextureCB.addItemListener(this);
	930	+
	931	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	932	+ toggleSwitchCB.setToolTipText("Use switch");
	933	+ toggleSwitchCB.addItemListener(this);
	934	+
	935	+ panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
	936	+ autosaveCB.setToolTipText("On structure change");
	937	+ autosaveCB.addItemListener(this);
	938	+
	939	+ panel.Return();
	940	+ if (Globals.ADVANCED)
	941	+ {
707	942	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
708	943	lookAtCB.setToolTipText("Look-at target");
709	944	lookAtCB.addItemListener(this);
	945	+ }
710	946
711	947	}
712	948
713	949	cGridBag fill = new cGridBag();
714		-
715	950	fill.preferredHeight = 200;
	951	+ cGridBag fill2 = new cGridBag();
	952	+ fill2.preferredHeight = 200;
	953	+ cGridBag fill3 = new cGridBag();
	954	+ fill3.preferredHeight = 200;
716	955
717	956	panel.add(fill);
	957	+ panel.add(fill2);
	958	+ panel.add(fill3);
718	959
719	960	}
720	961
721	962	void EditObject(Object3D obj)
722	963	{
723	964	cRadio radioButton = new cRadio(obj.name);
	965	+
	966	+ // Patch to avoid bug with transparency.
	967	+ radioButton.hadMaterial = obj.material != null;
	968	+ if (!radioButton.hadMaterial)
	969	+ {
	970	+ obj.material = new cMaterial();
	971	+ }
	972	+
724	973	radioButton.SetObject(obj);
725	974	radioButton.layout = sevenButton;
726	975	radioButton.SetCamera(cameraView.renderCamera, false);
..	..	@@ -729,8 +978,11 @@
729	978	buttonGroup.add(radioButton);
730	979	radioButton.doClick();
731	980	}
	981	+
732	982	void SetupViews(ObjEditor oe)
733	983	{
	984	+ theFrame = this;
	985	+
734	986	oe.SetupViews();
735	987
736	988	System.out.println("SetupViews");
..	..	@@ -739,23 +991,27 @@
739	991	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
740	992	}
741	993
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;
	994	+ cToggleButton liveCB;
	995	+ cCheckBox supportCB;
	996	+ cCheckBox localCB;
	997	+ cCheckBox crowdCB;
	998	+ cCheckBox smoothCB;
	999	+ cToggleButton fastCB;
	1000	+ cCheckBox slowCB;
	1001	+ cCheckBox boxCB;
	1002	+ cCheckBox zoomBoxCB;
	1003	+ //cToggleButton trackCB;
	1004	+ cCheckBox trackCB;
	1005	+ cCheckBox smoothfocusCB;
753	1006	// JCheckBox speakerMocapCB;
754		- JCheckBox speakerCameraCB;
755		- JCheckBox speakerFocusCB;
756		- JCheckBox debugCB;
757		- JCheckBox oeilCB;
758		- JCheckBox lookAtCB;
	1007	+ cCheckBox speakerCameraCB;
	1008	+ cCheckBox speakerFocusCB;
	1009	+ cCheckBox debugCB;
	1010	+
	1011	+ cCheckBox oeilCB;
	1012	+ cCheckBox shadowCB;
	1013	+ cCheckBox autosaveCB;
	1014	+ cCheckBox lookAtCB;
759	1015
760	1016	// static int COLOR = 1;
761	1017	// static int MATERIAL = 2;
..	..	@@ -763,9 +1019,9 @@
763	1019
764	1020	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
765	1021
766		- JCheckBox colorCB;
767		- JCheckBox materialCB;
768		- JCheckBox textureCB;
	1022	+ cCheckBox colorCB;
	1023	+ cCheckBox materialCB;
	1024	+ cCheckBox textureCB;
769	1025
770	1026	public void itemStateChanged(ItemEvent e)
771	1027	{
..	..	@@ -793,6 +1049,7 @@
793	1049	} else if(e.getSource() == liveCB)
794	1050	{
795	1051	cameraView.ToggleLive();
	1052	+ refreshContents(false);
796	1053	}
797	1054	else if(e.getSource() == supportCB)
798	1055	{
..	..	@@ -857,6 +1114,14 @@
857	1114	{
858	1115	cameraView.ToggleOeil();
859	1116	}
	1117	+ else if(e.getSource() == shadowCB)
	1118	+ {
	1119	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1120	+ }
	1121	+ else if(e.getSource() == autosaveCB)
	1122	+ {
	1123	+ Globals.SAVEONMAKE ^= true;
	1124	+ }
860	1125	else if(e.getSource() == lookAtCB)
861	1126	{
862	1127	cameraView.ToggleLookAt();
..	..	@@ -873,7 +1138,8 @@
873	1138
874	1139	/**/
875	1140	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
876		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1141	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1142	+ TreePath path = objEditor.jTree.getSelectionPath();
877	1143	if ((path == null) \|\| (path.getPathCount() <= 1)) {
878	1144	// We can't move the root node or an empty selection
879	1145	return;
..	..	@@ -990,23 +1256,33 @@
990	1256
991	1257	assert target == objEditor.jTree;
992	1258	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1259	+ Object3D destinationLeaf;
993	1260	try {
994		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1261	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
995	1262	} catch (Exception e) {
996	1263	System.out.println("destinationPath : " + destinationPath);
997	1264	return;
998	1265	}
999	1266
1000		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1267	+ for (int i=group.selection.size(); --i>=0;)
1001	1268	{
	1269	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1270	+
	1271	+ // Cannot move into itself
	1272	+ if (child == destinationLeaf)
	1273	+ return;
	1274	+ }
	1275	+
	1276	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1277	+// {
1002	1278	loadClipboard(true);
1003	1279	objEditor.jTree.setSelectionPath(destinationPath);
1004	1280	pasteInto(false, false);
1005		- } else {
1006		- loadClipboard(false);
1007		- objEditor.jTree.setSelectionPath(destinationPath);
1008		- pasteInto(false, false); // true); // ???
1009		- }
	1281	+// } else {
	1282	+// loadClipboard(false);
	1283	+// objEditor.jTree.setSelectionPath(destinationPath);
	1284	+// pasteInto(false, false); // true); // ???
	1285	+// }
1010	1286	}
1011	1287	public void dropActionChanged(DropTargetDragEvent dtde)
1012	1288	// Called if the user has modified the current drop gesture
..	..	@@ -1111,22 +1387,30 @@
1111	1387	{
1112	1388	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1113	1389	//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);
	1390	+// gridItem = menu.add(new MenuItem("Grid"));
	1391	+// gridItem.addActionListener(this);
	1392	+// rectoidItem = menu.add(new MenuItem("Box"));
	1393	+// rectoidItem.addActionListener(this);
	1394	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1395	+// ellipsoidItem.addActionListener(this);
	1396	+// coneItem = menu.add(new MenuItem("Cone"));
	1397	+// coneItem.addActionListener(this);
	1398	+// torusItem = menu.add(new MenuItem("Torus"));
	1399	+// torusItem.addActionListener(this);
	1400	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1401	+// superItem.addActionListener(this);
	1402	+
	1403	+ cameraItem = menu.add(new MenuItem("Camera"));
	1404	+ cameraItem.addActionListener(this);
	1405	+
	1406	+ if (!Globals.ADVANCED)
	1407	+ {
1126	1408	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1127	1409	kleinItem.addActionListener(this);
1128		- particleItem = menu.add(new MenuItem("Particle system"));
1129		- particleItem.addActionListener(this);
	1410	+ }
	1411	+
	1412	+// particleItem = menu.add(new MenuItem("Particle system"));
	1413	+// particleItem.addActionListener(this);
1130	1414	if (Globals.ADVANCED)
1131	1415	{
1132	1416	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1152,15 +1436,15 @@
1152	1436	}
1153	1437	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1154	1438	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);
	1439	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1440	+// overlayItem.addActionListener(this);
	1441	+// lightItem = menu.add(new MenuItem("Light"));
	1442	+// lightItem.addActionListener(this);
1159	1443	menu.add("-");
1160	1444	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1161	1445	//superLoopItem.addActionListener(this);
1162		- loopItem = menu.add(new MenuItem("Loop"));
1163		- loopItem.addActionListener(this);
	1446	+// loopItem = menu.add(new MenuItem("Loop"));
	1447	+// loopItem.addActionListener(this);
1164	1448	doubleItem = menu.add(new MenuItem("Fork"));
1165	1449	doubleItem.addActionListener(this);
1166	1450	if (Globals.ADVANCED)
..	..	@@ -1200,7 +1484,7 @@
1200	1484	memoryItem.addActionListener(this);
1201	1485	menu.add(analyzeItem = new MenuItem("Analyze"));
1202	1486	analyzeItem.addActionListener(this);
1203		- menu.add(dumpItem = new MenuItem("Dump"));
	1487	+ menu.add(dumpItem = new MenuItem("Print"));
1204	1488	dumpItem.addActionListener(this);
1205	1489	// menu.add(pathItem = new MenuItem("From-to path"));
1206	1490	// pathItem.addActionListener(this);
..	..	@@ -1341,9 +1625,24 @@
1341	1625	shadow.material = new cMaterial(obj.material);
1342	1626	shadow.material.diffuse = 0.0001f;
1343	1627	shadow.material.specular = 0.0001f;
	1628	+ //shadow.projectedVertices[1].x = 300;
1344	1629
1345	1630	makeSomething(shadow);
1346	1631	}
	1632	+
	1633	+ private void ClearUnpinned()
	1634	+ {
	1635	+ //for (Object3D obj : listUI)
	1636	+ for (int i=listUI.size(); --i>=0;)
	1637	+ {
	1638	+ Object3D obj = listUI.elementAt(i);
	1639	+ if (!obj.pinned)
	1640	+ {
	1641	+ obj.CloseUI();
	1642	+ listUI.remove(i);
	1643	+ }
	1644	+ }
	1645	+ }
1347	1646
1348	1647	/**
1349	1648	* applyExample
..	..	@@ -1588,7 +1887,7 @@
1588	1887	{
1589	1888	ScreenFit();
1590	1889	} else
1591		- if (source == switchItem)
	1890	+ if (source == switchViewItem)
1592	1891	{
1593	1892	cVector v1 = new cVector();
1594	1893	cVector v2 = new cVector();
..	..	@@ -1597,11 +1896,11 @@
1597	1896	objEditor.cameraView.renderCamera.setAim(v2, v1);
1598	1897	objEditor.cameraView.repaint();
1599	1898	} else
1600		- if (source == rectoidItem)
	1899	+ if (source == rectoidItem \|\| source == boxButton)
1601	1900	{
1602	1901	makeSomething(new Box());
1603	1902	} else
1604		- if (source == particleItem)
	1903	+ if (source == particleItem \|\| source == particlesButton)
1605	1904	{
1606	1905	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1607	1906	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1680,27 +1979,27 @@
1680	1979
1681	1980	makeSomething(obj);
1682	1981	} else
1683		- if (source == gridItem)
	1982	+ if (source == gridItem \|\| source == gridButton)
1684	1983	{
1685	1984	makeSomething(new Grid());
1686	1985	} else
1687		- if (source == ellipsoidItem)
	1986	+ if (source == ellipsoidItem \|\| source == sphereButton)
1688	1987	{
1689	1988	makeSomething(new Sphere());
1690	1989	} else
1691		- if (source == coneItem)
	1990	+ if (source == coneItem \|\| source == coneButton)
1692	1991	{
1693	1992	makeSomething(new Cone());
1694	1993	} else
1695		- if (source == torusItem)
	1994	+ if (source == torusItem \|\| source == torusButton)
1696	1995	{
1697	1996	makeSomething(new Torus());
1698	1997	} else
1699		- if (source == superItem)
	1998	+ if (source == superItem \|\| source == superButton)
1700	1999	{
1701	2000	makeSomething(new Superellipsoid());
1702	2001	} else
1703		- if (source == kleinItem)
	2002	+ if (source == kleinItem \|\| source == kleinButton)
1704	2003	{
1705	2004	makeSomething(new Klein());
1706	2005	} else
..	..	@@ -1720,7 +2019,7 @@
1720	2019	{
1721	2020	makeSomething(new BezierSurface());
1722	2021	} else
1723		- if (source == overlayItem)
	2022	+ if (source == overlayItem \|\| source == overlayButton)
1724	2023	{
1725	2024	/*
1726	2025	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1768,7 +2067,7 @@
1768	2067	s.setup();
1769	2068	makeSomething(s);
1770	2069	} else
1771		- if (source == lightItem)
	2070	+ if (source == lightItem \|\| source == lightButton)
1772	2071	{
1773	2072	makeSomething(new Light());
1774	2073	} else
..	..	@@ -1818,7 +2117,7 @@
1818	2117
1819	2118	group(g);
1820	2119	} else
1821		- if (source == loopItem)
	2120	+ if (source == loopItem \|\| source == loopButton)
1822	2121	{
1823	2122	Composite csg = new GroupLeaf();
1824	2123	csg.count = 5;
..	..	@@ -1853,31 +2152,6 @@
1853	2152	child = new cGroup();
1854	2153	csg.addChild(child);
1855	2154	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	2155	} else
1882	2156	if (source == computeAOItem)
1883	2157	{
..	..	@@ -1915,6 +2189,30 @@
1915	2189	if (source == dumpItem)
1916	2190	{
1917	2191	DumpObject();
	2192	+ } else
	2193	+ if (source == minButton)
	2194	+ {
	2195	+ Minimize();
	2196	+ } else
	2197	+ if (source == maxButton)
	2198	+ {
	2199	+ Maximize();
	2200	+ } else
	2201	+ if (source == fullButton)
	2202	+ {
	2203	+ ToggleFullScreen();
	2204	+ } else
	2205	+ if (source == undoButton)
	2206	+ {
	2207	+ Undo();
	2208	+ } else
	2209	+ if (source == redoButton)
	2210	+ {
	2211	+ Redo();
	2212	+ } else
	2213	+ if (source == saveButton)
	2214	+ {
	2215	+ Save();
1918	2216	} else
1919	2217	if (source == oneStepButton)
1920	2218	{
..	..	@@ -1969,6 +2267,14 @@
1969	2267	if (source == cutItem \|\| source == clearButton)
1970	2268	{
1971	2269	loadClipboard(true);
	2270	+ } else
	2271	+ if (source == undoItem)
	2272	+ {
	2273	+ Undo();
	2274	+ } else
	2275	+ if (source == redoItem)
	2276	+ {
	2277	+ Redo();
1972	2278	} else
1973	2279	if (source == duplicateItem)
1974	2280	{
..	..	@@ -2281,7 +2587,7 @@
2281	2587	{
2282	2588	RevertMeshes();
2283	2589	} else
2284		- if (source == resetMeshItem)
	2590	+ if (source == resetAllItem)
2285	2591	{
2286	2592	ResetAll();
2287	2593	} else
..	..	@@ -2301,9 +2607,9 @@
2301	2607	{
2302	2608	ClearSelection(true);
2303	2609	} else
2304		- if (source == grabItem)
	2610	+ if (source == grabItem \|\| source == groupButton)
2305	2611	{
2306		- group(new cGroup(), true);
	2612	+ group(new cGroup(), false); // true);
2307	2613	} else
2308	2614	if (source == hideItem)
2309	2615	{
..	..	@@ -2321,11 +2627,11 @@
2321	2627	{
2322	2628	makeSomething(new Camera());
2323	2629	} else
2324		- if (source == compositeItem)
	2630	+ if (source == compositeItem \|\| source == compositeButton)
2325	2631	{
2326	2632	group(new Composite());
2327	2633	} else
2328		- if (source == randomItem)
	2634	+ if (source == switchItem \|\| source == switchButton)
2329	2635	{
2330	2636	RandomNode random = new RandomNode();
2331	2637	group(random);
..	..	@@ -2427,7 +2733,7 @@
2427	2733	{
2428	2734	group(new cLinker());
2429	2735	} else
2430		- if (source == textureItem)
	2736	+ if (source == textureItem \|\| source == textureButton)
2431	2737	{
2432	2738	group(new TextureNode());
2433	2739	} else
..	..	@@ -2447,7 +2753,7 @@
2447	2753	{
2448	2754	CastShadow(2);
2449	2755	} else
2450		- if (source == ungroupItem)
	2756	+ if (source == ungroupItem \|\| source == ungroupButton)
2451	2757	{
2452	2758	//ungroup();
2453	2759	for (int i=0; i<group.selection.size(); i++)
..	..	@@ -2469,7 +2775,7 @@
2469	2775	} else
2470	2776	if (source == genNormalsMESHItem)
2471	2777	{
2472		- GenNormals(true); // TODO
	2778	+ GenNormalsMESH();
2473	2779	} else
2474	2780	if (source == genNormalsORGANItem)
2475	2781	{
..	..	@@ -2534,6 +2840,22 @@
2534	2840	if (source == unmarkleavesItem)
2535	2841	{
2536	2842	MarkLeaves(false);
	2843	+ } else
	2844	+ if (source == rewindleavesItem)
	2845	+ {
	2846	+ RewindLeaves(true);
	2847	+ } else
	2848	+ if (source == unrewindleavesItem)
	2849	+ {
	2850	+ RewindLeaves(false);
	2851	+ } else
	2852	+ if (source == randomleavesItem)
	2853	+ {
	2854	+ RandomLeaves(true);
	2855	+ } else
	2856	+ if (source == unrandomleavesItem)
	2857	+ {
	2858	+ RandomLeaves(false);
2537	2859	} else
2538	2860	if (source == flipVItem)
2539	2861	{
..	..	@@ -2769,6 +3091,10 @@
2769	3091	if (source == twoButton)
2770	3092	{
2771	3093	radio.layout = twoButton;
	3094	+
	3095	+ if (CameraPane.FULLSCREEN)
	3096	+ fullscreenLayout = radio.layout;
	3097	+
2772	3098	// bug
2773	3099	//gridPanel.setDividerLocation(1.0);
2774	3100	//bigPanel.setDividerLocation(0.0);
..	..	@@ -2801,10 +3127,31 @@
2801	3127	bigThree.ClearUI();
2802	3128	bigThree.add(centralPanel);
2803	3129	bigThree.FlushUI();
	3130	+
	3131	+ cameraView.requestFocusInWindow();
	3132	+
	3133	+// refreshContents(true);
	3134	+//
	3135	+// try
	3136	+// {
	3137	+// java.awt.Robot bot = new java.awt.Robot();
	3138	+// int mask = InputEvent.BUTTON1_MASK;
	3139	+// bot.mouseMove(100, 100);
	3140	+// bot.mousePress(mask);
	3141	+// bot.mouseRelease(mask);
	3142	+// }
	3143	+// catch (Exception e)
	3144	+// {
	3145	+//
	3146	+// }
	3147	+
2804	3148	} else
2805	3149	if (source == threeButton)
2806	3150	{
2807	3151	radio.layout = threeButton;
	3152	+
	3153	+ if (CameraPane.FULLSCREEN)
	3154	+ fullscreenLayout = radio.layout;
2808	3155
2809	3156	// bigThree.remove(scenePanel);
2810	3157	// bigThree.remove(centralPanel);
..	..	@@ -2837,10 +3184,15 @@
2837	3184	bigThree.add(centralPanel);
2838	3185	bigThree.add(XYZPanel);
2839	3186	bigThree.FlushUI();
	3187	+
	3188	+ cameraView.requestFocusInWindow();
2840	3189	} else
2841	3190	if (source == fourButton)
2842	3191	{
2843	3192	radio.layout = fourButton;
	3193	+
	3194	+ if (CameraPane.FULLSCREEN)
	3195	+ fullscreenLayout = radio.layout;
2844	3196
2845	3197	// bigThree.remove(scenePanel);
2846	3198	// bigThree.remove(centralPanel);
..	..	@@ -2872,10 +3224,15 @@
2872	3224	bigThree.ClearUI();
2873	3225	bigThree.add(scenePanel);
2874	3226	bigThree.FlushUI();
	3227	+
	3228	+ cameraView.requestFocusInWindow();
2875	3229	} else
2876	3230	if (source == sixButton)
2877	3231	{
2878	3232	radio.layout = sixButton;
	3233	+
	3234	+ if (CameraPane.FULLSCREEN)
	3235	+ fullscreenLayout = radio.layout;
2879	3236
2880	3237	// bigThree.remove(scenePanel);
2881	3238	// bigThree.remove(centralPanel);
..	..	@@ -2908,10 +3265,15 @@
2908	3265	bigThree.add(scenePanel);
2909	3266	bigThree.add(centralPanel);
2910	3267	bigThree.FlushUI();
	3268	+
	3269	+ cameraView.requestFocusInWindow();
2911	3270	} else
2912	3271	if (source == sevenButton)
2913	3272	{
2914	3273	radio.layout = sevenButton;
	3274	+
	3275	+ if (CameraPane.FULLSCREEN)
	3276	+ fullscreenLayout = radio.layout;
2915	3277
2916	3278	// bigThree.remove(scenePanel);
2917	3279	// bigThree.remove(centralPanel);
..	..	@@ -2945,6 +3307,8 @@
2945	3307	bigThree.add(centralPanel);
2946	3308	bigThree.add(XYZPanel);
2947	3309	bigThree.FlushUI();
	3310	+
	3311	+ cameraView.requestFocusInWindow();
2948	3312	} else
2949	3313	if (source == rootButton)
2950	3314	{
..	..	@@ -2956,6 +3320,7 @@
2956	3320	EditObject(obj);
2957	3321	}
2958	3322
	3323	+ cameraView.requestFocusInWindow();
2959	3324	refreshContents(true);
2960	3325	} else
2961	3326	if (source == closeButton)
..	..	@@ -2965,22 +3330,37 @@
2965	3330	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2966	3331	{
2967	3332	ab = (cRadio)e.nextElement();
2968		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3333	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2969	3334	{
	3335	+ // Patch to avoid bug with transparency.
	3336	+ if (!ab.hadMaterial)
	3337	+ {
	3338	+ ab.object.material = null;
	3339	+ }
	3340	+
2970	3341	buttonGroup.remove(ab);
2971	3342	radioPanel.remove(ab);
2972	3343
2973		- ab.GetObject().editWindow = null;
	3344	+ //ab.GetObject().editWindow = null;
	3345	+ ab.GetObject().manipWindow = null;
2974	3346	// ab.GetObject().objectUI = null; // ?????????
2975	3347
2976	3348	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2977	3349	break;
2978	3350	}
2979	3351	}
	3352	+
	3353	+ cameraView.requestFocusInWindow();
2980	3354	refreshContents(true);
2981	3355	} else
2982	3356	if (source == editItem \|\| source == editButton)
2983	3357	{
	3358	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3359	+ {
	3360	+ Object3D child = (Object3D)e.nextElement();
	3361	+ child.pinned = true;
	3362	+ }
	3363	+
2984	3364	EditSelection(false);
2985	3365	} else
2986	3366	if (source == uneditButton)
..	..	@@ -2990,10 +3370,11 @@
2990	3370	Object3D child = (Object3D)e.nextElement();
2991	3371	if(child.editWindow != null)
2992	3372	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3373	+ child.pinned = false;
2993	3374	child.CloseUI();
2994	3375	listUI.remove(child);
2995	3376
2996		- child.editWindow = null; // ???????????
	3377	+ //child.editWindow = null; // ???????????
2997	3378	}
2998	3379	objEditor.ctrlPanel.FlushUI();
2999	3380	//objEditor.jTree.clearSelection();
..	..	@@ -3006,6 +3387,7 @@
3006	3387	//copy.ClearUI();
3007	3388	for (Object3D obj : listUI)
3008	3389	{
	3390	+ obj.pinned = false;
3009	3391	obj.CloseUI();
3010	3392	}
3011	3393	listUI.clear();
..	..	@@ -3015,7 +3397,7 @@
3015	3397	{
3016	3398	assert(copy == group);
3017	3399
3018		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3400	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3019	3401
3020	3402	for (Object3D obj : listUI)
3021	3403	{
..	..	@@ -3079,20 +3461,44 @@
3079	3461	frontView.object = group;
3080	3462	sideView.object = group;
3081	3463	}
3082		- group.editWindow = this;
	3464	+
	3465	+// fix "+" issue
	3466	+ //group.editWindow = this;
	3467	+ group.manipWindow = this;
	3468	+
3083	3469	/*
3084	3470	currentLayout = radio.layout;
3085	3471	if (currentLayout == null)
3086	3472	currentLayout = sevenButton;
3087	3473	*/
3088	3474	radio.layout.doClick();
	3475	+
	3476	+ ClearUnpinned();
	3477	+ SetPinStates(group.selection.size() > 0);
	3478	+ if (group.selection.size() == 1)
	3479	+ EditSelection(false);
3089	3480	keepparent = group.parent;
3090	3481	// PARENT = NULL or not???
3091	3482	//group.parent = null; // ROOT
3092	3483	//group.attributes = -1;
3093	3484	ResetModel();
	3485	+
	3486	+ cameraView.requestFocusInWindow();
3094	3487	refreshContents(true);
3095		- }
	3488	+ } else if (event.getSource() == editCameraItem)
	3489	+ {
	3490	+ cameraView.ProtectCamera();
	3491	+ cameraView.repaint();
	3492	+ return;
	3493	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
	3494	+ {
	3495	+ cameraView.RevertCamera();
	3496	+ cameraView.repaint();
	3497	+ return;
	3498	+ // } else if (event.getSource() == textureButton)
	3499	+ // {
	3500	+ // return; // true;
	3501	+ }
3096	3502	else
3097	3503	{
3098	3504	//return super.action(event, arg);
..	..	@@ -3101,7 +3507,6 @@
3101	3507	}
3102	3508
3103	3509	boolean useclient = false;
3104		- cRadio radio;
3105	3510
3106	3511	void ToggleRoot()
3107	3512	{
..	..	@@ -3340,7 +3745,8 @@
3340	3745
3341	3746	int size = obj.MemorySize();
3342	3747
3343		- System.err.println((size/1024) + " KB is the size of " + obj);
	3748	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	3749	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3344	3750	}
3345	3751	}
3346	3752	catch (Exception e)
..	..	@@ -3421,6 +3827,13 @@
3421	3827	void GenNormals(boolean crease)
3422	3828	{
3423	3829	group.GenNormalsS(crease);
	3830	+
	3831	+ refreshContents();
	3832	+ }
	3833	+
	3834	+ void GenNormalsMESH()
	3835	+ {
	3836	+ group.GenNormalsMeshS();
3424	3837
3425	3838	refreshContents();
3426	3839	}
..	..	@@ -3652,7 +4065,16 @@
3652	4065	String pigment = Object3D.GetPigment(tex);
3653	4066	//String bump = Object3D.GetBump(tex);
3654	4067
3655		- com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4068	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	4069	+
	4070	+ try
	4071	+ {
	4072	+ texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4073	+ }
	4074	+ catch (Exception e)
	4075	+ {
	4076	+ System.err.println("FAIL: " + node);
	4077	+ }
3656	4078
3657	4079	double s = v.s;
3658	4080
..	..	@@ -4039,6 +4461,18 @@
4039	4461	refreshContents();
4040	4462	}
4041	4463
	4464	+ void RewindLeaves(boolean hide)
	4465	+ {
	4466	+ group.selection.RewindLeaves(hide);
	4467	+ refreshContents();
	4468	+ }
	4469	+
	4470	+ void RandomLeaves(boolean hide)
	4471	+ {
	4472	+ group.selection.RandomLeaves(hide);
	4473	+ refreshContents();
	4474	+ }
	4475	+
4042	4476	void SetTexRes(int tr)
4043	4477	{
4044	4478	group.selection.SetTexRes(tr);
..	..	@@ -4110,10 +4544,6 @@
4110	4544	// }
4111	4545	// }
4112	4546
4113		- static boolean allparams = true;
4114		-
4115		- static Vector<Object3D> listUI = new Vector<Object3D>();
4116		-
4117	4547	void EditSelection(boolean newWindow)
4118	4548	{
4119	4549	// aConstraints.gridy = 0;
..	..	@@ -4121,10 +4551,10 @@
4121	4551	{
4122	4552	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4123	4553	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4124		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4554	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4125	4555
4126	4556	Object3D elem = (Object3D)group.selection.elementAt(i);
4127		- if(elem != group)
	4557	+ if(elem != group \|\| !newWindow)
4128	4558	{
4129	4559	// if (!(elem instanceof Composite))
4130	4560	// newWindow = false;
..	..	@@ -4206,7 +4636,8 @@
4206	4636	//new Exception().printStackTrace();
4207	4637
4208	4638	freezemodel = true;
4209		-
	4639	+ ClearUnpinned();
	4640	+
4210	4641	/**/
4211	4642	//switch (event.id)
4212	4643	{
..	..	@@ -4214,7 +4645,6 @@
4214	4645	//case 702: // Event.LIST_DESELECT
4215	4646	group.deselectAll();
4216	4647	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4217		- objEditor.ClearInfo(); // .GetMaterial());
4218	4648	if (tps != null)
4219	4649	{
4220	4650	for (int i=0; i < tps.length; i++)
..	..	@@ -4223,10 +4653,8 @@
4223	4653
4224	4654	//if (child.parent != null)
4225	4655	//child.parent.addSelectee(child);
	4656	+ objEditor.SetMaterial(child);
4226	4657	group.addSelectee(child);
4227		- objEditor.SetMaterial(child); // .GetMaterial());
4228		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4229		- System.err.println("info : " + child.GetPath());
4230	4658	}
4231	4659	}
4232	4660	// else
..	..	@@ -4236,20 +4664,28 @@
4236	4664	// System.err.println("info : " + group.GetPath());
4237	4665	// }
4238	4666
4239		- objEditor.SetText(); // jan 2014
4240		-
4241		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4667	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4242	4668	CameraPane.flash = true;
4243	4669
4244		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4670	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4245	4671	// a camera
4246	4672	{
4247		- CameraPane.camerachangeframe = 0; // don't refuse it
4248		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4673	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
	4674	+ {
	4675	+ CameraPane.camerachangeframe = 0; // don't refuse it
	4676	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4677	+ }
4249	4678	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4250	4679	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4251	4680	}
4252	4681
	4682	+ if (tps != null && tps.length == 1)
	4683	+ {
	4684	+ EditSelection(false);
	4685	+ }
	4686	+
	4687	+ SetPinStates(tps != null && tps.length > 0);
	4688	+
4253	4689	refreshContents();
4254	4690	//return true;
4255	4691	}
..	..	@@ -4258,6 +4694,35 @@
4258	4694
4259	4695	freezemodel = false;
4260	4696	}
	4697	+
	4698	+ void SetPinStates(boolean enabled)
	4699	+ {
	4700	+ editButton.setEnabled(enabled);
	4701	+ uneditButton.setEnabled(enabled);
	4702	+ unselectButton.setEnabled(enabled);
	4703	+ flashSelectionButton.setEnabled(enabled);
	4704	+ }
	4705	+
	4706	+ void refreshContents(boolean cp)
	4707	+ {
	4708	+ if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
	4709	+ if (!Globals.MOUSEDRAGGED) // && !Globals.TIMERRUNNING)
	4710	+ {
	4711	+ objEditor.ClearInfo(); // .GetMaterial());
	4712	+
	4713	+ for (int i=0; i < group.selection.Size(); i++)
	4714	+ {
	4715	+ Object3D child = (Object3D) group.selection.get(i);
	4716	+
	4717	+ objEditor.AddInfo(child, this, true);
	4718	+ System.err.println("info : " + child.GetPath());
	4719	+ }
	4720	+
	4721	+ objEditor.SetText(); // jan 2014
	4722	+ }
	4723	+
	4724	+ super.refreshContents(cp);
	4725	+ }
4261	4726
4262	4727	void linkSomething(Object3D thing)
4263	4728	{
..	..	@@ -4329,6 +4794,7 @@
4329	4794	{
4330	4795	if (group.selection.isEmpty())
4331	4796	return;
	4797	+
4332	4798	Grafreed.clipboardIsTempGroup = false;
4333	4799	Composite tGroup = null;
4334	4800	if (group.selection.size() > 0) // 1)
..	..	@@ -4339,6 +4805,8 @@
4339	4805
4340	4806	if (cut)
4341	4807	{
	4808	+ if (Globals.SAVEONMAKE)
	4809	+ Save();
4342	4810	//int indices[] = jList.getSelectedIndices();
4343	4811	//for (int i = indices.length - 1; i >= 0; i--)
4344	4812	//jList.remove(indices[i]);
..	..	@@ -4428,8 +4896,10 @@
4428	4896	}
4429	4897
4430	4898	}
	4899	+
4431	4900	if (Grafreed.clipboardIsTempGroup)
4432	4901	Grafreed.clipboard = tGroup;
	4902	+
4433	4903	if (cut)
4434	4904	{
4435	4905	ResetModel();
..	..	@@ -4961,21 +5431,6 @@
4961	5431	}
4962	5432	*/
4963	5433
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	5434	/*
4980	5435	public void Callback(Object obj)
4981	5436	{
..	..	@@ -4999,23 +5454,6 @@
4999	5454	}
5000	5455	*/
5001	5456
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	5457	String GetFile(String dialogName)
5020	5458	{
5021	5459	if (Grafreed.standAlone)
..	..	@@ -5086,7 +5524,31 @@
5086	5524	cButton clearpanelButton;
5087	5525	cButton unselectButton;
5088	5526
	5527	+ cButton restoreCameraButton;
	5528	+
	5529	+ cButton minButton;
	5530	+ cButton maxButton;
	5531	+ cButton fullButton;
	5532	+ cButton saveButton;
5089	5533	cButton oneStepButton;
	5534	+
	5535	+ cButton groupButton;
	5536	+ cButton ungroupButton;
	5537	+ cButton compositeButton;
	5538	+ cButton switchButton;
	5539	+ cButton loopButton;
	5540	+ cButton textureButton;
	5541	+
	5542	+ cButton gridButton;
	5543	+ cButton boxButton;
	5544	+ cButton sphereButton;
	5545	+ cButton coneButton;
	5546	+ cButton torusButton;
	5547	+ cButton superButton;
	5548	+ cButton kleinButton;
	5549	+ cButton particlesButton;
	5550	+ cButton overlayButton;
	5551	+ cButton lightButton;
5090	5552
5091	5553	cButton screenfitButton;
5092	5554	cButton screenfitpointButton;
..	..	@@ -5099,14 +5561,6 @@
5099	5561
5100	5562	cButton setsupportButton;
5101	5563
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	5564	//
5111	5565	//Composite
5112	5566	Object3D // to do !!
..	..	@@ -5116,9 +5570,11 @@
5116	5570	//JTree jTree;
5117	5571	private MenuItem lookAtItem;
5118	5572	private MenuItem lookFromItem;
5119		- private MenuItem switchItem;
	5573	+ private MenuItem switchViewItem;
5120	5574	private MenuItem cutItem;
5121		- private MenuItem duplicateItem;
	5575	+ private MenuItem undoItem;
	5576	+ private MenuItem redoItem;
	5577	+ private JMenuItem duplicateItem;
5122	5578	private MenuItem cloneItem;
5123	5579	private MenuItem cloneSupportItem;
5124	5580	private MenuItem overwriteGeoItem;
..	..	@@ -5131,7 +5587,7 @@
5131	5587	private MenuItem linkverticesItem;
5132	5588	private MenuItem relinkverticesItem;
5133	5589	private MenuItem setMasterItem;
5134		- private MenuItem resetMeshItem;
	5590	+ private MenuItem resetAllItem;
5135	5591	private MenuItem stepAllItem;
5136	5592	private MenuItem revertMeshItem;
5137	5593	private MenuItem poseMeshItem;
..	..	@@ -5181,6 +5637,10 @@
5181	5637	private MenuItem showleavesItem;
5182	5638	private MenuItem markleavesItem;
5183	5639	private MenuItem unmarkleavesItem;
	5640	+ private MenuItem rewindleavesItem;
	5641	+ private MenuItem unrewindleavesItem;
	5642	+ private MenuItem randomleavesItem;
	5643	+ private MenuItem unrandomleavesItem;
5184	5644
5185	5645	private MenuItem flipVItem;
5186	5646	private MenuItem unflipVItem;
..	..	@@ -5202,7 +5662,7 @@
5202	5662	private MenuItem frontItem;
5203	5663	private MenuItem cameraItem;
5204	5664	private MenuItem compositeItem;
5205		- private MenuItem randomItem;
	5665	+ private MenuItem switchItem;
5206	5666	private MenuItem physicsItem;
5207	5667	private MenuItem frameselectorItem;
5208	5668	private MenuItem scriptNodeItem;
..	..	@@ -5264,11 +5724,6 @@
5264	5724	private MenuItem doubleItem;
5265	5725	private MenuItem tripleItem;
5266	5726
5267		- private MenuItem importGFDItem;
5268		- private MenuItem importVRMLX3DItem;
5269		- private MenuItem import3DSItem;
5270		- private MenuItem importOBJItem;
5271		-
5272	5727	private MenuItem computeAOItem;
5273	5728	private MenuItem recompileItem;
5274	5729	private MenuItem editScriptItem;
..	..	@@ -5278,4 +5733,8 @@
5278	5733	private MenuItem analyzeItem;
5279	5734	private MenuItem dumpItem;
5280	5735	//boolean freezemodel = false;
	5736	+
	5737	+ Menu cameraMenu;
	5738	+ MenuItem editCameraItem;
	5739	+ MenuItem restoreCameraItem;
5281	5740	}