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