~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -150,6 +150,8 @@
150	150
151	151	void SetupMenu2(GroupEditor oe)
152	152	{
	153	+ oe.jTree = new cTree();
	154	+
153	155	Menu menu;
154	156	oe.menuBar.add(menu = new Menu("Edit"));
155	157	//editItem = menu.add(new MenuItem("Edit"));
..	..	@@ -160,7 +162,7 @@
160	162	// redoItem = menu.add(new MenuItem("Redo"));
161	163	// redoItem.addActionListener(this);
162	164	// menu.add("-");
163		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	165	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
164	166	duplicateItem.addActionListener(this);
165	167	cloneItem = menu.add(new MenuItem("Clone"));
166	168	cloneItem.addActionListener(this);
..	..	@@ -202,21 +204,21 @@
202	204	//zBufferItem.addActionListener(this);
203	205	//cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
204	206	//normalLensItem.addActionListener(this);
205		- cameraMenu.add(revertCameraItem = new MenuItem("Restore Viewpoint"));
206		- revertCameraItem.addActionListener(this);
	207	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	208	+ restoreCameraItem.addActionListener(this);
207	209
208		- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
209		- toggleFullScreenItem.addItemListener(this);
210		- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
211		- cameraMenu.add("-");
212		-
213		- cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
214		- toggleTextureItem.addItemListener(this);
215		- toggleTextureItem.setState(CameraPane.textureon);
216		-
217		- cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
218		- toggleSwitchItem.addItemListener(this);
219		- toggleSwitchItem.setState(CameraPane.SWITCH);
	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);
220	222
221	223	cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
222	224	toggleHandleItem.addItemListener(this);
..	..	@@ -273,7 +275,7 @@
273	275	{
274	276	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
275	277	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
276		- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
	278	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
277	279	editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
278	280	oe.cameraMenu.add("-");
279	281	openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
..	..	@@ -281,7 +283,7 @@
281	283	editLeafItem.addActionListener(this);
282	284	lookAtItem.addActionListener(this);
283	285	//lookFromItem.addActinoListener(this);
284		- //switchItem.addActionListener(this);
	286	+ //switchViewItem.addActionListener(this);
285	287	}
286	288
287	289	oe.menuBar.add(menu = new Menu("Setting"));
..	..	@@ -326,21 +328,29 @@
326	328	}
327	329
328	330	oe.menuBar.add(menu = new Menu("Group"));
329		- grabItem = menu.add(new MenuItem("Grab"));
330		- grabItem.addActionListener(this);
	331	+// grabItem = menu.add(new MenuItem("Grab"));
	332	+// grabItem.addActionListener(this);
331	333	backItem = menu.add(new MenuItem("Back"));
332	334	backItem.addActionListener(this);
333	335	frontItem = menu.add(new MenuItem("Front"));
334	336	frontItem.addActionListener(this);
335		- compositeItem = menu.add(new MenuItem("Composite"));
336		- compositeItem.addActionListener(this);
	337	+// compositeItem = menu.add(new MenuItem("Composite"));
	338	+// compositeItem.addActionListener(this);
	339	+
	340	+ if (Globals.ADVANCED)
	341	+ {
337	342	hideItem = menu.add(new MenuItem("Hidden Group"));
338	343	hideItem.addActionListener(this);
	344	+ }
