~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -150,11 +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		- 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"));
158	166	duplicateItem.addActionListener(this);
159	167	cloneItem = menu.add(new MenuItem("Clone"));
160	168	cloneItem.addActionListener(this);
..	..	@@ -170,7 +178,6 @@
170	178	copyItem.addActionListener(this);
171	179	pasteItem = menu.add(new MenuItem("Paste"));
172	180	pasteItem.addActionListener(this);
173		- menu.add("-");
174	181
175	182	menu.add("-");
176	183	pasteIntoItem = menu.add(new MenuItem("Paste into"));
..	..	@@ -197,23 +204,23 @@
197	204	//zBufferItem.addActionListener(this);
198	205	//cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
199	206	//normalLensItem.addActionListener(this);
200		- cameraMenu.add(revertCameraItem = new MenuItem("Revert Camera"));
201		- revertCameraItem.addActionListener(this);
	207	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	208	+ restoreCameraItem.addActionListener(this);
202	209
203		- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
204		- toggleFullScreenItem.addItemListener(this);
205		- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
206		- 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);
207	222
208		- cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
209		- toggleTextureItem.addItemListener(this);
210		- toggleTextureItem.setState(CameraPane.textureon);
211		-
212		- cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
213		- toggleSwitchItem.addItemListener(this);
214		- toggleSwitchItem.setState(CameraPane.SWITCH);
215		-
216		- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
	223	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
217	224	toggleHandleItem.addItemListener(this);
218	225	toggleHandleItem.setState(CameraPane.HANDLES);
219	226
..	..	@@ -240,7 +247,7 @@
240	247
241	248	cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
242	249	toggleDebugItem.addItemListener(this);
243		- toggleDebugItem.setState(CameraPane.DEBUG);
	250	+ toggleDebugItem.setState(Globals.DEBUG);
244	251
245	252	cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
246	253	toggleFrustumItem.addItemListener(this);
..	..	@@ -261,14 +268,14 @@
261	268	// animationItem.addItemListener(this);
262	269	// animationItem.setState(CameraPane.ANIMATION);
263	270	cameraMenu.add("-");
264		- cameraMenu.add(editCameraItem = new MenuItem("Freeze Camera"));
	271	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
265	272	editCameraItem.addActionListener(this);
266	273
267	274	if (Globals.ADVANCED)
268	275	{
269	276	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
270	277	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
271		- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
	278	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
272	279	editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
273	280	oe.cameraMenu.add("-");
274	281	openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
..	..	@@ -276,7 +283,7 @@
276	283	editLeafItem.addActionListener(this);
277	284	lookAtItem.addActionListener(this);
278	285	//lookFromItem.addActinoListener(this);
279		- //switchItem.addActionListener(this);
	286	+ //switchViewItem.addActionListener(this);
280	287	}
281	288
282	289	oe.menuBar.add(menu = new Menu("Setting"));
..	..	@@ -321,21 +328,29 @@
321	328	}
322	329
323	330	oe.menuBar.add(menu = new Menu("Group"));
324		- grabItem = menu.add(new MenuItem("Grab"));
325		- grabItem.addActionListener(this);
	331	+// grabItem = menu.add(new MenuItem("Grab"));
	332	+// grabItem.addActionListener(this);
326	333	backItem = menu.add(new MenuItem("Back"));
327	334	backItem.addActionListener(this);
328	335	frontItem = menu.add(new MenuItem("Front"));
329	336	frontItem.addActionListener(this);
330		- compositeItem = menu.add(new MenuItem("Composite"));
331		- compositeItem.addActionListener(this);
	337	+// compositeItem = menu.add(new MenuItem("Composite"));
	338	+// compositeItem.addActionListener(this);
	339	+
	340	+ if (Globals.ADVANCED)
	341	+ {
332	342	hideItem = menu.add(new MenuItem("Hidden Group"));
333	343	hideItem.addActionListener(this);
	344	+ }
334	345	ungroupItem = menu.add(new MenuItem("Ungroup"));
335	346	ungroupItem.addActionListener(this);
336		- menu.add("-");
337		- randomItem = menu.add(new MenuItem("Switch node"));
338		- 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	+ {
339	354	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
340	355	switchGeoItem.addActionListener(this);
341	356	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
..	..	@@ -343,8 +358,6 @@
343	358	morphItem = menu.add(new MenuItem("Morph Group"));
344	359	morphItem.addActionListener(this);
345	360
346		- if (Globals.ADVANCED)
347		- {
348	361	menu.add("-");
349	362	physicsItem = menu.add(new MenuItem("Physics"));
350	363	physicsItem.addActionListener(this);
..	..	@@ -352,23 +365,22 @@
352	365	frameselectorItem.addActionListener(this);
353	366	scriptNodeItem = menu.add(new MenuItem("Script Node"));
354	367	scriptNodeItem.addActionListener(this);
355		- cameraItem = menu.add(new MenuItem("Camera"));
356		- cameraItem.addActionListener(this);
357	368	}
358	369
359	370	oe.menuBar.add(menu = new Menu("Object"));
360		- textureItem = menu.add(new MenuItem("Texture"));
361		- textureItem.addActionListener(this);
	371	+// textureItem = menu.add(new MenuItem("Texture"));
	372	+// textureItem.addActionListener(this);
362	373	billboardItem = menu.add(new MenuItem("Billboard"));
363	374	billboardItem.addActionListener(this);
364	375	csgItem = menu.add(new MenuItem("CSG"));
365	376	csgItem.addActionListener(this);
366		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	377	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
367	378	shadowXItem.addActionListener(this);
368		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	379	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
369	380	shadowYItem.addActionListener(this);
370		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	381	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
371	382	shadowZItem.addActionListener(this);
	383	+
372	384	if (Globals.ADVANCED)
373	385	{
374	386	menu.add("-");
..	..	@@ -464,6 +476,14 @@
464	476	markleavesItem.addActionListener(this);
465	477	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
466	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);
467	487	menu.add("-");
468	488	flipVItem = menu.add(new MenuItem("Flip V"));
469	489	flipVItem.addActionListener(this);
..	..	@@ -521,6 +541,18 @@
521	541
522	542	void SetupUI2(ObjEditor oe)
523	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	+
524	556	//new Exception().printStackTrace();
525	557
526	558	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -549,27 +581,66 @@
549	581	oe.radioPanel.add(dummyButton);
550	582	oe.buttonGroup.add(dummyButton);
551	583	*/
	584	+ cGridBag copyOptionsPanel = new cGridBag();
	585	+
	586	+ copyOptionsPanel.preferredHeight = 1;
	587	+
552	588	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
553	589
554		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, 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);
	614	+ undoButton.setToolTipText("Undo changes");
	615	+ undoButton.addActionListener(this);
	616	+ undoButton.setEnabled(false);
	617	+
	618	+ copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	619	+ redoButton.setToolTipText("Redo changes");
	620	+ redoButton.addActionListener(this);
	621	+ redoButton.setEnabled(false);
	622	+
	623	+ copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	624	+ saveButton.setToolTipText("Save changes");
	625	+ saveButton.addActionListener(this);
	626	+
	627	+ copyOptionsPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
