~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"));
..	..	@@ -382,6 +380,7 @@
382	380	shadowYItem.addActionListener(this);
383	381	shadowZItem = menu.add(new MenuItem("Shadow Blue"));
384	382	shadowZItem.addActionListener(this);
	383	+
385	384	if (Globals.ADVANCED)
386	385	{
387	386	menu.add("-");
..	..	@@ -582,53 +581,66 @@
582	581	oe.radioPanel.add(dummyButton);
583	582	oe.buttonGroup.add(dummyButton);
584	583	*/
	584	+ cGridBag copyOptionsPanel = new cGridBag();
	585	+
	586	+ copyOptionsPanel.preferredHeight = 1;
	587	+
585	588	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
586	589
587	590	//oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
588	591	//minButton.setToolTipText("Minimize window");
589	592	//minButton.addActionListener(this);
590	593
591		- oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
592		- maxButton.setToolTipText("Maximize window");
593		- maxButton.addActionListener(this);
	594	+ if (Globals.ADVANCED)
	595	+ {
	596	+ oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	597	+ maxButton.setToolTipText("Maximize window");
	598	+ maxButton.addActionListener(this);
	599	+ }
594	600
595	601	oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
596	602	fullButton.setToolTipText("Full-screen window");
597	603	fullButton.addActionListener(this);
598	604
599		- oe.toolboxPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	605	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	606	+ screenfitButton.setToolTipText("Screen fit");
	607	+ screenfitButton.addActionListener(this);
	608	+
	609	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	610	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	611	+ restoreCameraButton.addActionListener(this);
	612	+
	613	+ copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
600	614	undoButton.setToolTipText("Undo changes");
601	615	undoButton.addActionListener(this);
	616	+ undoButton.setEnabled(false);
602	617
603		- oe.toolboxPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	618	+ copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
604	619	redoButton.setToolTipText("Redo changes");
605	620	redoButton.addActionListener(this);
	621	+ redoButton.setEnabled(false);
606	622
607		- oe.toolboxPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	623	+ copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
608	624	saveButton.setToolTipText("Save changes");
609	625	saveButton.addActionListener(this);
610	626
611		- oe.toolboxPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	627	+ copyOptionsPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
612	628	liveCB.setToolTipText("Enable animation");
613	629	liveCB.addItemListener(this);
614	630
615		- oe.toolboxPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	631	+ copyOptionsPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
616	632	oneStepButton.setToolTipText("Animate one step forward");
617	633	oneStepButton.addActionListener(this);
618	634
619		- oe.toolboxPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
	635	+ copyOptionsPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
620	636	fastCB.setToolTipText("Fast mode");
621	637	fastCB.addItemListener(this);
622	638
623		- oe.toolboxPanel.Return();
	639	+ //oe.toolboxPanel.Return();
624	640
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);
630		- screenfitButton.setToolTipText("Screen fit");
631		- screenfitButton.addActionListener(this);
	641	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	642	+// trackCB.setToolTipText("Enable tracking");
	643	+// trackCB.addItemListener(this);
632	644
633	645	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
634	646	// screenfitpointButton.addActionListener(this);
..	..	@@ -640,10 +652,6 @@
640	652	snapobjectButton.setToolTipText("Snap Object");
641	653	}
642	654
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	655	//oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
648	656
649	657	oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..	..	@@ -688,8 +696,6 @@
688	696	sphereButton.setToolTipText("Create sphere");
689	697	sphereButton.addActionListener(this);
690	698
691		- oe.toolboxPanel.Return();
692		-
693	699	oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
694	700	coneButton.setToolTipText("Create cone");
695	701	coneButton.addActionListener(this);
..	..	@@ -713,6 +719,28 @@
713	719	particlesButton.setToolTipText("Create particle system");
714	720	particlesButton.addActionListener(this);
715	721
	722	+ oe.toolboxPanel.Return();
	723	+
	724	+ oe.toolboxPanel.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	725	+ groupButton.setToolTipText("Create group");
	726	+ groupButton.addActionListener(this);
	727	+
	728	+ oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	729	+ compositeButton.setToolTipText("Create composite");
	730	+ compositeButton.addActionListener(this);
	731	+
	732	+ oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	733	+ switchButton.setToolTipText("Create item switcher");
	734	+ switchButton.addActionListener(this);
	735	+
	736	+ oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	737	+ loopButton.setToolTipText("Create loop");
	738	+ loopButton.addActionListener(this);
	739	+
	740	+ oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	741	+ textureButton.setToolTipText("Create texture");
	742	+ textureButton.addActionListener(this);
	743	+
