~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,63 @@
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);
	608	+ undoButton.setEnabled(false);
595	609
596		- oe.toolbarPanel.add(redoButton = new cButton("\u21aa", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	610	+ copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
597	611	redoButton.setToolTipText("Redo changes");
598	612	redoButton.addActionListener(this);
	613	+ redoButton.setEnabled(false);
599	614
600		- oe.toolbarPanel.add(saveButton = new cButton("\u21e3", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	615	+ copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
601	616	saveButton.setToolTipText("Save changes");
602	617	saveButton.addActionListener(this);
603	618
604		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
	619	+ copyOptionsPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
605	620	liveCB.setToolTipText("Enable animation");
606	621	liveCB.addItemListener(this);
607	622
608		- oe.toolbarPanel.add(oneStepButton = new cButton("\u29f4", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	623	+ copyOptionsPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
609	624	oneStepButton.setToolTipText("Animate one step forward");
610	625	oneStepButton.addActionListener(this);
611	626
612		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	627	+ copyOptionsPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
613	628	fastCB.setToolTipText("Fast mode");
614	629	fastCB.addItemListener(this);
615	630
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);
	631	+ //oe.toolboxPanel.Return();
	632	+
	633	+ copyOptionsPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
621	634	screenfitButton.setToolTipText("Screen fit");
622	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);
623	640
624	641	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
625	642	// screenfitpointButton.addActionListener(this);
..	..	@@ -631,65 +648,144 @@
631	648	snapobjectButton.setToolTipText("Snap Object");
632	649	}
633	650
634		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
635		- flashSelectionButton.setToolTipText("Show selection");
636		- flashSelectionButton.addActionListener(this);
	651	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
637	652
638		- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
639		-
640		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	653	+ oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
641	654	twoButton.setToolTipText("Show center view only");
642	655	twoButton.addActionListener(this);
643		- oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	656	+ this.fullscreenLayout = twoButton;
	657	+
	658	+ oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
644	659	fourButton.addActionListener(this);
645	660	fourButton.setToolTipText("Show left panel only");
646		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	661	+ oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
647	662	sixButton.setToolTipText("2-column layout left");
648	663	sixButton.addActionListener(this);
649		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	664	+ oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
650	665	threeButton.setToolTipText("2-column layout right");
651	666	threeButton.addActionListener(this);
652		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	667	+ oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
653	668	sevenButton.setToolTipText("3-column layout");
654	669	sevenButton.addActionListener(this);
655	670	//
656	671
657		- 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);
658	673	rootButton.setToolTipText("Edit selection in new tab");
659	674	rootButton.addActionListener(this);
660	675
661		- 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);
662	677	closeButton.setToolTipText("Close tab");
663	678	closeButton.addActionListener(this);
664	679	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
665	680	//clearButton.addActionListener(this);
666		-
667		- cGridBag commandsPanel = new cGridBag();
	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	+ }
668	713
669		- commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	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 = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
670	762	editButton.setToolTipText("Edit selection");
671	763	editButton.addActionListener(this);
672	764
673		- commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	765	+ editCommandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
674	766	uneditButton.setToolTipText("Unedit selection");
675	767	uneditButton.addActionListener(this);
676	768
677		- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	769	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
678	770	allParamsButton.setToolTipText("Edit all params");
679	771	allParamsButton.addActionListener(this);
680	772
681		- commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	773	+ editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
682	774	clearPanelButton.setToolTipText("Clear edit panel");
683	775	clearPanelButton.addActionListener(this);
684	776
685		- commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	777	+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
686	778	unselectButton.setToolTipText("Unselect");
687	779	unselectButton.addActionListener(this);
688	780
689		- commandsPanel.preferredHeight = 1;
	781	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	782	+ flashSelectionButton.setToolTipText("Highlight selection");
	783	+ flashSelectionButton.addActionListener(this);