555	628	liveCB.setToolTipText("Enable animation");
556	629	liveCB.addItemListener(this);
557	630
558		- oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	631	+ copyOptionsPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
559	632	oneStepButton.setToolTipText("Animate one step forward");
560	633	oneStepButton.addActionListener(this);
561	634
562		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	635	+ copyOptionsPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
563	636	fastCB.setToolTipText("Fast mode");
564	637	fastCB.addItemListener(this);
565	638
566		- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
567		- trackCB.setToolTipText("Enable tracking");
568		- trackCB.addItemListener(this);
569		-
570		- oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
571		- screenfitButton.setToolTipText("Screen fit");
572		- 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);
573	644
574	645	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
575	646	// screenfitpointButton.addActionListener(this);
..	..	@@ -581,65 +652,145 @@
581	652	snapobjectButton.setToolTipText("Snap Object");
582	653	}
583	654
584		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
585		- flashSelectionButton.setToolTipText("Show selection");
586		- flashSelectionButton.addActionListener(this);
	655	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
587	656
588		- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
589		-
590		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	657	+ oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
591	658	twoButton.setToolTipText("Show center view only");
592	659	twoButton.addActionListener(this);
593		- 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);
594	663	fourButton.addActionListener(this);
595	664	fourButton.setToolTipText("Show left panel only");
596		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	665	+ oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
597	666	sixButton.setToolTipText("2-column layout left");
598	667	sixButton.addActionListener(this);
599		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	668	+ oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
600	669	threeButton.setToolTipText("2-column layout right");
601	670	threeButton.addActionListener(this);
602		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	671	+ oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
603	672	sevenButton.setToolTipText("3-column layout");
604	673	sevenButton.addActionListener(this);
605	674	//
606	675
607		- 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);
608	677	rootButton.setToolTipText("Edit selection in new tab");
609	678	rootButton.addActionListener(this);
610	679
611		- 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);
612	681	closeButton.setToolTipText("Close tab");
613	682	closeButton.addActionListener(this);
614	683	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
615	684	//clearButton.addActionListener(this);
616		-
617		- 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	+ }
618	717
619		- commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
620		- 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");
621	767	editButton.addActionListener(this);
622	768
623		- commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
624		- uneditButton.setToolTipText("Unedit selection");
	769	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	770	+ uneditButton.setToolTipText("Remove selection controls");
625	771	uneditButton.addActionListener(this);
626	772
627		- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
628		- allParamsButton.setToolTipText("Edit all params");
	773	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	774	+ allParamsButton.setToolTipText("Show all controle");
629	775	allParamsButton.addActionListener(this);
630	776
631		- commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	777	+ editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
632	778	clearPanelButton.setToolTipText("Clear edit panel");
633	779	clearPanelButton.addActionListener(this);
634	780
635		- commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	781	+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
636	782	unselectButton.setToolTipText("Unselect");
637	783	unselectButton.addActionListener(this);
638	784
639		- 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);
640	788
641		- oe.treePanel.add(commandsPanel);
642		- oe.treePanel.Return();
	789	+ editCommandsPanel.preferredHeight = 1;
	790	+
	791	+ SetPinStates(false);
	792	+// oe.treePanel.add(commandsPanel);
	793	+// oe.treePanel.Return();
643	794
644	795	// oe.aConstraints.gridx += 1;
645	796	// oe.aConstraints.weighty = 0;
..	..	@@ -656,27 +807,12 @@
656	807
657	808	JScrollPane jSP;
658	809	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
659		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	810	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
660	811	ResetModel();
661	812
662	813	oe.treePanel.add(jSPPanel);
663	814	oe.treePanel.Return();
664	815
665		- cGridBag copyOptionsPanel = new cGridBag();
666		-
667		- copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
668		- colorCB.setToolTipText("Copy color when dropped");
669		- colorCB.addItemListener(this);
670		-
671		- copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
672		- materialCB.setToolTipText("Copy material when dropped");
673		- materialCB.addItemListener(this);
674		-
675		- copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
676		- textureCB.setToolTipText("Copy texture when dropped");
677		- textureCB.addItemListener(this);
678		-
679		- copyOptionsPanel.preferredHeight = 1;
680	816	oe.treePanel.add(copyOptionsPanel);
681	817	oe.treePanel.Return();
682	818
..	..	@@ -707,23 +843,43 @@
707	843
708	844	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
709	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	+
710	860	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
711	861	boxCB.setToolTipText("Display bounding boxes");
712	862	boxCB.addItemListener(this);
713	863
714	864	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
715		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	865	+ zoomBoxCB.setToolTipText("Display only for wheel");
716	866	zoomBoxCB.addItemListener(this);
717	867
718	868	if (true) // Globals.ADVANCED)
719	869	{
720		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
721		- supportCB.setToolTipText("Enable rigging");
722		- 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);
723	877
724	878	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
725	879	// localCB.addItemListener(this);
726	880
	881	+ panel.Return();
	882	+