716	744	oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
717	745	overlayButton.setToolTipText("Create overlay");
718	746	overlayButton.addActionListener(this);
..	..	@@ -721,17 +749,29 @@
721	749	lightButton.setToolTipText("Create light");
722	750	lightButton.addActionListener(this);
723	751
	752	+ for (int i=6; --i>=0;)
	753	+ {
	754	+ oe.toolboxPanel.Return();
	755	+ oe.toolboxPanel.add(new cGridBag());
	756	+ oe.toolboxPanel.add(new cGridBag());
	757	+ oe.toolboxPanel.add(new cGridBag());
	758	+ oe.toolboxPanel.add(new cGridBag());
	759	+ oe.toolboxPanel.add(new cGridBag());
	760	+ oe.toolboxPanel.add(new cGridBag());
	761	+ oe.toolboxPanel.add(new cGridBag());
	762	+ }
	763	+
724	764	// EDIT panel
725		- editCommandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
726		- editButton.setToolTipText("Edit selection");
	765	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	766	+ editButton.setToolTipText("Pin selection controls");
727	767	editButton.addActionListener(this);
728	768
729		- editCommandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
730		- uneditButton.setToolTipText("Unedit selection");
	769	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	770	+ uneditButton.setToolTipText("Remove selection controls");
731	771	uneditButton.addActionListener(this);
732	772
733	773	editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
734		- allParamsButton.setToolTipText("Edit all params");
	774	+ allParamsButton.setToolTipText("Show all controle");
735	775	allParamsButton.addActionListener(this);
736	776
737	777	editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..	..	@@ -742,8 +782,13 @@
742	782	unselectButton.setToolTipText("Unselect");
743	783	unselectButton.addActionListener(this);
744	784
	785	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	786	+ flashSelectionButton.setToolTipText("Highlight selection");
	787	+ flashSelectionButton.addActionListener(this);
	788	+
745	789	editCommandsPanel.preferredHeight = 1;
746	790
	791	+ SetPinStates(false);