339	345	ungroupItem = menu.add(new MenuItem("Ungroup"));
340	346	ungroupItem.addActionListener(this);
341		- menu.add("-");
342		- randomItem = menu.add(new MenuItem("Switch node"));
343		- randomItem.addActionListener(this);
	347	+
	348	+// menu.add("-");
	349	+//
	350	+// switchItem = menu.add(new MenuItem("Switch node"));
	351	+// switchItem.addActionListener(this);
	352	+ if (Globals.ADVANCED)
	353	+ {
344	354	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
345	355	switchGeoItem.addActionListener(this);
346	356	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
..	..	@@ -348,8 +358,6 @@
348	358	morphItem = menu.add(new MenuItem("Morph Group"));
349	359	morphItem.addActionListener(this);
350	360
351		- if (Globals.ADVANCED)
352		- {
353	361	menu.add("-");
354	362	physicsItem = menu.add(new MenuItem("Physics"));
355	363	physicsItem.addActionListener(this);
..	..	@@ -357,13 +365,11 @@
357	365	frameselectorItem.addActionListener(this);
358	366	scriptNodeItem = menu.add(new MenuItem("Script Node"));
359	367	scriptNodeItem.addActionListener(this);
360		- cameraItem = menu.add(new MenuItem("Camera"));
361		- cameraItem.addActionListener(this);
362	368	}
363	369
364	370	oe.menuBar.add(menu = new Menu("Object"));
365		- textureItem = menu.add(new MenuItem("Texture"));
366		- textureItem.addActionListener(this);
	371	+// textureItem = menu.add(new MenuItem("Texture"));
	372	+// textureItem.addActionListener(this);
367	373	billboardItem = menu.add(new MenuItem("Billboard"));
368	374	billboardItem.addActionListener(this);
369	375	csgItem = menu.add(new MenuItem("CSG"));
..	..	@@ -574,6 +580,10 @@
574	580	oe.radioPanel.add(dummyButton);
575	581	oe.buttonGroup.add(dummyButton);
576	582	*/
	583	+ cGridBag copyOptionsPanel = new cGridBag();
	584	+
	585	+ copyOptionsPanel.preferredHeight = 2;
	586	+
577	587	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
578	588
579	589	//oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..	..	@@ -588,37 +598,45 @@
588	598	fullButton.setToolTipText("Full-screen window");
589	599	fullButton.addActionListener(this);
590	600
591		- oe.toolbarPanel.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);
592	606	undoButton.setToolTipText("Undo changes");
593	607	undoButton.addActionListener(this);
	608	+ undoButton.setEnabled(false);
594	609
595		- oe.toolbarPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	610	+ copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
596	611	redoButton.setToolTipText("Redo changes");
597	612	redoButton.addActionListener(this);
	613	+ redoButton.setEnabled(false);