727	883	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
728	884	crowdCB.setToolTipText("Used for crowds");
729	885	crowdCB.addItemListener(this);
..	..	@@ -740,6 +896,8 @@
740	896	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
741	897	// speakerMocapCB.addItemListener(this);
742	898
	899	+ panel.Return();
	900	+
743	901	if (false)
744	902	{
745	903	// handled in scripts
..	..	@@ -754,32 +912,72 @@
754	912	//constraints.gridy += 1;
755	913	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
756	914	smoothfocusCB.addItemListener(this);
	915	+ panel.Return();
757	916	}
758	917
759	918	//constraints.gridx += 1;
760	919	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
761	920	// debugCB.addItemListener(this);
762	921
	922	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	923	+ trackCB.setToolTipText("Enable tracking target");
	924	+ trackCB.addItemListener(this);
	925	+
763	926	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	927	+ oeilCB.setToolTipText("Move camera when tracking");
764	928	oeilCB.addItemListener(this);
765	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	+ {
766	950	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
767	951	lookAtCB.setToolTipText("Look-at target");
768	952	lookAtCB.addItemListener(this);
	953	+ }
769	954
770	955	}
771	956
772	957	cGridBag fill = new cGridBag();
773		-
774	958	fill.preferredHeight = 200;
	959	+ cGridBag fill2 = new cGridBag();
	960	+ fill2.preferredHeight = 200;
	961	+ cGridBag fill3 = new cGridBag();
	962	+ fill3.preferredHeight = 200;
775	963
776	964	panel.add(fill);
	965	+ panel.add(fill2);
	966	+ panel.add(fill3);
777	967
778	968	}
779	969
780	970	void EditObject(Object3D obj)
781	971	{
782	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	+
783	981	radioButton.SetObject(obj);
784	982	radioButton.layout = sevenButton;
785	983	radioButton.SetCamera(cameraView.renderCamera, false);
..	..	@@ -791,6 +989,8 @@
791	989
792	990	void SetupViews(ObjEditor oe)
793	991	{
	992	+ theFrame = this;
	993	+
794	994	oe.SetupViews();
795	995
796	996	System.out.println("SetupViews");
..	..	@@ -799,23 +999,28 @@
799	999	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
800	1000	}
801	1001
802		- JCheckBox liveCB;
803		- JCheckBox supportCB;
804		- JCheckBox localCB;
805		- JCheckBox crowdCB;
806		- JCheckBox smoothCB;
807		- JCheckBox fastCB;
808		- JCheckBox slowCB;
809		- JCheckBox boxCB;
810		- JCheckBox zoomBoxCB;
811		- JCheckBox trackCB;
812		- 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;
813	1015	// JCheckBox speakerMocapCB;
814		- JCheckBox speakerCameraCB;
815		- JCheckBox speakerFocusCB;
816		- JCheckBox debugCB;
817		- JCheckBox oeilCB;
818		- JCheckBox lookAtCB;
	1016	+ cCheckBox speakerCameraCB;
	1017	+ cCheckBox speakerFocusCB;
	1018	+ cCheckBox debugCB;
	1019	+
	1020	+ cCheckBox oeilCB;
	1021	+ cCheckBox shadowCB;
	1022	+ cCheckBox autosaveCB;
	1023	+ cCheckBox lookAtCB;
819	1024
820	1025	// static int COLOR = 1;
821	1026	// static int MATERIAL = 2;
..	..	@@ -823,9 +1028,9 @@
823	1028
824	1029	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
825	1030
826		- JCheckBox colorCB;
827		- JCheckBox materialCB;
828		- JCheckBox textureCB;
	1031	+ cCheckBox colorCB;
	1032	+ cCheckBox materialCB;
	1033	+ cCheckBox textureCB;
829	1034
830	1035	public void itemStateChanged(ItemEvent e)
831	1036	{
..	..	@@ -853,6 +1058,7 @@
853	1058	} else if(e.getSource() == liveCB)
854	1059	{
855	1060	cameraView.ToggleLive();
	1061	+ refreshContents(false);
856	1062	}
857	1063	else if(e.getSource() == supportCB)
858	1064	{
..	..	@@ -917,6 +1123,18 @@
917	1123	{
918	1124	cameraView.ToggleOeil();
919	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	+ }
920	1138	else if(e.getSource() == lookAtCB)
921	1139	{
922	1140	cameraView.ToggleLookAt();
..	..	@@ -933,7 +1151,8 @@
933	1151
934	1152	/**/
935	1153	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
936		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1154	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1155	+ TreePath path = objEditor.jTree.getSelectionPath();
937	1156	if ((path == null) \|\| (path.getPathCount() <= 1)) {
938	1157	// We can't move the root node or an empty selection
939	1158	return;
..	..	@@ -996,8 +1215,6 @@
996	1215	}
997	1216	}
998	1217
999		- String string = (String) object;
1000		-
1001	1218	System.out.println("Transfer = " + object + "; drop : " + target);
1002	1219	// if( object instanceof java.io.File[])
1003	1220	// {
..	..	@@ -1005,6 +1222,8 @@
1005	1222	// objEditor.DropFile((java.io.File[]) object, true);
1006	1223	// return;
1007	1224	// }
	1225	+
	1226	+ String string = (String) object;
1008	1227
1009	1228	// File path for Mac and Windows
1010	1229	if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
..	..	@@ -1050,23 +1269,33 @@
1050	1269
1051	1270	assert target == objEditor.jTree;
1052	1271	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1272	+ Object3D destinationLeaf;
1053	1273	try {
1054		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1274	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
1055	1275	} catch (Exception e) {
1056	1276	System.out.println("destinationPath : " + destinationPath);
1057	1277	return;
1058	1278	}
1059	1279
1060		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1280	+ for (int i=group.selection.size(); --i>=0;)
1061	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	+// {
1062	1291	loadClipboard(true);
1063	1292	objEditor.jTree.setSelectionPath(destinationPath);
1064	1293	pasteInto(false, false);
1065		- } else {
1066		- loadClipboard(false);
1067		- objEditor.jTree.setSelectionPath(destinationPath);
1068		- pasteInto(false, false); // true); // ???
1069		- }
	1294	+// } else {
	1295	+// loadClipboard(false);
	1296	+// objEditor.jTree.setSelectionPath(destinationPath);
	1297	+// pasteInto(false, false); // true); // ???
	1298	+// }
1070	1299	}
1071	1300	public void dropActionChanged(DropTargetDragEvent dtde)
1072	1301	// Called if the user has modified the current drop gesture
..	..	@@ -1171,22 +1400,30 @@
1171	1400	{
1172	1401	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1173	1402	//heightFieldItem.addActionListener(this);
1174		- gridItem = menu.add(new MenuItem("Grid"));
1175		- gridItem.addActionListener(this);
1176		- rectoidItem = menu.add(new MenuItem("Box"));
1177		- rectoidItem.addActionListener(this);
1178		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1179		- ellipsoidItem.addActionListener(this);
1180		- coneItem = menu.add(new MenuItem("Cone"));
1181		- coneItem.addActionListener(this);
1182		- torusItem = menu.add(new MenuItem("Torus"));
1183		- torusItem.addActionListener(this);
1184		- superItem = menu.add(new MenuItem("Superellipsoid"));
1185		- 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	+ {
1186	1421	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1187	1422	kleinItem.addActionListener(this);
1188		- particleItem = menu.add(new MenuItem("Particle system"));
1189		- particleItem.addActionListener(this);
	1423	+ }
	1424	+
	1425	+// particleItem = menu.add(new MenuItem("Particle system"));
	1426	+// particleItem.addActionListener(this);
1190	1427	if (Globals.ADVANCED)
1191	1428	{
1192	1429	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1212,15 +1449,15 @@
1212	1449	}
1213	1450	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1214	1451	bezierItem.addActionListener(this);
1215		- overlayItem = menu.add(new MenuItem("Overlay"));
1216		- overlayItem.addActionListener(this);
1217		- lightItem = menu.add(new MenuItem("Light"));
1218		- 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);
1219	1456	menu.add("-");
1220	1457	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1221	1458	//superLoopItem.addActionListener(this);
1222		- loopItem = menu.add(new MenuItem("Loop"));
1223		- loopItem.addActionListener(this);
	1459	+// loopItem = menu.add(new MenuItem("Loop"));
	1460	+// loopItem.addActionListener(this);