747	792	// oe.treePanel.add(commandsPanel);
748	793	// oe.treePanel.Return();
749	794
..	..	@@ -768,21 +813,6 @@
768	813	oe.treePanel.add(jSPPanel);
769	814	oe.treePanel.Return();
770	815
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	816	oe.treePanel.add(copyOptionsPanel);
787	817	oe.treePanel.Return();
788	818
..	..	@@ -813,23 +843,43 @@
813	843
814	844	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
815	845	{
	846	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	847	+ colorCB.setToolTipText("Copy color when dropped");
	848	+ colorCB.addItemListener(this);
	849	+
	850	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	851	+ materialCB.setToolTipText("Copy material when dropped");
	852	+ materialCB.addItemListener(this);
	853	+
	854	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	855	+ textureCB.setToolTipText("Copy texture when dropped");
	856	+ textureCB.addItemListener(this);
	857	+
	858	+ panel.Return();
	859	+
816	860	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
817	861	boxCB.setToolTipText("Display bounding boxes");
818	862	boxCB.addItemListener(this);
819	863
820	864	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
821		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	865	+ zoomBoxCB.setToolTipText("Display only for wheel");
822	866	zoomBoxCB.addItemListener(this);
823	867
824	868	if (true) // Globals.ADVANCED)
825	869	{
826		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
827		- supportCB.setToolTipText("Enable rigging");
828		- supportCB.addItemListener(this);
	870	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	871	+// supportCB.setToolTipText("Enable rigging");
	872	+// supportCB.addItemListener(this);
	873	+
	874	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	875	+ freezeCB.setToolTipText("Fast moving camera");
	876	+ freezeCB.addItemListener(this);
829	877
830	878	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
831	879	// localCB.addItemListener(this);
832	880
	881	+ panel.Return();
	882	+
833	883	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
834	884	crowdCB.setToolTipText("Used for crowds");
835	885	crowdCB.addItemListener(this);
..	..	@@ -846,6 +896,8 @@
846	896	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
847	897	// speakerMocapCB.addItemListener(this);
848	898
	899	+ panel.Return();
	900	+
849	901	if (false)
850	902	{
851	903	// handled in scripts
..	..	@@ -860,24 +912,39 @@
860	912	//constraints.gridy += 1;
861	913	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
862	914	smoothfocusCB.addItemListener(this);
	915	+ panel.Return();
863	916	}
864	917
865	918	//constraints.gridx += 1;
866	919	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
867	920	// debugCB.addItemListener(this);
868	921
	922	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	923	+ trackCB.setToolTipText("Enable tracking target");
	924	+ trackCB.addItemListener(this);
	925	+
869	926	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
870		- oeilCB.setToolTipText("Move camera when tracking target");
	927	+ oeilCB.setToolTipText("Move camera when tracking");
871	928	oeilCB.addItemListener(this);
872	929
873	930	panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
874		- shadowCB.setToolTipText("Compute shadows when live");
	931	+ shadowCB.setToolTipText("When live compute shadows");
875	932	shadowCB.addItemListener(this);
876	933
	934	+ panel.Return();
	935	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	936	+ toggleTextureCB.setToolTipText("Load textures");
	937	+ toggleTextureCB.addItemListener(this);
	938	+
	939	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	940	+ toggleSwitchCB.setToolTipText("Choose a single item");
	941	+ toggleSwitchCB.addItemListener(this);
	942	+
877	943	panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
878		- autosaveCB.setToolTipText("Auto-save on structure change");
	944	+ autosaveCB.setToolTipText("On structure change");
879	945	autosaveCB.addItemListener(this);
880	946
	947	+ panel.Return();
881	948	if (Globals.ADVANCED)
882	949	{
883	950	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
..	..	@@ -888,10 +955,15 @@
888	955	}
889	956
890	957	cGridBag fill = new cGridBag();
891		-
892	958	fill.preferredHeight = 200;
	959	+ cGridBag fill2 = new cGridBag();
	960	+ fill2.preferredHeight = 200;
	961	+ cGridBag fill3 = new cGridBag();
	962	+ fill3.preferredHeight = 200;
893	963
894	964	panel.add(fill);
	965	+ panel.add(fill2);
	966	+ panel.add(fill3);
895	967
896	968	}
897	969
..	..	@@ -936,7 +1008,9 @@
936	1008	cCheckBox slowCB;
937	1009	cCheckBox boxCB;
938	1010	cCheckBox zoomBoxCB;
939		- cToggleButton trackCB;
	1011	+ cCheckBox freezeCB;
	1012	+ //cToggleButton trackCB;
	1013	+ cCheckBox trackCB;
940	1014	cCheckBox smoothfocusCB;
941	1015	// JCheckBox speakerMocapCB;
942	1016	cCheckBox speakerCameraCB;
..	..	@@ -1053,6 +1127,10 @@
1053	1127	{
1054	1128	Globals.COMPUTESHADOWWHENLIVE ^= true;
1055	1129	}
	1130	+ else if(e.getSource() == freezeCB)
	1131	+ {
	1132	+ Globals.FREEZEONMOVE ^= true;
	1133	+ }
1056	1134	else if(e.getSource() == autosaveCB)
1057	1135	{
1058	1136	Globals.SAVEONMAKE ^= true;
..	..	@@ -1137,8 +1215,6 @@
1137	1215	}
1138	1216	}
1139	1217
1140		- String string = (String) object;
1141		-
1142	1218	System.out.println("Transfer = " + object + "; drop : " + target);
1143	1219	// if( object instanceof java.io.File[])
1144	1220	// {
..	..	@@ -1146,6 +1222,8 @@
1146	1222	// objEditor.DropFile((java.io.File[]) object, true);
1147	1223	// return;
1148	1224	// }
	1225	+
	1226	+ String string = (String) object;
