~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);
..	..	@@ -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,63 @@
563	580	oe.radioPanel.add(dummyButton);
564	581	oe.buttonGroup.add(dummyButton);
565	582	*/
	583	+ cGridBag copyOptionsPanel = new cGridBag();
	584	+
	585	+ copyOptionsPanel.preferredHeight = 2;
	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	+ oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	594	+ maxButton.setToolTipText("Maximize window");
	595	+ maxButton.addActionListener(this);
	596	+
	597	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	598	+ fullButton.setToolTipText("Full-screen window");
	599	+ fullButton.addActionListener(this);
	600	+
	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);
569	606	undoButton.setToolTipText("Undo changes");
570	607	undoButton.addActionListener(this);
	608	+ undoButton.setEnabled(false);
571	609
572		- oe.toolbarPanel.add(redoButton = new cButton("Redo", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	610	+ copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
573	611	redoButton.setToolTipText("Redo changes");
574	612	redoButton.addActionListener(this);
	613	+ redoButton.setEnabled(false);
575	614
576		- oe.toolbarPanel.add(saveButton = new cButton("Save", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	615	+ copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
577	616	saveButton.setToolTipText("Save changes");
578	617	saveButton.addActionListener(this);
579	618
580		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
	619	+ copyOptionsPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
581	620	liveCB.setToolTipText("Enable animation");
582	621	liveCB.addItemListener(this);
583	622
584		- oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	623	+ copyOptionsPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
585	624	oneStepButton.setToolTipText("Animate one step forward");
586	625	oneStepButton.addActionListener(this);
587	626
588		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	627	+ copyOptionsPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
589	628	fastCB.setToolTipText("Fast mode");
590	629	fastCB.addItemListener(this);
591	630
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);
	631	+ //oe.toolboxPanel.Return();
	632	+
	633	+ copyOptionsPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
597	634	screenfitButton.setToolTipText("Screen fit");
598	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);
599	640
600	641	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
601	642	// screenfitpointButton.addActionListener(this);
..	..	@@ -607,65 +648,144 @@
607	648	snapobjectButton.setToolTipText("Snap Object");
608	649	}
609	650
610		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
611		- flashSelectionButton.setToolTipText("Show selection");
612		- flashSelectionButton.addActionListener(this);
	651	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
613	652
614		- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
615		-
616		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	653	+ oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
617	654	twoButton.setToolTipText("Show center view only");
618	655	twoButton.addActionListener(this);
619		- 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);
620	659	fourButton.addActionListener(this);
621	660	fourButton.setToolTipText("Show left panel only");
622		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	661	+ oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
623	662	sixButton.setToolTipText("2-column layout left");
624	663	sixButton.addActionListener(this);
625		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	664	+ oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
626	665	threeButton.setToolTipText("2-column layout right");
627	666	threeButton.addActionListener(this);
628		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	667	+ oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
629	668	sevenButton.setToolTipText("3-column layout");
630	669	sevenButton.addActionListener(this);
631	670	//
632	671
633		- 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);
634	673	rootButton.setToolTipText("Edit selection in new tab");
635	674	rootButton.addActionListener(this);
636	675
637		- 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);
638	677	closeButton.setToolTipText("Close tab");
639	678	closeButton.addActionListener(this);
640	679	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
641	680	//clearButton.addActionListener(this);
642		-
643		- 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	+ }
644	713
645		- 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);
646	762	editButton.setToolTipText("Edit selection");
647	763	editButton.addActionListener(this);
648	764
649		- commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	765	+ editCommandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
650	766	uneditButton.setToolTipText("Unedit selection");
651	767	uneditButton.addActionListener(this);
652	768
653		- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	769	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
654	770	allParamsButton.setToolTipText("Edit all params");
655	771	allParamsButton.addActionListener(this);
656	772
657		- commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	773	+ editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
658	774	clearPanelButton.setToolTipText("Clear edit panel");
659	775	clearPanelButton.addActionListener(this);
660	776
661		- commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	777	+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
662	778	unselectButton.setToolTipText("Unselect");
663	779	unselectButton.addActionListener(this);
664	780
665		- 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);
666	784
667		- oe.treePanel.add(commandsPanel);
668		- oe.treePanel.Return();
	785	+ editCommandsPanel.preferredHeight = 1;
	786	+
	787	+// oe.treePanel.add(commandsPanel);
	788	+// oe.treePanel.Return();
