~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -150,6 +150,8 @@
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"));
..	..	@@ -160,7 +162,7 @@
160	162	// redoItem = menu.add(new MenuItem("Redo"));
161	163	// redoItem.addActionListener(this);
162	164	// menu.add("-");
163		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	165	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
164	166	duplicateItem.addActionListener(this);
165	167	cloneItem = menu.add(new MenuItem("Clone"));
166	168	cloneItem.addActionListener(this);
..	..	@@ -176,7 +178,6 @@
176	178	copyItem.addActionListener(this);
177	179	pasteItem = menu.add(new MenuItem("Paste"));
178	180	pasteItem.addActionListener(this);
179		- menu.add("-");
180	181
181	182	menu.add("-");
182	183	pasteIntoItem = menu.add(new MenuItem("Paste into"));
..	..	@@ -203,23 +204,23 @@
203	204	//zBufferItem.addActionListener(this);
204	205	//cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
205	206	//normalLensItem.addActionListener(this);
206		- cameraMenu.add(revertCameraItem = new MenuItem("Restore Viewpoint"));
207		- revertCameraItem.addActionListener(this);
	207	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	208	+ restoreCameraItem.addActionListener(this);
208	209
209		- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
210		- toggleFullScreenItem.addItemListener(this);
211		- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
212		- 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);
213	222
214		- cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
215		- toggleTextureItem.addItemListener(this);
216		- toggleTextureItem.setState(CameraPane.textureon);
217		-
218		- cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
219		- toggleSwitchItem.addItemListener(this);
220		- toggleSwitchItem.setState(CameraPane.SWITCH);
221		-
222		- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
	223	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
223	224	toggleHandleItem.addItemListener(this);
224	225	toggleHandleItem.setState(CameraPane.HANDLES);
225	226
..	..	@@ -246,7 +247,7 @@
246	247
247	248	cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
248	249	toggleDebugItem.addItemListener(this);
249		- toggleDebugItem.setState(CameraPane.DEBUG);
	250	+ toggleDebugItem.setState(Globals.DEBUG);
250	251
251	252	cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
252	253	toggleFrustumItem.addItemListener(this);
..	..	@@ -274,7 +275,7 @@
274	275	{
275	276	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
276	277	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
277		- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
	278	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
278	279	editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
279	280	oe.cameraMenu.add("-");
280	281	openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
..	..	@@ -282,7 +283,7 @@
282	283	editLeafItem.addActionListener(this);
283	284	lookAtItem.addActionListener(this);
284	285	//lookFromItem.addActinoListener(this);
285		- //switchItem.addActionListener(this);
	286	+ //switchViewItem.addActionListener(this);
286	287	}
287	288
288	289	oe.menuBar.add(menu = new Menu("Setting"));
..	..	@@ -327,21 +328,29 @@
327	328	}
328	329
329	330	oe.menuBar.add(menu = new Menu("Group"));
330		- grabItem = menu.add(new MenuItem("Grab"));
331		- grabItem.addActionListener(this);
	331	+// grabItem = menu.add(new MenuItem("Grab"));
	332	+// grabItem.addActionListener(this);
332	333	backItem = menu.add(new MenuItem("Back"));
333	334	backItem.addActionListener(this);
334	335	frontItem = menu.add(new MenuItem("Front"));
335	336	frontItem.addActionListener(this);
336		- compositeItem = menu.add(new MenuItem("Composite"));
337		- compositeItem.addActionListener(this);
	337	+// compositeItem = menu.add(new MenuItem("Composite"));
	338	+// compositeItem.addActionListener(this);
	339	+
	340	+ if (Globals.ADVANCED)
	341	+ {
338	342	hideItem = menu.add(new MenuItem("Hidden Group"));
339	343	hideItem.addActionListener(this);
	344	+ }
