~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -150,16 +150,19 @@
150	150
151	151	void SetupMenu2(GroupEditor oe)
152	152	{
	153	+ oe.jTree = new cTree();
	154	+
153	155	Menu menu;
154	156	oe.menuBar.add(menu = new Menu("Edit"));
155	157	//editItem = menu.add(new MenuItem("Edit"));
156	158	//editItem.addActionListener(this);
157		- undoItem = menu.add(new MenuItem("Undo"));
158		- undoItem.addActionListener(this);
159		- redoItem = menu.add(new MenuItem("Redo"));
160		- redoItem.addActionListener(this);
161		- menu.add("-");
162		- 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"));
163	166	duplicateItem.addActionListener(this);
164	167	cloneItem = menu.add(new MenuItem("Clone"));
165	168	cloneItem.addActionListener(this);
..	..	@@ -175,7 +178,6 @@
175	178	copyItem.addActionListener(this);
176	179	pasteItem = menu.add(new MenuItem("Paste"));
177	180	pasteItem.addActionListener(this);
178		- menu.add("-");
179	181
180	182	menu.add("-");
181	183	pasteIntoItem = menu.add(new MenuItem("Paste into"));
..	..	@@ -202,23 +204,23 @@
202	204	//zBufferItem.addActionListener(this);
203	205	//cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
204	206	//normalLensItem.addActionListener(this);
205		- cameraMenu.add(revertCameraItem = new MenuItem("Restore Camera"));
206		- revertCameraItem.addActionListener(this);
	207	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	208	+ restoreCameraItem.addActionListener(this);
207	209
208		- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
209		- toggleFullScreenItem.addItemListener(this);
210		- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
211		- cameraMenu.add("-");
	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);
212	222
213		- cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
214		- toggleTextureItem.addItemListener(this);
215		- toggleTextureItem.setState(CameraPane.textureon);
216		-
217		- cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
218		- toggleSwitchItem.addItemListener(this);
219		- toggleSwitchItem.setState(CameraPane.SWITCH);
220		-
221		- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
	223	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
222	224	toggleHandleItem.addItemListener(this);
223	225	toggleHandleItem.setState(CameraPane.HANDLES);
224	226
..	..	@@ -245,7 +247,7 @@
245	247
246	248	cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
247	249	toggleDebugItem.addItemListener(this);
248		- toggleDebugItem.setState(CameraPane.DEBUG);
	250	+ toggleDebugItem.setState(Globals.DEBUG);
249	251
250	252	cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
251	253	toggleFrustumItem.addItemListener(this);
..	..	@@ -266,14 +268,14 @@
266	268	// animationItem.addItemListener(this);
267	269	// animationItem.setState(CameraPane.ANIMATION);
268	270	cameraMenu.add("-");
269		- cameraMenu.add(editCameraItem = new MenuItem("Save Camera"));
	271	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
270	272	editCameraItem.addActionListener(this);
271	273
272	274	if (Globals.ADVANCED)
273	275	{
274	276	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
275	277	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
276		- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
	278	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
277	279	editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
278	280	oe.cameraMenu.add("-");
279	281	openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
..	..	@@ -281,7 +283,7 @@
281	283	editLeafItem.addActionListener(this);
282	284	lookAtItem.addActionListener(this);
283	285	//lookFromItem.addActinoListener(this);
284		- //switchItem.addActionListener(this);
	286	+ //switchViewItem.addActionListener(this);
285	287	}
286	288
287	289	oe.menuBar.add(menu = new Menu("Setting"));
..	..	@@ -326,21 +328,29 @@
326	328	}
327	329
328	330	oe.menuBar.add(menu = new Menu("Group"));
329		- grabItem = menu.add(new MenuItem("Grab"));
330		- grabItem.addActionListener(this);
	331	+// grabItem = menu.add(new MenuItem("Grab"));
	332	+// grabItem.addActionListener(this);
331	333	backItem = menu.add(new MenuItem("Back"));
332	334	backItem.addActionListener(this);
333	335	frontItem = menu.add(new MenuItem("Front"));
334	336	frontItem.addActionListener(this);
335		- compositeItem = menu.add(new MenuItem("Composite"));
336		- compositeItem.addActionListener(this);
	337	+// compositeItem = menu.add(new MenuItem("Composite"));
	338	+// compositeItem.addActionListener(this);
	339	+
	340	+ if (Globals.ADVANCED)
	341	+ {
337	342	hideItem = menu.add(new MenuItem("Hidden Group"));
338	343	hideItem.addActionListener(this);
	344	+ }
339	345	ungroupItem = menu.add(new MenuItem("Ungroup"));
340	346	ungroupItem.addActionListener(this);
341		- menu.add("-");
342		- randomItem = menu.add(new MenuItem("Switch node"));
343		- 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	+ {
344	354	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
345	355	switchGeoItem.addActionListener(this);
346	356	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
..	..	@@ -348,8 +358,6 @@
348	358	morphItem = menu.add(new MenuItem("Morph Group"));
349	359	morphItem.addActionListener(this);
350	360
351		- if (Globals.ADVANCED)
352		- {
353	361	menu.add("-");
354	362	physicsItem = menu.add(new MenuItem("Physics"));
355	363	physicsItem.addActionListener(this);
..	..	@@ -357,22 +365,20 @@
357	365	frameselectorItem.addActionListener(this);
358	366	scriptNodeItem = menu.add(new MenuItem("Script Node"));
359	367	scriptNodeItem.addActionListener(this);
360		- cameraItem = menu.add(new MenuItem("Camera"));
361		- cameraItem.addActionListener(this);
362	368	}
363	369
364	370	oe.menuBar.add(menu = new Menu("Object"));
365		- textureItem = menu.add(new MenuItem("Texture"));
366		- textureItem.addActionListener(this);
	371	+// textureItem = menu.add(new MenuItem("Texture"));
	372	+// textureItem.addActionListener(this);
367	373	billboardItem = menu.add(new MenuItem("Billboard"));
368	374	billboardItem.addActionListener(this);
369	375	csgItem = menu.add(new MenuItem("CSG"));
370	376	csgItem.addActionListener(this);
371		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	377	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
372	378	shadowXItem.addActionListener(this);
373		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	379	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
374	380	shadowYItem.addActionListener(this);
375		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	381	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
376	382	shadowZItem.addActionListener(this);
377	383	if (Globals.ADVANCED)
378	384	{
..	..	@@ -469,6 +475,14 @@
469	475	markleavesItem.addActionListener(this);
470	476	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
471	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);
472	486	menu.add("-");
473	487	flipVItem = menu.add(new MenuItem("Flip V"));
474	488	flipVItem.addActionListener(this);
..	..	@@ -526,6 +540,18 @@
526	540
527	541	void SetupUI2(ObjEditor oe)
528	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	+
529	555	//new Exception().printStackTrace();
530	556
531	557	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -554,27 +580,66 @@
554	580	oe.radioPanel.add(dummyButton);
555	581	oe.buttonGroup.add(dummyButton);
556	582	*/
	583	+ cGridBag copyOptionsPanel = new cGridBag();
	584	+
	585	+ copyOptionsPanel.preferredHeight = 1;
	586	+
557	587	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
558	588
559		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
	589	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	590	+ //minButton.setToolTipText("Minimize window");
	591	+ //minButton.addActionListener(this);
	592	+
	593	+ if (Globals.ADVANCED)
	594	+ {
	595	+ oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	596	+ maxButton.setToolTipText("Maximize window");
	597	+ maxButton.addActionListener(this);
	598	+ }
	599	+
	600	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	601	+ fullButton.setToolTipText("Full-screen window");
	602	+ fullButton.addActionListener(this);
	603	+
	604	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	605	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	606	+ restoreCameraButton.addActionListener(this);
	607	+
	608	+ copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	609	+ undoButton.setToolTipText("Undo changes");
	610	+ undoButton.addActionListener(this);
	611	+ undoButton.setEnabled(false);
	612	+
	613	+ copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	614	+ redoButton.setToolTipText("Redo changes");
	615	+ redoButton.addActionListener(this);
	616	+ redoButton.setEnabled(false);
	617	+
	618	+ copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	619	+ saveButton.setToolTipText("Save changes");
	620	+ saveButton.addActionListener(this);
	621	+
	622	+ copyOptionsPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
560	623	liveCB.setToolTipText("Enable animation");
561	624	liveCB.addItemListener(this);
562	625
563		- oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	626	+ copyOptionsPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
564	627	oneStepButton.setToolTipText("Animate one step forward");
565	628	oneStepButton.addActionListener(this);
566	629
567		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	630	+ copyOptionsPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
568	631	fastCB.setToolTipText("Fast mode");
569	632	fastCB.addItemListener(this);
570	633
571		- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
572		- trackCB.setToolTipText("Enable tracking");
573		- trackCB.addItemListener(this);
574		-
575		- oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	634	+ //oe.toolboxPanel.Return();
	635	+
	636	+ copyOptionsPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
576	637	screenfitButton.setToolTipText("Screen fit");
577	638	screenfitButton.addActionListener(this);
	639	+
	640	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	641	+// trackCB.setToolTipText("Enable tracking");
	642	+// trackCB.addItemListener(this);
578	643
579	644	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
580	645	// screenfitpointButton.addActionListener(this);
..	..	@@ -586,65 +651,145 @@
586	651	snapobjectButton.setToolTipText("Snap Object");
587	652	}
588	653
589		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
590		- flashSelectionButton.setToolTipText("Show selection");
591		- flashSelectionButton.addActionListener(this);
	654	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
