~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"));
..	..	@@ -374,6 +380,7 @@
374	380	shadowYItem.addActionListener(this);
375	381	shadowZItem = menu.add(new MenuItem("Shadow Blue"));
376	382	shadowZItem.addActionListener(this);
	383	+
377	384	if (Globals.ADVANCED)
378	385	{
379	386	menu.add("-");
..	..	@@ -574,51 +581,66 @@
574	581	oe.radioPanel.add(dummyButton);
575	582	oe.buttonGroup.add(dummyButton);
576	583	*/
	584	+ cGridBag copyOptionsPanel = new cGridBag();
	585	+
	586	+ copyOptionsPanel.preferredHeight = 1;
	587	+
577	588	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
578	589
579	590	//oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
580	591	//minButton.setToolTipText("Minimize window");
581	592	//minButton.addActionListener(this);
582	593
583		- oe.toolbarPanel.add(maxButton = new cButton("\u271A", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
584		- maxButton.setToolTipText("Maximize window");
585		- maxButton.addActionListener(this);
	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	+ }
586	600
587		- oe.toolbarPanel.add(fullButton = new cButton("\u2b1c", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	601	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
588	602	fullButton.setToolTipText("Full-screen window");
589	603	fullButton.addActionListener(this);
590	604
591		- oe.toolbarPanel.add(undoButton = new cButton("\u21a9", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	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);
592	614	undoButton.setToolTipText("Undo changes");
593	615	undoButton.addActionListener(this);
	616	+ undoButton.setEnabled(false);
594	617
595		- oe.toolbarPanel.add(redoButton = new cButton("\u21aa", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	618	+ copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
596	619	redoButton.setToolTipText("Redo changes");
597	620	redoButton.addActionListener(this);
	621	+ redoButton.setEnabled(false);
598	622
599		- oe.toolbarPanel.add(saveButton = new cButton("\u21e3", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	623	+ copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
600	624	saveButton.setToolTipText("Save changes");
601	625	saveButton.addActionListener(this);
602	626
603		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
	627	+ copyOptionsPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
604	628	liveCB.setToolTipText("Enable animation");
605	629	liveCB.addItemListener(this);
606	630
607		- oe.toolbarPanel.add(oneStepButton = new cButton("\u29f4", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	631	+ copyOptionsPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
608	632	oneStepButton.setToolTipText("Animate one step forward");
609	633	oneStepButton.addActionListener(this);
610	634
611		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	635	+ copyOptionsPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
612	636	fastCB.setToolTipText("Fast mode");
613	637	fastCB.addItemListener(this);
614	638
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);
620		- screenfitButton.setToolTipText("Screen fit");
621		- 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);
622	644
623	645	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
624	646	// screenfitpointButton.addActionListener(this);
..	..	@@ -630,15 +652,13 @@
630	652	snapobjectButton.setToolTipText("Snap Object");
631	653	}
632	654
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));
	655	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
638	656
639	657	oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
640	658	twoButton.setToolTipText("Show center view only");
641	659	twoButton.addActionListener(this);
	660	+ this.fullscreenLayout = twoButton;
	661	+
642	662	oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
643	663	fourButton.addActionListener(this);
644	664	fourButton.setToolTipText("Show left panel only");
..	..	@@ -653,26 +673,105 @@
653	673	sevenButton.addActionListener(this);
654	674	//
655	675
656		- 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);
657	677	rootButton.setToolTipText("Edit selection in new tab");
658	678	rootButton.addActionListener(this);
659	679
660		- 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);
661	681	closeButton.setToolTipText("Close tab");
662	682	closeButton.addActionListener(this);
663	683	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
664	684	//clearButton.addActionListener(this);
665		-
666		- editCommandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
667		- editButton.setToolTipText("Edit selection");
	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	+ }
	717	+
	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");
668	767	editButton.addActionListener(this);
669	768
670		- editCommandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
671		- uneditButton.setToolTipText("Unedit selection");
	769	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	770	+ uneditButton.setToolTipText("Remove selection controls");
672	771	uneditButton.addActionListener(this);
673	772
674	773	editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
675		- allParamsButton.setToolTipText("Edit all params");
	774	+ allParamsButton.setToolTipText("Show all controle");
676	775	allParamsButton.addActionListener(this);
677	776
678	777	editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..	..	@@ -683,8 +782,13 @@
683	782	unselectButton.setToolTipText("Unselect");
684	783	unselectButton.addActionListener(this);
685	784
	785	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	786	+ flashSelectionButton.setToolTipText("Highlight selection");
	787	+ flashSelectionButton.addActionListener(this);
	788	+
686	789	editCommandsPanel.preferredHeight = 1;
687	790
	791	+ SetPinStates(false);
688	792	// oe.treePanel.add(commandsPanel);
689	793	// oe.treePanel.Return();
690	794
..	..	@@ -703,27 +807,12 @@
703	807
704	808	JScrollPane jSP;
705	809	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
706		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	810	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
707	811	ResetModel();
708	812
709	813	oe.treePanel.add(jSPPanel);
710	814	oe.treePanel.Return();
711	815
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	816	oe.treePanel.add(copyOptionsPanel);
728	817	oe.treePanel.Return();
729	818
..	..	@@ -754,23 +843,43 @@
754	843
755	844	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
756	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	+
757	860	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
758	861	boxCB.setToolTipText("Display bounding boxes");
759	862	boxCB.addItemListener(this);
760	863
761	864	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
762		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	865	+ zoomBoxCB.setToolTipText("Display only for wheel");
763	866	zoomBoxCB.addItemListener(this);
764	867
765	868	if (true) // Globals.ADVANCED)
766	869	{
767		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
768		- supportCB.setToolTipText("Enable rigging");
769		- 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);
770	877
771	878	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
772	879	// localCB.addItemListener(this);
773	880
	881	+ panel.Return();
	882	+
774	883	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
775	884	crowdCB.setToolTipText("Used for crowds");
776	885	crowdCB.addItemListener(this);
..	..	@@ -787,6 +896,8 @@
787	896	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
788	897	// speakerMocapCB.addItemListener(this);
789	898
	899	+ panel.Return();
	900	+
790	901	if (false)
791	902	{
792	903	// handled in scripts
..	..	@@ -801,32 +912,72 @@
801	912	//constraints.gridy += 1;
802	913	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
803	914	smoothfocusCB.addItemListener(this);
	915	+ panel.Return();
804	916	}
805	917
806	918	//constraints.gridx += 1;
807	919	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
808	920	// debugCB.addItemListener(this);
809	921
	922	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	923	+ trackCB.setToolTipText("Enable tracking target");
	924	+ trackCB.addItemListener(this);
	925	+
810	926	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	927	+ oeilCB.setToolTipText("Move camera when tracking");
811	928	oeilCB.addItemListener(this);
812	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	+ {
813	950	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
814	951	lookAtCB.setToolTipText("Look-at target");
815	952	lookAtCB.addItemListener(this);
	953	+ }
816	954
817	955	}
818	956
819	957	cGridBag fill = new cGridBag();
820		-
821	958	fill.preferredHeight = 200;
	959	+ cGridBag fill2 = new cGridBag();
	960	+ fill2.preferredHeight = 200;
	961	+ cGridBag fill3 = new cGridBag();
	962	+ fill3.preferredHeight = 200;
822	963
823	964	panel.add(fill);
	965	+ panel.add(fill2);
	966	+ panel.add(fill3);
824	967
825	968	}
826	969
827	970	void EditObject(Object3D obj)
828	971	{
829	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	+
830	981	radioButton.SetObject(obj);
831	982	radioButton.layout = sevenButton;
832	983	radioButton.SetCamera(cameraView.renderCamera, false);
..	..	@@ -848,23 +999,28 @@
848	999	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
849	1000	}
850	1001
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;
	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;
862	1015	// JCheckBox speakerMocapCB;
863		- JCheckBox speakerCameraCB;
864		- JCheckBox speakerFocusCB;
865		- JCheckBox debugCB;
866		- JCheckBox oeilCB;
867		- JCheckBox lookAtCB;
	1016	+ cCheckBox speakerCameraCB;
	1017	+ cCheckBox speakerFocusCB;
	1018	+ cCheckBox debugCB;
	1019	+
	1020	+ cCheckBox oeilCB;
	1021	+ cCheckBox shadowCB;
	1022	+ cCheckBox autosaveCB;
	1023	+ cCheckBox lookAtCB;
868	1024
869	1025	// static int COLOR = 1;
870	1026	// static int MATERIAL = 2;
..	..	@@ -872,9 +1028,9 @@
872	1028
873	1029	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
874	1030
875		- JCheckBox colorCB;
876		- JCheckBox materialCB;
877		- JCheckBox textureCB;
	1031	+ cCheckBox colorCB;
	1032	+ cCheckBox materialCB;
	1033	+ cCheckBox textureCB;
878	1034
879	1035	public void itemStateChanged(ItemEvent e)
880	1036	{
..	..	@@ -967,6 +1123,18 @@
967	1123	{
968	1124	cameraView.ToggleOeil();
969	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	+ }
970	1138	else if(e.getSource() == lookAtCB)
971	1139	{
972	1140	cameraView.ToggleLookAt();
..	..	@@ -983,7 +1151,8 @@
983	1151
984	1152	/**/
985	1153	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
986		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1154	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1155	+ TreePath path = objEditor.jTree.getSelectionPath();
987	1156	if ((path == null) \|\| (path.getPathCount() <= 1)) {
988	1157	// We can't move the root node or an empty selection
989	1158	return;
..	..	@@ -1046,8 +1215,6 @@
1046	1215	}
1047	1216	}
1048	1217
1049		- String string = (String) object;
1050		-
1051	1218	System.out.println("Transfer = " + object + "; drop : " + target);
1052	1219	// if( object instanceof java.io.File[])
1053	1220	// {
..	..	@@ -1055,6 +1222,8 @@
1055	1222	// objEditor.DropFile((java.io.File[]) object, true);
1056	1223	// return;
1057	1224	// }
	1225	+
	1226	+ String string = (String) object;
1058	1227
1059	1228	// File path for Mac and Windows
1060	1229	if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
..	..	@@ -1100,23 +1269,33 @@
1100	1269
1101	1270	assert target == objEditor.jTree;
1102	1271	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1272	+ Object3D destinationLeaf;
1103	1273	try {
1104		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1274	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
1105	1275	} catch (Exception e) {
1106	1276	System.out.println("destinationPath : " + destinationPath);
1107	1277	return;
1108	1278	}
1109	1279
1110		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1280	+ for (int i=group.selection.size(); --i>=0;)
1111	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	+// {
1112	1291	loadClipboard(true);
1113	1292	objEditor.jTree.setSelectionPath(destinationPath);
1114	1293	pasteInto(false, false);
1115		- } else {
1116		- loadClipboard(false);
1117		- objEditor.jTree.setSelectionPath(destinationPath);
1118		- pasteInto(false, false); // true); // ???
1119		- }
	1294	+// } else {
	1295	+// loadClipboard(false);
	1296	+// objEditor.jTree.setSelectionPath(destinationPath);
	1297	+// pasteInto(false, false); // true); // ???
	1298	+// }
1120	1299	}
1121	1300	public void dropActionChanged(DropTargetDragEvent dtde)
1122	1301	// Called if the user has modified the current drop gesture
..	..	@@ -1221,22 +1400,30 @@
1221	1400	{
1222	1401	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1223	1402	//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);
	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	+ {
1236	1421	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1237	1422	kleinItem.addActionListener(this);
1238		- particleItem = menu.add(new MenuItem("Particle system"));
1239		- particleItem.addActionListener(this);
	1423	+ }
	1424	+
	1425	+// particleItem = menu.add(new MenuItem("Particle system"));
	1426	+// particleItem.addActionListener(this);
1240	1427	if (Globals.ADVANCED)
1241	1428	{
1242	1429	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1262,15 +1449,15 @@
1262	1449	}
1263	1450	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1264	1451	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);
	1452	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1453	+// overlayItem.addActionListener(this);
	1454	+// lightItem = menu.add(new MenuItem("Light"));
	1455	+// lightItem.addActionListener(this);
