~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -204,23 +204,23 @@
204	204	//zBufferItem.addActionListener(this);
205	205	//cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
206	206	//normalLensItem.addActionListener(this);
207		- cameraMenu.add(revertCameraItem = new MenuItem("Restore Viewpoint"));
208		- revertCameraItem.addActionListener(this);
	207	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	208	+ restoreCameraItem.addActionListener(this);
209	209
210		- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
211		- toggleFullScreenItem.addItemListener(this);
212		- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
213		- 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);
214	222
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);
222		-
223		- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
	223	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
224	224	toggleHandleItem.addItemListener(this);
225	225	toggleHandleItem.setState(CameraPane.HANDLES);
226	226
..	..	@@ -275,7 +275,7 @@
275	275	{
276	276	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
277	277	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
278		- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
	278	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
279	279	editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
280	280	oe.cameraMenu.add("-");
281	281	openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
..	..	@@ -283,7 +283,7 @@
283	283	editLeafItem.addActionListener(this);
284	284	lookAtItem.addActionListener(this);
285	285	//lookFromItem.addActinoListener(this);
286		- //switchItem.addActionListener(this);
	286	+ //switchViewItem.addActionListener(this);
287	287	}
288	288
289	289	oe.menuBar.add(menu = new Menu("Setting"));
..	..	@@ -328,14 +328,14 @@
328	328	}
329	329
330	330	oe.menuBar.add(menu = new Menu("Group"));
331		- grabItem = menu.add(new MenuItem("Grab"));
332		- grabItem.addActionListener(this);
	331	+// grabItem = menu.add(new MenuItem("Grab"));
	332	+// grabItem.addActionListener(this);
333	333	backItem = menu.add(new MenuItem("Back"));
334	334	backItem.addActionListener(this);
335	335	frontItem = menu.add(new MenuItem("Front"));
336	336	frontItem.addActionListener(this);
337		- compositeItem = menu.add(new MenuItem("Composite"));
338		- compositeItem.addActionListener(this);
	337	+// compositeItem = menu.add(new MenuItem("Composite"));
	338	+// compositeItem.addActionListener(this);