669	789
670	790	// oe.aConstraints.gridx += 1;
671	791	// oe.aConstraints.weighty = 0;
..	..	@@ -682,27 +802,12 @@
682	802
683	803	JScrollPane jSP;
684	804	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
685		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	805	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
686	806	ResetModel();
687	807
688	808	oe.treePanel.add(jSPPanel);
689	809	oe.treePanel.Return();
690	810
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	811	oe.treePanel.add(copyOptionsPanel);
707	812	oe.treePanel.Return();
708	813
..	..	@@ -733,6 +838,20 @@
733	838
734	839	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
735	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	+
736	855	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
737	856	boxCB.setToolTipText("Display bounding boxes");
738	857	boxCB.addItemListener(this);
..	..	@@ -750,6 +869,8 @@
750	869	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
751	870	// localCB.addItemListener(this);
752	871
	872	+ panel.Return();
	873	+
753	874	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
754	875	crowdCB.setToolTipText("Used for crowds");
755	876	crowdCB.addItemListener(this);
..	..	@@ -766,6 +887,8 @@
766	887	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
767	888	// speakerMocapCB.addItemListener(this);
768	889
	890	+ panel.Return();
	891	+
769	892	if (false)
770	893	{
771	894	// handled in scripts
..	..	@@ -780,32 +903,72 @@
780	903	//constraints.gridy += 1;
781	904	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
782	905	smoothfocusCB.addItemListener(this);
	906	+ panel.Return();
783	907	}
784	908
785	909	//constraints.gridx += 1;
786	910	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
787	911	// debugCB.addItemListener(this);
788	912
	913	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	914	+ trackCB.setToolTipText("Enable tracking target");
	915	+ trackCB.addItemListener(this);
	916	+
789	917	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	918	+ oeilCB.setToolTipText("Move camera when tracking");
790	919	oeilCB.addItemListener(this);
791	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	+ {
792	941	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
793	942	lookAtCB.setToolTipText("Look-at target");
794	943	lookAtCB.addItemListener(this);
	944	+ }
795	945
796	946	}
797	947
798	948	cGridBag fill = new cGridBag();
799		-
800	949	fill.preferredHeight = 200;
	950	+ cGridBag fill2 = new cGridBag();
	951	+ fill2.preferredHeight = 200;
	952	+ cGridBag fill3 = new cGridBag();
	953	+ fill3.preferredHeight = 200;
801	954
802	955	panel.add(fill);
	956	+ panel.add(fill2);
	957	+ panel.add(fill3);