1269	1456	menu.add("-");
1270	1457	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1271	1458	//superLoopItem.addActionListener(this);
1272		- loopItem = menu.add(new MenuItem("Loop"));
1273		- loopItem.addActionListener(this);
	1459	+// loopItem = menu.add(new MenuItem("Loop"));
	1460	+// loopItem.addActionListener(this);
1274	1461	doubleItem = menu.add(new MenuItem("Fork"));
1275	1462	doubleItem.addActionListener(this);
1276	1463	if (Globals.ADVANCED)
..	..	@@ -1285,6 +1472,9 @@
1285	1472	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1286	1473	animationItem.addItemListener(this);
1287	1474	animationItem.setState(Globals.ANIMATION);
	1475	+
	1476	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1477	+ archiveItem.addActionListener(this);
1288	1478
1289	1479	menu.add("-");
1290	1480	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
..	..	@@ -1455,6 +1645,20 @@
1455	1645
1456	1646	makeSomething(shadow);
1457	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	+ }
1458	1662
1459	1663	/**
1460	1664	* applyExample
..	..	@@ -1699,7 +1903,7 @@
1699	1903	{
1700	1904	ScreenFit();
1701	1905	} else
1702		- if (source == switchItem)
	1906	+ if (source == switchViewItem)
1703	1907	{
1704	1908	cVector v1 = new cVector();
1705	1909	cVector v2 = new cVector();
..	..	@@ -1708,11 +1912,11 @@
1708	1912	objEditor.cameraView.renderCamera.setAim(v2, v1);
1709	1913	objEditor.cameraView.repaint();
1710	1914	} else
1711		- if (source == rectoidItem)
	1915	+ if (source == rectoidItem \|\| source == boxButton)
1712	1916	{
1713	1917	makeSomething(new Box());
1714	1918	} else
1715		- if (source == particleItem)
	1919	+ if (source == particleItem \|\| source == particlesButton)
1716	1920	{
1717	1921	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1718	1922	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1791,27 +1995,27 @@
1791	1995
1792	1996	makeSomething(obj);
1793	1997	} else
1794		- if (source == gridItem)
	1998	+ if (source == gridItem \|\| source == gridButton)
1795	1999	{
1796	2000	makeSomething(new Grid());
1797	2001	} else
1798		- if (source == ellipsoidItem)
	2002	+ if (source == ellipsoidItem \|\| source == sphereButton)
1799	2003	{
1800	2004	makeSomething(new Sphere());
1801	2005	} else
1802		- if (source == coneItem)
	2006	+ if (source == coneItem \|\| source == coneButton)
1803	2007	{
1804	2008	makeSomething(new Cone());
1805	2009	} else
1806		- if (source == torusItem)
	2010	+ if (source == torusItem \|\| source == torusButton)
1807	2011	{
1808	2012	makeSomething(new Torus());
1809	2013	} else
1810		- if (source == superItem)
	2014	+ if (source == superItem \|\| source == superButton)
1811	2015	{
1812	2016	makeSomething(new Superellipsoid());
1813	2017	} else
1814		- if (source == kleinItem)
	2018	+ if (source == kleinItem \|\| source == kleinButton)
1815	2019	{
1816	2020	makeSomething(new Klein());
1817	2021	} else
..	..	@@ -1831,7 +2035,7 @@
1831	2035	{
1832	2036	makeSomething(new BezierSurface());
1833	2037	} else
1834		- if (source == overlayItem)
	2038	+ if (source == overlayItem \|\| source == overlayButton)
1835	2039	{
1836	2040	/*
1837	2041	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1879,7 +2083,7 @@
1879	2083	s.setup();
1880	2084	makeSomething(s);
1881	2085	} else
1882		- if (source == lightItem)
	2086	+ if (source == lightItem \|\| source == lightButton)
1883	2087	{
1884	2088	makeSomething(new Light());
1885	2089	} else
..	..	@@ -1929,30 +2133,30 @@
1929	2133
1930	2134	group(g);
1931	2135	} else
1932		- if (source == loopItem)
	2136	+ if (source == loopItem \|\| source == loopButton)
1933	2137	{
1934	2138	Composite csg = new GroupLeaf();
1935	2139	csg.count = 5;
1936	2140	group(csg);
1937		- Composite child = new cGroup();
	2141	+ Composite child = new cGroup("Branch");
1938	2142	csg.addChild(child);
1939	2143	child.addChild(csg);
1940	2144	} else
1941	2145	if (source == doubleItem)
1942	2146	{
1943		- Composite csg = new GroupLeaf();
	2147	+ Composite csg = new GroupLeaf("Fork");
1944	2148	csg.count = 5;
1945	2149	group(csg);
1946		- Composite child = new cGroup();
	2150	+ Composite child = new cGroup("Branch A");
1947	2151	csg.addChild(child);
1948	2152	child.addChild(csg);
1949		- child = new cGroup();
	2153	+ child = new cGroup("Branch B");
1950	2154	csg.addChild(child);
1951	2155	child.addChild(csg);
1952	2156	} else
1953	2157	if (source == tripleItem)
1954	2158	{
1955		- Composite csg = new GroupLeaf();
	2159	+ Composite csg = new GroupLeaf("Trident");
1956	2160	csg.count = 4;
1957	2161	group(csg);
1958	2162	Composite child = new cGroup();
..	..	@@ -2016,7 +2220,8 @@
2016	2220	} else
2017	2221	if (source == undoButton)
2018	2222	{
2019		- Undo();
	2223	+ if (!Undo())
	2224	+ java.awt.Toolkit.getDefaultToolkit().beep();
2020	2225	} else
2021	2226	if (source == redoButton)
2022	2227	{
..	..	@@ -2024,7 +2229,8 @@
2024	2229	} else
2025	2230	if (source == saveButton)
2026	2231	{
2027		- Save();
	2232	+ if (!Save(true))
	2233	+ java.awt.Toolkit.getDefaultToolkit().beep();
2028	2234	} else
2029	2235	if (source == oneStepButton)
2030	2236	{
..	..	@@ -2033,17 +2239,14 @@
2033	2239	} else
2034	2240	if (source == screenfitButton)
2035	2241	{
2036		- //Reload(lastConverter, lastFilename, true);
2037	2242	ScreenFit();
2038	2243	} else
2039	2244	if (source == screenfitpointButton)
2040	2245	{
2041		- //Reload(lastConverter, lastFilename, true);
2042	2246	ScreenFitPoint();
2043	2247	} else
2044	2248	if (source == snapobjectButton)
2045	2249	{
2046		- //Reload(lastConverter, lastFilename, true);
2047	2250	SnapObject();
2048	2251	} else
2049	2252	// if (event.getSource() == recompileButton)
..	..	@@ -2419,9 +2622,9 @@
2419	2622	{
2420	2623	ClearSelection(true);
2421	2624	} else
2422		- if (source == grabItem)
	2625	+ if (source == grabItem \|\| source == groupButton)
2423	2626	{
2424		- group(new cGroup(), true);
	2627	+ group(new cGroup(), false); // true);
2425	2628	} else
2426	2629	if (source == hideItem)
2427	2630	{
..	..	@@ -2439,11 +2642,11 @@
2439	2642	{
2440	2643	makeSomething(new Camera());
2441	2644	} else
2442		- if (source == compositeItem)
	2645	+ if (source == compositeItem \|\| source == compositeButton)
2443	2646	{
2444	2647	group(new Composite());
2445	2648	} else
2446		- if (source == randomItem)
	2649	+ if (source == switchItem \|\| source == switchButton)
2447	2650	{
2448	2651	RandomNode random = new RandomNode();
2449	2652	group(random);
..	..	@@ -2545,7 +2748,7 @@
2545	2748	{
2546	2749	group(new cLinker());
2547	2750	} else
2548		- if (source == textureItem)
	2751	+ if (source == textureItem \|\| source == textureButton)
2549	2752	{
2550	2753	group(new TextureNode());
2551	2754	} else
..	..	@@ -2565,17 +2768,30 @@
2565	2768	{
2566	2769	CastShadow(2);
2567	2770	} else
2568		- if (source == ungroupItem)
	2771	+ if (source == ungroupItem \|\| source == ungroupButton)
2569	2772	{
2570		- //ungroup();
	2773	+ boolean hasRoot = false;
	2774	+
2571	2775	for (int i=0; i<group.selection.size(); i++)
2572	2776	{
2573		- Ungroup(group.selection.get(i));
	2777	+ if (group.selection.get(i) == group)
	2778	+ {
	2779	+ hasRoot = true;
	2780	+ break;
	2781	+ }
2574	2782	}
2575	2783
2576		- ClearSelection(false);
2577		-
2578		- 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	+ }
2579	2795	} else
2580	2796	if (source == genUVItem)
2581	2797	{
..	..	@@ -2903,6 +3119,10 @@
2903	3119	if (source == twoButton)
2904	3120	{
2905	3121	radio.layout = twoButton;
	3122	+
	3123	+ if (CameraPane.FULLSCREEN)
	3124	+ fullscreenLayout = radio.layout;
	3125	+
2906	3126	// bug
2907	3127	//gridPanel.setDividerLocation(1.0);
2908	3128	//bigPanel.setDividerLocation(0.0);
..	..	@@ -2958,6 +3178,9 @@
2958	3178	{
2959	3179	radio.layout = threeButton;
2960	3180
	3181	+ if (CameraPane.FULLSCREEN)
	3182	+ fullscreenLayout = radio.layout;
	3183	+
2961	3184	// bigThree.remove(scenePanel);
2962	3185	// bigThree.remove(centralPanel);
2963	3186	// bigThree.remove(XYZPanel);
..	..	@@ -2996,6 +3219,9 @@
2996	3219	{
2997	3220	radio.layout = fourButton;
2998	3221
	3222	+ if (CameraPane.FULLSCREEN)
	3223	+ fullscreenLayout = radio.layout;
	3224	+
2999	3225	// bigThree.remove(scenePanel);
3000	3226	// bigThree.remove(centralPanel);
3001	3227	// bigThree.remove(XYZPanel);
..	..	@@ -3032,6 +3258,9 @@
3032	3258	if (source == sixButton)
3033	3259	{
3034	3260	radio.layout = sixButton;
	3261	+
	3262	+ if (CameraPane.FULLSCREEN)
	3263	+ fullscreenLayout = radio.layout;
3035	3264
3036	3265	// bigThree.remove(scenePanel);
3037	3266	// bigThree.remove(centralPanel);
..	..	@@ -3070,6 +3299,9 @@
3070	3299	if (source == sevenButton)
3071	3300	{
3072	3301	radio.layout = sevenButton;
	3302	+
	3303	+ if (CameraPane.FULLSCREEN)
	3304	+ fullscreenLayout = radio.layout;
3073	3305
3074	3306	// bigThree.remove(scenePanel);
3075	3307	// bigThree.remove(centralPanel);
..	..	@@ -3126,12 +3358,19 @@
3126	3358	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3127	3359	{
3128	3360	ab = (cRadio)e.nextElement();
3129		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3361	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
3130	3362	{
	3363	+ // Patch to avoid bug with transparency.
	3364	+ if (!ab.hadMaterial)
	3365	+ {
	3366	+ ab.object.material = null;
	3367	+ }
	3368	+
3131	3369	buttonGroup.remove(ab);
3132	3370	radioPanel.remove(ab);
3133	3371
3134		- ab.GetObject().editWindow = null;
	3372	+ //ab.GetObject().editWindow = null;
	3373	+ ab.GetObject().manipWindow = null;
3135	3374	// ab.GetObject().objectUI = null; // ?????????
3136	3375
3137	3376	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
..	..	@@ -3144,6 +3383,12 @@
3144	3383	} else
3145	3384	if (source == editItem \|\| source == editButton)
3146	3385	{
	3386	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3387	+ {
	3388	+ Object3D child = (Object3D)e.nextElement();
	3389	+ child.pinned = true;
	3390	+ }
	3391	+
3147	3392	EditSelection(false);
3148	3393	} else
3149	3394	if (source == uneditButton)
..	..	@@ -3153,6 +3398,7 @@
3153	3398	Object3D child = (Object3D)e.nextElement();
3154	3399	if(child.editWindow != null)
3155	3400	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3401	+ child.pinned = false;
3156	3402	child.CloseUI();
3157	3403	listUI.remove(child);
3158	3404
..	..	@@ -3169,6 +3415,7 @@
3169	3415	//copy.ClearUI();
3170	3416	for (Object3D obj : listUI)
3171	3417	{
	3418	+ obj.pinned = false;
3172	3419	obj.CloseUI();
3173	3420	}
3174	3421	listUI.clear();
..	..	@@ -3178,7 +3425,7 @@
3178	3425	{
3179	3426	assert(copy == group);
3180	3427
3181		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3428	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3182	3429
3183	3430	for (Object3D obj : listUI)
3184	3431	{
..	..	@@ -3245,6 +3492,7 @@
3245	3492
3246	3493	// fix "+" issue
3247	3494	//group.editWindow = this;
	3495	+ group.manipWindow = this;
3248	3496
3249	3497	/*
3250	3498	currentLayout = radio.layout;
..	..	@@ -3252,6 +3500,11 @@
3252	3500	currentLayout = sevenButton;
3253	3501	*/
3254	3502	radio.layout.doClick();
	3503	+
	3504	+ ClearUnpinned();
	3505	+ SetPinStates(group.selection.size() > 0);
	3506	+ if (group.selection.size() == 1)
	3507	+ EditSelection(false);
