~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,145 @@
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);
646		- editButton.setToolTipText("Edit selection");
	714	+ oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	715	+ particlesButton.setToolTipText("Create particle system");
	716	+ particlesButton.addActionListener(this);
	717	+
	718	+ oe.toolboxPanel.Return();
	719	+
	720	+ oe.toolboxPanel.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	721	+ groupButton.setToolTipText("Create group");
	722	+ groupButton.addActionListener(this);
	723	+
	724	+ oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	725	+ compositeButton.setToolTipText("Create composite");
	726	+ compositeButton.addActionListener(this);
	727	+
	728	+ oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	729	+ switchButton.setToolTipText("Create switch");
	730	+ switchButton.addActionListener(this);
	731	+
	732	+ oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	733	+ loopButton.setToolTipText("Create loop");
	734	+ loopButton.addActionListener(this);
	735	+
	736	+ oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	737	+ textureButton.setToolTipText("Create texture");
	738	+ textureButton.addActionListener(this);
	739	+
	740	+ oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	741	+ overlayButton.setToolTipText("Create overlay");
	742	+ overlayButton.addActionListener(this);
	743	+
	744	+ oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	745	+ lightButton.setToolTipText("Create light");
	746	+ lightButton.addActionListener(this);
	747	+
	748	+ for (int i=6; --i>=0;)
	749	+ {
	750	+ oe.toolboxPanel.Return();
	751	+ oe.toolboxPanel.add(new cGridBag());
	752	+ oe.toolboxPanel.add(new cGridBag());
	753	+ oe.toolboxPanel.add(new cGridBag());
	754	+ oe.toolboxPanel.add(new cGridBag());
	755	+ oe.toolboxPanel.add(new cGridBag());
	756	+ oe.toolboxPanel.add(new cGridBag());
	757	+ oe.toolboxPanel.add(new cGridBag());
	758	+ }
	759	+
	760	+ // EDIT panel
	761	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	762	+ editButton.setToolTipText("Pin selection controls");
647	763	editButton.addActionListener(this);
648	764
649		- commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
650		- uneditButton.setToolTipText("Unedit selection");
	765	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	766	+ uneditButton.setToolTipText("Remove selection controls");
651	767	uneditButton.addActionListener(this);
652	768
653		- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
654		- allParamsButton.setToolTipText("Edit all params");
	769	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	770	+ allParamsButton.setToolTipText("Show all controle");
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	+ SetPinStates(false);
	788	+// oe.treePanel.add(commandsPanel);
	789	+// oe.treePanel.Return();