1149	1227
1150	1228	// File path for Mac and Windows
1151	1229	if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
..	..	@@ -1191,13 +1269,23 @@
1191	1269
1192	1270	assert target == objEditor.jTree;
1193	1271	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1272	+ Object3D destinationLeaf;
1194	1273	try {
1195		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1274	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
1196	1275	} catch (Exception e) {
1197	1276	System.out.println("destinationPath : " + destinationPath);
1198	1277	return;
1199	1278	}
1200	1279
	1280	+ for (int i=group.selection.size(); --i>=0;)
	1281	+ {
	1282	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1283	+
	1284	+ // Cannot move into itself
	1285	+ if (child == destinationLeaf)
	1286	+ return;
	1287	+ }
	1288	+
1201	1289	// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
1202	1290	// {
1203	1291	loadClipboard(true);
..	..	@@ -1312,22 +1400,30 @@
1312	1400	{
1313	1401	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1314	1402	//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);
	1403	+// gridItem = menu.add(new MenuItem("Grid"));
	1404	+// gridItem.addActionListener(this);
	1405	+// rectoidItem = menu.add(new MenuItem("Box"));
	1406	+// rectoidItem.addActionListener(this);
	1407	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1408	+// ellipsoidItem.addActionListener(this);
	1409	+// coneItem = menu.add(new MenuItem("Cone"));
	1410	+// coneItem.addActionListener(this);
	1411	+// torusItem = menu.add(new MenuItem("Torus"));
	1412	+// torusItem.addActionListener(this);
	1413	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1414	+// superItem.addActionListener(this);
	1415	+
	1416	+ cameraItem = menu.add(new MenuItem("Camera"));
	1417	+ cameraItem.addActionListener(this);
	1418	+
	1419	+ if (!Globals.ADVANCED)
	1420	+ {
1327	1421	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1328	1422	kleinItem.addActionListener(this);
1329		- particleItem = menu.add(new MenuItem("Particle system"));
1330		- particleItem.addActionListener(this);
	1423	+ }
	1424	+
	1425	+// particleItem = menu.add(new MenuItem("Particle system"));
	1426	+// particleItem.addActionListener(this);
1331	1427	if (Globals.ADVANCED)
1332	1428	{
1333	1429	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1353,15 +1449,15 @@
1353	1449	}
1354	1450	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1355	1451	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);
	1452	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1453	+// overlayItem.addActionListener(this);
	1454	+// lightItem = menu.add(new MenuItem("Light"));
	1455	+// lightItem.addActionListener(this);
1360	1456	menu.add("-");
1361	1457	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1362	1458	//superLoopItem.addActionListener(this);
1363		- loopItem = menu.add(new MenuItem("Loop"));
1364		- loopItem.addActionListener(this);
	1459	+// loopItem = menu.add(new MenuItem("Loop"));
	1460	+// loopItem.addActionListener(this);
1365	1461	doubleItem = menu.add(new MenuItem("Fork"));
1366	1462	doubleItem.addActionListener(this);
1367	1463	if (Globals.ADVANCED)
..	..	@@ -1376,6 +1472,9 @@
1376	1472	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1377	1473	animationItem.addItemListener(this);
1378	1474	animationItem.setState(Globals.ANIMATION);
	1475	+
	1476	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1477	+ archiveItem.addActionListener(this);
1379	1478
1380	1479	menu.add("-");
1381	1480	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
..	..	@@ -1546,6 +1645,20 @@
1546	1645
1547	1646	makeSomething(shadow);
1548	1647	}
	1648	+
	1649	+ private void ClearUnpinned()
	1650	+ {
	1651	+ //for (Object3D obj : listUI)
	1652	+ for (int i=listUI.size(); --i>=0;)
	1653	+ {
	1654	+ Object3D obj = listUI.elementAt(i);
	1655	+ if (!obj.pinned)
	1656	+ {
	1657	+ obj.CloseUI();
	1658	+ listUI.remove(i);
	1659	+ }
	1660	+ }
	1661	+ }