3255	3508	keepparent = group.parent;
3256	3509	// PARENT = NULL or not???
3257	3510	//group.parent = null; // ROOT
..	..	@@ -3265,7 +3518,7 @@
3265	3518	cameraView.ProtectCamera();
3266	3519	cameraView.repaint();
3267	3520	return;
3268		- } else if (event.getSource() == revertCameraItem)
	3521	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3269	3522	{
3270	3523	cameraView.RevertCamera();
3271	3524	cameraView.repaint();
..	..	@@ -4319,10 +4572,6 @@
4319	4572	// }
4320	4573	// }
4321	4574
4322		- static boolean allparams = true;
4323		-
4324		- static Vector<Object3D> listUI = new Vector<Object3D>();
4325		-
4326	4575	void EditSelection(boolean newWindow)
4327	4576	{
4328	4577	// aConstraints.gridy = 0;
..	..	@@ -4330,7 +4579,7 @@
4330	4579	{
4331	4580	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4332	4581	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4333		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4582	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4334	4583
4335	4584	Object3D elem = (Object3D)group.selection.elementAt(i);
4336	4585	if(elem != group \|\| !newWindow)
..	..	@@ -4415,7 +4664,8 @@
4415	4664	//new Exception().printStackTrace();
4416	4665
4417	4666	freezemodel = true;
4418		-
	4667	+ ClearUnpinned();
	4668	+
4419	4669	/**/
4420	4670	//switch (event.id)
4421	4671	{
..	..	@@ -4448,7 +4698,7 @@
4448	4698	if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4449	4699	// a camera
4450	4700	{
4451		- if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	4701	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
4452	4702	{
4453	4703	CameraPane.camerachangeframe = 0; // don't refuse it
4454	4704	Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
..	..	@@ -4457,6 +4707,13 @@
4457	4707	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4458	4708	}
4459	4709
	4710	+ if (tps != null && tps.length == 1)
	4711	+ {
	4712	+ EditSelection(false);
	4713	+ }
	4714	+
	4715	+ SetPinStates(tps != null && tps.length > 0);
	4716	+
4460	4717	refreshContents();
4461	4718	//return true;
4462	4719	}
..	..	@@ -4466,9 +4723,18 @@
4466	4723	freezemodel = false;
4467	4724	}
4468	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	+
4469	4734	void refreshContents(boolean cp)
4470	4735	{
4471		- if (!Globals.MOUSEDRAGGED)
	4736	+ if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
	4737	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
4472	4738	{
4473	4739	objEditor.ClearInfo(); // .GetMaterial());
4474	4740
..	..	@@ -4567,6 +4833,7 @@
4567	4833
4568	4834	if (cut)
4569	4835	{
	4836	+ if (Globals.SAVEONMAKE)
4570	4837	Save();
4571	4838	//int indices[] = jList.getSelectedIndices();
4572	4839	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -5285,13 +5552,28 @@
5285	5552	cButton clearpanelButton;
5286	5553	cButton unselectButton;
5287	5554
5288		- cButton minButton;
5289		- cButton maxButton;
5290		- cButton fullButton;
5291		- cButton undoButton;
5292		- cButton redoButton;
	5555	+ cButton restoreCameraButton;
	5556	+
5293	5557	cButton saveButton;
5294	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;
5295	5577
5296	5578	cButton screenfitButton;
5297	5579	cButton screenfitpointButton;
..	..	@@ -5313,11 +5595,11 @@
5313	5595	//JTree jTree;
5314	5596	private MenuItem lookAtItem;
5315	5597	private MenuItem lookFromItem;
5316		- private MenuItem switchItem;
	5598	+ private MenuItem switchViewItem;
5317	5599	private MenuItem cutItem;
5318	5600	private MenuItem undoItem;
5319	5601	private MenuItem redoItem;
5320		- private MenuItem duplicateItem;
	5602	+ private JMenuItem duplicateItem;
5321	5603	private MenuItem cloneItem;
5322	5604	private MenuItem cloneSupportItem;
5323	5605	private MenuItem overwriteGeoItem;
..	..	@@ -5405,7 +5687,7 @@
5405	5687	private MenuItem frontItem;
5406	5688	private MenuItem cameraItem;
5407	5689	private MenuItem compositeItem;
5408		- private MenuItem randomItem;
	5690	+ private MenuItem switchItem;
5409	5691	private MenuItem physicsItem;
5410	5692	private MenuItem frameselectorItem;
5411	5693	private MenuItem scriptNodeItem;
..	..	@@ -5479,5 +5761,5 @@
5479	5761
5480	5762	Menu cameraMenu;
5481	5763	MenuItem editCameraItem;
5482		- MenuItem revertCameraItem;
	5764	+ MenuItem restoreCameraItem;
5483	5765	}