~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -204,21 +204,21 @@
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("-");
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);
	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);
222	222
223	223	cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
224	224	toggleHandleItem.addItemListener(this);
..	..	@@ -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 = 2;
	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 switch");
	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,6 +745,18 @@
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	761	editCommandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
726	762	editButton.setToolTipText("Edit selection");
..	..	@@ -742,6 +778,10 @@
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
747	787	// oe.treePanel.add(commandsPanel);
..	..	@@ -768,21 +808,6 @@
768	808	oe.treePanel.add(jSPPanel);
769	809	oe.treePanel.Return();
770	810
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	811	oe.treePanel.add(copyOptionsPanel);
787	812	oe.treePanel.Return();
788	813
..	..	@@ -813,6 +838,20 @@
813	838
814	839	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
815	840	{
	841	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	842	+ colorCB.setToolTipText("Copy color when dropped");
	843	+ colorCB.addItemListener(this);
	844	+
	845	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	846	+ materialCB.setToolTipText("Copy material when dropped");
	847	+ materialCB.addItemListener(this);
	848	+
	849	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	850	+ textureCB.setToolTipText("Copy texture when dropped");
	851	+ textureCB.addItemListener(this);
	852	+
	853	+ panel.Return();
	854	+
816	855	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
817	856	boxCB.setToolTipText("Display bounding boxes");
818	857	boxCB.addItemListener(this);
..	..	@@ -830,6 +869,8 @@
830	869	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
831	870	// localCB.addItemListener(this);
832	871
	872	+ panel.Return();
	873	+
833	874	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
834	875	crowdCB.setToolTipText("Used for crowds");
835	876	crowdCB.addItemListener(this);
..	..	@@ -846,6 +887,8 @@
846	887	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
847	888	// speakerMocapCB.addItemListener(this);
848	889
	890	+ panel.Return();
	891	+
849	892	if (false)
850	893	{
851	894	// handled in scripts
..	..	@@ -860,24 +903,39 @@
860	903	//constraints.gridy += 1;
861	904	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
862	905	smoothfocusCB.addItemListener(this);
	906	+ panel.Return();
863	907	}
864	908
865	909	//constraints.gridx += 1;
866	910	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
867	911	// debugCB.addItemListener(this);
868	912
	913	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	914	+ trackCB.setToolTipText("Enable tracking target");
	915	+ trackCB.addItemListener(this);
	916	+
869	917	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
870		- oeilCB.setToolTipText("Move camera when tracking target");
	918	+ oeilCB.setToolTipText("Move camera when tracking");
871	919	oeilCB.addItemListener(this);
872	920
873	921	panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
874	922	shadowCB.setToolTipText("Compute shadows when live");
875	923	shadowCB.addItemListener(this);
876	924
	925	+ panel.Return();
	926	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	927	+ toggleTextureCB.setToolTipText("Load textures");
	928	+ toggleTextureCB.addItemListener(this);
	929	+
	930	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	931	+ toggleSwitchCB.setToolTipText("Use switch");
	932	+ toggleSwitchCB.addItemListener(this);
	933	+
877	934	panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
878	935	autosaveCB.setToolTipText("Auto-save on structure change");
879	936	autosaveCB.addItemListener(this);
880	937
	938	+ panel.Return();
881	939	if (Globals.ADVANCED)
882	940	{
883	941	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
..	..	@@ -888,10 +946,15 @@
888	946	}
889	947
890	948	cGridBag fill = new cGridBag();
891		-
892	949	fill.preferredHeight = 200;
	950	+ cGridBag fill2 = new cGridBag();
	951	+ fill2.preferredHeight = 200;
	952	+ cGridBag fill3 = new cGridBag();
	953	+ fill3.preferredHeight = 200;
893	954
894	955	panel.add(fill);
	956	+ panel.add(fill2);
	957	+ panel.add(fill3);
895	958
896	959	}
897	960
..	..	@@ -936,7 +999,8 @@
936	999	cCheckBox slowCB;
937	1000	cCheckBox boxCB;
938	1001	cCheckBox zoomBoxCB;
939		- cToggleButton trackCB;
	1002	+ //cToggleButton trackCB;
	1003	+ cCheckBox trackCB;
940	1004	cCheckBox smoothfocusCB;
941	1005	// JCheckBox speakerMocapCB;
942	1006	cCheckBox speakerCameraCB;
..	..	@@ -1191,13 +1255,23 @@
1191	1255
1192	1256	assert target == objEditor.jTree;
1193	1257	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1258	+ Object3D destinationLeaf;
1194	1259	try {
1195		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1260	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
1196	1261	} catch (Exception e) {
1197	1262	System.out.println("destinationPath : " + destinationPath);
1198	1263	return;
1199	1264	}
1200	1265
	1266	+ for (int i=group.selection.size(); --i>=0;)
	1267	+ {
	1268	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1269	+
	1270	+ // Cannot move into itself
	1271	+ if (child == destinationLeaf)
	1272	+ return;
	1273	+ }
	1274	+
