~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -84,6 +84,10 @@
84	84
85	85	void CloneSelection(boolean supports)
86	86	{
	87	+ if (Globals.SAVEONMAKE)
	88	+ Save();
	89	+ boolean keep = Globals.SAVEONMAKE;
	90	+ Globals.SAVEONMAKE = false;
87	91	// Object3D keep = GrafreeD.clipboard;
88	92	//Object3D obj;
89	93	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -94,6 +98,7 @@
94	98
95	99	makeSomething(clone, i==group.selection.size()-1);
96	100	}
	101	+ Globals.SAVEONMAKE = keep;
97	102	}
98	103
99	104	void CloneClipboard(boolean supports)
..	..	@@ -150,6 +155,8 @@
150	155
151	156	void SetupMenu2(GroupEditor oe)
152	157	{
	158	+ oe.jTree = new cTree();
	159	+
153	160	Menu menu;
154	161	oe.menuBar.add(menu = new Menu("Edit"));
155	162	//editItem = menu.add(new MenuItem("Edit"));
..	..	@@ -160,7 +167,7 @@
160	167	// redoItem = menu.add(new MenuItem("Redo"));
161	168	// redoItem.addActionListener(this);
162	169	// menu.add("-");
163		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	170	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
164	171	duplicateItem.addActionListener(this);
165	172	cloneItem = menu.add(new MenuItem("Clone"));
166	173	cloneItem.addActionListener(this);
..	..	@@ -202,23 +209,23 @@
202	209	//zBufferItem.addActionListener(this);
203	210	//cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
204	211	//normalLensItem.addActionListener(this);
205		- cameraMenu.add(revertCameraItem = new MenuItem("Restore Viewpoint"));
206		- revertCameraItem.addActionListener(this);
	212	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	213	+ restoreCameraItem.addActionListener(this);
207	214
208		- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
209		- toggleFullScreenItem.addItemListener(this);
210		- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
211		- cameraMenu.add("-");
	215	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	216	+// toggleFullScreenItem.addItemListener(this);
	217	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	218	+// cameraMenu.add("-");
	219	+//
	220	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	221	+// toggleTextureItem.addItemListener(this);
	222	+// toggleTextureItem.setState(CameraPane.textureon);
	223	+//
	224	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	225	+// toggleSwitchItem.addItemListener(this);
	226	+// toggleSwitchItem.setState(CameraPane.SWITCH);
212	227
213		- cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
214		- toggleTextureItem.addItemListener(this);
215		- toggleTextureItem.setState(CameraPane.textureon);
216		-
217		- cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
218		- toggleSwitchItem.addItemListener(this);
219		- toggleSwitchItem.setState(CameraPane.SWITCH);
220		-
221		- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
	228	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
222	229	toggleHandleItem.addItemListener(this);
223	230	toggleHandleItem.setState(CameraPane.HANDLES);
224	231
..	..	@@ -273,7 +280,7 @@
273	280	{
274	281	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
275	282	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
276		- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
	283	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
277	284	editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
278	285	oe.cameraMenu.add("-");
279	286	openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
..	..	@@ -281,7 +288,7 @@
281	288	editLeafItem.addActionListener(this);
282	289	lookAtItem.addActionListener(this);
283	290	//lookFromItem.addActinoListener(this);
284		- //switchItem.addActionListener(this);
	291	+ //switchViewItem.addActionListener(this);
285	292	}
286	293
287	294	oe.menuBar.add(menu = new Menu("Setting"));
..	..	@@ -326,21 +333,29 @@
326	333	}
327	334
328	335	oe.menuBar.add(menu = new Menu("Group"));
329		- grabItem = menu.add(new MenuItem("Grab"));
330		- grabItem.addActionListener(this);
	336	+// grabItem = menu.add(new MenuItem("Grab"));
	337	+// grabItem.addActionListener(this);
331	338	backItem = menu.add(new MenuItem("Back"));
332	339	backItem.addActionListener(this);
333	340	frontItem = menu.add(new MenuItem("Front"));
334	341	frontItem.addActionListener(this);
335		- compositeItem = menu.add(new MenuItem("Composite"));
336		- compositeItem.addActionListener(this);
	342	+// compositeItem = menu.add(new MenuItem("Composite"));
	343	+// compositeItem.addActionListener(this);
	344	+
	345	+ if (Globals.ADVANCED)
	346	+ {
337	347	hideItem = menu.add(new MenuItem("Hidden Group"));
338	348	hideItem.addActionListener(this);
	349	+ }