690	784
691		- oe.treePanel.add(commandsPanel);
692		- oe.treePanel.Return();
	785	+ editCommandsPanel.preferredHeight = 1;
	786	+
	787	+// oe.treePanel.add(commandsPanel);
	788	+// oe.treePanel.Return();
693	789
694	790	// oe.aConstraints.gridx += 1;
695	791	// oe.aConstraints.weighty = 0;
..	..	@@ -706,27 +802,12 @@
706	802
707	803	JScrollPane jSP;
708	804	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
709		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	805	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
710	806	ResetModel();
711	807
712	808	oe.treePanel.add(jSPPanel);
713	809	oe.treePanel.Return();
714	810
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	811	oe.treePanel.add(copyOptionsPanel);
731	812	oe.treePanel.Return();
732	813
..	..	@@ -757,6 +838,20 @@
757	838
758	839	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
759	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	+
760	855	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
761	856	boxCB.setToolTipText("Display bounding boxes");
762	857	boxCB.addItemListener(this);
..	..	@@ -774,6 +869,8 @@
774	869	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
775	870	// localCB.addItemListener(this);
776	871
	872	+ panel.Return();
	873	+
777	874	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
778	875	crowdCB.setToolTipText("Used for crowds");
779	876	crowdCB.addItemListener(this);
..	..	@@ -790,6 +887,8 @@
790	887	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
791	888	// speakerMocapCB.addItemListener(this);
792	889
	890	+ panel.Return();
	891	+
793	892	if (false)
794	893	{
795	894	// handled in scripts
..	..	@@ -804,32 +903,72 @@
804	903	//constraints.gridy += 1;
805	904	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
806	905	smoothfocusCB.addItemListener(this);
	906	+ panel.Return();
807	907	}
808	908
809	909	//constraints.gridx += 1;
810	910	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
811	911	// debugCB.addItemListener(this);
812	912
	913	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	914	+ trackCB.setToolTipText("Enable tracking target");
	915	+ trackCB.addItemListener(this);
	916	+
813	917	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	918	+ oeilCB.setToolTipText("Move camera when tracking");
814	919	oeilCB.addItemListener(this);
815	920
	921	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	922	+ shadowCB.setToolTipText("Compute shadows when live");
	923	+ shadowCB.addItemListener(this);
	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	+
	934	+ panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
	935	+ autosaveCB.setToolTipText("Auto-save on structure change");
	936	+ autosaveCB.addItemListener(this);
	937	+
	938	+ panel.Return();
	939	+ if (Globals.ADVANCED)
	940	+ {
816	941	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
817	942	lookAtCB.setToolTipText("Look-at target");
818	943	lookAtCB.addItemListener(this);
	944	+ }
819	945
820	946	}
821	947
822	948	cGridBag fill = new cGridBag();
823		-
824	949	fill.preferredHeight = 200;
	950	+ cGridBag fill2 = new cGridBag();
	951	+ fill2.preferredHeight = 200;
	952	+ cGridBag fill3 = new cGridBag();
	953	+ fill3.preferredHeight = 200;
825	954
826	955	panel.add(fill);
	956	+ panel.add(fill2);
	957	+ panel.add(fill3);
827	958
828	959	}
829	960
830	961	void EditObject(Object3D obj)
831	962	{
832	963	cRadio radioButton = new cRadio(obj.name);
	964	+
	965	+ // Patch to avoid bug with transparency.
	966	+ radioButton.hadMaterial = obj.material != null;
	967	+ if (!radioButton.hadMaterial)
	968	+ {
	969	+ obj.material = new cMaterial();
	970	+ }
	971	+
833	972	radioButton.SetObject(obj);
834	973	radioButton.layout = sevenButton;
835	974	radioButton.SetCamera(cameraView.renderCamera, false);
..	..	@@ -851,23 +990,27 @@
851	990	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
852	991	}
853	992
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;
	993	+ cToggleButton liveCB;
	994	+ cCheckBox supportCB;
	995	+ cCheckBox localCB;
	996	+ cCheckBox crowdCB;
	997	+ cCheckBox smoothCB;
	998	+ cToggleButton fastCB;
	999	+ cCheckBox slowCB;
	1000	+ cCheckBox boxCB;
	1001	+ cCheckBox zoomBoxCB;
	1002	+ //cToggleButton trackCB;
	1003	+ cCheckBox trackCB;
	1004	+ cCheckBox smoothfocusCB;