1549	1662
1550	1663	/**
1551	1664	* applyExample
..	..	@@ -1790,7 +1903,7 @@
1790	1903	{
1791	1904	ScreenFit();
1792	1905	} else
1793		- if (source == switchItem)
	1906	+ if (source == switchViewItem)
1794	1907	{
1795	1908	cVector v1 = new cVector();
1796	1909	cVector v2 = new cVector();
..	..	@@ -2020,30 +2133,30 @@
2020	2133
2021	2134	group(g);
2022	2135	} else
2023		- if (source == loopItem)
	2136	+ if (source == loopItem \|\| source == loopButton)
2024	2137	{
2025	2138	Composite csg = new GroupLeaf();
2026	2139	csg.count = 5;
2027	2140	group(csg);
2028		- Composite child = new cGroup();
	2141	+ Composite child = new cGroup("Branch");
2029	2142	csg.addChild(child);
2030	2143	child.addChild(csg);
2031	2144	} else
2032	2145	if (source == doubleItem)
2033	2146	{
2034		- Composite csg = new GroupLeaf();
	2147	+ Composite csg = new GroupLeaf("Fork");
2035	2148	csg.count = 5;
2036	2149	group(csg);
2037		- Composite child = new cGroup();
	2150	+ Composite child = new cGroup("Branch A");
2038	2151	csg.addChild(child);
2039	2152	child.addChild(csg);
2040		- child = new cGroup();
	2153	+ child = new cGroup("Branch B");
2041	2154	csg.addChild(child);
2042	2155	child.addChild(csg);
2043	2156	} else
2044	2157	if (source == tripleItem)
2045	2158	{
2046		- Composite csg = new GroupLeaf();
	2159	+ Composite csg = new GroupLeaf("Trident");
2047	2160	csg.count = 4;
2048	2161	group(csg);
2049	2162	Composite child = new cGroup();
..	..	@@ -2107,7 +2220,8 @@
2107	2220	} else
2108	2221	if (source == undoButton)
2109	2222	{
2110		- Undo();
	2223	+ if (!Undo())
	2224	+ java.awt.Toolkit.getDefaultToolkit().beep();
2111	2225	} else
2112	2226	if (source == redoButton)
2113	2227	{
..	..	@@ -2115,7 +2229,8 @@
2115	2229	} else
2116	2230	if (source == saveButton)
2117	2231	{
2118		- Save();
	2232	+ if (!Save(true))
	2233	+ java.awt.Toolkit.getDefaultToolkit().beep();
2119	2234	} else
2120	2235	if (source == oneStepButton)
2121	2236	{
..	..	@@ -2124,17 +2239,14 @@
2124	2239	} else
2125	2240	if (source == screenfitButton)
2126	2241	{
2127		- //Reload(lastConverter, lastFilename, true);
2128	2242	ScreenFit();
2129	2243	} else
2130	2244	if (source == screenfitpointButton)
2131	2245	{
2132		- //Reload(lastConverter, lastFilename, true);
2133	2246	ScreenFitPoint();
2134	2247	} else
2135	2248	if (source == snapobjectButton)
2136	2249	{
2137		- //Reload(lastConverter, lastFilename, true);
2138	2250	SnapObject();
2139	2251	} else
2140	2252	// if (event.getSource() == recompileButton)
..	..	@@ -2510,9 +2622,9 @@
2510	2622	{
2511	2623	ClearSelection(true);
2512	2624	} else
2513		- if (source == grabItem)
	2625	+ if (source == grabItem \|\| source == groupButton)
2514	2626	{
2515		- group(new cGroup(), true);
	2627	+ group(new cGroup(), false); // true);
2516	2628	} else
2517	2629	if (source == hideItem)
2518	2630	{
..	..	@@ -2530,11 +2642,11 @@
2530	2642	{
2531	2643	makeSomething(new Camera());
2532	2644	} else
2533		- if (source == compositeItem)
	2645	+ if (source == compositeItem \|\| source == compositeButton)
2534	2646	{
2535	2647	group(new Composite());
2536	2648	} else
2537		- if (source == randomItem)
	2649	+ if (source == switchItem \|\| source == switchButton)
2538	2650	{
2539	2651	RandomNode random = new RandomNode();
2540	2652	group(random);
..	..	@@ -2636,7 +2748,7 @@
2636	2748	{
2637	2749	group(new cLinker());
2638	2750	} else
2639		- if (source == textureItem)
	2751	+ if (source == textureItem \|\| source == textureButton)
2640	2752	{
2641	2753	group(new TextureNode());
2642	2754	} else
..	..	@@ -2658,15 +2770,28 @@
2658	2770	} else
2659	2771	if (source == ungroupItem \|\| source == ungroupButton)
2660	2772	{
2661		- //ungroup();
	2773	+ boolean hasRoot = false;
	2774	+
2662	2775	for (int i=0; i<group.selection.size(); i++)
2663	2776	{
2664		- Ungroup(group.selection.get(i));
	2777	+ if (group.selection.get(i) == group)
	2778	+ {
	2779	+ hasRoot = true;
	2780	+ break;
	2781	+ }
2665	2782	}
2666	2783
2667		- ClearSelection(false);
2668		-
2669		- refreshContents();
	2784	+ if (!hasRoot)
	2785	+ {
	2786	+ for (int i=0; i<group.selection.size(); i++)
	2787	+ {
	2788	+ Ungroup(group.selection.get(i));
	2789	+ }
	2790	+
	2791	+ ClearSelection(false);
	2792	+
	2793	+ refreshContents();
	2794	+ }
2670	2795	} else
2671	2796	if (source == genUVItem)
2672	2797	{
..	..	@@ -3258,6 +3383,12 @@
3258	3383	} else
3259	3384	if (source == editItem \|\| source == editButton)
3260	3385	{
	3386	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3387	+ {
	3388	+ Object3D child = (Object3D)e.nextElement();
	3389	+ child.pinned = true;
	3390	+ }
	3391	+
3261	3392	EditSelection(false);
3262	3393	} else
3263	3394	if (source == uneditButton)
..	..	@@ -3267,6 +3398,7 @@
3267	3398	Object3D child = (Object3D)e.nextElement();
3268	3399	if(child.editWindow != null)
3269	3400	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3401	+ child.pinned = false;
3270	3402	child.CloseUI();
3271	3403	listUI.remove(child);
3272	3404
..	..	@@ -3283,6 +3415,7 @@
3283	3415	//copy.ClearUI();
3284	3416	for (Object3D obj : listUI)
3285	3417	{
	3418	+ obj.pinned = false;
3286	3419	obj.CloseUI();
3287	3420	}
3288	3421	listUI.clear();
..	..	@@ -3292,7 +3425,7 @@
3292	3425	{
3293	3426	assert(copy == group);
3294	3427
3295		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3428	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3296	3429
3297	3430	for (Object3D obj : listUI)
3298	3431	{
..	..	@@ -3367,6 +3500,11 @@
3367	3500	currentLayout = sevenButton;
3368	3501	*/
3369	3502	radio.layout.doClick();
	3503	+
	3504	+ ClearUnpinned();
	3505	+ SetPinStates(group.selection.size() > 0);
	3506	+ if (group.selection.size() == 1)
	3507	+ EditSelection(false);