1224	1461	doubleItem = menu.add(new MenuItem("Fork"));
1225	1462	doubleItem.addActionListener(this);
1226	1463	if (Globals.ADVANCED)
..	..	@@ -1235,6 +1472,9 @@
1235	1472	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1236	1473	animationItem.addItemListener(this);
1237	1474	animationItem.setState(Globals.ANIMATION);
	1475	+
	1476	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1477	+ archiveItem.addActionListener(this);
1238	1478
1239	1479	menu.add("-");
1240	1480	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
..	..	@@ -1260,7 +1500,7 @@
1260	1500	memoryItem.addActionListener(this);
1261	1501	menu.add(analyzeItem = new MenuItem("Analyze"));
1262	1502	analyzeItem.addActionListener(this);
1263		- menu.add(dumpItem = new MenuItem("Dump"));
	1503	+ menu.add(dumpItem = new MenuItem("Print"));
1264	1504	dumpItem.addActionListener(this);
1265	1505	// menu.add(pathItem = new MenuItem("From-to path"));
1266	1506	// pathItem.addActionListener(this);
..	..	@@ -1401,9 +1641,24 @@
1401	1641	shadow.material = new cMaterial(obj.material);
1402	1642	shadow.material.diffuse = 0.0001f;
1403	1643	shadow.material.specular = 0.0001f;
	1644	+ //shadow.projectedVertices[1].x = 300;