865	1005	// JCheckBox speakerMocapCB;
866		- JCheckBox speakerCameraCB;
867		- JCheckBox speakerFocusCB;
868		- JCheckBox debugCB;
869		- JCheckBox oeilCB;
870		- JCheckBox lookAtCB;
	1006	+ cCheckBox speakerCameraCB;
	1007	+ cCheckBox speakerFocusCB;
	1008	+ cCheckBox debugCB;
	1009	+
	1010	+ cCheckBox oeilCB;
	1011	+ cCheckBox shadowCB;
	1012	+ cCheckBox autosaveCB;
	1013	+ cCheckBox lookAtCB;
871	1014
872	1015	// static int COLOR = 1;
873	1016	// static int MATERIAL = 2;
..	..	@@ -875,9 +1018,9 @@
875	1018
876	1019	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
877	1020
878		- JCheckBox colorCB;
879		- JCheckBox materialCB;
880		- JCheckBox textureCB;
	1021	+ cCheckBox colorCB;
	1022	+ cCheckBox materialCB;
	1023	+ cCheckBox textureCB;
881	1024
882	1025	public void itemStateChanged(ItemEvent e)
883	1026	{
..	..	@@ -970,6 +1113,14 @@
970	1113	{
971	1114	cameraView.ToggleOeil();
972	1115	}
	1116	+ else if(e.getSource() == shadowCB)
	1117	+ {
	1118	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1119	+ }
	1120	+ else if(e.getSource() == autosaveCB)
	1121	+ {
	1122	+ Globals.SAVEONMAKE ^= true;
	1123	+ }
973	1124	else if(e.getSource() == lookAtCB)
974	1125	{
975	1126	cameraView.ToggleLookAt();
..	..	@@ -986,7 +1137,8 @@
986	1137
987	1138	/**/
988	1139	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
989		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1140	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1141	+ TreePath path = objEditor.jTree.getSelectionPath();
990	1142	if ((path == null) \|\| (path.getPathCount() <= 1)) {
991	1143	// We can't move the root node or an empty selection
992	1144	return;
..	..	@@ -1103,23 +1255,33 @@
1103	1255
1104	1256	assert target == objEditor.jTree;
1105	1257	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1258	+ Object3D destinationLeaf;
1106	1259	try {
1107		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1260	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
1108	1261	} catch (Exception e) {
1109	1262	System.out.println("destinationPath : " + destinationPath);
1110	1263	return;
1111	1264	}
1112	1265
1113		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1266	+ for (int i=group.selection.size(); --i>=0;)
1114	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	+// {
1115	1277	loadClipboard(true);
1116	1278	objEditor.jTree.setSelectionPath(destinationPath);
1117	1279	pasteInto(false, false);
1118		- } else {
1119		- loadClipboard(false);
1120		- objEditor.jTree.setSelectionPath(destinationPath);
1121		- pasteInto(false, false); // true); // ???
1122		- }
	1280	+// } else {
	1281	+// loadClipboard(false);
	1282	+// objEditor.jTree.setSelectionPath(destinationPath);
	1283	+// pasteInto(false, false); // true); // ???
	1284	+// }
1123	1285	}
1124	1286	public void dropActionChanged(DropTargetDragEvent dtde)
1125	1287	// Called if the user has modified the current drop gesture
..	..	@@ -1224,22 +1386,30 @@
1224	1386	{
1225	1387	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1226	1388	//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);
	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	+ {
1239	1407	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1240	1408	kleinItem.addActionListener(this);
1241		- particleItem = menu.add(new MenuItem("Particle system"));
1242		- particleItem.addActionListener(this);
	1409	+ }
	1410	+
	1411	+// particleItem = menu.add(new MenuItem("Particle system"));
	1412	+// particleItem.addActionListener(this);
1243	1413	if (Globals.ADVANCED)
1244	1414	{
1245	1415	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1265,15 +1435,15 @@
1265	1435	}
1266	1436	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1267	1437	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);
	1438	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1439	+// overlayItem.addActionListener(this);
	1440	+// lightItem = menu.add(new MenuItem("Light"));
	1441	+// lightItem.addActionListener(this);
1272	1442	menu.add("-");
1273	1443	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1274	1444	//superLoopItem.addActionListener(this);
1275		- loopItem = menu.add(new MenuItem("Loop"));
1276		- loopItem.addActionListener(this);
	1445	+// loopItem = menu.add(new MenuItem("Loop"));
	1446	+// loopItem.addActionListener(this);
1277	1447	doubleItem = menu.add(new MenuItem("Fork"));
1278	1448	doubleItem.addActionListener(this);
1279	1449	if (Globals.ADVANCED)
..	..	@@ -1454,6 +1624,7 @@
1454	1624	shadow.material = new cMaterial(obj.material);
1455	1625	shadow.material.diffuse = 0.0001f;
1456	1626	shadow.material.specular = 0.0001f;
	1627	+ //shadow.projectedVertices[1].x = 300;
1457	1628
1458	1629	makeSomething(shadow);
1459	1630	}
..	..	@@ -1701,7 +1872,7 @@
1701	1872	{
1702	1873	ScreenFit();
1703	1874	} else
1704		- if (source == switchItem)
	1875	+ if (source == switchViewItem)