339	339
340	340	if (Globals.ADVANCED)
341	341	{
..	..	@@ -345,10 +345,10 @@
345	345	ungroupItem = menu.add(new MenuItem("Ungroup"));
346	346	ungroupItem.addActionListener(this);
347	347
348		- menu.add("-");
349		-
350		- randomItem = menu.add(new MenuItem("Switch node"));
351		- randomItem.addActionListener(this);
	348	+// menu.add("-");
	349	+//
	350	+// switchItem = menu.add(new MenuItem("Switch node"));
	351	+// switchItem.addActionListener(this);
352	352	if (Globals.ADVANCED)
353	353	{
354	354	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
..	..	@@ -365,13 +365,11 @@
365	365	frameselectorItem.addActionListener(this);
366	366	scriptNodeItem = menu.add(new MenuItem("Script Node"));
367	367	scriptNodeItem.addActionListener(this);
368		- cameraItem = menu.add(new MenuItem("Camera"));
369		- cameraItem.addActionListener(this);
370	368	}
371	369
372	370	oe.menuBar.add(menu = new Menu("Object"));
373		- textureItem = menu.add(new MenuItem("Texture"));
374		- textureItem.addActionListener(this);
	371	+// textureItem = menu.add(new MenuItem("Texture"));
	372	+// textureItem.addActionListener(this);
375	373	billboardItem = menu.add(new MenuItem("Billboard"));
376	374	billboardItem.addActionListener(this);
377	375	csgItem = menu.add(new MenuItem("CSG"));
..	..	@@ -582,6 +580,10 @@
582	580	oe.radioPanel.add(dummyButton);
583	581	oe.buttonGroup.add(dummyButton);
584	582	*/
	583	+ cGridBag copyOptionsPanel = new cGridBag();
	584	+
	585	+ copyOptionsPanel.preferredHeight = 1;
	586	+
585	587	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
586	588
587	589	//oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..	..	@@ -596,39 +598,45 @@
596	598	fullButton.setToolTipText("Full-screen window");
597	599	fullButton.addActionListener(this);
598	600
599		- oe.toolboxPanel.add(undoButton = GetButton("icons/undo.png", !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);
600	606	undoButton.setToolTipText("Undo changes");
601	607	undoButton.addActionListener(this);
	608	+ undoButton.setEnabled(false);
602	609
603		- oe.toolboxPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	610	+ copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
604	611	redoButton.setToolTipText("Redo changes");
605	612	redoButton.addActionListener(this);
	613	+ redoButton.setEnabled(false);
606	614
607		- oe.toolboxPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	615	+ copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
608	616	saveButton.setToolTipText("Save changes");
609	617	saveButton.addActionListener(this);
610	618
611		- oe.toolboxPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	619	+ copyOptionsPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
612	620	liveCB.setToolTipText("Enable animation");
613	621	liveCB.addItemListener(this);
614	622
615		- oe.toolboxPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	623	+ copyOptionsPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
616	624	oneStepButton.setToolTipText("Animate one step forward");
617	625	oneStepButton.addActionListener(this);
618	626
619		- oe.toolboxPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
	627	+ copyOptionsPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
620	628	fastCB.setToolTipText("Fast mode");
621	629	fastCB.addItemListener(this);
622	630
623		- oe.toolboxPanel.Return();
	631	+ //oe.toolboxPanel.Return();
624	632
625		- oe.toolboxPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
626		- trackCB.setToolTipText("Enable tracking");
627		- trackCB.addItemListener(this);
628		-
629		- oe.toolboxPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	633	+ copyOptionsPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
630	634	screenfitButton.setToolTipText("Screen fit");
631	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);
632	640
633	641	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
634	642	// screenfitpointButton.addActionListener(this);
..	..	@@ -640,10 +648,6 @@
640	648	snapobjectButton.setToolTipText("Snap Object");
641	649	}
642	650
643		- oe.toolboxPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
644		- flashSelectionButton.setToolTipText("Highlight selection");
645		- flashSelectionButton.addActionListener(this);
646		-
647	651	//oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
648	652
649	653	oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..	..	@@ -688,8 +692,6 @@
688	692	sphereButton.setToolTipText("Create sphere");
689	693	sphereButton.addActionListener(this);
690	694
691		- oe.toolboxPanel.Return();
692		-
693	695	oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
694	696	coneButton.setToolTipText("Create cone");
695	697	coneButton.addActionListener(this);
..	..	@@ -713,6 +715,28 @@
713	715	particlesButton.setToolTipText("Create particle system");
714	716	particlesButton.addActionListener(this);
715	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	+
716	740	oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
717	741	overlayButton.setToolTipText("Create overlay");
718	742	overlayButton.addActionListener(this);
..	..	@@ -721,17 +745,29 @@
721	745	lightButton.setToolTipText("Create light");
722	746	lightButton.addActionListener(this);
723	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	+
724	760	// EDIT panel
725		- editCommandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
726		- editButton.setToolTipText("Edit selection");
	761	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	762	+ editButton.setToolTipText("Pin selection controls");
727	763	editButton.addActionListener(this);
728	764
729		- editCommandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
730		- uneditButton.setToolTipText("Unedit selection");
	765	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	766	+ uneditButton.setToolTipText("Remove selection controls");
731	767	uneditButton.addActionListener(this);
732	768
733	769	editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
734		- allParamsButton.setToolTipText("Edit all params");
	770	+ allParamsButton.setToolTipText("Show all controle");
735	771	allParamsButton.addActionListener(this);
736	772
737	773	editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..	..	@@ -742,8 +778,13 @@
742	778	unselectButton.setToolTipText("Unselect");
743	779	unselectButton.addActionListener(this);
744	780
	781	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	782	+ flashSelectionButton.setToolTipText("Highlight selection");
	783	+ flashSelectionButton.addActionListener(this);
	784	+
745	785	editCommandsPanel.preferredHeight = 1;
746	786
	787	+ SetPinStates(false);