1404	1645
1405	1646	makeSomething(shadow);
1406	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	+ }
1407	1662
1408	1663	/**
1409	1664	* applyExample
..	..	@@ -1648,7 +1903,7 @@
1648	1903	{
1649	1904	ScreenFit();
1650	1905	} else
1651		- if (source == switchItem)
	1906	+ if (source == switchViewItem)
1652	1907	{
1653	1908	cVector v1 = new cVector();
1654	1909	cVector v2 = new cVector();
..	..	@@ -1657,11 +1912,11 @@
1657	1912	objEditor.cameraView.renderCamera.setAim(v2, v1);
1658	1913	objEditor.cameraView.repaint();
1659	1914	} else
1660		- if (source == rectoidItem)
	1915	+ if (source == rectoidItem \|\| source == boxButton)
1661	1916	{
1662	1917	makeSomething(new Box());
1663	1918	} else
1664		- if (source == particleItem)
	1919	+ if (source == particleItem \|\| source == particlesButton)
1665	1920	{
1666	1921	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1667	1922	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1740,27 +1995,27 @@
1740	1995
1741	1996	makeSomething(obj);
1742	1997	} else
1743		- if (source == gridItem)
	1998	+ if (source == gridItem \|\| source == gridButton)
1744	1999	{
1745	2000	makeSomething(new Grid());
1746	2001	} else
1747		- if (source == ellipsoidItem)
	2002	+ if (source == ellipsoidItem \|\| source == sphereButton)
1748	2003	{
1749	2004	makeSomething(new Sphere());
1750	2005	} else
1751		- if (source == coneItem)
	2006	+ if (source == coneItem \|\| source == coneButton)
1752	2007	{
1753	2008	makeSomething(new Cone());
1754	2009	} else
1755		- if (source == torusItem)
	2010	+ if (source == torusItem \|\| source == torusButton)
1756	2011	{
1757	2012	makeSomething(new Torus());
1758	2013	} else
1759		- if (source == superItem)
	2014	+ if (source == superItem \|\| source == superButton)
1760	2015	{
1761	2016	makeSomething(new Superellipsoid());
1762	2017	} else
1763		- if (source == kleinItem)
	2018	+ if (source == kleinItem \|\| source == kleinButton)
1764	2019	{
1765	2020	makeSomething(new Klein());
1766	2021	} else
..	..	@@ -1780,7 +2035,7 @@
1780	2035	{
1781	2036	makeSomething(new BezierSurface());
1782	2037	} else
1783		- if (source == overlayItem)
	2038	+ if (source == overlayItem \|\| source == overlayButton)
1784	2039	{
1785	2040	/*
1786	2041	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1828,7 +2083,7 @@
1828	2083	s.setup();
1829	2084	makeSomething(s);
1830	2085	} else
1831		- if (source == lightItem)
	2086	+ if (source == lightItem \|\| source == lightButton)
1832	2087	{
1833	2088	makeSomething(new Light());
1834	2089	} else
..	..	@@ -1878,30 +2133,30 @@
1878	2133
1879	2134	group(g);
1880	2135	} else
1881		- if (source == loopItem)
	2136	+ if (source == loopItem \|\| source == loopButton)
1882	2137	{
1883	2138	Composite csg = new GroupLeaf();
1884	2139	csg.count = 5;
1885	2140	group(csg);
1886		- Composite child = new cGroup();
	2141	+ Composite child = new cGroup("Branch");
1887	2142	csg.addChild(child);
1888	2143	child.addChild(csg);
1889	2144	} else
1890	2145	if (source == doubleItem)
1891	2146	{
1892		- Composite csg = new GroupLeaf();
	2147	+ Composite csg = new GroupLeaf("Fork");
1893	2148	csg.count = 5;
1894	2149	group(csg);
1895		- Composite child = new cGroup();
	2150	+ Composite child = new cGroup("Branch A");
1896	2151	csg.addChild(child);
1897	2152	child.addChild(csg);
1898		- child = new cGroup();
	2153	+ child = new cGroup("Branch B");
1899	2154	csg.addChild(child);
1900	2155	child.addChild(csg);
1901	2156	} else
1902	2157	if (source == tripleItem)
1903	2158	{
1904		- Composite csg = new GroupLeaf();
	2159	+ Composite csg = new GroupLeaf("Trident");
1905	2160	csg.count = 4;
1906	2161	group(csg);
1907	2162	Composite child = new cGroup();
..	..	@@ -1951,6 +2206,32 @@
1951	2206	{
1952	2207	DumpObject();
1953	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
	2221	+ if (source == undoButton)
	2222	+ {
	2223	+ if (!Undo())
	2224	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2225	+ } else
	2226	+ if (source == redoButton)
	2227	+ {
	2228	+ Redo();
	2229	+ } else
	2230	+ if (source == saveButton)
	2231	+ {
	2232	+ if (!Save(true))
	2233	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2234	+ } else
1954	2235	if (source == oneStepButton)
1955	2236	{
1956	2237	Globals.ONESTEP = true;
..	..	@@ -1958,17 +2239,14 @@
1958	2239	} else
1959	2240	if (source == screenfitButton)
1960	2241	{
1961		- //Reload(lastConverter, lastFilename, true);
1962	2242	ScreenFit();
1963	2243	} else
1964	2244	if (source == screenfitpointButton)
1965	2245	{
1966		- //Reload(lastConverter, lastFilename, true);
1967	2246	ScreenFitPoint();
1968	2247	} else
1969	2248	if (source == snapobjectButton)
1970	2249	{
1971		- //Reload(lastConverter, lastFilename, true);
1972	2250	SnapObject();
1973	2251	} else
1974	2252	// if (event.getSource() == recompileButton)
..	..	@@ -2004,6 +2282,14 @@
2004	2282	if (source == cutItem \|\| source == clearButton)
2005	2283	{
2006	2284	loadClipboard(true);
	2285	+ } else
	2286	+ if (source == undoItem)
	2287	+ {
	2288	+ Undo();
	2289	+ } else
	2290	+ if (source == redoItem)
	2291	+ {
	2292	+ Redo();
2007	2293	} else
2008	2294	if (source == duplicateItem)
2009	2295	{
..	..	@@ -2336,9 +2622,9 @@
2336	2622	{
2337	2623	ClearSelection(true);
2338	2624	} else
2339		- if (source == grabItem)
	2625	+ if (source == grabItem \|\| source == groupButton)
2340	2626	{
2341		- group(new cGroup(), true);
	2627	+ group(new cGroup(), false); // true);
2342	2628	} else
2343	2629	if (source == hideItem)
2344	2630	{
..	..	@@ -2356,11 +2642,11 @@
2356	2642	{
2357	2643	makeSomething(new Camera());
2358	2644	} else
2359		- if (source == compositeItem)
	2645	+ if (source == compositeItem \|\| source == compositeButton)
2360	2646	{
2361	2647	group(new Composite());
2362	2648	} else
2363		- if (source == randomItem)
	2649	+ if (source == switchItem \|\| source == switchButton)
2364	2650	{
2365	2651	RandomNode random = new RandomNode();
2366	2652	group(random);
..	..	@@ -2462,7 +2748,7 @@
2462	2748	{
2463	2749	group(new cLinker());
2464	2750	} else
2465		- if (source == textureItem)
	2751	+ if (source == textureItem \|\| source == textureButton)
2466	2752	{
2467	2753	group(new TextureNode());
2468	2754	} else
..	..	@@ -2482,17 +2768,30 @@
2482	2768	{
2483	2769	CastShadow(2);
2484	2770	} else
2485		- if (source == ungroupItem)
	2771	+ if (source == ungroupItem \|\| source == ungroupButton)
2486	2772	{
2487		- //ungroup();
	2773	+ boolean hasRoot = false;
	2774	+
2488	2775	for (int i=0; i<group.selection.size(); i++)
2489	2776	{
2490		- Ungroup(group.selection.get(i));
	2777	+ if (group.selection.get(i) == group)
	2778	+ {
	2779	+ hasRoot = true;
	2780	+ break;
	2781	+ }
2491	2782	}
2492	2783
2493		- ClearSelection(false);
2494		-
2495		- 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	+ }
2496	2795	} else
2497	2796	if (source == genUVItem)
2498	2797	{
..	..	@@ -2504,7 +2803,7 @@
2504	2803	} else
2505	2804	if (source == genNormalsMESHItem)
2506	2805	{
2507		- GenNormals(true); // TODO
	2806	+ GenNormalsMESH();
2508	2807	} else
2509	2808	if (source == genNormalsORGANItem)
2510	2809	{
..	..	@@ -2569,6 +2868,22 @@
2569	2868	if (source == unmarkleavesItem)
2570	2869	{
2571	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);
2572	2887	} else
2573	2888	if (source == flipVItem)
2574	2889	{
..	..	@@ -2804,6 +3119,10 @@
2804	3119	if (source == twoButton)
2805	3120	{
2806	3121	radio.layout = twoButton;
	3122	+
	3123	+ if (CameraPane.FULLSCREEN)
	3124	+ fullscreenLayout = radio.layout;
	3125	+
2807	3126	// bug
2808	3127	//gridPanel.setDividerLocation(1.0);
2809	3128	//bigPanel.setDividerLocation(0.0);
..	..	@@ -2836,10 +3155,31 @@
2836	3155	bigThree.ClearUI();
2837	3156	bigThree.add(centralPanel);
2838	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	+
2839	3176	} else
2840	3177	if (source == threeButton)
2841	3178	{
2842	3179	radio.layout = threeButton;
	3180	+
	3181	+ if (CameraPane.FULLSCREEN)
	3182	+ fullscreenLayout = radio.layout;
2843	3183
2844	3184	// bigThree.remove(scenePanel);
2845	3185	// bigThree.remove(centralPanel);
..	..	@@ -2872,10 +3212,15 @@
2872	3212	bigThree.add(centralPanel);
2873	3213	bigThree.add(XYZPanel);
2874	3214	bigThree.FlushUI();
	3215	+
	3216	+ cameraView.requestFocusInWindow();
2875	3217	} else
2876	3218	if (source == fourButton)
2877	3219	{
2878	3220	radio.layout = fourButton;
	3221	+
	3222	+ if (CameraPane.FULLSCREEN)
	3223	+ fullscreenLayout = radio.layout;
2879	3224
2880	3225	// bigThree.remove(scenePanel);
2881	3226	// bigThree.remove(centralPanel);
..	..	@@ -2907,10 +3252,15 @@
2907	3252	bigThree.ClearUI();
2908	3253	bigThree.add(scenePanel);
2909	3254	bigThree.FlushUI();
	3255	+
	3256	+ cameraView.requestFocusInWindow();
2910	3257	} else
2911	3258	if (source == sixButton)
2912	3259	{
2913	3260	radio.layout = sixButton;
	3261	+
	3262	+ if (CameraPane.FULLSCREEN)
	3263	+ fullscreenLayout = radio.layout;
2914	3264
2915	3265	// bigThree.remove(scenePanel);
2916	3266	// bigThree.remove(centralPanel);
..	..	@@ -2943,10 +3293,15 @@
2943	3293	bigThree.add(scenePanel);
2944	3294	bigThree.add(centralPanel);
2945	3295	bigThree.FlushUI();
	3296	+
	3297	+ cameraView.requestFocusInWindow();
2946	3298	} else
2947	3299	if (source == sevenButton)
2948	3300	{
2949	3301	radio.layout = sevenButton;
	3302	+
	3303	+ if (CameraPane.FULLSCREEN)
	3304	+ fullscreenLayout = radio.layout;
2950	3305
2951	3306	// bigThree.remove(scenePanel);
2952	3307	// bigThree.remove(centralPanel);
..	..	@@ -2980,6 +3335,8 @@
2980	3335	bigThree.add(centralPanel);
2981	3336	bigThree.add(XYZPanel);
2982	3337	bigThree.FlushUI();
	3338	+
	3339	+ cameraView.requestFocusInWindow();
2983	3340	} else
2984	3341	if (source == rootButton)
2985	3342	{
..	..	@@ -2991,6 +3348,7 @@
2991	3348	EditObject(obj);
2992	3349	}
2993	3350
	3351	+ cameraView.requestFocusInWindow();
2994	3352	refreshContents(true);
2995	3353	} else
2996	3354	if (source == closeButton)
..	..	@@ -3000,22 +3358,37 @@
3000	3358	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3001	3359	{
3002	3360	ab = (cRadio)e.nextElement();
3003		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3361	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
3004	3362	{
	3363	+ // Patch to avoid bug with transparency.
	3364	+ if (!ab.hadMaterial)
	3365	+ {
	3366	+ ab.object.material = null;
	3367	+ }
	3368	+
3005	3369	buttonGroup.remove(ab);
3006	3370	radioPanel.remove(ab);
3007	3371
3008		- ab.GetObject().editWindow = null;
	3372	+ //ab.GetObject().editWindow = null;
	3373	+ ab.GetObject().manipWindow = null;
3009	3374	// ab.GetObject().objectUI = null; // ?????????
3010	3375
3011	3376	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
3012	3377	break;
3013	3378	}
3014	3379	}
	3380	+
	3381	+ cameraView.requestFocusInWindow();
3015	3382	refreshContents(true);
3016	3383	} else
3017	3384	if (source == editItem \|\| source == editButton)
3018	3385	{
	3386	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3387	+ {
	3388	+ Object3D child = (Object3D)e.nextElement();
	3389	+ child.pinned = true;
	3390	+ }
	3391	+
3019	3392	EditSelection(false);
3020	3393	} else
3021	3394	if (source == uneditButton)
..	..	@@ -3025,10 +3398,11 @@
3025	3398	Object3D child = (Object3D)e.nextElement();
3026	3399	if(child.editWindow != null)
3027	3400	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3401	+ child.pinned = false;
3028	3402	child.CloseUI();
3029	3403	listUI.remove(child);
3030	3404
3031		- child.editWindow = null; // ???????????
	3405	+ //child.editWindow = null; // ???????????
3032	3406	}
3033	3407	objEditor.ctrlPanel.FlushUI();
3034	3408	//objEditor.jTree.clearSelection();
..	..	@@ -3041,6 +3415,7 @@
3041	3415	//copy.ClearUI();
3042	3416	for (Object3D obj : listUI)
3043	3417	{
	3418	+ obj.pinned = false;
3044	3419	obj.CloseUI();
3045	3420	}
3046	3421	listUI.clear();
..	..	@@ -3050,7 +3425,7 @@
3050	3425	{
3051	3426	assert(copy == group);
3052	3427
3053		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3428	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3054	3429
3055	3430	for (Object3D obj : listUI)
3056	3431	{
..	..	@@ -3115,7 +3490,9 @@
3115	3490	sideView.object = group;
3116	3491	}
3117	3492
3118		-// fix "+" issue group.editWindow = this;
	3493	+// fix "+" issue
	3494	+ //group.editWindow = this;
	3495	+ group.manipWindow = this;
3119	3496
3120	3497	/*
3121	3498	currentLayout = radio.layout;
..	..	@@ -3123,18 +3500,25 @@
3123	3500	currentLayout = sevenButton;
3124	3501	*/
3125	3502	radio.layout.doClick();
	3503	+
	3504	+ ClearUnpinned();
	3505	+ SetPinStates(group.selection.size() > 0);
	3506	+ if (group.selection.size() == 1)
	3507	+ EditSelection(false);