803	958
804	959	}
805	960
806	961	void EditObject(Object3D obj)
807	962	{
808	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	+
809	972	radioButton.SetObject(obj);
810	973	radioButton.layout = sevenButton;
811	974	radioButton.SetCamera(cameraView.renderCamera, false);
..	..	@@ -817,6 +980,8 @@
817	980
818	981	void SetupViews(ObjEditor oe)
819	982	{
	983	+ theFrame = this;
	984	+
820	985	oe.SetupViews();
821	986
822	987	System.out.println("SetupViews");
..	..	@@ -825,23 +990,27 @@
825	990	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
826	991	}
827	992
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;
	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;
839	1005	// JCheckBox speakerMocapCB;
840		- JCheckBox speakerCameraCB;
841		- JCheckBox speakerFocusCB;
842		- JCheckBox debugCB;
843		- JCheckBox oeilCB;
844		- JCheckBox lookAtCB;
	1006	+ cCheckBox speakerCameraCB;
	1007	+ cCheckBox speakerFocusCB;
	1008	+ cCheckBox debugCB;
	1009	+
	1010	+ cCheckBox oeilCB;
	1011	+ cCheckBox shadowCB;
	1012	+ cCheckBox autosaveCB;
	1013	+ cCheckBox lookAtCB;
845	1014
846	1015	// static int COLOR = 1;
847	1016	// static int MATERIAL = 2;
..	..	@@ -849,9 +1018,9 @@
849	1018
850	1019	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
851	1020
852		- JCheckBox colorCB;
853		- JCheckBox materialCB;
854		- JCheckBox textureCB;
	1021	+ cCheckBox colorCB;
	1022	+ cCheckBox materialCB;
	1023	+ cCheckBox textureCB;
855	1024
856	1025	public void itemStateChanged(ItemEvent e)
857	1026	{
..	..	@@ -944,6 +1113,14 @@
944	1113	{
945	1114	cameraView.ToggleOeil();
946	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	+ }
947	1124	else if(e.getSource() == lookAtCB)
948	1125	{
949	1126	cameraView.ToggleLookAt();
..	..	@@ -960,7 +1137,8 @@
960	1137
961	1138	/**/
962	1139	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
963		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1140	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1141	+ TreePath path = objEditor.jTree.getSelectionPath();
964	1142	if ((path == null) \|\| (path.getPathCount() <= 1)) {
965	1143	// We can't move the root node or an empty selection
966	1144	return;
..	..	@@ -1077,23 +1255,33 @@
1077	1255
1078	1256	assert target == objEditor.jTree;
1079	1257	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1258	+ Object3D destinationLeaf;
1080	1259	try {
1081		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1260	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
1082	1261	} catch (Exception e) {
1083	1262	System.out.println("destinationPath : " + destinationPath);
1084	1263	return;
1085	1264	}
1086	1265
1087		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1266	+ for (int i=group.selection.size(); --i>=0;)
1088	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	+// {
1089	1277	loadClipboard(true);
1090	1278	objEditor.jTree.setSelectionPath(destinationPath);
1091	1279	pasteInto(false, false);
1092		- } else {
1093		- loadClipboard(false);
1094		- objEditor.jTree.setSelectionPath(destinationPath);
1095		- pasteInto(false, false); // true); // ???
1096		- }
	1280	+// } else {
	1281	+// loadClipboard(false);
	1282	+// objEditor.jTree.setSelectionPath(destinationPath);
	1283	+// pasteInto(false, false); // true); // ???
	1284	+// }
1097	1285	}
1098	1286	public void dropActionChanged(DropTargetDragEvent dtde)
1099	1287	// Called if the user has modified the current drop gesture
..	..	@@ -1198,22 +1386,30 @@
1198	1386	{
1199	1387	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1200	1388	//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);
	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	+ {
1213	1407	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1214	1408	kleinItem.addActionListener(this);
1215		- particleItem = menu.add(new MenuItem("Particle system"));
1216		- particleItem.addActionListener(this);
	1409	+ }
	1410	+
	1411	+// particleItem = menu.add(new MenuItem("Particle system"));
	1412	+// particleItem.addActionListener(this);
1217	1413	if (Globals.ADVANCED)
1218	1414	{
1219	1415	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1239,15 +1435,15 @@
1239	1435	}
1240	1436	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1241	1437	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);
	1438	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1439	+// overlayItem.addActionListener(this);
	1440	+// lightItem = menu.add(new MenuItem("Light"));
	1441	+// lightItem.addActionListener(this);
1246	1442	menu.add("-");
1247	1443	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1248	1444	//superLoopItem.addActionListener(this);
1249		- loopItem = menu.add(new MenuItem("Loop"));
1250		- loopItem.addActionListener(this);
	1445	+// loopItem = menu.add(new MenuItem("Loop"));
	1446	+// loopItem.addActionListener(this);
1251	1447	doubleItem = menu.add(new MenuItem("Fork"));
1252	1448	doubleItem.addActionListener(this);
1253	1449	if (Globals.ADVANCED)
..	..	@@ -1428,6 +1624,7 @@
1428	1624	shadow.material = new cMaterial(obj.material);
1429	1625	shadow.material.diffuse = 0.0001f;
1430	1626	shadow.material.specular = 0.0001f;
	1627	+ //shadow.projectedVertices[1].x = 300;
1431	1628
1432	1629	makeSomething(shadow);
1433	1630	}
..	..	@@ -1675,7 +1872,7 @@
1675	1872	{
1676	1873	ScreenFit();
1677	1874	} else
1678		- if (source == switchItem)
	1875	+ if (source == switchViewItem)
1679	1876	{
1680	1877	cVector v1 = new cVector();
1681	1878	cVector v2 = new cVector();
..	..	@@ -1684,11 +1881,11 @@
1684	1881	objEditor.cameraView.renderCamera.setAim(v2, v1);
1685	1882	objEditor.cameraView.repaint();
1686	1883	} else
1687		- if (source == rectoidItem)
	1884	+ if (source == rectoidItem \|\| source == boxButton)
1688	1885	{
1689	1886	makeSomething(new Box());
1690	1887	} else
1691		- if (source == particleItem)
	1888	+ if (source == particleItem \|\| source == particlesButton)
1692	1889	{
1693	1890	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1694	1891	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1767,27 +1964,27 @@
1767	1964
1768	1965	makeSomething(obj);
1769	1966	} else
1770		- if (source == gridItem)
	1967	+ if (source == gridItem \|\| source == gridButton)
1771	1968	{
1772	1969	makeSomething(new Grid());
1773	1970	} else
1774		- if (source == ellipsoidItem)
	1971	+ if (source == ellipsoidItem \|\| source == sphereButton)
1775	1972	{
1776	1973	makeSomething(new Sphere());
1777	1974	} else
1778		- if (source == coneItem)
	1975	+ if (source == coneItem \|\| source == coneButton)
1779	1976	{
1780	1977	makeSomething(new Cone());
1781	1978	} else
1782		- if (source == torusItem)
	1979	+ if (source == torusItem \|\| source == torusButton)
1783	1980	{
1784	1981	makeSomething(new Torus());
1785	1982	} else
1786		- if (source == superItem)
	1983	+ if (source == superItem \|\| source == superButton)
1787	1984	{
1788	1985	makeSomething(new Superellipsoid());
1789	1986	} else
1790		- if (source == kleinItem)
	1987	+ if (source == kleinItem \|\| source == kleinButton)
1791	1988	{
1792	1989	makeSomething(new Klein());
1793	1990	} else
..	..	@@ -1807,7 +2004,7 @@
1807	2004	{
1808	2005	makeSomething(new BezierSurface());
1809	2006	} else
1810		- if (source == overlayItem)
	2007	+ if (source == overlayItem \|\| source == overlayButton)
1811	2008	{
1812	2009	/*
1813	2010	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1855,7 +2052,7 @@
1855	2052	s.setup();
1856	2053	makeSomething(s);
1857	2054	} else
1858		- if (source == lightItem)
	2055	+ if (source == lightItem \|\| source == lightButton)
1859	2056	{
1860	2057	makeSomething(new Light());
1861	2058	} else
..	..	@@ -1905,7 +2102,7 @@
1905	2102
1906	2103	group(g);
1907	2104	} else
1908		- if (source == loopItem)
	2105	+ if (source == loopItem \|\| source == loopButton)
1909	2106	{
1910	2107	Composite csg = new GroupLeaf();
1911	2108	csg.count = 5;
..	..	@@ -1977,6 +2174,18 @@
1977	2174	if (source == dumpItem)
1978	2175	{
1979	2176	DumpObject();
	2177	+ } else
	2178	+ if (source == minButton)
	2179	+ {
	2180	+ Minimize();
	2181	+ } else
	2182	+ if (source == maxButton)
	2183	+ {
	2184	+ Maximize();
	2185	+ } else
	2186	+ if (source == fullButton)
	2187	+ {
	2188	+ ToggleFullScreen();
1980	2189	} else
1981	2190	if (source == undoButton)
1982	2191	{
..	..	@@ -2383,9 +2592,9 @@
2383	2592	{
2384	2593	ClearSelection(true);
2385	2594	} else
2386		- if (source == grabItem)
	2595	+ if (source == grabItem \|\| source == groupButton)
2387	2596	{
2388		- group(new cGroup(), true);
	2597	+ group(new cGroup(), false); // true);
2389	2598	} else
2390	2599	if (source == hideItem)
2391	2600	{
..	..	@@ -2403,11 +2612,11 @@
2403	2612	{
2404	2613	makeSomething(new Camera());
2405	2614	} else
2406		- if (source == compositeItem)
	2615	+ if (source == compositeItem \|\| source == compositeButton)
2407	2616	{
2408	2617	group(new Composite());
2409	2618	} else
2410		- if (source == randomItem)
	2619	+ if (source == switchItem \|\| source == switchButton)
2411	2620	{
2412	2621	RandomNode random = new RandomNode();
2413	2622	group(random);
..	..	@@ -2509,7 +2718,7 @@
2509	2718	{
2510	2719	group(new cLinker());
2511	2720	} else
2512		- if (source == textureItem)
	2721	+ if (source == textureItem \|\| source == textureButton)
2513	2722	{
2514	2723	group(new TextureNode());
2515	2724	} else
..	..	@@ -2529,7 +2738,7 @@
2529	2738	{
2530	2739	CastShadow(2);
2531	2740	} else
2532		- if (source == ungroupItem)
	2741	+ if (source == ungroupItem \|\| source == ungroupButton)
2533	2742	{
2534	2743	//ungroup();
2535	2744	for (int i=0; i<group.selection.size(); i++)
..	..	@@ -2867,6 +3076,10 @@
2867	3076	if (source == twoButton)
2868	3077	{
2869	3078	radio.layout = twoButton;
	3079	+
	3080	+ if (CameraPane.FULLSCREEN)
	3081	+ fullscreenLayout = radio.layout;
	3082	+
2870	3083	// bug
2871	3084	//gridPanel.setDividerLocation(1.0);
2872	3085	//bigPanel.setDividerLocation(0.0);
..	..	@@ -2899,10 +3112,31 @@
2899	3112	bigThree.ClearUI();
2900	3113	bigThree.add(centralPanel);
2901	3114	bigThree.FlushUI();
	3115	+
	3116	+ cameraView.requestFocusInWindow();
	3117	+
	3118	+// refreshContents(true);
	3119	+//
	3120	+// try
	3121	+// {
	3122	+// java.awt.Robot bot = new java.awt.Robot();
	3123	+// int mask = InputEvent.BUTTON1_MASK;
	3124	+// bot.mouseMove(100, 100);
	3125	+// bot.mousePress(mask);
	3126	+// bot.mouseRelease(mask);
	3127	+// }
	3128	+// catch (Exception e)
	3129	+// {
	3130	+//
	3131	+// }
	3132	+
2902	3133	} else
2903	3134	if (source == threeButton)
2904	3135	{
2905	3136	radio.layout = threeButton;
	3137	+
	3138	+ if (CameraPane.FULLSCREEN)
	3139	+ fullscreenLayout = radio.layout;
2906	3140
2907	3141	// bigThree.remove(scenePanel);
2908	3142	// bigThree.remove(centralPanel);
..	..	@@ -2935,10 +3169,15 @@
2935	3169	bigThree.add(centralPanel);
2936	3170	bigThree.add(XYZPanel);
2937	3171	bigThree.FlushUI();
	3172	+
	3173	+ cameraView.requestFocusInWindow();
2938	3174	} else
2939	3175	if (source == fourButton)
2940	3176	{
2941	3177	radio.layout = fourButton;
	3178	+
	3179	+ if (CameraPane.FULLSCREEN)
	3180	+ fullscreenLayout = radio.layout;
2942	3181
2943	3182	// bigThree.remove(scenePanel);
2944	3183	// bigThree.remove(centralPanel);
..	..	@@ -2970,10 +3209,15 @@
2970	3209	bigThree.ClearUI();
2971	3210	bigThree.add(scenePanel);
2972	3211	bigThree.FlushUI();
	3212	+
	3213	+ cameraView.requestFocusInWindow();
2973	3214	} else
2974	3215	if (source == sixButton)
2975	3216	{
2976	3217	radio.layout = sixButton;
	3218	+
	3219	+ if (CameraPane.FULLSCREEN)
	3220	+ fullscreenLayout = radio.layout;
2977	3221
2978	3222	// bigThree.remove(scenePanel);
2979	3223	// bigThree.remove(centralPanel);
..	..	@@ -3006,10 +3250,15 @@
3006	3250	bigThree.add(scenePanel);
3007	3251	bigThree.add(centralPanel);
3008	3252	bigThree.FlushUI();
	3253	+
	3254	+ cameraView.requestFocusInWindow();
3009	3255	} else
3010	3256	if (source == sevenButton)
3011	3257	{
3012	3258	radio.layout = sevenButton;
	3259	+
	3260	+ if (CameraPane.FULLSCREEN)
	3261	+ fullscreenLayout = radio.layout;
3013	3262
3014	3263	// bigThree.remove(scenePanel);
3015	3264	// bigThree.remove(centralPanel);
..	..	@@ -3043,6 +3292,8 @@
3043	3292	bigThree.add(centralPanel);
3044	3293	bigThree.add(XYZPanel);
3045	3294	bigThree.FlushUI();
	3295	+
	3296	+ cameraView.requestFocusInWindow();
3046	3297	} else
3047	3298	if (source == rootButton)
3048	3299	{
..	..	@@ -3054,6 +3305,7 @@
3054	3305	EditObject(obj);
3055	3306	}
3056	3307
	3308	+ cameraView.requestFocusInWindow();
3057	3309	refreshContents(true);
3058	3310	} else
3059	3311	if (source == closeButton)
..	..	@@ -3063,22 +3315,37 @@
3063	3315	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3064	3316	{
3065	3317	ab = (cRadio)e.nextElement();
3066		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3318	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
3067	3319	{
	3320	+ // Patch to avoid bug with transparency.
	3321	+ if (!ab.hadMaterial)
	3322	+ {
	3323	+ ab.object.material = null;
	3324	+ }
	3325	+
3068	3326	buttonGroup.remove(ab);
3069	3327	radioPanel.remove(ab);
3070	3328
3071		- ab.GetObject().editWindow = null;
	3329	+ //ab.GetObject().editWindow = null;
	3330	+ ab.GetObject().manipWindow = null;
3072	3331	// ab.GetObject().objectUI = null; // ?????????
3073	3332
3074	3333	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
3075	3334	break;
3076	3335	}
3077	3336	}
	3337	+
	3338	+ cameraView.requestFocusInWindow();
3078	3339	refreshContents(true);
3079	3340	} else
3080	3341	if (source == editItem \|\| source == editButton)
3081	3342	{
	3343	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3344	+ {
	3345	+ Object3D child = (Object3D)e.nextElement();
	3346	+ child.pinned = true;
	3347	+ }
	3348	+
3082	3349	EditSelection(false);
3083	3350	} else
3084	3351	if (source == uneditButton)
..	..	@@ -3088,6 +3355,7 @@
3088	3355	Object3D child = (Object3D)e.nextElement();
3089	3356	if(child.editWindow != null)
3090	3357	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3358	+ child.pinned = false;
3091	3359	child.CloseUI();
3092	3360	listUI.remove(child);
3093	3361
..	..	@@ -3104,6 +3372,7 @@
3104	3372	//copy.ClearUI();
3105	3373	for (Object3D obj : listUI)
3106	3374	{
	3375	+ obj.pinned = true;
3107	3376	obj.CloseUI();
3108	3377	}
3109	3378	listUI.clear();
..	..	@@ -3113,7 +3382,7 @@
3113	3382	{
3114	3383	assert(copy == group);
3115	3384
3116		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3385	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3117	3386
3118	3387	for (Object3D obj : listUI)
3119	3388	{
..	..	@@ -3179,7 +3448,8 @@
3179	3448	}
3180	3449
3181	3450	// fix "+" issue
3182		- group.editWindow = this;
	3451	+ //group.editWindow = this;
	3452	+ group.manipWindow = this;
3183	3453
3184	3454	/*
3185	3455	currentLayout = radio.layout;
..	..	@@ -3192,13 +3462,15 @@
3192	3462	//group.parent = null; // ROOT
3193	3463	//group.attributes = -1;
3194	3464	ResetModel();
	3465	+
	3466	+ cameraView.requestFocusInWindow();
3195	3467	refreshContents(true);
3196	3468	} else if (event.getSource() == editCameraItem)
3197	3469	{
3198	3470	cameraView.ProtectCamera();
3199	3471	cameraView.repaint();
3200	3472	return;
3201		- } else if (event.getSource() == revertCameraItem)
	3473	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3202	3474	{
3203	3475	cameraView.RevertCamera();
3204	3476	cameraView.repaint();
..	..	@@ -3215,7 +3487,6 @@
3215	3487	}
3216	3488
3217	3489	boolean useclient = false;
3218		- cRadio radio;
3219	3490
3220	3491	void ToggleRoot()
3221	3492	{
..	..	@@ -4253,10 +4524,6 @@
4253	4524	// }
4254	4525	// }
4255	4526
4256		- static boolean allparams = true;
4257		-
4258		- static Vector<Object3D> listUI = new Vector<Object3D>();
4259		-
4260	4527	void EditSelection(boolean newWindow)
4261	4528	{
4262	4529	// aConstraints.gridy = 0;
..	..	@@ -4264,7 +4531,7 @@
4264	4531	{
4265	4532	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4266	4533	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4267		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4534	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4268	4535
4269	4536	Object3D elem = (Object3D)group.selection.elementAt(i);
4270	4537	if(elem != group \|\| !newWindow)
..	..	@@ -4350,6 +4617,17 @@
4350	4617
4351	4618	freezemodel = true;
4352	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	+
4353	4631	/**/
4354	4632	//switch (event.id)
4355	4633	{
..	..	@@ -4382,7 +4660,7 @@
4382	4660	if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4383	4661	// a camera
4384	4662	{
4385		- if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	4663	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
4386	4664	{
4387	4665	CameraPane.camerachangeframe = 0; // don't refuse it
4388	4666	Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
..	..	@@ -4391,6 +4669,13 @@
4391	4669	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4392	4670	}
4393	4671
	4672	+ if (tps != null && tps.length == 1)
	4673	+ {
	4674	+ EditSelection(false);
	4675	+ }
	4676	+
	4677	+ SetPinStates(tps != null && tps.length > 0);
	4678	+
4394	4679	refreshContents();
4395	4680	//return true;
4396	4681	}
..	..	@@ -4400,9 +4685,16 @@
4400	4685	freezemodel = false;
4401	4686	}
4402	4687
	4688	+ void SetPinStates(boolean enabled)
	4689	+ {
	4690	+ editButton.setEnabled(enabled);
	4691	+ uneditButton.setEnabled(enabled);
	4692	+ }
	4693	+
4403	4694	void refreshContents(boolean cp)
4404	4695	{
4405		- if (!Globals.MOUSEDRAGGED)
	4696	+ if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
	4697	+ if (!Globals.MOUSEDRAGGED) // && !Globals.TIMERRUNNING)
4406	4698	{
4407	4699	objEditor.ClearInfo(); // .GetMaterial());
4408	4700
..	..	@@ -4501,6 +4793,7 @@
4501	4793
4502	4794	if (cut)
4503	4795	{
	4796	+ if (Globals.SAVEONMAKE)
4504	4797	Save();
4505	4798	//int indices[] = jList.getSelectedIndices();
4506	4799	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -5219,10 +5512,31 @@
5219	5512	cButton clearpanelButton;
5220	5513	cButton unselectButton;
5221	5514
	5515	+ cButton restoreCameraButton;
	5516	+
	5517	+ cButton minButton;
	5518	+ cButton maxButton;
	5519	+ cButton fullButton;
5222	5520	cButton saveButton;
5223		- cButton undoButton;
5224		- cButton redoButton;
5225	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;
5226	5540
5227	5541	cButton screenfitButton;
5228	5542	cButton screenfitpointButton;
..	..	@@ -5235,14 +5549,6 @@
5235	5549
5236	5550	cButton setsupportButton;
5237	5551
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	5552	//
5247	5553	//Composite
5248	5554	Object3D // to do !!
..	..	@@ -5252,11 +5558,11 @@
5252	5558	//JTree jTree;
5253	5559	private MenuItem lookAtItem;
5254	5560	private MenuItem lookFromItem;
5255		- private MenuItem switchItem;
	5561	+ private MenuItem switchViewItem;
5256	5562	private MenuItem cutItem;
5257	5563	private MenuItem undoItem;
5258	5564	private MenuItem redoItem;
5259		- private MenuItem duplicateItem;
	5565	+ private JMenuItem duplicateItem;
5260	5566	private MenuItem cloneItem;
5261	5567	private MenuItem cloneSupportItem;
5262	5568	private MenuItem overwriteGeoItem;
..	..	@@ -5344,7 +5650,7 @@
5344	5650	private MenuItem frontItem;
5345	5651	private MenuItem cameraItem;
5346	5652	private MenuItem compositeItem;
5347		- private MenuItem randomItem;
	5653	+ private MenuItem switchItem;
5348	5654	private MenuItem physicsItem;
5349	5655	private MenuItem frameselectorItem;
5350	5656	private MenuItem scriptNodeItem;
..	..	@@ -5418,5 +5724,5 @@
5418	5724
5419	5725	Menu cameraMenu;
5420	5726	MenuItem editCameraItem;
5421		- MenuItem revertCameraItem;
	5727	+ MenuItem restoreCameraItem;
5422	5728	}