592	655
593		- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
594		-
595		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	656	+ oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
596	657	twoButton.setToolTipText("Show center view only");
597	658	twoButton.addActionListener(this);
598		- oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	659	+ this.fullscreenLayout = twoButton;
	660	+
	661	+ oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
599	662	fourButton.addActionListener(this);
600	663	fourButton.setToolTipText("Show left panel only");
601		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	664	+ oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
602	665	sixButton.setToolTipText("2-column layout left");
603	666	sixButton.addActionListener(this);
604		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	667	+ oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
605	668	threeButton.setToolTipText("2-column layout right");
606	669	threeButton.addActionListener(this);
607		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	670	+ oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
608	671	sevenButton.setToolTipText("3-column layout");
609	672	sevenButton.addActionListener(this);
610	673	//
611	674
612		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	675	+ oe.toolbarPanel.add(rootButton = GetButton("icons/write.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
613	676	rootButton.setToolTipText("Edit selection in new tab");
614	677	rootButton.addActionListener(this);
615	678
616		- oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	679	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
617	680	closeButton.setToolTipText("Close tab");
618	681	closeButton.addActionListener(this);
619	682	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
620	683	//clearButton.addActionListener(this);
621		-
622		- cGridBag commandsPanel = new cGridBag();
	684	+
	685	+ // INSERT
	686	+ oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	687	+ gridButton.setToolTipText("Create grid");
	688	+ gridButton.addActionListener(this);
	689	+
	690	+ oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	691	+ boxButton.setToolTipText("Create box");
	692	+ boxButton.addActionListener(this);
	693	+
	694	+ oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	695	+ sphereButton.setToolTipText("Create sphere");
	696	+ sphereButton.addActionListener(this);
	697	+
	698	+ oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	699	+ coneButton.setToolTipText("Create cone");
	700	+ coneButton.addActionListener(this);
	701	+
	702	+ oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	703	+ torusButton.setToolTipText("Create torus");
	704	+ torusButton.addActionListener(this);
	705	+
	706	+ oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	707	+ superButton.setToolTipText("Create superellipsoid");
	708	+ superButton.addActionListener(this);
	709	+
	710	+ if (Globals.ADVANCED)
	711	+ {
	712	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	713	+ kleinButton.setToolTipText("Create Klein bottle");
	714	+ kleinButton.addActionListener(this);
	715	+ }
623	716
624		- commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
625		- editButton.setToolTipText("Edit selection");
	717	+ oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	718	+ particlesButton.setToolTipText("Create particle system");
	719	+ particlesButton.addActionListener(this);
	720	+
	721	+ oe.toolboxPanel.Return();
	722	+
	723	+ oe.toolboxPanel.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	724	+ groupButton.setToolTipText("Create group");
	725	+ groupButton.addActionListener(this);
	726	+
	727	+ oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	728	+ compositeButton.setToolTipText("Create composite");
	729	+ compositeButton.addActionListener(this);
	730	+
	731	+ oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	732	+ switchButton.setToolTipText("Create item switcher");
	733	+ switchButton.addActionListener(this);
	734	+
	735	+ oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	736	+ loopButton.setToolTipText("Create loop");
	737	+ loopButton.addActionListener(this);
	738	+
	739	+ oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	740	+ textureButton.setToolTipText("Create texture");
	741	+ textureButton.addActionListener(this);
	742	+
	743	+ oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	744	+ overlayButton.setToolTipText("Create overlay");
	745	+ overlayButton.addActionListener(this);
	746	+
	747	+ oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	748	+ lightButton.setToolTipText("Create light");
	749	+ lightButton.addActionListener(this);
	750	+
	751	+ for (int i=6; --i>=0;)
	752	+ {
	753	+ oe.toolboxPanel.Return();
	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	+ oe.toolboxPanel.add(new cGridBag());
	759	+ oe.toolboxPanel.add(new cGridBag());
	760	+ oe.toolboxPanel.add(new cGridBag());
	761	+ }
	762	+
	763	+ // EDIT panel
	764	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	765	+ editButton.setToolTipText("Pin selection controls");
626	766	editButton.addActionListener(this);
627	767
628		- commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
629		- uneditButton.setToolTipText("Unedit selection");
	768	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	769	+ uneditButton.setToolTipText("Remove selection controls");
630	770	uneditButton.addActionListener(this);
631	771
632		- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
633		- allParamsButton.setToolTipText("Edit all params");
	772	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	773	+ allParamsButton.setToolTipText("Show all controle");
634	774	allParamsButton.addActionListener(this);
635	775
636		- commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	776	+ editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
637	777	clearPanelButton.setToolTipText("Clear edit panel");
638	778	clearPanelButton.addActionListener(this);
639	779
640		- commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	780	+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
641	781	unselectButton.setToolTipText("Unselect");
642	782	unselectButton.addActionListener(this);
643	783
644		- commandsPanel.preferredHeight = 1;
	784	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	785	+ flashSelectionButton.setToolTipText("Highlight selection");
	786	+ flashSelectionButton.addActionListener(this);
645	787
646		- oe.treePanel.add(commandsPanel);
647		- oe.treePanel.Return();
	788	+ editCommandsPanel.preferredHeight = 1;
	789	+
	790	+ SetPinStates(false);
	791	+// oe.treePanel.add(commandsPanel);
	792	+// oe.treePanel.Return();
648	793
649	794	// oe.aConstraints.gridx += 1;
650	795	// oe.aConstraints.weighty = 0;
..	..	@@ -661,27 +806,12 @@
661	806
662	807	JScrollPane jSP;
663	808	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
664		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	809	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
665	810	ResetModel();
666	811
667	812	oe.treePanel.add(jSPPanel);
668	813	oe.treePanel.Return();
669	814
670		- cGridBag copyOptionsPanel = new cGridBag();
671		-
672		- copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
673		- colorCB.setToolTipText("Copy color when dropped");
674		- colorCB.addItemListener(this);
675		-
676		- copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
677		- materialCB.setToolTipText("Copy material when dropped");
678		- materialCB.addItemListener(this);
679		-
680		- copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
681		- textureCB.setToolTipText("Copy texture when dropped");
682		- textureCB.addItemListener(this);
683		-
684		- copyOptionsPanel.preferredHeight = 1;
685	815	oe.treePanel.add(copyOptionsPanel);
686	816	oe.treePanel.Return();
687	817
..	..	@@ -712,23 +842,43 @@
712	842
713	843	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
714	844	{
	845	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	846	+ colorCB.setToolTipText("Copy color when dropped");
	847	+ colorCB.addItemListener(this);
	848	+
	849	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	850	+ materialCB.setToolTipText("Copy material when dropped");
	851	+ materialCB.addItemListener(this);
	852	+
	853	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	854	+ textureCB.setToolTipText("Copy texture when dropped");
	855	+ textureCB.addItemListener(this);
	856	+
	857	+ panel.Return();
	858	+
715	859	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
716	860	boxCB.setToolTipText("Display bounding boxes");
717	861	boxCB.addItemListener(this);
718	862
719	863	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
720		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	864	+ zoomBoxCB.setToolTipText("Display only for wheel");
721	865	zoomBoxCB.addItemListener(this);
722	866
723	867	if (true) // Globals.ADVANCED)
724	868	{
725		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
726		- supportCB.setToolTipText("Enable rigging");
727		- supportCB.addItemListener(this);
	869	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	870	+// supportCB.setToolTipText("Enable rigging");
	871	+// supportCB.addItemListener(this);
	872	+
	873	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	874	+ freezeCB.setToolTipText("Fast moving camera");
	875	+ freezeCB.addItemListener(this);
728	876
729	877	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
730	878	// localCB.addItemListener(this);
731	879
	880	+ panel.Return();
	881	+
732	882	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
733	883	crowdCB.setToolTipText("Used for crowds");
734	884	crowdCB.addItemListener(this);
..	..	@@ -745,6 +895,8 @@
745	895	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
746	896	// speakerMocapCB.addItemListener(this);
747	897
	898	+ panel.Return();
	899	+
748	900	if (false)
749	901	{
750	902	// handled in scripts
..	..	@@ -759,32 +911,72 @@
759	911	//constraints.gridy += 1;
760	912	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
761	913	smoothfocusCB.addItemListener(this);
	914	+ panel.Return();
762	915	}
763	916
764	917	//constraints.gridx += 1;
765	918	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
766	919	// debugCB.addItemListener(this);
767	920
	921	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	922	+ trackCB.setToolTipText("Enable tracking target");
	923	+ trackCB.addItemListener(this);
	924	+
768	925	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	926	+ oeilCB.setToolTipText("Move camera when tracking");
769	927	oeilCB.addItemListener(this);
770	928
	929	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	930	+ shadowCB.setToolTipText("When live compute shadows");
	931	+ shadowCB.addItemListener(this);
	932	+
	933	+ panel.Return();
	934	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	935	+ toggleTextureCB.setToolTipText("Load textures");
	936	+ toggleTextureCB.addItemListener(this);
	937	+
	938	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	939	+ toggleSwitchCB.setToolTipText("Choose a single item");
	940	+ toggleSwitchCB.addItemListener(this);
	941	+
	942	+ panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
	943	+ autosaveCB.setToolTipText("On structure change");
	944	+ autosaveCB.addItemListener(this);
	945	+
	946	+ panel.Return();
	947	+ if (Globals.ADVANCED)
	948	+ {
771	949	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
772	950	lookAtCB.setToolTipText("Look-at target");
773	951	lookAtCB.addItemListener(this);
	952	+ }
774	953
775	954	}
776	955
777	956	cGridBag fill = new cGridBag();
778		-
779	957	fill.preferredHeight = 200;
	958	+ cGridBag fill2 = new cGridBag();
	959	+ fill2.preferredHeight = 200;
	960	+ cGridBag fill3 = new cGridBag();
	961	+ fill3.preferredHeight = 200;
780	962
781	963	panel.add(fill);
	964	+ panel.add(fill2);
	965	+ panel.add(fill3);
782	966
783	967	}
784	968
785	969	void EditObject(Object3D obj)
786	970	{
787	971	cRadio radioButton = new cRadio(obj.name);
	972	+
	973	+ // Patch to avoid bug with transparency.
	974	+ radioButton.hadMaterial = obj.material != null;
	975	+ if (!radioButton.hadMaterial)
	976	+ {
	977	+ obj.material = new cMaterial();
	978	+ }
	979	+
788	980	radioButton.SetObject(obj);
789	981	radioButton.layout = sevenButton;
790	982	radioButton.SetCamera(cameraView.renderCamera, false);
..	..	@@ -796,6 +988,8 @@
796	988
797	989	void SetupViews(ObjEditor oe)
798	990	{
	991	+ theFrame = this;
	992	+
799	993	oe.SetupViews();
800	994
801	995	System.out.println("SetupViews");
..	..	@@ -804,23 +998,28 @@
804	998	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
805	999	}
806	1000
807		- JCheckBox liveCB;
808		- JCheckBox supportCB;
809		- JCheckBox localCB;
810		- JCheckBox crowdCB;
811		- JCheckBox smoothCB;
812		- JCheckBox fastCB;
813		- JCheckBox slowCB;
814		- JCheckBox boxCB;
815		- JCheckBox zoomBoxCB;
816		- JCheckBox trackCB;
817		- JCheckBox smoothfocusCB;
	1001	+ cToggleButton liveCB;
	1002	+ cCheckBox supportCB;
	1003	+ cCheckBox localCB;
	1004	+ cCheckBox crowdCB;
	1005	+ cCheckBox smoothCB;
	1006	+ cToggleButton fastCB;
	1007	+ cCheckBox slowCB;
	1008	+ cCheckBox boxCB;
	1009	+ cCheckBox zoomBoxCB;
	1010	+ cCheckBox freezeCB;
	1011	+ //cToggleButton trackCB;
	1012	+ cCheckBox trackCB;
	1013	+ cCheckBox smoothfocusCB;
818	1014	// JCheckBox speakerMocapCB;
819		- JCheckBox speakerCameraCB;
820		- JCheckBox speakerFocusCB;
821		- JCheckBox debugCB;
822		- JCheckBox oeilCB;
823		- JCheckBox lookAtCB;
	1015	+ cCheckBox speakerCameraCB;
	1016	+ cCheckBox speakerFocusCB;
	1017	+ cCheckBox debugCB;
	1018	+
	1019	+ cCheckBox oeilCB;
	1020	+ cCheckBox shadowCB;
	1021	+ cCheckBox autosaveCB;
	1022	+ cCheckBox lookAtCB;
824	1023
825	1024	// static int COLOR = 1;
826	1025	// static int MATERIAL = 2;
..	..	@@ -828,9 +1027,9 @@
828	1027
829	1028	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
830	1029
831		- JCheckBox colorCB;
832		- JCheckBox materialCB;
833		- JCheckBox textureCB;
	1030	+ cCheckBox colorCB;
	1031	+ cCheckBox materialCB;
	1032	+ cCheckBox textureCB;
834	1033
835	1034	public void itemStateChanged(ItemEvent e)
836	1035	{
..	..	@@ -858,6 +1057,7 @@
858	1057	} else if(e.getSource() == liveCB)
859	1058	{
860	1059	cameraView.ToggleLive();
	1060	+ refreshContents(false);
861	1061	}
862	1062	else if(e.getSource() == supportCB)
863	1063	{
..	..	@@ -922,6 +1122,18 @@
922	1122	{
923	1123	cameraView.ToggleOeil();
924	1124	}
	1125	+ else if(e.getSource() == shadowCB)
	1126	+ {
	1127	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1128	+ }
	1129	+ else if(e.getSource() == freezeCB)
	1130	+ {
	1131	+ Globals.FREEZEONMOVE ^= true;
	1132	+ }
	1133	+ else if(e.getSource() == autosaveCB)
	1134	+ {
	1135	+ Globals.SAVEONMAKE ^= true;
	1136	+ }
925	1137	else if(e.getSource() == lookAtCB)
926	1138	{
927	1139	cameraView.ToggleLookAt();
..	..	@@ -938,7 +1150,8 @@
938	1150
939	1151	/**/
940	1152	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
941		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1153	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1154	+ TreePath path = objEditor.jTree.getSelectionPath();
942	1155	if ((path == null) \|\| (path.getPathCount() <= 1)) {
943	1156	// We can't move the root node or an empty selection
944	1157	return;
..	..	@@ -1055,23 +1268,33 @@
1055	1268
1056	1269	assert target == objEditor.jTree;
1057	1270	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1271	+ Object3D destinationLeaf;
1058	1272	try {
1059		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1273	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
1060	1274	} catch (Exception e) {
1061	1275	System.out.println("destinationPath : " + destinationPath);
1062	1276	return;
1063	1277	}
1064	1278
1065		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1279	+ for (int i=group.selection.size(); --i>=0;)
1066	1280	{
	1281	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1282	+
	1283	+ // Cannot move into itself
	1284	+ if (child == destinationLeaf)
	1285	+ return;
	1286	+ }
	1287	+
	1288	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1289	+// {
1067	1290	loadClipboard(true);
1068	1291	objEditor.jTree.setSelectionPath(destinationPath);
1069	1292	pasteInto(false, false);
1070		- } else {
1071		- loadClipboard(false);
1072		- objEditor.jTree.setSelectionPath(destinationPath);
1073		- pasteInto(false, false); // true); // ???
1074		- }
	1293	+// } else {
	1294	+// loadClipboard(false);
	1295	+// objEditor.jTree.setSelectionPath(destinationPath);
	1296	+// pasteInto(false, false); // true); // ???
	1297	+// }
1075	1298	}
1076	1299	public void dropActionChanged(DropTargetDragEvent dtde)
1077	1300	// Called if the user has modified the current drop gesture
..	..	@@ -1176,22 +1399,30 @@
1176	1399	{
1177	1400	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1178	1401	//heightFieldItem.addActionListener(this);
1179		- gridItem = menu.add(new MenuItem("Grid"));
1180		- gridItem.addActionListener(this);
1181		- rectoidItem = menu.add(new MenuItem("Box"));
1182		- rectoidItem.addActionListener(this);
1183		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1184		- ellipsoidItem.addActionListener(this);
1185		- coneItem = menu.add(new MenuItem("Cone"));
1186		- coneItem.addActionListener(this);
1187		- torusItem = menu.add(new MenuItem("Torus"));
1188		- torusItem.addActionListener(this);
1189		- superItem = menu.add(new MenuItem("Superellipsoid"));
1190		- superItem.addActionListener(this);
	1402	+// gridItem = menu.add(new MenuItem("Grid"));
	1403	+// gridItem.addActionListener(this);
	1404	+// rectoidItem = menu.add(new MenuItem("Box"));
	1405	+// rectoidItem.addActionListener(this);
	1406	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1407	+// ellipsoidItem.addActionListener(this);
	1408	+// coneItem = menu.add(new MenuItem("Cone"));
	1409	+// coneItem.addActionListener(this);
	1410	+// torusItem = menu.add(new MenuItem("Torus"));
	1411	+// torusItem.addActionListener(this);
	1412	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1413	+// superItem.addActionListener(this);
	1414	+
	1415	+ cameraItem = menu.add(new MenuItem("Camera"));
	1416	+ cameraItem.addActionListener(this);
	1417	+
	1418	+ if (!Globals.ADVANCED)
	1419	+ {
1191	1420	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1192	1421	kleinItem.addActionListener(this);
1193		- particleItem = menu.add(new MenuItem("Particle system"));
1194		- particleItem.addActionListener(this);
	1422	+ }
	1423	+
	1424	+// particleItem = menu.add(new MenuItem("Particle system"));
	1425	+// particleItem.addActionListener(this);
1195	1426	if (Globals.ADVANCED)
1196	1427	{
1197	1428	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1217,15 +1448,15 @@
1217	1448	}
1218	1449	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1219	1450	bezierItem.addActionListener(this);
1220		- overlayItem = menu.add(new MenuItem("Overlay"));
1221		- overlayItem.addActionListener(this);
1222		- lightItem = menu.add(new MenuItem("Light"));
1223		- lightItem.addActionListener(this);
	1451	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1452	+// overlayItem.addActionListener(this);
	1453	+// lightItem = menu.add(new MenuItem("Light"));
	1454	+// lightItem.addActionListener(this);
1224	1455	menu.add("-");
1225	1456	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1226	1457	//superLoopItem.addActionListener(this);
1227		- loopItem = menu.add(new MenuItem("Loop"));
1228		- loopItem.addActionListener(this);
	1458	+// loopItem = menu.add(new MenuItem("Loop"));
	1459	+// loopItem.addActionListener(this);
1229	1460	doubleItem = menu.add(new MenuItem("Fork"));
1230	1461	doubleItem.addActionListener(this);
1231	1462	if (Globals.ADVANCED)
..	..	@@ -1265,7 +1496,7 @@
1265	1496	memoryItem.addActionListener(this);
1266	1497	menu.add(analyzeItem = new MenuItem("Analyze"));
1267	1498	analyzeItem.addActionListener(this);
1268		- menu.add(dumpItem = new MenuItem("Dump"));
	1499	+ menu.add(dumpItem = new MenuItem("Print"));
1269	1500	dumpItem.addActionListener(this);
1270	1501	// menu.add(pathItem = new MenuItem("From-to path"));
1271	1502	// pathItem.addActionListener(this);
..	..	@@ -1406,9 +1637,24 @@
1406	1637	shadow.material = new cMaterial(obj.material);
1407	1638	shadow.material.diffuse = 0.0001f;
1408	1639	shadow.material.specular = 0.0001f;
	1640	+ //shadow.projectedVertices[1].x = 300;
1409	1641
1410	1642	makeSomething(shadow);
1411	1643	}
	1644	+
	1645	+ private void ClearUnpinned()
	1646	+ {
	1647	+ //for (Object3D obj : listUI)
	1648	+ for (int i=listUI.size(); --i>=0;)
	1649	+ {
	1650	+ Object3D obj = listUI.elementAt(i);
	1651	+ if (!obj.pinned)
	1652	+ {
	1653	+ obj.CloseUI();
	1654	+ listUI.remove(i);
	1655	+ }
	1656	+ }
	1657	+ }
1412	1658
1413	1659	/**
1414	1660	* applyExample
..	..	@@ -1653,7 +1899,7 @@
1653	1899	{
1654	1900	ScreenFit();
1655	1901	} else
1656		- if (source == switchItem)
	1902	+ if (source == switchViewItem)
1657	1903	{
1658	1904	cVector v1 = new cVector();
1659	1905	cVector v2 = new cVector();
..	..	@@ -1662,11 +1908,11 @@
1662	1908	objEditor.cameraView.renderCamera.setAim(v2, v1);
1663	1909	objEditor.cameraView.repaint();
1664	1910	} else
1665		- if (source == rectoidItem)
	1911	+ if (source == rectoidItem \|\| source == boxButton)
1666	1912	{
1667	1913	makeSomething(new Box());
1668	1914	} else
1669		- if (source == particleItem)
	1915	+ if (source == particleItem \|\| source == particlesButton)
1670	1916	{
1671	1917	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1672	1918	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1745,27 +1991,27 @@
1745	1991
1746	1992	makeSomething(obj);
1747	1993	} else
1748		- if (source == gridItem)
	1994	+ if (source == gridItem \|\| source == gridButton)
1749	1995	{
1750	1996	makeSomething(new Grid());
1751	1997	} else
1752		- if (source == ellipsoidItem)
	1998	+ if (source == ellipsoidItem \|\| source == sphereButton)
1753	1999	{
1754	2000	makeSomething(new Sphere());
1755	2001	} else
1756		- if (source == coneItem)
	2002	+ if (source == coneItem \|\| source == coneButton)
1757	2003	{
1758	2004	makeSomething(new Cone());
1759	2005	} else
1760		- if (source == torusItem)
	2006	+ if (source == torusItem \|\| source == torusButton)
1761	2007	{
1762	2008	makeSomething(new Torus());
1763	2009	} else
1764		- if (source == superItem)
	2010	+ if (source == superItem \|\| source == superButton)
1765	2011	{
1766	2012	makeSomething(new Superellipsoid());
1767	2013	} else
1768		- if (source == kleinItem)
	2014	+ if (source == kleinItem \|\| source == kleinButton)
1769	2015	{
1770	2016	makeSomething(new Klein());
1771	2017	} else
..	..	@@ -1785,7 +2031,7 @@
1785	2031	{
1786	2032	makeSomething(new BezierSurface());
1787	2033	} else
1788		- if (source == overlayItem)
	2034	+ if (source == overlayItem \|\| source == overlayButton)
1789	2035	{
1790	2036	/*
1791	2037	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1833,7 +2079,7 @@
1833	2079	s.setup();
1834	2080	makeSomething(s);
1835	2081	} else
1836		- if (source == lightItem)
	2082	+ if (source == lightItem \|\| source == lightButton)
1837	2083	{
1838	2084	makeSomething(new Light());
1839	2085	} else
..	..	@@ -1883,30 +2129,30 @@
1883	2129
1884	2130	group(g);
1885	2131	} else
1886		- if (source == loopItem)
	2132	+ if (source == loopItem \|\| source == loopButton)
1887	2133	{
1888	2134	Composite csg = new GroupLeaf();
1889	2135	csg.count = 5;
1890	2136	group(csg);
1891		- Composite child = new cGroup();
	2137	+ Composite child = new cGroup("Branch");
1892	2138	csg.addChild(child);
1893	2139	child.addChild(csg);
1894	2140	} else
1895	2141	if (source == doubleItem)
1896	2142	{
1897		- Composite csg = new GroupLeaf();
	2143	+ Composite csg = new GroupLeaf("Fork");
1898	2144	csg.count = 5;
1899	2145	group(csg);
1900		- Composite child = new cGroup();
	2146	+ Composite child = new cGroup("Branch A");
1901	2147	csg.addChild(child);
1902	2148	child.addChild(csg);
1903		- child = new cGroup();
	2149	+ child = new cGroup("Branch B");
1904	2150	csg.addChild(child);
1905	2151	child.addChild(csg);
1906	2152	} else
1907	2153	if (source == tripleItem)
1908	2154	{
1909		- Composite csg = new GroupLeaf();
	2155	+ Composite csg = new GroupLeaf("Trident");
1910	2156	csg.count = 4;
1911	2157	group(csg);
1912	2158	Composite child = new cGroup();
..	..	@@ -1955,6 +2201,30 @@
1955	2201	if (source == dumpItem)
1956	2202	{
1957	2203	DumpObject();
	2204	+ } else
	2205	+ if (source == minButton)
	2206	+ {
	2207	+ Minimize();
	2208	+ } else
	2209	+ if (source == maxButton)
	2210	+ {
	2211	+ Maximize();
	2212	+ } else
	2213	+ if (source == fullButton)
	2214	+ {
	2215	+ ToggleFullScreen();
	2216	+ } else
	2217	+ if (source == undoButton)
	2218	+ {
	2219	+ Undo();
	2220	+ } else
	2221	+ if (source == redoButton)
	2222	+ {
	2223	+ Redo();
	2224	+ } else
	2225	+ if (source == saveButton)
	2226	+ {
	2227	+ Save();
1958	2228	} else
1959	2229	if (source == oneStepButton)
1960	2230	{
..	..	@@ -2349,9 +2619,9 @@
2349	2619	{
2350	2620	ClearSelection(true);
2351	2621	} else
2352		- if (source == grabItem)
	2622	+ if (source == grabItem \|\| source == groupButton)
2353	2623	{
2354		- group(new cGroup(), true);
	2624	+ group(new cGroup(), false); // true);
2355	2625	} else
2356	2626	if (source == hideItem)
2357	2627	{
..	..	@@ -2369,11 +2639,11 @@
2369	2639	{
2370	2640	makeSomething(new Camera());
2371	2641	} else
2372		- if (source == compositeItem)
	2642	+ if (source == compositeItem \|\| source == compositeButton)
2373	2643	{
2374	2644	group(new Composite());
2375	2645	} else
2376		- if (source == randomItem)
	2646	+ if (source == switchItem \|\| source == switchButton)
2377	2647	{
2378	2648	RandomNode random = new RandomNode();
2379	2649	group(random);
..	..	@@ -2475,7 +2745,7 @@
2475	2745	{
2476	2746	group(new cLinker());
2477	2747	} else
2478		- if (source == textureItem)
	2748	+ if (source == textureItem \|\| source == textureButton)
2479	2749	{
2480	2750	group(new TextureNode());
2481	2751	} else
..	..	@@ -2495,17 +2765,30 @@
2495	2765	{
2496	2766	CastShadow(2);
2497	2767	} else
2498		- if (source == ungroupItem)
	2768	+ if (source == ungroupItem \|\| source == ungroupButton)
2499	2769	{
2500		- //ungroup();
	2770	+ boolean hasRoot = false;
	2771	+
2501	2772	for (int i=0; i<group.selection.size(); i++)
2502	2773	{
2503		- Ungroup(group.selection.get(i));
	2774	+ if (group.selection.get(i) == group)
	2775	+ {
	2776	+ hasRoot = true;
	2777	+ break;
	2778	+ }
2504	2779	}
2505	2780
2506		- ClearSelection(false);
2507		-
2508		- refreshContents();
	2781	+ if (!hasRoot)
	2782	+ {
	2783	+ for (int i=0; i<group.selection.size(); i++)
	2784	+ {
	2785	+ Ungroup(group.selection.get(i));
	2786	+ }
	2787	+
	2788	+ ClearSelection(false);
	2789	+
	2790	+ refreshContents();
	2791	+ }
2509	2792	} else
2510	2793	if (source == genUVItem)
2511	2794	{
..	..	@@ -2517,7 +2800,7 @@
2517	2800	} else
2518	2801	if (source == genNormalsMESHItem)
2519	2802	{
2520		- GenNormals(true); // TODO
	2803	+ GenNormalsMESH();
2521	2804	} else
2522	2805	if (source == genNormalsORGANItem)
2523	2806	{
..	..	@@ -2582,6 +2865,22 @@
2582	2865	if (source == unmarkleavesItem)
2583	2866	{
2584	2867	MarkLeaves(false);
	2868	+ } else
	2869	+ if (source == rewindleavesItem)
	2870	+ {
	2871	+ RewindLeaves(true);
	2872	+ } else
	2873	+ if (source == unrewindleavesItem)
	2874	+ {
	2875	+ RewindLeaves(false);
	2876	+ } else
	2877	+ if (source == randomleavesItem)
	2878	+ {
	2879	+ RandomLeaves(true);
	2880	+ } else
	2881	+ if (source == unrandomleavesItem)
	2882	+ {
	2883	+ RandomLeaves(false);
2585	2884	} else
2586	2885	if (source == flipVItem)
2587	2886	{
..	..	@@ -2817,6 +3116,10 @@
2817	3116	if (source == twoButton)
2818	3117	{
2819	3118	radio.layout = twoButton;
	3119	+
	3120	+ if (CameraPane.FULLSCREEN)
	3121	+ fullscreenLayout = radio.layout;
	3122	+
2820	3123	// bug
2821	3124	//gridPanel.setDividerLocation(1.0);
2822	3125	//bigPanel.setDividerLocation(0.0);
..	..	@@ -2849,10 +3152,31 @@
2849	3152	bigThree.ClearUI();
2850	3153	bigThree.add(centralPanel);
2851	3154	bigThree.FlushUI();
	3155	+
	3156	+ cameraView.requestFocusInWindow();
	3157	+
	3158	+// refreshContents(true);
	3159	+//
	3160	+// try
	3161	+// {
	3162	+// java.awt.Robot bot = new java.awt.Robot();
	3163	+// int mask = InputEvent.BUTTON1_MASK;
	3164	+// bot.mouseMove(100, 100);
	3165	+// bot.mousePress(mask);
	3166	+// bot.mouseRelease(mask);
	3167	+// }
	3168	+// catch (Exception e)
	3169	+// {
	3170	+//
	3171	+// }
	3172	+
2852	3173	} else
2853	3174	if (source == threeButton)
2854	3175	{
2855	3176	radio.layout = threeButton;
	3177	+
	3178	+ if (CameraPane.FULLSCREEN)
	3179	+ fullscreenLayout = radio.layout;
2856	3180
2857	3181	// bigThree.remove(scenePanel);
2858	3182	// bigThree.remove(centralPanel);
..	..	@@ -2885,10 +3209,15 @@
2885	3209	bigThree.add(centralPanel);
2886	3210	bigThree.add(XYZPanel);
2887	3211	bigThree.FlushUI();
	3212	+
	3213	+ cameraView.requestFocusInWindow();
2888	3214	} else
2889	3215	if (source == fourButton)
2890	3216	{
2891	3217	radio.layout = fourButton;
	3218	+
	3219	+ if (CameraPane.FULLSCREEN)
	3220	+ fullscreenLayout = radio.layout;
2892	3221
2893	3222	// bigThree.remove(scenePanel);
2894	3223	// bigThree.remove(centralPanel);
..	..	@@ -2920,10 +3249,15 @@
2920	3249	bigThree.ClearUI();
2921	3250	bigThree.add(scenePanel);
2922	3251	bigThree.FlushUI();
	3252	+
	3253	+ cameraView.requestFocusInWindow();
2923	3254	} else
2924	3255	if (source == sixButton)
2925	3256	{
2926	3257	radio.layout = sixButton;
	3258	+
	3259	+ if (CameraPane.FULLSCREEN)
	3260	+ fullscreenLayout = radio.layout;
2927	3261
2928	3262	// bigThree.remove(scenePanel);
2929	3263	// bigThree.remove(centralPanel);
..	..	@@ -2956,10 +3290,15 @@
2956	3290	bigThree.add(scenePanel);
2957	3291	bigThree.add(centralPanel);
2958	3292	bigThree.FlushUI();
	3293	+
	3294	+ cameraView.requestFocusInWindow();
2959	3295	} else
2960	3296	if (source == sevenButton)
2961	3297	{
2962	3298	radio.layout = sevenButton;
	3299	+
	3300	+ if (CameraPane.FULLSCREEN)
	3301	+ fullscreenLayout = radio.layout;
2963	3302
2964	3303	// bigThree.remove(scenePanel);
2965	3304	// bigThree.remove(centralPanel);
..	..	@@ -2993,6 +3332,8 @@
2993	3332	bigThree.add(centralPanel);
2994	3333	bigThree.add(XYZPanel);
2995	3334	bigThree.FlushUI();
	3335	+
	3336	+ cameraView.requestFocusInWindow();
2996	3337	} else
2997	3338	if (source == rootButton)
2998	3339	{
..	..	@@ -3004,6 +3345,7 @@
3004	3345	EditObject(obj);
3005	3346	}
3006	3347
	3348	+ cameraView.requestFocusInWindow();
3007	3349	refreshContents(true);
3008	3350	} else
3009	3351	if (source == closeButton)
..	..	@@ -3013,22 +3355,37 @@
3013	3355	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3014	3356	{
3015	3357	ab = (cRadio)e.nextElement();
3016		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3358	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
3017	3359	{
	3360	+ // Patch to avoid bug with transparency.
	3361	+ if (!ab.hadMaterial)
	3362	+ {
	3363	+ ab.object.material = null;
	3364	+ }
	3365	+
3018	3366	buttonGroup.remove(ab);
3019	3367	radioPanel.remove(ab);
3020	3368
3021		- ab.GetObject().editWindow = null;
	3369	+ //ab.GetObject().editWindow = null;
	3370	+ ab.GetObject().manipWindow = null;
3022	3371	// ab.GetObject().objectUI = null; // ?????????
3023	3372
3024	3373	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
3025	3374	break;
3026	3375	}
3027	3376	}
	3377	+
	3378	+ cameraView.requestFocusInWindow();
3028	3379	refreshContents(true);
3029	3380	} else
3030	3381	if (source == editItem \|\| source == editButton)
3031	3382	{
	3383	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3384	+ {
	3385	+ Object3D child = (Object3D)e.nextElement();
	3386	+ child.pinned = true;
	3387	+ }
	3388	+
3032	3389	EditSelection(false);
3033	3390	} else
3034	3391	if (source == uneditButton)
..	..	@@ -3038,10 +3395,11 @@
3038	3395	Object3D child = (Object3D)e.nextElement();
3039	3396	if(child.editWindow != null)
3040	3397	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3398	+ child.pinned = false;
3041	3399	child.CloseUI();
3042	3400	listUI.remove(child);
3043	3401
3044		- child.editWindow = null; // ???????????
	3402	+ //child.editWindow = null; // ???????????
3045	3403	}
3046	3404	objEditor.ctrlPanel.FlushUI();
3047	3405	//objEditor.jTree.clearSelection();
..	..	@@ -3054,6 +3412,7 @@
3054	3412	//copy.ClearUI();
3055	3413	for (Object3D obj : listUI)
3056	3414	{
	3415	+ obj.pinned = false;
3057	3416	obj.CloseUI();
3058	3417	}
3059	3418	listUI.clear();
..	..	@@ -3063,7 +3422,7 @@
3063	3422	{
3064	3423	assert(copy == group);
3065	3424
3066		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3425	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3067	3426
3068	3427	for (Object3D obj : listUI)
3069	3428	{
..	..	@@ -3128,7 +3487,9 @@
3128	3487	sideView.object = group;
3129	3488	}
3130	3489
3131		-// fix "+" issue group.editWindow = this;
	3490	+// fix "+" issue
	3491	+ //group.editWindow = this;
	3492	+ group.manipWindow = this;
3132	3493
3133	3494	/*
3134	3495	currentLayout = radio.layout;
..	..	@@ -3136,18 +3497,25 @@
3136	3497	currentLayout = sevenButton;
3137	3498	*/
3138	3499	radio.layout.doClick();
	3500	+
	3501	+ ClearUnpinned();
	3502	+ SetPinStates(group.selection.size() > 0);
	3503	+ if (group.selection.size() == 1)
	3504	+ EditSelection(false);
3139	3505	keepparent = group.parent;
3140	3506	// PARENT = NULL or not???
3141	3507	//group.parent = null; // ROOT
3142	3508	//group.attributes = -1;
3143	3509	ResetModel();
	3510	+
	3511	+ cameraView.requestFocusInWindow();
3144	3512	refreshContents(true);
3145	3513	} else if (event.getSource() == editCameraItem)
3146	3514	{
3147	3515	cameraView.ProtectCamera();
3148	3516	cameraView.repaint();
3149	3517	return;
3150		- } else if (event.getSource() == revertCameraItem)
	3518	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3151	3519	{
3152	3520	cameraView.RevertCamera();
3153	3521	cameraView.repaint();
..	..	@@ -3164,7 +3532,6 @@
3164	3532	}
3165	3533
3166	3534	boolean useclient = false;
3167		- cRadio radio;
3168	3535
3169	3536	void ToggleRoot()
3170	3537	{
..	..	@@ -3403,7 +3770,8 @@
3403	3770
3404	3771	int size = obj.MemorySize();
3405	3772
3406		- System.err.println((size/1024) + " KB is the size of " + obj);
	3773	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	3774	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3407	3775	}
3408	3776	}
3409	3777	catch (Exception e)
..	..	@@ -3484,6 +3852,13 @@
3484	3852	void GenNormals(boolean crease)
3485	3853	{
3486	3854	group.GenNormalsS(crease);
	3855	+
	3856	+ refreshContents();
	3857	+ }
	3858	+
	3859	+ void GenNormalsMESH()
	3860	+ {
	3861	+ group.GenNormalsMeshS();
3487	3862
3488	3863	refreshContents();
3489	3864	}
..	..	@@ -4111,6 +4486,18 @@
4111	4486	refreshContents();
4112	4487	}
4113	4488
	4489	+ void RewindLeaves(boolean hide)
	4490	+ {
	4491	+ group.selection.RewindLeaves(hide);
	4492	+ refreshContents();
	4493	+ }
	4494	+
	4495	+ void RandomLeaves(boolean hide)
	4496	+ {
	4497	+ group.selection.RandomLeaves(hide);
	4498	+ refreshContents();
	4499	+ }
	4500	+
4114	4501	void SetTexRes(int tr)
4115	4502	{
4116	4503	group.selection.SetTexRes(tr);
..	..	@@ -4182,10 +4569,6 @@
4182	4569	// }
4183	4570	// }
4184	4571
4185		- static boolean allparams = true;
4186		-
4187		- static Vector<Object3D> listUI = new Vector<Object3D>();
4188		-
4189	4572	void EditSelection(boolean newWindow)
4190	4573	{
4191	4574	// aConstraints.gridy = 0;
..	..	@@ -4193,7 +4576,7 @@
4193	4576	{
4194	4577	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4195	4578	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4196		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4579	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4197	4580
4198	4581	Object3D elem = (Object3D)group.selection.elementAt(i);
4199	4582	if(elem != group \|\| !newWindow)
..	..	@@ -4278,7 +4661,8 @@
4278	4661	//new Exception().printStackTrace();
4279	4662
4280	4663	freezemodel = true;
4281		-
	4664	+ ClearUnpinned();
	4665	+
4282	4666	/**/
4283	4667	//switch (event.id)
4284	4668	{
..	..	@@ -4286,7 +4670,6 @@
4286	4670	//case 702: // Event.LIST_DESELECT
4287	4671	group.deselectAll();
4288	4672	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4289		- objEditor.ClearInfo(); // .GetMaterial());
4290	4673	if (tps != null)
4291	4674	{
4292	4675	for (int i=0; i < tps.length; i++)
..	..	@@ -4295,10 +4678,8 @@
4295	4678
4296	4679	//if (child.parent != null)
4297	4680	//child.parent.addSelectee(child);
	4681	+ objEditor.SetMaterial(child);
4298	4682	group.addSelectee(child);
4299		- objEditor.SetMaterial(child); // .GetMaterial());
4300		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4301		- System.err.println("info : " + child.GetPath());
4302	4683	}
4303	4684	}
4304	4685	// else
..	..	@@ -4308,17 +4689,13 @@
4308	4689	// System.err.println("info : " + group.GetPath());
4309	4690	// }
4310	4691
4311		- objEditor.SetText(); // jan 2014
4312		-
4313		- Object3D object = (Object3D) tps[0].getLastPathComponent();
4314		-
4315		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(object instanceof Camera))
	4692	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4316	4693	CameraPane.flash = true;
4317	4694
4318		- if (tps != null && tps.length > 0 && object instanceof Camera)
	4695	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4319	4696	// a camera
4320	4697	{
4321		- if (object != Globals.theRenderer.LightCamera())
	4698	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
4322	4699	{
4323	4700	CameraPane.camerachangeframe = 0; // don't refuse it
4324	4701	Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
..	..	@@ -4327,6 +4704,13 @@
4327	4704	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4328	4705	}
4329	4706
	4707	+ if (tps != null && tps.length == 1)
	4708	+ {
	4709	+ EditSelection(false);
	4710	+ }
	4711	+
	4712	+ SetPinStates(tps != null && tps.length > 0);
	4713	+
4330	4714	refreshContents();
4331	4715	//return true;
4332	4716	}
..	..	@@ -4335,6 +4719,35 @@
4335	4719
4336	4720	freezemodel = false;
4337	4721	}
	4722	+
	4723	+ void SetPinStates(boolean enabled)
	4724	+ {
	4725	+ editButton.setEnabled(enabled);
	4726	+ uneditButton.setEnabled(enabled);
	4727	+ unselectButton.setEnabled(enabled);
	4728	+ flashSelectionButton.setEnabled(enabled);
	4729	+ }
	4730	+
	4731	+ void refreshContents(boolean cp)
	4732	+ {
	4733	+ if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
	4734	+ if (!Globals.MOUSEDRAGGED) // && !Globals.TIMERRUNNING)
	4735	+ {
	4736	+ objEditor.ClearInfo(); // .GetMaterial());
	4737	+
	4738	+ for (int i=0; i < group.selection.Size(); i++)
	4739	+ {
	4740	+ Object3D child = (Object3D) group.selection.get(i);
	4741	+
	4742	+ objEditor.AddInfo(child, this, true);
	4743	+ System.err.println("info : " + child.GetPath());
	4744	+ }
	4745	+
	4746	+ objEditor.SetText(); // jan 2014
	4747	+ }
	4748	+
	4749	+ super.refreshContents(cp);
	4750	+ }
4338	4751
4339	4752	void linkSomething(Object3D thing)
4340	4753	{
..	..	@@ -4406,6 +4819,7 @@
4406	4819	{
4407	4820	if (group.selection.isEmpty())
4408	4821	return;
	4822	+
4409	4823	Grafreed.clipboardIsTempGroup = false;
4410	4824	Composite tGroup = null;
4411	4825	if (group.selection.size() > 0) // 1)
..	..	@@ -4416,6 +4830,8 @@
4416	4830
4417	4831	if (cut)
4418	4832	{
	4833	+ if (Globals.SAVEONMAKE)
	4834	+ Save();
4419	4835	//int indices[] = jList.getSelectedIndices();
4420	4836	//for (int i = indices.length - 1; i >= 0; i--)
4421	4837	//jList.remove(indices[i]);
..	..	@@ -4505,8 +4921,10 @@
4505	4921	}
4506	4922
4507	4923	}
	4924	+
4508	4925	if (Grafreed.clipboardIsTempGroup)
4509	4926	Grafreed.clipboard = tGroup;
	4927	+
4510	4928	if (cut)
4511	4929	{
4512	4930	ResetModel();
..	..	@@ -5131,7 +5549,28 @@
5131	5549	cButton clearpanelButton;
5132	5550	cButton unselectButton;
5133	5551
	5552	+ cButton restoreCameraButton;
	5553	+
	5554	+ cButton saveButton;
5134	5555	cButton oneStepButton;
	5556	+
	5557	+ cButton groupButton;
	5558	+ cButton ungroupButton;
	5559	+ cButton compositeButton;
	5560	+ cButton switchButton;
	5561	+ cButton loopButton;
	5562	+ cButton textureButton;
	5563	+
	5564	+ cButton gridButton;
	5565	+ cButton boxButton;
	5566	+ cButton sphereButton;
	5567	+ cButton coneButton;
	5568	+ cButton torusButton;
	5569	+ cButton superButton;
	5570	+ cButton kleinButton;
	5571	+ cButton particlesButton;
	5572	+ cButton overlayButton;
	5573	+ cButton lightButton;
5135	5574
5136	5575	cButton screenfitButton;
5137	5576	cButton screenfitpointButton;
..	..	@@ -5144,14 +5583,6 @@
5144	5583
5145	5584	cButton setsupportButton;
5146	5585
5147		- cButton twoButton;
5148		- cButton sixButton;
5149		- cButton threeButton;
5150		- cButton sevenButton;
5151		- cButton fourButton; // full panel
5152		- cButton oneButton; // full XYZ
5153		- //cButton currentLayout;
5154		-
5155	5586	//
5156	5587	//Composite
5157	5588	Object3D // to do !!
..	..	@@ -5161,11 +5592,11 @@
5161	5592	//JTree jTree;
5162	5593	private MenuItem lookAtItem;
5163	5594	private MenuItem lookFromItem;
5164		- private MenuItem switchItem;
	5595	+ private MenuItem switchViewItem;
5165	5596	private MenuItem cutItem;
5166	5597	private MenuItem undoItem;
5167	5598	private MenuItem redoItem;
5168		- private MenuItem duplicateItem;
	5599	+ private JMenuItem duplicateItem;
5169	5600	private MenuItem cloneItem;
5170	5601	private MenuItem cloneSupportItem;
5171	5602	private MenuItem overwriteGeoItem;
..	..	@@ -5228,6 +5659,10 @@
5228	5659	private MenuItem showleavesItem;
5229	5660	private MenuItem markleavesItem;
5230	5661	private MenuItem unmarkleavesItem;
	5662	+ private MenuItem rewindleavesItem;
	5663	+ private MenuItem unrewindleavesItem;
	5664	+ private MenuItem randomleavesItem;
	5665	+ private MenuItem unrandomleavesItem;
5231	5666
5232	5667	private MenuItem flipVItem;
5233	5668	private MenuItem unflipVItem;
..	..	@@ -5249,7 +5684,7 @@
5249	5684	private MenuItem frontItem;
5250	5685	private MenuItem cameraItem;
5251	5686	private MenuItem compositeItem;
5252		- private MenuItem randomItem;
	5687	+ private MenuItem switchItem;
5253	5688	private MenuItem physicsItem;
5254	5689	private MenuItem frameselectorItem;
5255	5690	private MenuItem scriptNodeItem;
..	..	@@ -5323,5 +5758,5 @@
5323	5758
5324	5759	Menu cameraMenu;
5325	5760	MenuItem editCameraItem;
5326		- MenuItem revertCameraItem;
	5761	+ MenuItem restoreCameraItem;
5327	5762	}