3370	3508	keepparent = group.parent;
3371	3509	// PARENT = NULL or not???
3372	3510	//group.parent = null; // ROOT
..	..	@@ -3380,7 +3518,7 @@
3380	3518	cameraView.ProtectCamera();
3381	3519	cameraView.repaint();
3382	3520	return;
3383		- } else if (event.getSource() == revertCameraItem)
	3521	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3384	3522	{
3385	3523	cameraView.RevertCamera();
3386	3524	cameraView.repaint();
..	..	@@ -4434,10 +4572,6 @@
4434	4572	// }
4435	4573	// }
4436	4574
4437		- static boolean allparams = true;
4438		-
4439		- static Vector<Object3D> listUI = new Vector<Object3D>();
4440		-
4441	4575	void EditSelection(boolean newWindow)
4442	4576	{
4443	4577	// aConstraints.gridy = 0;
..	..	@@ -4530,7 +4664,8 @@
4530	4664	//new Exception().printStackTrace();
4531	4665
4532	4666	freezemodel = true;
4533		-
	4667	+ ClearUnpinned();
	4668	+
4534	4669	/**/
4535	4670	//switch (event.id)
4536	4671	{
..	..	@@ -4563,7 +4698,7 @@
4563	4698	if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4564	4699	// a camera
4565	4700	{
4566		- if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	4701	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
4567	4702	{
4568	4703	CameraPane.camerachangeframe = 0; // don't refuse it
4569	4704	Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
..	..	@@ -4572,6 +4707,13 @@
4572	4707	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4573	4708	}
4574	4709
	4710	+ if (tps != null && tps.length == 1)
	4711	+ {
	4712	+ EditSelection(false);
	4713	+ }
	4714	+
	4715	+ SetPinStates(tps != null && tps.length > 0);
	4716	+
4575	4717	refreshContents();
4576	4718	//return true;
4577	4719	}
..	..	@@ -4581,9 +4723,18 @@
4581	4723	freezemodel = false;
4582	4724	}
4583	4725
	4726	+ void SetPinStates(boolean enabled)
	4727	+ {
	4728	+ editButton.setEnabled(enabled);
	4729	+ uneditButton.setEnabled(enabled);
	4730	+ unselectButton.setEnabled(enabled);
	4731	+ flashSelectionButton.setEnabled(enabled);
	4732	+ }
	4733	+
4584	4734	void refreshContents(boolean cp)
4585	4735	{
4586		- if (!Globals.MOUSEDRAGGED)
	4736	+ if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
	4737	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
4587	4738	{
4588	4739	objEditor.ClearInfo(); // .GetMaterial());
4589	4740
..	..	@@ -5401,17 +5552,17 @@
5401	5552	cButton clearpanelButton;
5402	5553	cButton unselectButton;
5403	5554
5404		- cButton minButton;
5405		- cButton maxButton;
5406		- cButton fullButton;
5407		- cButton undoButton;
5408		- cButton redoButton;
	5555	+ cButton restoreCameraButton;
	5556	+
5409	5557	cButton saveButton;
5410	5558	cButton oneStepButton;
5411	5559
5412	5560	cButton groupButton;
5413	5561	cButton ungroupButton;
5414	5562	cButton compositeButton;
	5563	+ cButton switchButton;
	5564	+ cButton loopButton;
	5565	+ cButton textureButton;
5415	5566
5416	5567	cButton gridButton;
5417	5568	cButton boxButton;
..	..	@@ -5444,7 +5595,7 @@
5444	5595	//JTree jTree;
5445	5596	private MenuItem lookAtItem;
5446	5597	private MenuItem lookFromItem;
5447		- private MenuItem switchItem;
	5598	+ private MenuItem switchViewItem;
5448	5599	private MenuItem cutItem;
5449	5600	private MenuItem undoItem;
5450	5601	private MenuItem redoItem;
..	..	@@ -5536,7 +5687,7 @@
5536	5687	private MenuItem frontItem;
5537	5688	private MenuItem cameraItem;
5538	5689	private MenuItem compositeItem;
5539		- private MenuItem randomItem;
	5690	+ private MenuItem switchItem;
5540	5691	private MenuItem physicsItem;
5541	5692	private MenuItem frameselectorItem;
5542	5693	private MenuItem scriptNodeItem;
..	..	@@ -5610,5 +5761,5 @@
5610	5761
5611	5762	Menu cameraMenu;
5612	5763	MenuItem editCameraItem;
5613		- MenuItem revertCameraItem;
	5764	+ MenuItem restoreCameraItem;
5614	5765	}