340	345	ungroupItem = menu.add(new MenuItem("Ungroup"));
341	346	ungroupItem.addActionListener(this);
342		- menu.add("-");
343		- randomItem = menu.add(new MenuItem("Switch node"));
344		- 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	+ {
345	354	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
346	355	switchGeoItem.addActionListener(this);
347	356	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
..	..	@@ -349,8 +358,6 @@
349	358	morphItem = menu.add(new MenuItem("Morph Group"));
350	359	morphItem.addActionListener(this);
351	360
352		- if (Globals.ADVANCED)
353		- {
354	361	menu.add("-");
355	362	physicsItem = menu.add(new MenuItem("Physics"));
356	363	physicsItem.addActionListener(this);
..	..	@@ -358,23 +365,22 @@
358	365	frameselectorItem.addActionListener(this);
359	366	scriptNodeItem = menu.add(new MenuItem("Script Node"));
360	367	scriptNodeItem.addActionListener(this);
361		- cameraItem = menu.add(new MenuItem("Camera"));
362		- cameraItem.addActionListener(this);
363	368	}
364	369
365	370	oe.menuBar.add(menu = new Menu("Object"));
366		- textureItem = menu.add(new MenuItem("Texture"));
367		- textureItem.addActionListener(this);
	371	+// textureItem = menu.add(new MenuItem("Texture"));
	372	+// textureItem.addActionListener(this);
368	373	billboardItem = menu.add(new MenuItem("Billboard"));
369	374	billboardItem.addActionListener(this);
370	375	csgItem = menu.add(new MenuItem("CSG"));
371	376	csgItem.addActionListener(this);
372		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	377	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
373	378	shadowXItem.addActionListener(this);
374		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	379	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
375	380	shadowYItem.addActionListener(this);
376		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	381	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
377	382	shadowZItem.addActionListener(this);
	383	+
378	384	if (Globals.ADVANCED)
379	385	{
380	386	menu.add("-");
..	..	@@ -470,6 +476,14 @@
470	476	markleavesItem.addActionListener(this);
471	477	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
472	478	unmarkleavesItem.addActionListener(this);
	479	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	480	+ rewindleavesItem.addActionListener(this);
	481	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	482	+ unrewindleavesItem.addActionListener(this);
	483	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	484	+ randomleavesItem.addActionListener(this);
	485	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	486	+ unrandomleavesItem.addActionListener(this);
473	487	menu.add("-");
474	488	flipVItem = menu.add(new MenuItem("Flip V"));
475	489	flipVItem.addActionListener(this);
..	..	@@ -527,6 +541,18 @@
527	541
528	542	void SetupUI2(ObjEditor oe)
529	543	{
	544	+ // June 2019
	545	+ if (oe == null)
	546	+ {
	547	+ //super.SetupUI2(this);
	548	+ //return;
	549	+ }
	550	+
	551	+ if (copy != group)
	552	+ {
	553	+ //super.SetupUI2(this);
	554	+ }
	555	+
530	556	//new Exception().printStackTrace();
531	557
532	558	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -555,39 +581,66 @@
555	581	oe.radioPanel.add(dummyButton);
556	582	oe.buttonGroup.add(dummyButton);
557	583	*/
	584	+ cGridBag copyOptionsPanel = new cGridBag();
	585	+
	586	+ copyOptionsPanel.preferredHeight = 1;
	587	+
558	588	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
559	589
560		- oe.toolbarPanel.add(undoButton = new cButton("Undo", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	590	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	591	+ //minButton.setToolTipText("Minimize window");
	592	+ //minButton.addActionListener(this);
	593	+
	594	+ if (Globals.ADVANCED)
	595	+ {
	596	+ oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	597	+ maxButton.setToolTipText("Maximize window");
	598	+ maxButton.addActionListener(this);
	599	+ }
	600	+
	601	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	602	+ fullButton.setToolTipText("Full-screen window");
	603	+ fullButton.addActionListener(this);
	604	+
	605	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	606	+ screenfitButton.setToolTipText("Screen fit");
	607	+ screenfitButton.addActionListener(this);
	608	+
	609	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	610	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	611	+ restoreCameraButton.addActionListener(this);
	612	+
	613	+ copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
561	614	undoButton.setToolTipText("Undo changes");
562	615	undoButton.addActionListener(this);
	616	+ undoButton.setEnabled(false);
563	617
564		- oe.toolbarPanel.add(redoButton = new cButton("Redo", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	618	+ copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
565	619	redoButton.setToolTipText("Redo changes");
566	620	redoButton.addActionListener(this);
	621	+ redoButton.setEnabled(false);
567	622
568		- oe.toolbarPanel.add(saveButton = new cButton("Save", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	623	+ copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
569	624	saveButton.setToolTipText("Save changes");
570	625	saveButton.addActionListener(this);
571	626
572		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
	627	+ copyOptionsPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
573	628	liveCB.setToolTipText("Enable animation");
574	629	liveCB.addItemListener(this);
575	630
576		- oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	631	+ copyOptionsPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
577	632	oneStepButton.setToolTipText("Animate one step forward");
578	633	oneStepButton.addActionListener(this);
579	634
580		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	635	+ copyOptionsPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
581	636	fastCB.setToolTipText("Fast mode");
582	637	fastCB.addItemListener(this);
583	638
584		- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
585		- trackCB.setToolTipText("Enable tracking");
586		- trackCB.addItemListener(this);
587		-
588		- oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
589		- screenfitButton.setToolTipText("Screen fit");
590		- screenfitButton.addActionListener(this);
	639	+ //oe.toolboxPanel.Return();
	640	+
	641	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	642	+// trackCB.setToolTipText("Enable tracking");
	643	+// trackCB.addItemListener(this);
591	644
592	645	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
593	646	// screenfitpointButton.addActionListener(this);
..	..	@@ -599,65 +652,145 @@
599	652	snapobjectButton.setToolTipText("Snap Object");
600	653	}
601	654
602		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
603		- flashSelectionButton.setToolTipText("Show selection");
604		- flashSelectionButton.addActionListener(this);
	655	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
605	656
606		- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
607		-
608		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	657	+ oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
609	658	twoButton.setToolTipText("Show center view only");
610	659	twoButton.addActionListener(this);
611		- oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	660	+ this.fullscreenLayout = twoButton;
	661	+
	662	+ oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
612	663	fourButton.addActionListener(this);
613	664	fourButton.setToolTipText("Show left panel only");
614		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	665	+ oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
615	666	sixButton.setToolTipText("2-column layout left");
616	667	sixButton.addActionListener(this);
617		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	668	+ oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
618	669	threeButton.setToolTipText("2-column layout right");
619	670	threeButton.addActionListener(this);
620		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	671	+ oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
621	672	sevenButton.setToolTipText("3-column layout");
622	673	sevenButton.addActionListener(this);
623	674	//
624	675
625		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	676	+ oe.toolbarPanel.add(rootButton = GetButton("icons/write.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
626	677	rootButton.setToolTipText("Edit selection in new tab");
627	678	rootButton.addActionListener(this);
628	679
629		- oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	680	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
630	681	closeButton.setToolTipText("Close tab");
631	682	closeButton.addActionListener(this);
632	683	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
633	684	//clearButton.addActionListener(this);
634		-
635		- cGridBag commandsPanel = new cGridBag();
	685	+
	686	+ // INSERT
	687	+ oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	688	+ gridButton.setToolTipText("Create grid");
	689	+ gridButton.addActionListener(this);
	690	+
	691	+ oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	692	+ boxButton.setToolTipText("Create box");
	693	+ boxButton.addActionListener(this);
	694	+
	695	+ oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	696	+ sphereButton.setToolTipText("Create sphere");
	697	+ sphereButton.addActionListener(this);
	698	+
	699	+ oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	700	+ coneButton.setToolTipText("Create cone");
	701	+ coneButton.addActionListener(this);
	702	+
	703	+ oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	704	+ torusButton.setToolTipText("Create torus");
	705	+ torusButton.addActionListener(this);
	706	+
	707	+ oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	708	+ superButton.setToolTipText("Create superellipsoid");
	709	+ superButton.addActionListener(this);
	710	+
	711	+ if (Globals.ADVANCED)
	712	+ {
	713	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	714	+ kleinButton.setToolTipText("Create Klein bottle");
	715	+ kleinButton.addActionListener(this);
	716	+ }
636	717
637		- commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
638		- editButton.setToolTipText("Edit selection");
	718	+ oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	719	+ particlesButton.setToolTipText("Create particle system");
	720	+ particlesButton.addActionListener(this);
	721	+
	722	+ oe.toolboxPanel.Return();
	723	+
	724	+ oe.toolboxPanel.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	725	+ groupButton.setToolTipText("Create group");
	726	+ groupButton.addActionListener(this);
	727	+
	728	+ oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	729	+ compositeButton.setToolTipText("Create composite");
	730	+ compositeButton.addActionListener(this);
	731	+
	732	+ oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	733	+ switchButton.setToolTipText("Create item switcher");
	734	+ switchButton.addActionListener(this);
	735	+
	736	+ oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	737	+ loopButton.setToolTipText("Create loop");
	738	+ loopButton.addActionListener(this);
	739	+
	740	+ oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	741	+ textureButton.setToolTipText("Create texture");
	742	+ textureButton.addActionListener(this);
	743	+
	744	+ oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	745	+ overlayButton.setToolTipText("Create overlay");
	746	+ overlayButton.addActionListener(this);
	747	+
	748	+ oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	749	+ lightButton.setToolTipText("Create light");
	750	+ lightButton.addActionListener(this);
	751	+
	752	+ for (int i=6; --i>=0;)
	753	+ {
	754	+ oe.toolboxPanel.Return();
	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	+ oe.toolboxPanel.add(new cGridBag());
	762	+ }
	763	+
	764	+ // EDIT panel
	765	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	766	+ editButton.setToolTipText("Pin selection controls");
639	767	editButton.addActionListener(this);
640	768
641		- commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
642		- uneditButton.setToolTipText("Unedit selection");
	769	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	770	+ uneditButton.setToolTipText("Remove selection controls");
643	771	uneditButton.addActionListener(this);
644	772
645		- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
646		- allParamsButton.setToolTipText("Edit all params");
	773	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	774	+ allParamsButton.setToolTipText("Show all controle");
647	775	allParamsButton.addActionListener(this);
648	776
649		- commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	777	+ editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
650	778	clearPanelButton.setToolTipText("Clear edit panel");
651	779	clearPanelButton.addActionListener(this);
652	780
653		- commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	781	+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
654	782	unselectButton.setToolTipText("Unselect");
655	783	unselectButton.addActionListener(this);
656	784
657		- commandsPanel.preferredHeight = 1;
	785	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	786	+ flashSelectionButton.setToolTipText("Highlight selection");
	787	+ flashSelectionButton.addActionListener(this);
658	788
659		- oe.treePanel.add(commandsPanel);
660		- oe.treePanel.Return();
	789	+ editCommandsPanel.preferredHeight = 1;
	790	+
	791	+ SetPinStates(false);
	792	+// oe.treePanel.add(commandsPanel);
	793	+// oe.treePanel.Return();
661	794
662	795	// oe.aConstraints.gridx += 1;
663	796	// oe.aConstraints.weighty = 0;
..	..	@@ -674,27 +807,12 @@
674	807
675	808	JScrollPane jSP;
676	809	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
677		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	810	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
678	811	ResetModel();
679	812
680	813	oe.treePanel.add(jSPPanel);
681	814	oe.treePanel.Return();
682	815
683		- cGridBag copyOptionsPanel = new cGridBag();
684		-
685		- copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
686		- colorCB.setToolTipText("Copy color when dropped");
687		- colorCB.addItemListener(this);
688		-
689		- copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
690		- materialCB.setToolTipText("Copy material when dropped");
691		- materialCB.addItemListener(this);
692		-
693		- copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
694		- textureCB.setToolTipText("Copy texture when dropped");
695		- textureCB.addItemListener(this);
696		-
697		- copyOptionsPanel.preferredHeight = 1;
698	816	oe.treePanel.add(copyOptionsPanel);
699	817	oe.treePanel.Return();
700	818
..	..	@@ -725,23 +843,43 @@
725	843
726	844	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
727	845	{
	846	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	847	+ colorCB.setToolTipText("Copy color when dropped");
	848	+ colorCB.addItemListener(this);
	849	+
	850	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	851	+ materialCB.setToolTipText("Copy material when dropped");
	852	+ materialCB.addItemListener(this);
	853	+
	854	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	855	+ textureCB.setToolTipText("Copy texture when dropped");
	856	+ textureCB.addItemListener(this);
	857	+
	858	+ panel.Return();
	859	+
728	860	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
729	861	boxCB.setToolTipText("Display bounding boxes");
730	862	boxCB.addItemListener(this);
731	863
732	864	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
733		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	865	+ zoomBoxCB.setToolTipText("Display only for wheel");
734	866	zoomBoxCB.addItemListener(this);
735	867
736	868	if (true) // Globals.ADVANCED)
737	869	{
738		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
739		- supportCB.setToolTipText("Enable rigging");
740		- supportCB.addItemListener(this);
	870	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	871	+// supportCB.setToolTipText("Enable rigging");
	872	+// supportCB.addItemListener(this);
	873	+
	874	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	875	+ freezeCB.setToolTipText("Fast moving camera");
	876	+ freezeCB.addItemListener(this);
741	877
742	878	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
743	879	// localCB.addItemListener(this);
744	880
	881	+ panel.Return();
	882	+
745	883	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
746	884	crowdCB.setToolTipText("Used for crowds");
747	885	crowdCB.addItemListener(this);
..	..	@@ -758,6 +896,8 @@
758	896	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
759	897	// speakerMocapCB.addItemListener(this);
760	898
	899	+ panel.Return();
	900	+
761	901	if (false)
762	902	{
763	903	// handled in scripts
..	..	@@ -772,32 +912,72 @@
772	912	//constraints.gridy += 1;
773	913	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
774	914	smoothfocusCB.addItemListener(this);
	915	+ panel.Return();
775	916	}
776	917
777	918	//constraints.gridx += 1;
778	919	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
779	920	// debugCB.addItemListener(this);
780	921
	922	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	923	+ trackCB.setToolTipText("Enable tracking target");
	924	+ trackCB.addItemListener(this);
	925	+
781	926	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	927	+ oeilCB.setToolTipText("Move camera when tracking");
782	928	oeilCB.addItemListener(this);
783	929
	930	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	931	+ shadowCB.setToolTipText("When live compute shadows");
	932	+ shadowCB.addItemListener(this);
	933	+
	934	+ panel.Return();
	935	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	936	+ toggleTextureCB.setToolTipText("Load textures");
	937	+ toggleTextureCB.addItemListener(this);
	938	+
	939	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	940	+ toggleSwitchCB.setToolTipText("Choose a single item");
	941	+ toggleSwitchCB.addItemListener(this);
	942	+
	943	+ panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
	944	+ autosaveCB.setToolTipText("On structure change");
	945	+ autosaveCB.addItemListener(this);
	946	+
	947	+ panel.Return();
	948	+ if (Globals.ADVANCED)
	949	+ {
784	950	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
785	951	lookAtCB.setToolTipText("Look-at target");
786	952	lookAtCB.addItemListener(this);
	953	+ }
787	954
788	955	}
789	956
790	957	cGridBag fill = new cGridBag();
791		-
792	958	fill.preferredHeight = 200;
	959	+ cGridBag fill2 = new cGridBag();
	960	+ fill2.preferredHeight = 200;
	961	+ cGridBag fill3 = new cGridBag();
	962	+ fill3.preferredHeight = 200;
793	963
794	964	panel.add(fill);
	965	+ panel.add(fill2);
	966	+ panel.add(fill3);
795	967
796	968	}
797	969
798	970	void EditObject(Object3D obj)
799	971	{
800	972	cRadio radioButton = new cRadio(obj.name);
	973	+
	974	+ // Patch to avoid bug with transparency.
	975	+ radioButton.hadMaterial = obj.material != null;
	976	+ if (!radioButton.hadMaterial)
	977	+ {
	978	+ obj.material = new cMaterial();
	979	+ }
	980	+
801	981	radioButton.SetObject(obj);
802	982	radioButton.layout = sevenButton;
803	983	radioButton.SetCamera(cameraView.renderCamera, false);
..	..	@@ -809,6 +989,8 @@
809	989
810	990	void SetupViews(ObjEditor oe)
811	991	{
	992	+ theFrame = this;
	993	+
812	994	oe.SetupViews();
813	995
814	996	System.out.println("SetupViews");
..	..	@@ -817,23 +999,28 @@
817	999	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
818	1000	}
819	1001
820		- JCheckBox liveCB;
821		- JCheckBox supportCB;
822		- JCheckBox localCB;
823		- JCheckBox crowdCB;
824		- JCheckBox smoothCB;
825		- JCheckBox fastCB;
826		- JCheckBox slowCB;
827		- JCheckBox boxCB;
828		- JCheckBox zoomBoxCB;
829		- JCheckBox trackCB;
830		- JCheckBox smoothfocusCB;
	1002	+ cToggleButton liveCB;
	1003	+ cCheckBox supportCB;
	1004	+ cCheckBox localCB;
	1005	+ cCheckBox crowdCB;
	1006	+ cCheckBox smoothCB;
	1007	+ cToggleButton fastCB;
	1008	+ cCheckBox slowCB;
	1009	+ cCheckBox boxCB;
	1010	+ cCheckBox zoomBoxCB;
	1011	+ cCheckBox freezeCB;
	1012	+ //cToggleButton trackCB;
	1013	+ cCheckBox trackCB;
	1014	+ cCheckBox smoothfocusCB;
831	1015	// JCheckBox speakerMocapCB;
832		- JCheckBox speakerCameraCB;
833		- JCheckBox speakerFocusCB;
834		- JCheckBox debugCB;
835		- JCheckBox oeilCB;
836		- JCheckBox lookAtCB;
	1016	+ cCheckBox speakerCameraCB;
	1017	+ cCheckBox speakerFocusCB;
	1018	+ cCheckBox debugCB;
	1019	+
	1020	+ cCheckBox oeilCB;
	1021	+ cCheckBox shadowCB;
	1022	+ cCheckBox autosaveCB;
	1023	+ cCheckBox lookAtCB;
837	1024
838	1025	// static int COLOR = 1;
839	1026	// static int MATERIAL = 2;
..	..	@@ -841,9 +1028,9 @@
841	1028
842	1029	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
843	1030
844		- JCheckBox colorCB;
845		- JCheckBox materialCB;
846		- JCheckBox textureCB;
	1031	+ cCheckBox colorCB;
	1032	+ cCheckBox materialCB;
	1033	+ cCheckBox textureCB;
847	1034
848	1035	public void itemStateChanged(ItemEvent e)
849	1036	{
..	..	@@ -871,6 +1058,7 @@
871	1058	} else if(e.getSource() == liveCB)
872	1059	{
873	1060	cameraView.ToggleLive();
	1061	+ refreshContents(false);
874	1062	}
875	1063	else if(e.getSource() == supportCB)
876	1064	{
..	..	@@ -935,6 +1123,18 @@
935	1123	{
936	1124	cameraView.ToggleOeil();
937	1125	}
	1126	+ else if(e.getSource() == shadowCB)
	1127	+ {
	1128	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1129	+ }
	1130	+ else if(e.getSource() == freezeCB)
	1131	+ {
	1132	+ Globals.FREEZEONMOVE ^= true;
	1133	+ }
	1134	+ else if(e.getSource() == autosaveCB)
	1135	+ {
	1136	+ Globals.SAVEONMAKE ^= true;
	1137	+ }
938	1138	else if(e.getSource() == lookAtCB)
939	1139	{
940	1140	cameraView.ToggleLookAt();
..	..	@@ -951,7 +1151,8 @@
951	1151
952	1152	/**/
953	1153	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
954		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1154	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1155	+ TreePath path = objEditor.jTree.getSelectionPath();
955	1156	if ((path == null) \|\| (path.getPathCount() <= 1)) {
956	1157	// We can't move the root node or an empty selection
957	1158	return;
..	..	@@ -1014,8 +1215,6 @@
1014	1215	}
1015	1216	}
1016	1217
1017		- String string = (String) object;
1018		-
1019	1218	System.out.println("Transfer = " + object + "; drop : " + target);
1020	1219	// if( object instanceof java.io.File[])
1021	1220	// {
..	..	@@ -1023,6 +1222,8 @@
1023	1222	// objEditor.DropFile((java.io.File[]) object, true);
1024	1223	// return;
1025	1224	// }
	1225	+
	1226	+ String string = (String) object;
1026	1227
1027	1228	// File path for Mac and Windows
1028	1229	if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
..	..	@@ -1068,23 +1269,33 @@
1068	1269
1069	1270	assert target == objEditor.jTree;
1070	1271	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1272	+ Object3D destinationLeaf;
1071	1273	try {
1072		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1274	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
1073	1275	} catch (Exception e) {
1074	1276	System.out.println("destinationPath : " + destinationPath);
1075	1277	return;
1076	1278	}
1077	1279
1078		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1280	+ for (int i=group.selection.size(); --i>=0;)
1079	1281	{
	1282	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1283	+
	1284	+ // Cannot move into itself
	1285	+ if (child == destinationLeaf)
	1286	+ return;
	1287	+ }
	1288	+
	1289	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1290	+// {
1080	1291	loadClipboard(true);
1081	1292	objEditor.jTree.setSelectionPath(destinationPath);
1082	1293	pasteInto(false, false);
1083		- } else {
1084		- loadClipboard(false);
1085		- objEditor.jTree.setSelectionPath(destinationPath);
1086		- pasteInto(false, false); // true); // ???
1087		- }
	1294	+// } else {
	1295	+// loadClipboard(false);
	1296	+// objEditor.jTree.setSelectionPath(destinationPath);
	1297	+// pasteInto(false, false); // true); // ???
	1298	+// }
1088	1299	}
1089	1300	public void dropActionChanged(DropTargetDragEvent dtde)
1090	1301	// Called if the user has modified the current drop gesture
..	..	@@ -1189,22 +1400,30 @@
1189	1400	{
1190	1401	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1191	1402	//heightFieldItem.addActionListener(this);
1192		- gridItem = menu.add(new MenuItem("Grid"));
1193		- gridItem.addActionListener(this);
1194		- rectoidItem = menu.add(new MenuItem("Box"));
1195		- rectoidItem.addActionListener(this);
1196		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1197		- ellipsoidItem.addActionListener(this);
1198		- coneItem = menu.add(new MenuItem("Cone"));
1199		- coneItem.addActionListener(this);
1200		- torusItem = menu.add(new MenuItem("Torus"));
1201		- torusItem.addActionListener(this);
1202		- superItem = menu.add(new MenuItem("Superellipsoid"));
1203		- superItem.addActionListener(this);
	1403	+// gridItem = menu.add(new MenuItem("Grid"));
	1404	+// gridItem.addActionListener(this);
	1405	+// rectoidItem = menu.add(new MenuItem("Box"));
	1406	+// rectoidItem.addActionListener(this);
	1407	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1408	+// ellipsoidItem.addActionListener(this);
	1409	+// coneItem = menu.add(new MenuItem("Cone"));
	1410	+// coneItem.addActionListener(this);
	1411	+// torusItem = menu.add(new MenuItem("Torus"));
	1412	+// torusItem.addActionListener(this);
	1413	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1414	+// superItem.addActionListener(this);
	1415	+
	1416	+ cameraItem = menu.add(new MenuItem("Camera"));
	1417	+ cameraItem.addActionListener(this);
	1418	+
	1419	+ if (!Globals.ADVANCED)
	1420	+ {
1204	1421	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1205	1422	kleinItem.addActionListener(this);
1206		- particleItem = menu.add(new MenuItem("Particle system"));
1207		- particleItem.addActionListener(this);
	1423	+ }
	1424	+
	1425	+// particleItem = menu.add(new MenuItem("Particle system"));
	1426	+// particleItem.addActionListener(this);
1208	1427	if (Globals.ADVANCED)
1209	1428	{
1210	1429	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1230,15 +1449,15 @@
1230	1449	}
1231	1450	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1232	1451	bezierItem.addActionListener(this);
1233		- overlayItem = menu.add(new MenuItem("Overlay"));
1234		- overlayItem.addActionListener(this);
1235		- lightItem = menu.add(new MenuItem("Light"));
1236		- lightItem.addActionListener(this);
	1452	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1453	+// overlayItem.addActionListener(this);
	1454	+// lightItem = menu.add(new MenuItem("Light"));
	1455	+// lightItem.addActionListener(this);
1237	1456	menu.add("-");
1238	1457	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1239	1458	//superLoopItem.addActionListener(this);
1240		- loopItem = menu.add(new MenuItem("Loop"));
1241		- loopItem.addActionListener(this);
	1459	+// loopItem = menu.add(new MenuItem("Loop"));
	1460	+// loopItem.addActionListener(this);
1242	1461	doubleItem = menu.add(new MenuItem("Fork"));
1243	1462	doubleItem.addActionListener(this);
1244	1463	if (Globals.ADVANCED)
..	..	@@ -1253,6 +1472,9 @@
1253	1472	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1254	1473	animationItem.addItemListener(this);
1255	1474	animationItem.setState(Globals.ANIMATION);
	1475	+
	1476	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1477	+ archiveItem.addActionListener(this);
1256	1478
1257	1479	menu.add("-");
1258	1480	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
..	..	@@ -1278,7 +1500,7 @@
1278	1500	memoryItem.addActionListener(this);
1279	1501	menu.add(analyzeItem = new MenuItem("Analyze"));
1280	1502	analyzeItem.addActionListener(this);
1281		- menu.add(dumpItem = new MenuItem("Dump"));
	1503	+ menu.add(dumpItem = new MenuItem("Print"));
1282	1504	dumpItem.addActionListener(this);
1283	1505	// menu.add(pathItem = new MenuItem("From-to path"));
1284	1506	// pathItem.addActionListener(this);
..	..	@@ -1419,9 +1641,24 @@
1419	1641	shadow.material = new cMaterial(obj.material);
1420	1642	shadow.material.diffuse = 0.0001f;
1421	1643	shadow.material.specular = 0.0001f;
	1644	+ //shadow.projectedVertices[1].x = 300;
1422	1645
1423	1646	makeSomething(shadow);
1424	1647	}
	1648	+
	1649	+ private void ClearUnpinned()
	1650	+ {
	1651	+ //for (Object3D obj : listUI)
	1652	+ for (int i=listUI.size(); --i>=0;)
	1653	+ {
	1654	+ Object3D obj = listUI.elementAt(i);
	1655	+ if (!obj.pinned)
	1656	+ {
	1657	+ obj.CloseUI();
	1658	+ listUI.remove(i);
	1659	+ }
	1660	+ }
	1661	+ }
1425	1662
1426	1663	/**
1427	1664	* applyExample
..	..	@@ -1666,7 +1903,7 @@
1666	1903	{
1667	1904	ScreenFit();
1668	1905	} else
1669		- if (source == switchItem)
	1906	+ if (source == switchViewItem)
1670	1907	{
1671	1908	cVector v1 = new cVector();
1672	1909	cVector v2 = new cVector();
..	..	@@ -1675,11 +1912,11 @@
1675	1912	objEditor.cameraView.renderCamera.setAim(v2, v1);
1676	1913	objEditor.cameraView.repaint();
1677	1914	} else
1678		- if (source == rectoidItem)
	1915	+ if (source == rectoidItem \|\| source == boxButton)
1679	1916	{
1680	1917	makeSomething(new Box());
1681	1918	} else
1682		- if (source == particleItem)
	1919	+ if (source == particleItem \|\| source == particlesButton)
1683	1920	{
1684	1921	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1685	1922	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1758,27 +1995,27 @@
1758	1995
1759	1996	makeSomething(obj);
1760	1997	} else
1761		- if (source == gridItem)
	1998	+ if (source == gridItem \|\| source == gridButton)
1762	1999	{
1763	2000	makeSomething(new Grid());
1764	2001	} else
1765		- if (source == ellipsoidItem)
	2002	+ if (source == ellipsoidItem \|\| source == sphereButton)
1766	2003	{
1767	2004	makeSomething(new Sphere());
1768	2005	} else
1769		- if (source == coneItem)
	2006	+ if (source == coneItem \|\| source == coneButton)
1770	2007	{
1771	2008	makeSomething(new Cone());
1772	2009	} else
1773		- if (source == torusItem)
	2010	+ if (source == torusItem \|\| source == torusButton)
1774	2011	{
1775	2012	makeSomething(new Torus());
1776	2013	} else
1777		- if (source == superItem)
	2014	+ if (source == superItem \|\| source == superButton)
1778	2015	{
1779	2016	makeSomething(new Superellipsoid());
1780	2017	} else
1781		- if (source == kleinItem)
	2018	+ if (source == kleinItem \|\| source == kleinButton)
1782	2019	{
1783	2020	makeSomething(new Klein());
1784	2021	} else
..	..	@@ -1798,7 +2035,7 @@
1798	2035	{
1799	2036	makeSomething(new BezierSurface());
1800	2037	} else
1801		- if (source == overlayItem)
	2038	+ if (source == overlayItem \|\| source == overlayButton)
1802	2039	{
1803	2040	/*
1804	2041	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1846,7 +2083,7 @@
1846	2083	s.setup();
1847	2084	makeSomething(s);
1848	2085	} else
1849		- if (source == lightItem)
	2086	+ if (source == lightItem \|\| source == lightButton)
1850	2087	{
1851	2088	makeSomething(new Light());
1852	2089	} else
..	..	@@ -1896,30 +2133,30 @@
1896	2133
1897	2134	group(g);
1898	2135	} else
1899		- if (source == loopItem)
	2136	+ if (source == loopItem \|\| source == loopButton)
1900	2137	{
1901	2138	Composite csg = new GroupLeaf();
1902	2139	csg.count = 5;
1903	2140	group(csg);
1904		- Composite child = new cGroup();
	2141	+ Composite child = new cGroup("Branch");
1905	2142	csg.addChild(child);
1906	2143	child.addChild(csg);
1907	2144	} else
1908	2145	if (source == doubleItem)
1909	2146	{
1910		- Composite csg = new GroupLeaf();
	2147	+ Composite csg = new GroupLeaf("Fork");
1911	2148	csg.count = 5;
1912	2149	group(csg);
1913		- Composite child = new cGroup();
	2150	+ Composite child = new cGroup("Branch A");
1914	2151	csg.addChild(child);
1915	2152	child.addChild(csg);
1916		- child = new cGroup();
	2153	+ child = new cGroup("Branch B");
1917	2154	csg.addChild(child);
1918	2155	child.addChild(csg);
1919	2156	} else
1920	2157	if (source == tripleItem)
1921	2158	{
1922		- Composite csg = new GroupLeaf();
	2159	+ Composite csg = new GroupLeaf("Trident");
1923	2160	csg.count = 4;
1924	2161	group(csg);
1925	2162	Composite child = new cGroup();
..	..	@@ -1969,9 +2206,22 @@
1969	2206	{
1970	2207	DumpObject();
1971	2208	} else
	2209	+ if (source == minButton)
	2210	+ {
	2211	+ Minimize();
	2212	+ } else
	2213	+ if (source == maxButton)
	2214	+ {
	2215	+ Maximize();
	2216	+ } else
	2217	+ if (source == fullButton)
	2218	+ {
	2219	+ ToggleFullScreen();
	2220	+ } else
1972	2221	if (source == undoButton)
1973	2222	{
1974		- Undo();
	2223	+ if (!Undo())
	2224	+ java.awt.Toolkit.getDefaultToolkit().beep();
1975	2225	} else
1976	2226	if (source == redoButton)
1977	2227	{
..	..	@@ -1979,7 +2229,8 @@
1979	2229	} else
1980	2230	if (source == saveButton)
1981	2231	{
1982		- Save();
	2232	+ if (!Save(true))
	2233	+ java.awt.Toolkit.getDefaultToolkit().beep();
1983	2234	} else
1984	2235	if (source == oneStepButton)
1985	2236	{
..	..	@@ -1988,17 +2239,14 @@
1988	2239	} else
1989	2240	if (source == screenfitButton)
1990	2241	{
1991		- //Reload(lastConverter, lastFilename, true);
1992	2242	ScreenFit();
1993	2243	} else
1994	2244	if (source == screenfitpointButton)
1995	2245	{
1996		- //Reload(lastConverter, lastFilename, true);
1997	2246	ScreenFitPoint();
1998	2247	} else
1999	2248	if (source == snapobjectButton)
2000	2249	{
2001		- //Reload(lastConverter, lastFilename, true);
2002	2250	SnapObject();
2003	2251	} else
2004	2252	// if (event.getSource() == recompileButton)
..	..	@@ -2374,9 +2622,9 @@
2374	2622	{
2375	2623	ClearSelection(true);
2376	2624	} else
2377		- if (source == grabItem)
	2625	+ if (source == grabItem \|\| source == groupButton)
2378	2626	{
2379		- group(new cGroup(), true);
	2627	+ group(new cGroup(), false); // true);
2380	2628	} else
2381	2629	if (source == hideItem)
2382	2630	{
..	..	@@ -2394,11 +2642,11 @@
2394	2642	{
2395	2643	makeSomething(new Camera());
2396	2644	} else
2397		- if (source == compositeItem)
	2645	+ if (source == compositeItem \|\| source == compositeButton)
2398	2646	{
2399	2647	group(new Composite());
2400	2648	} else
2401		- if (source == randomItem)
	2649	+ if (source == switchItem \|\| source == switchButton)
2402	2650	{
2403	2651	RandomNode random = new RandomNode();
2404	2652	group(random);
..	..	@@ -2500,7 +2748,7 @@
2500	2748	{
2501	2749	group(new cLinker());
2502	2750	} else
2503		- if (source == textureItem)
	2751	+ if (source == textureItem \|\| source == textureButton)
2504	2752	{
2505	2753	group(new TextureNode());
2506	2754	} else
..	..	@@ -2520,17 +2768,30 @@
2520	2768	{
2521	2769	CastShadow(2);
2522	2770	} else
2523		- if (source == ungroupItem)
	2771	+ if (source == ungroupItem \|\| source == ungroupButton)
2524	2772	{
2525		- //ungroup();
	2773	+ boolean hasRoot = false;
	2774	+
2526	2775	for (int i=0; i<group.selection.size(); i++)
2527	2776	{
2528		- Ungroup(group.selection.get(i));
	2777	+ if (group.selection.get(i) == group)
	2778	+ {
	2779	+ hasRoot = true;
	2780	+ break;
	2781	+ }
2529	2782	}
2530	2783
2531		- ClearSelection(false);
2532		-
2533		- refreshContents();
	2784	+ if (!hasRoot)
	2785	+ {
	2786	+ for (int i=0; i<group.selection.size(); i++)
	2787	+ {
	2788	+ Ungroup(group.selection.get(i));
	2789	+ }
	2790	+
	2791	+ ClearSelection(false);
	2792	+
	2793	+ refreshContents();
	2794	+ }
2534	2795	} else
2535	2796	if (source == genUVItem)
2536	2797	{
..	..	@@ -2607,6 +2868,22 @@
2607	2868	if (source == unmarkleavesItem)
2608	2869	{
2609	2870	MarkLeaves(false);
	2871	+ } else
	2872	+ if (source == rewindleavesItem)
	2873	+ {
	2874	+ RewindLeaves(true);
	2875	+ } else
	2876	+ if (source == unrewindleavesItem)
	2877	+ {
	2878	+ RewindLeaves(false);
	2879	+ } else
	2880	+ if (source == randomleavesItem)
	2881	+ {
	2882	+ RandomLeaves(true);
	2883	+ } else
	2884	+ if (source == unrandomleavesItem)
	2885	+ {
	2886	+ RandomLeaves(false);
2610	2887	} else
2611	2888	if (source == flipVItem)
2612	2889	{
..	..	@@ -2842,6 +3119,10 @@
2842	3119	if (source == twoButton)
2843	3120	{
2844	3121	radio.layout = twoButton;
	3122	+
	3123	+ if (CameraPane.FULLSCREEN)
	3124	+ fullscreenLayout = radio.layout;
	3125	+
2845	3126	// bug
2846	3127	//gridPanel.setDividerLocation(1.0);
2847	3128	//bigPanel.setDividerLocation(0.0);
..	..	@@ -2874,10 +3155,31 @@
2874	3155	bigThree.ClearUI();
2875	3156	bigThree.add(centralPanel);
2876	3157	bigThree.FlushUI();
	3158	+
	3159	+ cameraView.requestFocusInWindow();
	3160	+
	3161	+// refreshContents(true);
	3162	+//
	3163	+// try
	3164	+// {
	3165	+// java.awt.Robot bot = new java.awt.Robot();
	3166	+// int mask = InputEvent.BUTTON1_MASK;
	3167	+// bot.mouseMove(100, 100);
	3168	+// bot.mousePress(mask);
	3169	+// bot.mouseRelease(mask);
	3170	+// }
	3171	+// catch (Exception e)
	3172	+// {
	3173	+//
	3174	+// }
	3175	+
2877	3176	} else
2878	3177	if (source == threeButton)
2879	3178	{
2880	3179	radio.layout = threeButton;
	3180	+
	3181	+ if (CameraPane.FULLSCREEN)
	3182	+ fullscreenLayout = radio.layout;
2881	3183
2882	3184	// bigThree.remove(scenePanel);
2883	3185	// bigThree.remove(centralPanel);
..	..	@@ -2910,10 +3212,15 @@
2910	3212	bigThree.add(centralPanel);
2911	3213	bigThree.add(XYZPanel);
2912	3214	bigThree.FlushUI();
	3215	+
	3216	+ cameraView.requestFocusInWindow();
2913	3217	} else
2914	3218	if (source == fourButton)
2915	3219	{
2916	3220	radio.layout = fourButton;
	3221	+
	3222	+ if (CameraPane.FULLSCREEN)
	3223	+ fullscreenLayout = radio.layout;
2917	3224
2918	3225	// bigThree.remove(scenePanel);
2919	3226	// bigThree.remove(centralPanel);
..	..	@@ -2945,10 +3252,15 @@
2945	3252	bigThree.ClearUI();
2946	3253	bigThree.add(scenePanel);
2947	3254	bigThree.FlushUI();
	3255	+
	3256	+ cameraView.requestFocusInWindow();
2948	3257	} else
2949	3258	if (source == sixButton)
2950	3259	{
2951	3260	radio.layout = sixButton;
	3261	+
	3262	+ if (CameraPane.FULLSCREEN)
	3263	+ fullscreenLayout = radio.layout;
2952	3264
2953	3265	// bigThree.remove(scenePanel);
2954	3266	// bigThree.remove(centralPanel);
..	..	@@ -2981,10 +3293,15 @@
2981	3293	bigThree.add(scenePanel);
2982	3294	bigThree.add(centralPanel);
2983	3295	bigThree.FlushUI();
	3296	+
	3297	+ cameraView.requestFocusInWindow();
2984	3298	} else
2985	3299	if (source == sevenButton)
2986	3300	{
2987	3301	radio.layout = sevenButton;
	3302	+
	3303	+ if (CameraPane.FULLSCREEN)
	3304	+ fullscreenLayout = radio.layout;
2988	3305
2989	3306	// bigThree.remove(scenePanel);
2990	3307	// bigThree.remove(centralPanel);
..	..	@@ -3018,6 +3335,8 @@
3018	3335	bigThree.add(centralPanel);
3019	3336	bigThree.add(XYZPanel);
3020	3337	bigThree.FlushUI();
	3338	+
	3339	+ cameraView.requestFocusInWindow();
3021	3340	} else
3022	3341	if (source == rootButton)
3023	3342	{
..	..	@@ -3029,6 +3348,7 @@
3029	3348	EditObject(obj);
3030	3349	}
3031	3350
	3351	+ cameraView.requestFocusInWindow();
3032	3352	refreshContents(true);
3033	3353	} else
3034	3354	if (source == closeButton)
..	..	@@ -3038,22 +3358,37 @@
3038	3358	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3039	3359	{
3040	3360	ab = (cRadio)e.nextElement();
3041		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3361	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
3042	3362	{
	3363	+ // Patch to avoid bug with transparency.
	3364	+ if (!ab.hadMaterial)
	3365	+ {
	3366	+ ab.object.material = null;
	3367	+ }
	3368	+
3043	3369	buttonGroup.remove(ab);
3044	3370	radioPanel.remove(ab);
3045	3371
3046		- ab.GetObject().editWindow = null;
	3372	+ //ab.GetObject().editWindow = null;
	3373	+ ab.GetObject().manipWindow = null;
3047	3374	// ab.GetObject().objectUI = null; // ?????????
3048	3375
3049	3376	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
3050	3377	break;
3051	3378	}
3052	3379	}
	3380	+
	3381	+ cameraView.requestFocusInWindow();
3053	3382	refreshContents(true);
3054	3383	} else
3055	3384	if (source == editItem \|\| source == editButton)
3056	3385	{
	3386	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3387	+ {
	3388	+ Object3D child = (Object3D)e.nextElement();
	3389	+ child.pinned = true;
	3390	+ }
	3391	+
3057	3392	EditSelection(false);
3058	3393	} else
3059	3394	if (source == uneditButton)
..	..	@@ -3063,6 +3398,7 @@
3063	3398	Object3D child = (Object3D)e.nextElement();
3064	3399	if(child.editWindow != null)
3065	3400	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3401	+ child.pinned = false;
3066	3402	child.CloseUI();
3067	3403	listUI.remove(child);
3068	3404
..	..	@@ -3079,6 +3415,7 @@
3079	3415	//copy.ClearUI();
3080	3416	for (Object3D obj : listUI)
3081	3417	{
	3418	+ obj.pinned = false;
3082	3419	obj.CloseUI();
3083	3420	}
3084	3421	listUI.clear();
..	..	@@ -3088,7 +3425,7 @@
3088	3425	{
3089	3426	assert(copy == group);
3090	3427
3091		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3428	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3092	3429
3093	3430	for (Object3D obj : listUI)
3094	3431	{
..	..	@@ -3154,7 +3491,8 @@
3154	3491	}
3155	3492
3156	3493	// fix "+" issue
3157		- group.editWindow = this;
	3494	+ //group.editWindow = this;
	3495	+ group.manipWindow = this;
3158	3496
3159	3497	/*
3160	3498	currentLayout = radio.layout;
..	..	@@ -3162,18 +3500,25 @@
3162	3500	currentLayout = sevenButton;
3163	3501	*/
3164	3502	radio.layout.doClick();
	3503	+
	3504	+ ClearUnpinned();
	3505	+ SetPinStates(group.selection.size() > 0);
	3506	+ if (group.selection.size() == 1)
	3507	+ EditSelection(false);
3165	3508	keepparent = group.parent;
3166	3509	// PARENT = NULL or not???
3167	3510	//group.parent = null; // ROOT
3168	3511	//group.attributes = -1;
3169	3512	ResetModel();
	3513	+
	3514	+ cameraView.requestFocusInWindow();
3170	3515	refreshContents(true);
3171	3516	} else if (event.getSource() == editCameraItem)
3172	3517	{
3173	3518	cameraView.ProtectCamera();
3174	3519	cameraView.repaint();
3175	3520	return;
3176		- } else if (event.getSource() == revertCameraItem)
	3521	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3177	3522	{
3178	3523	cameraView.RevertCamera();
3179	3524	cameraView.repaint();
..	..	@@ -3190,7 +3535,6 @@
3190	3535	}
3191	3536
3192	3537	boolean useclient = false;
3193		- cRadio radio;
3194	3538
3195	3539	void ToggleRoot()
3196	3540	{
..	..	@@ -4145,6 +4489,18 @@
4145	4489	refreshContents();
4146	4490	}
4147	4491
	4492	+ void RewindLeaves(boolean hide)
	4493	+ {
	4494	+ group.selection.RewindLeaves(hide);
	4495	+ refreshContents();
	4496	+ }
	4497	+
	4498	+ void RandomLeaves(boolean hide)
	4499	+ {
	4500	+ group.selection.RandomLeaves(hide);
	4501	+ refreshContents();
	4502	+ }
	4503	+
4148	4504	void SetTexRes(int tr)
4149	4505	{
4150	4506	group.selection.SetTexRes(tr);
..	..	@@ -4216,10 +4572,6 @@
4216	4572	// }
4217	4573	// }
4218	4574
4219		- static boolean allparams = true;
4220		-
4221		- static Vector<Object3D> listUI = new Vector<Object3D>();
4222		-
4223	4575	void EditSelection(boolean newWindow)
4224	4576	{
4225	4577	// aConstraints.gridy = 0;
..	..	@@ -4227,7 +4579,7 @@
4227	4579	{
4228	4580	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4229	4581	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4230		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4582	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4231	4583
4232	4584	Object3D elem = (Object3D)group.selection.elementAt(i);
4233	4585	if(elem != group \|\| !newWindow)
..	..	@@ -4312,7 +4664,8 @@
4312	4664	//new Exception().printStackTrace();
4313	4665
4314	4666	freezemodel = true;
4315		-
	4667	+ ClearUnpinned();
	4668	+
4316	4669	/**/
4317	4670	//switch (event.id)
4318	4671	{
..	..	@@ -4320,7 +4673,6 @@
4320	4673	//case 702: // Event.LIST_DESELECT
4321	4674	group.deselectAll();
4322	4675	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4323		- objEditor.ClearInfo(); // .GetMaterial());
4324	4676	if (tps != null)
4325	4677	{
4326	4678	for (int i=0; i < tps.length; i++)
..	..	@@ -4329,10 +4681,8 @@
4329	4681
4330	4682	//if (child.parent != null)
4331	4683	//child.parent.addSelectee(child);
	4684	+ objEditor.SetMaterial(child);
4332	4685	group.addSelectee(child);
4333		- objEditor.SetMaterial(child); // .GetMaterial());
4334		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4335		- System.err.println("info : " + child.GetPath());
4336	4686	}
4337	4687	}
4338	4688	// else
..	..	@@ -4342,15 +4692,13 @@
4342	4692	// System.err.println("info : " + group.GetPath());
4343	4693	// }
4344	4694
4345		- objEditor.SetText(); // jan 2014
4346		-
4347	4695	if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4348	4696	CameraPane.flash = true;
4349	4697
4350	4698	if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4351	4699	// a camera
4352	4700	{
4353		- if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	4701	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
4354	4702	{
4355	4703	CameraPane.camerachangeframe = 0; // don't refuse it
4356	4704	Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
..	..	@@ -4359,6 +4707,13 @@
4359	4707	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4360	4708	}
4361	4709
	4710	+ if (tps != null && tps.length == 1)
	4711	+ {
	4712	+ EditSelection(false);
	4713	+ }
	4714	+
	4715	+ SetPinStates(tps != null && tps.length > 0);
	4716	+
4362	4717	refreshContents();
4363	4718	//return true;
4364	4719	}
..	..	@@ -4367,6 +4722,35 @@
4367	4722
4368	4723	freezemodel = false;
4369	4724	}
	4725	+
	4726	+ void SetPinStates(boolean enabled)
	4727	+ {
	4728	+ editButton.setEnabled(enabled);
	4729	+ uneditButton.setEnabled(enabled);
	4730	+ unselectButton.setEnabled(enabled);
	4731	+ flashSelectionButton.setEnabled(enabled);
	4732	+ }
	4733	+
	4734	+ void refreshContents(boolean cp)
	4735	+ {
	4736	+ if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
	4737	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
	4738	+ {
	4739	+ objEditor.ClearInfo(); // .GetMaterial());
	4740	+
	4741	+ for (int i=0; i < group.selection.Size(); i++)
	4742	+ {
	4743	+ Object3D child = (Object3D) group.selection.get(i);
	4744	+
	4745	+ objEditor.AddInfo(child, this, true);
	4746	+ System.err.println("info : " + child.GetPath());
	4747	+ }
	4748	+
	4749	+ objEditor.SetText(); // jan 2014
	4750	+ }
	4751	+
	4752	+ super.refreshContents(cp);
	4753	+ }
4370	4754
4371	4755	void linkSomething(Object3D thing)
4372	4756	{
..	..	@@ -4449,6 +4833,7 @@
4449	4833
4450	4834	if (cut)
4451	4835	{
	4836	+ if (Globals.SAVEONMAKE)
4452	4837	Save();
4453	4838	//int indices[] = jList.getSelectedIndices();
4454	4839	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -5167,10 +5552,28 @@
5167	5552	cButton clearpanelButton;
5168	5553	cButton unselectButton;
5169	5554
	5555	+ cButton restoreCameraButton;
	5556	+
5170	5557	cButton saveButton;
5171		- cButton undoButton;
5172		- cButton redoButton;
5173	5558	cButton oneStepButton;
	5559	+
	5560	+ cButton groupButton;
	5561	+ cButton ungroupButton;
	5562	+ cButton compositeButton;
	5563	+ cButton switchButton;
	5564	+ cButton loopButton;
	5565	+ cButton textureButton;
	5566	+
	5567	+ cButton gridButton;
	5568	+ cButton boxButton;
	5569	+ cButton sphereButton;
	5570	+ cButton coneButton;
	5571	+ cButton torusButton;
	5572	+ cButton superButton;
	5573	+ cButton kleinButton;
	5574	+ cButton particlesButton;
	5575	+ cButton overlayButton;
	5576	+ cButton lightButton;
5174	5577
5175	5578	cButton screenfitButton;
5176	5579	cButton screenfitpointButton;
..	..	@@ -5183,14 +5586,6 @@
5183	5586
5184	5587	cButton setsupportButton;
5185	5588
5186		- cButton twoButton;
5187		- cButton sixButton;
5188		- cButton threeButton;
5189		- cButton sevenButton;
5190		- cButton fourButton; // full panel
5191		- cButton oneButton; // full XYZ
5192		- //cButton currentLayout;
5193		-
5194	5589	//
5195	5590	//Composite
5196	5591	Object3D // to do !!
..	..	@@ -5200,11 +5595,11 @@
5200	5595	//JTree jTree;
5201	5596	private MenuItem lookAtItem;
5202	5597	private MenuItem lookFromItem;
5203		- private MenuItem switchItem;
	5598	+ private MenuItem switchViewItem;
5204	5599	private MenuItem cutItem;
5205	5600	private MenuItem undoItem;
5206	5601	private MenuItem redoItem;
5207		- private MenuItem duplicateItem;
	5602	+ private JMenuItem duplicateItem;
5208	5603	private MenuItem cloneItem;
5209	5604	private MenuItem cloneSupportItem;
5210	5605	private MenuItem overwriteGeoItem;
..	..	@@ -5267,6 +5662,10 @@
5267	5662	private MenuItem showleavesItem;
5268	5663	private MenuItem markleavesItem;
5269	5664	private MenuItem unmarkleavesItem;
	5665	+ private MenuItem rewindleavesItem;
	5666	+ private MenuItem unrewindleavesItem;
	5667	+ private MenuItem randomleavesItem;
	5668	+ private MenuItem unrandomleavesItem;
5270	5669
5271	5670	private MenuItem flipVItem;
5272	5671	private MenuItem unflipVItem;
..	..	@@ -5288,7 +5687,7 @@
5288	5687	private MenuItem frontItem;
5289	5688	private MenuItem cameraItem;
5290	5689	private MenuItem compositeItem;
5291		- private MenuItem randomItem;
	5690	+ private MenuItem switchItem;
5292	5691	private MenuItem physicsItem;
5293	5692	private MenuItem frameselectorItem;
5294	5693	private MenuItem scriptNodeItem;
..	..	@@ -5362,5 +5761,5 @@
5362	5761
5363	5762	Menu cameraMenu;
5364	5763	MenuItem editCameraItem;
5365		- MenuItem revertCameraItem;
	5764	+ MenuItem restoreCameraItem;
5366	5765	}