~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,63 @@
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);
	593	+ oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
584	594	maxButton.setToolTipText("Maximize window");
585	595	maxButton.addActionListener(this);
586	596
587		- oe.toolbarPanel.add(fullButton = new cButton("\u2b1c", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	597	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
588	598	fullButton.setToolTipText("Full-screen window");
589	599	fullButton.addActionListener(this);
590	600
591		- oe.toolbarPanel.add(undoButton = new cButton("\u21a9", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	601	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	602	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	603	+ restoreCameraButton.addActionListener(this);
	604	+
	605	+ copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
592	606	undoButton.setToolTipText("Undo changes");
593	607	undoButton.addActionListener(this);
	608	+ undoButton.setEnabled(false);
594	609
595		- oe.toolbarPanel.add(redoButton = new cButton("\u21aa", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	610	+ copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
596	611	redoButton.setToolTipText("Redo changes");
597	612	redoButton.addActionListener(this);
	613	+ redoButton.setEnabled(false);
598	614
599		- oe.toolbarPanel.add(saveButton = new cButton("\u21e3", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	615	+ copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
600	616	saveButton.setToolTipText("Save changes");
601	617	saveButton.addActionListener(this);
602	618
603		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
	619	+ copyOptionsPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
604	620	liveCB.setToolTipText("Enable animation");
605	621	liveCB.addItemListener(this);
606	622
607		- oe.toolbarPanel.add(oneStepButton = new cButton("\u29f4", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	623	+ copyOptionsPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
608	624	oneStepButton.setToolTipText("Animate one step forward");
609	625	oneStepButton.addActionListener(this);
610	626
611		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	627	+ copyOptionsPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
612	628	fastCB.setToolTipText("Fast mode");
613	629	fastCB.addItemListener(this);
614	630
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);
	631	+ //oe.toolboxPanel.Return();
	632	+
	633	+ copyOptionsPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
620	634	screenfitButton.setToolTipText("Screen fit");
621	635	screenfitButton.addActionListener(this);
	636	+
	637	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	638	+// trackCB.setToolTipText("Enable tracking");
	639	+// trackCB.addItemListener(this);
622	640
623	641	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
624	642	// screenfitpointButton.addActionListener(this);
..	..	@@ -630,15 +648,13 @@
630	648	snapobjectButton.setToolTipText("Snap Object");
631	649	}
632	650
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));
	651	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
638	652
639	653	oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
640	654	twoButton.setToolTipText("Show center view only");
641	655	twoButton.addActionListener(this);
	656	+ this.fullscreenLayout = twoButton;
	657	+
642	658	oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
643	659	fourButton.addActionListener(this);
644	660	fourButton.setToolTipText("Show left panel only");
..	..	@@ -653,26 +669,105 @@
653	669	sevenButton.addActionListener(this);
654	670	//
655	671
656		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	672	+ oe.toolbarPanel.add(rootButton = GetButton("icons/write.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
657	673	rootButton.setToolTipText("Edit selection in new tab");
658	674	rootButton.addActionListener(this);
659	675
660		- oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	676	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
661	677	closeButton.setToolTipText("Close tab");
662	678	closeButton.addActionListener(this);
663	679	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
664	680	//clearButton.addActionListener(this);
665		-
666		- editCommandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
667		- editButton.setToolTipText("Edit selection");
	681	+
	682	+ // INSERT
	683	+ oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	684	+ gridButton.setToolTipText("Create grid");
	685	+ gridButton.addActionListener(this);
	686	+
	687	+ oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	688	+ boxButton.setToolTipText("Create box");
	689	+ boxButton.addActionListener(this);
	690	+
	691	+ oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	692	+ sphereButton.setToolTipText("Create sphere");
	693	+ sphereButton.addActionListener(this);
	694	+
	695	+ oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	696	+ coneButton.setToolTipText("Create cone");
	697	+ coneButton.addActionListener(this);
	698	+
	699	+ oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	700	+ torusButton.setToolTipText("Create torus");
	701	+ torusButton.addActionListener(this);
	702	+
	703	+ oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	704	+ superButton.setToolTipText("Create superellipsoid");
	705	+ superButton.addActionListener(this);
	706	+
	707	+ if (Globals.ADVANCED)
	708	+ {
	709	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	710	+ kleinButton.setToolTipText("Create Klein bottle");
	711	+ kleinButton.addActionListener(this);
	712	+ }
	713	+
	714	+ oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	715	+ particlesButton.setToolTipText("Create particle system");
	716	+ particlesButton.addActionListener(this);
	717	+
	718	+ oe.toolboxPanel.Return();
	719	+
	720	+ oe.toolboxPanel.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	721	+ groupButton.setToolTipText("Create group");
	722	+ groupButton.addActionListener(this);
	723	+
	724	+ oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	725	+ compositeButton.setToolTipText("Create composite");
	726	+ compositeButton.addActionListener(this);
	727	+
	728	+ oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	729	+ switchButton.setToolTipText("Create item switcher");
	730	+ switchButton.addActionListener(this);
	731	+
	732	+ oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	733	+ loopButton.setToolTipText("Create loop");
	734	+ loopButton.addActionListener(this);
	735	+
	736	+ oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	737	+ textureButton.setToolTipText("Create texture");
	738	+ textureButton.addActionListener(this);
	739	+
	740	+ oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	741	+ overlayButton.setToolTipText("Create overlay");
	742	+ overlayButton.addActionListener(this);
	743	+
	744	+ oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	745	+ lightButton.setToolTipText("Create light");
	746	+ lightButton.addActionListener(this);
	747	+
	748	+ for (int i=6; --i>=0;)
	749	+ {
	750	+ oe.toolboxPanel.Return();
	751	+ oe.toolboxPanel.add(new cGridBag());
	752	+ oe.toolboxPanel.add(new cGridBag());
	753	+ oe.toolboxPanel.add(new cGridBag());
	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	+ }
	759	+
	760	+ // EDIT panel
	761	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	762	+ editButton.setToolTipText("Pin selection controls");
668	763	editButton.addActionListener(this);
669	764
670		- editCommandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
671		- uneditButton.setToolTipText("Unedit selection");
	765	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	766	+ uneditButton.setToolTipText("Remove selection controls");
672	767	uneditButton.addActionListener(this);
673	768
674	769	editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
675		- allParamsButton.setToolTipText("Edit all params");
	770	+ allParamsButton.setToolTipText("Show all controle");
676	771	allParamsButton.addActionListener(this);
677	772
678	773	editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..	..	@@ -683,8 +778,13 @@
683	778	unselectButton.setToolTipText("Unselect");
684	779	unselectButton.addActionListener(this);
685	780
	781	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	782	+ flashSelectionButton.setToolTipText("Highlight selection");
	783	+ flashSelectionButton.addActionListener(this);
	784	+
686	785	editCommandsPanel.preferredHeight = 1;
687	786
	787	+ SetPinStates(false);
688	788	// oe.treePanel.add(commandsPanel);
689	789	// oe.treePanel.Return();
690	790
..	..	@@ -703,27 +803,12 @@
703	803
704	804	JScrollPane jSP;
705	805	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
706		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	806	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
707	807	ResetModel();
708	808
709	809	oe.treePanel.add(jSPPanel);
710	810	oe.treePanel.Return();
711	811
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	812	oe.treePanel.add(copyOptionsPanel);
728	813	oe.treePanel.Return();
729	814
..	..	@@ -754,23 +839,43 @@
754	839
755	840	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
756	841	{
	842	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	843	+ colorCB.setToolTipText("Copy color when dropped");
	844	+ colorCB.addItemListener(this);
	845	+
	846	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	847	+ materialCB.setToolTipText("Copy material when dropped");
	848	+ materialCB.addItemListener(this);
	849	+
	850	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	851	+ textureCB.setToolTipText("Copy texture when dropped");
	852	+ textureCB.addItemListener(this);
	853	+
	854	+ panel.Return();
	855	+
757	856	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
758	857	boxCB.setToolTipText("Display bounding boxes");
759	858	boxCB.addItemListener(this);
760	859
761	860	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
762		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	861	+ zoomBoxCB.setToolTipText("Display only for wheel");
763	862	zoomBoxCB.addItemListener(this);
764	863
765	864	if (true) // Globals.ADVANCED)
766	865	{
767		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
768		- supportCB.setToolTipText("Enable rigging");
769		- supportCB.addItemListener(this);
	866	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	867	+// supportCB.setToolTipText("Enable rigging");
	868	+// supportCB.addItemListener(this);
	869	+
	870	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	871	+ freezeCB.setToolTipText("Fast moving camera");
	872	+ freezeCB.addItemListener(this);
770	873
771	874	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
772	875	// localCB.addItemListener(this);
773	876
	877	+ panel.Return();
	878	+
774	879	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
775	880	crowdCB.setToolTipText("Used for crowds");
776	881	crowdCB.addItemListener(this);
..	..	@@ -787,6 +892,8 @@
787	892	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
788	893	// speakerMocapCB.addItemListener(this);
789	894
	895	+ panel.Return();
	896	+
790	897	if (false)
791	898	{
792	899	// handled in scripts
..	..	@@ -801,20 +908,39 @@
801	908	//constraints.gridy += 1;
802	909	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
803	910	smoothfocusCB.addItemListener(this);
	911	+ panel.Return();
804	912	}
805	913
806	914	//constraints.gridx += 1;
807	915	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
808	916	// debugCB.addItemListener(this);
809	917
	918	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	919	+ trackCB.setToolTipText("Enable tracking target");
	920	+ trackCB.addItemListener(this);
	921	+
810	922	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
811		- oeilCB.setToolTipText("Move camera when tracking target");
	923	+ oeilCB.setToolTipText("Move camera when tracking");
812	924	oeilCB.addItemListener(this);
813	925
814	926	panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
815		- shadowCB.setToolTipText("Compute shadows when live");
	927	+ shadowCB.setToolTipText("When live compute shadows");
816	928	shadowCB.addItemListener(this);
817	929
	930	+ panel.Return();
	931	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	932	+ toggleTextureCB.setToolTipText("Load textures");
	933	+ toggleTextureCB.addItemListener(this);
	934	+
	935	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	936	+ toggleSwitchCB.setToolTipText("Choose a single item");
	937	+ toggleSwitchCB.addItemListener(this);
	938	+
	939	+ panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
	940	+ autosaveCB.setToolTipText("On structure change");
	941	+ autosaveCB.addItemListener(this);
	942	+
	943	+ panel.Return();
818	944	if (Globals.ADVANCED)
819	945	{
820	946	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
..	..	@@ -825,10 +951,15 @@
825	951	}
826	952
827	953	cGridBag fill = new cGridBag();
828		-
829	954	fill.preferredHeight = 200;
	955	+ cGridBag fill2 = new cGridBag();
	956	+ fill2.preferredHeight = 200;
	957	+ cGridBag fill3 = new cGridBag();
	958	+ fill3.preferredHeight = 200;
830	959
831	960	panel.add(fill);
	961	+ panel.add(fill2);
	962	+ panel.add(fill3);
832	963
833	964	}
834	965
..	..	@@ -864,25 +995,28 @@
864	995	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
865	996	}
866	997
867		- JCheckBox liveCB;
868		- JCheckBox supportCB;
869		- JCheckBox localCB;
870		- JCheckBox crowdCB;
871		- JCheckBox smoothCB;
872		- JCheckBox fastCB;
873		- JCheckBox slowCB;
874		- JCheckBox boxCB;
875		- JCheckBox zoomBoxCB;
876		- JCheckBox trackCB;
877		- JCheckBox smoothfocusCB;
	998	+ cToggleButton liveCB;
	999	+ cCheckBox supportCB;
	1000	+ cCheckBox localCB;
	1001	+ cCheckBox crowdCB;
	1002	+ cCheckBox smoothCB;
	1003	+ cToggleButton fastCB;
	1004	+ cCheckBox slowCB;
	1005	+ cCheckBox boxCB;
	1006	+ cCheckBox zoomBoxCB;
	1007	+ cCheckBox freezeCB;
	1008	+ //cToggleButton trackCB;
	1009	+ cCheckBox trackCB;
	1010	+ cCheckBox smoothfocusCB;
878	1011	// JCheckBox speakerMocapCB;
879		- JCheckBox speakerCameraCB;
880		- JCheckBox speakerFocusCB;
881		- JCheckBox debugCB;
	1012	+ cCheckBox speakerCameraCB;
	1013	+ cCheckBox speakerFocusCB;
	1014	+ cCheckBox debugCB;
882	1015
883		- JCheckBox oeilCB;
884		- JCheckBox shadowCB;
885		- JCheckBox lookAtCB;
	1016	+ cCheckBox oeilCB;
	1017	+ cCheckBox shadowCB;
	1018	+ cCheckBox autosaveCB;
	1019	+ cCheckBox lookAtCB;
886	1020
887	1021	// static int COLOR = 1;
888	1022	// static int MATERIAL = 2;
..	..	@@ -890,9 +1024,9 @@
890	1024
891	1025	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
892	1026
893		- JCheckBox colorCB;
894		- JCheckBox materialCB;
895		- JCheckBox textureCB;
	1027	+ cCheckBox colorCB;
	1028	+ cCheckBox materialCB;
	1029	+ cCheckBox textureCB;
896	1030
897	1031	public void itemStateChanged(ItemEvent e)
898	1032	{
..	..	@@ -989,6 +1123,14 @@
989	1123	{
990	1124	Globals.COMPUTESHADOWWHENLIVE ^= true;
991	1125	}
	1126	+ else if(e.getSource() == freezeCB)
	1127	+ {
	1128	+ Globals.FREEZEONMOVE ^= true;
	1129	+ }
	1130	+ else if(e.getSource() == autosaveCB)
	1131	+ {
	1132	+ Globals.SAVEONMAKE ^= true;
	1133	+ }
992	1134	else if(e.getSource() == lookAtCB)
993	1135	{
994	1136	cameraView.ToggleLookAt();
..	..	@@ -1005,7 +1147,8 @@
1005	1147
1006	1148	/**/
1007	1149	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
1008		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1150	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1151	+ TreePath path = objEditor.jTree.getSelectionPath();
1009	1152	if ((path == null) \|\| (path.getPathCount() <= 1)) {
1010	1153	// We can't move the root node or an empty selection
1011	1154	return;
..	..	@@ -1122,23 +1265,33 @@
1122	1265
1123	1266	assert target == objEditor.jTree;
1124	1267	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1268	+ Object3D destinationLeaf;
1125	1269	try {
1126		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1270	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
1127	1271	} catch (Exception e) {
1128	1272	System.out.println("destinationPath : " + destinationPath);
1129	1273	return;
1130	1274	}
1131	1275
1132		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1276	+ for (int i=group.selection.size(); --i>=0;)
1133	1277	{
	1278	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1279	+
	1280	+ // Cannot move into itself
	1281	+ if (child == destinationLeaf)
	1282	+ return;
	1283	+ }
	1284	+
	1285	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1286	+// {
1134	1287	loadClipboard(true);
1135	1288	objEditor.jTree.setSelectionPath(destinationPath);
1136	1289	pasteInto(false, false);
1137		- } else {
1138		- loadClipboard(false);
1139		- objEditor.jTree.setSelectionPath(destinationPath);
1140		- pasteInto(false, false); // true); // ???
1141		- }
	1290	+// } else {
	1291	+// loadClipboard(false);
	1292	+// objEditor.jTree.setSelectionPath(destinationPath);
	1293	+// pasteInto(false, false); // true); // ???
	1294	+// }
1142	1295	}
1143	1296	public void dropActionChanged(DropTargetDragEvent dtde)
1144	1297	// Called if the user has modified the current drop gesture
..	..	@@ -1243,22 +1396,30 @@
1243	1396	{
1244	1397	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1245	1398	//heightFieldItem.addActionListener(this);
1246		- gridItem = menu.add(new MenuItem("Grid"));
1247		- gridItem.addActionListener(this);
1248		- rectoidItem = menu.add(new MenuItem("Box"));
1249		- rectoidItem.addActionListener(this);
1250		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1251		- ellipsoidItem.addActionListener(this);
1252		- coneItem = menu.add(new MenuItem("Cone"));
1253		- coneItem.addActionListener(this);
1254		- torusItem = menu.add(new MenuItem("Torus"));
1255		- torusItem.addActionListener(this);
1256		- superItem = menu.add(new MenuItem("Superellipsoid"));
1257		- superItem.addActionListener(this);
	1399	+// gridItem = menu.add(new MenuItem("Grid"));
	1400	+// gridItem.addActionListener(this);
	1401	+// rectoidItem = menu.add(new MenuItem("Box"));
	1402	+// rectoidItem.addActionListener(this);
	1403	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1404	+// ellipsoidItem.addActionListener(this);
	1405	+// coneItem = menu.add(new MenuItem("Cone"));
	1406	+// coneItem.addActionListener(this);
	1407	+// torusItem = menu.add(new MenuItem("Torus"));
	1408	+// torusItem.addActionListener(this);
	1409	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1410	+// superItem.addActionListener(this);
	1411	+
	1412	+ cameraItem = menu.add(new MenuItem("Camera"));
	1413	+ cameraItem.addActionListener(this);
	1414	+
	1415	+ if (!Globals.ADVANCED)
	1416	+ {
1258	1417	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1259	1418	kleinItem.addActionListener(this);
1260		- particleItem = menu.add(new MenuItem("Particle system"));
1261		- particleItem.addActionListener(this);
	1419	+ }
	1420	+
	1421	+// particleItem = menu.add(new MenuItem("Particle system"));
	1422	+// particleItem.addActionListener(this);
1262	1423	if (Globals.ADVANCED)
1263	1424	{
1264	1425	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1284,15 +1445,15 @@
1284	1445	}
1285	1446	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1286	1447	bezierItem.addActionListener(this);
1287		- overlayItem = menu.add(new MenuItem("Overlay"));
1288		- overlayItem.addActionListener(this);
1289		- lightItem = menu.add(new MenuItem("Light"));
1290		- lightItem.addActionListener(this);
	1448	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1449	+// overlayItem.addActionListener(this);
	1450	+// lightItem = menu.add(new MenuItem("Light"));
	1451	+// lightItem.addActionListener(this);
1291	1452	menu.add("-");
1292	1453	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1293	1454	//superLoopItem.addActionListener(this);
1294		- loopItem = menu.add(new MenuItem("Loop"));
1295		- loopItem.addActionListener(this);
	1455	+// loopItem = menu.add(new MenuItem("Loop"));
	1456	+// loopItem.addActionListener(this);
1296	1457	doubleItem = menu.add(new MenuItem("Fork"));
1297	1458	doubleItem.addActionListener(this);
1298	1459	if (Globals.ADVANCED)
..	..	@@ -1477,6 +1638,20 @@
1477	1638
1478	1639	makeSomething(shadow);
1479	1640	}
	1641	+
	1642	+ private void ClearUnpinned()
	1643	+ {
	1644	+ //for (Object3D obj : listUI)
	1645	+ for (int i=listUI.size(); --i>=0;)
	1646	+ {
	1647	+ Object3D obj = listUI.elementAt(i);
	1648	+ if (!obj.pinned)
	1649	+ {
	1650	+ obj.CloseUI();
	1651	+ listUI.remove(i);
	1652	+ }
	1653	+ }
	1654	+ }
1480	1655
1481	1656	/**
1482	1657	* applyExample
..	..	@@ -1721,7 +1896,7 @@
1721	1896	{
1722	1897	ScreenFit();
1723	1898	} else
1724		- if (source == switchItem)
	1899	+ if (source == switchViewItem)
1725	1900	{
1726	1901	cVector v1 = new cVector();
1727	1902	cVector v2 = new cVector();
..	..	@@ -1730,11 +1905,11 @@
1730	1905	objEditor.cameraView.renderCamera.setAim(v2, v1);
1731	1906	objEditor.cameraView.repaint();
1732	1907	} else
1733		- if (source == rectoidItem)
	1908	+ if (source == rectoidItem \|\| source == boxButton)
1734	1909	{
1735	1910	makeSomething(new Box());
1736	1911	} else
1737		- if (source == particleItem)
	1912	+ if (source == particleItem \|\| source == particlesButton)
1738	1913	{
1739	1914	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1740	1915	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1813,27 +1988,27 @@
1813	1988
1814	1989	makeSomething(obj);
1815	1990	} else
1816		- if (source == gridItem)
	1991	+ if (source == gridItem \|\| source == gridButton)
1817	1992	{
1818	1993	makeSomething(new Grid());
1819	1994	} else
1820		- if (source == ellipsoidItem)
	1995	+ if (source == ellipsoidItem \|\| source == sphereButton)
1821	1996	{
1822	1997	makeSomething(new Sphere());
1823	1998	} else
1824		- if (source == coneItem)
	1999	+ if (source == coneItem \|\| source == coneButton)
1825	2000	{
1826	2001	makeSomething(new Cone());
1827	2002	} else
1828		- if (source == torusItem)
	2003	+ if (source == torusItem \|\| source == torusButton)
1829	2004	{
1830	2005	makeSomething(new Torus());
1831	2006	} else
1832		- if (source == superItem)
	2007	+ if (source == superItem \|\| source == superButton)
1833	2008	{
1834	2009	makeSomething(new Superellipsoid());
1835	2010	} else
1836		- if (source == kleinItem)
	2011	+ if (source == kleinItem \|\| source == kleinButton)
1837	2012	{
1838	2013	makeSomething(new Klein());
1839	2014	} else
..	..	@@ -1853,7 +2028,7 @@
1853	2028	{
1854	2029	makeSomething(new BezierSurface());
1855	2030	} else
1856		- if (source == overlayItem)
	2031	+ if (source == overlayItem \|\| source == overlayButton)
1857	2032	{
1858	2033	/*
1859	2034	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1901,7 +2076,7 @@
1901	2076	s.setup();
1902	2077	makeSomething(s);
1903	2078	} else
1904		- if (source == lightItem)
	2079	+ if (source == lightItem \|\| source == lightButton)
1905	2080	{
1906	2081	makeSomething(new Light());
1907	2082	} else
..	..	@@ -1951,30 +2126,30 @@
1951	2126
1952	2127	group(g);
1953	2128	} else
1954		- if (source == loopItem)
	2129	+ if (source == loopItem \|\| source == loopButton)
1955	2130	{
1956	2131	Composite csg = new GroupLeaf();
1957	2132	csg.count = 5;
1958	2133	group(csg);
1959		- Composite child = new cGroup();
	2134	+ Composite child = new cGroup("Branch");
1960	2135	csg.addChild(child);
1961	2136	child.addChild(csg);
1962	2137	} else
1963	2138	if (source == doubleItem)
1964	2139	{
1965		- Composite csg = new GroupLeaf();
	2140	+ Composite csg = new GroupLeaf("Fork");
1966	2141	csg.count = 5;
1967	2142	group(csg);
1968		- Composite child = new cGroup();
	2143	+ Composite child = new cGroup("Branch A");
1969	2144	csg.addChild(child);
1970	2145	child.addChild(csg);
1971		- child = new cGroup();
	2146	+ child = new cGroup("Branch B");
1972	2147	csg.addChild(child);
1973	2148	child.addChild(csg);
1974	2149	} else
1975	2150	if (source == tripleItem)
1976	2151	{
1977		- Composite csg = new GroupLeaf();
	2152	+ Composite csg = new GroupLeaf("Trident");
1978	2153	csg.count = 4;
1979	2154	group(csg);
1980	2155	Composite child = new cGroup();
..	..	@@ -2441,9 +2616,9 @@
2441	2616	{
2442	2617	ClearSelection(true);
2443	2618	} else
2444		- if (source == grabItem)
	2619	+ if (source == grabItem \|\| source == groupButton)
2445	2620	{
2446		- group(new cGroup(), true);
	2621	+ group(new cGroup(), false); // true);
2447	2622	} else
2448	2623	if (source == hideItem)
2449	2624	{
..	..	@@ -2461,11 +2636,11 @@
2461	2636	{
2462	2637	makeSomething(new Camera());
2463	2638	} else
2464		- if (source == compositeItem)
	2639	+ if (source == compositeItem \|\| source == compositeButton)
2465	2640	{
2466	2641	group(new Composite());
2467	2642	} else
2468		- if (source == randomItem)
	2643	+ if (source == switchItem \|\| source == switchButton)
2469	2644	{
2470	2645	RandomNode random = new RandomNode();
2471	2646	group(random);
..	..	@@ -2567,7 +2742,7 @@
2567	2742	{
2568	2743	group(new cLinker());
2569	2744	} else
2570		- if (source == textureItem)
	2745	+ if (source == textureItem \|\| source == textureButton)
2571	2746	{
2572	2747	group(new TextureNode());
2573	2748	} else
..	..	@@ -2587,17 +2762,30 @@
2587	2762	{
2588	2763	CastShadow(2);
2589	2764	} else
2590		- if (source == ungroupItem)
	2765	+ if (source == ungroupItem \|\| source == ungroupButton)
2591	2766	{
2592		- //ungroup();
	2767	+ boolean hasRoot = false;
	2768	+
2593	2769	for (int i=0; i<group.selection.size(); i++)
2594	2770	{
2595		- Ungroup(group.selection.get(i));
	2771	+ if (group.selection.get(i) == group)
	2772	+ {
	2773	+ hasRoot = true;
	2774	+ break;
	2775	+ }
2596	2776	}
2597	2777
2598		- ClearSelection(false);
2599		-
2600		- refreshContents();
	2778	+ if (!hasRoot)
	2779	+ {
	2780	+ for (int i=0; i<group.selection.size(); i++)
	2781	+ {
	2782	+ Ungroup(group.selection.get(i));
	2783	+ }
	2784	+
	2785	+ ClearSelection(false);
	2786	+
	2787	+ refreshContents();
	2788	+ }
2601	2789	} else
2602	2790	if (source == genUVItem)
2603	2791	{
..	..	@@ -2925,6 +3113,10 @@
2925	3113	if (source == twoButton)
2926	3114	{
2927	3115	radio.layout = twoButton;
	3116	+
	3117	+ if (CameraPane.FULLSCREEN)
	3118	+ fullscreenLayout = radio.layout;
	3119	+
2928	3120	// bug
2929	3121	//gridPanel.setDividerLocation(1.0);
2930	3122	//bigPanel.setDividerLocation(0.0);
..	..	@@ -2980,6 +3172,9 @@
2980	3172	{
2981	3173	radio.layout = threeButton;
2982	3174
	3175	+ if (CameraPane.FULLSCREEN)
	3176	+ fullscreenLayout = radio.layout;
	3177	+
2983	3178	// bigThree.remove(scenePanel);
2984	3179	// bigThree.remove(centralPanel);
2985	3180	// bigThree.remove(XYZPanel);
..	..	@@ -3018,6 +3213,9 @@
3018	3213	{
3019	3214	radio.layout = fourButton;
3020	3215
	3216	+ if (CameraPane.FULLSCREEN)
	3217	+ fullscreenLayout = radio.layout;
	3218	+
3021	3219	// bigThree.remove(scenePanel);
3022	3220	// bigThree.remove(centralPanel);
3023	3221	// bigThree.remove(XYZPanel);
..	..	@@ -3054,6 +3252,9 @@
3054	3252	if (source == sixButton)
3055	3253	{
3056	3254	radio.layout = sixButton;
	3255	+
	3256	+ if (CameraPane.FULLSCREEN)
	3257	+ fullscreenLayout = radio.layout;
3057	3258
3058	3259	// bigThree.remove(scenePanel);
3059	3260	// bigThree.remove(centralPanel);
..	..	@@ -3092,6 +3293,9 @@
3092	3293	if (source == sevenButton)
3093	3294	{
3094	3295	radio.layout = sevenButton;
	3296	+
	3297	+ if (CameraPane.FULLSCREEN)
	3298	+ fullscreenLayout = radio.layout;
3095	3299
3096	3300	// bigThree.remove(scenePanel);
3097	3301	// bigThree.remove(centralPanel);
..	..	@@ -3159,7 +3363,8 @@
3159	3363	buttonGroup.remove(ab);
3160	3364	radioPanel.remove(ab);
3161	3365
3162		- ab.GetObject().editWindow = null;
	3366	+ //ab.GetObject().editWindow = null;
	3367	+ ab.GetObject().manipWindow = null;
3163	3368	// ab.GetObject().objectUI = null; // ?????????
3164	3369
3165	3370	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
..	..	@@ -3172,6 +3377,12 @@
3172	3377	} else
3173	3378	if (source == editItem \|\| source == editButton)
3174	3379	{
	3380	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3381	+ {
	3382	+ Object3D child = (Object3D)e.nextElement();
	3383	+ child.pinned = true;
	3384	+ }
	3385	+
3175	3386	EditSelection(false);
3176	3387	} else
3177	3388	if (source == uneditButton)
..	..	@@ -3181,6 +3392,7 @@
3181	3392	Object3D child = (Object3D)e.nextElement();
3182	3393	if(child.editWindow != null)
3183	3394	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3395	+ child.pinned = false;
3184	3396	child.CloseUI();
3185	3397	listUI.remove(child);
3186	3398
..	..	@@ -3197,6 +3409,7 @@
3197	3409	//copy.ClearUI();
3198	3410	for (Object3D obj : listUI)
3199	3411	{
	3412	+ obj.pinned = false;
3200	3413	obj.CloseUI();
3201	3414	}
3202	3415	listUI.clear();
..	..	@@ -3206,7 +3419,7 @@
3206	3419	{
3207	3420	assert(copy == group);
3208	3421
3209		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3422	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3210	3423
3211	3424	for (Object3D obj : listUI)
3212	3425	{
..	..	@@ -3273,6 +3486,7 @@
3273	3486
3274	3487	// fix "+" issue
3275	3488	//group.editWindow = this;
	3489	+ group.manipWindow = this;
3276	3490
3277	3491	/*
3278	3492	currentLayout = radio.layout;
..	..	@@ -3280,6 +3494,11 @@
3280	3494	currentLayout = sevenButton;
3281	3495	*/
3282	3496	radio.layout.doClick();
	3497	+
	3498	+ ClearUnpinned();
	3499	+ SetPinStates(group.selection.size() > 0);
	3500	+ if (group.selection.size() == 1)
	3501	+ EditSelection(false);
3283	3502	keepparent = group.parent;
3284	3503	// PARENT = NULL or not???
3285	3504	//group.parent = null; // ROOT
..	..	@@ -3293,7 +3512,7 @@
3293	3512	cameraView.ProtectCamera();
3294	3513	cameraView.repaint();
3295	3514	return;
3296		- } else if (event.getSource() == revertCameraItem)
	3515	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3297	3516	{
3298	3517	cameraView.RevertCamera();
3299	3518	cameraView.repaint();
..	..	@@ -4347,10 +4566,6 @@
4347	4566	// }
4348	4567	// }
4349	4568
4350		- static boolean allparams = true;
4351		-
4352		- static Vector<Object3D> listUI = new Vector<Object3D>();
4353		-
4354	4569	void EditSelection(boolean newWindow)
4355	4570	{
4356	4571	// aConstraints.gridy = 0;
..	..	@@ -4358,7 +4573,7 @@
4358	4573	{
4359	4574	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4360	4575	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4361		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4576	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4362	4577
4363	4578	Object3D elem = (Object3D)group.selection.elementAt(i);
4364	4579	if(elem != group \|\| !newWindow)
..	..	@@ -4443,7 +4658,8 @@
4443	4658	//new Exception().printStackTrace();
4444	4659
4445	4660	freezemodel = true;
4446		-
	4661	+ ClearUnpinned();
	4662	+
4447	4663	/**/
4448	4664	//switch (event.id)
4449	4665	{
..	..	@@ -4476,7 +4692,7 @@
4476	4692	if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4477	4693	// a camera
4478	4694	{
4479		- if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	4695	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
4480	4696	{
4481	4697	CameraPane.camerachangeframe = 0; // don't refuse it
4482	4698	Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
..	..	@@ -4485,6 +4701,13 @@
4485	4701	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4486	4702	}
4487	4703
	4704	+ if (tps != null && tps.length == 1)
	4705	+ {
	4706	+ EditSelection(false);
	4707	+ }
	4708	+
	4709	+ SetPinStates(tps != null && tps.length > 0);
	4710	+
4488	4711	refreshContents();
4489	4712	//return true;
4490	4713	}
..	..	@@ -4494,9 +4717,18 @@
4494	4717	freezemodel = false;
4495	4718	}
4496	4719
	4720	+ void SetPinStates(boolean enabled)
	4721	+ {
	4722	+ editButton.setEnabled(enabled);
	4723	+ uneditButton.setEnabled(enabled);
	4724	+ unselectButton.setEnabled(enabled);
	4725	+ flashSelectionButton.setEnabled(enabled);
	4726	+ }
	4727	+
4497	4728	void refreshContents(boolean cp)
4498	4729	{
4499		- if (!Globals.MOUSEDRAGGED)
	4730	+ if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
	4731	+ if (!Globals.MOUSEDRAGGED) // && !Globals.TIMERRUNNING)
4500	4732	{
4501	4733	objEditor.ClearInfo(); // .GetMaterial());
4502	4734
..	..	@@ -4595,6 +4827,7 @@
4595	4827
4596	4828	if (cut)
4597	4829	{
	4830	+ if (Globals.SAVEONMAKE)
4598	4831	Save();
4599	4832	//int indices[] = jList.getSelectedIndices();
4600	4833	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -5313,13 +5546,28 @@
5313	5546	cButton clearpanelButton;
5314	5547	cButton unselectButton;
5315	5548
5316		- cButton minButton;
5317		- cButton maxButton;
5318		- cButton fullButton;
5319		- cButton undoButton;
5320		- cButton redoButton;
	5549	+ cButton restoreCameraButton;
	5550	+
5321	5551	cButton saveButton;
5322	5552	cButton oneStepButton;
	5553	+
	5554	+ cButton groupButton;
	5555	+ cButton ungroupButton;
	5556	+ cButton compositeButton;
	5557	+ cButton switchButton;
	5558	+ cButton loopButton;
	5559	+ cButton textureButton;
	5560	+
	5561	+ cButton gridButton;
	5562	+ cButton boxButton;
	5563	+ cButton sphereButton;
	5564	+ cButton coneButton;
	5565	+ cButton torusButton;
	5566	+ cButton superButton;
	5567	+ cButton kleinButton;
	5568	+ cButton particlesButton;
	5569	+ cButton overlayButton;
	5570	+ cButton lightButton;
5323	5571
5324	5572	cButton screenfitButton;
5325	5573	cButton screenfitpointButton;
..	..	@@ -5341,11 +5589,11 @@
5341	5589	//JTree jTree;
5342	5590	private MenuItem lookAtItem;
5343	5591	private MenuItem lookFromItem;
5344		- private MenuItem switchItem;
	5592	+ private MenuItem switchViewItem;
5345	5593	private MenuItem cutItem;
5346	5594	private MenuItem undoItem;
5347	5595	private MenuItem redoItem;
5348		- private MenuItem duplicateItem;
	5596	+ private JMenuItem duplicateItem;
5349	5597	private MenuItem cloneItem;
5350	5598	private MenuItem cloneSupportItem;
5351	5599	private MenuItem overwriteGeoItem;
..	..	@@ -5433,7 +5681,7 @@
5433	5681	private MenuItem frontItem;
5434	5682	private MenuItem cameraItem;
5435	5683	private MenuItem compositeItem;
5436		- private MenuItem randomItem;
	5684	+ private MenuItem switchItem;
5437	5685	private MenuItem physicsItem;
5438	5686	private MenuItem frameselectorItem;
5439	5687	private MenuItem scriptNodeItem;
..	..	@@ -5507,5 +5755,5 @@
5507	5755
5508	5756	Menu cameraMenu;
5509	5757	MenuItem editCameraItem;
5510		- MenuItem revertCameraItem;
	5758	+ MenuItem restoreCameraItem;
5511	5759	}