~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -150,6 +150,8 @@
150	150
151	151	void SetupMenu2(GroupEditor oe)
152	152	{
	153	+ oe.jTree = new cTree();
	154	+
153	155	Menu menu;
154	156	oe.menuBar.add(menu = new Menu("Edit"));
155	157	//editItem = menu.add(new MenuItem("Edit"));
..	..	@@ -160,7 +162,7 @@
160	162	// redoItem = menu.add(new MenuItem("Redo"));
161	163	// redoItem.addActionListener(this);
162	164	// menu.add("-");
163		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	165	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
164	166	duplicateItem.addActionListener(this);
165	167	cloneItem = menu.add(new MenuItem("Clone"));
166	168	cloneItem.addActionListener(this);
..	..	@@ -176,7 +178,6 @@
176	178	copyItem.addActionListener(this);
177	179	pasteItem = menu.add(new MenuItem("Paste"));
178	180	pasteItem.addActionListener(this);
179		- menu.add("-");
180	181
181	182	menu.add("-");
182	183	pasteIntoItem = menu.add(new MenuItem("Paste into"));
..	..	@@ -203,23 +204,23 @@
203	204	//zBufferItem.addActionListener(this);
204	205	//cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
205	206	//normalLensItem.addActionListener(this);
206		- cameraMenu.add(revertCameraItem = new MenuItem("Restore Viewpoint"));
207		- revertCameraItem.addActionListener(this);
	207	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	208	+ restoreCameraItem.addActionListener(this);
208	209
209		- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
210		- toggleFullScreenItem.addItemListener(this);
211		- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
212		- cameraMenu.add("-");
	210	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	211	+// toggleFullScreenItem.addItemListener(this);
	212	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	213	+// cameraMenu.add("-");
	214	+//
	215	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	216	+// toggleTextureItem.addItemListener(this);
	217	+// toggleTextureItem.setState(CameraPane.textureon);
	218	+//
	219	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	220	+// toggleSwitchItem.addItemListener(this);
	221	+// toggleSwitchItem.setState(CameraPane.SWITCH);
213	222
214		- cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
215		- toggleTextureItem.addItemListener(this);
216		- toggleTextureItem.setState(CameraPane.textureon);
217		-
218		- cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
219		- toggleSwitchItem.addItemListener(this);
220		- toggleSwitchItem.setState(CameraPane.SWITCH);
221		-
222		- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
	223	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
223	224	toggleHandleItem.addItemListener(this);
224	225	toggleHandleItem.setState(CameraPane.HANDLES);
225	226
..	..	@@ -246,7 +247,7 @@
246	247
247	248	cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
248	249	toggleDebugItem.addItemListener(this);
249		- toggleDebugItem.setState(CameraPane.DEBUG);
	250	+ toggleDebugItem.setState(Globals.DEBUG);
250	251
251	252	cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
252	253	toggleFrustumItem.addItemListener(this);
..	..	@@ -274,7 +275,7 @@
274	275	{
275	276	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
276	277	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
277		- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
	278	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
278	279	editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
279	280	oe.cameraMenu.add("-");
280	281	openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
..	..	@@ -282,7 +283,7 @@
282	283	editLeafItem.addActionListener(this);
283	284	lookAtItem.addActionListener(this);
284	285	//lookFromItem.addActinoListener(this);
285		- //switchItem.addActionListener(this);
	286	+ //switchViewItem.addActionListener(this);
286	287	}
287	288
288	289	oe.menuBar.add(menu = new Menu("Setting"));
..	..	@@ -327,21 +328,29 @@
327	328	}
328	329
329	330	oe.menuBar.add(menu = new Menu("Group"));
330		- grabItem = menu.add(new MenuItem("Grab"));
331		- grabItem.addActionListener(this);
	331	+// grabItem = menu.add(new MenuItem("Grab"));
	332	+// grabItem.addActionListener(this);
332	333	backItem = menu.add(new MenuItem("Back"));
333	334	backItem.addActionListener(this);
334	335	frontItem = menu.add(new MenuItem("Front"));
335	336	frontItem.addActionListener(this);
336		- compositeItem = menu.add(new MenuItem("Composite"));
337		- compositeItem.addActionListener(this);
	337	+// compositeItem = menu.add(new MenuItem("Composite"));
	338	+// compositeItem.addActionListener(this);
	339	+
	340	+ if (Globals.ADVANCED)
	341	+ {
338	342	hideItem = menu.add(new MenuItem("Hidden Group"));
339	343	hideItem.addActionListener(this);
	344	+ }