339	350	ungroupItem = menu.add(new MenuItem("Ungroup"));
340	351	ungroupItem.addActionListener(this);
341		- menu.add("-");
342		- randomItem = menu.add(new MenuItem("Switch node"));
343		- randomItem.addActionListener(this);
	352	+
	353	+// menu.add("-");
	354	+//
	355	+// switchItem = menu.add(new MenuItem("Switch node"));
	356	+// switchItem.addActionListener(this);
	357	+ if (Globals.ADVANCED)
	358	+ {
344	359	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
345	360	switchGeoItem.addActionListener(this);
346	361	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
..	..	@@ -348,8 +363,6 @@
348	363	morphItem = menu.add(new MenuItem("Morph Group"));
349	364	morphItem.addActionListener(this);
350	365
351		- if (Globals.ADVANCED)
352		- {
353	366	menu.add("-");
354	367	physicsItem = menu.add(new MenuItem("Physics"));
355	368	physicsItem.addActionListener(this);
..	..	@@ -357,13 +370,11 @@
357	370	frameselectorItem.addActionListener(this);
358	371	scriptNodeItem = menu.add(new MenuItem("Script Node"));
359	372	scriptNodeItem.addActionListener(this);
360		- cameraItem = menu.add(new MenuItem("Camera"));
361		- cameraItem.addActionListener(this);
362	373	}
363	374
364	375	oe.menuBar.add(menu = new Menu("Object"));
365		- textureItem = menu.add(new MenuItem("Texture"));
366		- textureItem.addActionListener(this);
	376	+// textureItem = menu.add(new MenuItem("Texture"));
	377	+// textureItem.addActionListener(this);
367	378	billboardItem = menu.add(new MenuItem("Billboard"));
368	379	billboardItem.addActionListener(this);
369	380	csgItem = menu.add(new MenuItem("CSG"));
..	..	@@ -374,13 +385,14 @@
374	385	shadowYItem.addActionListener(this);
375	386	shadowZItem = menu.add(new MenuItem("Shadow Blue"));
376	387	shadowZItem.addActionListener(this);
	388	+ attributeItem = menu.add(new MenuItem("Attribute"));
	389	+ attributeItem.addActionListener(this);
	390	+
377	391	if (Globals.ADVANCED)
378	392	{
379	393	menu.add("-");
380	394	linkerItem = menu.add(new MenuItem("Linker"));
381	395	linkerItem.addActionListener(this);
382		- attributeItem = menu.add(new MenuItem("Attribute"));
383		- attributeItem.addActionListener(this);
384	396	templateItem = menu.add(new MenuItem("Template"));
385	397	templateItem.addActionListener(this);
386	398	pointflowItem = menu.add(new MenuItem("Point Flow"));
..	..	@@ -574,51 +586,66 @@
574	586	oe.radioPanel.add(dummyButton);
575	587	oe.buttonGroup.add(dummyButton);
576	588	*/
	589	+ cGridBag copyOptionsPanel = new cGridBag();
	590	+
	591	+ copyOptionsPanel.preferredHeight = 1;
	592	+
577	593	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
578	594
579	595	//oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
580	596	//minButton.setToolTipText("Minimize window");
581	597	//minButton.addActionListener(this);
582	598
583		- oe.toolbarPanel.add(maxButton = new cButton("\u271A", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
584		- maxButton.setToolTipText("Maximize window");
585		- maxButton.addActionListener(this);
	599	+ if (Globals.ADVANCED)
	600	+ {
	601	+ oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	602	+ maxButton.setToolTipText("Maximize window");
	603	+ maxButton.addActionListener(this);
	604	+ }
586	605
587		- oe.toolbarPanel.add(fullButton = new cButton("\u2b1c", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	606	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
588	607	fullButton.setToolTipText("Full-screen window");
589	608	fullButton.addActionListener(this);
590	609
591		- oe.toolbarPanel.add(undoButton = new cButton("\u21a9", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	610	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	611	+ screenfitButton.setToolTipText("Screen fit");
	612	+ screenfitButton.addActionListener(this);
	613	+
	614	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	615	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	616	+ restoreCameraButton.addActionListener(this);
	617	+
	618	+ copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
592	619	undoButton.setToolTipText("Undo changes");
593	620	undoButton.addActionListener(this);
	621	+ undoButton.setEnabled(false);
594	622
595		- oe.toolbarPanel.add(redoButton = new cButton("\u21aa", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	623	+ copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
596	624	redoButton.setToolTipText("Redo changes");
597	625	redoButton.addActionListener(this);
	626	+ redoButton.setEnabled(false);
598	627
599		- oe.toolbarPanel.add(saveButton = new cButton("\u21e3", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	628	+ copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
600	629	saveButton.setToolTipText("Save changes");
601	630	saveButton.addActionListener(this);
602	631
603		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
	632	+ copyOptionsPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
604	633	liveCB.setToolTipText("Enable animation");
605	634	liveCB.addItemListener(this);
606	635
607		- oe.toolbarPanel.add(oneStepButton = new cButton("\u29f4", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	636	+ copyOptionsPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
608	637	oneStepButton.setToolTipText("Animate one step forward");
609	638	oneStepButton.addActionListener(this);
610	639
611		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	640	+ copyOptionsPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
612	641	fastCB.setToolTipText("Fast mode");
613	642	fastCB.addItemListener(this);
614	643
615		- oe.toolbarPanel.add(trackCB = new cCheckBox(":", CameraPane.TRACK)); //, oe.aConstraints);
616		- trackCB.setToolTipText("Enable tracking");
617		- trackCB.addItemListener(this);
618		-
619		- oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
620		- screenfitButton.setToolTipText("Screen fit");
621		- screenfitButton.addActionListener(this);
	644	+ //oe.toolboxPanel.Return();
	645	+
	646	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	647	+// trackCB.setToolTipText("Enable tracking");
	648	+// trackCB.addItemListener(this);
622	649
623	650	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
624	651	// screenfitpointButton.addActionListener(this);
..	..	@@ -630,15 +657,13 @@
630	657	snapobjectButton.setToolTipText("Snap Object");
631	658	}
632	659
633		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
634		- flashSelectionButton.setToolTipText("Show selection");
635		- flashSelectionButton.addActionListener(this);
636		-
637		- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
	660	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
638	661
639	662	oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
640	663	twoButton.setToolTipText("Show center view only");
641	664	twoButton.addActionListener(this);
	665	+ this.fullscreenLayout = twoButton;
	666	+
642	667	oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
643	668	fourButton.addActionListener(this);
644	669	fourButton.setToolTipText("Show left panel only");
..	..	@@ -653,26 +678,105 @@
653	678	sevenButton.addActionListener(this);
654	679	//
655	680
656		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	681	+ oe.toolbarPanel.add(rootButton = GetButton("icons/write.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
657	682	rootButton.setToolTipText("Edit selection in new tab");
658	683	rootButton.addActionListener(this);
659	684
660		- oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	685	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
661	686	closeButton.setToolTipText("Close tab");
662	687	closeButton.addActionListener(this);
663	688	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
664	689	//clearButton.addActionListener(this);
665		-
666		- editCommandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
667		- editButton.setToolTipText("Edit selection");
	690	+
	691	+ // INSERT
	692	+ oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	693	+ gridButton.setToolTipText("Create grid");
	694	+ gridButton.addActionListener(this);
	695	+
	696	+ oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	697	+ boxButton.setToolTipText("Create box");
	698	+ boxButton.addActionListener(this);
	699	+
	700	+ oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	701	+ sphereButton.setToolTipText("Create sphere");
	702	+ sphereButton.addActionListener(this);
	703	+
	704	+ oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	705	+ coneButton.setToolTipText("Create cone");
	706	+ coneButton.addActionListener(this);
	707	+
	708	+ oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	709	+ torusButton.setToolTipText("Create torus");
	710	+ torusButton.addActionListener(this);
	711	+
	712	+ oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	713	+ superButton.setToolTipText("Create superellipsoid");
	714	+ superButton.addActionListener(this);
	715	+
	716	+ if (Globals.ADVANCED)
	717	+ {
	718	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	719	+ kleinButton.setToolTipText("Create Klein bottle");
	720	+ kleinButton.addActionListener(this);
	721	+ }
	722	+
	723	+ oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	724	+ particlesButton.setToolTipText("Create particle system");
	725	+ particlesButton.addActionListener(this);
	726	+
	727	+ oe.toolboxPanel.Return();
	728	+
	729	+ oe.toolboxPanel.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	730	+ groupButton.setToolTipText("Create group");
	731	+ groupButton.addActionListener(this);
	732	+
	733	+ oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	734	+ compositeButton.setToolTipText("Create composite");
	735	+ compositeButton.addActionListener(this);
	736	+
	737	+ oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	738	+ switchButton.setToolTipText("Create item switcher");
	739	+ switchButton.addActionListener(this);
	740	+
	741	+ oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	742	+ loopButton.setToolTipText("Create loop");
	743	+ loopButton.addActionListener(this);
	744	+
	745	+ oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	746	+ textureButton.setToolTipText("Create texture");
	747	+ textureButton.addActionListener(this);
	748	+
	749	+ oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	750	+ overlayButton.setToolTipText("Create overlay");
	751	+ overlayButton.addActionListener(this);
	752	+
	753	+ oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	754	+ lightButton.setToolTipText("Create light");
	755	+ lightButton.addActionListener(this);
	756	+
	757	+ for (int i=6; --i>=0;)
	758	+ {
	759	+ oe.toolboxPanel.Return();
	760	+ oe.toolboxPanel.add(new cGridBag());
	761	+ oe.toolboxPanel.add(new cGridBag());
	762	+ oe.toolboxPanel.add(new cGridBag());
	763	+ oe.toolboxPanel.add(new cGridBag());
	764	+ oe.toolboxPanel.add(new cGridBag());
	765	+ oe.toolboxPanel.add(new cGridBag());
	766	+ oe.toolboxPanel.add(new cGridBag());
	767	+ }
	768	+
	769	+ // EDIT panel
	770	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	771	+ editButton.setToolTipText("Pin selection controls");
668	772	editButton.addActionListener(this);
669	773
670		- editCommandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
671		- uneditButton.setToolTipText("Unedit selection");
	774	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	775	+ uneditButton.setToolTipText("Remove selection controls");
672	776	uneditButton.addActionListener(this);
673	777
674	778	editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
675		- allParamsButton.setToolTipText("Edit all params");
	779	+ allParamsButton.setToolTipText("Show all controle");
676	780	allParamsButton.addActionListener(this);
677	781
678	782	editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..	..	@@ -683,8 +787,13 @@
683	787	unselectButton.setToolTipText("Unselect");
684	788	unselectButton.addActionListener(this);
685	789
	790	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	791	+ flashSelectionButton.setToolTipText("Highlight selection");
	792	+ flashSelectionButton.addActionListener(this);
	793	+
686	794	editCommandsPanel.preferredHeight = 1;
687	795
	796	+ SetPinStates(false);
688	797	// oe.treePanel.add(commandsPanel);
689	798	// oe.treePanel.Return();
690	799
..	..	@@ -703,27 +812,12 @@
703	812
704	813	JScrollPane jSP;
705	814	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
706		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	815	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
707	816	ResetModel();
708	817
709	818	oe.treePanel.add(jSPPanel);
710	819	oe.treePanel.Return();
711	820
712		- cGridBag copyOptionsPanel = new cGridBag();
713		-
714		- copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
715		- colorCB.setToolTipText("Copy color when dropped");
716		- colorCB.addItemListener(this);
717		-
718		- copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
719		- materialCB.setToolTipText("Copy material when dropped");
720		- materialCB.addItemListener(this);
721		-
722		- copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
723		- textureCB.setToolTipText("Copy texture when dropped");
724		- textureCB.addItemListener(this);
725		-
726		- copyOptionsPanel.preferredHeight = 1;
727	821	oe.treePanel.add(copyOptionsPanel);
728	822	oe.treePanel.Return();
729	823
..	..	@@ -754,23 +848,43 @@
754	848
755	849	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
756	850	{
	851	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	852	+ colorCB.setToolTipText("Copy color when dropped");
	853	+ colorCB.addItemListener(this);
	854	+
	855	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	856	+ materialCB.setToolTipText("Copy material when dropped");
	857	+ materialCB.addItemListener(this);
	858	+
	859	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	860	+ textureCB.setToolTipText("Copy texture when dropped");
	861	+ textureCB.addItemListener(this);
	862	+
	863	+ panel.Return();
	864	+
757	865	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
758	866	boxCB.setToolTipText("Display bounding boxes");
759	867	boxCB.addItemListener(this);
760	868
761	869	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
762		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	870	+ zoomBoxCB.setToolTipText("Display only for wheel");
763	871	zoomBoxCB.addItemListener(this);
764	872
765	873	if (true) // Globals.ADVANCED)
766	874	{
767		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
768		- supportCB.setToolTipText("Enable rigging");
769		- supportCB.addItemListener(this);
	875	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	876	+// supportCB.setToolTipText("Enable rigging");
	877	+// supportCB.addItemListener(this);
	878	+
	879	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	880	+ freezeCB.setToolTipText("Fast moving camera");
	881	+ freezeCB.addItemListener(this);
770	882
771	883	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
772	884	// localCB.addItemListener(this);
773	885
	886	+ panel.Return();
	887	+
774	888	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
775	889	crowdCB.setToolTipText("Used for crowds");
776	890	crowdCB.addItemListener(this);
..	..	@@ -787,6 +901,8 @@
787	901	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
788	902	// speakerMocapCB.addItemListener(this);
789	903
	904	+ panel.Return();
	905	+
790	906	if (false)
791	907	{
792	908	// handled in scripts
..	..	@@ -801,32 +917,72 @@
801	917	//constraints.gridy += 1;
802	918	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
803	919	smoothfocusCB.addItemListener(this);
	920	+ panel.Return();
804	921	}
805	922
806	923	//constraints.gridx += 1;
807	924	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
808	925	// debugCB.addItemListener(this);
809	926
	927	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	928	+ trackCB.setToolTipText("Enable tracking target");
	929	+ trackCB.addItemListener(this);
	930	+
810	931	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	932	+ oeilCB.setToolTipText("Move camera when tracking");
811	933	oeilCB.addItemListener(this);
812	934
	935	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	936	+ shadowCB.setToolTipText("When live compute shadows");
	937	+ shadowCB.addItemListener(this);
	938	+
	939	+ panel.Return();
	940	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	941	+ toggleTextureCB.setToolTipText("Load textures");
	942	+ toggleTextureCB.addItemListener(this);
	943	+
	944	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	945	+ toggleSwitchCB.setToolTipText("Choose a single item");
	946	+ toggleSwitchCB.addItemListener(this);
	947	+
	948	+ panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
	949	+ autosaveCB.setToolTipText("On structure change");
	950	+ autosaveCB.addItemListener(this);
	951	+
	952	+ panel.Return();
	953	+ if (Globals.ADVANCED)
	954	+ {
813	955	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
814	956	lookAtCB.setToolTipText("Look-at target");
815	957	lookAtCB.addItemListener(this);
	958	+ }
816	959
817	960	}
818	961
819	962	cGridBag fill = new cGridBag();
820		-
821	963	fill.preferredHeight = 200;
	964	+ cGridBag fill2 = new cGridBag();
	965	+ fill2.preferredHeight = 200;
	966	+ cGridBag fill3 = new cGridBag();
	967	+ fill3.preferredHeight = 200;
822	968
823	969	panel.add(fill);
	970	+ panel.add(fill2);
	971	+ panel.add(fill3);
824	972
825	973	}
826	974
827	975	void EditObject(Object3D obj)
828	976	{
829	977	cRadio radioButton = new cRadio(obj.name);
	978	+
	979	+ // June 2019. Patch to avoid bug with transparency.
	980	+ radioButton.hadMaterial = obj.material != null;
	981	+ if (!radioButton.hadMaterial)
	982	+ {
	983	+ obj.material = new cMaterial();
	984	+ }
	985	+
830	986	radioButton.SetObject(obj);
831	987	radioButton.layout = sevenButton;
832	988	radioButton.SetCamera(cameraView.renderCamera, false);
..	..	@@ -848,23 +1004,28 @@
848	1004	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
849	1005	}
850	1006
851		- JCheckBox liveCB;
852		- JCheckBox supportCB;
853		- JCheckBox localCB;
854		- JCheckBox crowdCB;
855		- JCheckBox smoothCB;
856		- JCheckBox fastCB;
857		- JCheckBox slowCB;
858		- JCheckBox boxCB;
859		- JCheckBox zoomBoxCB;
860		- JCheckBox trackCB;
861		- JCheckBox smoothfocusCB;
	1007	+ cToggleButton liveCB;
	1008	+ cCheckBox supportCB;
	1009	+ cCheckBox localCB;
	1010	+ cCheckBox crowdCB;
	1011	+ cCheckBox smoothCB;
	1012	+ cToggleButton fastCB;
	1013	+ cCheckBox slowCB;
	1014	+ cCheckBox boxCB;
	1015	+ cCheckBox zoomBoxCB;
	1016	+ cCheckBox freezeCB;
	1017	+ //cToggleButton trackCB;
	1018	+ cCheckBox trackCB;
	1019	+ cCheckBox smoothfocusCB;
862	1020	// JCheckBox speakerMocapCB;
863		- JCheckBox speakerCameraCB;
864		- JCheckBox speakerFocusCB;
865		- JCheckBox debugCB;
866		- JCheckBox oeilCB;
867		- JCheckBox lookAtCB;
	1021	+ cCheckBox speakerCameraCB;
	1022	+ cCheckBox speakerFocusCB;
	1023	+ cCheckBox debugCB;
	1024	+
	1025	+ cCheckBox oeilCB;
	1026	+ cCheckBox shadowCB;
	1027	+ cCheckBox autosaveCB;
	1028	+ cCheckBox lookAtCB;
868	1029
869	1030	// static int COLOR = 1;
870	1031	// static int MATERIAL = 2;
..	..	@@ -872,9 +1033,9 @@
872	1033
873	1034	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
874	1035
875		- JCheckBox colorCB;
876		- JCheckBox materialCB;
877		- JCheckBox textureCB;
	1036	+ cCheckBox colorCB;
	1037	+ cCheckBox materialCB;
	1038	+ cCheckBox textureCB;
878	1039
879	1040	public void itemStateChanged(ItemEvent e)
880	1041	{
..	..	@@ -967,6 +1128,18 @@
967	1128	{
968	1129	cameraView.ToggleOeil();
969	1130	}
	1131	+ else if(e.getSource() == shadowCB)
	1132	+ {
	1133	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1134	+ }
	1135	+ else if(e.getSource() == freezeCB)
	1136	+ {
	1137	+ Globals.FREEZEONMOVE ^= true;
	1138	+ }
	1139	+ else if(e.getSource() == autosaveCB)
	1140	+ {
	1141	+ Globals.SAVEONMAKE ^= true;
	1142	+ }
970	1143	else if(e.getSource() == lookAtCB)
971	1144	{
972	1145	cameraView.ToggleLookAt();
..	..	@@ -983,7 +1156,8 @@
983	1156
984	1157	/**/
985	1158	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
986		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1159	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1160	+ TreePath path = objEditor.jTree.getSelectionPath();
987	1161	if ((path == null) \|\| (path.getPathCount() <= 1)) {
988	1162	// We can't move the root node or an empty selection
989	1163	return;
..	..	@@ -1046,8 +1220,6 @@
1046	1220	}
1047	1221	}
1048	1222
1049		- String string = (String) object;
1050		-
1051	1223	System.out.println("Transfer = " + object + "; drop : " + target);
1052	1224	// if( object instanceof java.io.File[])
1053	1225	// {
..	..	@@ -1055,6 +1227,8 @@
1055	1227	// objEditor.DropFile((java.io.File[]) object, true);
1056	1228	// return;
1057	1229	// }
	1230	+
	1231	+ String string = object.toString();
1058	1232
1059	1233	// File path for Mac and Windows
1060	1234	if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
..	..	@@ -1100,23 +1274,33 @@
1100	1274
1101	1275	assert target == objEditor.jTree;
1102	1276	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1277	+ Object3D destinationLeaf;
1103	1278	try {
1104		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1279	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
1105	1280	} catch (Exception e) {
1106	1281	System.out.println("destinationPath : " + destinationPath);
1107	1282	return;
1108	1283	}
1109	1284
1110		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1285	+ for (int i=group.selection.size(); --i>=0;)
1111	1286	{
	1287	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1288	+
	1289	+ // Cannot move into itself
	1290	+ if (child == destinationLeaf)
	1291	+ return;
	1292	+ }
	1293	+
	1294	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1295	+// {
1112	1296	loadClipboard(true);
1113	1297	objEditor.jTree.setSelectionPath(destinationPath);
1114	1298	pasteInto(false, false);
1115		- } else {
1116		- loadClipboard(false);
1117		- objEditor.jTree.setSelectionPath(destinationPath);
1118		- pasteInto(false, false); // true); // ???
1119		- }
	1299	+// } else {
	1300	+// loadClipboard(false);
	1301	+// objEditor.jTree.setSelectionPath(destinationPath);
	1302	+// pasteInto(false, false); // true); // ???
	1303	+// }
1120	1304	}
1121	1305	public void dropActionChanged(DropTargetDragEvent dtde)
1122	1306	// Called if the user has modified the current drop gesture
..	..	@@ -1221,22 +1405,30 @@
1221	1405	{
1222	1406	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1223	1407	//heightFieldItem.addActionListener(this);
1224		- gridItem = menu.add(new MenuItem("Grid"));
1225		- gridItem.addActionListener(this);
1226		- rectoidItem = menu.add(new MenuItem("Box"));
1227		- rectoidItem.addActionListener(this);
1228		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1229		- ellipsoidItem.addActionListener(this);
1230		- coneItem = menu.add(new MenuItem("Cone"));
1231		- coneItem.addActionListener(this);
1232		- torusItem = menu.add(new MenuItem("Torus"));
1233		- torusItem.addActionListener(this);
1234		- superItem = menu.add(new MenuItem("Superellipsoid"));
1235		- superItem.addActionListener(this);
	1408	+// gridItem = menu.add(new MenuItem("Grid"));
	1409	+// gridItem.addActionListener(this);
	1410	+// rectoidItem = menu.add(new MenuItem("Box"));
	1411	+// rectoidItem.addActionListener(this);
	1412	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1413	+// ellipsoidItem.addActionListener(this);
	1414	+// coneItem = menu.add(new MenuItem("Cone"));
	1415	+// coneItem.addActionListener(this);
	1416	+// torusItem = menu.add(new MenuItem("Torus"));
	1417	+// torusItem.addActionListener(this);
	1418	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1419	+// superItem.addActionListener(this);
	1420	+
	1421	+ cameraItem = menu.add(new MenuItem("Camera"));
	1422	+ cameraItem.addActionListener(this);
	1423	+
	1424	+ if (!Globals.ADVANCED)
	1425	+ {
1236	1426	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1237	1427	kleinItem.addActionListener(this);
1238		- particleItem = menu.add(new MenuItem("Particle system"));
1239		- particleItem.addActionListener(this);
	1428	+ }
	1429	+
	1430	+// particleItem = menu.add(new MenuItem("Particle system"));
	1431	+// particleItem.addActionListener(this);
1240	1432	if (Globals.ADVANCED)
1241	1433	{
1242	1434	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1262,15 +1454,15 @@
1262	1454	}
1263	1455	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1264	1456	bezierItem.addActionListener(this);
1265		- overlayItem = menu.add(new MenuItem("Overlay"));
1266		- overlayItem.addActionListener(this);
1267		- lightItem = menu.add(new MenuItem("Light"));
1268		- lightItem.addActionListener(this);
	1457	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1458	+// overlayItem.addActionListener(this);
	1459	+// lightItem = menu.add(new MenuItem("Light"));
	1460	+// lightItem.addActionListener(this);
1269	1461	menu.add("-");
1270	1462	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1271	1463	//superLoopItem.addActionListener(this);
1272		- loopItem = menu.add(new MenuItem("Loop"));
1273		- loopItem.addActionListener(this);
	1464	+// loopItem = menu.add(new MenuItem("Loop"));
	1465	+// loopItem.addActionListener(this);
1274	1466	doubleItem = menu.add(new MenuItem("Fork"));
1275	1467	doubleItem.addActionListener(this);
1276	1468	if (Globals.ADVANCED)
..	..	@@ -1286,6 +1478,9 @@
1286	1478	animationItem.addItemListener(this);
1287	1479	animationItem.setState(Globals.ANIMATION);
1288	1480
	1481	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1482	+ archiveItem.addActionListener(this);
	1483	+
1289	1484	menu.add("-");
1290	1485	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1291	1486	parseverticesItem.addActionListener(this);
..	..	@@ -1298,6 +1493,8 @@
1298	1493	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1299	1494	reduce34MorphItem.addActionListener(this);
1300	1495	menu.add("-");
	1496	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	1497	+ memoryItem.addActionListener(this);
1301	1498	menu.add(computeAOItem = new MenuItem("Compute AO"));
1302	1499	computeAOItem.addActionListener(this);
1303	1500
..	..	@@ -1306,8 +1503,6 @@
1306	1503	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1307	1504	mirrorItem.addActionListener(this);
1308	1505	menu.add("-");
1309		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1310		- memoryItem.addActionListener(this);
1311	1506	menu.add(analyzeItem = new MenuItem("Analyze"));
1312	1507	analyzeItem.addActionListener(this);
1313	1508	menu.add(dumpItem = new MenuItem("Print"));
..	..	@@ -1455,6 +1650,20 @@
1455	1650
1456	1651	makeSomething(shadow);
1457	1652	}
	1653	+
	1654	+ private void ClearUnpinned()
	1655	+ {
	1656	+ //for (Object3D obj : listUI)
	1657	+ for (int i=listUI.size(); --i>=0;)
	1658	+ {
	1659	+ Object3D obj = listUI.elementAt(i);
	1660	+ if (!obj.pinned)
	1661	+ {
	1662	+ obj.CloseUI();
	1663	+ listUI.remove(i);
	1664	+ }
	1665	+ }
	1666	+ }
1458	1667
1459	1668	/**
1460	1669	* applyExample
..	..	@@ -1699,7 +1908,7 @@
1699	1908	{
1700	1909	ScreenFit();
1701	1910	} else
1702		- if (source == switchItem)
	1911	+ if (source == switchViewItem)
1703	1912	{
1704	1913	cVector v1 = new cVector();
1705	1914	cVector v2 = new cVector();
..	..	@@ -1708,11 +1917,11 @@
1708	1917	objEditor.cameraView.renderCamera.setAim(v2, v1);
1709	1918	objEditor.cameraView.repaint();
1710	1919	} else
1711		- if (source == rectoidItem)
	1920	+ if (source == rectoidItem \|\| source == boxButton)
1712	1921	{
1713	1922	makeSomething(new Box());
1714	1923	} else
1715		- if (source == particleItem)
	1924	+ if (source == particleItem \|\| source == particlesButton)
1716	1925	{
1717	1926	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1718	1927	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1791,27 +2000,27 @@
1791	2000
1792	2001	makeSomething(obj);
1793	2002	} else
1794		- if (source == gridItem)
	2003	+ if (source == gridItem \|\| source == gridButton)
1795	2004	{
1796	2005	makeSomething(new Grid());
1797	2006	} else
1798		- if (source == ellipsoidItem)
	2007	+ if (source == ellipsoidItem \|\| source == sphereButton)
1799	2008	{
1800	2009	makeSomething(new Sphere());
1801	2010	} else
1802		- if (source == coneItem)
	2011	+ if (source == coneItem \|\| source == coneButton)
1803	2012	{
1804	2013	makeSomething(new Cone());
1805	2014	} else
1806		- if (source == torusItem)
	2015	+ if (source == torusItem \|\| source == torusButton)
1807	2016	{
1808	2017	makeSomething(new Torus());
1809	2018	} else
1810		- if (source == superItem)
	2019	+ if (source == superItem \|\| source == superButton)
1811	2020	{
1812	2021	makeSomething(new Superellipsoid());
1813	2022	} else
1814		- if (source == kleinItem)
	2023	+ if (source == kleinItem \|\| source == kleinButton)
1815	2024	{
1816	2025	makeSomething(new Klein());
1817	2026	} else
..	..	@@ -1831,7 +2040,7 @@
1831	2040	{
1832	2041	makeSomething(new BezierSurface());
1833	2042	} else
1834		- if (source == overlayItem)
	2043	+ if (source == overlayItem \|\| source == overlayButton)
1835	2044	{
1836	2045	/*
1837	2046	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1879,7 +2088,7 @@
1879	2088	s.setup();
1880	2089	makeSomething(s);
1881	2090	} else
1882		- if (source == lightItem)
	2091	+ if (source == lightItem \|\| source == lightButton)
1883	2092	{
1884	2093	makeSomething(new Light());
1885	2094	} else
..	..	@@ -1929,30 +2138,30 @@
1929	2138
1930	2139	group(g);
1931	2140	} else
1932		- if (source == loopItem)
	2141	+ if (source == loopItem \|\| source == loopButton)
1933	2142	{
1934	2143	Composite csg = new GroupLeaf();
1935	2144	csg.count = 5;
1936	2145	group(csg);
1937		- Composite child = new cGroup();
	2146	+ Composite child = new cGroup("Branch");
1938	2147	csg.addChild(child);
1939	2148	child.addChild(csg);
1940	2149	} else
1941	2150	if (source == doubleItem)
1942	2151	{
1943		- Composite csg = new GroupLeaf();
	2152	+ Composite csg = new GroupLeaf("Fork");
1944	2153	csg.count = 5;
1945	2154	group(csg);
1946		- Composite child = new cGroup();
	2155	+ Composite child = new cGroup("Branch A");
1947	2156	csg.addChild(child);
1948	2157	child.addChild(csg);
1949		- child = new cGroup();
	2158	+ child = new cGroup("Branch B");
1950	2159	csg.addChild(child);
1951	2160	child.addChild(csg);
1952	2161	} else
1953	2162	if (source == tripleItem)
1954	2163	{
1955		- Composite csg = new GroupLeaf();
	2164	+ Composite csg = new GroupLeaf("Trident");
1956	2165	csg.count = 4;
1957	2166	group(csg);
1958	2167	Composite child = new cGroup();
..	..	@@ -2016,7 +2225,8 @@
2016	2225	} else
2017	2226	if (source == undoButton)
2018	2227	{
2019		- Undo();
	2228	+ if (!Undo())
	2229	+ java.awt.Toolkit.getDefaultToolkit().beep();
2020	2230	} else
2021	2231	if (source == redoButton)
2022	2232	{
..	..	@@ -2024,7 +2234,8 @@
2024	2234	} else
2025	2235	if (source == saveButton)
2026	2236	{
2027		- Save();
	2237	+ if (!Save(true))
	2238	+ java.awt.Toolkit.getDefaultToolkit().beep();
2028	2239	} else
2029	2240	if (source == oneStepButton)
2030	2241	{
..	..	@@ -2033,17 +2244,14 @@
2033	2244	} else
2034	2245	if (source == screenfitButton)
2035	2246	{
2036		- //Reload(lastConverter, lastFilename, true);
2037	2247	ScreenFit();
2038	2248	} else
2039	2249	if (source == screenfitpointButton)
2040	2250	{
2041		- //Reload(lastConverter, lastFilename, true);
2042	2251	ScreenFitPoint();
2043	2252	} else
2044	2253	if (source == snapobjectButton)
2045	2254	{
2046		- //Reload(lastConverter, lastFilename, true);
2047	2255	SnapObject();
2048	2256	} else
2049	2257	// if (event.getSource() == recompileButton)
..	..	@@ -2419,9 +2627,9 @@
2419	2627	{
2420	2628	ClearSelection(true);
2421	2629	} else
2422		- if (source == grabItem)
	2630	+ if (source == grabItem \|\| source == groupButton)
2423	2631	{
2424		- group(new cGroup(), true);
	2632	+ group(new cGroup(), false); // true);
2425	2633	} else
2426	2634	if (source == hideItem)
2427	2635	{
..	..	@@ -2439,11 +2647,11 @@
2439	2647	{
2440	2648	makeSomething(new Camera());
2441	2649	} else
2442		- if (source == compositeItem)
	2650	+ if (source == compositeItem \|\| source == compositeButton)
2443	2651	{
2444	2652	group(new Composite());
2445	2653	} else
2446		- if (source == randomItem)
	2654	+ if (source == switchItem \|\| source == switchButton)
2447	2655	{
2448	2656	RandomNode random = new RandomNode();
2449	2657	group(random);
..	..	@@ -2545,7 +2753,7 @@
2545	2753	{
2546	2754	group(new cLinker());
2547	2755	} else
2548		- if (source == textureItem)
	2756	+ if (source == textureItem \|\| source == textureButton)
2549	2757	{
2550	2758	group(new TextureNode());
2551	2759	} else
..	..	@@ -2565,17 +2773,30 @@
2565	2773	{
2566	2774	CastShadow(2);
2567	2775	} else
2568		- if (source == ungroupItem)
	2776	+ if (source == ungroupItem \|\| source == ungroupButton)
2569	2777	{
2570		- //ungroup();
	2778	+ boolean hasRoot = false;
	2779	+
2571	2780	for (int i=0; i<group.selection.size(); i++)
2572	2781	{
2573		- Ungroup(group.selection.get(i));
	2782	+ if (group.selection.get(i) == group)
	2783	+ {
	2784	+ hasRoot = true;
	2785	+ break;
	2786	+ }
2574	2787	}
2575	2788
2576		- ClearSelection(false);
2577		-
2578		- refreshContents();
	2789	+ if (!hasRoot)
	2790	+ {
	2791	+ for (int i=0; i<group.selection.size(); i++)
	2792	+ {
	2793	+ Ungroup(group.selection.get(i));
	2794	+ }
	2795	+
	2796	+ ClearSelection(false);
	2797	+
	2798	+ refreshContents();
	2799	+ }
2579	2800	} else
2580	2801	if (source == genUVItem)
2581	2802	{
..	..	@@ -2903,6 +3124,10 @@
2903	3124	if (source == twoButton)
2904	3125	{
2905	3126	radio.layout = twoButton;
	3127	+
	3128	+ if (CameraPane.FULLSCREEN)
	3129	+ fullscreenLayout = radio.layout;
	3130	+
2906	3131	// bug
2907	3132	//gridPanel.setDividerLocation(1.0);
2908	3133	//bigPanel.setDividerLocation(0.0);
..	..	@@ -2958,6 +3183,9 @@
2958	3183	{
2959	3184	radio.layout = threeButton;
2960	3185
	3186	+ if (CameraPane.FULLSCREEN)
	3187	+ fullscreenLayout = radio.layout;
	3188	+
2961	3189	// bigThree.remove(scenePanel);
2962	3190	// bigThree.remove(centralPanel);
2963	3191	// bigThree.remove(XYZPanel);
..	..	@@ -2996,6 +3224,9 @@
2996	3224	{
2997	3225	radio.layout = fourButton;
2998	3226
	3227	+ if (CameraPane.FULLSCREEN)
	3228	+ fullscreenLayout = radio.layout;
	3229	+
2999	3230	// bigThree.remove(scenePanel);
3000	3231	// bigThree.remove(centralPanel);
3001	3232	// bigThree.remove(XYZPanel);
..	..	@@ -3032,6 +3263,9 @@
3032	3263	if (source == sixButton)
3033	3264	{
3034	3265	radio.layout = sixButton;
	3266	+
	3267	+ if (CameraPane.FULLSCREEN)
	3268	+ fullscreenLayout = radio.layout;
3035	3269
3036	3270	// bigThree.remove(scenePanel);
3037	3271	// bigThree.remove(centralPanel);
..	..	@@ -3070,6 +3304,9 @@
3070	3304	if (source == sevenButton)
3071	3305	{
3072	3306	radio.layout = sevenButton;
	3307	+
	3308	+ if (CameraPane.FULLSCREEN)
	3309	+ fullscreenLayout = radio.layout;
3073	3310
3074	3311	// bigThree.remove(scenePanel);
3075	3312	// bigThree.remove(centralPanel);
..	..	@@ -3126,12 +3363,19 @@
3126	3363	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3127	3364	{
3128	3365	ab = (cRadio)e.nextElement();
3129		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3366	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
3130	3367	{
	3368	+ // Patch to avoid bug with transparency.
	3369	+ if (!ab.hadMaterial)
	3370	+ {
	3371	+ ab.object.material = null;
	3372	+ }
	3373	+
3131	3374	buttonGroup.remove(ab);
3132	3375	radioPanel.remove(ab);
3133	3376
3134		- ab.GetObject().editWindow = null;
	3377	+ //ab.GetObject().editWindow = null;
	3378	+ ab.GetObject().manipWindow = null;
3135	3379	// ab.GetObject().objectUI = null; // ?????????
3136	3380
3137	3381	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
..	..	@@ -3144,6 +3388,12 @@
3144	3388	} else
3145	3389	if (source == editItem \|\| source == editButton)
3146	3390	{
	3391	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3392	+ {
	3393	+ Object3D child = (Object3D)e.nextElement();
	3394	+ child.pinned = true;
	3395	+ }
	3396	+
3147	3397	EditSelection(false);
3148	3398	} else
3149	3399	if (source == uneditButton)
..	..	@@ -3153,6 +3403,7 @@
3153	3403	Object3D child = (Object3D)e.nextElement();
3154	3404	if(child.editWindow != null)
3155	3405	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3406	+ child.pinned = false;
3156	3407	child.CloseUI();
3157	3408	listUI.remove(child);
3158	3409
..	..	@@ -3169,6 +3420,7 @@
3169	3420	//copy.ClearUI();
3170	3421	for (Object3D obj : listUI)
3171	3422	{
	3423	+ obj.pinned = false;
3172	3424	obj.CloseUI();
3173	3425	}
3174	3426	listUI.clear();
..	..	@@ -3178,7 +3430,7 @@
3178	3430	{
3179	3431	assert(copy == group);
3180	3432
3181		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3433	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3182	3434
3183	3435	for (Object3D obj : listUI)
3184	3436	{
..	..	@@ -3245,6 +3497,7 @@
3245	3497
3246	3498	// fix "+" issue
3247	3499	//group.editWindow = this;
	3500	+ group.manipWindow = this;
3248	3501
3249	3502	/*
3250	3503	currentLayout = radio.layout;
..	..	@@ -3252,6 +3505,11 @@
3252	3505	currentLayout = sevenButton;
3253	3506	*/
3254	3507	radio.layout.doClick();
	3508	+
	3509	+ ClearUnpinned();
	3510	+ SetPinStates(group.selection.size() > 0);
	3511	+ if (group.selection.size() == 1)
	3512	+ EditSelection(false);
3255	3513	keepparent = group.parent;
3256	3514	// PARENT = NULL or not???
3257	3515	//group.parent = null; // ROOT
..	..	@@ -3265,7 +3523,7 @@
3265	3523	cameraView.ProtectCamera();
3266	3524	cameraView.repaint();
3267	3525	return;
3268		- } else if (event.getSource() == revertCameraItem)
	3526	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3269	3527	{
3270	3528	cameraView.RevertCamera();
3271	3529	cameraView.repaint();
..	..	@@ -4319,10 +4577,6 @@
4319	4577	// }
4320	4578	// }
4321	4579
4322		- static boolean allparams = true;
4323		-
4324		- static Vector<Object3D> listUI = new Vector<Object3D>();
4325		-
4326	4580	void EditSelection(boolean newWindow)
4327	4581	{
4328	4582	// aConstraints.gridy = 0;
..	..	@@ -4330,7 +4584,7 @@
4330	4584	{
4331	4585	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4332	4586	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4333		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4587	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4334	4588
4335	4589	Object3D elem = (Object3D)group.selection.elementAt(i);
4336	4590	if(elem != group \|\| !newWindow)
..	..	@@ -4415,7 +4669,8 @@
4415	4669	//new Exception().printStackTrace();
4416	4670
4417	4671	freezemodel = true;
4418		-
	4672	+ ClearUnpinned();
	4673	+
4419	4674	/**/
4420	4675	//switch (event.id)
4421	4676	{
..	..	@@ -4448,7 +4703,7 @@
4448	4703	if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4449	4704	// a camera
4450	4705	{
4451		- if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	4706	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
4452	4707	{
4453	4708	CameraPane.camerachangeframe = 0; // don't refuse it
4454	4709	Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
..	..	@@ -4457,6 +4712,13 @@
4457	4712	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4458	4713	}
4459	4714
	4715	+ if (tps != null && tps.length == 1)
	4716	+ {
	4717	+ EditSelection(false);
	4718	+ }
	4719	+
	4720	+ SetPinStates(tps != null && tps.length > 0);
	4721	+
4460	4722	refreshContents();
4461	4723	//return true;
4462	4724	}
..	..	@@ -4466,9 +4728,18 @@
4466	4728	freezemodel = false;
4467	4729	}
4468	4730
	4731	+ void SetPinStates(boolean enabled)
	4732	+ {
	4733	+ editButton.setEnabled(enabled);
	4734	+ uneditButton.setEnabled(enabled);
	4735	+ unselectButton.setEnabled(enabled);
	4736	+ flashSelectionButton.setEnabled(enabled);
	4737	+ }
	4738	+
4469	4739	void refreshContents(boolean cp)
4470	4740	{
4471		- if (!Globals.MOUSEDRAGGED)
	4741	+ if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
	4742	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
4472	4743	{
4473	4744	objEditor.ClearInfo(); // .GetMaterial());
4474	4745
..	..	@@ -4567,7 +4838,8 @@
4567	4838
4568	4839	if (cut)
4569	4840	{
4570		- Save();
	4841	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	4842	+// Save();
4571	4843	//int indices[] = jList.getSelectedIndices();
4572	4844	//for (int i = indices.length - 1; i >= 0; i--)
4573	4845	//jList.remove(indices[i]);
..	..	@@ -4670,6 +4942,10 @@
4670	4942
4671	4943	void paste(boolean expand)
4672	4944	{
	4945	+ if (Globals.SAVEONMAKE)
	4946	+ Save();
	4947	+ boolean keep = Globals.SAVEONMAKE;
	4948	+ Globals.SAVEONMAKE = false;
4673	4949	// if (GrafreeD.clipboard == null)
4674	4950	// return;
4675	4951	boolean first = true;
..	..	@@ -4729,6 +5005,7 @@
4729	5005	Grafreed.clipboard.get(0).parent = keepparent;
4730	5006	}
4731	5007
	5008	+ Globals.SAVEONMAKE = keep;
4732	5009	ResetModel();
4733	5010	refreshContents();
4734	5011	}
..	..	@@ -4864,6 +5141,10 @@
4864	5141
4865	5142	void group(Object3D csg, boolean grab)
4866	5143	{
	5144	+ if (Globals.SAVEONMAKE)
	5145	+ Save();
	5146	+ boolean keep = Globals.SAVEONMAKE;
	5147	+ Globals.SAVEONMAKE = false;
4867	5148	if (//false) // why??
4868	5149	!group.selection.isEmpty())
4869	5150	{
..	..	@@ -4977,10 +5258,15 @@
4977	5258	//node.add(csg);
4978	5259	//makeSomething(node);
4979	5260	makeSomething(csg);
	5261	+ Globals.SAVEONMAKE = keep;
4980	5262	}
4981	5263
4982	5264	void Ungroup(Object3D g)
4983	5265	{
	5266	+ if (Globals.SAVEONMAKE)
	5267	+ Save();
	5268	+ boolean keep = Globals.SAVEONMAKE;
	5269	+ Globals.SAVEONMAKE = false;
4984	5270	if (g instanceof HiddenObject)
4985	5271	{
4986	5272	HiddenObject h = (HiddenObject) g;
..	..	@@ -4997,6 +5283,7 @@
4997	5283	objEditor.makeSomething(g.get(i), false);
4998	5284	}
4999	5285	}
	5286	+ Globals.SAVEONMAKE = keep;
5000	5287	}
5001	5288
5002	5289	void ungroup()
..	..	@@ -5285,13 +5572,28 @@
5285	5572	cButton clearpanelButton;
5286	5573	cButton unselectButton;
5287	5574
5288		- cButton minButton;
5289		- cButton maxButton;
5290		- cButton fullButton;
5291		- cButton undoButton;
5292		- cButton redoButton;
	5575	+ cButton restoreCameraButton;
	5576	+
5293	5577	cButton saveButton;
5294	5578	cButton oneStepButton;
	5579	+
	5580	+ cButton groupButton;
	5581	+ cButton ungroupButton;
	5582	+ cButton compositeButton;
	5583	+ cButton switchButton;
	5584	+ cButton loopButton;
	5585	+ cButton textureButton;
	5586	+
	5587	+ cButton gridButton;
	5588	+ cButton boxButton;
	5589	+ cButton sphereButton;
	5590	+ cButton coneButton;
	5591	+ cButton torusButton;
	5592	+ cButton superButton;
	5593	+ cButton kleinButton;
	5594	+ cButton particlesButton;
	5595	+ cButton overlayButton;
	5596	+ cButton lightButton;
5295	5597
5296	5598	cButton screenfitButton;
5297	5599	cButton screenfitpointButton;
..	..	@@ -5313,11 +5615,11 @@
5313	5615	//JTree jTree;
5314	5616	private MenuItem lookAtItem;
5315	5617	private MenuItem lookFromItem;
5316		- private MenuItem switchItem;
	5618	+ private MenuItem switchViewItem;
5317	5619	private MenuItem cutItem;
5318	5620	private MenuItem undoItem;
5319	5621	private MenuItem redoItem;
5320		- private MenuItem duplicateItem;
	5622	+ private JMenuItem duplicateItem;
5321	5623	private MenuItem cloneItem;
5322	5624	private MenuItem cloneSupportItem;
5323	5625	private MenuItem overwriteGeoItem;
..	..	@@ -5405,7 +5707,7 @@
5405	5707	private MenuItem frontItem;
5406	5708	private MenuItem cameraItem;
5407	5709	private MenuItem compositeItem;
5408		- private MenuItem randomItem;
	5710	+ private MenuItem switchItem;
5409	5711	private MenuItem physicsItem;
5410	5712	private MenuItem frameselectorItem;
5411	5713	private MenuItem scriptNodeItem;
..	..	@@ -5479,5 +5781,5 @@
5479	5781
5480	5782	Menu cameraMenu;
5481	5783	MenuItem editCameraItem;
5482		- MenuItem revertCameraItem;
	5784	+ MenuItem restoreCameraItem;
5483	5785	}