1705	1876	{
1706	1877	cVector v1 = new cVector();
1707	1878	cVector v2 = new cVector();
..	..	@@ -1710,11 +1881,11 @@
1710	1881	objEditor.cameraView.renderCamera.setAim(v2, v1);
1711	1882	objEditor.cameraView.repaint();
1712	1883	} else
1713		- if (source == rectoidItem)
	1884	+ if (source == rectoidItem \|\| source == boxButton)
1714	1885	{
1715	1886	makeSomething(new Box());
1716	1887	} else
1717		- if (source == particleItem)
	1888	+ if (source == particleItem \|\| source == particlesButton)
1718	1889	{
1719	1890	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1720	1891	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1793,27 +1964,27 @@
1793	1964
1794	1965	makeSomething(obj);
1795	1966	} else
1796		- if (source == gridItem)
	1967	+ if (source == gridItem \|\| source == gridButton)
1797	1968	{
1798	1969	makeSomething(new Grid());
1799	1970	} else
1800		- if (source == ellipsoidItem)
	1971	+ if (source == ellipsoidItem \|\| source == sphereButton)
1801	1972	{
1802	1973	makeSomething(new Sphere());
1803	1974	} else
1804		- if (source == coneItem)
	1975	+ if (source == coneItem \|\| source == coneButton)
1805	1976	{
1806	1977	makeSomething(new Cone());
1807	1978	} else
1808		- if (source == torusItem)
	1979	+ if (source == torusItem \|\| source == torusButton)
1809	1980	{
1810	1981	makeSomething(new Torus());
1811	1982	} else
1812		- if (source == superItem)
	1983	+ if (source == superItem \|\| source == superButton)
1813	1984	{
1814	1985	makeSomething(new Superellipsoid());
1815	1986	} else
1816		- if (source == kleinItem)
	1987	+ if (source == kleinItem \|\| source == kleinButton)
1817	1988	{
1818	1989	makeSomething(new Klein());
1819	1990	} else
..	..	@@ -1833,7 +2004,7 @@
1833	2004	{
1834	2005	makeSomething(new BezierSurface());
1835	2006	} else
1836		- if (source == overlayItem)
	2007	+ if (source == overlayItem \|\| source == overlayButton)