1201	1275	// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
1202	1276	// {
1203	1277	loadClipboard(true);
..	..	@@ -1312,22 +1386,30 @@
1312	1386	{
1313	1387	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1314	1388	//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);
	1389	+// gridItem = menu.add(new MenuItem("Grid"));
	1390	+// gridItem.addActionListener(this);
	1391	+// rectoidItem = menu.add(new MenuItem("Box"));
	1392	+// rectoidItem.addActionListener(this);
	1393	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1394	+// ellipsoidItem.addActionListener(this);
	1395	+// coneItem = menu.add(new MenuItem("Cone"));
	1396	+// coneItem.addActionListener(this);
	1397	+// torusItem = menu.add(new MenuItem("Torus"));
	1398	+// torusItem.addActionListener(this);
	1399	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1400	+// superItem.addActionListener(this);
	1401	+
	1402	+ cameraItem = menu.add(new MenuItem("Camera"));
	1403	+ cameraItem.addActionListener(this);
	1404	+
	1405	+ if (!Globals.ADVANCED)
	1406	+ {
1327	1407	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1328	1408	kleinItem.addActionListener(this);
1329		- particleItem = menu.add(new MenuItem("Particle system"));
1330		- particleItem.addActionListener(this);
	1409	+ }
	1410	+
	1411	+// particleItem = menu.add(new MenuItem("Particle system"));
	1412	+// particleItem.addActionListener(this);
1331	1413	if (Globals.ADVANCED)
1332	1414	{
1333	1415	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1353,15 +1435,15 @@
1353	1435	}
1354	1436	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1355	1437	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);
	1438	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1439	+// overlayItem.addActionListener(this);
	1440	+// lightItem = menu.add(new MenuItem("Light"));
	1441	+// lightItem.addActionListener(this);
1360	1442	menu.add("-");
1361	1443	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1362	1444	//superLoopItem.addActionListener(this);
1363		- loopItem = menu.add(new MenuItem("Loop"));
1364		- loopItem.addActionListener(this);
	1445	+// loopItem = menu.add(new MenuItem("Loop"));
	1446	+// loopItem.addActionListener(this);
1365	1447	doubleItem = menu.add(new MenuItem("Fork"));
1366	1448	doubleItem.addActionListener(this);
1367	1449	if (Globals.ADVANCED)
..	..	@@ -1790,7 +1872,7 @@
1790	1872	{
1791	1873	ScreenFit();
1792	1874	} else
1793		- if (source == switchItem)
	1875	+ if (source == switchViewItem)
1794	1876	{
1795	1877	cVector v1 = new cVector();
1796	1878	cVector v2 = new cVector();
..	..	@@ -2020,7 +2102,7 @@
2020	2102
2021	2103	group(g);
2022	2104	} else
2023		- if (source == loopItem)
	2105	+ if (source == loopItem \|\| source == loopButton)