747	788	// oe.treePanel.add(commandsPanel);
748	789	// oe.treePanel.Return();
749	790
..	..	@@ -768,21 +809,6 @@
768	809	oe.treePanel.add(jSPPanel);
769	810	oe.treePanel.Return();
770	811
771		- cGridBag copyOptionsPanel = new cGridBag();
772		-
773		- copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
774		- colorCB.setToolTipText("Copy color when dropped");
775		- colorCB.addItemListener(this);
776		-
777		- copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
778		- materialCB.setToolTipText("Copy material when dropped");
779		- materialCB.addItemListener(this);
780		-
781		- copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
782		- textureCB.setToolTipText("Copy texture when dropped");
783		- textureCB.addItemListener(this);
784		-
785		- copyOptionsPanel.preferredHeight = 1;
786	812	oe.treePanel.add(copyOptionsPanel);
787	813	oe.treePanel.Return();
788	814
..	..	@@ -813,23 +839,43 @@
813	839
814	840	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
815	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	+
816	856	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
817	857	boxCB.setToolTipText("Display bounding boxes");
818	858	boxCB.addItemListener(this);
819	859
820	860	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
821		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	861	+ zoomBoxCB.setToolTipText("Display only for wheel");
822	862	zoomBoxCB.addItemListener(this);
823	863
824	864	if (true) // Globals.ADVANCED)
825	865	{
826		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
827		- supportCB.setToolTipText("Enable rigging");
828		- 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);
829	873
830	874	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
831	875	// localCB.addItemListener(this);
832	876
	877	+ panel.Return();
	878	+
833	879	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
834	880	crowdCB.setToolTipText("Used for crowds");
835	881	crowdCB.addItemListener(this);
..	..	@@ -846,6 +892,8 @@
846	892	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
847	893	// speakerMocapCB.addItemListener(this);
848	894
	895	+ panel.Return();
	896	+
849	897	if (false)
850	898	{
851	899	// handled in scripts
..	..	@@ -860,24 +908,39 @@
860	908	//constraints.gridy += 1;
861	909	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
862	910	smoothfocusCB.addItemListener(this);
	911	+ panel.Return();
863	912	}
864	913
865	914	//constraints.gridx += 1;
866	915	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
867	916	// debugCB.addItemListener(this);
868	917
	918	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	919	+ trackCB.setToolTipText("Enable tracking target");
	920	+ trackCB.addItemListener(this);
	921	+
869	922	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
870		- oeilCB.setToolTipText("Move camera when tracking target");
	923	+ oeilCB.setToolTipText("Move camera when tracking");
871	924	oeilCB.addItemListener(this);
872	925
873	926	panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
874		- shadowCB.setToolTipText("Compute shadows when live");
	927	+ shadowCB.setToolTipText("When live compute shadows");
875	928	shadowCB.addItemListener(this);
876	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	+
877	939	panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
878		- autosaveCB.setToolTipText("Auto-save on structure change");
	940	+ autosaveCB.setToolTipText("On structure change");
879	941	autosaveCB.addItemListener(this);
880	942
	943	+ panel.Return();
881	944	if (Globals.ADVANCED)
882	945	{
883	946	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
..	..	@@ -888,10 +951,15 @@
888	951	}
889	952
890	953	cGridBag fill = new cGridBag();
891		-
892	954	fill.preferredHeight = 200;
	955	+ cGridBag fill2 = new cGridBag();
	956	+ fill2.preferredHeight = 200;
	957	+ cGridBag fill3 = new cGridBag();
	958	+ fill3.preferredHeight = 200;
893	959
894	960	panel.add(fill);
	961	+ panel.add(fill2);
	962	+ panel.add(fill3);
895	963
896	964	}
897	965
..	..	@@ -936,7 +1004,9 @@
936	1004	cCheckBox slowCB;
937	1005	cCheckBox boxCB;
938	1006	cCheckBox zoomBoxCB;
939		- cToggleButton trackCB;
	1007	+ cCheckBox freezeCB;
	1008	+ //cToggleButton trackCB;
	1009	+ cCheckBox trackCB;