340	345	ungroupItem = menu.add(new MenuItem("Ungroup"));
341	346	ungroupItem.addActionListener(this);
342		- menu.add("-");
343		- randomItem = menu.add(new MenuItem("Switch node"));
344		- randomItem.addActionListener(this);
	347	+
	348	+// menu.add("-");
	349	+//
	350	+// switchItem = menu.add(new MenuItem("Switch node"));
	351	+// switchItem.addActionListener(this);
	352	+ if (Globals.ADVANCED)
	353	+ {
345	354	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
346	355	switchGeoItem.addActionListener(this);
347	356	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
..	..	@@ -349,8 +358,6 @@
349	358	morphItem = menu.add(new MenuItem("Morph Group"));
350	359	morphItem.addActionListener(this);
351	360
352		- if (Globals.ADVANCED)
353		- {
354	361	menu.add("-");
355	362	physicsItem = menu.add(new MenuItem("Physics"));
356	363	physicsItem.addActionListener(this);
..	..	@@ -358,22 +365,20 @@
358	365	frameselectorItem.addActionListener(this);
359	366	scriptNodeItem = menu.add(new MenuItem("Script Node"));
360	367	scriptNodeItem.addActionListener(this);
361		- cameraItem = menu.add(new MenuItem("Camera"));
362		- cameraItem.addActionListener(this);
363	368	}
364	369
365	370	oe.menuBar.add(menu = new Menu("Object"));
366		- textureItem = menu.add(new MenuItem("Texture"));
367		- textureItem.addActionListener(this);
	371	+// textureItem = menu.add(new MenuItem("Texture"));
	372	+// textureItem.addActionListener(this);
368	373	billboardItem = menu.add(new MenuItem("Billboard"));
369	374	billboardItem.addActionListener(this);
370	375	csgItem = menu.add(new MenuItem("CSG"));
371	376	csgItem.addActionListener(this);
372		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	377	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
373	378	shadowXItem.addActionListener(this);
374		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	379	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
375	380	shadowYItem.addActionListener(this);
376		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	381	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
377	382	shadowZItem.addActionListener(this);
378	383	if (Globals.ADVANCED)
379	384	{
..	..	@@ -535,6 +540,18 @@
535	540
536	541	void SetupUI2(ObjEditor oe)
537	542	{
	543	+ // June 2019
	544	+ if (oe == null)
	545	+ {
	546	+ //super.SetupUI2(this);
	547	+ //return;
	548	+ }
	549	+
	550	+ if (copy != group)
	551	+ {
	552	+ //super.SetupUI2(this);
	553	+ }
	554	+
538	555	//new Exception().printStackTrace();
539	556
540	557	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -563,39 +580,63 @@
563	580	oe.radioPanel.add(dummyButton);
564	581	oe.buttonGroup.add(dummyButton);
565	582	*/
	583	+ cGridBag copyOptionsPanel = new cGridBag();
	584	+
	585	+ copyOptionsPanel.preferredHeight = 1;
	586	+
566	587	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
567	588
568		- oe.toolbarPanel.add(undoButton = new cButton("Undo", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	589	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	590	+ //minButton.setToolTipText("Minimize window");
	591	+ //minButton.addActionListener(this);
	592	+
	593	+ 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 item switcher");
	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,23 +839,43 @@
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)
745	865	{
746		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
747		- supportCB.setToolTipText("Enable rigging");
748		- supportCB.addItemListener(this);
	866	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	867	+// supportCB.setToolTipText("Enable rigging");
	868	+// supportCB.addItemListener(this);
	869	+
	870	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	871	+ freezeCB.setToolTipText("Fast moving camera");
	872	+ freezeCB.addItemListener(this);
749	873
750	874	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
751	875	// localCB.addItemListener(this);
752	876
	877	+ panel.Return();
	878	+
753	879	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
754	880	crowdCB.setToolTipText("Used for crowds");
755	881	crowdCB.addItemListener(this);
..	..	@@ -766,6 +892,8 @@
766	892	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
767	893	// speakerMocapCB.addItemListener(this);
768	894
	895	+ panel.Return();
	896	+
769	897	if (false)
770	898	{
771	899	// handled in scripts
..	..	@@ -780,32 +908,72 @@
780	908	//constraints.gridy += 1;
781	909	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
782	910	smoothfocusCB.addItemListener(this);
	911	+ panel.Return();
783	912	}
784	913
785	914	//constraints.gridx += 1;
786	915	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
787	916	// debugCB.addItemListener(this);
788	917
	918	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	919	+ trackCB.setToolTipText("Enable tracking target");
	920	+ trackCB.addItemListener(this);
	921	+
789	922	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	923	+ oeilCB.setToolTipText("Move camera when tracking");
790	924	oeilCB.addItemListener(this);
791	925
	926	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	927	+ shadowCB.setToolTipText("When live compute shadows");
	928	+ shadowCB.addItemListener(this);
	929	+
	930	+ panel.Return();
	931	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	932	+ toggleTextureCB.setToolTipText("Load textures");
	933	+ toggleTextureCB.addItemListener(this);
	934	+
	935	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	936	+ toggleSwitchCB.setToolTipText("Choose a single item");
	937	+ toggleSwitchCB.addItemListener(this);
	938	+
	939	+ panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
	940	+ autosaveCB.setToolTipText("On structure change");
	941	+ autosaveCB.addItemListener(this);
	942	+
	943	+ panel.Return();
	944	+ if (Globals.ADVANCED)
	945	+ {
792	946	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
793	947	lookAtCB.setToolTipText("Look-at target");
794	948	lookAtCB.addItemListener(this);
	949	+ }
795	950
796	951	}
797	952
798	953	cGridBag fill = new cGridBag();
799		-
800	954	fill.preferredHeight = 200;
	955	+ cGridBag fill2 = new cGridBag();
	956	+ fill2.preferredHeight = 200;
	957	+ cGridBag fill3 = new cGridBag();
	958	+ fill3.preferredHeight = 200;
801	959
802	960	panel.add(fill);
	961	+ panel.add(fill2);
	962	+ panel.add(fill3);
803	963
804	964	}
805	965
806	966	void EditObject(Object3D obj)
807	967	{
808	968	cRadio radioButton = new cRadio(obj.name);
	969	+
	970	+ // Patch to avoid bug with transparency.
	971	+ radioButton.hadMaterial = obj.material != null;
	972	+ if (!radioButton.hadMaterial)
	973	+ {
	974	+ obj.material = new cMaterial();
	975	+ }
	976	+
809	977	radioButton.SetObject(obj);
810	978	radioButton.layout = sevenButton;
811	979	radioButton.SetCamera(cameraView.renderCamera, false);
..	..	@@ -817,6 +985,8 @@
817	985
818	986	void SetupViews(ObjEditor oe)
819	987	{
	988	+ theFrame = this;
	989	+
820	990	oe.SetupViews();
821	991
822	992	System.out.println("SetupViews");
..	..	@@ -825,23 +995,28 @@
825	995	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
826	996	}
827	997
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;
	998	+ cToggleButton liveCB;
	999	+ cCheckBox supportCB;
	1000	+ cCheckBox localCB;
	1001	+ cCheckBox crowdCB;
	1002	+ cCheckBox smoothCB;
	1003	+ cToggleButton fastCB;
	1004	+ cCheckBox slowCB;
	1005	+ cCheckBox boxCB;
	1006	+ cCheckBox zoomBoxCB;
	1007	+ cCheckBox freezeCB;
	1008	+ //cToggleButton trackCB;
	1009	+ cCheckBox trackCB;
	1010	+ cCheckBox smoothfocusCB;
839	1011	// JCheckBox speakerMocapCB;
840		- JCheckBox speakerCameraCB;
841		- JCheckBox speakerFocusCB;
842		- JCheckBox debugCB;
843		- JCheckBox oeilCB;
844		- JCheckBox lookAtCB;
	1012	+ cCheckBox speakerCameraCB;
	1013	+ cCheckBox speakerFocusCB;
	1014	+ cCheckBox debugCB;
	1015	+
	1016	+ cCheckBox oeilCB;
	1017	+ cCheckBox shadowCB;
	1018	+ cCheckBox autosaveCB;
	1019	+ cCheckBox lookAtCB;
845	1020
846	1021	// static int COLOR = 1;
847	1022	// static int MATERIAL = 2;
..	..	@@ -849,9 +1024,9 @@
849	1024
850	1025	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
851	1026
852		- JCheckBox colorCB;
853		- JCheckBox materialCB;
854		- JCheckBox textureCB;
	1027	+ cCheckBox colorCB;
	1028	+ cCheckBox materialCB;
	1029	+ cCheckBox textureCB;
855	1030
856	1031	public void itemStateChanged(ItemEvent e)
857	1032	{
..	..	@@ -944,6 +1119,18 @@
944	1119	{
945	1120	cameraView.ToggleOeil();
946	1121	}
	1122	+ else if(e.getSource() == shadowCB)
	1123	+ {
	1124	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1125	+ }
	1126	+ else if(e.getSource() == freezeCB)
	1127	+ {
	1128	+ Globals.FREEZEONMOVE ^= true;
	1129	+ }
	1130	+ else if(e.getSource() == autosaveCB)
	1131	+ {
	1132	+ Globals.SAVEONMAKE ^= true;
	1133	+ }
947	1134	else if(e.getSource() == lookAtCB)
948	1135	{
949	1136	cameraView.ToggleLookAt();
..	..	@@ -960,7 +1147,8 @@
960	1147
961	1148	/**/
962	1149	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
963		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1150	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1151	+ TreePath path = objEditor.jTree.getSelectionPath();
964	1152	if ((path == null) \|\| (path.getPathCount() <= 1)) {
965	1153	// We can't move the root node or an empty selection
966	1154	return;
..	..	@@ -1077,23 +1265,33 @@
1077	1265
1078	1266	assert target == objEditor.jTree;
1079	1267	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1268	+ Object3D destinationLeaf;
1080	1269	try {
1081		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1270	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
1082	1271	} catch (Exception e) {
1083	1272	System.out.println("destinationPath : " + destinationPath);
1084	1273	return;
1085	1274	}
1086	1275
1087		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1276	+ for (int i=group.selection.size(); --i>=0;)
1088	1277	{
	1278	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1279	+
	1280	+ // Cannot move into itself
	1281	+ if (child == destinationLeaf)
	1282	+ return;
	1283	+ }
	1284	+
	1285	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1286	+// {
1089	1287	loadClipboard(true);
1090	1288	objEditor.jTree.setSelectionPath(destinationPath);
1091	1289	pasteInto(false, false);
1092		- } else {
1093		- loadClipboard(false);
1094		- objEditor.jTree.setSelectionPath(destinationPath);
1095		- pasteInto(false, false); // true); // ???
1096		- }
	1290	+// } else {
	1291	+// loadClipboard(false);
	1292	+// objEditor.jTree.setSelectionPath(destinationPath);
	1293	+// pasteInto(false, false); // true); // ???
	1294	+// }
1097	1295	}
1098	1296	public void dropActionChanged(DropTargetDragEvent dtde)
1099	1297	// Called if the user has modified the current drop gesture
..	..	@@ -1198,22 +1396,30 @@
1198	1396	{
1199	1397	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1200	1398	//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);
	1399	+// gridItem = menu.add(new MenuItem("Grid"));
	1400	+// gridItem.addActionListener(this);
	1401	+// rectoidItem = menu.add(new MenuItem("Box"));
	1402	+// rectoidItem.addActionListener(this);
	1403	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1404	+// ellipsoidItem.addActionListener(this);
	1405	+// coneItem = menu.add(new MenuItem("Cone"));
	1406	+// coneItem.addActionListener(this);
	1407	+// torusItem = menu.add(new MenuItem("Torus"));
	1408	+// torusItem.addActionListener(this);
	1409	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1410	+// superItem.addActionListener(this);
	1411	+
	1412	+ cameraItem = menu.add(new MenuItem("Camera"));
	1413	+ cameraItem.addActionListener(this);
	1414	+
	1415	+ if (!Globals.ADVANCED)
	1416	+ {
1213	1417	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1214	1418	kleinItem.addActionListener(this);
1215		- particleItem = menu.add(new MenuItem("Particle system"));
1216		- particleItem.addActionListener(this);
	1419	+ }
	1420	+
	1421	+// particleItem = menu.add(new MenuItem("Particle system"));
	1422	+// particleItem.addActionListener(this);
1217	1423	if (Globals.ADVANCED)
1218	1424	{
1219	1425	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1239,15 +1445,15 @@
1239	1445	}
1240	1446	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1241	1447	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);
	1448	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1449	+// overlayItem.addActionListener(this);
	1450	+// lightItem = menu.add(new MenuItem("Light"));
	1451	+// lightItem.addActionListener(this);
1246	1452	menu.add("-");
1247	1453	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1248	1454	//superLoopItem.addActionListener(this);
1249		- loopItem = menu.add(new MenuItem("Loop"));
1250		- loopItem.addActionListener(this);
	1455	+// loopItem = menu.add(new MenuItem("Loop"));
	1456	+// loopItem.addActionListener(this);
1251	1457	doubleItem = menu.add(new MenuItem("Fork"));
1252	1458	doubleItem.addActionListener(this);
1253	1459	if (Globals.ADVANCED)
..	..	@@ -1428,9 +1634,24 @@
1428	1634	shadow.material = new cMaterial(obj.material);
1429	1635	shadow.material.diffuse = 0.0001f;
1430	1636	shadow.material.specular = 0.0001f;
	1637	+ //shadow.projectedVertices[1].x = 300;
1431	1638
1432	1639	makeSomething(shadow);
1433	1640	}
	1641	+
	1642	+ private void ClearUnpinned()
	1643	+ {
	1644	+ //for (Object3D obj : listUI)
	1645	+ for (int i=listUI.size(); --i>=0;)
	1646	+ {
	1647	+ Object3D obj = listUI.elementAt(i);
	1648	+ if (!obj.pinned)
	1649	+ {
	1650	+ obj.CloseUI();
	1651	+ listUI.remove(i);
	1652	+ }
	1653	+ }
	1654	+ }
1434	1655
1435	1656	/**
1436	1657	* applyExample
..	..	@@ -1675,7 +1896,7 @@
1675	1896	{
1676	1897	ScreenFit();
1677	1898	} else
1678		- if (source == switchItem)
	1899	+ if (source == switchViewItem)
1679	1900	{
1680	1901	cVector v1 = new cVector();
1681	1902	cVector v2 = new cVector();
..	..	@@ -1684,11 +1905,11 @@
1684	1905	objEditor.cameraView.renderCamera.setAim(v2, v1);
1685	1906	objEditor.cameraView.repaint();
1686	1907	} else
1687		- if (source == rectoidItem)
	1908	+ if (source == rectoidItem \|\| source == boxButton)
1688	1909	{
1689	1910	makeSomething(new Box());
1690	1911	} else
1691		- if (source == particleItem)
	1912	+ if (source == particleItem \|\| source == particlesButton)
1692	1913	{
1693	1914	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1694	1915	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1767,27 +1988,27 @@
1767	1988
1768	1989	makeSomething(obj);
1769	1990	} else
1770		- if (source == gridItem)
	1991	+ if (source == gridItem \|\| source == gridButton)
1771	1992	{
1772	1993	makeSomething(new Grid());
1773	1994	} else
1774		- if (source == ellipsoidItem)
	1995	+ if (source == ellipsoidItem \|\| source == sphereButton)
1775	1996	{
1776	1997	makeSomething(new Sphere());
1777	1998	} else
1778		- if (source == coneItem)
	1999	+ if (source == coneItem \|\| source == coneButton)
1779	2000	{
1780	2001	makeSomething(new Cone());
1781	2002	} else
1782		- if (source == torusItem)
	2003	+ if (source == torusItem \|\| source == torusButton)
1783	2004	{
1784	2005	makeSomething(new Torus());
1785	2006	} else
1786		- if (source == superItem)
	2007	+ if (source == superItem \|\| source == superButton)
1787	2008	{
1788	2009	makeSomething(new Superellipsoid());
1789	2010	} else
1790		- if (source == kleinItem)
	2011	+ if (source == kleinItem \|\| source == kleinButton)
1791	2012	{
1792	2013	makeSomething(new Klein());
1793	2014	} else
..	..	@@ -1807,7 +2028,7 @@
1807	2028	{
1808	2029	makeSomething(new BezierSurface());
1809	2030	} else
1810		- if (source == overlayItem)
	2031	+ if (source == overlayItem \|\| source == overlayButton)
1811	2032	{
1812	2033	/*
1813	2034	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1855,7 +2076,7 @@
1855	2076	s.setup();
1856	2077	makeSomething(s);
1857	2078	} else
1858		- if (source == lightItem)
	2079	+ if (source == lightItem \|\| source == lightButton)
1859	2080	{
1860	2081	makeSomething(new Light());
1861	2082	} else
..	..	@@ -1905,30 +2126,30 @@
1905	2126
1906	2127	group(g);
1907	2128	} else
1908		- if (source == loopItem)
	2129	+ if (source == loopItem \|\| source == loopButton)
1909	2130	{
1910	2131	Composite csg = new GroupLeaf();
1911	2132	csg.count = 5;
1912	2133	group(csg);
1913		- Composite child = new cGroup();
	2134	+ Composite child = new cGroup("Branch");
1914	2135	csg.addChild(child);
1915	2136	child.addChild(csg);
1916	2137	} else
1917	2138	if (source == doubleItem)
1918	2139	{
1919		- Composite csg = new GroupLeaf();
	2140	+ Composite csg = new GroupLeaf("Fork");
1920	2141	csg.count = 5;
1921	2142	group(csg);
1922		- Composite child = new cGroup();
	2143	+ Composite child = new cGroup("Branch A");
1923	2144	csg.addChild(child);
1924	2145	child.addChild(csg);
1925		- child = new cGroup();
	2146	+ child = new cGroup("Branch B");
1926	2147	csg.addChild(child);
1927	2148	child.addChild(csg);
1928	2149	} else
1929	2150	if (source == tripleItem)
1930	2151	{
1931		- Composite csg = new GroupLeaf();
	2152	+ Composite csg = new GroupLeaf("Trident");
1932	2153	csg.count = 4;
1933	2154	group(csg);
1934	2155	Composite child = new cGroup();
..	..	@@ -1977,6 +2198,18 @@
1977	2198	if (source == dumpItem)
1978	2199	{
1979	2200	DumpObject();
	2201	+ } else
	2202	+ if (source == minButton)
	2203	+ {
	2204	+ Minimize();
	2205	+ } else
	2206	+ if (source == maxButton)
	2207	+ {
	2208	+ Maximize();
	2209	+ } else
	2210	+ if (source == fullButton)
	2211	+ {
	2212	+ ToggleFullScreen();
1980	2213	} else
1981	2214	if (source == undoButton)
1982	2215	{
..	..	@@ -2383,9 +2616,9 @@
2383	2616	{
2384	2617	ClearSelection(true);
2385	2618	} else
2386		- if (source == grabItem)
	2619	+ if (source == grabItem \|\| source == groupButton)
2387	2620	{
2388		- group(new cGroup(), true);
	2621	+ group(new cGroup(), false); // true);
2389	2622	} else
2390	2623	if (source == hideItem)
2391	2624	{
..	..	@@ -2403,11 +2636,11 @@
2403	2636	{
2404	2637	makeSomething(new Camera());
2405	2638	} else
2406		- if (source == compositeItem)
	2639	+ if (source == compositeItem \|\| source == compositeButton)
2407	2640	{
2408	2641	group(new Composite());
2409	2642	} else
2410		- if (source == randomItem)
	2643	+ if (source == switchItem \|\| source == switchButton)
2411	2644	{
2412	2645	RandomNode random = new RandomNode();
2413	2646	group(random);
..	..	@@ -2509,7 +2742,7 @@
2509	2742	{
2510	2743	group(new cLinker());
2511	2744	} else
2512		- if (source == textureItem)
	2745	+ if (source == textureItem \|\| source == textureButton)
2513	2746	{
2514	2747	group(new TextureNode());
2515	2748	} else
..	..	@@ -2529,17 +2762,30 @@
2529	2762	{
2530	2763	CastShadow(2);
2531	2764	} else
2532		- if (source == ungroupItem)
	2765	+ if (source == ungroupItem \|\| source == ungroupButton)
2533	2766	{
2534		- //ungroup();
	2767	+ boolean hasRoot = false;
	2768	+
2535	2769	for (int i=0; i<group.selection.size(); i++)
2536	2770	{
2537		- Ungroup(group.selection.get(i));
	2771	+ if (group.selection.get(i) == group)
	2772	+ {
	2773	+ hasRoot = true;
	2774	+ break;
	2775	+ }
2538	2776	}
2539	2777
2540		- ClearSelection(false);
2541		-
2542		- refreshContents();
	2778	+ if (!hasRoot)
	2779	+ {
	2780	+ for (int i=0; i<group.selection.size(); i++)
	2781	+ {
	2782	+ Ungroup(group.selection.get(i));
	2783	+ }
	2784	+
	2785	+ ClearSelection(false);
	2786	+
	2787	+ refreshContents();
	2788	+ }
2543	2789	} else
2544	2790	if (source == genUVItem)
2545	2791	{
..	..	@@ -2867,6 +3113,10 @@
2867	3113	if (source == twoButton)
2868	3114	{
2869	3115	radio.layout = twoButton;
	3116	+
	3117	+ if (CameraPane.FULLSCREEN)
	3118	+ fullscreenLayout = radio.layout;
	3119	+
2870	3120	// bug
2871	3121	//gridPanel.setDividerLocation(1.0);
2872	3122	//bigPanel.setDividerLocation(0.0);
..	..	@@ -2899,10 +3149,31 @@
2899	3149	bigThree.ClearUI();
2900	3150	bigThree.add(centralPanel);
2901	3151	bigThree.FlushUI();
	3152	+
	3153	+ cameraView.requestFocusInWindow();
	3154	+
	3155	+// refreshContents(true);
	3156	+//
	3157	+// try
	3158	+// {
	3159	+// java.awt.Robot bot = new java.awt.Robot();
	3160	+// int mask = InputEvent.BUTTON1_MASK;
	3161	+// bot.mouseMove(100, 100);
	3162	+// bot.mousePress(mask);
	3163	+// bot.mouseRelease(mask);
	3164	+// }
	3165	+// catch (Exception e)
	3166	+// {
	3167	+//
	3168	+// }
	3169	+
2902	3170	} else
2903	3171	if (source == threeButton)
2904	3172	{
2905	3173	radio.layout = threeButton;
	3174	+
	3175	+ if (CameraPane.FULLSCREEN)
	3176	+ fullscreenLayout = radio.layout;
2906	3177
2907	3178	// bigThree.remove(scenePanel);
2908	3179	// bigThree.remove(centralPanel);
..	..	@@ -2935,10 +3206,15 @@
2935	3206	bigThree.add(centralPanel);
2936	3207	bigThree.add(XYZPanel);
2937	3208	bigThree.FlushUI();
	3209	+
	3210	+ cameraView.requestFocusInWindow();
2938	3211	} else
2939	3212	if (source == fourButton)
2940	3213	{
2941	3214	radio.layout = fourButton;
	3215	+
	3216	+ if (CameraPane.FULLSCREEN)
	3217	+ fullscreenLayout = radio.layout;
2942	3218
2943	3219	// bigThree.remove(scenePanel);
2944	3220	// bigThree.remove(centralPanel);
..	..	@@ -2970,10 +3246,15 @@
2970	3246	bigThree.ClearUI();
2971	3247	bigThree.add(scenePanel);
2972	3248	bigThree.FlushUI();
	3249	+
	3250	+ cameraView.requestFocusInWindow();
2973	3251	} else
2974	3252	if (source == sixButton)
2975	3253	{
2976	3254	radio.layout = sixButton;
	3255	+
	3256	+ if (CameraPane.FULLSCREEN)
	3257	+ fullscreenLayout = radio.layout;
2977	3258
2978	3259	// bigThree.remove(scenePanel);
2979	3260	// bigThree.remove(centralPanel);
..	..	@@ -3006,10 +3287,15 @@
3006	3287	bigThree.add(scenePanel);
3007	3288	bigThree.add(centralPanel);
3008	3289	bigThree.FlushUI();
	3290	+
	3291	+ cameraView.requestFocusInWindow();
3009	3292	} else
3010	3293	if (source == sevenButton)
3011	3294	{
3012	3295	radio.layout = sevenButton;
	3296	+
	3297	+ if (CameraPane.FULLSCREEN)
	3298	+ fullscreenLayout = radio.layout;
3013	3299
3014	3300	// bigThree.remove(scenePanel);
3015	3301	// bigThree.remove(centralPanel);
..	..	@@ -3043,6 +3329,8 @@
3043	3329	bigThree.add(centralPanel);
3044	3330	bigThree.add(XYZPanel);
3045	3331	bigThree.FlushUI();
	3332	+
	3333	+ cameraView.requestFocusInWindow();
3046	3334	} else
3047	3335	if (source == rootButton)
3048	3336	{
..	..	@@ -3054,6 +3342,7 @@
3054	3342	EditObject(obj);
3055	3343	}
3056	3344
	3345	+ cameraView.requestFocusInWindow();
3057	3346	refreshContents(true);
3058	3347	} else
3059	3348	if (source == closeButton)
..	..	@@ -3063,22 +3352,37 @@
3063	3352	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3064	3353	{
3065	3354	ab = (cRadio)e.nextElement();
3066		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3355	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
3067	3356	{
	3357	+ // Patch to avoid bug with transparency.
	3358	+ if (!ab.hadMaterial)
	3359	+ {
	3360	+ ab.object.material = null;
	3361	+ }
	3362	+
3068	3363	buttonGroup.remove(ab);
3069	3364	radioPanel.remove(ab);
3070	3365
3071		- ab.GetObject().editWindow = null;
	3366	+ //ab.GetObject().editWindow = null;
	3367	+ ab.GetObject().manipWindow = null;
3072	3368	// ab.GetObject().objectUI = null; // ?????????
3073	3369
3074	3370	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
3075	3371	break;
3076	3372	}
3077	3373	}
	3374	+
	3375	+ cameraView.requestFocusInWindow();
3078	3376	refreshContents(true);
3079	3377	} else
3080	3378	if (source == editItem \|\| source == editButton)
3081	3379	{
	3380	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3381	+ {
	3382	+ Object3D child = (Object3D)e.nextElement();
	3383	+ child.pinned = true;
	3384	+ }
	3385	+
3082	3386	EditSelection(false);
3083	3387	} else
3084	3388	if (source == uneditButton)
..	..	@@ -3088,6 +3392,7 @@
3088	3392	Object3D child = (Object3D)e.nextElement();
3089	3393	if(child.editWindow != null)
3090	3394	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3395	+ child.pinned = false;
3091	3396	child.CloseUI();
3092	3397	listUI.remove(child);
3093	3398
..	..	@@ -3104,6 +3409,7 @@
3104	3409	//copy.ClearUI();
3105	3410	for (Object3D obj : listUI)
3106	3411	{
	3412	+ obj.pinned = false;
3107	3413	obj.CloseUI();
3108	3414	}
3109	3415	listUI.clear();
..	..	@@ -3113,7 +3419,7 @@
3113	3419	{
3114	3420	assert(copy == group);
3115	3421
3116		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3422	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3117	3423
3118	3424	for (Object3D obj : listUI)
3119	3425	{
..	..	@@ -3179,7 +3485,8 @@
3179	3485	}
3180	3486
3181	3487	// fix "+" issue
3182		- group.editWindow = this;
	3488	+ //group.editWindow = this;
	3489	+ group.manipWindow = this;
3183	3490
3184	3491	/*
3185	3492	currentLayout = radio.layout;
..	..	@@ -3187,18 +3494,25 @@
3187	3494	currentLayout = sevenButton;
3188	3495	*/
3189	3496	radio.layout.doClick();
	3497	+
	3498	+ ClearUnpinned();
	3499	+ SetPinStates(group.selection.size() > 0);
	3500	+ if (group.selection.size() == 1)
	3501	+ EditSelection(false);
3190	3502	keepparent = group.parent;
3191	3503	// PARENT = NULL or not???
3192	3504	//group.parent = null; // ROOT
3193	3505	//group.attributes = -1;
3194	3506	ResetModel();
	3507	+
	3508	+ cameraView.requestFocusInWindow();
3195	3509	refreshContents(true);
3196	3510	} else if (event.getSource() == editCameraItem)
3197	3511	{
3198	3512	cameraView.ProtectCamera();
3199	3513	cameraView.repaint();
3200	3514	return;
3201		- } else if (event.getSource() == revertCameraItem)
	3515	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3202	3516	{
3203	3517	cameraView.RevertCamera();
3204	3518	cameraView.repaint();
..	..	@@ -3215,7 +3529,6 @@
3215	3529	}
3216	3530
3217	3531	boolean useclient = false;
3218		- cRadio radio;
3219	3532
3220	3533	void ToggleRoot()
3221	3534	{
..	..	@@ -4253,10 +4566,6 @@
4253	4566	// }
4254	4567	// }
4255	4568
4256		- static boolean allparams = true;
4257		-
4258		- static Vector<Object3D> listUI = new Vector<Object3D>();
4259		-
4260	4569	void EditSelection(boolean newWindow)
4261	4570	{
4262	4571	// aConstraints.gridy = 0;
..	..	@@ -4264,7 +4573,7 @@
4264	4573	{
4265	4574	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4266	4575	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4267		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4576	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4268	4577
4269	4578	Object3D elem = (Object3D)group.selection.elementAt(i);
4270	4579	if(elem != group \|\| !newWindow)
..	..	@@ -4349,7 +4658,8 @@
4349	4658	//new Exception().printStackTrace();
4350	4659
4351	4660	freezemodel = true;
4352		-
	4661	+ ClearUnpinned();
	4662	+
4353	4663	/**/
4354	4664	//switch (event.id)
4355	4665	{
..	..	@@ -4382,7 +4692,7 @@
4382	4692	if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4383	4693	// a camera
4384	4694	{
4385		- if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	4695	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
4386	4696	{
4387	4697	CameraPane.camerachangeframe = 0; // don't refuse it
4388	4698	Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
..	..	@@ -4391,6 +4701,13 @@
4391	4701	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4392	4702	}
4393	4703
	4704	+ if (tps != null && tps.length == 1)
	4705	+ {
	4706	+ EditSelection(false);
	4707	+ }
	4708	+
	4709	+ SetPinStates(tps != null && tps.length > 0);
	4710	+
4394	4711	refreshContents();
4395	4712	//return true;
4396	4713	}
..	..	@@ -4400,9 +4717,18 @@
4400	4717	freezemodel = false;
4401	4718	}
4402	4719
	4720	+ void SetPinStates(boolean enabled)
	4721	+ {
	4722	+ editButton.setEnabled(enabled);
	4723	+ uneditButton.setEnabled(enabled);
	4724	+ unselectButton.setEnabled(enabled);
	4725	+ flashSelectionButton.setEnabled(enabled);
	4726	+ }
	4727	+
4403	4728	void refreshContents(boolean cp)
4404	4729	{
4405		- if (!Globals.MOUSEDRAGGED)
	4730	+ if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
	4731	+ if (!Globals.MOUSEDRAGGED) // && !Globals.TIMERRUNNING)
4406	4732	{
4407	4733	objEditor.ClearInfo(); // .GetMaterial());
4408	4734
..	..	@@ -4501,6 +4827,7 @@
4501	4827
4502	4828	if (cut)
4503	4829	{
	4830	+ if (Globals.SAVEONMAKE)
4504	4831	Save();
4505	4832	//int indices[] = jList.getSelectedIndices();
4506	4833	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -5219,10 +5546,28 @@
5219	5546	cButton clearpanelButton;
5220	5547	cButton unselectButton;
5221	5548
	5549	+ cButton restoreCameraButton;
	5550	+
5222	5551	cButton saveButton;
5223		- cButton undoButton;
5224		- cButton redoButton;
5225	5552	cButton oneStepButton;
	5553	+
	5554	+ cButton groupButton;
	5555	+ cButton ungroupButton;
	5556	+ cButton compositeButton;
	5557	+ cButton switchButton;
	5558	+ cButton loopButton;
	5559	+ cButton textureButton;
	5560	+
	5561	+ cButton gridButton;
	5562	+ cButton boxButton;
	5563	+ cButton sphereButton;
	5564	+ cButton coneButton;
	5565	+ cButton torusButton;
	5566	+ cButton superButton;
	5567	+ cButton kleinButton;
	5568	+ cButton particlesButton;
	5569	+ cButton overlayButton;
	5570	+ cButton lightButton;
5226	5571
5227	5572	cButton screenfitButton;
5228	5573	cButton screenfitpointButton;
..	..	@@ -5235,14 +5580,6 @@
5235	5580
5236	5581	cButton setsupportButton;
5237	5582
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	5583	//
5247	5584	//Composite
5248	5585	Object3D // to do !!
..	..	@@ -5252,11 +5589,11 @@
5252	5589	//JTree jTree;
5253	5590	private MenuItem lookAtItem;
5254	5591	private MenuItem lookFromItem;
5255		- private MenuItem switchItem;
	5592	+ private MenuItem switchViewItem;
5256	5593	private MenuItem cutItem;
5257	5594	private MenuItem undoItem;
5258	5595	private MenuItem redoItem;
5259		- private MenuItem duplicateItem;
	5596	+ private JMenuItem duplicateItem;
5260	5597	private MenuItem cloneItem;
5261	5598	private MenuItem cloneSupportItem;
5262	5599	private MenuItem overwriteGeoItem;
..	..	@@ -5344,7 +5681,7 @@
5344	5681	private MenuItem frontItem;
5345	5682	private MenuItem cameraItem;
5346	5683	private MenuItem compositeItem;
5347		- private MenuItem randomItem;
	5684	+ private MenuItem switchItem;
5348	5685	private MenuItem physicsItem;
5349	5686	private MenuItem frameselectorItem;
5350	5687	private MenuItem scriptNodeItem;
..	..	@@ -5418,5 +5755,5 @@
5418	5755
5419	5756	Menu cameraMenu;
5420	5757	MenuItem editCameraItem;
5421		- MenuItem revertCameraItem;
	5758	+ MenuItem restoreCameraItem;
5422	5759	}