1837	2008	{
1838	2009	/*
1839	2010	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1881,7 +2052,7 @@
1881	2052	s.setup();
1882	2053	makeSomething(s);
1883	2054	} else
1884		- if (source == lightItem)
	2055	+ if (source == lightItem \|\| source == lightButton)
1885	2056	{
1886	2057	makeSomething(new Light());
1887	2058	} else
..	..	@@ -1931,7 +2102,7 @@
1931	2102
1932	2103	group(g);
1933	2104	} else
1934		- if (source == loopItem)
	2105	+ if (source == loopItem \|\| source == loopButton)
1935	2106	{
1936	2107	Composite csg = new GroupLeaf();
1937	2108	csg.count = 5;
..	..	@@ -2421,9 +2592,9 @@
2421	2592	{
2422	2593	ClearSelection(true);
2423	2594	} else
2424		- if (source == grabItem)
	2595	+ if (source == grabItem \|\| source == groupButton)
2425	2596	{
2426		- group(new cGroup(), true);
	2597	+ group(new cGroup(), false); // true);
2427	2598	} else
2428	2599	if (source == hideItem)
2429	2600	{
..	..	@@ -2441,11 +2612,11 @@
2441	2612	{
2442	2613	makeSomething(new Camera());
2443	2614	} else
2444		- if (source == compositeItem)
	2615	+ if (source == compositeItem \|\| source == compositeButton)
2445	2616	{
2446	2617	group(new Composite());
2447	2618	} else
2448		- if (source == randomItem)
	2619	+ if (source == switchItem \|\| source == switchButton)
2449	2620	{
2450	2621	RandomNode random = new RandomNode();
2451	2622	group(random);
..	..	@@ -2547,7 +2718,7 @@
2547	2718	{
2548	2719	group(new cLinker());
2549	2720	} else
2550		- if (source == textureItem)
	2721	+ if (source == textureItem \|\| source == textureButton)
2551	2722	{
2552	2723	group(new TextureNode());
2553	2724	} else
..	..	@@ -2567,7 +2738,7 @@
2567	2738	{
2568	2739	CastShadow(2);
2569	2740	} else
2570		- if (source == ungroupItem)
	2741	+ if (source == ungroupItem \|\| source == ungroupButton)
2571	2742	{
2572	2743	//ungroup();
2573	2744	for (int i=0; i<group.selection.size(); i++)
..	..	@@ -2905,6 +3076,10 @@
2905	3076	if (source == twoButton)
2906	3077	{
2907	3078	radio.layout = twoButton;
	3079	+
	3080	+ if (CameraPane.FULLSCREEN)
	3081	+ fullscreenLayout = radio.layout;
	3082	+
2908	3083	// bug
2909	3084	//gridPanel.setDividerLocation(1.0);
2910	3085	//bigPanel.setDividerLocation(0.0);
..	..	@@ -2960,6 +3135,9 @@
2960	3135	{
2961	3136	radio.layout = threeButton;
2962	3137
	3138	+ if (CameraPane.FULLSCREEN)
	3139	+ fullscreenLayout = radio.layout;
	3140	+
2963	3141	// bigThree.remove(scenePanel);
2964	3142	// bigThree.remove(centralPanel);
2965	3143	// bigThree.remove(XYZPanel);
..	..	@@ -2998,6 +3176,9 @@
2998	3176	{
2999	3177	radio.layout = fourButton;
3000	3178
	3179	+ if (CameraPane.FULLSCREEN)
	3180	+ fullscreenLayout = radio.layout;
	3181	+
3001	3182	// bigThree.remove(scenePanel);
3002	3183	// bigThree.remove(centralPanel);
3003	3184	// bigThree.remove(XYZPanel);
..	..	@@ -3034,6 +3215,9 @@
3034	3215	if (source == sixButton)
3035	3216	{
3036	3217	radio.layout = sixButton;
	3218	+
	3219	+ if (CameraPane.FULLSCREEN)
	3220	+ fullscreenLayout = radio.layout;
3037	3221
3038	3222	// bigThree.remove(scenePanel);
3039	3223	// bigThree.remove(centralPanel);
..	..	@@ -3072,6 +3256,9 @@
3072	3256	if (source == sevenButton)
3073	3257	{
3074	3258	radio.layout = sevenButton;
	3259	+
	3260	+ if (CameraPane.FULLSCREEN)
	3261	+ fullscreenLayout = radio.layout;
3075	3262
3076	3263	// bigThree.remove(scenePanel);
3077	3264	// bigThree.remove(centralPanel);
..	..	@@ -3128,12 +3315,19 @@
3128	3315	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3129	3316	{
3130	3317	ab = (cRadio)e.nextElement();
3131		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3318	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
3132	3319	{
	3320	+ // Patch to avoid bug with transparency.
	3321	+ if (!ab.hadMaterial)
	3322	+ {
	3323	+ ab.object.material = null;
	3324	+ }
	3325	+
3133	3326	buttonGroup.remove(ab);
3134	3327	radioPanel.remove(ab);
3135	3328
3136		- ab.GetObject().editWindow = null;
	3329	+ //ab.GetObject().editWindow = null;
	3330	+ ab.GetObject().manipWindow = null;
3137	3331	// ab.GetObject().objectUI = null; // ?????????
3138	3332
3139	3333	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
..	..	@@ -3146,6 +3340,12 @@
3146	3340	} else
3147	3341	if (source == editItem \|\| source == editButton)
3148	3342	{
	3343	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3344	+ {
	3345	+ Object3D child = (Object3D)e.nextElement();
	3346	+ child.pinned = true;
	3347	+ }
	3348	+
3149	3349	EditSelection(false);
3150	3350	} else
3151	3351	if (source == uneditButton)
..	..	@@ -3155,6 +3355,7 @@
3155	3355	Object3D child = (Object3D)e.nextElement();
3156	3356	if(child.editWindow != null)
3157	3357	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3358	+ child.pinned = false;
3158	3359	child.CloseUI();
3159	3360	listUI.remove(child);
3160	3361
..	..	@@ -3171,6 +3372,7 @@
3171	3372	//copy.ClearUI();
3172	3373	for (Object3D obj : listUI)
3173	3374	{
	3375	+ obj.pinned = true;
3174	3376	obj.CloseUI();
3175	3377	}
3176	3378	listUI.clear();
..	..	@@ -3180,7 +3382,7 @@
3180	3382	{
3181	3383	assert(copy == group);
3182	3384
3183		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3385	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3184	3386
3185	3387	for (Object3D obj : listUI)
3186	3388	{
..	..	@@ -3247,6 +3449,7 @@
3247	3449
3248	3450	// fix "+" issue
3249	3451	//group.editWindow = this;
	3452	+ group.manipWindow = this;
3250	3453
3251	3454	/*
3252	3455	currentLayout = radio.layout;
..	..	@@ -3267,7 +3470,7 @@
3267	3470	cameraView.ProtectCamera();
3268	3471	cameraView.repaint();
3269	3472	return;
3270		- } else if (event.getSource() == revertCameraItem)
	3473	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3271	3474	{
3272	3475	cameraView.RevertCamera();
3273	3476	cameraView.repaint();
..	..	@@ -4321,10 +4524,6 @@
4321	4524	// }
4322	4525	// }
4323	4526
4324		- static boolean allparams = true;
4325		-
4326		- static Vector<Object3D> listUI = new Vector<Object3D>();
4327		-
4328	4527	void EditSelection(boolean newWindow)
4329	4528	{
4330	4529	// aConstraints.gridy = 0;
..	..	@@ -4332,7 +4531,7 @@
4332	4531	{
4333	4532	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4334	4533	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4335		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4534	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4336	4535
4337	4536	Object3D elem = (Object3D)group.selection.elementAt(i);
4338	4537	if(elem != group \|\| !newWindow)
..	..	@@ -4418,6 +4617,17 @@
4418	4617
4419	4618	freezemodel = true;
4420	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	+
4421	4631	/**/
4422	4632	//switch (event.id)
4423	4633	{
..	..	@@ -4450,7 +4660,7 @@
4450	4660	if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4451	4661	// a camera
4452	4662	{
4453		- if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	4663	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
4454	4664	{
4455	4665	CameraPane.camerachangeframe = 0; // don't refuse it
4456	4666	Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
..	..	@@ -4459,6 +4669,13 @@
4459	4669	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4460	4670	}
4461	4671
	4672	+ if (tps != null && tps.length == 1)
	4673	+ {
	4674	+ EditSelection(false);
	4675	+ }
	4676	+
	4677	+ SetPinStates(tps != null && tps.length > 0);
	4678	+
4462	4679	refreshContents();
4463	4680	//return true;
4464	4681	}
..	..	@@ -4468,9 +4685,16 @@
4468	4685	freezemodel = false;
4469	4686	}
4470	4687
	4688	+ void SetPinStates(boolean enabled)
	4689	+ {
	4690	+ editButton.setEnabled(enabled);
	4691	+ uneditButton.setEnabled(enabled);
	4692	+ }
	4693	+
4471	4694	void refreshContents(boolean cp)
4472	4695	{
4473		- if (!Globals.MOUSEDRAGGED)
	4696	+ if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
	4697	+ if (!Globals.MOUSEDRAGGED) // && !Globals.TIMERRUNNING)
4474	4698	{
4475	4699	objEditor.ClearInfo(); // .GetMaterial());
4476	4700
..	..	@@ -4569,6 +4793,7 @@
4569	4793
4570	4794	if (cut)
4571	4795	{
	4796	+ if (Globals.SAVEONMAKE)
4572	4797	Save();
4573	4798	//int indices[] = jList.getSelectedIndices();
4574	4799	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -5287,13 +5512,31 @@
5287	5512	cButton clearpanelButton;
5288	5513	cButton unselectButton;
5289	5514
	5515	+ cButton restoreCameraButton;
	5516	+
5290	5517	cButton minButton;
5291	5518	cButton maxButton;
5292	5519	cButton fullButton;
5293		- cButton undoButton;
5294		- cButton redoButton;
5295	5520	cButton saveButton;
5296	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;
5297	5540
5298	5541	cButton screenfitButton;
5299	5542	cButton screenfitpointButton;
..	..	@@ -5315,11 +5558,11 @@
5315	5558	//JTree jTree;
5316	5559	private MenuItem lookAtItem;
5317	5560	private MenuItem lookFromItem;
5318		- private MenuItem switchItem;
	5561	+ private MenuItem switchViewItem;
5319	5562	private MenuItem cutItem;
5320	5563	private MenuItem undoItem;
5321	5564	private MenuItem redoItem;
5322		- private MenuItem duplicateItem;
	5565	+ private JMenuItem duplicateItem;
5323	5566	private MenuItem cloneItem;
5324	5567	private MenuItem cloneSupportItem;
5325	5568	private MenuItem overwriteGeoItem;
..	..	@@ -5407,7 +5650,7 @@
5407	5650	private MenuItem frontItem;
5408	5651	private MenuItem cameraItem;
5409	5652	private MenuItem compositeItem;
5410		- private MenuItem randomItem;
	5653	+ private MenuItem switchItem;
5411	5654	private MenuItem physicsItem;
5412	5655	private MenuItem frameselectorItem;
5413	5656	private MenuItem scriptNodeItem;
..	..	@@ -5481,5 +5724,5 @@
5481	5724
5482	5725	Menu cameraMenu;
5483	5726	MenuItem editCameraItem;
5484		- MenuItem revertCameraItem;
	5727	+ MenuItem restoreCameraItem;
5485	5728	}