~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,23 +204,23 @@
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("-");
	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);
213	222
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);
221		-
222		- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
	223	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
223	224	toggleHandleItem.addItemListener(this);
224	225	toggleHandleItem.setState(CameraPane.HANDLES);
225	226
..	..	@@ -246,7 +247,7 @@
246	247
247	248	cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
248	249	toggleDebugItem.addItemListener(this);
249		- toggleDebugItem.setState(CameraPane.DEBUG);
	250	+ toggleDebugItem.setState(Globals.DEBUG);
250	251
251	252	cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
252	253	toggleFrustumItem.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	{
..	..	@@ -535,6 +540,18 @@
535	540
536	541	void SetupUI2(ObjEditor oe)
537	542	{
	543	+ // June 2019
	544	+ if (oe == null)
	545	+ {
	546	+ //super.SetupUI2(this);
	547	+ //return;
	548	+ }
	549	+
	550	+ if (copy != group)
	551	+ {
	552	+ //super.SetupUI2(this);
	553	+ }
	554	+
538	555	//new Exception().printStackTrace();
539	556
540	557	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -563,39 +580,66 @@
563	580	oe.radioPanel.add(dummyButton);
564	581	oe.buttonGroup.add(dummyButton);
565	582	*/
	583	+ cGridBag copyOptionsPanel = new cGridBag();
	584	+
	585	+ copyOptionsPanel.preferredHeight = 1;
	586	+
566	587	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
567	588
568		- oe.toolbarPanel.add(undoButton = new cButton("Undo", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	589	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	590	+ //minButton.setToolTipText("Minimize window");
	591	+ //minButton.addActionListener(this);
	592	+
	593	+ if (Globals.ADVANCED)
	594	+ {
	595	+ oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	596	+ maxButton.setToolTipText("Maximize window");
	597	+ maxButton.addActionListener(this);
	598	+ }
	599	+
	600	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	601	+ fullButton.setToolTipText("Full-screen window");
	602	+ fullButton.addActionListener(this);
	603	+
	604	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	605	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	606	+ restoreCameraButton.addActionListener(this);
	607	+
	608	+ copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
569	609	undoButton.setToolTipText("Undo changes");
570	610	undoButton.addActionListener(this);
	611	+ undoButton.setEnabled(false);
571	612
572		- oe.toolbarPanel.add(redoButton = new cButton("Redo", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	613	+ copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
573	614	redoButton.setToolTipText("Redo changes");
574	615	redoButton.addActionListener(this);
	616	+ redoButton.setEnabled(false);
575	617
576		- oe.toolbarPanel.add(saveButton = new cButton("Save", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	618	+ copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
577	619	saveButton.setToolTipText("Save changes");
578	620	saveButton.addActionListener(this);
579	621
580		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
	622	+ copyOptionsPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
581	623	liveCB.setToolTipText("Enable animation");
582	624	liveCB.addItemListener(this);
583	625
584		- oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	626	+ copyOptionsPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
585	627	oneStepButton.setToolTipText("Animate one step forward");
586	628	oneStepButton.addActionListener(this);
587	629
588		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	630	+ copyOptionsPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
589	631	fastCB.setToolTipText("Fast mode");
590	632	fastCB.addItemListener(this);
591	633
592		- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
593		- trackCB.setToolTipText("Enable tracking");
594		- trackCB.addItemListener(this);
595		-
596		- oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	634	+ //oe.toolboxPanel.Return();
	635	+
	636	+ copyOptionsPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
597	637	screenfitButton.setToolTipText("Screen fit");
598	638	screenfitButton.addActionListener(this);
	639	+
	640	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	641	+// trackCB.setToolTipText("Enable tracking");
	642	+// trackCB.addItemListener(this);
599	643
600	644	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
601	645	// screenfitpointButton.addActionListener(this);
..	..	@@ -607,65 +651,145 @@
607	651	snapobjectButton.setToolTipText("Snap Object");
608	652	}
609	653
610		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
611		- flashSelectionButton.setToolTipText("Show selection");
612		- flashSelectionButton.addActionListener(this);
	654	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
613	655
614		- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
615		-
616		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	656	+ oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
617	657	twoButton.setToolTipText("Show center view only");
618	658	twoButton.addActionListener(this);
619		- oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	659	+ this.fullscreenLayout = twoButton;
	660	+
	661	+ oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
620	662	fourButton.addActionListener(this);
621	663	fourButton.setToolTipText("Show left panel only");
622		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	664	+ oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
623	665	sixButton.setToolTipText("2-column layout left");
624	666	sixButton.addActionListener(this);
625		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	667	+ oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
626	668	threeButton.setToolTipText("2-column layout right");
627	669	threeButton.addActionListener(this);
628		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	670	+ oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
629	671	sevenButton.setToolTipText("3-column layout");
630	672	sevenButton.addActionListener(this);
631	673	//
632	674
633		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	675	+ oe.toolbarPanel.add(rootButton = GetButton("icons/write.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
634	676	rootButton.setToolTipText("Edit selection in new tab");
635	677	rootButton.addActionListener(this);
636	678
637		- oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	679	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
638	680	closeButton.setToolTipText("Close tab");
639	681	closeButton.addActionListener(this);
640	682	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
641	683	//clearButton.addActionListener(this);
642		-
643		- cGridBag commandsPanel = new cGridBag();
	684	+
	685	+ // INSERT
	686	+ oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	687	+ gridButton.setToolTipText("Create grid");
	688	+ gridButton.addActionListener(this);
	689	+
	690	+ oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	691	+ boxButton.setToolTipText("Create box");
	692	+ boxButton.addActionListener(this);
	693	+
	694	+ oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	695	+ sphereButton.setToolTipText("Create sphere");
	696	+ sphereButton.addActionListener(this);
	697	+
	698	+ oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	699	+ coneButton.setToolTipText("Create cone");
	700	+ coneButton.addActionListener(this);
	701	+
	702	+ oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	703	+ torusButton.setToolTipText("Create torus");
	704	+ torusButton.addActionListener(this);
	705	+
	706	+ oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	707	+ superButton.setToolTipText("Create superellipsoid");
	708	+ superButton.addActionListener(this);
	709	+
	710	+ if (Globals.ADVANCED)
	711	+ {
	712	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	713	+ kleinButton.setToolTipText("Create Klein bottle");
	714	+ kleinButton.addActionListener(this);
	715	+ }
644	716
645		- commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
646		- editButton.setToolTipText("Edit selection");
	717	+ oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	718	+ particlesButton.setToolTipText("Create particle system");
	719	+ particlesButton.addActionListener(this);
	720	+
	721	+ oe.toolboxPanel.Return();
	722	+
	723	+ oe.toolboxPanel.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	724	+ groupButton.setToolTipText("Create group");
	725	+ groupButton.addActionListener(this);
	726	+
	727	+ oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	728	+ compositeButton.setToolTipText("Create composite");
	729	+ compositeButton.addActionListener(this);
	730	+
	731	+ oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	732	+ switchButton.setToolTipText("Create item switcher");
	733	+ switchButton.addActionListener(this);
	734	+
	735	+ oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	736	+ loopButton.setToolTipText("Create loop");
	737	+ loopButton.addActionListener(this);
	738	+
	739	+ oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	740	+ textureButton.setToolTipText("Create texture");
	741	+ textureButton.addActionListener(this);
	742	+
	743	+ oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	744	+ overlayButton.setToolTipText("Create overlay");
	745	+ overlayButton.addActionListener(this);
	746	+
	747	+ oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	748	+ lightButton.setToolTipText("Create light");
	749	+ lightButton.addActionListener(this);
	750	+
	751	+ for (int i=6; --i>=0;)
	752	+ {
	753	+ oe.toolboxPanel.Return();
	754	+ oe.toolboxPanel.add(new cGridBag());
	755	+ oe.toolboxPanel.add(new cGridBag());
	756	+ oe.toolboxPanel.add(new cGridBag());
	757	+ oe.toolboxPanel.add(new cGridBag());
	758	+ oe.toolboxPanel.add(new cGridBag());
	759	+ oe.toolboxPanel.add(new cGridBag());
	760	+ oe.toolboxPanel.add(new cGridBag());
	761	+ }
	762	+
	763	+ // EDIT panel
	764	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	765	+ editButton.setToolTipText("Pin selection controls");
647	766	editButton.addActionListener(this);
648	767
649		- commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
650		- uneditButton.setToolTipText("Unedit selection");
	768	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	769	+ uneditButton.setToolTipText("Remove selection controls");
651	770	uneditButton.addActionListener(this);
652	771
653		- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
654		- allParamsButton.setToolTipText("Edit all params");
	772	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	773	+ allParamsButton.setToolTipText("Show all controle");
655	774	allParamsButton.addActionListener(this);
656	775
657		- commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	776	+ editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
658	777	clearPanelButton.setToolTipText("Clear edit panel");
659	778	clearPanelButton.addActionListener(this);
660	779
661		- commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	780	+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
662	781	unselectButton.setToolTipText("Unselect");
663	782	unselectButton.addActionListener(this);
664	783
665		- commandsPanel.preferredHeight = 1;
	784	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	785	+ flashSelectionButton.setToolTipText("Highlight selection");
	786	+ flashSelectionButton.addActionListener(this);
666	787
667		- oe.treePanel.add(commandsPanel);
668		- oe.treePanel.Return();
	788	+ editCommandsPanel.preferredHeight = 1;
	789	+
	790	+ SetPinStates(false);
	791	+// oe.treePanel.add(commandsPanel);
	792	+// oe.treePanel.Return();
669	793
670	794	// oe.aConstraints.gridx += 1;
671	795	// oe.aConstraints.weighty = 0;
..	..	@@ -682,27 +806,12 @@
682	806
683	807	JScrollPane jSP;
684	808	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
685		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	809	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
686	810	ResetModel();
687	811
688	812	oe.treePanel.add(jSPPanel);
689	813	oe.treePanel.Return();
690	814
691		- cGridBag copyOptionsPanel = new cGridBag();
692		-
693		- copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
694		- colorCB.setToolTipText("Copy color when dropped");
695		- colorCB.addItemListener(this);
696		-
697		- copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
698		- materialCB.setToolTipText("Copy material when dropped");
699		- materialCB.addItemListener(this);
700		-
701		- copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
702		- textureCB.setToolTipText("Copy texture when dropped");
703		- textureCB.addItemListener(this);
704		-
705		- copyOptionsPanel.preferredHeight = 1;
706	815	oe.treePanel.add(copyOptionsPanel);
707	816	oe.treePanel.Return();
708	817
..	..	@@ -733,23 +842,43 @@
733	842
734	843	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
735	844	{
	845	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	846	+ colorCB.setToolTipText("Copy color when dropped");
	847	+ colorCB.addItemListener(this);
	848	+
	849	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	850	+ materialCB.setToolTipText("Copy material when dropped");
	851	+ materialCB.addItemListener(this);
	852	+
	853	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	854	+ textureCB.setToolTipText("Copy texture when dropped");
	855	+ textureCB.addItemListener(this);
	856	+
	857	+ panel.Return();
	858	+
736	859	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
737	860	boxCB.setToolTipText("Display bounding boxes");
738	861	boxCB.addItemListener(this);
739	862
740	863	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
741		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	864	+ zoomBoxCB.setToolTipText("Display only for wheel");
742	865	zoomBoxCB.addItemListener(this);
743	866
744	867	if (true) // Globals.ADVANCED)
745	868	{
746		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
747		- supportCB.setToolTipText("Enable rigging");
748		- supportCB.addItemListener(this);
	869	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	870	+// supportCB.setToolTipText("Enable rigging");
	871	+// supportCB.addItemListener(this);
	872	+
	873	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	874	+ freezeCB.setToolTipText("Fast moving camera");
	875	+ freezeCB.addItemListener(this);
749	876
750	877	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
751	878	// localCB.addItemListener(this);
752	879
	880	+ panel.Return();
	881	+
753	882	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
754	883	crowdCB.setToolTipText("Used for crowds");
755	884	crowdCB.addItemListener(this);
..	..	@@ -766,6 +895,8 @@
766	895	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
767	896	// speakerMocapCB.addItemListener(this);
768	897
	898	+ panel.Return();
	899	+
769	900	if (false)
770	901	{
771	902	// handled in scripts
..	..	@@ -780,32 +911,72 @@
780	911	//constraints.gridy += 1;
781	912	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
782	913	smoothfocusCB.addItemListener(this);
	914	+ panel.Return();
783	915	}
784	916
785	917	//constraints.gridx += 1;
786	918	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
787	919	// debugCB.addItemListener(this);
788	920
	921	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	922	+ trackCB.setToolTipText("Enable tracking target");
	923	+ trackCB.addItemListener(this);
	924	+
789	925	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	926	+ oeilCB.setToolTipText("Move camera when tracking");
790	927	oeilCB.addItemListener(this);
791	928
	929	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	930	+ shadowCB.setToolTipText("When live compute shadows");
	931	+ shadowCB.addItemListener(this);
	932	+
	933	+ panel.Return();
	934	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	935	+ toggleTextureCB.setToolTipText("Load textures");
	936	+ toggleTextureCB.addItemListener(this);
	937	+
	938	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	939	+ toggleSwitchCB.setToolTipText("Choose a single item");
	940	+ toggleSwitchCB.addItemListener(this);
	941	+
	942	+ panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
	943	+ autosaveCB.setToolTipText("On structure change");
	944	+ autosaveCB.addItemListener(this);
	945	+
	946	+ panel.Return();
	947	+ if (Globals.ADVANCED)
	948	+ {
792	949	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
793	950	lookAtCB.setToolTipText("Look-at target");
794	951	lookAtCB.addItemListener(this);
	952	+ }
795	953
796	954	}
797	955
798	956	cGridBag fill = new cGridBag();
799		-
800	957	fill.preferredHeight = 200;
	958	+ cGridBag fill2 = new cGridBag();
	959	+ fill2.preferredHeight = 200;
	960	+ cGridBag fill3 = new cGridBag();
	961	+ fill3.preferredHeight = 200;
801	962
802	963	panel.add(fill);
	964	+ panel.add(fill2);
	965	+ panel.add(fill3);
803	966
804	967	}
805	968
806	969	void EditObject(Object3D obj)
807	970	{
808	971	cRadio radioButton = new cRadio(obj.name);
	972	+
	973	+ // Patch to avoid bug with transparency.
	974	+ radioButton.hadMaterial = obj.material != null;
	975	+ if (!radioButton.hadMaterial)
	976	+ {
	977	+ obj.material = new cMaterial();
	978	+ }
	979	+
809	980	radioButton.SetObject(obj);
810	981	radioButton.layout = sevenButton;
811	982	radioButton.SetCamera(cameraView.renderCamera, false);
..	..	@@ -817,6 +988,8 @@
817	988
818	989	void SetupViews(ObjEditor oe)
819	990	{
	991	+ theFrame = this;
	992	+
820	993	oe.SetupViews();
821	994
822	995	System.out.println("SetupViews");
..	..	@@ -825,23 +998,28 @@
825	998	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
826	999	}
827	1000
828		- JCheckBox liveCB;
829		- JCheckBox supportCB;
830		- JCheckBox localCB;
831		- JCheckBox crowdCB;
832		- JCheckBox smoothCB;
833		- JCheckBox fastCB;
834		- JCheckBox slowCB;
835		- JCheckBox boxCB;
836		- JCheckBox zoomBoxCB;
837		- JCheckBox trackCB;
838		- JCheckBox smoothfocusCB;
	1001	+ cToggleButton liveCB;
	1002	+ cCheckBox supportCB;
	1003	+ cCheckBox localCB;
	1004	+ cCheckBox crowdCB;
	1005	+ cCheckBox smoothCB;
	1006	+ cToggleButton fastCB;
	1007	+ cCheckBox slowCB;
	1008	+ cCheckBox boxCB;
	1009	+ cCheckBox zoomBoxCB;
	1010	+ cCheckBox freezeCB;
	1011	+ //cToggleButton trackCB;
	1012	+ cCheckBox trackCB;
	1013	+ cCheckBox smoothfocusCB;
839	1014	// JCheckBox speakerMocapCB;
840		- JCheckBox speakerCameraCB;
841		- JCheckBox speakerFocusCB;
842		- JCheckBox debugCB;
843		- JCheckBox oeilCB;
844		- JCheckBox lookAtCB;
	1015	+ cCheckBox speakerCameraCB;
	1016	+ cCheckBox speakerFocusCB;
	1017	+ cCheckBox debugCB;
	1018	+
	1019	+ cCheckBox oeilCB;
	1020	+ cCheckBox shadowCB;
	1021	+ cCheckBox autosaveCB;
	1022	+ cCheckBox lookAtCB;
845	1023
846	1024	// static int COLOR = 1;
847	1025	// static int MATERIAL = 2;
..	..	@@ -849,9 +1027,9 @@
849	1027
850	1028	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
851	1029
852		- JCheckBox colorCB;
853		- JCheckBox materialCB;
854		- JCheckBox textureCB;
	1030	+ cCheckBox colorCB;
	1031	+ cCheckBox materialCB;
	1032	+ cCheckBox textureCB;
855	1033
856	1034	public void itemStateChanged(ItemEvent e)
857	1035	{
..	..	@@ -944,6 +1122,18 @@
944	1122	{
945	1123	cameraView.ToggleOeil();
946	1124	}
	1125	+ else if(e.getSource() == shadowCB)
	1126	+ {
	1127	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1128	+ }
	1129	+ else if(e.getSource() == freezeCB)
	1130	+ {
	1131	+ Globals.FREEZEONMOVE ^= true;
	1132	+ }
	1133	+ else if(e.getSource() == autosaveCB)
	1134	+ {
	1135	+ Globals.SAVEONMAKE ^= true;
	1136	+ }
947	1137	else if(e.getSource() == lookAtCB)
948	1138	{
949	1139	cameraView.ToggleLookAt();
..	..	@@ -960,7 +1150,8 @@
960	1150
961	1151	/**/
962	1152	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
963		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1153	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1154	+ TreePath path = objEditor.jTree.getSelectionPath();
964	1155	if ((path == null) \|\| (path.getPathCount() <= 1)) {
965	1156	// We can't move the root node or an empty selection
966	1157	return;
..	..	@@ -1077,23 +1268,33 @@
1077	1268
1078	1269	assert target == objEditor.jTree;
1079	1270	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1271	+ Object3D destinationLeaf;
1080	1272	try {
1081		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1273	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
1082	1274	} catch (Exception e) {
1083	1275	System.out.println("destinationPath : " + destinationPath);
1084	1276	return;
1085	1277	}
1086	1278
1087		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1279	+ for (int i=group.selection.size(); --i>=0;)
1088	1280	{
	1281	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1282	+
	1283	+ // Cannot move into itself
	1284	+ if (child == destinationLeaf)
	1285	+ return;
	1286	+ }
	1287	+
	1288	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1289	+// {
1089	1290	loadClipboard(true);
1090	1291	objEditor.jTree.setSelectionPath(destinationPath);
1091	1292	pasteInto(false, false);
1092		- } else {
1093		- loadClipboard(false);
1094		- objEditor.jTree.setSelectionPath(destinationPath);
1095		- pasteInto(false, false); // true); // ???
1096		- }
	1293	+// } else {
	1294	+// loadClipboard(false);
	1295	+// objEditor.jTree.setSelectionPath(destinationPath);
	1296	+// pasteInto(false, false); // true); // ???
	1297	+// }
1097	1298	}
1098	1299	public void dropActionChanged(DropTargetDragEvent dtde)
1099	1300	// Called if the user has modified the current drop gesture
..	..	@@ -1198,22 +1399,30 @@
1198	1399	{
1199	1400	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1200	1401	//heightFieldItem.addActionListener(this);
1201		- gridItem = menu.add(new MenuItem("Grid"));
1202		- gridItem.addActionListener(this);
1203		- rectoidItem = menu.add(new MenuItem("Box"));
1204		- rectoidItem.addActionListener(this);
1205		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1206		- ellipsoidItem.addActionListener(this);
1207		- coneItem = menu.add(new MenuItem("Cone"));
1208		- coneItem.addActionListener(this);
1209		- torusItem = menu.add(new MenuItem("Torus"));
1210		- torusItem.addActionListener(this);
1211		- superItem = menu.add(new MenuItem("Superellipsoid"));
1212		- superItem.addActionListener(this);
	1402	+// gridItem = menu.add(new MenuItem("Grid"));
	1403	+// gridItem.addActionListener(this);
	1404	+// rectoidItem = menu.add(new MenuItem("Box"));
	1405	+// rectoidItem.addActionListener(this);
	1406	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1407	+// ellipsoidItem.addActionListener(this);
	1408	+// coneItem = menu.add(new MenuItem("Cone"));
	1409	+// coneItem.addActionListener(this);
	1410	+// torusItem = menu.add(new MenuItem("Torus"));
	1411	+// torusItem.addActionListener(this);
	1412	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1413	+// superItem.addActionListener(this);
	1414	+
	1415	+ cameraItem = menu.add(new MenuItem("Camera"));
	1416	+ cameraItem.addActionListener(this);
	1417	+
	1418	+ if (!Globals.ADVANCED)
	1419	+ {
1213	1420	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1214	1421	kleinItem.addActionListener(this);
1215		- particleItem = menu.add(new MenuItem("Particle system"));
1216		- particleItem.addActionListener(this);
	1422	+ }
	1423	+
	1424	+// particleItem = menu.add(new MenuItem("Particle system"));
	1425	+// particleItem.addActionListener(this);
1217	1426	if (Globals.ADVANCED)
1218	1427	{
1219	1428	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1239,15 +1448,15 @@
1239	1448	}
1240	1449	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1241	1450	bezierItem.addActionListener(this);
1242		- overlayItem = menu.add(new MenuItem("Overlay"));
1243		- overlayItem.addActionListener(this);
1244		- lightItem = menu.add(new MenuItem("Light"));
1245		- lightItem.addActionListener(this);
	1451	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1452	+// overlayItem.addActionListener(this);
	1453	+// lightItem = menu.add(new MenuItem("Light"));
	1454	+// lightItem.addActionListener(this);
1246	1455	menu.add("-");
1247	1456	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1248	1457	//superLoopItem.addActionListener(this);
1249		- loopItem = menu.add(new MenuItem("Loop"));
1250		- loopItem.addActionListener(this);
	1458	+// loopItem = menu.add(new MenuItem("Loop"));
	1459	+// loopItem.addActionListener(this);
1251	1460	doubleItem = menu.add(new MenuItem("Fork"));
1252	1461	doubleItem.addActionListener(this);
1253	1462	if (Globals.ADVANCED)
..	..	@@ -1428,9 +1637,24 @@
1428	1637	shadow.material = new cMaterial(obj.material);
1429	1638	shadow.material.diffuse = 0.0001f;
1430	1639	shadow.material.specular = 0.0001f;
	1640	+ //shadow.projectedVertices[1].x = 300;
1431	1641
1432	1642	makeSomething(shadow);
1433	1643	}
	1644	+
	1645	+ private void ClearUnpinned()
	1646	+ {
	1647	+ //for (Object3D obj : listUI)
	1648	+ for (int i=listUI.size(); --i>=0;)
	1649	+ {
	1650	+ Object3D obj = listUI.elementAt(i);
	1651	+ if (!obj.pinned)
	1652	+ {
	1653	+ obj.CloseUI();
	1654	+ listUI.remove(i);
	1655	+ }
	1656	+ }
	1657	+ }
1434	1658
1435	1659	/**
1436	1660	* applyExample
..	..	@@ -1675,7 +1899,7 @@
1675	1899	{
1676	1900	ScreenFit();
1677	1901	} else
1678		- if (source == switchItem)
	1902	+ if (source == switchViewItem)
1679	1903	{
1680	1904	cVector v1 = new cVector();
1681	1905	cVector v2 = new cVector();
..	..	@@ -1684,11 +1908,11 @@
1684	1908	objEditor.cameraView.renderCamera.setAim(v2, v1);
1685	1909	objEditor.cameraView.repaint();
1686	1910	} else
1687		- if (source == rectoidItem)
	1911	+ if (source == rectoidItem \|\| source == boxButton)
1688	1912	{
1689	1913	makeSomething(new Box());
1690	1914	} else
1691		- if (source == particleItem)
	1915	+ if (source == particleItem \|\| source == particlesButton)
1692	1916	{
1693	1917	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1694	1918	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1767,27 +1991,27 @@
1767	1991
1768	1992	makeSomething(obj);
1769	1993	} else
1770		- if (source == gridItem)
	1994	+ if (source == gridItem \|\| source == gridButton)
1771	1995	{
1772	1996	makeSomething(new Grid());
1773	1997	} else
1774		- if (source == ellipsoidItem)
	1998	+ if (source == ellipsoidItem \|\| source == sphereButton)
1775	1999	{
1776	2000	makeSomething(new Sphere());
1777	2001	} else
1778		- if (source == coneItem)
	2002	+ if (source == coneItem \|\| source == coneButton)
1779	2003	{
1780	2004	makeSomething(new Cone());
1781	2005	} else
1782		- if (source == torusItem)
	2006	+ if (source == torusItem \|\| source == torusButton)
1783	2007	{
1784	2008	makeSomething(new Torus());
1785	2009	} else
1786		- if (source == superItem)
	2010	+ if (source == superItem \|\| source == superButton)
1787	2011	{
1788	2012	makeSomething(new Superellipsoid());
1789	2013	} else
1790		- if (source == kleinItem)
	2014	+ if (source == kleinItem \|\| source == kleinButton)
1791	2015	{
1792	2016	makeSomething(new Klein());
1793	2017	} else
..	..	@@ -1807,7 +2031,7 @@
1807	2031	{
1808	2032	makeSomething(new BezierSurface());
1809	2033	} else
1810		- if (source == overlayItem)
	2034	+ if (source == overlayItem \|\| source == overlayButton)
1811	2035	{
1812	2036	/*
1813	2037	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1855,7 +2079,7 @@
1855	2079	s.setup();
1856	2080	makeSomething(s);
1857	2081	} else
1858		- if (source == lightItem)
	2082	+ if (source == lightItem \|\| source == lightButton)
1859	2083	{
1860	2084	makeSomething(new Light());
1861	2085	} else
..	..	@@ -1905,30 +2129,30 @@
1905	2129
1906	2130	group(g);
1907	2131	} else
1908		- if (source == loopItem)
	2132	+ if (source == loopItem \|\| source == loopButton)
1909	2133	{
1910	2134	Composite csg = new GroupLeaf();
1911	2135	csg.count = 5;
1912	2136	group(csg);
1913		- Composite child = new cGroup();
	2137	+ Composite child = new cGroup("Branch");
1914	2138	csg.addChild(child);
1915	2139	child.addChild(csg);
1916	2140	} else
1917	2141	if (source == doubleItem)
1918	2142	{
1919		- Composite csg = new GroupLeaf();
	2143	+ Composite csg = new GroupLeaf("Fork");
1920	2144	csg.count = 5;
1921	2145	group(csg);
1922		- Composite child = new cGroup();
	2146	+ Composite child = new cGroup("Branch A");
1923	2147	csg.addChild(child);
1924	2148	child.addChild(csg);
1925		- child = new cGroup();
	2149	+ child = new cGroup("Branch B");
1926	2150	csg.addChild(child);
1927	2151	child.addChild(csg);
1928	2152	} else
1929	2153	if (source == tripleItem)
1930	2154	{
1931		- Composite csg = new GroupLeaf();
	2155	+ Composite csg = new GroupLeaf("Trident");
1932	2156	csg.count = 4;
1933	2157	group(csg);
1934	2158	Composite child = new cGroup();
..	..	@@ -1977,6 +2201,18 @@
1977	2201	if (source == dumpItem)
1978	2202	{
1979	2203	DumpObject();
	2204	+ } else
	2205	+ if (source == minButton)
	2206	+ {
	2207	+ Minimize();
	2208	+ } else
	2209	+ if (source == maxButton)
	2210	+ {
	2211	+ Maximize();
	2212	+ } else
	2213	+ if (source == fullButton)
	2214	+ {
	2215	+ ToggleFullScreen();
1980	2216	} else
1981	2217	if (source == undoButton)
1982	2218	{
..	..	@@ -2383,9 +2619,9 @@
2383	2619	{
2384	2620	ClearSelection(true);
2385	2621	} else
2386		- if (source == grabItem)
	2622	+ if (source == grabItem \|\| source == groupButton)
2387	2623	{
2388		- group(new cGroup(), true);
	2624	+ group(new cGroup(), false); // true);
2389	2625	} else
2390	2626	if (source == hideItem)
2391	2627	{
..	..	@@ -2403,11 +2639,11 @@
2403	2639	{
2404	2640	makeSomething(new Camera());
2405	2641	} else
2406		- if (source == compositeItem)
	2642	+ if (source == compositeItem \|\| source == compositeButton)
2407	2643	{
2408	2644	group(new Composite());
2409	2645	} else
2410		- if (source == randomItem)
	2646	+ if (source == switchItem \|\| source == switchButton)
2411	2647	{
2412	2648	RandomNode random = new RandomNode();
2413	2649	group(random);
..	..	@@ -2509,7 +2745,7 @@
2509	2745	{
2510	2746	group(new cLinker());
2511	2747	} else
2512		- if (source == textureItem)
	2748	+ if (source == textureItem \|\| source == textureButton)
2513	2749	{
2514	2750	group(new TextureNode());
2515	2751	} else
..	..	@@ -2529,17 +2765,30 @@
2529	2765	{
2530	2766	CastShadow(2);
2531	2767	} else
2532		- if (source == ungroupItem)
	2768	+ if (source == ungroupItem \|\| source == ungroupButton)
2533	2769	{
2534		- //ungroup();
	2770	+ boolean hasRoot = false;
	2771	+
2535	2772	for (int i=0; i<group.selection.size(); i++)
2536	2773	{
2537		- Ungroup(group.selection.get(i));
	2774	+ if (group.selection.get(i) == group)
	2775	+ {
	2776	+ hasRoot = true;
	2777	+ break;
	2778	+ }
2538	2779	}
2539	2780
2540		- ClearSelection(false);
2541		-
2542		- refreshContents();
	2781	+ if (!hasRoot)
	2782	+ {
	2783	+ for (int i=0; i<group.selection.size(); i++)
	2784	+ {
	2785	+ Ungroup(group.selection.get(i));
	2786	+ }
	2787	+
	2788	+ ClearSelection(false);
	2789	+
	2790	+ refreshContents();
	2791	+ }
2543	2792	} else
2544	2793	if (source == genUVItem)
2545	2794	{
..	..	@@ -2867,6 +3116,10 @@
2867	3116	if (source == twoButton)
2868	3117	{
2869	3118	radio.layout = twoButton;
	3119	+
	3120	+ if (CameraPane.FULLSCREEN)
	3121	+ fullscreenLayout = radio.layout;
	3122	+
2870	3123	// bug
2871	3124	//gridPanel.setDividerLocation(1.0);
2872	3125	//bigPanel.setDividerLocation(0.0);
..	..	@@ -2899,10 +3152,31 @@
2899	3152	bigThree.ClearUI();
2900	3153	bigThree.add(centralPanel);
2901	3154	bigThree.FlushUI();
	3155	+
	3156	+ cameraView.requestFocusInWindow();
	3157	+
	3158	+// refreshContents(true);
	3159	+//
	3160	+// try
	3161	+// {
	3162	+// java.awt.Robot bot = new java.awt.Robot();
	3163	+// int mask = InputEvent.BUTTON1_MASK;
	3164	+// bot.mouseMove(100, 100);
	3165	+// bot.mousePress(mask);
	3166	+// bot.mouseRelease(mask);
	3167	+// }
	3168	+// catch (Exception e)
	3169	+// {
	3170	+//
	3171	+// }
	3172	+
2902	3173	} else
2903	3174	if (source == threeButton)
2904	3175	{
2905	3176	radio.layout = threeButton;
	3177	+
	3178	+ if (CameraPane.FULLSCREEN)
	3179	+ fullscreenLayout = radio.layout;
2906	3180
2907	3181	// bigThree.remove(scenePanel);
2908	3182	// bigThree.remove(centralPanel);
..	..	@@ -2935,10 +3209,15 @@
2935	3209	bigThree.add(centralPanel);
2936	3210	bigThree.add(XYZPanel);
2937	3211	bigThree.FlushUI();
	3212	+
	3213	+ cameraView.requestFocusInWindow();
2938	3214	} else
2939	3215	if (source == fourButton)
2940	3216	{
2941	3217	radio.layout = fourButton;
	3218	+
	3219	+ if (CameraPane.FULLSCREEN)
	3220	+ fullscreenLayout = radio.layout;
2942	3221
2943	3222	// bigThree.remove(scenePanel);
2944	3223	// bigThree.remove(centralPanel);
..	..	@@ -2970,10 +3249,15 @@
2970	3249	bigThree.ClearUI();
2971	3250	bigThree.add(scenePanel);
2972	3251	bigThree.FlushUI();
	3252	+
	3253	+ cameraView.requestFocusInWindow();
2973	3254	} else
2974	3255	if (source == sixButton)
2975	3256	{
2976	3257	radio.layout = sixButton;
	3258	+
	3259	+ if (CameraPane.FULLSCREEN)
	3260	+ fullscreenLayout = radio.layout;
2977	3261
2978	3262	// bigThree.remove(scenePanel);
2979	3263	// bigThree.remove(centralPanel);
..	..	@@ -3006,10 +3290,15 @@
3006	3290	bigThree.add(scenePanel);
3007	3291	bigThree.add(centralPanel);
3008	3292	bigThree.FlushUI();
	3293	+
	3294	+ cameraView.requestFocusInWindow();
3009	3295	} else
3010	3296	if (source == sevenButton)
3011	3297	{
3012	3298	radio.layout = sevenButton;
	3299	+
	3300	+ if (CameraPane.FULLSCREEN)
	3301	+ fullscreenLayout = radio.layout;
3013	3302
3014	3303	// bigThree.remove(scenePanel);
3015	3304	// bigThree.remove(centralPanel);
..	..	@@ -3043,6 +3332,8 @@
3043	3332	bigThree.add(centralPanel);
3044	3333	bigThree.add(XYZPanel);
3045	3334	bigThree.FlushUI();
	3335	+
	3336	+ cameraView.requestFocusInWindow();
3046	3337	} else
3047	3338	if (source == rootButton)
3048	3339	{
..	..	@@ -3054,6 +3345,7 @@
3054	3345	EditObject(obj);
3055	3346	}
3056	3347
	3348	+ cameraView.requestFocusInWindow();
3057	3349	refreshContents(true);
3058	3350	} else
3059	3351	if (source == closeButton)
..	..	@@ -3063,22 +3355,37 @@
3063	3355	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3064	3356	{
3065	3357	ab = (cRadio)e.nextElement();
3066		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3358	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
3067	3359	{
	3360	+ // Patch to avoid bug with transparency.
	3361	+ if (!ab.hadMaterial)
	3362	+ {
	3363	+ ab.object.material = null;
	3364	+ }
	3365	+
3068	3366	buttonGroup.remove(ab);
3069	3367	radioPanel.remove(ab);
3070	3368
3071		- ab.GetObject().editWindow = null;
	3369	+ //ab.GetObject().editWindow = null;
	3370	+ ab.GetObject().manipWindow = null;
3072	3371	// ab.GetObject().objectUI = null; // ?????????
3073	3372
3074	3373	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
3075	3374	break;
3076	3375	}
3077	3376	}
	3377	+
	3378	+ cameraView.requestFocusInWindow();
3078	3379	refreshContents(true);
3079	3380	} else
3080	3381	if (source == editItem \|\| source == editButton)
3081	3382	{
	3383	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3384	+ {
	3385	+ Object3D child = (Object3D)e.nextElement();
	3386	+ child.pinned = true;
	3387	+ }
	3388	+
3082	3389	EditSelection(false);
3083	3390	} else
3084	3391	if (source == uneditButton)
..	..	@@ -3088,6 +3395,7 @@
3088	3395	Object3D child = (Object3D)e.nextElement();
3089	3396	if(child.editWindow != null)
3090	3397	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3398	+ child.pinned = false;
3091	3399	child.CloseUI();
3092	3400	listUI.remove(child);
3093	3401
..	..	@@ -3104,6 +3412,7 @@
3104	3412	//copy.ClearUI();
3105	3413	for (Object3D obj : listUI)
3106	3414	{
	3415	+ obj.pinned = false;
3107	3416	obj.CloseUI();
3108	3417	}
3109	3418	listUI.clear();
..	..	@@ -3113,7 +3422,7 @@
3113	3422	{
3114	3423	assert(copy == group);
3115	3424
3116		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3425	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3117	3426
3118	3427	for (Object3D obj : listUI)
3119	3428	{
..	..	@@ -3179,7 +3488,8 @@
3179	3488	}
3180	3489
3181	3490	// fix "+" issue
3182		- group.editWindow = this;
	3491	+ //group.editWindow = this;
	3492	+ group.manipWindow = this;
3183	3493
3184	3494	/*
3185	3495	currentLayout = radio.layout;
..	..	@@ -3187,18 +3497,25 @@
3187	3497	currentLayout = sevenButton;
3188	3498	*/
3189	3499	radio.layout.doClick();
	3500	+
	3501	+ ClearUnpinned();
	3502	+ SetPinStates(group.selection.size() > 0);
	3503	+ if (group.selection.size() == 1)
	3504	+ EditSelection(false);
3190	3505	keepparent = group.parent;
3191	3506	// PARENT = NULL or not???
3192	3507	//group.parent = null; // ROOT
3193	3508	//group.attributes = -1;
3194	3509	ResetModel();
	3510	+
	3511	+ cameraView.requestFocusInWindow();
3195	3512	refreshContents(true);
3196	3513	} else if (event.getSource() == editCameraItem)
3197	3514	{
3198	3515	cameraView.ProtectCamera();
3199	3516	cameraView.repaint();
3200	3517	return;
3201		- } else if (event.getSource() == revertCameraItem)
	3518	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3202	3519	{
3203	3520	cameraView.RevertCamera();
3204	3521	cameraView.repaint();
..	..	@@ -3215,7 +3532,6 @@
3215	3532	}
3216	3533
3217	3534	boolean useclient = false;
3218		- cRadio radio;
3219	3535
3220	3536	void ToggleRoot()
3221	3537	{
..	..	@@ -4253,10 +4569,6 @@
4253	4569	// }
4254	4570	// }
4255	4571
4256		- static boolean allparams = true;
4257		-
4258		- static Vector<Object3D> listUI = new Vector<Object3D>();
4259		-
4260	4572	void EditSelection(boolean newWindow)
4261	4573	{
4262	4574	// aConstraints.gridy = 0;
..	..	@@ -4264,7 +4576,7 @@
4264	4576	{
4265	4577	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4266	4578	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4267		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4579	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4268	4580
4269	4581	Object3D elem = (Object3D)group.selection.elementAt(i);
4270	4582	if(elem != group \|\| !newWindow)
..	..	@@ -4349,7 +4661,8 @@
4349	4661	//new Exception().printStackTrace();
4350	4662
4351	4663	freezemodel = true;
4352		-
	4664	+ ClearUnpinned();
	4665	+
4353	4666	/**/
4354	4667	//switch (event.id)
4355	4668	{
..	..	@@ -4382,7 +4695,7 @@
4382	4695	if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4383	4696	// a camera
4384	4697	{
4385		- if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	4698	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
4386	4699	{
4387	4700	CameraPane.camerachangeframe = 0; // don't refuse it
4388	4701	Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
..	..	@@ -4391,6 +4704,13 @@
4391	4704	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4392	4705	}
4393	4706
	4707	+ if (tps != null && tps.length == 1)
	4708	+ {
	4709	+ EditSelection(false);
	4710	+ }
	4711	+
	4712	+ SetPinStates(tps != null && tps.length > 0);
	4713	+
4394	4714	refreshContents();
4395	4715	//return true;
4396	4716	}
..	..	@@ -4400,9 +4720,18 @@
4400	4720	freezemodel = false;
4401	4721	}
4402	4722
	4723	+ void SetPinStates(boolean enabled)
	4724	+ {
	4725	+ editButton.setEnabled(enabled);
	4726	+ uneditButton.setEnabled(enabled);
	4727	+ unselectButton.setEnabled(enabled);
	4728	+ flashSelectionButton.setEnabled(enabled);
	4729	+ }
	4730	+
4403	4731	void refreshContents(boolean cp)
4404	4732	{
4405		- if (!Globals.MOUSEDRAGGED)
	4733	+ if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
	4734	+ if (!Globals.MOUSEDRAGGED) // && !Globals.TIMERRUNNING)
4406	4735	{
4407	4736	objEditor.ClearInfo(); // .GetMaterial());
4408	4737
..	..	@@ -4501,6 +4830,7 @@
4501	4830
4502	4831	if (cut)
4503	4832	{
	4833	+ if (Globals.SAVEONMAKE)
4504	4834	Save();
4505	4835	//int indices[] = jList.getSelectedIndices();
4506	4836	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -5219,10 +5549,28 @@
5219	5549	cButton clearpanelButton;
5220	5550	cButton unselectButton;
5221	5551
	5552	+ cButton restoreCameraButton;
	5553	+
5222	5554	cButton saveButton;
5223		- cButton undoButton;
5224		- cButton redoButton;
5225	5555	cButton oneStepButton;
	5556	+
	5557	+ cButton groupButton;
	5558	+ cButton ungroupButton;
	5559	+ cButton compositeButton;
	5560	+ cButton switchButton;
	5561	+ cButton loopButton;
	5562	+ cButton textureButton;
	5563	+
	5564	+ cButton gridButton;
	5565	+ cButton boxButton;
	5566	+ cButton sphereButton;
	5567	+ cButton coneButton;
	5568	+ cButton torusButton;
	5569	+ cButton superButton;
	5570	+ cButton kleinButton;
	5571	+ cButton particlesButton;
	5572	+ cButton overlayButton;
	5573	+ cButton lightButton;
5226	5574
5227	5575	cButton screenfitButton;
5228	5576	cButton screenfitpointButton;
..	..	@@ -5235,14 +5583,6 @@
5235	5583
5236	5584	cButton setsupportButton;
5237	5585
5238		- cButton twoButton;
5239		- cButton sixButton;
5240		- cButton threeButton;
5241		- cButton sevenButton;
5242		- cButton fourButton; // full panel
5243		- cButton oneButton; // full XYZ
5244		- //cButton currentLayout;
5245		-
5246	5586	//
5247	5587	//Composite
5248	5588	Object3D // to do !!
..	..	@@ -5252,11 +5592,11 @@
5252	5592	//JTree jTree;
5253	5593	private MenuItem lookAtItem;
5254	5594	private MenuItem lookFromItem;
5255		- private MenuItem switchItem;
	5595	+ private MenuItem switchViewItem;
5256	5596	private MenuItem cutItem;
5257	5597	private MenuItem undoItem;
5258	5598	private MenuItem redoItem;
5259		- private MenuItem duplicateItem;
	5599	+ private JMenuItem duplicateItem;
5260	5600	private MenuItem cloneItem;
5261	5601	private MenuItem cloneSupportItem;
5262	5602	private MenuItem overwriteGeoItem;
..	..	@@ -5344,7 +5684,7 @@
5344	5684	private MenuItem frontItem;
5345	5685	private MenuItem cameraItem;
5346	5686	private MenuItem compositeItem;
5347		- private MenuItem randomItem;
	5687	+ private MenuItem switchItem;
5348	5688	private MenuItem physicsItem;
5349	5689	private MenuItem frameselectorItem;
5350	5690	private MenuItem scriptNodeItem;
..	..	@@ -5418,5 +5758,5 @@
5418	5758
5419	5759	Menu cameraMenu;
5420	5760	MenuItem editCameraItem;
5421		- MenuItem revertCameraItem;
	5761	+ MenuItem restoreCameraItem;
5422	5762	}