669	790
670	791	// oe.aConstraints.gridx += 1;
671	792	// oe.aConstraints.weighty = 0;
..	..	@@ -682,27 +803,12 @@
682	803
683	804	JScrollPane jSP;
684	805	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
685		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	806	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
686	807	ResetModel();
687	808
688	809	oe.treePanel.add(jSPPanel);
689	810	oe.treePanel.Return();
690	811
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	812	oe.treePanel.add(copyOptionsPanel);
707	813	oe.treePanel.Return();
708	814
..	..	@@ -733,12 +839,26 @@
733	839
734	840	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
735	841	{
	842	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	843	+ colorCB.setToolTipText("Copy color when dropped");
	844	+ colorCB.addItemListener(this);
	845	+
	846	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	847	+ materialCB.setToolTipText("Copy material when dropped");
	848	+ materialCB.addItemListener(this);
	849	+
	850	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	851	+ textureCB.setToolTipText("Copy texture when dropped");
	852	+ textureCB.addItemListener(this);
	853	+
	854	+ panel.Return();
	855	+
736	856	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
737	857	boxCB.setToolTipText("Display bounding boxes");
738	858	boxCB.addItemListener(this);
739	859
740	860	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
741		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	861	+ zoomBoxCB.setToolTipText("Display only for wheel");
742	862	zoomBoxCB.addItemListener(this);
743	863
744	864	if (true) // Globals.ADVANCED)
..	..	@@ -750,6 +870,8 @@
750	870	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
751	871	// localCB.addItemListener(this);
752	872
	873	+ panel.Return();
	874	+
753	875	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
754	876	crowdCB.setToolTipText("Used for crowds");
755	877	crowdCB.addItemListener(this);
..	..	@@ -766,6 +888,8 @@
766	888	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
767	889	// speakerMocapCB.addItemListener(this);
768	890
	891	+ panel.Return();
	892	+
769	893	if (false)
770	894	{
771	895	// handled in scripts
..	..	@@ -780,32 +904,72 @@
780	904	//constraints.gridy += 1;
781	905	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
782	906	smoothfocusCB.addItemListener(this);
	907	+ panel.Return();
783	908	}
784	909
785	910	//constraints.gridx += 1;
786	911	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
787	912	// debugCB.addItemListener(this);
788	913
	914	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	915	+ trackCB.setToolTipText("Enable tracking target");
	916	+ trackCB.addItemListener(this);
	917	+
789	918	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	919	+ oeilCB.setToolTipText("Move camera when tracking");
790	920	oeilCB.addItemListener(this);
791	921
	922	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	923	+ shadowCB.setToolTipText("When live compute shadows");
	924	+ shadowCB.addItemListener(this);
	925	+
	926	+ panel.Return();
	927	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	928	+ toggleTextureCB.setToolTipText("Load textures");
	929	+ toggleTextureCB.addItemListener(this);
	930	+
	931	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	932	+ toggleSwitchCB.setToolTipText("Use switch");
	933	+ toggleSwitchCB.addItemListener(this);
	934	+
	935	+ panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
	936	+ autosaveCB.setToolTipText("On structure change");
	937	+ autosaveCB.addItemListener(this);
	938	+
	939	+ panel.Return();
	940	+ if (Globals.ADVANCED)
	941	+ {
792	942	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
793	943	lookAtCB.setToolTipText("Look-at target");
794	944	lookAtCB.addItemListener(this);
	945	+ }
795	946
796	947	}
797	948
798	949	cGridBag fill = new cGridBag();
799		-
800	950	fill.preferredHeight = 200;
	951	+ cGridBag fill2 = new cGridBag();
	952	+ fill2.preferredHeight = 200;
	953	+ cGridBag fill3 = new cGridBag();
	954	+ fill3.preferredHeight = 200;
801	955
802	956	panel.add(fill);
	957	+ panel.add(fill2);
	958	+ panel.add(fill3);