3126	3508	keepparent = group.parent;
3127	3509	// PARENT = NULL or not???
3128	3510	//group.parent = null; // ROOT
3129	3511	//group.attributes = -1;
3130	3512	ResetModel();
	3513	+
	3514	+ cameraView.requestFocusInWindow();
3131	3515	refreshContents(true);
3132	3516	} else if (event.getSource() == editCameraItem)
3133	3517	{
3134	3518	cameraView.ProtectCamera();
3135	3519	cameraView.repaint();
3136	3520	return;
3137		- } else if (event.getSource() == revertCameraItem)
	3521	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3138	3522	{
3139	3523	cameraView.RevertCamera();
3140	3524	cameraView.repaint();
..	..	@@ -3151,7 +3535,6 @@
3151	3535	}
3152	3536
3153	3537	boolean useclient = false;
3154		- cRadio radio;
3155	3538
3156	3539	void ToggleRoot()
3157	3540	{
..	..	@@ -3390,7 +3773,8 @@
3390	3773
3391	3774	int size = obj.MemorySize();
3392	3775
3393		- System.err.println((size/1024) + " KB is the size of " + obj);
	3776	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	3777	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3394	3778	}
3395	3779	}
3396	3780	catch (Exception e)
..	..	@@ -3471,6 +3855,13 @@
3471	3855	void GenNormals(boolean crease)
3472	3856	{
3473	3857	group.GenNormalsS(crease);
	3858	+
	3859	+ refreshContents();
	3860	+ }
	3861	+
	3862	+ void GenNormalsMESH()
	3863	+ {
	3864	+ group.GenNormalsMeshS();
3474	3865
3475	3866	refreshContents();
3476	3867	}
..	..	@@ -4098,6 +4489,18 @@
4098	4489	refreshContents();
4099	4490	}
4100	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	+
4101	4504	void SetTexRes(int tr)
4102	4505	{
4103	4506	group.selection.SetTexRes(tr);
..	..	@@ -4169,10 +4572,6 @@
4169	4572	// }
4170	4573	// }
4171	4574
4172		- static boolean allparams = true;
4173		-
4174		- static Vector<Object3D> listUI = new Vector<Object3D>();
4175		-
4176	4575	void EditSelection(boolean newWindow)
4177	4576	{
4178	4577	// aConstraints.gridy = 0;
..	..	@@ -4180,7 +4579,7 @@
4180	4579	{
4181	4580	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4182	4581	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4183		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4582	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4184	4583
4185	4584	Object3D elem = (Object3D)group.selection.elementAt(i);
4186	4585	if(elem != group \|\| !newWindow)
..	..	@@ -4265,7 +4664,8 @@
4265	4664	//new Exception().printStackTrace();
4266	4665
4267	4666	freezemodel = true;
4268		-
	4667	+ ClearUnpinned();
	4668	+
4269	4669	/**/
4270	4670	//switch (event.id)
4271	4671	{
..	..	@@ -4273,7 +4673,6 @@
4273	4673	//case 702: // Event.LIST_DESELECT
4274	4674	group.deselectAll();
4275	4675	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4276		- objEditor.ClearInfo(); // .GetMaterial());
4277	4676	if (tps != null)
4278	4677	{
4279	4678	for (int i=0; i < tps.length; i++)
..	..	@@ -4282,10 +4681,8 @@
4282	4681
4283	4682	//if (child.parent != null)
4284	4683	//child.parent.addSelectee(child);
	4684	+ objEditor.SetMaterial(child);
4285	4685	group.addSelectee(child);
4286		- objEditor.SetMaterial(child); // .GetMaterial());
4287		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4288		- System.err.println("info : " + child.GetPath());
4289	4686	}
4290	4687	}
4291	4688	// else
..	..	@@ -4295,20 +4692,28 @@
4295	4692	// System.err.println("info : " + group.GetPath());
4296	4693	// }
4297	4694
4298		- objEditor.SetText(); // jan 2014
4299		-
4300		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4695	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4301	4696	CameraPane.flash = true;
4302	4697
4303		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4698	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4304	4699	// a camera
4305	4700	{
4306		- CameraPane.camerachangeframe = 0; // don't refuse it
4307		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4701	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
	4702	+ {
	4703	+ CameraPane.camerachangeframe = 0; // don't refuse it
	4704	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4705	+ }
4308	4706	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4309	4707	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4310	4708	}
4311	4709
	4710	+ if (tps != null && tps.length == 1)
	4711	+ {
	4712	+ EditSelection(false);
	4713	+ }
	4714	+
	4715	+ SetPinStates(tps != null && tps.length > 0);
	4716	+
4312	4717	refreshContents();
4313	4718	//return true;
4314	4719	}
..	..	@@ -4317,6 +4722,35 @@
4317	4722
4318	4723	freezemodel = false;
4319	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	+ }
4320	4754
4321	4755	void linkSomething(Object3D thing)
4322	4756	{
..	..	@@ -4388,6 +4822,7 @@
4388	4822	{
4389	4823	if (group.selection.isEmpty())
4390	4824	return;
	4825	+
4391	4826	Grafreed.clipboardIsTempGroup = false;
4392	4827	Composite tGroup = null;
4393	4828	if (group.selection.size() > 0) // 1)
..	..	@@ -4398,6 +4833,8 @@
4398	4833
4399	4834	if (cut)
4400	4835	{
	4836	+ if (Globals.SAVEONMAKE)
	4837	+ Save();
4401	4838	//int indices[] = jList.getSelectedIndices();
4402	4839	//for (int i = indices.length - 1; i >= 0; i--)
4403	4840	//jList.remove(indices[i]);
..	..	@@ -4487,8 +4924,10 @@
4487	4924	}
4488	4925
4489	4926	}
	4927	+
4490	4928	if (Grafreed.clipboardIsTempGroup)
4491	4929	Grafreed.clipboard = tGroup;
	4930	+
4492	4931	if (cut)
4493	4932	{
4494	4933	ResetModel();
..	..	@@ -5113,7 +5552,28 @@
5113	5552	cButton clearpanelButton;
5114	5553	cButton unselectButton;
5115	5554
	5555	+ cButton restoreCameraButton;
	5556	+
	5557	+ cButton saveButton;
5116	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;
5117	5577
5118	5578	cButton screenfitButton;
5119	5579	cButton screenfitpointButton;
..	..	@@ -5126,14 +5586,6 @@
5126	5586
5127	5587	cButton setsupportButton;
5128	5588
5129		- cButton twoButton;
5130		- cButton sixButton;
5131		- cButton threeButton;
5132		- cButton sevenButton;
5133		- cButton fourButton; // full panel
5134		- cButton oneButton; // full XYZ
5135		- //cButton currentLayout;
5136		-
5137	5589	//
5138	5590	//Composite
5139	5591	Object3D // to do !!
..	..	@@ -5143,9 +5595,11 @@
5143	5595	//JTree jTree;
5144	5596	private MenuItem lookAtItem;
5145	5597	private MenuItem lookFromItem;
5146		- private MenuItem switchItem;
	5598	+ private MenuItem switchViewItem;
5147	5599	private MenuItem cutItem;
5148		- private MenuItem duplicateItem;
	5600	+ private MenuItem undoItem;
	5601	+ private MenuItem redoItem;
	5602	+ private JMenuItem duplicateItem;
5149	5603	private MenuItem cloneItem;
5150	5604	private MenuItem cloneSupportItem;
5151	5605	private MenuItem overwriteGeoItem;
..	..	@@ -5208,6 +5662,10 @@
5208	5662	private MenuItem showleavesItem;
5209	5663	private MenuItem markleavesItem;
5210	5664	private MenuItem unmarkleavesItem;
	5665	+ private MenuItem rewindleavesItem;
	5666	+ private MenuItem unrewindleavesItem;
	5667	+ private MenuItem randomleavesItem;
	5668	+ private MenuItem unrandomleavesItem;
5211	5669
5212	5670	private MenuItem flipVItem;
5213	5671	private MenuItem unflipVItem;
..	..	@@ -5229,7 +5687,7 @@
5229	5687	private MenuItem frontItem;
5230	5688	private MenuItem cameraItem;
5231	5689	private MenuItem compositeItem;
5232		- private MenuItem randomItem;
	5690	+ private MenuItem switchItem;
5233	5691	private MenuItem physicsItem;
5234	5692	private MenuItem frameselectorItem;
5235	5693	private MenuItem scriptNodeItem;
..	..	@@ -5303,5 +5761,5 @@
5303	5761
5304	5762	Menu cameraMenu;
5305	5763	MenuItem editCameraItem;
5306		- MenuItem revertCameraItem;
	5764	+ MenuItem restoreCameraItem;
5307	5765	}