~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);
..	..	@@ -176,7 +178,6 @@
176	178	copyItem.addActionListener(this);
177	179	pasteItem = menu.add(new MenuItem("Paste"));
178	180	pasteItem.addActionListener(this);
179		- menu.add("-");
180	181
181	182	menu.add("-");
182	183	pasteIntoItem = menu.add(new MenuItem("Paste into"));
..	..	@@ -203,21 +204,21 @@
203	204	//zBufferItem.addActionListener(this);
204	205	//cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
205	206	//normalLensItem.addActionListener(this);
206		- cameraMenu.add(revertCameraItem = new MenuItem("Restore Viewpoint"));
207		- revertCameraItem.addActionListener(this);
	207	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	208	+ restoreCameraItem.addActionListener(this);
208	209
209		- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
210		- toggleFullScreenItem.addItemListener(this);
211		- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
212		- cameraMenu.add("-");
213		-
214		- cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
215		- toggleTextureItem.addItemListener(this);
216		- toggleTextureItem.setState(CameraPane.textureon);
217		-
218		- cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
219		- toggleSwitchItem.addItemListener(this);
220		- 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);
221	222
222	223	cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
223	224	toggleHandleItem.addItemListener(this);
..	..	@@ -274,7 +275,7 @@
274	275	{
275	276	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
276	277	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
277		- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
	278	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
278	279	editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
279	280	oe.cameraMenu.add("-");
280	281	openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
..	..	@@ -282,7 +283,7 @@
282	283	editLeafItem.addActionListener(this);
283	284	lookAtItem.addActionListener(this);
284	285	//lookFromItem.addActinoListener(this);
285		- //switchItem.addActionListener(this);
	286	+ //switchViewItem.addActionListener(this);
286	287	}
287	288
288	289	oe.menuBar.add(menu = new Menu("Setting"));
..	..	@@ -327,21 +328,29 @@
327	328	}
328	329
329	330	oe.menuBar.add(menu = new Menu("Group"));
330		- grabItem = menu.add(new MenuItem("Grab"));
331		- grabItem.addActionListener(this);
	331	+// grabItem = menu.add(new MenuItem("Grab"));
	332	+// grabItem.addActionListener(this);
332	333	backItem = menu.add(new MenuItem("Back"));
333	334	backItem.addActionListener(this);
334	335	frontItem = menu.add(new MenuItem("Front"));
335	336	frontItem.addActionListener(this);
336		- compositeItem = menu.add(new MenuItem("Composite"));
337		- compositeItem.addActionListener(this);
	337	+// compositeItem = menu.add(new MenuItem("Composite"));
	338	+// compositeItem.addActionListener(this);
	339	+
	340	+ if (Globals.ADVANCED)
	341	+ {
338	342	hideItem = menu.add(new MenuItem("Hidden Group"));
339	343	hideItem.addActionListener(this);
	344	+ }
