~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);
..	..	@@ -202,23 +204,23 @@
202	204	//zBufferItem.addActionListener(this);
203	205	//cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
204	206	//normalLensItem.addActionListener(this);
205		- cameraMenu.add(revertCameraItem = new MenuItem("Restore Viewpoint"));
206		- revertCameraItem.addActionListener(this);
	207	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	208	+ restoreCameraItem.addActionListener(this);
207	209
208		- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
209		- toggleFullScreenItem.addItemListener(this);
210		- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
211		- cameraMenu.add("-");
	210	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	211	+// toggleFullScreenItem.addItemListener(this);
	212	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	213	+// cameraMenu.add("-");
	214	+//
	215	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	216	+// toggleTextureItem.addItemListener(this);
	217	+// toggleTextureItem.setState(CameraPane.textureon);
	218	+//
	219	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	220	+// toggleSwitchItem.addItemListener(this);
	221	+// toggleSwitchItem.setState(CameraPane.SWITCH);
212	222
213		- cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
214		- toggleTextureItem.addItemListener(this);
215		- toggleTextureItem.setState(CameraPane.textureon);
216		-
217		- cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
218		- toggleSwitchItem.addItemListener(this);
219		- toggleSwitchItem.setState(CameraPane.SWITCH);
220		-
221		- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
	223	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
222	224	toggleHandleItem.addItemListener(this);
223	225	toggleHandleItem.setState(CameraPane.HANDLES);
224	226
..	..	@@ -273,7 +275,7 @@
273	275	{
274	276	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
275	277	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
276		- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
	278	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
277	279	editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
278	280	oe.cameraMenu.add("-");
279	281	openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
..	..	@@ -281,7 +283,7 @@
281	283	editLeafItem.addActionListener(this);
282	284	lookAtItem.addActionListener(this);
283	285	//lookFromItem.addActinoListener(this);
284		- //switchItem.addActionListener(this);
	286	+ //switchViewItem.addActionListener(this);
285	287	}
286	288
287	289	oe.menuBar.add(menu = new Menu("Setting"));
..	..	@@ -326,21 +328,29 @@
326	328	}
327	329
328	330	oe.menuBar.add(menu = new Menu("Group"));
329		- grabItem = menu.add(new MenuItem("Grab"));
330		- grabItem.addActionListener(this);
	331	+// grabItem = menu.add(new MenuItem("Grab"));
	332	+// grabItem.addActionListener(this);
331	333	backItem = menu.add(new MenuItem("Back"));
332	334	backItem.addActionListener(this);
333	335	frontItem = menu.add(new MenuItem("Front"));
334	336	frontItem.addActionListener(this);
335		- compositeItem = menu.add(new MenuItem("Composite"));
336		- compositeItem.addActionListener(this);
	337	+// compositeItem = menu.add(new MenuItem("Composite"));
	338	+// compositeItem.addActionListener(this);
	339	+
	340	+ if (Globals.ADVANCED)
	341	+ {
337	342	hideItem = menu.add(new MenuItem("Hidden Group"));
338	343	hideItem.addActionListener(this);
	344	+ }