2024	2106	{
2025	2107	Composite csg = new GroupLeaf();
2026	2108	csg.count = 5;
..	..	@@ -2510,9 +2592,9 @@
2510	2592	{
2511	2593	ClearSelection(true);
2512	2594	} else
2513		- if (source == grabItem)
	2595	+ if (source == grabItem \|\| source == groupButton)
2514	2596	{
2515		- group(new cGroup(), true);
	2597	+ group(new cGroup(), false); // true);
2516	2598	} else
2517	2599	if (source == hideItem)
2518	2600	{
..	..	@@ -2530,11 +2612,11 @@
2530	2612	{
2531	2613	makeSomething(new Camera());
2532	2614	} else
2533		- if (source == compositeItem)
	2615	+ if (source == compositeItem \|\| source == compositeButton)
2534	2616	{
2535	2617	group(new Composite());
2536	2618	} else
2537		- if (source == randomItem)
	2619	+ if (source == switchItem \|\| source == switchButton)
2538	2620	{
2539	2621	RandomNode random = new RandomNode();
2540	2622	group(random);
..	..	@@ -2636,7 +2718,7 @@
2636	2718	{
2637	2719	group(new cLinker());
2638	2720	} else
2639		- if (source == textureItem)
	2721	+ if (source == textureItem \|\| source == textureButton)
2640	2722	{
2641	2723	group(new TextureNode());
2642	2724	} else
..	..	@@ -3258,6 +3340,12 @@
3258	3340	} else
3259	3341	if (source == editItem \|\| source == editButton)
3260	3342	{
	3343	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3344	+ {
	3345	+ Object3D child = (Object3D)e.nextElement();
	3346	+ child.pinned = true;
	3347	+ }
	3348	+
3261	3349	EditSelection(false);
3262	3350	} else
3263	3351	if (source == uneditButton)
..	..	@@ -3267,6 +3355,7 @@
3267	3355	Object3D child = (Object3D)e.nextElement();
3268	3356	if(child.editWindow != null)
3269	3357	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3358	+ child.pinned = false;
3270	3359	child.CloseUI();
3271	3360	listUI.remove(child);
3272	3361
..	..	@@ -3283,6 +3372,7 @@
3283	3372	//copy.ClearUI();
3284	3373	for (Object3D obj : listUI)
3285	3374	{
	3375	+ obj.pinned = true;
3286	3376	obj.CloseUI();
3287	3377	}
3288	3378	listUI.clear();
..	..	@@ -3292,7 +3382,7 @@
3292	3382	{
3293	3383	assert(copy == group);
3294	3384
3295		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3385	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3296	3386
3297	3387	for (Object3D obj : listUI)
3298	3388	{
..	..	@@ -3380,7 +3470,7 @@
3380	3470	cameraView.ProtectCamera();
3381	3471	cameraView.repaint();
3382	3472	return;
3383		- } else if (event.getSource() == revertCameraItem)
	3473	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3384	3474	{
3385	3475	cameraView.RevertCamera();
3386	3476	cameraView.repaint();
..	..	@@ -4434,10 +4524,6 @@
4434	4524	// }
4435	4525	// }
4436	4526
4437		- static boolean allparams = true;
4438		-
4439		- static Vector<Object3D> listUI = new Vector<Object3D>();
4440		-
4441	4527	void EditSelection(boolean newWindow)
4442	4528	{
4443	4529	// aConstraints.gridy = 0;
..	..	@@ -4531,6 +4617,17 @@
4531	4617
4532	4618	freezemodel = true;
4533	4619
	4620	+ //for (Object3D obj : listUI)
	4621	+ for (int i=listUI.size(); --i>=0;)
	4622	+ {
	4623	+ Object3D obj = listUI.elementAt(i);
	4624	+ if (!obj.pinned)
	4625	+ {
	4626	+ obj.CloseUI();
	4627	+ listUI.remove(i);
	4628	+ }
	4629	+ }
	4630	+
4534	4631	/**/
4535	4632	//switch (event.id)
4536	4633	{
..	..	@@ -4563,7 +4660,7 @@
4563	4660	if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4564	4661	// a camera
4565	4662	{
4566		- if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	4663	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
4567	4664	{
4568	4665	CameraPane.camerachangeframe = 0; // don't refuse it
4569	4666	Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
..	..	@@ -4572,6 +4669,13 @@
4572	4669	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4573	4670	}
4574	4671
	4672	+ if (tps != null && tps.length == 1)
	4673	+ {
	4674	+ EditSelection(false);
	4675	+ }
	4676	+
	4677	+ SetPinStates(tps != null && tps.length > 0);
	4678	+
4575	4679	refreshContents();
4576	4680	//return true;
4577	4681	}
..	..	@@ -4581,9 +4685,16 @@
4581	4685	freezemodel = false;
4582	4686	}
4583	4687
	4688	+ void SetPinStates(boolean enabled)
	4689	+ {
	4690	+ editButton.setEnabled(enabled);
	4691	+ uneditButton.setEnabled(enabled);
	4692	+ }
	4693	+
4584	4694	void refreshContents(boolean cp)
4585	4695	{
4586		- if (!Globals.MOUSEDRAGGED)
	4696	+ if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
	4697	+ if (!Globals.MOUSEDRAGGED) // && !Globals.TIMERRUNNING)
4587	4698	{
4588	4699	objEditor.ClearInfo(); // .GetMaterial());
4589	4700
..	..	@@ -5401,17 +5512,20 @@
5401	5512	cButton clearpanelButton;
5402	5513	cButton unselectButton;
5403	5514
	5515	+ cButton restoreCameraButton;
	5516	+
5404	5517	cButton minButton;
5405	5518	cButton maxButton;
5406	5519	cButton fullButton;
5407		- cButton undoButton;
5408		- cButton redoButton;
5409	5520	cButton saveButton;
5410	5521	cButton oneStepButton;
5411	5522
5412	5523	cButton groupButton;
5413	5524	cButton ungroupButton;
5414	5525	cButton compositeButton;
	5526	+ cButton switchButton;
	5527	+ cButton loopButton;
	5528	+ cButton textureButton;
5415	5529
5416	5530	cButton gridButton;
5417	5531	cButton boxButton;
..	..	@@ -5444,7 +5558,7 @@
5444	5558	//JTree jTree;
5445	5559	private MenuItem lookAtItem;
5446	5560	private MenuItem lookFromItem;
5447		- private MenuItem switchItem;
	5561	+ private MenuItem switchViewItem;
5448	5562	private MenuItem cutItem;
5449	5563	private MenuItem undoItem;
5450	5564	private MenuItem redoItem;
..	..	@@ -5536,7 +5650,7 @@
5536	5650	private MenuItem frontItem;
5537	5651	private MenuItem cameraItem;
5538	5652	private MenuItem compositeItem;
5539		- private MenuItem randomItem;
	5653	+ private MenuItem switchItem;
5540	5654	private MenuItem physicsItem;
5541	5655	private MenuItem frameselectorItem;
5542	5656	private MenuItem scriptNodeItem;
..	..	@@ -5610,5 +5724,5 @@
5610	5724
5611	5725	Menu cameraMenu;
5612	5726	MenuItem editCameraItem;
5613		- MenuItem revertCameraItem;
	5727	+ MenuItem restoreCameraItem;
5614	5728	}