803	959
804	960	}
805	961
806	962	void EditObject(Object3D obj)
807	963	{
808	964	cRadio radioButton = new cRadio(obj.name);
	965	+
	966	+ // Patch to avoid bug with transparency.
	967	+ radioButton.hadMaterial = obj.material != null;
	968	+ if (!radioButton.hadMaterial)
	969	+ {
	970	+ obj.material = new cMaterial();
	971	+ }
	972	+
809	973	radioButton.SetObject(obj);
810	974	radioButton.layout = sevenButton;
811	975	radioButton.SetCamera(cameraView.renderCamera, false);
..	..	@@ -817,6 +981,8 @@
817	981
818	982	void SetupViews(ObjEditor oe)
819	983	{
	984	+ theFrame = this;
	985	+
820	986	oe.SetupViews();
821	987
822	988	System.out.println("SetupViews");
..	..	@@ -825,23 +991,27 @@
825	991	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
826	992	}
827	993
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;
	994	+ cToggleButton liveCB;
	995	+ cCheckBox supportCB;
	996	+ cCheckBox localCB;
	997	+ cCheckBox crowdCB;
	998	+ cCheckBox smoothCB;
	999	+ cToggleButton fastCB;
	1000	+ cCheckBox slowCB;
	1001	+ cCheckBox boxCB;
	1002	+ cCheckBox zoomBoxCB;
	1003	+ //cToggleButton trackCB;
	1004	+ cCheckBox trackCB;
	1005	+ cCheckBox smoothfocusCB;
839	1006	// JCheckBox speakerMocapCB;
840		- JCheckBox speakerCameraCB;
841		- JCheckBox speakerFocusCB;
842		- JCheckBox debugCB;
843		- JCheckBox oeilCB;
844		- JCheckBox lookAtCB;
	1007	+ cCheckBox speakerCameraCB;
	1008	+ cCheckBox speakerFocusCB;
	1009	+ cCheckBox debugCB;
	1010	+
	1011	+ cCheckBox oeilCB;
	1012	+ cCheckBox shadowCB;
	1013	+ cCheckBox autosaveCB;
	1014	+ cCheckBox lookAtCB;
845	1015
846	1016	// static int COLOR = 1;
847	1017	// static int MATERIAL = 2;
..	..	@@ -849,9 +1019,9 @@
849	1019
850	1020	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
851	1021
852		- JCheckBox colorCB;
853		- JCheckBox materialCB;
854		- JCheckBox textureCB;
	1022	+ cCheckBox colorCB;
	1023	+ cCheckBox materialCB;
	1024	+ cCheckBox textureCB;
855	1025
856	1026	public void itemStateChanged(ItemEvent e)
857	1027	{
..	..	@@ -944,6 +1114,14 @@
944	1114	{
945	1115	cameraView.ToggleOeil();
946	1116	}
	1117	+ else if(e.getSource() == shadowCB)
	1118	+ {
	1119	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1120	+ }
	1121	+ else if(e.getSource() == autosaveCB)
	1122	+ {
	1123	+ Globals.SAVEONMAKE ^= true;
	1124	+ }
947	1125	else if(e.getSource() == lookAtCB)
948	1126	{
949	1127	cameraView.ToggleLookAt();
..	..	@@ -960,7 +1138,8 @@
960	1138
961	1139	/**/
962	1140	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
963		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1141	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1142	+ TreePath path = objEditor.jTree.getSelectionPath();
964	1143	if ((path == null) \|\| (path.getPathCount() <= 1)) {
965	1144	// We can't move the root node or an empty selection
966	1145	return;
..	..	@@ -1077,23 +1256,33 @@
1077	1256
1078	1257	assert target == objEditor.jTree;
1079	1258	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1259	+ Object3D destinationLeaf;
1080	1260	try {
1081		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1261	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
1082	1262	} catch (Exception e) {
1083	1263	System.out.println("destinationPath : " + destinationPath);
1084	1264	return;
1085	1265	}
1086	1266
1087		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1267	+ for (int i=group.selection.size(); --i>=0;)
1088	1268	{
	1269	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1270	+
	1271	+ // Cannot move into itself
	1272	+ if (child == destinationLeaf)
	1273	+ return;
	1274	+ }
	1275	+
	1276	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1277	+// {
1089	1278	loadClipboard(true);
1090	1279	objEditor.jTree.setSelectionPath(destinationPath);
1091	1280	pasteInto(false, false);
1092		- } else {
1093		- loadClipboard(false);
1094		- objEditor.jTree.setSelectionPath(destinationPath);
1095		- pasteInto(false, false); // true); // ???
1096		- }
	1281	+// } else {
	1282	+// loadClipboard(false);
	1283	+// objEditor.jTree.setSelectionPath(destinationPath);
	1284	+// pasteInto(false, false); // true); // ???
	1285	+// }
1097	1286	}
1098	1287	public void dropActionChanged(DropTargetDragEvent dtde)
1099	1288	// Called if the user has modified the current drop gesture
..	..	@@ -1198,22 +1387,30 @@
1198	1387	{
1199	1388	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1200	1389	//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);
	1390	+// gridItem = menu.add(new MenuItem("Grid"));
	1391	+// gridItem.addActionListener(this);
	1392	+// rectoidItem = menu.add(new MenuItem("Box"));
	1393	+// rectoidItem.addActionListener(this);
	1394	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1395	+// ellipsoidItem.addActionListener(this);
	1396	+// coneItem = menu.add(new MenuItem("Cone"));
	1397	+// coneItem.addActionListener(this);
	1398	+// torusItem = menu.add(new MenuItem("Torus"));
	1399	+// torusItem.addActionListener(this);
	1400	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1401	+// superItem.addActionListener(this);
	1402	+
	1403	+ cameraItem = menu.add(new MenuItem("Camera"));
	1404	+ cameraItem.addActionListener(this);
	1405	+
	1406	+ if (!Globals.ADVANCED)
	1407	+ {
1213	1408	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1214	1409	kleinItem.addActionListener(this);
1215		- particleItem = menu.add(new MenuItem("Particle system"));
1216		- particleItem.addActionListener(this);
	1410	+ }
	1411	+
	1412	+// particleItem = menu.add(new MenuItem("Particle system"));
	1413	+// particleItem.addActionListener(this);
1217	1414	if (Globals.ADVANCED)
1218	1415	{
1219	1416	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1239,15 +1436,15 @@
1239	1436	}
1240	1437	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1241	1438	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);
	1439	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1440	+// overlayItem.addActionListener(this);
	1441	+// lightItem = menu.add(new MenuItem("Light"));
	1442	+// lightItem.addActionListener(this);
1246	1443	menu.add("-");
1247	1444	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1248	1445	//superLoopItem.addActionListener(this);
1249		- loopItem = menu.add(new MenuItem("Loop"));
1250		- loopItem.addActionListener(this);
	1446	+// loopItem = menu.add(new MenuItem("Loop"));
	1447	+// loopItem.addActionListener(this);
1251	1448	doubleItem = menu.add(new MenuItem("Fork"));
1252	1449	doubleItem.addActionListener(this);
1253	1450	if (Globals.ADVANCED)
..	..	@@ -1428,9 +1625,24 @@
1428	1625	shadow.material = new cMaterial(obj.material);
1429	1626	shadow.material.diffuse = 0.0001f;
1430	1627	shadow.material.specular = 0.0001f;
	1628	+ //shadow.projectedVertices[1].x = 300;
1431	1629
1432	1630	makeSomething(shadow);
1433	1631	}
	1632	+
	1633	+ private void ClearUnpinned()
	1634	+ {
	1635	+ //for (Object3D obj : listUI)
	1636	+ for (int i=listUI.size(); --i>=0;)
	1637	+ {
	1638	+ Object3D obj = listUI.elementAt(i);
	1639	+ if (!obj.pinned)
	1640	+ {
	1641	+ obj.CloseUI();
	1642	+ listUI.remove(i);
	1643	+ }
	1644	+ }
	1645	+ }
1434	1646
1435	1647	/**
1436	1648	* applyExample
..	..	@@ -1675,7 +1887,7 @@
1675	1887	{
1676	1888	ScreenFit();
1677	1889	} else
1678		- if (source == switchItem)
	1890	+ if (source == switchViewItem)
1679	1891	{
1680	1892	cVector v1 = new cVector();
1681	1893	cVector v2 = new cVector();
..	..	@@ -1684,11 +1896,11 @@
1684	1896	objEditor.cameraView.renderCamera.setAim(v2, v1);
1685	1897	objEditor.cameraView.repaint();
1686	1898	} else
1687		- if (source == rectoidItem)
	1899	+ if (source == rectoidItem \|\| source == boxButton)
1688	1900	{
1689	1901	makeSomething(new Box());
1690	1902	} else
1691		- if (source == particleItem)
	1903	+ if (source == particleItem \|\| source == particlesButton)
1692	1904	{
1693	1905	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1694	1906	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1767,27 +1979,27 @@
1767	1979
1768	1980	makeSomething(obj);
1769	1981	} else
1770		- if (source == gridItem)
	1982	+ if (source == gridItem \|\| source == gridButton)
1771	1983	{
1772	1984	makeSomething(new Grid());
1773	1985	} else
1774		- if (source == ellipsoidItem)
	1986	+ if (source == ellipsoidItem \|\| source == sphereButton)
1775	1987	{
1776	1988	makeSomething(new Sphere());
1777	1989	} else
1778		- if (source == coneItem)
	1990	+ if (source == coneItem \|\| source == coneButton)
1779	1991	{
1780	1992	makeSomething(new Cone());
1781	1993	} else
1782		- if (source == torusItem)
	1994	+ if (source == torusItem \|\| source == torusButton)
1783	1995	{
1784	1996	makeSomething(new Torus());
1785	1997	} else
1786		- if (source == superItem)
	1998	+ if (source == superItem \|\| source == superButton)
1787	1999	{
1788	2000	makeSomething(new Superellipsoid());
1789	2001	} else
1790		- if (source == kleinItem)
	2002	+ if (source == kleinItem \|\| source == kleinButton)
1791	2003	{
1792	2004	makeSomething(new Klein());
1793	2005	} else
..	..	@@ -1807,7 +2019,7 @@
1807	2019	{
1808	2020	makeSomething(new BezierSurface());
1809	2021	} else
1810		- if (source == overlayItem)
	2022	+ if (source == overlayItem \|\| source == overlayButton)
1811	2023	{
1812	2024	/*
1813	2025	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1855,7 +2067,7 @@
1855	2067	s.setup();
1856	2068	makeSomething(s);
1857	2069	} else
1858		- if (source == lightItem)
	2070	+ if (source == lightItem \|\| source == lightButton)
1859	2071	{
1860	2072	makeSomething(new Light());
1861	2073	} else
..	..	@@ -1905,7 +2117,7 @@
1905	2117
1906	2118	group(g);
1907	2119	} else
1908		- if (source == loopItem)
	2120	+ if (source == loopItem \|\| source == loopButton)
1909	2121	{
1910	2122	Composite csg = new GroupLeaf();
1911	2123	csg.count = 5;
..	..	@@ -1977,6 +2189,18 @@
1977	2189	if (source == dumpItem)
1978	2190	{
1979	2191	DumpObject();
	2192	+ } else
	2193	+ if (source == minButton)
	2194	+ {
	2195	+ Minimize();
	2196	+ } else
	2197	+ if (source == maxButton)
	2198	+ {
	2199	+ Maximize();
	2200	+ } else
	2201	+ if (source == fullButton)
	2202	+ {
	2203	+ ToggleFullScreen();
1980	2204	} else
1981	2205	if (source == undoButton)
1982	2206	{
..	..	@@ -2383,9 +2607,9 @@
2383	2607	{
2384	2608	ClearSelection(true);
2385	2609	} else
2386		- if (source == grabItem)
	2610	+ if (source == grabItem \|\| source == groupButton)
2387	2611	{
2388		- group(new cGroup(), true);
	2612	+ group(new cGroup(), false); // true);
2389	2613	} else
2390	2614	if (source == hideItem)
2391	2615	{
..	..	@@ -2403,11 +2627,11 @@
2403	2627	{
2404	2628	makeSomething(new Camera());
2405	2629	} else
2406		- if (source == compositeItem)
	2630	+ if (source == compositeItem \|\| source == compositeButton)
2407	2631	{
2408	2632	group(new Composite());
2409	2633	} else
2410		- if (source == randomItem)
	2634	+ if (source == switchItem \|\| source == switchButton)
2411	2635	{
2412	2636	RandomNode random = new RandomNode();
2413	2637	group(random);
..	..	@@ -2509,7 +2733,7 @@
2509	2733	{
2510	2734	group(new cLinker());
2511	2735	} else
2512		- if (source == textureItem)
	2736	+ if (source == textureItem \|\| source == textureButton)
2513	2737	{
2514	2738	group(new TextureNode());
2515	2739	} else
..	..	@@ -2529,7 +2753,7 @@
2529	2753	{
2530	2754	CastShadow(2);
2531	2755	} else
2532		- if (source == ungroupItem)
	2756	+ if (source == ungroupItem \|\| source == ungroupButton)
2533	2757	{
2534	2758	//ungroup();
2535	2759	for (int i=0; i<group.selection.size(); i++)
..	..	@@ -2867,6 +3091,10 @@
2867	3091	if (source == twoButton)
2868	3092	{
2869	3093	radio.layout = twoButton;
	3094	+
	3095	+ if (CameraPane.FULLSCREEN)
	3096	+ fullscreenLayout = radio.layout;
	3097	+
2870	3098	// bug
2871	3099	//gridPanel.setDividerLocation(1.0);
2872	3100	//bigPanel.setDividerLocation(0.0);
..	..	@@ -2899,10 +3127,31 @@
2899	3127	bigThree.ClearUI();
2900	3128	bigThree.add(centralPanel);
2901	3129	bigThree.FlushUI();
	3130	+
	3131	+ cameraView.requestFocusInWindow();
	3132	+
	3133	+// refreshContents(true);
	3134	+//
	3135	+// try
	3136	+// {
	3137	+// java.awt.Robot bot = new java.awt.Robot();
	3138	+// int mask = InputEvent.BUTTON1_MASK;
	3139	+// bot.mouseMove(100, 100);
	3140	+// bot.mousePress(mask);
	3141	+// bot.mouseRelease(mask);
	3142	+// }
	3143	+// catch (Exception e)
	3144	+// {
	3145	+//
	3146	+// }
	3147	+
2902	3148	} else
2903	3149	if (source == threeButton)
2904	3150	{
2905	3151	radio.layout = threeButton;
	3152	+
	3153	+ if (CameraPane.FULLSCREEN)
	3154	+ fullscreenLayout = radio.layout;
2906	3155
2907	3156	// bigThree.remove(scenePanel);
2908	3157	// bigThree.remove(centralPanel);
..	..	@@ -2935,10 +3184,15 @@
2935	3184	bigThree.add(centralPanel);
2936	3185	bigThree.add(XYZPanel);
2937	3186	bigThree.FlushUI();
	3187	+
	3188	+ cameraView.requestFocusInWindow();
2938	3189	} else
2939	3190	if (source == fourButton)
2940	3191	{
2941	3192	radio.layout = fourButton;
	3193	+
	3194	+ if (CameraPane.FULLSCREEN)
	3195	+ fullscreenLayout = radio.layout;
2942	3196
2943	3197	// bigThree.remove(scenePanel);
2944	3198	// bigThree.remove(centralPanel);
..	..	@@ -2970,10 +3224,15 @@
2970	3224	bigThree.ClearUI();
2971	3225	bigThree.add(scenePanel);
2972	3226	bigThree.FlushUI();
	3227	+
	3228	+ cameraView.requestFocusInWindow();
2973	3229	} else
2974	3230	if (source == sixButton)
2975	3231	{
2976	3232	radio.layout = sixButton;
	3233	+
	3234	+ if (CameraPane.FULLSCREEN)
	3235	+ fullscreenLayout = radio.layout;
2977	3236
2978	3237	// bigThree.remove(scenePanel);
2979	3238	// bigThree.remove(centralPanel);
..	..	@@ -3006,10 +3265,15 @@
3006	3265	bigThree.add(scenePanel);
3007	3266	bigThree.add(centralPanel);
3008	3267	bigThree.FlushUI();
	3268	+
	3269	+ cameraView.requestFocusInWindow();
3009	3270	} else
3010	3271	if (source == sevenButton)
3011	3272	{
3012	3273	radio.layout = sevenButton;
	3274	+
	3275	+ if (CameraPane.FULLSCREEN)
	3276	+ fullscreenLayout = radio.layout;
3013	3277
3014	3278	// bigThree.remove(scenePanel);
3015	3279	// bigThree.remove(centralPanel);
..	..	@@ -3043,6 +3307,8 @@
3043	3307	bigThree.add(centralPanel);
3044	3308	bigThree.add(XYZPanel);
3045	3309	bigThree.FlushUI();
	3310	+
	3311	+ cameraView.requestFocusInWindow();
3046	3312	} else
3047	3313	if (source == rootButton)
3048	3314	{
..	..	@@ -3054,6 +3320,7 @@
3054	3320	EditObject(obj);
3055	3321	}
3056	3322
	3323	+ cameraView.requestFocusInWindow();
3057	3324	refreshContents(true);
3058	3325	} else
3059	3326	if (source == closeButton)
..	..	@@ -3063,22 +3330,37 @@
3063	3330	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3064	3331	{
3065	3332	ab = (cRadio)e.nextElement();
3066		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3333	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
3067	3334	{
	3335	+ // Patch to avoid bug with transparency.
	3336	+ if (!ab.hadMaterial)
	3337	+ {
	3338	+ ab.object.material = null;
	3339	+ }
	3340	+
3068	3341	buttonGroup.remove(ab);
3069	3342	radioPanel.remove(ab);
3070	3343
3071		- ab.GetObject().editWindow = null;
	3344	+ //ab.GetObject().editWindow = null;
	3345	+ ab.GetObject().manipWindow = null;
3072	3346	// ab.GetObject().objectUI = null; // ?????????
3073	3347
3074	3348	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
3075	3349	break;
3076	3350	}
3077	3351	}
	3352	+
	3353	+ cameraView.requestFocusInWindow();
3078	3354	refreshContents(true);
3079	3355	} else
3080	3356	if (source == editItem \|\| source == editButton)
3081	3357	{
	3358	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3359	+ {
	3360	+ Object3D child = (Object3D)e.nextElement();
	3361	+ child.pinned = true;
	3362	+ }
	3363	+
3082	3364	EditSelection(false);
3083	3365	} else
3084	3366	if (source == uneditButton)
..	..	@@ -3088,6 +3370,7 @@
3088	3370	Object3D child = (Object3D)e.nextElement();
3089	3371	if(child.editWindow != null)
3090	3372	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3373	+ child.pinned = false;
3091	3374	child.CloseUI();
3092	3375	listUI.remove(child);
3093	3376
..	..	@@ -3104,6 +3387,7 @@
3104	3387	//copy.ClearUI();
3105	3388	for (Object3D obj : listUI)
3106	3389	{
	3390	+ obj.pinned = false;
3107	3391	obj.CloseUI();
3108	3392	}
3109	3393	listUI.clear();
..	..	@@ -3113,7 +3397,7 @@
3113	3397	{
3114	3398	assert(copy == group);
3115	3399
3116		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3400	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3117	3401
3118	3402	for (Object3D obj : listUI)
3119	3403	{
..	..	@@ -3179,7 +3463,8 @@
3179	3463	}
3180	3464
3181	3465	// fix "+" issue
3182		- group.editWindow = this;
	3466	+ //group.editWindow = this;
	3467	+ group.manipWindow = this;
3183	3468
3184	3469	/*
3185	3470	currentLayout = radio.layout;
..	..	@@ -3187,18 +3472,25 @@
3187	3472	currentLayout = sevenButton;
3188	3473	*/
3189	3474	radio.layout.doClick();
	3475	+
	3476	+ ClearUnpinned();
	3477	+ SetPinStates(group.selection.size() > 0);
	3478	+ if (group.selection.size() == 1)
	3479	+ EditSelection(false);
3190	3480	keepparent = group.parent;
3191	3481	// PARENT = NULL or not???
3192	3482	//group.parent = null; // ROOT
3193	3483	//group.attributes = -1;
3194	3484	ResetModel();
	3485	+
	3486	+ cameraView.requestFocusInWindow();
3195	3487	refreshContents(true);
3196	3488	} else if (event.getSource() == editCameraItem)
3197	3489	{
3198	3490	cameraView.ProtectCamera();
3199	3491	cameraView.repaint();
3200	3492	return;
3201		- } else if (event.getSource() == revertCameraItem)
	3493	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3202	3494	{
3203	3495	cameraView.RevertCamera();
3204	3496	cameraView.repaint();
..	..	@@ -3215,7 +3507,6 @@
3215	3507	}
3216	3508
3217	3509	boolean useclient = false;
3218		- cRadio radio;
3219	3510
3220	3511	void ToggleRoot()
3221	3512	{
..	..	@@ -4253,10 +4544,6 @@
4253	4544	// }
4254	4545	// }
4255	4546
4256		- static boolean allparams = true;
4257		-
4258		- static Vector<Object3D> listUI = new Vector<Object3D>();
4259		-
4260	4547	void EditSelection(boolean newWindow)
4261	4548	{
4262	4549	// aConstraints.gridy = 0;
..	..	@@ -4264,7 +4551,7 @@
4264	4551	{
4265	4552	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4266	4553	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4267		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4554	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4268	4555
4269	4556	Object3D elem = (Object3D)group.selection.elementAt(i);
4270	4557	if(elem != group \|\| !newWindow)
..	..	@@ -4349,7 +4636,8 @@
4349	4636	//new Exception().printStackTrace();
4350	4637
4351	4638	freezemodel = true;
4352		-
	4639	+ ClearUnpinned();
	4640	+
4353	4641	/**/
4354	4642	//switch (event.id)
4355	4643	{
..	..	@@ -4382,7 +4670,7 @@
4382	4670	if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4383	4671	// a camera
4384	4672	{
4385		- if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	4673	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
4386	4674	{
4387	4675	CameraPane.camerachangeframe = 0; // don't refuse it
4388	4676	Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
..	..	@@ -4391,6 +4679,13 @@
4391	4679	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4392	4680	}
4393	4681
	4682	+ if (tps != null && tps.length == 1)
	4683	+ {
	4684	+ EditSelection(false);
	4685	+ }
	4686	+
	4687	+ SetPinStates(tps != null && tps.length > 0);
	4688	+
4394	4689	refreshContents();
4395	4690	//return true;
4396	4691	}
..	..	@@ -4400,9 +4695,18 @@
4400	4695	freezemodel = false;
4401	4696	}
4402	4697
	4698	+ void SetPinStates(boolean enabled)
	4699	+ {
	4700	+ editButton.setEnabled(enabled);
	4701	+ uneditButton.setEnabled(enabled);
	4702	+ unselectButton.setEnabled(enabled);
	4703	+ flashSelectionButton.setEnabled(enabled);
	4704	+ }
	4705	+
4403	4706	void refreshContents(boolean cp)
4404	4707	{
4405		- if (!Globals.MOUSEDRAGGED)
	4708	+ if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
	4709	+ if (!Globals.MOUSEDRAGGED) // && !Globals.TIMERRUNNING)
4406	4710	{
4407	4711	objEditor.ClearInfo(); // .GetMaterial());
4408	4712
..	..	@@ -4501,6 +4805,7 @@
4501	4805
4502	4806	if (cut)
4503	4807	{
	4808	+ if (Globals.SAVEONMAKE)
4504	4809	Save();
4505	4810	//int indices[] = jList.getSelectedIndices();
4506	4811	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -5219,10 +5524,31 @@
5219	5524	cButton clearpanelButton;
5220	5525	cButton unselectButton;
5221	5526
	5527	+ cButton restoreCameraButton;
	5528	+
	5529	+ cButton minButton;
	5530	+ cButton maxButton;
	5531	+ cButton fullButton;
5222	5532	cButton saveButton;
5223		- cButton undoButton;
5224		- cButton redoButton;
5225	5533	cButton oneStepButton;
	5534	+
	5535	+ cButton groupButton;
	5536	+ cButton ungroupButton;
	5537	+ cButton compositeButton;
	5538	+ cButton switchButton;
	5539	+ cButton loopButton;
	5540	+ cButton textureButton;
	5541	+
	5542	+ cButton gridButton;
	5543	+ cButton boxButton;
	5544	+ cButton sphereButton;
	5545	+ cButton coneButton;
	5546	+ cButton torusButton;
	5547	+ cButton superButton;
	5548	+ cButton kleinButton;
	5549	+ cButton particlesButton;
	5550	+ cButton overlayButton;
	5551	+ cButton lightButton;
5226	5552
5227	5553	cButton screenfitButton;
5228	5554	cButton screenfitpointButton;
..	..	@@ -5235,14 +5561,6 @@
5235	5561
5236	5562	cButton setsupportButton;
5237	5563
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	5564	//
5247	5565	//Composite
5248	5566	Object3D // to do !!
..	..	@@ -5252,11 +5570,11 @@
5252	5570	//JTree jTree;
5253	5571	private MenuItem lookAtItem;
5254	5572	private MenuItem lookFromItem;
5255		- private MenuItem switchItem;
	5573	+ private MenuItem switchViewItem;
5256	5574	private MenuItem cutItem;
5257	5575	private MenuItem undoItem;
5258	5576	private MenuItem redoItem;
5259		- private MenuItem duplicateItem;
	5577	+ private JMenuItem duplicateItem;
5260	5578	private MenuItem cloneItem;
5261	5579	private MenuItem cloneSupportItem;
5262	5580	private MenuItem overwriteGeoItem;
..	..	@@ -5344,7 +5662,7 @@
5344	5662	private MenuItem frontItem;
5345	5663	private MenuItem cameraItem;
5346	5664	private MenuItem compositeItem;
5347		- private MenuItem randomItem;
	5665	+ private MenuItem switchItem;
5348	5666	private MenuItem physicsItem;
5349	5667	private MenuItem frameselectorItem;
5350	5668	private MenuItem scriptNodeItem;
..	..	@@ -5418,5 +5736,5 @@
5418	5736
5419	5737	Menu cameraMenu;
5420	5738	MenuItem editCameraItem;
5421		- MenuItem revertCameraItem;
	5739	+ MenuItem restoreCameraItem;
5422	5740	}