339	345	ungroupItem = menu.add(new MenuItem("Ungroup"));
340	346	ungroupItem.addActionListener(this);
341		- menu.add("-");
342		- randomItem = menu.add(new MenuItem("Switch node"));
343		- randomItem.addActionListener(this);
	347	+
	348	+// menu.add("-");
	349	+//
	350	+// switchItem = menu.add(new MenuItem("Switch node"));
	351	+// switchItem.addActionListener(this);
	352	+ if (Globals.ADVANCED)
	353	+ {
344	354	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
345	355	switchGeoItem.addActionListener(this);
346	356	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
..	..	@@ -348,8 +358,6 @@
348	358	morphItem = menu.add(new MenuItem("Morph Group"));
349	359	morphItem.addActionListener(this);
350	360
351		- if (Globals.ADVANCED)
352		- {
353	361	menu.add("-");
354	362	physicsItem = menu.add(new MenuItem("Physics"));
355	363	physicsItem.addActionListener(this);
..	..	@@ -357,13 +365,11 @@
357	365	frameselectorItem.addActionListener(this);
358	366	scriptNodeItem = menu.add(new MenuItem("Script Node"));
359	367	scriptNodeItem.addActionListener(this);
360		- cameraItem = menu.add(new MenuItem("Camera"));
361		- cameraItem.addActionListener(this);
362	368	}
363	369
364	370	oe.menuBar.add(menu = new Menu("Object"));
365		- textureItem = menu.add(new MenuItem("Texture"));
366		- textureItem.addActionListener(this);
	371	+// textureItem = menu.add(new MenuItem("Texture"));
	372	+// textureItem.addActionListener(this);
367	373	billboardItem = menu.add(new MenuItem("Billboard"));
368	374	billboardItem.addActionListener(this);
369	375	csgItem = menu.add(new MenuItem("CSG"));
..	..	@@ -574,51 +580,66 @@
574	580	oe.radioPanel.add(dummyButton);
575	581	oe.buttonGroup.add(dummyButton);
576	582	*/
	583	+ cGridBag copyOptionsPanel = new cGridBag();
	584	+
	585	+ copyOptionsPanel.preferredHeight = 1;
	586	+
577	587	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
578	588
579	589	//oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
580	590	//minButton.setToolTipText("Minimize window");
581	591	//minButton.addActionListener(this);
582	592
583		- oe.toolbarPanel.add(maxButton = new cButton("\u271A", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
584		- maxButton.setToolTipText("Maximize window");
585		- maxButton.addActionListener(this);
	593	+ if (Globals.ADVANCED)
	594	+ {
	595	+ oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	596	+ maxButton.setToolTipText("Maximize window");
	597	+ maxButton.addActionListener(this);
	598	+ }
586	599
587		- oe.toolbarPanel.add(fullButton = new cButton("\u2b1c", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	600	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
588	601	fullButton.setToolTipText("Full-screen window");
589	602	fullButton.addActionListener(this);
590	603
591		- oe.toolbarPanel.add(undoButton = new cButton("\u21a9", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	604	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	605	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	606	+ restoreCameraButton.addActionListener(this);
	607	+
	608	+ copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
592	609	undoButton.setToolTipText("Undo changes");
593	610	undoButton.addActionListener(this);
	611	+ undoButton.setEnabled(false);
594	612
595		- oe.toolbarPanel.add(redoButton = new cButton("\u21aa", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	613	+ copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
596	614	redoButton.setToolTipText("Redo changes");
597	615	redoButton.addActionListener(this);
	616	+ redoButton.setEnabled(false);
598	617
599		- oe.toolbarPanel.add(saveButton = new cButton("\u21e3", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	618	+ copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
600	619	saveButton.setToolTipText("Save changes");
601	620	saveButton.addActionListener(this);
602	621
603		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
	622	+ copyOptionsPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
604	623	liveCB.setToolTipText("Enable animation");
605	624	liveCB.addItemListener(this);
606	625
607		- oe.toolbarPanel.add(oneStepButton = new cButton("\u29f4", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	626	+ copyOptionsPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
608	627	oneStepButton.setToolTipText("Animate one step forward");
609	628	oneStepButton.addActionListener(this);
610	629
611		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	630	+ copyOptionsPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
612	631	fastCB.setToolTipText("Fast mode");
613	632	fastCB.addItemListener(this);
614	633
615		- oe.toolbarPanel.add(trackCB = new cCheckBox(":", CameraPane.TRACK)); //, oe.aConstraints);
616		- trackCB.setToolTipText("Enable tracking");
617		- trackCB.addItemListener(this);
618		-
619		- oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	634	+ //oe.toolboxPanel.Return();
	635	+
	636	+ copyOptionsPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
620	637	screenfitButton.setToolTipText("Screen fit");
621	638	screenfitButton.addActionListener(this);
	639	+
	640	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	641	+// trackCB.setToolTipText("Enable tracking");
	642	+// trackCB.addItemListener(this);
622	643
623	644	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
624	645	// screenfitpointButton.addActionListener(this);
..	..	@@ -630,15 +651,13 @@
630	651	snapobjectButton.setToolTipText("Snap Object");
631	652	}
632	653
633		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
634		- flashSelectionButton.setToolTipText("Show selection");
635		- flashSelectionButton.addActionListener(this);
636		-
637		- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
	654	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
638	655
639	656	oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
640	657	twoButton.setToolTipText("Show center view only");
641	658	twoButton.addActionListener(this);
	659	+ this.fullscreenLayout = twoButton;
	660	+
642	661	oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
643	662	fourButton.addActionListener(this);
644	663	fourButton.setToolTipText("Show left panel only");
..	..	@@ -653,26 +672,105 @@
653	672	sevenButton.addActionListener(this);
654	673	//
655	674
656		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	675	+ oe.toolbarPanel.add(rootButton = GetButton("icons/write.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
657	676	rootButton.setToolTipText("Edit selection in new tab");
658	677	rootButton.addActionListener(this);
659	678
660		- oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	679	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
661	680	closeButton.setToolTipText("Close tab");
662	681	closeButton.addActionListener(this);
663	682	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
664	683	//clearButton.addActionListener(this);
665		-
666		- editCommandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
667		- editButton.setToolTipText("Edit selection");
	684	+
	685	+ // INSERT
	686	+ oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	687	+ gridButton.setToolTipText("Create grid");
	688	+ gridButton.addActionListener(this);
	689	+
	690	+ oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	691	+ boxButton.setToolTipText("Create box");
	692	+ boxButton.addActionListener(this);
	693	+
	694	+ oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	695	+ sphereButton.setToolTipText("Create sphere");
	696	+ sphereButton.addActionListener(this);
	697	+
	698	+ oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	699	+ coneButton.setToolTipText("Create cone");
	700	+ coneButton.addActionListener(this);
	701	+
	702	+ oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	703	+ torusButton.setToolTipText("Create torus");
	704	+ torusButton.addActionListener(this);
	705	+
	706	+ oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	707	+ superButton.setToolTipText("Create superellipsoid");
	708	+ superButton.addActionListener(this);
	709	+
	710	+ if (Globals.ADVANCED)
	711	+ {
	712	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	713	+ kleinButton.setToolTipText("Create Klein bottle");
	714	+ kleinButton.addActionListener(this);
	715	+ }
	716	+
	717	+ oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	718	+ particlesButton.setToolTipText("Create particle system");
	719	+ particlesButton.addActionListener(this);
	720	+
	721	+ oe.toolboxPanel.Return();
	722	+
	723	+ oe.toolboxPanel.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	724	+ groupButton.setToolTipText("Create group");
	725	+ groupButton.addActionListener(this);
	726	+
	727	+ oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	728	+ compositeButton.setToolTipText("Create composite");
	729	+ compositeButton.addActionListener(this);
	730	+
	731	+ oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	732	+ switchButton.setToolTipText("Create item switcher");
	733	+ switchButton.addActionListener(this);
	734	+
	735	+ oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	736	+ loopButton.setToolTipText("Create loop");
	737	+ loopButton.addActionListener(this);
	738	+
	739	+ oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	740	+ textureButton.setToolTipText("Create texture");
	741	+ textureButton.addActionListener(this);
	742	+
	743	+ oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	744	+ overlayButton.setToolTipText("Create overlay");
	745	+ overlayButton.addActionListener(this);
	746	+
	747	+ oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	748	+ lightButton.setToolTipText("Create light");
	749	+ lightButton.addActionListener(this);
	750	+
	751	+ for (int i=6; --i>=0;)
	752	+ {
	753	+ oe.toolboxPanel.Return();
	754	+ oe.toolboxPanel.add(new cGridBag());
	755	+ oe.toolboxPanel.add(new cGridBag());
	756	+ oe.toolboxPanel.add(new cGridBag());
	757	+ oe.toolboxPanel.add(new cGridBag());
	758	+ oe.toolboxPanel.add(new cGridBag());
	759	+ oe.toolboxPanel.add(new cGridBag());
	760	+ oe.toolboxPanel.add(new cGridBag());
	761	+ }
	762	+
	763	+ // EDIT panel
	764	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	765	+ editButton.setToolTipText("Pin selection controls");
668	766	editButton.addActionListener(this);
669	767
670		- editCommandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
671		- uneditButton.setToolTipText("Unedit selection");
	768	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	769	+ uneditButton.setToolTipText("Remove selection controls");
672	770	uneditButton.addActionListener(this);
673	771
674	772	editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
675		- allParamsButton.setToolTipText("Edit all params");
	773	+ allParamsButton.setToolTipText("Show all controle");
676	774	allParamsButton.addActionListener(this);
677	775
678	776	editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..	..	@@ -683,8 +781,13 @@
683	781	unselectButton.setToolTipText("Unselect");
684	782	unselectButton.addActionListener(this);
685	783
	784	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	785	+ flashSelectionButton.setToolTipText("Highlight selection");
	786	+ flashSelectionButton.addActionListener(this);
	787	+
686	788	editCommandsPanel.preferredHeight = 1;
687	789
	790	+ SetPinStates(false);
688	791	// oe.treePanel.add(commandsPanel);
689	792	// oe.treePanel.Return();
690	793
..	..	@@ -703,27 +806,12 @@
703	806
704	807	JScrollPane jSP;
705	808	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
706		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	809	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
707	810	ResetModel();
708	811
709	812	oe.treePanel.add(jSPPanel);
710	813	oe.treePanel.Return();
711	814
712		- cGridBag copyOptionsPanel = new cGridBag();
713		-
714		- copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
715		- colorCB.setToolTipText("Copy color when dropped");
716		- colorCB.addItemListener(this);
717		-
718		- copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
719		- materialCB.setToolTipText("Copy material when dropped");
720		- materialCB.addItemListener(this);
721		-
722		- copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
723		- textureCB.setToolTipText("Copy texture when dropped");
724		- textureCB.addItemListener(this);
725		-
726		- copyOptionsPanel.preferredHeight = 1;
727	815	oe.treePanel.add(copyOptionsPanel);
728	816	oe.treePanel.Return();
729	817
..	..	@@ -754,23 +842,43 @@
754	842
755	843	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
756	844	{
	845	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	846	+ colorCB.setToolTipText("Copy color when dropped");
	847	+ colorCB.addItemListener(this);
	848	+
	849	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	850	+ materialCB.setToolTipText("Copy material when dropped");
	851	+ materialCB.addItemListener(this);
	852	+
	853	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	854	+ textureCB.setToolTipText("Copy texture when dropped");
	855	+ textureCB.addItemListener(this);
	856	+
	857	+ panel.Return();
	858	+
757	859	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
758	860	boxCB.setToolTipText("Display bounding boxes");
759	861	boxCB.addItemListener(this);
760	862
761	863	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
762		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	864	+ zoomBoxCB.setToolTipText("Display only for wheel");
763	865	zoomBoxCB.addItemListener(this);
764	866
765	867	if (true) // Globals.ADVANCED)
766	868	{
767		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
768		- supportCB.setToolTipText("Enable rigging");
769		- supportCB.addItemListener(this);
	869	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	870	+// supportCB.setToolTipText("Enable rigging");
	871	+// supportCB.addItemListener(this);
	872	+
	873	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	874	+ freezeCB.setToolTipText("Fast moving camera");
	875	+ freezeCB.addItemListener(this);
770	876
771	877	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
772	878	// localCB.addItemListener(this);
773	879
	880	+ panel.Return();
	881	+
774	882	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
775	883	crowdCB.setToolTipText("Used for crowds");
776	884	crowdCB.addItemListener(this);
..	..	@@ -787,6 +895,8 @@
787	895	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
788	896	// speakerMocapCB.addItemListener(this);
789	897
	898	+ panel.Return();
	899	+
790	900	if (false)
791	901	{
792	902	// handled in scripts
..	..	@@ -801,32 +911,72 @@
801	911	//constraints.gridy += 1;
802	912	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
803	913	smoothfocusCB.addItemListener(this);
	914	+ panel.Return();
804	915	}
805	916
806	917	//constraints.gridx += 1;
807	918	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
808	919	// debugCB.addItemListener(this);
809	920
	921	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	922	+ trackCB.setToolTipText("Enable tracking target");
	923	+ trackCB.addItemListener(this);
	924	+
810	925	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	926	+ oeilCB.setToolTipText("Move camera when tracking");
811	927	oeilCB.addItemListener(this);
812	928
	929	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	930	+ shadowCB.setToolTipText("When live compute shadows");
	931	+ shadowCB.addItemListener(this);
	932	+
	933	+ panel.Return();
	934	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	935	+ toggleTextureCB.setToolTipText("Load textures");
	936	+ toggleTextureCB.addItemListener(this);
	937	+
	938	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	939	+ toggleSwitchCB.setToolTipText("Choose a single item");
	940	+ toggleSwitchCB.addItemListener(this);
	941	+
	942	+ panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
	943	+ autosaveCB.setToolTipText("On structure change");
	944	+ autosaveCB.addItemListener(this);
	945	+
	946	+ panel.Return();
	947	+ if (Globals.ADVANCED)
	948	+ {
813	949	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
814	950	lookAtCB.setToolTipText("Look-at target");
815	951	lookAtCB.addItemListener(this);
	952	+ }
816	953
817	954	}
818	955
819	956	cGridBag fill = new cGridBag();
820		-
821	957	fill.preferredHeight = 200;
	958	+ cGridBag fill2 = new cGridBag();
	959	+ fill2.preferredHeight = 200;
	960	+ cGridBag fill3 = new cGridBag();
	961	+ fill3.preferredHeight = 200;
822	962
823	963	panel.add(fill);
	964	+ panel.add(fill2);
	965	+ panel.add(fill3);
824	966
825	967	}
826	968
827	969	void EditObject(Object3D obj)
828	970	{
829	971	cRadio radioButton = new cRadio(obj.name);
	972	+
	973	+ // Patch to avoid bug with transparency.
	974	+ radioButton.hadMaterial = obj.material != null;
	975	+ if (!radioButton.hadMaterial)
	976	+ {
	977	+ obj.material = new cMaterial();
	978	+ }
	979	+
830	980	radioButton.SetObject(obj);
831	981	radioButton.layout = sevenButton;
832	982	radioButton.SetCamera(cameraView.renderCamera, false);
..	..	@@ -848,23 +998,28 @@
848	998	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
849	999	}
850	1000
851		- JCheckBox liveCB;
852		- JCheckBox supportCB;
853		- JCheckBox localCB;
854		- JCheckBox crowdCB;
855		- JCheckBox smoothCB;
856		- JCheckBox fastCB;
857		- JCheckBox slowCB;
858		- JCheckBox boxCB;
859		- JCheckBox zoomBoxCB;
860		- JCheckBox trackCB;
861		- JCheckBox smoothfocusCB;
	1001	+ cToggleButton liveCB;
	1002	+ cCheckBox supportCB;
	1003	+ cCheckBox localCB;
	1004	+ cCheckBox crowdCB;
	1005	+ cCheckBox smoothCB;
	1006	+ cToggleButton fastCB;
	1007	+ cCheckBox slowCB;
	1008	+ cCheckBox boxCB;
	1009	+ cCheckBox zoomBoxCB;
	1010	+ cCheckBox freezeCB;
	1011	+ //cToggleButton trackCB;
	1012	+ cCheckBox trackCB;
	1013	+ cCheckBox smoothfocusCB;
862	1014	// JCheckBox speakerMocapCB;
863		- JCheckBox speakerCameraCB;
864		- JCheckBox speakerFocusCB;
865		- JCheckBox debugCB;
866		- JCheckBox oeilCB;
867		- JCheckBox lookAtCB;
	1015	+ cCheckBox speakerCameraCB;
	1016	+ cCheckBox speakerFocusCB;
	1017	+ cCheckBox debugCB;
	1018	+
	1019	+ cCheckBox oeilCB;
	1020	+ cCheckBox shadowCB;
	1021	+ cCheckBox autosaveCB;
	1022	+ cCheckBox lookAtCB;
868	1023
869	1024	// static int COLOR = 1;
870	1025	// static int MATERIAL = 2;
..	..	@@ -872,9 +1027,9 @@
872	1027
873	1028	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
874	1029
875		- JCheckBox colorCB;
876		- JCheckBox materialCB;
877		- JCheckBox textureCB;
	1030	+ cCheckBox colorCB;
	1031	+ cCheckBox materialCB;
	1032	+ cCheckBox textureCB;
878	1033
879	1034	public void itemStateChanged(ItemEvent e)
880	1035	{
..	..	@@ -967,6 +1122,18 @@
967	1122	{
968	1123	cameraView.ToggleOeil();
969	1124	}
	1125	+ else if(e.getSource() == shadowCB)
	1126	+ {
	1127	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1128	+ }
	1129	+ else if(e.getSource() == freezeCB)
	1130	+ {
	1131	+ Globals.FREEZEONMOVE ^= true;
	1132	+ }
	1133	+ else if(e.getSource() == autosaveCB)
	1134	+ {
	1135	+ Globals.SAVEONMAKE ^= true;
	1136	+ }
970	1137	else if(e.getSource() == lookAtCB)
971	1138	{
972	1139	cameraView.ToggleLookAt();
..	..	@@ -983,7 +1150,8 @@
983	1150
984	1151	/**/
985	1152	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
986		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1153	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1154	+ TreePath path = objEditor.jTree.getSelectionPath();
987	1155	if ((path == null) \|\| (path.getPathCount() <= 1)) {
988	1156	// We can't move the root node or an empty selection
989	1157	return;
..	..	@@ -1100,23 +1268,33 @@
1100	1268
1101	1269	assert target == objEditor.jTree;
1102	1270	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1271	+ Object3D destinationLeaf;
1103	1272	try {
1104		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1273	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
1105	1274	} catch (Exception e) {
1106	1275	System.out.println("destinationPath : " + destinationPath);
1107	1276	return;
1108	1277	}
1109	1278
1110		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1279	+ for (int i=group.selection.size(); --i>=0;)
1111	1280	{
	1281	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1282	+
	1283	+ // Cannot move into itself
	1284	+ if (child == destinationLeaf)
	1285	+ return;
	1286	+ }
	1287	+
	1288	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1289	+// {
1112	1290	loadClipboard(true);
1113	1291	objEditor.jTree.setSelectionPath(destinationPath);
1114	1292	pasteInto(false, false);
1115		- } else {
1116		- loadClipboard(false);
1117		- objEditor.jTree.setSelectionPath(destinationPath);
1118		- pasteInto(false, false); // true); // ???
1119		- }
	1293	+// } else {
	1294	+// loadClipboard(false);
	1295	+// objEditor.jTree.setSelectionPath(destinationPath);
	1296	+// pasteInto(false, false); // true); // ???
	1297	+// }
1120	1298	}
1121	1299	public void dropActionChanged(DropTargetDragEvent dtde)
1122	1300	// Called if the user has modified the current drop gesture
..	..	@@ -1221,22 +1399,30 @@
1221	1399	{
1222	1400	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1223	1401	//heightFieldItem.addActionListener(this);
1224		- gridItem = menu.add(new MenuItem("Grid"));
1225		- gridItem.addActionListener(this);
1226		- rectoidItem = menu.add(new MenuItem("Box"));
1227		- rectoidItem.addActionListener(this);
1228		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1229		- ellipsoidItem.addActionListener(this);
1230		- coneItem = menu.add(new MenuItem("Cone"));
1231		- coneItem.addActionListener(this);
1232		- torusItem = menu.add(new MenuItem("Torus"));
1233		- torusItem.addActionListener(this);
1234		- superItem = menu.add(new MenuItem("Superellipsoid"));
1235		- superItem.addActionListener(this);
	1402	+// gridItem = menu.add(new MenuItem("Grid"));
	1403	+// gridItem.addActionListener(this);
	1404	+// rectoidItem = menu.add(new MenuItem("Box"));
	1405	+// rectoidItem.addActionListener(this);
	1406	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1407	+// ellipsoidItem.addActionListener(this);
	1408	+// coneItem = menu.add(new MenuItem("Cone"));
	1409	+// coneItem.addActionListener(this);
	1410	+// torusItem = menu.add(new MenuItem("Torus"));
	1411	+// torusItem.addActionListener(this);
	1412	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1413	+// superItem.addActionListener(this);
	1414	+
	1415	+ cameraItem = menu.add(new MenuItem("Camera"));
	1416	+ cameraItem.addActionListener(this);
	1417	+
	1418	+ if (!Globals.ADVANCED)
	1419	+ {
1236	1420	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1237	1421	kleinItem.addActionListener(this);
1238		- particleItem = menu.add(new MenuItem("Particle system"));
1239		- particleItem.addActionListener(this);
	1422	+ }
	1423	+
	1424	+// particleItem = menu.add(new MenuItem("Particle system"));
	1425	+// particleItem.addActionListener(this);
1240	1426	if (Globals.ADVANCED)
1241	1427	{
1242	1428	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1262,15 +1448,15 @@
1262	1448	}
1263	1449	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1264	1450	bezierItem.addActionListener(this);
1265		- overlayItem = menu.add(new MenuItem("Overlay"));
1266		- overlayItem.addActionListener(this);
1267		- lightItem = menu.add(new MenuItem("Light"));
1268		- lightItem.addActionListener(this);
	1451	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1452	+// overlayItem.addActionListener(this);
	1453	+// lightItem = menu.add(new MenuItem("Light"));
	1454	+// lightItem.addActionListener(this);
1269	1455	menu.add("-");
1270	1456	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1271	1457	//superLoopItem.addActionListener(this);
1272		- loopItem = menu.add(new MenuItem("Loop"));
1273		- loopItem.addActionListener(this);
	1458	+// loopItem = menu.add(new MenuItem("Loop"));
	1459	+// loopItem.addActionListener(this);
1274	1460	doubleItem = menu.add(new MenuItem("Fork"));
1275	1461	doubleItem.addActionListener(this);
1276	1462	if (Globals.ADVANCED)
..	..	@@ -1455,6 +1641,20 @@
1455	1641
1456	1642	makeSomething(shadow);
1457	1643	}
	1644	+
	1645	+ private void ClearUnpinned()
	1646	+ {
	1647	+ //for (Object3D obj : listUI)
	1648	+ for (int i=listUI.size(); --i>=0;)
	1649	+ {
	1650	+ Object3D obj = listUI.elementAt(i);
	1651	+ if (!obj.pinned)
	1652	+ {
	1653	+ obj.CloseUI();
	1654	+ listUI.remove(i);
	1655	+ }
	1656	+ }
	1657	+ }
1458	1658
1459	1659	/**
1460	1660	* applyExample
..	..	@@ -1699,7 +1899,7 @@
1699	1899	{
1700	1900	ScreenFit();
1701	1901	} else
1702		- if (source == switchItem)
	1902	+ if (source == switchViewItem)
1703	1903	{
1704	1904	cVector v1 = new cVector();
1705	1905	cVector v2 = new cVector();
..	..	@@ -1708,11 +1908,11 @@
1708	1908	objEditor.cameraView.renderCamera.setAim(v2, v1);
1709	1909	objEditor.cameraView.repaint();
1710	1910	} else
1711		- if (source == rectoidItem)
	1911	+ if (source == rectoidItem \|\| source == boxButton)
1712	1912	{
1713	1913	makeSomething(new Box());
1714	1914	} else
1715		- if (source == particleItem)
	1915	+ if (source == particleItem \|\| source == particlesButton)
1716	1916	{
1717	1917	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1718	1918	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1791,27 +1991,27 @@
1791	1991
1792	1992	makeSomething(obj);
1793	1993	} else
1794		- if (source == gridItem)
	1994	+ if (source == gridItem \|\| source == gridButton)
1795	1995	{
1796	1996	makeSomething(new Grid());
1797	1997	} else
1798		- if (source == ellipsoidItem)
	1998	+ if (source == ellipsoidItem \|\| source == sphereButton)
1799	1999	{
1800	2000	makeSomething(new Sphere());
1801	2001	} else
1802		- if (source == coneItem)
	2002	+ if (source == coneItem \|\| source == coneButton)
1803	2003	{
1804	2004	makeSomething(new Cone());
1805	2005	} else
1806		- if (source == torusItem)
	2006	+ if (source == torusItem \|\| source == torusButton)
1807	2007	{
1808	2008	makeSomething(new Torus());
1809	2009	} else
1810		- if (source == superItem)
	2010	+ if (source == superItem \|\| source == superButton)
1811	2011	{
1812	2012	makeSomething(new Superellipsoid());
1813	2013	} else
1814		- if (source == kleinItem)
	2014	+ if (source == kleinItem \|\| source == kleinButton)
1815	2015	{
1816	2016	makeSomething(new Klein());
1817	2017	} else
..	..	@@ -1831,7 +2031,7 @@
1831	2031	{
1832	2032	makeSomething(new BezierSurface());
1833	2033	} else
1834		- if (source == overlayItem)
	2034	+ if (source == overlayItem \|\| source == overlayButton)
1835	2035	{
1836	2036	/*
1837	2037	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1879,7 +2079,7 @@
1879	2079	s.setup();
1880	2080	makeSomething(s);
1881	2081	} else
1882		- if (source == lightItem)
	2082	+ if (source == lightItem \|\| source == lightButton)
1883	2083	{
1884	2084	makeSomething(new Light());
1885	2085	} else
..	..	@@ -1929,30 +2129,30 @@
1929	2129
1930	2130	group(g);
1931	2131	} else
1932		- if (source == loopItem)
	2132	+ if (source == loopItem \|\| source == loopButton)
1933	2133	{
1934	2134	Composite csg = new GroupLeaf();
1935	2135	csg.count = 5;
1936	2136	group(csg);
1937		- Composite child = new cGroup();
	2137	+ Composite child = new cGroup("Branch");
1938	2138	csg.addChild(child);
1939	2139	child.addChild(csg);
1940	2140	} else
1941	2141	if (source == doubleItem)
1942	2142	{
1943		- Composite csg = new GroupLeaf();
	2143	+ Composite csg = new GroupLeaf("Fork");
1944	2144	csg.count = 5;
1945	2145	group(csg);
1946		- Composite child = new cGroup();
	2146	+ Composite child = new cGroup("Branch A");
1947	2147	csg.addChild(child);
1948	2148	child.addChild(csg);
1949		- child = new cGroup();
	2149	+ child = new cGroup("Branch B");
1950	2150	csg.addChild(child);
1951	2151	child.addChild(csg);
1952	2152	} else
1953	2153	if (source == tripleItem)
1954	2154	{
1955		- Composite csg = new GroupLeaf();
	2155	+ Composite csg = new GroupLeaf("Trident");
1956	2156	csg.count = 4;
1957	2157	group(csg);
1958	2158	Composite child = new cGroup();
..	..	@@ -2419,9 +2619,9 @@
2419	2619	{
2420	2620	ClearSelection(true);
2421	2621	} else
2422		- if (source == grabItem)
	2622	+ if (source == grabItem \|\| source == groupButton)
2423	2623	{
2424		- group(new cGroup(), true);
	2624	+ group(new cGroup(), false); // true);
2425	2625	} else
2426	2626	if (source == hideItem)
2427	2627	{
..	..	@@ -2439,11 +2639,11 @@
2439	2639	{
2440	2640	makeSomething(new Camera());
2441	2641	} else
2442		- if (source == compositeItem)
	2642	+ if (source == compositeItem \|\| source == compositeButton)
2443	2643	{
2444	2644	group(new Composite());
2445	2645	} else
2446		- if (source == randomItem)
	2646	+ if (source == switchItem \|\| source == switchButton)
2447	2647	{
2448	2648	RandomNode random = new RandomNode();
2449	2649	group(random);
..	..	@@ -2545,7 +2745,7 @@
2545	2745	{
2546	2746	group(new cLinker());
2547	2747	} else
2548		- if (source == textureItem)
	2748	+ if (source == textureItem \|\| source == textureButton)
2549	2749	{
2550	2750	group(new TextureNode());
2551	2751	} else
..	..	@@ -2565,17 +2765,30 @@
2565	2765	{
2566	2766	CastShadow(2);
2567	2767	} else
2568		- if (source == ungroupItem)
	2768	+ if (source == ungroupItem \|\| source == ungroupButton)
2569	2769	{
2570		- //ungroup();
	2770	+ boolean hasRoot = false;
	2771	+
2571	2772	for (int i=0; i<group.selection.size(); i++)
2572	2773	{
2573		- Ungroup(group.selection.get(i));
	2774	+ if (group.selection.get(i) == group)
	2775	+ {
	2776	+ hasRoot = true;
	2777	+ break;
	2778	+ }
2574	2779	}
2575	2780
2576		- ClearSelection(false);
2577		-
2578		- refreshContents();
	2781	+ if (!hasRoot)
	2782	+ {
	2783	+ for (int i=0; i<group.selection.size(); i++)
	2784	+ {
	2785	+ Ungroup(group.selection.get(i));
	2786	+ }
	2787	+
	2788	+ ClearSelection(false);
	2789	+
	2790	+ refreshContents();
	2791	+ }
2579	2792	} else
2580	2793	if (source == genUVItem)
2581	2794	{
..	..	@@ -2903,6 +3116,10 @@
2903	3116	if (source == twoButton)
2904	3117	{
2905	3118	radio.layout = twoButton;
	3119	+
	3120	+ if (CameraPane.FULLSCREEN)
	3121	+ fullscreenLayout = radio.layout;
	3122	+
2906	3123	// bug
2907	3124	//gridPanel.setDividerLocation(1.0);
2908	3125	//bigPanel.setDividerLocation(0.0);
..	..	@@ -2958,6 +3175,9 @@
2958	3175	{
2959	3176	radio.layout = threeButton;
2960	3177
	3178	+ if (CameraPane.FULLSCREEN)
	3179	+ fullscreenLayout = radio.layout;
	3180	+
2961	3181	// bigThree.remove(scenePanel);
2962	3182	// bigThree.remove(centralPanel);
2963	3183	// bigThree.remove(XYZPanel);
..	..	@@ -2996,6 +3216,9 @@
2996	3216	{
2997	3217	radio.layout = fourButton;
2998	3218
	3219	+ if (CameraPane.FULLSCREEN)
	3220	+ fullscreenLayout = radio.layout;
	3221	+
2999	3222	// bigThree.remove(scenePanel);
3000	3223	// bigThree.remove(centralPanel);
3001	3224	// bigThree.remove(XYZPanel);
..	..	@@ -3032,6 +3255,9 @@
3032	3255	if (source == sixButton)
3033	3256	{
3034	3257	radio.layout = sixButton;
	3258	+
	3259	+ if (CameraPane.FULLSCREEN)
	3260	+ fullscreenLayout = radio.layout;
3035	3261
3036	3262	// bigThree.remove(scenePanel);
3037	3263	// bigThree.remove(centralPanel);
..	..	@@ -3070,6 +3296,9 @@
3070	3296	if (source == sevenButton)
3071	3297	{
3072	3298	radio.layout = sevenButton;
	3299	+
	3300	+ if (CameraPane.FULLSCREEN)
	3301	+ fullscreenLayout = radio.layout;
3073	3302
3074	3303	// bigThree.remove(scenePanel);
3075	3304	// bigThree.remove(centralPanel);
..	..	@@ -3126,12 +3355,19 @@
3126	3355	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3127	3356	{
3128	3357	ab = (cRadio)e.nextElement();
3129		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3358	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
3130	3359	{
	3360	+ // Patch to avoid bug with transparency.
	3361	+ if (!ab.hadMaterial)
	3362	+ {
	3363	+ ab.object.material = null;
	3364	+ }
	3365	+
3131	3366	buttonGroup.remove(ab);
3132	3367	radioPanel.remove(ab);
3133	3368
3134		- ab.GetObject().editWindow = null;
	3369	+ //ab.GetObject().editWindow = null;
	3370	+ ab.GetObject().manipWindow = null;
3135	3371	// ab.GetObject().objectUI = null; // ?????????
3136	3372
3137	3373	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
..	..	@@ -3144,6 +3380,12 @@
3144	3380	} else
3145	3381	if (source == editItem \|\| source == editButton)
3146	3382	{
	3383	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3384	+ {
	3385	+ Object3D child = (Object3D)e.nextElement();
	3386	+ child.pinned = true;
	3387	+ }
	3388	+
3147	3389	EditSelection(false);
3148	3390	} else
3149	3391	if (source == uneditButton)
..	..	@@ -3153,6 +3395,7 @@
3153	3395	Object3D child = (Object3D)e.nextElement();
3154	3396	if(child.editWindow != null)
3155	3397	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3398	+ child.pinned = false;
3156	3399	child.CloseUI();
3157	3400	listUI.remove(child);
3158	3401
..	..	@@ -3169,6 +3412,7 @@
3169	3412	//copy.ClearUI();
3170	3413	for (Object3D obj : listUI)
3171	3414	{
	3415	+ obj.pinned = false;
3172	3416	obj.CloseUI();
3173	3417	}
3174	3418	listUI.clear();
..	..	@@ -3178,7 +3422,7 @@
3178	3422	{
3179	3423	assert(copy == group);
3180	3424
3181		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3425	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3182	3426
3183	3427	for (Object3D obj : listUI)
3184	3428	{
..	..	@@ -3245,6 +3489,7 @@
3245	3489
3246	3490	// fix "+" issue
3247	3491	//group.editWindow = this;
	3492	+ group.manipWindow = this;
3248	3493
3249	3494	/*
3250	3495	currentLayout = radio.layout;
..	..	@@ -3252,6 +3497,11 @@
3252	3497	currentLayout = sevenButton;
3253	3498	*/
3254	3499	radio.layout.doClick();
	3500	+
	3501	+ ClearUnpinned();
	3502	+ SetPinStates(group.selection.size() > 0);
	3503	+ if (group.selection.size() == 1)
	3504	+ EditSelection(false);
3255	3505	keepparent = group.parent;
3256	3506	// PARENT = NULL or not???
3257	3507	//group.parent = null; // ROOT
..	..	@@ -3265,7 +3515,7 @@
3265	3515	cameraView.ProtectCamera();
3266	3516	cameraView.repaint();
3267	3517	return;
3268		- } else if (event.getSource() == revertCameraItem)
	3518	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3269	3519	{
3270	3520	cameraView.RevertCamera();
3271	3521	cameraView.repaint();
..	..	@@ -4319,10 +4569,6 @@
4319	4569	// }
4320	4570	// }
4321	4571
4322		- static boolean allparams = true;
4323		-
4324		- static Vector<Object3D> listUI = new Vector<Object3D>();
4325		-
4326	4572	void EditSelection(boolean newWindow)
4327	4573	{
4328	4574	// aConstraints.gridy = 0;
..	..	@@ -4330,7 +4576,7 @@
4330	4576	{
4331	4577	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4332	4578	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4333		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4579	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4334	4580
4335	4581	Object3D elem = (Object3D)group.selection.elementAt(i);
4336	4582	if(elem != group \|\| !newWindow)
..	..	@@ -4415,7 +4661,8 @@
4415	4661	//new Exception().printStackTrace();
4416	4662
4417	4663	freezemodel = true;
4418		-
	4664	+ ClearUnpinned();
	4665	+
4419	4666	/**/
4420	4667	//switch (event.id)
4421	4668	{
..	..	@@ -4448,7 +4695,7 @@
4448	4695	if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4449	4696	// a camera
4450	4697	{
4451		- if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	4698	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
4452	4699	{
4453	4700	CameraPane.camerachangeframe = 0; // don't refuse it
4454	4701	Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
..	..	@@ -4457,6 +4704,13 @@
4457	4704	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4458	4705	}
4459	4706
	4707	+ if (tps != null && tps.length == 1)
	4708	+ {
	4709	+ EditSelection(false);
	4710	+ }
	4711	+
	4712	+ SetPinStates(tps != null && tps.length > 0);
	4713	+
4460	4714	refreshContents();
4461	4715	//return true;
4462	4716	}
..	..	@@ -4466,9 +4720,18 @@
4466	4720	freezemodel = false;
4467	4721	}
4468	4722
	4723	+ void SetPinStates(boolean enabled)
	4724	+ {
	4725	+ editButton.setEnabled(enabled);
	4726	+ uneditButton.setEnabled(enabled);
	4727	+ unselectButton.setEnabled(enabled);
	4728	+ flashSelectionButton.setEnabled(enabled);
	4729	+ }
	4730	+
4469	4731	void refreshContents(boolean cp)
4470	4732	{
4471		- if (!Globals.MOUSEDRAGGED)
	4733	+ if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
	4734	+ if (!Globals.MOUSEDRAGGED) // && !Globals.TIMERRUNNING)
4472	4735	{
4473	4736	objEditor.ClearInfo(); // .GetMaterial());
4474	4737
..	..	@@ -4567,6 +4830,7 @@
4567	4830
4568	4831	if (cut)
4569	4832	{
	4833	+ if (Globals.SAVEONMAKE)
4570	4834	Save();
4571	4835	//int indices[] = jList.getSelectedIndices();
4572	4836	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -5285,13 +5549,28 @@
5285	5549	cButton clearpanelButton;
5286	5550	cButton unselectButton;
5287	5551
5288		- cButton minButton;
5289		- cButton maxButton;
5290		- cButton fullButton;
5291		- cButton undoButton;
5292		- cButton redoButton;
	5552	+ cButton restoreCameraButton;
	5553	+
5293	5554	cButton saveButton;
5294	5555	cButton oneStepButton;
	5556	+
	5557	+ cButton groupButton;
	5558	+ cButton ungroupButton;
	5559	+ cButton compositeButton;
	5560	+ cButton switchButton;
	5561	+ cButton loopButton;
	5562	+ cButton textureButton;
	5563	+
	5564	+ cButton gridButton;
	5565	+ cButton boxButton;
	5566	+ cButton sphereButton;
	5567	+ cButton coneButton;
	5568	+ cButton torusButton;
	5569	+ cButton superButton;
	5570	+ cButton kleinButton;
	5571	+ cButton particlesButton;
	5572	+ cButton overlayButton;
	5573	+ cButton lightButton;
5295	5574
5296	5575	cButton screenfitButton;
5297	5576	cButton screenfitpointButton;
..	..	@@ -5313,11 +5592,11 @@
5313	5592	//JTree jTree;
5314	5593	private MenuItem lookAtItem;
5315	5594	private MenuItem lookFromItem;
5316		- private MenuItem switchItem;
	5595	+ private MenuItem switchViewItem;
5317	5596	private MenuItem cutItem;
5318	5597	private MenuItem undoItem;
5319	5598	private MenuItem redoItem;
5320		- private MenuItem duplicateItem;
	5599	+ private JMenuItem duplicateItem;
5321	5600	private MenuItem cloneItem;
5322	5601	private MenuItem cloneSupportItem;
5323	5602	private MenuItem overwriteGeoItem;
..	..	@@ -5405,7 +5684,7 @@
5405	5684	private MenuItem frontItem;
5406	5685	private MenuItem cameraItem;
5407	5686	private MenuItem compositeItem;
5408		- private MenuItem randomItem;
	5687	+ private MenuItem switchItem;
5409	5688	private MenuItem physicsItem;
5410	5689	private MenuItem frameselectorItem;
5411	5690	private MenuItem scriptNodeItem;
..	..	@@ -5479,5 +5758,5 @@
5479	5758
5480	5759	Menu cameraMenu;
5481	5760	MenuItem editCameraItem;
5482		- MenuItem revertCameraItem;
	5761	+ MenuItem restoreCameraItem;
5483	5762	}