940	1010	cCheckBox smoothfocusCB;
941	1011	// JCheckBox speakerMocapCB;
942	1012	cCheckBox speakerCameraCB;
..	..	@@ -1052,6 +1122,10 @@
1052	1122	else if(e.getSource() == shadowCB)
1053	1123	{
1054	1124	Globals.COMPUTESHADOWWHENLIVE ^= true;
	1125	+ }
	1126	+ else if(e.getSource() == freezeCB)
	1127	+ {
	1128	+ Globals.FREEZEONMOVE ^= true;
1055	1129	}
1056	1130	else if(e.getSource() == autosaveCB)
1057	1131	{
..	..	@@ -1191,13 +1265,23 @@
1191	1265
1192	1266	assert target == objEditor.jTree;
1193	1267	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1268	+ Object3D destinationLeaf;
1194	1269	try {
1195		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1270	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
1196	1271	} catch (Exception e) {
1197	1272	System.out.println("destinationPath : " + destinationPath);
1198	1273	return;
1199	1274	}
1200	1275
	1276	+ for (int i=group.selection.size(); --i>=0;)
	1277	+ {
	1278	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1279	+
	1280	+ // Cannot move into itself
	1281	+ if (child == destinationLeaf)
	1282	+ return;
	1283	+ }
	1284	+
1201	1285	// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
1202	1286	// {
1203	1287	loadClipboard(true);
..	..	@@ -1312,22 +1396,30 @@
1312	1396	{
1313	1397	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1314	1398	//heightFieldItem.addActionListener(this);
1315		- gridItem = menu.add(new MenuItem("Grid"));
1316		- gridItem.addActionListener(this);
1317		- rectoidItem = menu.add(new MenuItem("Box"));
1318		- rectoidItem.addActionListener(this);
1319		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1320		- ellipsoidItem.addActionListener(this);
1321		- coneItem = menu.add(new MenuItem("Cone"));
1322		- coneItem.addActionListener(this);
1323		- torusItem = menu.add(new MenuItem("Torus"));
1324		- torusItem.addActionListener(this);
1325		- superItem = menu.add(new MenuItem("Superellipsoid"));
1326		- 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	+ {
1327	1417	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1328	1418	kleinItem.addActionListener(this);
1329		- particleItem = menu.add(new MenuItem("Particle system"));
1330		- particleItem.addActionListener(this);
	1419	+ }
	1420	+
	1421	+// particleItem = menu.add(new MenuItem("Particle system"));
	1422	+// particleItem.addActionListener(this);
1331	1423	if (Globals.ADVANCED)
1332	1424	{
1333	1425	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1353,15 +1445,15 @@
1353	1445	}
1354	1446	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1355	1447	bezierItem.addActionListener(this);
1356		- overlayItem = menu.add(new MenuItem("Overlay"));
1357		- overlayItem.addActionListener(this);
1358		- lightItem = menu.add(new MenuItem("Light"));
1359		- 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);
1360	1452	menu.add("-");
1361	1453	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1362	1454	//superLoopItem.addActionListener(this);
1363		- loopItem = menu.add(new MenuItem("Loop"));
1364		- loopItem.addActionListener(this);
	1455	+// loopItem = menu.add(new MenuItem("Loop"));
	1456	+// loopItem.addActionListener(this);
1365	1457	doubleItem = menu.add(new MenuItem("Fork"));
1366	1458	doubleItem.addActionListener(this);
1367	1459	if (Globals.ADVANCED)
..	..	@@ -1546,6 +1638,20 @@
1546	1638
1547	1639	makeSomething(shadow);
1548	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	+ }
1549	1655
1550	1656	/**
1551	1657	* applyExample
..	..	@@ -1790,7 +1896,7 @@
1790	1896	{
1791	1897	ScreenFit();
1792	1898	} else
1793		- if (source == switchItem)
	1899	+ if (source == switchViewItem)
1794	1900	{
1795	1901	cVector v1 = new cVector();
1796	1902	cVector v2 = new cVector();
..	..	@@ -2020,30 +2126,30 @@
2020	2126
2021	2127	group(g);
2022	2128	} else
2023		- if (source == loopItem)
	2129	+ if (source == loopItem \|\| source == loopButton)
2024	2130	{
2025	2131	Composite csg = new GroupLeaf();
2026	2132	csg.count = 5;
2027	2133	group(csg);
2028		- Composite child = new cGroup();
	2134	+ Composite child = new cGroup("Branch");
2029	2135	csg.addChild(child);
2030	2136	child.addChild(csg);
2031	2137	} else
2032	2138	if (source == doubleItem)
2033	2139	{
2034		- Composite csg = new GroupLeaf();
	2140	+ Composite csg = new GroupLeaf("Fork");
2035	2141	csg.count = 5;
2036	2142	group(csg);
2037		- Composite child = new cGroup();
	2143	+ Composite child = new cGroup("Branch A");
2038	2144	csg.addChild(child);
2039	2145	child.addChild(csg);
2040		- child = new cGroup();
	2146	+ child = new cGroup("Branch B");
2041	2147	csg.addChild(child);
2042	2148	child.addChild(csg);
2043	2149	} else
2044	2150	if (source == tripleItem)
2045	2151	{
2046		- Composite csg = new GroupLeaf();
	2152	+ Composite csg = new GroupLeaf("Trident");
2047	2153	csg.count = 4;
2048	2154	group(csg);
2049	2155	Composite child = new cGroup();
..	..	@@ -2510,9 +2616,9 @@
2510	2616	{
2511	2617	ClearSelection(true);
2512	2618	} else
2513		- if (source == grabItem)
	2619	+ if (source == grabItem \|\| source == groupButton)
2514	2620	{
2515		- group(new cGroup(), true);
	2621	+ group(new cGroup(), false); // true);
2516	2622	} else
2517	2623	if (source == hideItem)
2518	2624	{
..	..	@@ -2530,11 +2636,11 @@
2530	2636	{
2531	2637	makeSomething(new Camera());
2532	2638	} else
2533		- if (source == compositeItem)
	2639	+ if (source == compositeItem \|\| source == compositeButton)
2534	2640	{
2535	2641	group(new Composite());
2536	2642	} else
2537		- if (source == randomItem)
	2643	+ if (source == switchItem \|\| source == switchButton)
2538	2644	{
2539	2645	RandomNode random = new RandomNode();
2540	2646	group(random);
..	..	@@ -2636,7 +2742,7 @@
2636	2742	{
2637	2743	group(new cLinker());
2638	2744	} else
2639		- if (source == textureItem)
	2745	+ if (source == textureItem \|\| source == textureButton)
2640	2746	{
2641	2747	group(new TextureNode());
2642	2748	} else
..	..	@@ -2658,15 +2764,28 @@
2658	2764	} else
2659	2765	if (source == ungroupItem \|\| source == ungroupButton)
2660	2766	{
2661		- //ungroup();
	2767	+ boolean hasRoot = false;
	2768	+
2662	2769	for (int i=0; i<group.selection.size(); i++)
2663	2770	{
2664		- Ungroup(group.selection.get(i));
	2771	+ if (group.selection.get(i) == group)
	2772	+ {
	2773	+ hasRoot = true;
	2774	+ break;
	2775	+ }
2665	2776	}
2666	2777
2667		- ClearSelection(false);
2668		-
2669		- 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	+ }
2670	2789	} else
2671	2790	if (source == genUVItem)
2672	2791	{
..	..	@@ -3258,6 +3377,12 @@
3258	3377	} else
3259	3378	if (source == editItem \|\| source == editButton)
3260	3379	{
	3380	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3381	+ {
	3382	+ Object3D child = (Object3D)e.nextElement();
	3383	+ child.pinned = true;
	3384	+ }
	3385	+
3261	3386	EditSelection(false);
3262	3387	} else
3263	3388	if (source == uneditButton)
..	..	@@ -3267,6 +3392,7 @@
3267	3392	Object3D child = (Object3D)e.nextElement();
3268	3393	if(child.editWindow != null)
3269	3394	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3395	+ child.pinned = false;
3270	3396	child.CloseUI();
3271	3397	listUI.remove(child);
3272	3398
..	..	@@ -3283,6 +3409,7 @@
3283	3409	//copy.ClearUI();
3284	3410	for (Object3D obj : listUI)
3285	3411	{
	3412	+ obj.pinned = false;
3286	3413	obj.CloseUI();
3287	3414	}
3288	3415	listUI.clear();
..	..	@@ -3292,7 +3419,7 @@
3292	3419	{
3293	3420	assert(copy == group);
3294	3421
3295		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3422	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3296	3423
3297	3424	for (Object3D obj : listUI)
3298	3425	{
..	..	@@ -3367,6 +3494,11 @@
3367	3494	currentLayout = sevenButton;
3368	3495	*/
3369	3496	radio.layout.doClick();
	3497	+
	3498	+ ClearUnpinned();
	3499	+ SetPinStates(group.selection.size() > 0);
	3500	+ if (group.selection.size() == 1)
	3501	+ EditSelection(false);