340	345	ungroupItem = menu.add(new MenuItem("Ungroup"));
341	346	ungroupItem.addActionListener(this);
342		- menu.add("-");
343		- randomItem = menu.add(new MenuItem("Switch node"));
344		- 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	+ {
345	354	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
346	355	switchGeoItem.addActionListener(this);
347	356	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
..	..	@@ -349,8 +358,6 @@
349	358	morphItem = menu.add(new MenuItem("Morph Group"));
350	359	morphItem.addActionListener(this);
351	360
352		- if (Globals.ADVANCED)
353		- {
354	361	menu.add("-");
355	362	physicsItem = menu.add(new MenuItem("Physics"));
356	363	physicsItem.addActionListener(this);
..	..	@@ -358,22 +365,20 @@
358	365	frameselectorItem.addActionListener(this);
359	366	scriptNodeItem = menu.add(new MenuItem("Script Node"));
360	367	scriptNodeItem.addActionListener(this);
361		- cameraItem = menu.add(new MenuItem("Camera"));
362		- cameraItem.addActionListener(this);
363	368	}
364	369
365	370	oe.menuBar.add(menu = new Menu("Object"));
366		- textureItem = menu.add(new MenuItem("Texture"));
367		- textureItem.addActionListener(this);
	371	+// textureItem = menu.add(new MenuItem("Texture"));
	372	+// textureItem.addActionListener(this);
368	373	billboardItem = menu.add(new MenuItem("Billboard"));
369	374	billboardItem.addActionListener(this);
370	375	csgItem = menu.add(new MenuItem("CSG"));
371	376	csgItem.addActionListener(this);
372		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	377	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
373	378	shadowXItem.addActionListener(this);
374		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	379	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
375	380	shadowYItem.addActionListener(this);
376		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	381	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
377	382	shadowZItem.addActionListener(this);
378	383	if (Globals.ADVANCED)
379	384	{
..	..	@@ -575,51 +580,61 @@
575	580	oe.radioPanel.add(dummyButton);
576	581	oe.buttonGroup.add(dummyButton);
577	582	*/
	583	+ cGridBag copyOptionsPanel = new cGridBag();
	584	+
	585	+ copyOptionsPanel.preferredHeight = 2;
	586	+
578	587	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
579	588
580	589	//oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
581	590	//minButton.setToolTipText("Minimize window");
582	591	//minButton.addActionListener(this);
583	592
584		- 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);
585	594	maxButton.setToolTipText("Maximize window");
586	595	maxButton.addActionListener(this);
587	596
588		- oe.toolbarPanel.add(fullButton = new cButton("\u2b1c", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	597	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
589	598	fullButton.setToolTipText("Full-screen window");
590	599	fullButton.addActionListener(this);
591	600
592		- 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);
593	606	undoButton.setToolTipText("Undo changes");
594	607	undoButton.addActionListener(this);
595	608
596		- oe.toolbarPanel.add(redoButton = new cButton("\u21aa", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	609	+ copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
597	610	redoButton.setToolTipText("Redo changes");
598	611	redoButton.addActionListener(this);
599	612
600		- oe.toolbarPanel.add(saveButton = new cButton("\u21e3", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	613	+ copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
601	614	saveButton.setToolTipText("Save changes");
602	615	saveButton.addActionListener(this);
603	616
604		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
	617	+ copyOptionsPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
605	618	liveCB.setToolTipText("Enable animation");
606	619	liveCB.addItemListener(this);
607	620
608		- oe.toolbarPanel.add(oneStepButton = new cButton("\u29f4", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	621	+ copyOptionsPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
609	622	oneStepButton.setToolTipText("Animate one step forward");
610	623	oneStepButton.addActionListener(this);
611	624
612		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	625	+ copyOptionsPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
613	626	fastCB.setToolTipText("Fast mode");
614	627	fastCB.addItemListener(this);
615	628
616		- oe.toolbarPanel.add(trackCB = new cCheckBox(":", CameraPane.TRACK)); //, oe.aConstraints);
617		- trackCB.setToolTipText("Enable tracking");
618		- trackCB.addItemListener(this);
619		-
620		- oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	629	+ //oe.toolboxPanel.Return();
	630	+
	631	+ copyOptionsPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
621	632	screenfitButton.setToolTipText("Screen fit");
622	633	screenfitButton.addActionListener(this);
	634	+
	635	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	636	+// trackCB.setToolTipText("Enable tracking");
	637	+// trackCB.addItemListener(this);
623	638
624	639	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
625	640	// screenfitpointButton.addActionListener(this);
..	..	@@ -631,65 +646,132 @@
631	646	snapobjectButton.setToolTipText("Snap Object");
632	647	}
633	648
634		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
635		- flashSelectionButton.setToolTipText("Show selection");
636		- flashSelectionButton.addActionListener(this);
	649	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
637	650
638		- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
639		-
640		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	651	+ oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
641	652	twoButton.setToolTipText("Show center view only");
642	653	twoButton.addActionListener(this);
643		- oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	654	+ this.fullscreenLayout = twoButton;
	655	+
	656	+ oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
644	657	fourButton.addActionListener(this);
645	658	fourButton.setToolTipText("Show left panel only");
646		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	659	+ oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
647	660	sixButton.setToolTipText("2-column layout left");
648	661	sixButton.addActionListener(this);
649		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	662	+ oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
650	663	threeButton.setToolTipText("2-column layout right");
651	664	threeButton.addActionListener(this);
652		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	665	+ oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
653	666	sevenButton.setToolTipText("3-column layout");
654	667	sevenButton.addActionListener(this);
655	668	//
656	669
657		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	670	+ oe.toolbarPanel.add(rootButton = GetButton("icons/write.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
658	671	rootButton.setToolTipText("Edit selection in new tab");
659	672	rootButton.addActionListener(this);
660	673
661		- oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	674	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
662	675	closeButton.setToolTipText("Close tab");
663	676	closeButton.addActionListener(this);
664	677	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
665	678	//clearButton.addActionListener(this);
666		-
667		- cGridBag commandsPanel = new cGridBag();
	679	+
	680	+ // INSERT
	681	+ oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	682	+ gridButton.setToolTipText("Create grid");
	683	+ gridButton.addActionListener(this);
	684	+
	685	+ oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	686	+ boxButton.setToolTipText("Create box");
	687	+ boxButton.addActionListener(this);
	688	+
	689	+ oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	690	+ sphereButton.setToolTipText("Create sphere");
	691	+ sphereButton.addActionListener(this);
	692	+
	693	+ oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	694	+ coneButton.setToolTipText("Create cone");
	695	+ coneButton.addActionListener(this);
	696	+
	697	+ oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	698	+ torusButton.setToolTipText("Create torus");
	699	+ torusButton.addActionListener(this);
	700	+
	701	+ oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	702	+ superButton.setToolTipText("Create superellipsoid");
	703	+ superButton.addActionListener(this);
	704	+
	705	+ if (Globals.ADVANCED)
	706	+ {
	707	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	708	+ kleinButton.setToolTipText("Create Klein bottle");
	709	+ kleinButton.addActionListener(this);
	710	+ }
668	711
669		- commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	712	+ oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	713	+ particlesButton.setToolTipText("Create particle system");
	714	+ particlesButton.addActionListener(this);
	715	+
	716	+ oe.toolboxPanel.Return();
	717	+
	718	+ oe.toolboxPanel.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	719	+ groupButton.setToolTipText("Create group");
	720	+ groupButton.addActionListener(this);
	721	+
	722	+ oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	723	+ compositeButton.setToolTipText("Create composite");
	724	+ compositeButton.addActionListener(this);
	725	+
	726	+ oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	727	+ switchButton.setToolTipText("Create switch");
	728	+ switchButton.addActionListener(this);
	729	+
	730	+ oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	731	+ loopButton.setToolTipText("Create loop");
	732	+ loopButton.addActionListener(this);
	733	+
	734	+ oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	735	+ textureButton.setToolTipText("Create texture");
	736	+ textureButton.addActionListener(this);
	737	+
	738	+ oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	739	+ overlayButton.setToolTipText("Create overlay");
	740	+ overlayButton.addActionListener(this);
	741	+
	742	+ oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	743	+ lightButton.setToolTipText("Create light");
	744	+ lightButton.addActionListener(this);
	745	+
	746	+ // EDIT panel
	747	+ editCommandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
670	748	editButton.setToolTipText("Edit selection");
671	749	editButton.addActionListener(this);
672	750
673		- commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	751	+ editCommandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
674	752	uneditButton.setToolTipText("Unedit selection");
675	753	uneditButton.addActionListener(this);
676	754
677		- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	755	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
678	756	allParamsButton.setToolTipText("Edit all params");
679	757	allParamsButton.addActionListener(this);
680	758
681		- commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	759	+ editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
682	760	clearPanelButton.setToolTipText("Clear edit panel");
683	761	clearPanelButton.addActionListener(this);
684	762
685		- commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	763	+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
686	764	unselectButton.setToolTipText("Unselect");
687	765	unselectButton.addActionListener(this);
688	766
689		- commandsPanel.preferredHeight = 1;
	767	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	768	+ flashSelectionButton.setToolTipText("Highlight selection");
	769	+ flashSelectionButton.addActionListener(this);
690	770
691		- oe.treePanel.add(commandsPanel);
692		- oe.treePanel.Return();
	771	+ editCommandsPanel.preferredHeight = 1;
	772	+
	773	+// oe.treePanel.add(commandsPanel);
	774	+// oe.treePanel.Return();
693	775
694	776	// oe.aConstraints.gridx += 1;
695	777	// oe.aConstraints.weighty = 0;
..	..	@@ -706,27 +788,12 @@
706	788
707	789	JScrollPane jSP;
708	790	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
709		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	791	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
710	792	ResetModel();
711	793
712	794	oe.treePanel.add(jSPPanel);
713	795	oe.treePanel.Return();
714	796
715		- cGridBag copyOptionsPanel = new cGridBag();
716		-
717		- copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
718		- colorCB.setToolTipText("Copy color when dropped");
719		- colorCB.addItemListener(this);
720		-
721		- copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
722		- materialCB.setToolTipText("Copy material when dropped");
723		- materialCB.addItemListener(this);
724		-
725		- copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
726		- textureCB.setToolTipText("Copy texture when dropped");
727		- textureCB.addItemListener(this);
728		-
729		- copyOptionsPanel.preferredHeight = 1;
730	797	oe.treePanel.add(copyOptionsPanel);
731	798	oe.treePanel.Return();
732	799
..	..	@@ -757,6 +824,20 @@
757	824
758	825	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
759	826	{
	827	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	828	+ colorCB.setToolTipText("Copy color when dropped");
	829	+ colorCB.addItemListener(this);
	830	+
	831	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	832	+ materialCB.setToolTipText("Copy material when dropped");
	833	+ materialCB.addItemListener(this);
	834	+
	835	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	836	+ textureCB.setToolTipText("Copy texture when dropped");
	837	+ textureCB.addItemListener(this);
	838	+
	839	+ panel.Return();
	840	+
760	841	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
761	842	boxCB.setToolTipText("Display bounding boxes");
762	843	boxCB.addItemListener(this);
..	..	@@ -774,6 +855,8 @@
774	855	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
775	856	// localCB.addItemListener(this);
776	857
	858	+ panel.Return();
	859	+
777	860	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
778	861	crowdCB.setToolTipText("Used for crowds");
779	862	crowdCB.addItemListener(this);
..	..	@@ -790,6 +873,8 @@
790	873	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
791	874	// speakerMocapCB.addItemListener(this);
792	875
	876	+ panel.Return();
	877	+
793	878	if (false)
794	879	{
795	880	// handled in scripts
..	..	@@ -804,32 +889,72 @@
804	889	//constraints.gridy += 1;
805	890	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
806	891	smoothfocusCB.addItemListener(this);
	892	+ panel.Return();
807	893	}
808	894
809	895	//constraints.gridx += 1;
810	896	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
811	897	// debugCB.addItemListener(this);
812	898
	899	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	900	+ trackCB.setToolTipText("Enable tracking target");
	901	+ trackCB.addItemListener(this);
	902	+
813	903	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	904	+ oeilCB.setToolTipText("Move camera when tracking");
814	905	oeilCB.addItemListener(this);
815	906
	907	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	908	+ shadowCB.setToolTipText("Compute shadows when live");
	909	+ shadowCB.addItemListener(this);
	910	+
	911	+ panel.Return();
	912	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	913	+ toggleTextureCB.setToolTipText("Load textures");
	914	+ toggleTextureCB.addItemListener(this);
	915	+
	916	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	917	+ toggleSwitchCB.setToolTipText("Use switch");
	918	+ toggleSwitchCB.addItemListener(this);
	919	+
	920	+ panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
	921	+ autosaveCB.setToolTipText("Auto-save on structure change");
	922	+ autosaveCB.addItemListener(this);
	923	+
	924	+ panel.Return();
	925	+ if (Globals.ADVANCED)
	926	+ {
816	927	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
817	928	lookAtCB.setToolTipText("Look-at target");
818	929	lookAtCB.addItemListener(this);
	930	+ }
819	931
820	932	}
821	933
822	934	cGridBag fill = new cGridBag();
823		-
824	935	fill.preferredHeight = 200;
	936	+ cGridBag fill2 = new cGridBag();
	937	+ fill2.preferredHeight = 200;
	938	+ cGridBag fill3 = new cGridBag();
	939	+ fill3.preferredHeight = 200;
825	940
826	941	panel.add(fill);
	942	+ panel.add(fill2);
	943	+ panel.add(fill3);
827	944
828	945	}
829	946
830	947	void EditObject(Object3D obj)
831	948	{
832	949	cRadio radioButton = new cRadio(obj.name);
	950	+
	951	+ // Patch to avoid bug with transparency.
	952	+ radioButton.hadMaterial = obj.material != null;
	953	+ if (!radioButton.hadMaterial)
	954	+ {
	955	+ obj.material = new cMaterial();
	956	+ }
	957	+
833	958	radioButton.SetObject(obj);
834	959	radioButton.layout = sevenButton;
835	960	radioButton.SetCamera(cameraView.renderCamera, false);
..	..	@@ -851,23 +976,27 @@
851	976	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
852	977	}
853	978
854		- JCheckBox liveCB;
855		- JCheckBox supportCB;
856		- JCheckBox localCB;
857		- JCheckBox crowdCB;
858		- JCheckBox smoothCB;
859		- JCheckBox fastCB;
860		- JCheckBox slowCB;
861		- JCheckBox boxCB;
862		- JCheckBox zoomBoxCB;
863		- JCheckBox trackCB;
864		- JCheckBox smoothfocusCB;
	979	+ cToggleButton liveCB;
	980	+ cCheckBox supportCB;
	981	+ cCheckBox localCB;
	982	+ cCheckBox crowdCB;
	983	+ cCheckBox smoothCB;
	984	+ cToggleButton fastCB;
	985	+ cCheckBox slowCB;
	986	+ cCheckBox boxCB;
	987	+ cCheckBox zoomBoxCB;
	988	+ //cToggleButton trackCB;
	989	+ cCheckBox trackCB;
	990	+ cCheckBox smoothfocusCB;
865	991	// JCheckBox speakerMocapCB;
866		- JCheckBox speakerCameraCB;
867		- JCheckBox speakerFocusCB;
868		- JCheckBox debugCB;
869		- JCheckBox oeilCB;
870		- JCheckBox lookAtCB;
	992	+ cCheckBox speakerCameraCB;
	993	+ cCheckBox speakerFocusCB;
	994	+ cCheckBox debugCB;
	995	+
	996	+ cCheckBox oeilCB;
	997	+ cCheckBox shadowCB;
	998	+ cCheckBox autosaveCB;
	999	+ cCheckBox lookAtCB;
871	1000
872	1001	// static int COLOR = 1;
873	1002	// static int MATERIAL = 2;
..	..	@@ -875,9 +1004,9 @@
875	1004
876	1005	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
877	1006
878		- JCheckBox colorCB;
879		- JCheckBox materialCB;
880		- JCheckBox textureCB;
	1007	+ cCheckBox colorCB;
	1008	+ cCheckBox materialCB;
	1009	+ cCheckBox textureCB;
881	1010
882	1011	public void itemStateChanged(ItemEvent e)
883	1012	{
..	..	@@ -970,6 +1099,14 @@
970	1099	{
971	1100	cameraView.ToggleOeil();
972	1101	}
	1102	+ else if(e.getSource() == shadowCB)
	1103	+ {
	1104	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1105	+ }
	1106	+ else if(e.getSource() == autosaveCB)
	1107	+ {
	1108	+ Globals.SAVEONMAKE ^= true;
	1109	+ }
973	1110	else if(e.getSource() == lookAtCB)
974	1111	{
975	1112	cameraView.ToggleLookAt();
..	..	@@ -986,7 +1123,8 @@
986	1123
987	1124	/**/
988	1125	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
989		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1126	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1127	+ TreePath path = objEditor.jTree.getSelectionPath();
990	1128	if ((path == null) \|\| (path.getPathCount() <= 1)) {
991	1129	// We can't move the root node or an empty selection
992	1130	return;
..	..	@@ -1103,23 +1241,33 @@
1103	1241
1104	1242	assert target == objEditor.jTree;
1105	1243	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1244	+ Object3D destinationLeaf;
1106	1245	try {
1107		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1246	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
1108	1247	} catch (Exception e) {
1109	1248	System.out.println("destinationPath : " + destinationPath);
1110	1249	return;
1111	1250	}
1112	1251
1113		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1252	+ for (int i=group.selection.size(); --i>=0;)
1114	1253	{
	1254	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1255	+
	1256	+ // Cannot move into itself
	1257	+ if (child == destinationLeaf)
	1258	+ return;
	1259	+ }
	1260	+
	1261	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1262	+// {
1115	1263	loadClipboard(true);
1116	1264	objEditor.jTree.setSelectionPath(destinationPath);
1117	1265	pasteInto(false, false);
1118		- } else {
1119		- loadClipboard(false);
1120		- objEditor.jTree.setSelectionPath(destinationPath);
1121		- pasteInto(false, false); // true); // ???
1122		- }
	1266	+// } else {
	1267	+// loadClipboard(false);
	1268	+// objEditor.jTree.setSelectionPath(destinationPath);
	1269	+// pasteInto(false, false); // true); // ???
	1270	+// }
1123	1271	}
1124	1272	public void dropActionChanged(DropTargetDragEvent dtde)
1125	1273	// Called if the user has modified the current drop gesture
..	..	@@ -1224,22 +1372,30 @@
1224	1372	{
1225	1373	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1226	1374	//heightFieldItem.addActionListener(this);
1227		- gridItem = menu.add(new MenuItem("Grid"));
1228		- gridItem.addActionListener(this);
1229		- rectoidItem = menu.add(new MenuItem("Box"));
1230		- rectoidItem.addActionListener(this);
1231		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1232		- ellipsoidItem.addActionListener(this);
1233		- coneItem = menu.add(new MenuItem("Cone"));
1234		- coneItem.addActionListener(this);
1235		- torusItem = menu.add(new MenuItem("Torus"));
1236		- torusItem.addActionListener(this);
1237		- superItem = menu.add(new MenuItem("Superellipsoid"));
1238		- superItem.addActionListener(this);
	1375	+// gridItem = menu.add(new MenuItem("Grid"));
	1376	+// gridItem.addActionListener(this);
	1377	+// rectoidItem = menu.add(new MenuItem("Box"));
	1378	+// rectoidItem.addActionListener(this);
	1379	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1380	+// ellipsoidItem.addActionListener(this);
	1381	+// coneItem = menu.add(new MenuItem("Cone"));
	1382	+// coneItem.addActionListener(this);
	1383	+// torusItem = menu.add(new MenuItem("Torus"));
	1384	+// torusItem.addActionListener(this);
	1385	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1386	+// superItem.addActionListener(this);
	1387	+
	1388	+ cameraItem = menu.add(new MenuItem("Camera"));
	1389	+ cameraItem.addActionListener(this);
	1390	+
	1391	+ if (!Globals.ADVANCED)
	1392	+ {
1239	1393	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1240	1394	kleinItem.addActionListener(this);
1241		- particleItem = menu.add(new MenuItem("Particle system"));
1242		- particleItem.addActionListener(this);
	1395	+ }
	1396	+
	1397	+// particleItem = menu.add(new MenuItem("Particle system"));
	1398	+// particleItem.addActionListener(this);
1243	1399	if (Globals.ADVANCED)
1244	1400	{
1245	1401	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1265,15 +1421,15 @@
1265	1421	}
1266	1422	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1267	1423	bezierItem.addActionListener(this);
1268		- overlayItem = menu.add(new MenuItem("Overlay"));
1269		- overlayItem.addActionListener(this);
1270		- lightItem = menu.add(new MenuItem("Light"));
1271		- lightItem.addActionListener(this);
	1424	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1425	+// overlayItem.addActionListener(this);
	1426	+// lightItem = menu.add(new MenuItem("Light"));
	1427	+// lightItem.addActionListener(this);
1272	1428	menu.add("-");
1273	1429	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1274	1430	//superLoopItem.addActionListener(this);
1275		- loopItem = menu.add(new MenuItem("Loop"));
1276		- loopItem.addActionListener(this);
	1431	+// loopItem = menu.add(new MenuItem("Loop"));
	1432	+// loopItem.addActionListener(this);
1277	1433	doubleItem = menu.add(new MenuItem("Fork"));
1278	1434	doubleItem.addActionListener(this);
1279	1435	if (Globals.ADVANCED)
..	..	@@ -1454,6 +1610,7 @@
1454	1610	shadow.material = new cMaterial(obj.material);
1455	1611	shadow.material.diffuse = 0.0001f;
1456	1612	shadow.material.specular = 0.0001f;
	1613	+ //shadow.projectedVertices[1].x = 300;
1457	1614
1458	1615	makeSomething(shadow);
1459	1616	}
..	..	@@ -1701,7 +1858,7 @@
1701	1858	{
1702	1859	ScreenFit();
1703	1860	} else
1704		- if (source == switchItem)
	1861	+ if (source == switchViewItem)
1705	1862	{
1706	1863	cVector v1 = new cVector();
1707	1864	cVector v2 = new cVector();
..	..	@@ -1710,11 +1867,11 @@
1710	1867	objEditor.cameraView.renderCamera.setAim(v2, v1);
1711	1868	objEditor.cameraView.repaint();
1712	1869	} else
1713		- if (source == rectoidItem)
	1870	+ if (source == rectoidItem \|\| source == boxButton)
1714	1871	{
1715	1872	makeSomething(new Box());
1716	1873	} else
1717		- if (source == particleItem)
	1874	+ if (source == particleItem \|\| source == particlesButton)
1718	1875	{
1719	1876	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1720	1877	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1793,27 +1950,27 @@
1793	1950
1794	1951	makeSomething(obj);
1795	1952	} else
1796		- if (source == gridItem)
	1953	+ if (source == gridItem \|\| source == gridButton)
1797	1954	{
1798	1955	makeSomething(new Grid());
1799	1956	} else
1800		- if (source == ellipsoidItem)
	1957	+ if (source == ellipsoidItem \|\| source == sphereButton)
1801	1958	{
1802	1959	makeSomething(new Sphere());
1803	1960	} else
1804		- if (source == coneItem)
	1961	+ if (source == coneItem \|\| source == coneButton)
1805	1962	{
1806	1963	makeSomething(new Cone());
1807	1964	} else
1808		- if (source == torusItem)
	1965	+ if (source == torusItem \|\| source == torusButton)
1809	1966	{
1810	1967	makeSomething(new Torus());
1811	1968	} else
1812		- if (source == superItem)
	1969	+ if (source == superItem \|\| source == superButton)
1813	1970	{
1814	1971	makeSomething(new Superellipsoid());
1815	1972	} else
1816		- if (source == kleinItem)
	1973	+ if (source == kleinItem \|\| source == kleinButton)
1817	1974	{
1818	1975	makeSomething(new Klein());
1819	1976	} else
..	..	@@ -1833,7 +1990,7 @@
1833	1990	{
1834	1991	makeSomething(new BezierSurface());
1835	1992	} else
1836		- if (source == overlayItem)
	1993	+ if (source == overlayItem \|\| source == overlayButton)
1837	1994	{
1838	1995	/*
1839	1996	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1881,7 +2038,7 @@
1881	2038	s.setup();
1882	2039	makeSomething(s);
1883	2040	} else
1884		- if (source == lightItem)
	2041	+ if (source == lightItem \|\| source == lightButton)
1885	2042	{
1886	2043	makeSomething(new Light());
1887	2044	} else
..	..	@@ -1931,7 +2088,7 @@
1931	2088
1932	2089	group(g);
1933	2090	} else
1934		- if (source == loopItem)
	2091	+ if (source == loopItem \|\| source == loopButton)
1935	2092	{
1936	2093	Composite csg = new GroupLeaf();
1937	2094	csg.count = 5;
..	..	@@ -2421,9 +2578,9 @@
2421	2578	{
2422	2579	ClearSelection(true);
2423	2580	} else
2424		- if (source == grabItem)
	2581	+ if (source == grabItem \|\| source == groupButton)
2425	2582	{
2426		- group(new cGroup(), true);
	2583	+ group(new cGroup(), false); // true);
2427	2584	} else
2428	2585	if (source == hideItem)
2429	2586	{
..	..	@@ -2441,11 +2598,11 @@
2441	2598	{
2442	2599	makeSomething(new Camera());
2443	2600	} else
2444		- if (source == compositeItem)
	2601	+ if (source == compositeItem \|\| source == compositeButton)
2445	2602	{
2446	2603	group(new Composite());
2447	2604	} else
2448		- if (source == randomItem)
	2605	+ if (source == switchItem \|\| source == switchButton)
2449	2606	{
2450	2607	RandomNode random = new RandomNode();
2451	2608	group(random);
..	..	@@ -2547,7 +2704,7 @@
2547	2704	{
2548	2705	group(new cLinker());
2549	2706	} else
2550		- if (source == textureItem)
	2707	+ if (source == textureItem \|\| source == textureButton)
2551	2708	{
2552	2709	group(new TextureNode());
2553	2710	} else
..	..	@@ -2567,7 +2724,7 @@
2567	2724	{
2568	2725	CastShadow(2);
2569	2726	} else
2570		- if (source == ungroupItem)
	2727	+ if (source == ungroupItem \|\| source == ungroupButton)
2571	2728	{
2572	2729	//ungroup();
2573	2730	for (int i=0; i<group.selection.size(); i++)
..	..	@@ -2905,6 +3062,10 @@
2905	3062	if (source == twoButton)
2906	3063	{
2907	3064	radio.layout = twoButton;
	3065	+
	3066	+ if (CameraPane.FULLSCREEN)
	3067	+ fullscreenLayout = radio.layout;
	3068	+
2908	3069	// bug
2909	3070	//gridPanel.setDividerLocation(1.0);
2910	3071	//bigPanel.setDividerLocation(0.0);
..	..	@@ -2960,6 +3121,9 @@
2960	3121	{
2961	3122	radio.layout = threeButton;
2962	3123
	3124	+ if (CameraPane.FULLSCREEN)
	3125	+ fullscreenLayout = radio.layout;
	3126	+
2963	3127	// bigThree.remove(scenePanel);
2964	3128	// bigThree.remove(centralPanel);
2965	3129	// bigThree.remove(XYZPanel);
..	..	@@ -2998,6 +3162,9 @@
2998	3162	{
2999	3163	radio.layout = fourButton;
3000	3164
	3165	+ if (CameraPane.FULLSCREEN)
	3166	+ fullscreenLayout = radio.layout;
	3167	+
3001	3168	// bigThree.remove(scenePanel);
3002	3169	// bigThree.remove(centralPanel);
3003	3170	// bigThree.remove(XYZPanel);
..	..	@@ -3034,6 +3201,9 @@
3034	3201	if (source == sixButton)
3035	3202	{
3036	3203	radio.layout = sixButton;
	3204	+
	3205	+ if (CameraPane.FULLSCREEN)
	3206	+ fullscreenLayout = radio.layout;
3037	3207
3038	3208	// bigThree.remove(scenePanel);
3039	3209	// bigThree.remove(centralPanel);
..	..	@@ -3072,6 +3242,9 @@
3072	3242	if (source == sevenButton)
3073	3243	{
3074	3244	radio.layout = sevenButton;
	3245	+
	3246	+ if (CameraPane.FULLSCREEN)
	3247	+ fullscreenLayout = radio.layout;
3075	3248
3076	3249	// bigThree.remove(scenePanel);
3077	3250	// bigThree.remove(centralPanel);
..	..	@@ -3128,12 +3301,19 @@
3128	3301	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3129	3302	{
3130	3303	ab = (cRadio)e.nextElement();
3131		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3304	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
3132	3305	{
	3306	+ // Patch to avoid bug with transparency.
	3307	+ if (!ab.hadMaterial)
	3308	+ {
	3309	+ ab.object.material = null;
	3310	+ }
	3311	+
3133	3312	buttonGroup.remove(ab);
3134	3313	radioPanel.remove(ab);
3135	3314
3136		- ab.GetObject().editWindow = null;
	3315	+ //ab.GetObject().editWindow = null;
	3316	+ ab.GetObject().manipWindow = null;
3137	3317	// ab.GetObject().objectUI = null; // ?????????
3138	3318
3139	3319	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
..	..	@@ -3247,6 +3427,7 @@
3247	3427
3248	3428	// fix "+" issue
3249	3429	//group.editWindow = this;
	3430	+ group.manipWindow = this;
3250	3431
3251	3432	/*
3252	3433	currentLayout = radio.layout;
..	..	@@ -3267,7 +3448,7 @@
3267	3448	cameraView.ProtectCamera();
3268	3449	cameraView.repaint();
3269	3450	return;
3270		- } else if (event.getSource() == revertCameraItem)
	3451	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3271	3452	{
3272	3453	cameraView.RevertCamera();
3273	3454	cameraView.repaint();
..	..	@@ -4332,7 +4513,7 @@
4332	4513	{
4333	4514	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4334	4515	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4335		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4516	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4336	4517
4337	4518	Object3D elem = (Object3D)group.selection.elementAt(i);
4338	4519	if(elem != group \|\| !newWindow)
..	..	@@ -4470,7 +4651,8 @@
4470	4651
4471	4652	void refreshContents(boolean cp)
4472	4653	{
4473		- if (!Globals.MOUSEDRAGGED)
	4654	+ if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
	4655	+ if (!Globals.MOUSEDRAGGED) // && !Globals.TIMERRUNNING)
4474	4656	{
4475	4657	objEditor.ClearInfo(); // .GetMaterial());
4476	4658
..	..	@@ -4569,6 +4751,7 @@
4569	4751
4570	4752	if (cut)
4571	4753	{
	4754	+ if (Globals.SAVEONMAKE)
4572	4755	Save();
4573	4756	//int indices[] = jList.getSelectedIndices();
4574	4757	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -5287,6 +5470,8 @@
5287	5470	cButton clearpanelButton;
5288	5471	cButton unselectButton;
5289	5472
	5473	+ cButton restoreCameraButton;
	5474	+
5290	5475	cButton minButton;
5291	5476	cButton maxButton;
5292	5477	cButton fullButton;
..	..	@@ -5294,6 +5479,24 @@
5294	5479	cButton redoButton;
5295	5480	cButton saveButton;
5296	5481	cButton oneStepButton;
	5482	+
	5483	+ cButton groupButton;
	5484	+ cButton ungroupButton;
	5485	+ cButton compositeButton;
	5486	+ cButton switchButton;
	5487	+ cButton loopButton;
	5488	+ cButton textureButton;
	5489	+
	5490	+ cButton gridButton;
	5491	+ cButton boxButton;
	5492	+ cButton sphereButton;
	5493	+ cButton coneButton;
	5494	+ cButton torusButton;
	5495	+ cButton superButton;
	5496	+ cButton kleinButton;
	5497	+ cButton particlesButton;
	5498	+ cButton overlayButton;
	5499	+ cButton lightButton;
5297	5500
5298	5501	cButton screenfitButton;
5299	5502	cButton screenfitpointButton;
..	..	@@ -5315,11 +5518,11 @@
5315	5518	//JTree jTree;
5316	5519	private MenuItem lookAtItem;
5317	5520	private MenuItem lookFromItem;
5318		- private MenuItem switchItem;
	5521	+ private MenuItem switchViewItem;
5319	5522	private MenuItem cutItem;
5320	5523	private MenuItem undoItem;
5321	5524	private MenuItem redoItem;
5322		- private MenuItem duplicateItem;
	5525	+ private JMenuItem duplicateItem;
5323	5526	private MenuItem cloneItem;
5324	5527	private MenuItem cloneSupportItem;
5325	5528	private MenuItem overwriteGeoItem;
..	..	@@ -5407,7 +5610,7 @@
5407	5610	private MenuItem frontItem;
5408	5611	private MenuItem cameraItem;
5409	5612	private MenuItem compositeItem;
5410		- private MenuItem randomItem;
	5613	+ private MenuItem switchItem;
5411	5614	private MenuItem physicsItem;
5412	5615	private MenuItem frameselectorItem;
5413	5616	private MenuItem scriptNodeItem;
..	..	@@ -5481,5 +5684,5 @@
5481	5684
5482	5685	Menu cameraMenu;
5483	5686	MenuItem editCameraItem;
5484		- MenuItem revertCameraItem;
	5687	+ MenuItem restoreCameraItem;
5485	5688	}