~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,51 +580,63 @@
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);
580	590	//minButton.setToolTipText("Minimize window");
581	591	//minButton.addActionListener(this);
582	592
583		- oe.toolbarPanel.add(maxButton = new cButton("\u271A", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	593	+ oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
584	594	maxButton.setToolTipText("Maximize window");
585	595	maxButton.addActionListener(this);
586	596
587		- oe.toolbarPanel.add(fullButton = new cButton("\u2b1c", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	597	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
588	598	fullButton.setToolTipText("Full-screen window");
589	599	fullButton.addActionListener(this);
590	600
591		- oe.toolbarPanel.add(undoButton = new cButton("\u21a9", !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 = new cButton("\u21aa", !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 = new cButton("\u21e3", !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 = new cCheckBox("Live", 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(oneStepButton = new cButton("\u29f4", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	623	+ copyOptionsPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
608	624	oneStepButton.setToolTipText("Animate one step forward");
609	625	oneStepButton.addActionListener(this);
610	626
611		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	627	+ copyOptionsPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
612	628	fastCB.setToolTipText("Fast mode");
613	629	fastCB.addItemListener(this);
614	630
615		- oe.toolbarPanel.add(trackCB = new cCheckBox(":", CameraPane.TRACK)); //, oe.aConstraints);
616		- trackCB.setToolTipText("Enable tracking");
617		- trackCB.addItemListener(this);
618		-
619		- oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	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 = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
634		- flashSelectionButton.setToolTipText("Show 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,26 +669,105 @@
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		-
666		- editCommandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
667		- editButton.setToolTipText("Edit selection");
	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
	761	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	762	+ editButton.setToolTipText("Pin selection controls");
668	763	editButton.addActionListener(this);
669	764
670		- editCommandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
671		- uneditButton.setToolTipText("Unedit selection");
	765	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	766	+ uneditButton.setToolTipText("Remove selection controls");
672	767	uneditButton.addActionListener(this);
673	768
674	769	editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
675		- allParamsButton.setToolTipText("Edit all params");
	770	+ allParamsButton.setToolTipText("Show all controle");
676	771	allParamsButton.addActionListener(this);
677	772
678	773	editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..	..	@@ -683,8 +778,13 @@
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
	787	+ SetPinStates(false);
688	788	// oe.treePanel.add(commandsPanel);
689	789	// oe.treePanel.Return();
690	790
..	..	@@ -703,27 +803,12 @@
703	803
704	804	JScrollPane jSP;
705	805	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
706		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	806	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
707	807	ResetModel();
708	808
709	809	oe.treePanel.add(jSPPanel);
710	810	oe.treePanel.Return();
711	811
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	812	oe.treePanel.add(copyOptionsPanel);
728	813	oe.treePanel.Return();
729	814
..	..	@@ -754,12 +839,26 @@
754	839
755	840	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
756	841	{
	842	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	843	+ colorCB.setToolTipText("Copy color when dropped");
	844	+ colorCB.addItemListener(this);
	845	+
	846	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	847	+ materialCB.setToolTipText("Copy material when dropped");
	848	+ materialCB.addItemListener(this);
	849	+
	850	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	851	+ textureCB.setToolTipText("Copy texture when dropped");
	852	+ textureCB.addItemListener(this);
	853	+
	854	+ panel.Return();
	855	+
757	856	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
758	857	boxCB.setToolTipText("Display bounding boxes");
759	858	boxCB.addItemListener(this);
760	859
761	860	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
762		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	861	+ zoomBoxCB.setToolTipText("Display only for wheel");
763	862	zoomBoxCB.addItemListener(this);
764	863
765	864	if (true) // Globals.ADVANCED)
..	..	@@ -771,6 +870,8 @@
771	870	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
772	871	// localCB.addItemListener(this);
773	872
	873	+ panel.Return();
	874	+
774	875	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
775	876	crowdCB.setToolTipText("Used for crowds");
776	877	crowdCB.addItemListener(this);
..	..	@@ -787,6 +888,8 @@
787	888	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
788	889	// speakerMocapCB.addItemListener(this);
789	890
	891	+ panel.Return();
	892	+
790	893	if (false)
791	894	{
792	895	// handled in scripts
..	..	@@ -801,32 +904,72 @@
801	904	//constraints.gridy += 1;
802	905	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
803	906	smoothfocusCB.addItemListener(this);
	907	+ panel.Return();
804	908	}
805	909
806	910	//constraints.gridx += 1;
807	911	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
808	912	// debugCB.addItemListener(this);
809	913
	914	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	915	+ trackCB.setToolTipText("Enable tracking target");
	916	+ trackCB.addItemListener(this);
	917	+
810	918	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	919	+ oeilCB.setToolTipText("Move camera when tracking");
811	920	oeilCB.addItemListener(this);
812	921
	922	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	923	+ shadowCB.setToolTipText("When live compute shadows");
	924	+ shadowCB.addItemListener(this);
	925	+
	926	+ panel.Return();
	927	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	928	+ toggleTextureCB.setToolTipText("Load textures");
	929	+ toggleTextureCB.addItemListener(this);
	930	+
	931	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	932	+ toggleSwitchCB.setToolTipText("Use switch");
	933	+ toggleSwitchCB.addItemListener(this);
	934	+
	935	+ panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
	936	+ autosaveCB.setToolTipText("On structure change");
	937	+ autosaveCB.addItemListener(this);
	938	+
	939	+ panel.Return();
	940	+ if (Globals.ADVANCED)
	941	+ {
813	942	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
814	943	lookAtCB.setToolTipText("Look-at target");
815	944	lookAtCB.addItemListener(this);
	945	+ }
816	946
817	947	}
818	948
819	949	cGridBag fill = new cGridBag();
820		-
821	950	fill.preferredHeight = 200;
	951	+ cGridBag fill2 = new cGridBag();
	952	+ fill2.preferredHeight = 200;
	953	+ cGridBag fill3 = new cGridBag();
	954	+ fill3.preferredHeight = 200;
822	955
823	956	panel.add(fill);
	957	+ panel.add(fill2);
	958	+ panel.add(fill3);
824	959
825	960	}
826	961
827	962	void EditObject(Object3D obj)
828	963	{
829	964	cRadio radioButton = new cRadio(obj.name);
	965	+
	966	+ // Patch to avoid bug with transparency.
	967	+ radioButton.hadMaterial = obj.material != null;
	968	+ if (!radioButton.hadMaterial)
	969	+ {
	970	+ obj.material = new cMaterial();
	971	+ }
	972	+
830	973	radioButton.SetObject(obj);
831	974	radioButton.layout = sevenButton;
832	975	radioButton.SetCamera(cameraView.renderCamera, false);
..	..	@@ -848,23 +991,27 @@
848	991	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
849	992	}
850	993
851		- JCheckBox liveCB;
852		- JCheckBox supportCB;
853		- JCheckBox localCB;
854		- JCheckBox crowdCB;
855		- JCheckBox smoothCB;
856		- JCheckBox fastCB;
857		- JCheckBox slowCB;
858		- JCheckBox boxCB;
859		- JCheckBox zoomBoxCB;
860		- JCheckBox trackCB;
861		- JCheckBox smoothfocusCB;
	994	+ cToggleButton liveCB;
	995	+ cCheckBox supportCB;
	996	+ cCheckBox localCB;
	997	+ cCheckBox crowdCB;
	998	+ cCheckBox smoothCB;
	999	+ cToggleButton fastCB;
	1000	+ cCheckBox slowCB;
	1001	+ cCheckBox boxCB;
	1002	+ cCheckBox zoomBoxCB;
	1003	+ //cToggleButton trackCB;
	1004	+ cCheckBox trackCB;
	1005	+ cCheckBox smoothfocusCB;
862	1006	// JCheckBox speakerMocapCB;
863		- JCheckBox speakerCameraCB;
864		- JCheckBox speakerFocusCB;
865		- JCheckBox debugCB;
866		- JCheckBox oeilCB;
867		- JCheckBox lookAtCB;
	1007	+ cCheckBox speakerCameraCB;
	1008	+ cCheckBox speakerFocusCB;
	1009	+ cCheckBox debugCB;
	1010	+
	1011	+ cCheckBox oeilCB;
	1012	+ cCheckBox shadowCB;
	1013	+ cCheckBox autosaveCB;
	1014	+ cCheckBox lookAtCB;
868	1015
869	1016	// static int COLOR = 1;
870	1017	// static int MATERIAL = 2;
..	..	@@ -872,9 +1019,9 @@
872	1019
873	1020	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
874	1021
875		- JCheckBox colorCB;
876		- JCheckBox materialCB;
877		- JCheckBox textureCB;
	1022	+ cCheckBox colorCB;
	1023	+ cCheckBox materialCB;
	1024	+ cCheckBox textureCB;
878	1025
879	1026	public void itemStateChanged(ItemEvent e)
880	1027	{
..	..	@@ -967,6 +1114,14 @@
967	1114	{
968	1115	cameraView.ToggleOeil();
969	1116	}
	1117	+ else if(e.getSource() == shadowCB)
	1118	+ {
	1119	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1120	+ }
	1121	+ else if(e.getSource() == autosaveCB)
	1122	+ {
	1123	+ Globals.SAVEONMAKE ^= true;
	1124	+ }
970	1125	else if(e.getSource() == lookAtCB)
971	1126	{
972	1127	cameraView.ToggleLookAt();
..	..	@@ -983,7 +1138,8 @@
983	1138
984	1139	/**/
985	1140	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
986		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1141	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1142	+ TreePath path = objEditor.jTree.getSelectionPath();
987	1143	if ((path == null) \|\| (path.getPathCount() <= 1)) {
988	1144	// We can't move the root node or an empty selection
989	1145	return;
..	..	@@ -1100,23 +1256,33 @@
1100	1256
1101	1257	assert target == objEditor.jTree;
1102	1258	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1259	+ Object3D destinationLeaf;
1103	1260	try {
1104		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1261	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
1105	1262	} catch (Exception e) {
1106	1263	System.out.println("destinationPath : " + destinationPath);
1107	1264	return;
1108	1265	}
1109	1266
1110		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1267	+ for (int i=group.selection.size(); --i>=0;)
1111	1268	{
	1269	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1270	+
	1271	+ // Cannot move into itself
	1272	+ if (child == destinationLeaf)
	1273	+ return;
	1274	+ }
	1275	+
	1276	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1277	+// {
1112	1278	loadClipboard(true);
1113	1279	objEditor.jTree.setSelectionPath(destinationPath);
1114	1280	pasteInto(false, false);
1115		- } else {
1116		- loadClipboard(false);
1117		- objEditor.jTree.setSelectionPath(destinationPath);
1118		- pasteInto(false, false); // true); // ???
1119		- }
	1281	+// } else {
	1282	+// loadClipboard(false);
	1283	+// objEditor.jTree.setSelectionPath(destinationPath);
	1284	+// pasteInto(false, false); // true); // ???
	1285	+// }
1120	1286	}
1121	1287	public void dropActionChanged(DropTargetDragEvent dtde)
1122	1288	// Called if the user has modified the current drop gesture
..	..	@@ -1221,22 +1387,30 @@
1221	1387	{
1222	1388	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1223	1389	//heightFieldItem.addActionListener(this);
1224		- gridItem = menu.add(new MenuItem("Grid"));
1225		- gridItem.addActionListener(this);
1226		- rectoidItem = menu.add(new MenuItem("Box"));
1227		- rectoidItem.addActionListener(this);
1228		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1229		- ellipsoidItem.addActionListener(this);
1230		- coneItem = menu.add(new MenuItem("Cone"));
1231		- coneItem.addActionListener(this);
1232		- torusItem = menu.add(new MenuItem("Torus"));
1233		- torusItem.addActionListener(this);
1234		- superItem = menu.add(new MenuItem("Superellipsoid"));
1235		- superItem.addActionListener(this);
	1390	+// gridItem = menu.add(new MenuItem("Grid"));
	1391	+// gridItem.addActionListener(this);
	1392	+// rectoidItem = menu.add(new MenuItem("Box"));
	1393	+// rectoidItem.addActionListener(this);
	1394	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1395	+// ellipsoidItem.addActionListener(this);
	1396	+// coneItem = menu.add(new MenuItem("Cone"));
	1397	+// coneItem.addActionListener(this);
	1398	+// torusItem = menu.add(new MenuItem("Torus"));
	1399	+// torusItem.addActionListener(this);
	1400	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1401	+// superItem.addActionListener(this);
	1402	+
	1403	+ cameraItem = menu.add(new MenuItem("Camera"));
	1404	+ cameraItem.addActionListener(this);
	1405	+
	1406	+ if (!Globals.ADVANCED)
	1407	+ {
1236	1408	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1237	1409	kleinItem.addActionListener(this);
1238		- particleItem = menu.add(new MenuItem("Particle system"));
1239		- particleItem.addActionListener(this);
	1410	+ }
	1411	+
	1412	+// particleItem = menu.add(new MenuItem("Particle system"));
	1413	+// particleItem.addActionListener(this);
1240	1414	if (Globals.ADVANCED)
1241	1415	{
1242	1416	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1262,15 +1436,15 @@
1262	1436	}
1263	1437	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1264	1438	bezierItem.addActionListener(this);
1265		- overlayItem = menu.add(new MenuItem("Overlay"));
1266		- overlayItem.addActionListener(this);
1267		- lightItem = menu.add(new MenuItem("Light"));
1268		- lightItem.addActionListener(this);
	1439	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1440	+// overlayItem.addActionListener(this);
	1441	+// lightItem = menu.add(new MenuItem("Light"));
	1442	+// lightItem.addActionListener(this);
1269	1443	menu.add("-");
1270	1444	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1271	1445	//superLoopItem.addActionListener(this);
1272		- loopItem = menu.add(new MenuItem("Loop"));
1273		- loopItem.addActionListener(this);
	1446	+// loopItem = menu.add(new MenuItem("Loop"));
	1447	+// loopItem.addActionListener(this);
1274	1448	doubleItem = menu.add(new MenuItem("Fork"));
1275	1449	doubleItem.addActionListener(this);
1276	1450	if (Globals.ADVANCED)
..	..	@@ -1455,6 +1629,20 @@
1455	1629
1456	1630	makeSomething(shadow);
1457	1631	}
	1632	+
	1633	+ private void ClearUnpinned()
	1634	+ {
	1635	+ //for (Object3D obj : listUI)
	1636	+ for (int i=listUI.size(); --i>=0;)
	1637	+ {
	1638	+ Object3D obj = listUI.elementAt(i);
	1639	+ if (!obj.pinned)
	1640	+ {
	1641	+ obj.CloseUI();
	1642	+ listUI.remove(i);
	1643	+ }
	1644	+ }
	1645	+ }
1458	1646
1459	1647	/**
1460	1648	* applyExample
..	..	@@ -1699,7 +1887,7 @@
1699	1887	{
1700	1888	ScreenFit();
1701	1889	} else
1702		- if (source == switchItem)
	1890	+ if (source == switchViewItem)
1703	1891	{
1704	1892	cVector v1 = new cVector();
1705	1893	cVector v2 = new cVector();
..	..	@@ -1708,11 +1896,11 @@
1708	1896	objEditor.cameraView.renderCamera.setAim(v2, v1);
1709	1897	objEditor.cameraView.repaint();
1710	1898	} else
1711		- if (source == rectoidItem)
	1899	+ if (source == rectoidItem \|\| source == boxButton)
1712	1900	{
1713	1901	makeSomething(new Box());
1714	1902	} else
1715		- if (source == particleItem)
	1903	+ if (source == particleItem \|\| source == particlesButton)
1716	1904	{
1717	1905	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1718	1906	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1791,27 +1979,27 @@
1791	1979
1792	1980	makeSomething(obj);
1793	1981	} else
1794		- if (source == gridItem)
	1982	+ if (source == gridItem \|\| source == gridButton)
1795	1983	{
1796	1984	makeSomething(new Grid());
1797	1985	} else
1798		- if (source == ellipsoidItem)
	1986	+ if (source == ellipsoidItem \|\| source == sphereButton)
1799	1987	{
1800	1988	makeSomething(new Sphere());
1801	1989	} else
1802		- if (source == coneItem)
	1990	+ if (source == coneItem \|\| source == coneButton)
1803	1991	{
1804	1992	makeSomething(new Cone());
1805	1993	} else
1806		- if (source == torusItem)
	1994	+ if (source == torusItem \|\| source == torusButton)
1807	1995	{
1808	1996	makeSomething(new Torus());
1809	1997	} else
1810		- if (source == superItem)
	1998	+ if (source == superItem \|\| source == superButton)
1811	1999	{
1812	2000	makeSomething(new Superellipsoid());
1813	2001	} else
1814		- if (source == kleinItem)
	2002	+ if (source == kleinItem \|\| source == kleinButton)
1815	2003	{
1816	2004	makeSomething(new Klein());
1817	2005	} else
..	..	@@ -1831,7 +2019,7 @@
1831	2019	{
1832	2020	makeSomething(new BezierSurface());
1833	2021	} else
1834		- if (source == overlayItem)
	2022	+ if (source == overlayItem \|\| source == overlayButton)
1835	2023	{
1836	2024	/*
1837	2025	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1879,7 +2067,7 @@
1879	2067	s.setup();
1880	2068	makeSomething(s);
1881	2069	} else
1882		- if (source == lightItem)
	2070	+ if (source == lightItem \|\| source == lightButton)
1883	2071	{
1884	2072	makeSomething(new Light());
1885	2073	} else
..	..	@@ -1929,7 +2117,7 @@
1929	2117
1930	2118	group(g);
1931	2119	} else
1932		- if (source == loopItem)
	2120	+ if (source == loopItem \|\| source == loopButton)
1933	2121	{
1934	2122	Composite csg = new GroupLeaf();
1935	2123	csg.count = 5;
..	..	@@ -2419,9 +2607,9 @@
2419	2607	{
2420	2608	ClearSelection(true);
2421	2609	} else
2422		- if (source == grabItem)
	2610	+ if (source == grabItem \|\| source == groupButton)
2423	2611	{
2424		- group(new cGroup(), true);
	2612	+ group(new cGroup(), false); // true);
2425	2613	} else
2426	2614	if (source == hideItem)
2427	2615	{
..	..	@@ -2439,11 +2627,11 @@
2439	2627	{
2440	2628	makeSomething(new Camera());
2441	2629	} else
2442		- if (source == compositeItem)
	2630	+ if (source == compositeItem \|\| source == compositeButton)
2443	2631	{
2444	2632	group(new Composite());
2445	2633	} else
2446		- if (source == randomItem)
	2634	+ if (source == switchItem \|\| source == switchButton)
2447	2635	{
2448	2636	RandomNode random = new RandomNode();
2449	2637	group(random);
..	..	@@ -2545,7 +2733,7 @@
2545	2733	{
2546	2734	group(new cLinker());
2547	2735	} else
2548		- if (source == textureItem)
	2736	+ if (source == textureItem \|\| source == textureButton)
2549	2737	{
2550	2738	group(new TextureNode());
2551	2739	} else
..	..	@@ -2565,7 +2753,7 @@
2565	2753	{
2566	2754	CastShadow(2);
2567	2755	} else
2568		- if (source == ungroupItem)
	2756	+ if (source == ungroupItem \|\| source == ungroupButton)
2569	2757	{
2570	2758	//ungroup();
2571	2759	for (int i=0; i<group.selection.size(); i++)
..	..	@@ -2903,6 +3091,10 @@
2903	3091	if (source == twoButton)
2904	3092	{
2905	3093	radio.layout = twoButton;
	3094	+
	3095	+ if (CameraPane.FULLSCREEN)
	3096	+ fullscreenLayout = radio.layout;
	3097	+
2906	3098	// bug
2907	3099	//gridPanel.setDividerLocation(1.0);
2908	3100	//bigPanel.setDividerLocation(0.0);
..	..	@@ -2958,6 +3150,9 @@
2958	3150	{
2959	3151	radio.layout = threeButton;
2960	3152
	3153	+ if (CameraPane.FULLSCREEN)
	3154	+ fullscreenLayout = radio.layout;
	3155	+
2961	3156	// bigThree.remove(scenePanel);
2962	3157	// bigThree.remove(centralPanel);
2963	3158	// bigThree.remove(XYZPanel);
..	..	@@ -2996,6 +3191,9 @@
2996	3191	{
2997	3192	radio.layout = fourButton;
2998	3193
	3194	+ if (CameraPane.FULLSCREEN)
	3195	+ fullscreenLayout = radio.layout;
	3196	+
2999	3197	// bigThree.remove(scenePanel);
3000	3198	// bigThree.remove(centralPanel);
3001	3199	// bigThree.remove(XYZPanel);
..	..	@@ -3032,6 +3230,9 @@
3032	3230	if (source == sixButton)
3033	3231	{
3034	3232	radio.layout = sixButton;
	3233	+
	3234	+ if (CameraPane.FULLSCREEN)
	3235	+ fullscreenLayout = radio.layout;
3035	3236
3036	3237	// bigThree.remove(scenePanel);
3037	3238	// bigThree.remove(centralPanel);
..	..	@@ -3070,6 +3271,9 @@
3070	3271	if (source == sevenButton)
3071	3272	{
3072	3273	radio.layout = sevenButton;
	3274	+
	3275	+ if (CameraPane.FULLSCREEN)
	3276	+ fullscreenLayout = radio.layout;
3073	3277
3074	3278	// bigThree.remove(scenePanel);
3075	3279	// bigThree.remove(centralPanel);
..	..	@@ -3126,12 +3330,19 @@
3126	3330	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3127	3331	{
3128	3332	ab = (cRadio)e.nextElement();
3129		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3333	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
3130	3334	{
	3335	+ // Patch to avoid bug with transparency.
	3336	+ if (!ab.hadMaterial)
	3337	+ {
	3338	+ ab.object.material = null;
	3339	+ }
	3340	+
3131	3341	buttonGroup.remove(ab);
3132	3342	radioPanel.remove(ab);
3133	3343
3134		- ab.GetObject().editWindow = null;
	3344	+ //ab.GetObject().editWindow = null;
	3345	+ ab.GetObject().manipWindow = null;
3135	3346	// ab.GetObject().objectUI = null; // ?????????
3136	3347
3137	3348	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
..	..	@@ -3144,6 +3355,12 @@
3144	3355	} else
3145	3356	if (source == editItem \|\| source == editButton)
3146	3357	{
	3358	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3359	+ {
	3360	+ Object3D child = (Object3D)e.nextElement();
	3361	+ child.pinned = true;
	3362	+ }
	3363	+
3147	3364	EditSelection(false);
3148	3365	} else
3149	3366	if (source == uneditButton)
..	..	@@ -3153,6 +3370,7 @@
3153	3370	Object3D child = (Object3D)e.nextElement();
3154	3371	if(child.editWindow != null)
3155	3372	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3373	+ child.pinned = false;
3156	3374	child.CloseUI();
3157	3375	listUI.remove(child);
3158	3376
..	..	@@ -3169,6 +3387,7 @@
3169	3387	//copy.ClearUI();
3170	3388	for (Object3D obj : listUI)
3171	3389	{
	3390	+ obj.pinned = false;
3172	3391	obj.CloseUI();
3173	3392	}
3174	3393	listUI.clear();
..	..	@@ -3178,7 +3397,7 @@
3178	3397	{
3179	3398	assert(copy == group);
3180	3399
3181		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3400	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3182	3401
3183	3402	for (Object3D obj : listUI)
3184	3403	{
..	..	@@ -3245,6 +3464,7 @@
3245	3464
3246	3465	// fix "+" issue
3247	3466	//group.editWindow = this;
	3467	+ group.manipWindow = this;
3248	3468
3249	3469	/*
3250	3470	currentLayout = radio.layout;
..	..	@@ -3252,6 +3472,11 @@
3252	3472	currentLayout = sevenButton;
3253	3473	*/
3254	3474	radio.layout.doClick();
	3475	+
	3476	+ ClearUnpinned();
	3477	+ SetPinStates(group.selection.size() > 0);
	3478	+ if (group.selection.size() == 1)
	3479	+ EditSelection(false);
3255	3480	keepparent = group.parent;
3256	3481	// PARENT = NULL or not???
3257	3482	//group.parent = null; // ROOT
..	..	@@ -3265,7 +3490,7 @@
3265	3490	cameraView.ProtectCamera();
3266	3491	cameraView.repaint();
3267	3492	return;
3268		- } else if (event.getSource() == revertCameraItem)
	3493	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3269	3494	{
3270	3495	cameraView.RevertCamera();
3271	3496	cameraView.repaint();
..	..	@@ -4319,10 +4544,6 @@
4319	4544	// }
4320	4545	// }
4321	4546
4322		- static boolean allparams = true;
4323		-
4324		- static Vector<Object3D> listUI = new Vector<Object3D>();
4325		-
4326	4547	void EditSelection(boolean newWindow)
4327	4548	{
4328	4549	// aConstraints.gridy = 0;
..	..	@@ -4330,7 +4551,7 @@
4330	4551	{
4331	4552	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4332	4553	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4333		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4554	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4334	4555
4335	4556	Object3D elem = (Object3D)group.selection.elementAt(i);
4336	4557	if(elem != group \|\| !newWindow)
..	..	@@ -4415,7 +4636,8 @@
4415	4636	//new Exception().printStackTrace();
4416	4637
4417	4638	freezemodel = true;
4418		-
	4639	+ ClearUnpinned();
	4640	+
4419	4641	/**/
4420	4642	//switch (event.id)
4421	4643	{
..	..	@@ -4448,7 +4670,7 @@
4448	4670	if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4449	4671	// a camera
4450	4672	{
4451		- if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	4673	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
4452	4674	{
4453	4675	CameraPane.camerachangeframe = 0; // don't refuse it
4454	4676	Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
..	..	@@ -4457,6 +4679,13 @@
4457	4679	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4458	4680	}
4459	4681
	4682	+ if (tps != null && tps.length == 1)
	4683	+ {
	4684	+ EditSelection(false);
	4685	+ }
	4686	+
	4687	+ SetPinStates(tps != null && tps.length > 0);
	4688	+
4460	4689	refreshContents();
4461	4690	//return true;
4462	4691	}
..	..	@@ -4466,9 +4695,18 @@
4466	4695	freezemodel = false;
4467	4696	}
4468	4697
	4698	+ void SetPinStates(boolean enabled)
	4699	+ {
	4700	+ editButton.setEnabled(enabled);
	4701	+ uneditButton.setEnabled(enabled);
	4702	+ unselectButton.setEnabled(enabled);
	4703	+ flashSelectionButton.setEnabled(enabled);
	4704	+ }
	4705	+
4469	4706	void refreshContents(boolean cp)
4470	4707	{
4471		- if (!Globals.MOUSEDRAGGED)
	4708	+ if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
	4709	+ if (!Globals.MOUSEDRAGGED) // && !Globals.TIMERRUNNING)
4472	4710	{
4473	4711	objEditor.ClearInfo(); // .GetMaterial());
4474	4712
..	..	@@ -4567,6 +4805,7 @@
4567	4805
4568	4806	if (cut)
4569	4807	{
	4808	+ if (Globals.SAVEONMAKE)
4570	4809	Save();
4571	4810	//int indices[] = jList.getSelectedIndices();
4572	4811	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -5285,13 +5524,31 @@
5285	5524	cButton clearpanelButton;
5286	5525	cButton unselectButton;
5287	5526
	5527	+ cButton restoreCameraButton;
	5528	+
5288	5529	cButton minButton;
5289	5530	cButton maxButton;
5290	5531	cButton fullButton;
5291		- cButton undoButton;
5292		- cButton redoButton;
5293	5532	cButton saveButton;
5294	5533	cButton oneStepButton;
	5534	+
	5535	+ cButton groupButton;
	5536	+ cButton ungroupButton;
	5537	+ cButton compositeButton;
	5538	+ cButton switchButton;
	5539	+ cButton loopButton;
	5540	+ cButton textureButton;
	5541	+
	5542	+ cButton gridButton;
	5543	+ cButton boxButton;
	5544	+ cButton sphereButton;
	5545	+ cButton coneButton;
	5546	+ cButton torusButton;
	5547	+ cButton superButton;
	5548	+ cButton kleinButton;
	5549	+ cButton particlesButton;
	5550	+ cButton overlayButton;
	5551	+ cButton lightButton;
5295	5552
5296	5553	cButton screenfitButton;
5297	5554	cButton screenfitpointButton;
..	..	@@ -5313,11 +5570,11 @@
5313	5570	//JTree jTree;
5314	5571	private MenuItem lookAtItem;
5315	5572	private MenuItem lookFromItem;
5316		- private MenuItem switchItem;
	5573	+ private MenuItem switchViewItem;
5317	5574	private MenuItem cutItem;
5318	5575	private MenuItem undoItem;
5319	5576	private MenuItem redoItem;
5320		- private MenuItem duplicateItem;
	5577	+ private JMenuItem duplicateItem;
5321	5578	private MenuItem cloneItem;
5322	5579	private MenuItem cloneSupportItem;
5323	5580	private MenuItem overwriteGeoItem;
..	..	@@ -5405,7 +5662,7 @@
5405	5662	private MenuItem frontItem;
5406	5663	private MenuItem cameraItem;
5407	5664	private MenuItem compositeItem;
5408		- private MenuItem randomItem;
	5665	+ private MenuItem switchItem;
5409	5666	private MenuItem physicsItem;
5410	5667	private MenuItem frameselectorItem;
5411	5668	private MenuItem scriptNodeItem;
..	..	@@ -5479,5 +5736,5 @@
5479	5736
5480	5737	Menu cameraMenu;
5481	5738	MenuItem editCameraItem;
5482		- MenuItem revertCameraItem;
	5739	+ MenuItem restoreCameraItem;
5483	5740	}