3370	3502	keepparent = group.parent;
3371	3503	// PARENT = NULL or not???
3372	3504	//group.parent = null; // ROOT
..	..	@@ -3380,7 +3512,7 @@
3380	3512	cameraView.ProtectCamera();
3381	3513	cameraView.repaint();
3382	3514	return;
3383		- } else if (event.getSource() == revertCameraItem)
	3515	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3384	3516	{
3385	3517	cameraView.RevertCamera();
3386	3518	cameraView.repaint();
..	..	@@ -4434,10 +4566,6 @@
4434	4566	// }
4435	4567	// }
4436	4568
4437		- static boolean allparams = true;
4438		-
4439		- static Vector<Object3D> listUI = new Vector<Object3D>();
4440		-
4441	4569	void EditSelection(boolean newWindow)
4442	4570	{
4443	4571	// aConstraints.gridy = 0;
..	..	@@ -4530,7 +4658,8 @@
4530	4658	//new Exception().printStackTrace();
4531	4659
4532	4660	freezemodel = true;
4533		-
	4661	+ ClearUnpinned();
	4662	+
4534	4663	/**/
4535	4664	//switch (event.id)
4536	4665	{
..	..	@@ -4563,7 +4692,7 @@
4563	4692	if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4564	4693	// a camera
4565	4694	{
4566		- if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	4695	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
4567	4696	{
4568	4697	CameraPane.camerachangeframe = 0; // don't refuse it
4569	4698	Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
..	..	@@ -4572,6 +4701,13 @@
4572	4701	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4573	4702	}
4574	4703
	4704	+ if (tps != null && tps.length == 1)
	4705	+ {
	4706	+ EditSelection(false);
	4707	+ }
	4708	+
	4709	+ SetPinStates(tps != null && tps.length > 0);
	4710	+
4575	4711	refreshContents();
4576	4712	//return true;
4577	4713	}
..	..	@@ -4581,9 +4717,18 @@
4581	4717	freezemodel = false;
4582	4718	}
4583	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	+
4584	4728	void refreshContents(boolean cp)
4585	4729	{
4586		- if (!Globals.MOUSEDRAGGED)
	4730	+ if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
	4731	+ if (!Globals.MOUSEDRAGGED) // && !Globals.TIMERRUNNING)
4587	4732	{
4588	4733	objEditor.ClearInfo(); // .GetMaterial());
4589	4734
..	..	@@ -5401,17 +5546,17 @@
5401	5546	cButton clearpanelButton;
5402	5547	cButton unselectButton;
5403	5548
5404		- cButton minButton;
5405		- cButton maxButton;
5406		- cButton fullButton;
5407		- cButton undoButton;
5408		- cButton redoButton;
	5549	+ cButton restoreCameraButton;
	5550	+
5409	5551	cButton saveButton;
5410	5552	cButton oneStepButton;
5411	5553
5412	5554	cButton groupButton;
5413	5555	cButton ungroupButton;
5414	5556	cButton compositeButton;
	5557	+ cButton switchButton;
	5558	+ cButton loopButton;
	5559	+ cButton textureButton;
5415	5560
5416	5561	cButton gridButton;
5417	5562	cButton boxButton;
..	..	@@ -5444,7 +5589,7 @@
5444	5589	//JTree jTree;
5445	5590	private MenuItem lookAtItem;
5446	5591	private MenuItem lookFromItem;
5447		- private MenuItem switchItem;
	5592	+ private MenuItem switchViewItem;
5448	5593	private MenuItem cutItem;
5449	5594	private MenuItem undoItem;
5450	5595	private MenuItem redoItem;
..	..	@@ -5536,7 +5681,7 @@
5536	5681	private MenuItem frontItem;
5537	5682	private MenuItem cameraItem;
5538	5683	private MenuItem compositeItem;
5539		- private MenuItem randomItem;
	5684	+ private MenuItem switchItem;
5540	5685	private MenuItem physicsItem;
5541	5686	private MenuItem frameselectorItem;
5542	5687	private MenuItem scriptNodeItem;
..	..	@@ -5610,5 +5755,5 @@
5610	5755
5611	5756	Menu cameraMenu;
5612	5757	MenuItem editCameraItem;
5613		- MenuItem revertCameraItem;
	5758	+ MenuItem restoreCameraItem;
5614	5759	}