598	614
599		- oe.toolbarPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	615	+ copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
600	616	saveButton.setToolTipText("Save changes");
601	617	saveButton.addActionListener(this);
602	618
603		- oe.toolbarPanel.add(liveCB = GetCheckBox("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	619	+ copyOptionsPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
604	620	liveCB.setToolTipText("Enable animation");
605	621	liveCB.addItemListener(this);
606	622
607		- oe.toolbarPanel.add(fastCB = GetCheckBox("icons/runfast.png", CameraPane.FAST)); //, constraints);
608		- fastCB.setToolTipText("Fast mode");
609		- fastCB.addItemListener(this);
610		-
611		- oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	623	+ copyOptionsPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
612	624	oneStepButton.setToolTipText("Animate one step forward");
613	625	oneStepButton.addActionListener(this);
614	626
615		- oe.toolbarPanel.add(trackCB = GetCheckBox("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
616		- trackCB.setToolTipText("Enable tracking");
617		- trackCB.addItemListener(this);
618		-
619		- oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	627	+ copyOptionsPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
	628	+ fastCB.setToolTipText("Fast mode");
	629	+ fastCB.addItemListener(this);
	630	+
	631	+ //oe.toolboxPanel.Return();
	632	+
	633	+ copyOptionsPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
620	634	screenfitButton.setToolTipText("Screen fit");
621	635	screenfitButton.addActionListener(this);
	636	+
	637	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	638	+// trackCB.setToolTipText("Enable tracking");
	639	+// trackCB.addItemListener(this);
622	640
623	641	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
624	642	// screenfitpointButton.addActionListener(this);
..	..	@@ -630,15 +648,13 @@
630	648	snapobjectButton.setToolTipText("Snap Object");
631	649	}
632	650
633		- oe.toolbarPanel.add(flashSelectionButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
634		- flashSelectionButton.setToolTipText("Highlight selection");
635		- flashSelectionButton.addActionListener(this);
636		-
637		- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
	651	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
638	652
639	653	oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
640	654	twoButton.setToolTipText("Show center view only");
641	655	twoButton.addActionListener(this);
	656	+ this.fullscreenLayout = twoButton;
	657	+
642	658	oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
643	659	fourButton.addActionListener(this);
644	660	fourButton.setToolTipText("Show left panel only");
..	..	@@ -653,16 +669,95 @@
653	669	sevenButton.addActionListener(this);
654	670	//
655	671
656		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	672	+ oe.toolbarPanel.add(rootButton = GetButton("icons/write.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
657	673	rootButton.setToolTipText("Edit selection in new tab");
658	674	rootButton.addActionListener(this);
659	675
660		- oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	676	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
661	677	closeButton.setToolTipText("Close tab");
662	678	closeButton.addActionListener(this);
663	679	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
664	680	//clearButton.addActionListener(this);
665		-
	681	+
	682	+ // INSERT
	683	+ oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	684	+ gridButton.setToolTipText("Create grid");
	685	+ gridButton.addActionListener(this);
	686	+
	687	+ oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	688	+ boxButton.setToolTipText("Create box");
	689	+ boxButton.addActionListener(this);
	690	+
	691	+ oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	692	+ sphereButton.setToolTipText("Create sphere");
	693	+ sphereButton.addActionListener(this);
	694	+
	695	+ oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	696	+ coneButton.setToolTipText("Create cone");
	697	+ coneButton.addActionListener(this);
	698	+
	699	+ oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	700	+ torusButton.setToolTipText("Create torus");
	701	+ torusButton.addActionListener(this);
	702	+
	703	+ oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	704	+ superButton.setToolTipText("Create superellipsoid");
	705	+ superButton.addActionListener(this);
	706	+
	707	+ if (Globals.ADVANCED)
	708	+ {
	709	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	710	+ kleinButton.setToolTipText("Create Klein bottle");
	711	+ kleinButton.addActionListener(this);
	712	+ }
	713	+
	714	+ oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	715	+ particlesButton.setToolTipText("Create particle system");
	716	+ particlesButton.addActionListener(this);
	717	+
	718	+ oe.toolboxPanel.Return();
	719	+
	720	+ oe.toolboxPanel.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	721	+ groupButton.setToolTipText("Create group");
	722	+ groupButton.addActionListener(this);
	723	+
	724	+ oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	725	+ compositeButton.setToolTipText("Create composite");
	726	+ compositeButton.addActionListener(this);
	727	+
	728	+ oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	729	+ switchButton.setToolTipText("Create 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	+
	740	+ oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	741	+ overlayButton.setToolTipText("Create overlay");
	742	+ overlayButton.addActionListener(this);
	743	+
	744	+ oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	745	+ lightButton.setToolTipText("Create light");
	746	+ lightButton.addActionListener(this);
	747	+
	748	+ for (int i=6; --i>=0;)
	749	+ {
	750	+ oe.toolboxPanel.Return();
	751	+ oe.toolboxPanel.add(new cGridBag());
	752	+ oe.toolboxPanel.add(new cGridBag());
	753	+ oe.toolboxPanel.add(new cGridBag());
	754	+ oe.toolboxPanel.add(new cGridBag());
	755	+ oe.toolboxPanel.add(new cGridBag());
	756	+ oe.toolboxPanel.add(new cGridBag());
	757	+ oe.toolboxPanel.add(new cGridBag());
	758	+ }
	759	+
	760	+ // EDIT panel
666	761	editCommandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
667	762	editButton.setToolTipText("Edit selection");
668	763	editButton.addActionListener(this);
..	..	@@ -683,6 +778,10 @@
683	778	unselectButton.setToolTipText("Unselect");
684	779	unselectButton.addActionListener(this);
685	780
	781	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	782	+ flashSelectionButton.setToolTipText("Highlight selection");
	783	+ flashSelectionButton.addActionListener(this);
	784	+
686	785	editCommandsPanel.preferredHeight = 1;
687	786
688	787	// oe.treePanel.add(commandsPanel);
..	..	@@ -703,27 +802,12 @@
703	802
704	803	JScrollPane jSP;
705	804	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
706		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	805	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
707	806	ResetModel();
708	807
709	808	oe.treePanel.add(jSPPanel);
710	809	oe.treePanel.Return();
711	810
712		- cGridBag copyOptionsPanel = new cGridBag();
713		-
714		- copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
715		- colorCB.setToolTipText("Copy color when dropped");
716		- colorCB.addItemListener(this);
717		-
718		- copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
719		- materialCB.setToolTipText("Copy material when dropped");
720		- materialCB.addItemListener(this);
721		-
722		- copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
723		- textureCB.setToolTipText("Copy texture when dropped");
724		- textureCB.addItemListener(this);
725		-
726		- copyOptionsPanel.preferredHeight = 1;
727	811	oe.treePanel.add(copyOptionsPanel);
728	812	oe.treePanel.Return();
729	813
..	..	@@ -754,6 +838,20 @@
754	838
755	839	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
756	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	+
757	855	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
758	856	boxCB.setToolTipText("Display bounding boxes");
759	857	boxCB.addItemListener(this);
..	..	@@ -771,6 +869,8 @@
771	869	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
772	870	// localCB.addItemListener(this);
773	871
	872	+ panel.Return();
	873	+
774	874	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
775	875	crowdCB.setToolTipText("Used for crowds");
776	876	crowdCB.addItemListener(this);
..	..	@@ -787,6 +887,8 @@
787	887	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
788	888	// speakerMocapCB.addItemListener(this);
789	889
	890	+ panel.Return();
	891	+
790	892	if (false)
791	893	{
792	894	// handled in scripts
..	..	@@ -801,24 +903,39 @@
801	903	//constraints.gridy += 1;
802	904	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
803	905	smoothfocusCB.addItemListener(this);
	906	+ panel.Return();
804	907	}
805	908
806	909	//constraints.gridx += 1;
807	910	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
808	911	// debugCB.addItemListener(this);
809	912
	913	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	914	+ trackCB.setToolTipText("Enable tracking target");
	915	+ trackCB.addItemListener(this);
	916	+
810	917	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
811		- oeilCB.setToolTipText("Move camera when tracking target");
	918	+ oeilCB.setToolTipText("Move camera when tracking");
812	919	oeilCB.addItemListener(this);
813	920
814	921	panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
815	922	shadowCB.setToolTipText("Compute shadows when live");
816	923	shadowCB.addItemListener(this);
817	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	+
818	934	panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
819	935	autosaveCB.setToolTipText("Auto-save on structure change");
820	936	autosaveCB.addItemListener(this);
821	937
	938	+ panel.Return();
822	939	if (Globals.ADVANCED)
823	940	{
824	941	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
..	..	@@ -829,10 +946,15 @@
829	946	}
830	947
831	948	cGridBag fill = new cGridBag();
832		-
833	949	fill.preferredHeight = 200;
	950	+ cGridBag fill2 = new cGridBag();
	951	+ fill2.preferredHeight = 200;
	952	+ cGridBag fill3 = new cGridBag();
	953	+ fill3.preferredHeight = 200;
834	954
835	955	panel.add(fill);
	956	+ panel.add(fill2);
	957	+ panel.add(fill3);
836	958
837	959	}
838	960
..	..	@@ -868,15 +990,16 @@
868	990	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
869	991	}
870	992
871		- cCheckBox liveCB;
	993	+ cToggleButton liveCB;
872	994	cCheckBox supportCB;
873	995	cCheckBox localCB;
874	996	cCheckBox crowdCB;
875	997	cCheckBox smoothCB;
876		- cCheckBox fastCB;
	998	+ cToggleButton fastCB;
877	999	cCheckBox slowCB;
878	1000	cCheckBox boxCB;
879	1001	cCheckBox zoomBoxCB;
	1002	+ //cToggleButton trackCB;
880	1003	cCheckBox trackCB;
881	1004	cCheckBox smoothfocusCB;
882	1005	// JCheckBox speakerMocapCB;
..	..	@@ -1014,7 +1137,8 @@
1014	1137
1015	1138	/**/
1016	1139	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
1017		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1140	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1141	+ TreePath path = objEditor.jTree.getSelectionPath();
1018	1142	if ((path == null) \|\| (path.getPathCount() <= 1)) {
1019	1143	// We can't move the root node or an empty selection
1020	1144	return;
..	..	@@ -1131,23 +1255,33 @@
1131	1255
1132	1256	assert target == objEditor.jTree;
1133	1257	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1258	+ Object3D destinationLeaf;
1134	1259	try {
1135		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1260	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
1136	1261	} catch (Exception e) {
1137	1262	System.out.println("destinationPath : " + destinationPath);
1138	1263	return;
1139	1264	}
1140	1265
1141		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1266	+ for (int i=group.selection.size(); --i>=0;)
1142	1267	{
	1268	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1269	+
	1270	+ // Cannot move into itself
	1271	+ if (child == destinationLeaf)
	1272	+ return;
	1273	+ }
	1274	+
	1275	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1276	+// {
1143	1277	loadClipboard(true);
1144	1278	objEditor.jTree.setSelectionPath(destinationPath);
1145	1279	pasteInto(false, false);
1146		- } else {
1147		- loadClipboard(false);
1148		- objEditor.jTree.setSelectionPath(destinationPath);
1149		- pasteInto(false, false); // true); // ???
1150		- }
	1280	+// } else {
	1281	+// loadClipboard(false);
	1282	+// objEditor.jTree.setSelectionPath(destinationPath);
	1283	+// pasteInto(false, false); // true); // ???
	1284	+// }
1151	1285	}
1152	1286	public void dropActionChanged(DropTargetDragEvent dtde)
1153	1287	// Called if the user has modified the current drop gesture
..	..	@@ -1252,22 +1386,30 @@
1252	1386	{
1253	1387	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1254	1388	//heightFieldItem.addActionListener(this);
1255		- gridItem = menu.add(new MenuItem("Grid"));
1256		- gridItem.addActionListener(this);
1257		- rectoidItem = menu.add(new MenuItem("Box"));
1258		- rectoidItem.addActionListener(this);
1259		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1260		- ellipsoidItem.addActionListener(this);
1261		- coneItem = menu.add(new MenuItem("Cone"));
1262		- coneItem.addActionListener(this);
1263		- torusItem = menu.add(new MenuItem("Torus"));
1264		- torusItem.addActionListener(this);
1265		- superItem = menu.add(new MenuItem("Superellipsoid"));
1266		- 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	+ {
1267	1407	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1268	1408	kleinItem.addActionListener(this);
1269		- particleItem = menu.add(new MenuItem("Particle system"));
1270		- particleItem.addActionListener(this);
	1409	+ }
	1410	+
	1411	+// particleItem = menu.add(new MenuItem("Particle system"));
	1412	+// particleItem.addActionListener(this);
1271	1413	if (Globals.ADVANCED)
1272	1414	{
1273	1415	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1293,15 +1435,15 @@
1293	1435	}
1294	1436	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1295	1437	bezierItem.addActionListener(this);
1296		- overlayItem = menu.add(new MenuItem("Overlay"));
1297		- overlayItem.addActionListener(this);
1298		- lightItem = menu.add(new MenuItem("Light"));
1299		- 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);
1300	1442	menu.add("-");
1301	1443	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1302	1444	//superLoopItem.addActionListener(this);
1303		- loopItem = menu.add(new MenuItem("Loop"));
1304		- loopItem.addActionListener(this);
	1445	+// loopItem = menu.add(new MenuItem("Loop"));
	1446	+// loopItem.addActionListener(this);
1305	1447	doubleItem = menu.add(new MenuItem("Fork"));
1306	1448	doubleItem.addActionListener(this);
1307	1449	if (Globals.ADVANCED)
..	..	@@ -1730,7 +1872,7 @@
1730	1872	{
1731	1873	ScreenFit();
1732	1874	} else
1733		- if (source == switchItem)
	1875	+ if (source == switchViewItem)
1734	1876	{
1735	1877	cVector v1 = new cVector();
1736	1878	cVector v2 = new cVector();
..	..	@@ -1739,11 +1881,11 @@
1739	1881	objEditor.cameraView.renderCamera.setAim(v2, v1);
1740	1882	objEditor.cameraView.repaint();
1741	1883	} else
1742		- if (source == rectoidItem)
	1884	+ if (source == rectoidItem \|\| source == boxButton)
1743	1885	{
1744	1886	makeSomething(new Box());
1745	1887	} else
1746		- if (source == particleItem)
	1888	+ if (source == particleItem \|\| source == particlesButton)
1747	1889	{
1748	1890	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1749	1891	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1822,27 +1964,27 @@
1822	1964
1823	1965	makeSomething(obj);
1824	1966	} else
1825		- if (source == gridItem)
	1967	+ if (source == gridItem \|\| source == gridButton)
1826	1968	{
1827	1969	makeSomething(new Grid());
1828	1970	} else
1829		- if (source == ellipsoidItem)
	1971	+ if (source == ellipsoidItem \|\| source == sphereButton)
1830	1972	{
1831	1973	makeSomething(new Sphere());
1832	1974	} else
1833		- if (source == coneItem)
	1975	+ if (source == coneItem \|\| source == coneButton)
1834	1976	{
1835	1977	makeSomething(new Cone());
1836	1978	} else
1837		- if (source == torusItem)
	1979	+ if (source == torusItem \|\| source == torusButton)
1838	1980	{
1839	1981	makeSomething(new Torus());
1840	1982	} else
1841		- if (source == superItem)
	1983	+ if (source == superItem \|\| source == superButton)
1842	1984	{
1843	1985	makeSomething(new Superellipsoid());
1844	1986	} else
1845		- if (source == kleinItem)
	1987	+ if (source == kleinItem \|\| source == kleinButton)
1846	1988	{
1847	1989	makeSomething(new Klein());
1848	1990	} else
..	..	@@ -1862,7 +2004,7 @@
1862	2004	{
1863	2005	makeSomething(new BezierSurface());
1864	2006	} else
1865		- if (source == overlayItem)
	2007	+ if (source == overlayItem \|\| source == overlayButton)
1866	2008	{
1867	2009	/*
1868	2010	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1910,7 +2052,7 @@
1910	2052	s.setup();
1911	2053	makeSomething(s);
1912	2054	} else
1913		- if (source == lightItem)
	2055	+ if (source == lightItem \|\| source == lightButton)
1914	2056	{
1915	2057	makeSomething(new Light());
1916	2058	} else
..	..	@@ -1960,7 +2102,7 @@
1960	2102
1961	2103	group(g);
1962	2104	} else
1963		- if (source == loopItem)
	2105	+ if (source == loopItem \|\| source == loopButton)
1964	2106	{
1965	2107	Composite csg = new GroupLeaf();
1966	2108	csg.count = 5;
..	..	@@ -2450,9 +2592,9 @@
2450	2592	{
2451	2593	ClearSelection(true);
2452	2594	} else
2453		- if (source == grabItem)
	2595	+ if (source == grabItem \|\| source == groupButton)
2454	2596	{
2455		- group(new cGroup(), true);
	2597	+ group(new cGroup(), false); // true);
2456	2598	} else
2457	2599	if (source == hideItem)
2458	2600	{
..	..	@@ -2470,11 +2612,11 @@
2470	2612	{
2471	2613	makeSomething(new Camera());
2472	2614	} else
2473		- if (source == compositeItem)
	2615	+ if (source == compositeItem \|\| source == compositeButton)
2474	2616	{
2475	2617	group(new Composite());
2476	2618	} else
2477		- if (source == randomItem)
	2619	+ if (source == switchItem \|\| source == switchButton)
2478	2620	{
2479	2621	RandomNode random = new RandomNode();
2480	2622	group(random);
..	..	@@ -2576,7 +2718,7 @@
2576	2718	{
2577	2719	group(new cLinker());
2578	2720	} else
2579		- if (source == textureItem)
	2721	+ if (source == textureItem \|\| source == textureButton)
2580	2722	{
2581	2723	group(new TextureNode());
2582	2724	} else
..	..	@@ -2596,7 +2738,7 @@
2596	2738	{
2597	2739	CastShadow(2);
2598	2740	} else
2599		- if (source == ungroupItem)
	2741	+ if (source == ungroupItem \|\| source == ungroupButton)
2600	2742	{
2601	2743	//ungroup();
2602	2744	for (int i=0; i<group.selection.size(); i++)
..	..	@@ -2934,6 +3076,10 @@
2934	3076	if (source == twoButton)
2935	3077	{
2936	3078	radio.layout = twoButton;
	3079	+
	3080	+ if (CameraPane.FULLSCREEN)
	3081	+ fullscreenLayout = radio.layout;
	3082	+
2937	3083	// bug
2938	3084	//gridPanel.setDividerLocation(1.0);
2939	3085	//bigPanel.setDividerLocation(0.0);
..	..	@@ -2989,6 +3135,9 @@
2989	3135	{
2990	3136	radio.layout = threeButton;
2991	3137
	3138	+ if (CameraPane.FULLSCREEN)
	3139	+ fullscreenLayout = radio.layout;
	3140	+
2992	3141	// bigThree.remove(scenePanel);
2993	3142	// bigThree.remove(centralPanel);
2994	3143	// bigThree.remove(XYZPanel);
..	..	@@ -3027,6 +3176,9 @@
3027	3176	{
3028	3177	radio.layout = fourButton;
3029	3178
	3179	+ if (CameraPane.FULLSCREEN)
	3180	+ fullscreenLayout = radio.layout;
	3181	+
3030	3182	// bigThree.remove(scenePanel);
3031	3183	// bigThree.remove(centralPanel);
3032	3184	// bigThree.remove(XYZPanel);
..	..	@@ -3063,6 +3215,9 @@
3063	3215	if (source == sixButton)
3064	3216	{
3065	3217	radio.layout = sixButton;
	3218	+
	3219	+ if (CameraPane.FULLSCREEN)
	3220	+ fullscreenLayout = radio.layout;
3066	3221
3067	3222	// bigThree.remove(scenePanel);
3068	3223	// bigThree.remove(centralPanel);
..	..	@@ -3101,6 +3256,9 @@
3101	3256	if (source == sevenButton)
3102	3257	{
3103	3258	radio.layout = sevenButton;
	3259	+
	3260	+ if (CameraPane.FULLSCREEN)
	3261	+ fullscreenLayout = radio.layout;
3104	3262
3105	3263	// bigThree.remove(scenePanel);
3106	3264	// bigThree.remove(centralPanel);
..	..	@@ -3182,6 +3340,12 @@
3182	3340	} else
3183	3341	if (source == editItem \|\| source == editButton)
3184	3342	{
	3343	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3344	+ {
	3345	+ Object3D child = (Object3D)e.nextElement();
	3346	+ child.pinned = true;
	3347	+ }
	3348	+
3185	3349	EditSelection(false);
3186	3350	} else
3187	3351	if (source == uneditButton)
..	..	@@ -3191,6 +3355,7 @@
3191	3355	Object3D child = (Object3D)e.nextElement();
3192	3356	if(child.editWindow != null)
3193	3357	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3358	+ child.pinned = false;
3194	3359	child.CloseUI();
3195	3360	listUI.remove(child);
3196	3361
..	..	@@ -3207,6 +3372,7 @@
3207	3372	//copy.ClearUI();
3208	3373	for (Object3D obj : listUI)
3209	3374	{
	3375	+ obj.pinned = true;
3210	3376	obj.CloseUI();
3211	3377	}
3212	3378	listUI.clear();
..	..	@@ -3216,7 +3382,7 @@
3216	3382	{
3217	3383	assert(copy == group);
3218	3384
3219		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3385	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3220	3386
3221	3387	for (Object3D obj : listUI)
3222	3388	{
..	..	@@ -3304,7 +3470,7 @@
3304	3470	cameraView.ProtectCamera();
3305	3471	cameraView.repaint();
3306	3472	return;
3307		- } else if (event.getSource() == revertCameraItem)
	3473	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3308	3474	{
3309	3475	cameraView.RevertCamera();
3310	3476	cameraView.repaint();
..	..	@@ -4358,10 +4524,6 @@
4358	4524	// }
4359	4525	// }
4360	4526
4361		- static boolean allparams = true;
4362		-
4363		- static Vector<Object3D> listUI = new Vector<Object3D>();
4364		-
4365	4527	void EditSelection(boolean newWindow)
4366	4528	{
4367	4529	// aConstraints.gridy = 0;
..	..	@@ -4369,7 +4531,7 @@
4369	4531	{
4370	4532	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4371	4533	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4372		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4534	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4373	4535
4374	4536	Object3D elem = (Object3D)group.selection.elementAt(i);
4375	4537	if(elem != group \|\| !newWindow)
..	..	@@ -4455,6 +4617,17 @@
4455	4617
4456	4618	freezemodel = true;
4457	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	+
4458	4631	/**/
4459	4632	//switch (event.id)
4460	4633	{
..	..	@@ -4487,7 +4660,7 @@
4487	4660	if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4488	4661	// a camera
4489	4662	{
4490		- if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	4663	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
4491	4664	{
4492	4665	CameraPane.camerachangeframe = 0; // don't refuse it
4493	4666	Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
..	..	@@ -4496,6 +4669,13 @@
4496	4669	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4497	4670	}
4498	4671
	4672	+ if (tps != null && tps.length == 1)
	4673	+ {
	4674	+ EditSelection(false);
	4675	+ }
	4676	+
	4677	+ SetPinStates(tps != null && tps.length > 0);
	4678	+
4499	4679	refreshContents();
4500	4680	//return true;
4501	4681	}
..	..	@@ -4505,9 +4685,16 @@
4505	4685	freezemodel = false;
4506	4686	}
4507	4687
	4688	+ void SetPinStates(boolean enabled)
	4689	+ {
	4690	+ editButton.setEnabled(enabled);
	4691	+ uneditButton.setEnabled(enabled);
	4692	+ }
	4693	+
4508	4694	void refreshContents(boolean cp)
4509	4695	{
4510		- if (!Globals.MOUSEDRAGGED)
	4696	+ if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
	4697	+ if (!Globals.MOUSEDRAGGED) // && !Globals.TIMERRUNNING)
4511	4698	{
4512	4699	objEditor.ClearInfo(); // .GetMaterial());
4513	4700
..	..	@@ -5325,13 +5512,31 @@
5325	5512	cButton clearpanelButton;
5326	5513	cButton unselectButton;
5327	5514
	5515	+ cButton restoreCameraButton;
	5516	+
5328	5517	cButton minButton;
5329	5518	cButton maxButton;
5330	5519	cButton fullButton;
5331		- cButton undoButton;
5332		- cButton redoButton;
5333	5520	cButton saveButton;
5334	5521	cButton oneStepButton;
	5522	+
	5523	+ cButton groupButton;
	5524	+ cButton ungroupButton;
	5525	+ cButton compositeButton;
	5526	+ cButton switchButton;
	5527	+ cButton loopButton;
	5528	+ cButton textureButton;
	5529	+
	5530	+ cButton gridButton;
	5531	+ cButton boxButton;
	5532	+ cButton sphereButton;
	5533	+ cButton coneButton;
	5534	+ cButton torusButton;
	5535	+ cButton superButton;
	5536	+ cButton kleinButton;
	5537	+ cButton particlesButton;
	5538	+ cButton overlayButton;
	5539	+ cButton lightButton;
5335	5540
5336	5541	cButton screenfitButton;
5337	5542	cButton screenfitpointButton;
..	..	@@ -5353,11 +5558,11 @@
5353	5558	//JTree jTree;
5354	5559	private MenuItem lookAtItem;
5355	5560	private MenuItem lookFromItem;
5356		- private MenuItem switchItem;
	5561	+ private MenuItem switchViewItem;
5357	5562	private MenuItem cutItem;
5358	5563	private MenuItem undoItem;
5359	5564	private MenuItem redoItem;
5360		- private MenuItem duplicateItem;
	5565	+ private JMenuItem duplicateItem;
5361	5566	private MenuItem cloneItem;
5362	5567	private MenuItem cloneSupportItem;
5363	5568	private MenuItem overwriteGeoItem;
..	..	@@ -5445,7 +5650,7 @@
5445	5650	private MenuItem frontItem;
5446	5651	private MenuItem cameraItem;
5447	5652	private MenuItem compositeItem;
5448		- private MenuItem randomItem;
	5653	+ private MenuItem switchItem;
5449	5654	private MenuItem physicsItem;
5450	5655	private MenuItem frameselectorItem;
5451	5656	private MenuItem scriptNodeItem;
..	..	@@ -5519,5 +5724,5 @@
5519	5724
5520	5725	Menu cameraMenu;
5521	5726	MenuItem editCameraItem;
5522		- MenuItem revertCameraItem;
	5727	+ MenuItem restoreCameraItem;
5523	5728	}