~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -84,6 +84,10 @@
84	84
85	85	void CloneSelection(boolean supports)
86	86	{
	87	+ if (Globals.REPLACEONMAKE)
	88	+ Save();
	89	+ boolean keep = Globals.REPLACEONMAKE;
	90	+ Globals.REPLACEONMAKE = 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.REPLACEONMAKE = 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"));
..	..	@@ -532,6 +544,7 @@
532	544	buildToolsMenu(menu);
533	545	}
534	546
	547	+
535	548	void SetupUI2(ObjEditor oe)
536	549	{
537	550	// June 2019
..	..	@@ -574,51 +587,79 @@
574	587	oe.radioPanel.add(dummyButton);
575	588	oe.buttonGroup.add(dummyButton);
576	589	*/
	590	+ cGridBag copyOptionsPanel = new cGridBag();
	591	+
	592	+ copyOptionsPanel.preferredHeight = 1;
	593	+
577	594	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
578	595
579	596	//oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
580	597	//minButton.setToolTipText("Minimize window");
581	598	//minButton.addActionListener(this);
582	599
583		- oe.toolbarPanel.add(maxButton = new cButton("\u271A", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
584		- maxButton.setToolTipText("Maximize window");
585		- maxButton.addActionListener(this);
	600	+ if (Globals.ADVANCED)
	601	+ {
	602	+ oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	603	+ maxButton.setToolTipText("Maximize window");
	604	+ maxButton.addActionListener(this);
	605	+ }
586	606
587		- oe.toolbarPanel.add(fullButton = new cButton("\u2b1c", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	607	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
588	608	fullButton.setToolTipText("Full-screen window");
589	609	fullButton.addActionListener(this);
590	610
591		- oe.toolbarPanel.add(undoButton = new cButton("\u21a9", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
592		- undoButton.setToolTipText("Undo changes");
593		- undoButton.addActionListener(this);
	611	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	612	+ screenfitButton.setToolTipText("Screen fit");
	613	+ screenfitButton.addActionListener(this);
	614	+
	615	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	616	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	617	+ restoreCameraButton.addActionListener(this);
594	618
595		- oe.toolbarPanel.add(redoButton = new cButton("\u21aa", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
596		- redoButton.setToolTipText("Redo changes");
597		- redoButton.addActionListener(this);
598		-
599		- oe.toolbarPanel.add(saveButton = new cButton("\u21e3", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
600		- saveButton.setToolTipText("Save changes");
	619	+ copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	620	+ saveButton.setToolTipText("New version");
601	621	saveButton.addActionListener(this);
	622	+
	623	+ copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	624	+ undoButton.setToolTipText("Previous version");
	625	+ undoButton.addActionListener(this);
	626	+ undoButton.setEnabled(false);
602	627
603		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
	628	+ cGridBag updown = new cGridBag().setVertical(true);
	629	+ updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	630	+ restoreButton.setToolTipText("Restore current");
	631	+ restoreButton.addActionListener(this);
	632	+ restoreButton.setEnabled(false);
	633	+
	634	+ updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	635	+ replaceButton.setToolTipText("Replace current");
	636	+ replaceButton.addActionListener(this);
	637	+ replaceButton.setEnabled(false);
	638	+
	639	+ copyOptionsPanel.add(updown);
	640	+
	641	+ copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	642	+ redoButton.setToolTipText("Next version");
	643	+ redoButton.addActionListener(this);
	644	+ redoButton.setEnabled(false);
	645	+
	646	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
604	647	liveCB.setToolTipText("Enable animation");
605	648	liveCB.addItemListener(this);
606	649
607		- oe.toolbarPanel.add(oneStepButton = new cButton("\u29f4", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	650	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
608	651	oneStepButton.setToolTipText("Animate one step forward");
609	652	oneStepButton.addActionListener(this);
610	653
611		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	654	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
612	655	fastCB.setToolTipText("Fast mode");
613	656	fastCB.addItemListener(this);
614	657
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);
	658	+ //oe.toolboxPanel.Return();
	659	+
	660	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	661	+// trackCB.setToolTipText("Enable tracking");
	662	+// trackCB.addItemListener(this);
622	663
623	664	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
624	665	// screenfitpointButton.addActionListener(this);
..	..	@@ -630,15 +671,13 @@
630	671	snapobjectButton.setToolTipText("Snap Object");
631	672	}
632	673
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));
	674	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
638	675
639	676	oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
640	677	twoButton.setToolTipText("Show center view only");
641	678	twoButton.addActionListener(this);
	679	+ this.fullscreenLayout = twoButton;
	680	+
642	681	oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
643	682	fourButton.addActionListener(this);
644	683	fourButton.setToolTipText("Show left panel only");
..	..	@@ -653,26 +692,105 @@
653	692	sevenButton.addActionListener(this);
654	693	//
655	694
656		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	695	+ oe.toolbarPanel.add(rootButton = GetButton("icons/write.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
657	696	rootButton.setToolTipText("Edit selection in new tab");
658	697	rootButton.addActionListener(this);
659	698
660		- oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	699	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
661	700	closeButton.setToolTipText("Close tab");
662	701	closeButton.addActionListener(this);
663	702	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
664	703	//clearButton.addActionListener(this);
665		-
666		- editCommandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
667		- editButton.setToolTipText("Edit selection");
	704	+
	705	+ // INSERT
	706	+ oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	707	+ gridButton.setToolTipText("Create grid");
	708	+ gridButton.addActionListener(this);
	709	+
	710	+ oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	711	+ boxButton.setToolTipText("Create box");
	712	+ boxButton.addActionListener(this);
	713	+
	714	+ oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	715	+ sphereButton.setToolTipText("Create sphere");
	716	+ sphereButton.addActionListener(this);
	717	+
	718	+ oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	719	+ coneButton.setToolTipText("Create cone");
	720	+ coneButton.addActionListener(this);
	721	+
	722	+ oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	723	+ torusButton.setToolTipText("Create torus");
	724	+ torusButton.addActionListener(this);
	725	+
	726	+ oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	727	+ superButton.setToolTipText("Create superellipsoid");
	728	+ superButton.addActionListener(this);
	729	+
	730	+ if (Globals.ADVANCED)
	731	+ {
	732	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	733	+ kleinButton.setToolTipText("Create Klein bottle");
	734	+ kleinButton.addActionListener(this);
	735	+ }
	736	+
	737	+ oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	738	+ particlesButton.setToolTipText("Create particle system");
	739	+ particlesButton.addActionListener(this);
	740	+
	741	+ oe.toolboxPanel.Return();
	742	+
	743	+ oe.toolboxPanel.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	744	+ groupButton.setToolTipText("Create group");
	745	+ groupButton.addActionListener(this);
	746	+
	747	+ oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	748	+ compositeButton.setToolTipText("Create composite");
	749	+ compositeButton.addActionListener(this);
	750	+
	751	+ oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	752	+ switchButton.setToolTipText("Create item switcher");
	753	+ switchButton.addActionListener(this);
	754	+
	755	+ oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	756	+ loopButton.setToolTipText("Create loop");
	757	+ loopButton.addActionListener(this);
	758	+
	759	+ oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	760	+ textureButton.setToolTipText("Create texture");
	761	+ textureButton.addActionListener(this);
	762	+
	763	+ oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	764	+ overlayButton.setToolTipText("Create overlay");
	765	+ overlayButton.addActionListener(this);
	766	+
	767	+ oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	768	+ lightButton.setToolTipText("Create light");
	769	+ lightButton.addActionListener(this);
	770	+
	771	+ for (int i=6; --i>=0;)
	772	+ {
	773	+ oe.toolboxPanel.Return();
	774	+ oe.toolboxPanel.add(new cGridBag());
	775	+ oe.toolboxPanel.add(new cGridBag());
	776	+ oe.toolboxPanel.add(new cGridBag());
	777	+ oe.toolboxPanel.add(new cGridBag());
	778	+ oe.toolboxPanel.add(new cGridBag());
	779	+ oe.toolboxPanel.add(new cGridBag());
	780	+ oe.toolboxPanel.add(new cGridBag());
	781	+ }
	782	+
	783	+ // EDIT panel
	784	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	785	+ editButton.setToolTipText("Pin selection controls");
668	786	editButton.addActionListener(this);
669	787
670		- editCommandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
671		- uneditButton.setToolTipText("Unedit selection");
	788	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	789	+ uneditButton.setToolTipText("Remove selection controls");
672	790	uneditButton.addActionListener(this);
673	791
674	792	editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
675		- allParamsButton.setToolTipText("Edit all params");
	793	+ allParamsButton.setToolTipText("Show all controle");
676	794	allParamsButton.addActionListener(this);
677	795
678	796	editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..	..	@@ -683,8 +801,13 @@
683	801	unselectButton.setToolTipText("Unselect");
684	802	unselectButton.addActionListener(this);
685	803
	804	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	805	+ flashSelectionButton.setToolTipText("Highlight selection");
	806	+ flashSelectionButton.addActionListener(this);
	807	+
686	808	editCommandsPanel.preferredHeight = 1;
687	809
	810	+ SetPinStates(false);
688	811	// oe.treePanel.add(commandsPanel);
689	812	// oe.treePanel.Return();
690	813
..	..	@@ -703,29 +826,17 @@
703	826
704	827	JScrollPane jSP;
705	828	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
706		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	829	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
707	830	ResetModel();
708	831
709	832	oe.treePanel.add(jSPPanel);
710	833	oe.treePanel.Return();
711	834
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	835	oe.treePanel.add(copyOptionsPanel);
728	836	oe.treePanel.Return();
	837	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 10, 0);
	838	+ versionField = (cNumberSlider)sliderPane.getComponent(1);
	839	+ sliderPane.preferredHeight = 1;
729	840
730	841	// mainPanel.setDividerLocation(0.5); //1.0);
731	842	// mainPanel.setResizeWeight(0.5);
..	..	@@ -754,23 +865,43 @@
754	865
755	866	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
756	867	{
	868	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	869	+ colorCB.setToolTipText("Copy color when dropped");
	870	+ colorCB.addItemListener(this);
	871	+
	872	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	873	+ materialCB.setToolTipText("Copy material when dropped");
	874	+ materialCB.addItemListener(this);
	875	+
	876	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	877	+ textureCB.setToolTipText("Copy texture when dropped");
	878	+ textureCB.addItemListener(this);
	879	+
	880	+ panel.Return();
	881	+
757	882	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
758	883	boxCB.setToolTipText("Display bounding boxes");
759	884	boxCB.addItemListener(this);
760	885
761	886	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
762		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	887	+ zoomBoxCB.setToolTipText("Display only for wheel");
763	888	zoomBoxCB.addItemListener(this);
764	889
765	890	if (true) // Globals.ADVANCED)
766	891	{
767		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
768		- supportCB.setToolTipText("Enable rigging");
769		- supportCB.addItemListener(this);
	892	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	893	+// supportCB.setToolTipText("Enable rigging");
	894	+// supportCB.addItemListener(this);
	895	+
	896	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	897	+ freezeCB.setToolTipText("Fast moving camera");
	898	+ freezeCB.addItemListener(this);
770	899
771	900	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
772	901	// localCB.addItemListener(this);
773	902
	903	+ panel.Return();
	904	+
774	905	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
775	906	crowdCB.setToolTipText("Used for crowds");
776	907	crowdCB.addItemListener(this);
..	..	@@ -787,6 +918,8 @@
787	918	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
788	919	// speakerMocapCB.addItemListener(this);
789	920
	921	+ panel.Return();
	922	+
790	923	if (false)
791	924	{
792	925	// handled in scripts
..	..	@@ -801,20 +934,39 @@
801	934	//constraints.gridy += 1;
802	935	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
803	936	smoothfocusCB.addItemListener(this);
	937	+ panel.Return();
804	938	}
805	939
806	940	//constraints.gridx += 1;
807	941	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
808	942	// debugCB.addItemListener(this);
809	943
	944	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	945	+ trackCB.setToolTipText("Enable tracking target");
	946	+ trackCB.addItemListener(this);
	947	+
810	948	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
811		- oeilCB.setToolTipText("Move camera when tracking target");
	949	+ oeilCB.setToolTipText("Move camera when tracking");
812	950	oeilCB.addItemListener(this);
813	951
814	952	panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
815		- shadowCB.setToolTipText("Compute shadows when live");
	953	+ shadowCB.setToolTipText("When live compute shadows");
816	954	shadowCB.addItemListener(this);
817	955
	956	+ panel.Return();
	957	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	958	+ toggleTextureCB.setToolTipText("Load textures");
	959	+ toggleTextureCB.addItemListener(this);
	960	+
	961	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	962	+ toggleSwitchCB.setToolTipText("Choose a single item");
	963	+ toggleSwitchCB.addItemListener(this);
	964	+
	965	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	966	+ autokeepCB.setToolTipText("On structure change");
	967	+ autokeepCB.addItemListener(this);
	968	+
	969	+ panel.Return();
818	970	if (Globals.ADVANCED)
819	971	{
820	972	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
..	..	@@ -825,10 +977,15 @@
825	977	}
826	978
827	979	cGridBag fill = new cGridBag();
828		-
829	980	fill.preferredHeight = 200;
	981	+ cGridBag fill2 = new cGridBag();
	982	+ fill2.preferredHeight = 200;
	983	+ cGridBag fill3 = new cGridBag();
	984	+ fill3.preferredHeight = 200;
830	985
831	986	panel.add(fill);
	987	+ panel.add(fill2);
	988	+ panel.add(fill3);
832	989
833	990	}
834	991
..	..	@@ -836,7 +993,7 @@
836	993	{
837	994	cRadio radioButton = new cRadio(obj.name);
838	995
839		- // Patch to avoid bug with transparency.
	996	+ // June 2019. Patch to avoid bug with transparency.
840	997	radioButton.hadMaterial = obj.material != null;
841	998	if (!radioButton.hadMaterial)
842	999	{
..	..	@@ -864,25 +1021,28 @@
864	1021	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
865	1022	}
866	1023
867		- JCheckBox liveCB;
868		- JCheckBox supportCB;
869		- JCheckBox localCB;
870		- JCheckBox crowdCB;
871		- JCheckBox smoothCB;
872		- JCheckBox fastCB;
873		- JCheckBox slowCB;
874		- JCheckBox boxCB;
875		- JCheckBox zoomBoxCB;
876		- JCheckBox trackCB;
877		- JCheckBox smoothfocusCB;
	1024	+ cToggleButton liveCB;
	1025	+ cCheckBox supportCB;
	1026	+ cCheckBox localCB;
	1027	+ cCheckBox crowdCB;
	1028	+ cCheckBox smoothCB;
	1029	+ cToggleButton fastCB;
	1030	+ cCheckBox slowCB;
	1031	+ cCheckBox boxCB;
	1032	+ cCheckBox zoomBoxCB;
	1033	+ cCheckBox freezeCB;
	1034	+ //cToggleButton trackCB;
	1035	+ cCheckBox trackCB;
	1036	+ cCheckBox smoothfocusCB;
878	1037	// JCheckBox speakerMocapCB;
879		- JCheckBox speakerCameraCB;
880		- JCheckBox speakerFocusCB;
881		- JCheckBox debugCB;
	1038	+ cCheckBox speakerCameraCB;
	1039	+ cCheckBox speakerFocusCB;
	1040	+ cCheckBox debugCB;
882	1041
883		- JCheckBox oeilCB;
884		- JCheckBox shadowCB;
885		- JCheckBox lookAtCB;
	1042	+ cCheckBox oeilCB;
	1043	+ cCheckBox shadowCB;
	1044	+ cCheckBox autokeepCB;
	1045	+ cCheckBox lookAtCB;
886	1046
887	1047	// static int COLOR = 1;
888	1048	// static int MATERIAL = 2;
..	..	@@ -890,9 +1050,9 @@
890	1050
891	1051	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
892	1052
893		- JCheckBox colorCB;
894		- JCheckBox materialCB;
895		- JCheckBox textureCB;
	1053	+ cCheckBox colorCB;
	1054	+ cCheckBox materialCB;
	1055	+ cCheckBox textureCB;
896	1056
897	1057	public void itemStateChanged(ItemEvent e)
898	1058	{
..	..	@@ -989,6 +1149,14 @@
989	1149	{
990	1150	Globals.COMPUTESHADOWWHENLIVE ^= true;
991	1151	}
	1152	+ else if(e.getSource() == freezeCB)
	1153	+ {
	1154	+ Globals.FREEZEONMOVE ^= true;
	1155	+ }
	1156	+ else if(e.getSource() == autokeepCB)
	1157	+ {
	1158	+ Globals.REPLACEONMAKE ^= true;
	1159	+ }
992	1160	else if(e.getSource() == lookAtCB)
993	1161	{
994	1162	cameraView.ToggleLookAt();
..	..	@@ -1005,7 +1173,8 @@
1005	1173
1006	1174	/**/
1007	1175	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
1008		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1176	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1177	+ TreePath path = objEditor.jTree.getSelectionPath();
1009	1178	if ((path == null) \|\| (path.getPathCount() <= 1)) {
1010	1179	// We can't move the root node or an empty selection
1011	1180	return;
..	..	@@ -1068,8 +1237,6 @@
1068	1237	}
1069	1238	}
1070	1239
1071		- String string = (String) object;
1072		-
1073	1240	System.out.println("Transfer = " + object + "; drop : " + target);
1074	1241	// if( object instanceof java.io.File[])
1075	1242	// {
..	..	@@ -1077,6 +1244,8 @@
1077	1244	// objEditor.DropFile((java.io.File[]) object, true);
1078	1245	// return;
1079	1246	// }
	1247	+
	1248	+ String string = object.toString();
1080	1249
1081	1250	// File path for Mac and Windows
1082	1251	if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
..	..	@@ -1122,23 +1291,33 @@
1122	1291
1123	1292	assert target == objEditor.jTree;
1124	1293	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1294	+ Object3D destinationLeaf;
1125	1295	try {
1126		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1296	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
1127	1297	} catch (Exception e) {
1128	1298	System.out.println("destinationPath : " + destinationPath);
1129	1299	return;
1130	1300	}
1131	1301
1132		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1302	+ for (int i=group.selection.size(); --i>=0;)
1133	1303	{
	1304	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1305	+
	1306	+ // Cannot move into itself
	1307	+ if (child == destinationLeaf)
	1308	+ return;
	1309	+ }
	1310	+
	1311	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1312	+// {
1134	1313	loadClipboard(true);
1135	1314	objEditor.jTree.setSelectionPath(destinationPath);
1136	1315	pasteInto(false, false);
1137		- } else {
1138		- loadClipboard(false);
1139		- objEditor.jTree.setSelectionPath(destinationPath);
1140		- pasteInto(false, false); // true); // ???
1141		- }
	1316	+// } else {
	1317	+// loadClipboard(false);
	1318	+// objEditor.jTree.setSelectionPath(destinationPath);
	1319	+// pasteInto(false, false); // true); // ???
	1320	+// }
1142	1321	}
1143	1322	public void dropActionChanged(DropTargetDragEvent dtde)
1144	1323	// Called if the user has modified the current drop gesture
..	..	@@ -1243,22 +1422,30 @@
1243	1422	{
1244	1423	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1245	1424	//heightFieldItem.addActionListener(this);
1246		- gridItem = menu.add(new MenuItem("Grid"));
1247		- gridItem.addActionListener(this);
1248		- rectoidItem = menu.add(new MenuItem("Box"));
1249		- rectoidItem.addActionListener(this);
1250		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1251		- ellipsoidItem.addActionListener(this);
1252		- coneItem = menu.add(new MenuItem("Cone"));
1253		- coneItem.addActionListener(this);
1254		- torusItem = menu.add(new MenuItem("Torus"));
1255		- torusItem.addActionListener(this);
1256		- superItem = menu.add(new MenuItem("Superellipsoid"));
1257		- superItem.addActionListener(this);
	1425	+// gridItem = menu.add(new MenuItem("Grid"));
	1426	+// gridItem.addActionListener(this);
	1427	+// rectoidItem = menu.add(new MenuItem("Box"));
	1428	+// rectoidItem.addActionListener(this);
	1429	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1430	+// ellipsoidItem.addActionListener(this);
	1431	+// coneItem = menu.add(new MenuItem("Cone"));
	1432	+// coneItem.addActionListener(this);
	1433	+// torusItem = menu.add(new MenuItem("Torus"));
	1434	+// torusItem.addActionListener(this);
	1435	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1436	+// superItem.addActionListener(this);
	1437	+
	1438	+ cameraItem = menu.add(new MenuItem("Camera"));
	1439	+ cameraItem.addActionListener(this);
	1440	+
	1441	+ if (!Globals.ADVANCED)
	1442	+ {
1258	1443	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1259	1444	kleinItem.addActionListener(this);
1260		- particleItem = menu.add(new MenuItem("Particle system"));
1261		- particleItem.addActionListener(this);
	1445	+ }
	1446	+
	1447	+// particleItem = menu.add(new MenuItem("Particle system"));
	1448	+// particleItem.addActionListener(this);
1262	1449	if (Globals.ADVANCED)
1263	1450	{
1264	1451	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1284,15 +1471,15 @@
1284	1471	}
1285	1472	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1286	1473	bezierItem.addActionListener(this);
1287		- overlayItem = menu.add(new MenuItem("Overlay"));
1288		- overlayItem.addActionListener(this);
1289		- lightItem = menu.add(new MenuItem("Light"));
1290		- lightItem.addActionListener(this);
	1474	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1475	+// overlayItem.addActionListener(this);
	1476	+// lightItem = menu.add(new MenuItem("Light"));
	1477	+// lightItem.addActionListener(this);
1291	1478	menu.add("-");
1292	1479	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1293	1480	//superLoopItem.addActionListener(this);
1294		- loopItem = menu.add(new MenuItem("Loop"));
1295		- loopItem.addActionListener(this);
	1481	+// loopItem = menu.add(new MenuItem("Loop"));
	1482	+// loopItem.addActionListener(this);
1296	1483	doubleItem = menu.add(new MenuItem("Fork"));
1297	1484	doubleItem.addActionListener(this);
1298	1485	if (Globals.ADVANCED)
..	..	@@ -1308,6 +1495,9 @@
1308	1495	animationItem.addItemListener(this);
1309	1496	animationItem.setState(Globals.ANIMATION);
1310	1497
	1498	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1499	+ archiveItem.addActionListener(this);
	1500	+
1311	1501	menu.add("-");
1312	1502	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1313	1503	parseverticesItem.addActionListener(this);
..	..	@@ -1320,6 +1510,8 @@
1320	1510	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1321	1511	reduce34MorphItem.addActionListener(this);
1322	1512	menu.add("-");
	1513	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	1514	+ memoryItem.addActionListener(this);
1323	1515	menu.add(computeAOItem = new MenuItem("Compute AO"));
1324	1516	computeAOItem.addActionListener(this);
1325	1517
..	..	@@ -1328,8 +1520,6 @@
1328	1520	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1329	1521	mirrorItem.addActionListener(this);
1330	1522	menu.add("-");
1331		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1332		- memoryItem.addActionListener(this);
1333	1523	menu.add(analyzeItem = new MenuItem("Analyze"));
1334	1524	analyzeItem.addActionListener(this);
1335	1525	menu.add(dumpItem = new MenuItem("Print"));
..	..	@@ -1477,6 +1667,20 @@
1477	1667
1478	1668	makeSomething(shadow);
1479	1669	}
	1670	+
	1671	+ private void ClearUnpinned()
	1672	+ {
	1673	+ //for (Object3D obj : listUI)
	1674	+ for (int i=listUI.size(); --i>=0;)
	1675	+ {
	1676	+ Object3D obj = listUI.elementAt(i);
	1677	+ if (!obj.pinned)
	1678	+ {
	1679	+ obj.CloseUI();
	1680	+ listUI.remove(i);
	1681	+ }
	1682	+ }
	1683	+ }
1480	1684
1481	1685	/**
1482	1686	* applyExample
..	..	@@ -1721,7 +1925,7 @@
1721	1925	{
1722	1926	ScreenFit();
1723	1927	} else
1724		- if (source == switchItem)
	1928	+ if (source == switchViewItem)
1725	1929	{
1726	1930	cVector v1 = new cVector();
1727	1931	cVector v2 = new cVector();
..	..	@@ -1730,11 +1934,11 @@
1730	1934	objEditor.cameraView.renderCamera.setAim(v2, v1);
1731	1935	objEditor.cameraView.repaint();
1732	1936	} else
1733		- if (source == rectoidItem)
	1937	+ if (source == rectoidItem \|\| source == boxButton)
1734	1938	{
1735	1939	makeSomething(new Box());
1736	1940	} else
1737		- if (source == particleItem)
	1941	+ if (source == particleItem \|\| source == particlesButton)
1738	1942	{
1739	1943	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1740	1944	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1813,27 +2017,27 @@
1813	2017
1814	2018	makeSomething(obj);
1815	2019	} else
1816		- if (source == gridItem)
	2020	+ if (source == gridItem \|\| source == gridButton)
1817	2021	{
1818	2022	makeSomething(new Grid());
1819	2023	} else
1820		- if (source == ellipsoidItem)
	2024	+ if (source == ellipsoidItem \|\| source == sphereButton)
1821	2025	{
1822	2026	makeSomething(new Sphere());
1823	2027	} else
1824		- if (source == coneItem)
	2028	+ if (source == coneItem \|\| source == coneButton)
1825	2029	{
1826	2030	makeSomething(new Cone());
1827	2031	} else
1828		- if (source == torusItem)
	2032	+ if (source == torusItem \|\| source == torusButton)
1829	2033	{
1830	2034	makeSomething(new Torus());
1831	2035	} else
1832		- if (source == superItem)
	2036	+ if (source == superItem \|\| source == superButton)
1833	2037	{
1834	2038	makeSomething(new Superellipsoid());
1835	2039	} else
1836		- if (source == kleinItem)
	2040	+ if (source == kleinItem \|\| source == kleinButton)
1837	2041	{
1838	2042	makeSomething(new Klein());
1839	2043	} else
..	..	@@ -1853,7 +2057,7 @@
1853	2057	{
1854	2058	makeSomething(new BezierSurface());
1855	2059	} else
1856		- if (source == overlayItem)
	2060	+ if (source == overlayItem \|\| source == overlayButton)
1857	2061	{
1858	2062	/*
1859	2063	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1901,7 +2105,7 @@
1901	2105	s.setup();
1902	2106	makeSomething(s);
1903	2107	} else
1904		- if (source == lightItem)
	2108	+ if (source == lightItem \|\| source == lightButton)
1905	2109	{
1906	2110	makeSomething(new Light());
1907	2111	} else
..	..	@@ -1951,30 +2155,30 @@
1951	2155
1952	2156	group(g);
1953	2157	} else
1954		- if (source == loopItem)
	2158	+ if (source == loopItem \|\| source == loopButton)
1955	2159	{
1956	2160	Composite csg = new GroupLeaf();
1957	2161	csg.count = 5;
1958	2162	group(csg);
1959		- Composite child = new cGroup();
	2163	+ Composite child = new cGroup("Branch");
1960	2164	csg.addChild(child);
1961	2165	child.addChild(csg);
1962	2166	} else
1963	2167	if (source == doubleItem)
1964	2168	{
1965		- Composite csg = new GroupLeaf();
	2169	+ Composite csg = new GroupLeaf("Fork");
1966	2170	csg.count = 5;
1967	2171	group(csg);
1968		- Composite child = new cGroup();
	2172	+ Composite child = new cGroup("Branch A");
1969	2173	csg.addChild(child);
1970	2174	child.addChild(csg);
1971		- child = new cGroup();
	2175	+ child = new cGroup("Branch B");
1972	2176	csg.addChild(child);
1973	2177	child.addChild(csg);
1974	2178	} else
1975	2179	if (source == tripleItem)
1976	2180	{
1977		- Composite csg = new GroupLeaf();
	2181	+ Composite csg = new GroupLeaf("Trident");
1978	2182	csg.count = 4;
1979	2183	group(csg);
1980	2184	Composite child = new cGroup();
..	..	@@ -2038,15 +2242,31 @@
2038	2242	} else
2039	2243	if (source == undoButton)
2040	2244	{
	2245	+ // Go to previous version
	2246	+ //if (!Undo())
	2247	+ //java.awt.Toolkit.getDefaultToolkit().beep();
2041	2248	Undo();
	2249	+ } else
	2250	+ if (source == restoreButton)
	2251	+ {
	2252	+ // Restore current version
	2253	+ Restore();
	2254	+ } else
	2255	+ if (source == replaceButton)
	2256	+ {
	2257	+ // Overwrite current version
	2258	+ Replace();
2042	2259	} else
2043	2260	if (source == redoButton)
2044	2261	{
	2262	+ // Go to next version
2045	2263	Redo();
2046	2264	} else
2047	2265	if (source == saveButton)
2048	2266	{
2049		- Save();
	2267	+ // Save a new version
	2268	+ if (!Save(true))
	2269	+ java.awt.Toolkit.getDefaultToolkit().beep();
2050	2270	} else
2051	2271	if (source == oneStepButton)
2052	2272	{
..	..	@@ -2055,17 +2275,14 @@
2055	2275	} else
2056	2276	if (source == screenfitButton)
2057	2277	{
2058		- //Reload(lastConverter, lastFilename, true);
2059	2278	ScreenFit();
2060	2279	} else
2061	2280	if (source == screenfitpointButton)
2062	2281	{
2063		- //Reload(lastConverter, lastFilename, true);
2064	2282	ScreenFitPoint();
2065	2283	} else
2066	2284	if (source == snapobjectButton)
2067	2285	{
2068		- //Reload(lastConverter, lastFilename, true);
2069	2286	SnapObject();
2070	2287	} else
2071	2288	// if (event.getSource() == recompileButton)
..	..	@@ -2441,9 +2658,9 @@
2441	2658	{
2442	2659	ClearSelection(true);
2443	2660	} else
2444		- if (source == grabItem)
	2661	+ if (source == grabItem \|\| source == groupButton)
2445	2662	{
2446		- group(new cGroup(), true);
	2663	+ group(new cGroup(), false); // true);
2447	2664	} else
2448	2665	if (source == hideItem)
2449	2666	{
..	..	@@ -2461,11 +2678,11 @@
2461	2678	{
2462	2679	makeSomething(new Camera());
2463	2680	} else
2464		- if (source == compositeItem)
	2681	+ if (source == compositeItem \|\| source == compositeButton)
2465	2682	{
2466	2683	group(new Composite());
2467	2684	} else
2468		- if (source == randomItem)
	2685	+ if (source == switchItem \|\| source == switchButton)
2469	2686	{
2470	2687	RandomNode random = new RandomNode();
2471	2688	group(random);
..	..	@@ -2567,7 +2784,7 @@
2567	2784	{
2568	2785	group(new cLinker());
2569	2786	} else
2570		- if (source == textureItem)
	2787	+ if (source == textureItem \|\| source == textureButton)
2571	2788	{
2572	2789	group(new TextureNode());
2573	2790	} else
..	..	@@ -2587,17 +2804,30 @@
2587	2804	{
2588	2805	CastShadow(2);
2589	2806	} else
2590		- if (source == ungroupItem)
	2807	+ if (source == ungroupItem \|\| source == ungroupButton)
2591	2808	{
2592		- //ungroup();
	2809	+ boolean hasRoot = false;
	2810	+
2593	2811	for (int i=0; i<group.selection.size(); i++)
2594	2812	{
2595		- Ungroup(group.selection.get(i));
	2813	+ if (group.selection.get(i) == group)
	2814	+ {
	2815	+ hasRoot = true;
	2816	+ break;
	2817	+ }
2596	2818	}
2597	2819
2598		- ClearSelection(false);
2599		-
2600		- refreshContents();
	2820	+ if (!hasRoot)
	2821	+ {
	2822	+ for (int i=0; i<group.selection.size(); i++)
	2823	+ {
	2824	+ Ungroup(group.selection.get(i));
	2825	+ }
	2826	+
	2827	+ ClearSelection(false);
	2828	+
	2829	+ refreshContents();
	2830	+ }
2601	2831	} else
2602	2832	if (source == genUVItem)
2603	2833	{
..	..	@@ -2925,6 +3155,10 @@
2925	3155	if (source == twoButton)
2926	3156	{
2927	3157	radio.layout = twoButton;
	3158	+
	3159	+ if (CameraPane.FULLSCREEN)
	3160	+ fullscreenLayout = radio.layout;
	3161	+
2928	3162	// bug
2929	3163	//gridPanel.setDividerLocation(1.0);
2930	3164	//bigPanel.setDividerLocation(0.0);
..	..	@@ -2980,6 +3214,9 @@
2980	3214	{
2981	3215	radio.layout = threeButton;
2982	3216
	3217	+ if (CameraPane.FULLSCREEN)
	3218	+ fullscreenLayout = radio.layout;
	3219	+
2983	3220	// bigThree.remove(scenePanel);
2984	3221	// bigThree.remove(centralPanel);
2985	3222	// bigThree.remove(XYZPanel);
..	..	@@ -3018,6 +3255,9 @@
3018	3255	{
3019	3256	radio.layout = fourButton;
3020	3257
	3258	+ if (CameraPane.FULLSCREEN)
	3259	+ fullscreenLayout = radio.layout;
	3260	+
3021	3261	// bigThree.remove(scenePanel);
3022	3262	// bigThree.remove(centralPanel);
3023	3263	// bigThree.remove(XYZPanel);
..	..	@@ -3054,6 +3294,9 @@
3054	3294	if (source == sixButton)
3055	3295	{
3056	3296	radio.layout = sixButton;
	3297	+
	3298	+ if (CameraPane.FULLSCREEN)
	3299	+ fullscreenLayout = radio.layout;
3057	3300
3058	3301	// bigThree.remove(scenePanel);
3059	3302	// bigThree.remove(centralPanel);
..	..	@@ -3092,6 +3335,9 @@
3092	3335	if (source == sevenButton)
3093	3336	{
3094	3337	radio.layout = sevenButton;
	3338	+
	3339	+ if (CameraPane.FULLSCREEN)
	3340	+ fullscreenLayout = radio.layout;
3095	3341
3096	3342	// bigThree.remove(scenePanel);
3097	3343	// bigThree.remove(centralPanel);
..	..	@@ -3159,7 +3405,8 @@
3159	3405	buttonGroup.remove(ab);
3160	3406	radioPanel.remove(ab);
3161	3407
3162		- ab.GetObject().editWindow = null;
	3408	+ //ab.GetObject().editWindow = null;
	3409	+ ab.GetObject().manipWindow = null;
3163	3410	// ab.GetObject().objectUI = null; // ?????????
3164	3411
3165	3412	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
..	..	@@ -3172,6 +3419,12 @@
3172	3419	} else
3173	3420	if (source == editItem \|\| source == editButton)
3174	3421	{
	3422	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3423	+ {
	3424	+ Object3D child = (Object3D)e.nextElement();
	3425	+ child.pinned = true;
	3426	+ }
	3427	+
3175	3428	EditSelection(false);
3176	3429	} else
3177	3430	if (source == uneditButton)
..	..	@@ -3181,6 +3434,7 @@
3181	3434	Object3D child = (Object3D)e.nextElement();
3182	3435	if(child.editWindow != null)
3183	3436	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3437	+ child.pinned = false;
3184	3438	child.CloseUI();
3185	3439	listUI.remove(child);
3186	3440
..	..	@@ -3197,6 +3451,7 @@
3197	3451	//copy.ClearUI();
3198	3452	for (Object3D obj : listUI)
3199	3453	{
	3454	+ obj.pinned = false;
3200	3455	obj.CloseUI();
3201	3456	}
3202	3457	listUI.clear();
..	..	@@ -3206,7 +3461,7 @@
3206	3461	{
3207	3462	assert(copy == group);
3208	3463
3209		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3464	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3210	3465
3211	3466	for (Object3D obj : listUI)
3212	3467	{
..	..	@@ -3255,6 +3510,9 @@
3255	3510	}
3256	3511
3257	3512	copy = group;
	3513	+
	3514	+ SetUndoStates();
	3515	+
3258	3516	//Globals.theRenderer.object = group;
3259	3517	if(!useclient)
3260	3518	{
..	..	@@ -3273,6 +3531,7 @@
3273	3531
3274	3532	// fix "+" issue
3275	3533	//group.editWindow = this;
	3534	+ group.manipWindow = this;
3276	3535
3277	3536	/*
3278	3537	currentLayout = radio.layout;
..	..	@@ -3280,6 +3539,11 @@
3280	3539	currentLayout = sevenButton;
3281	3540	*/
3282	3541	radio.layout.doClick();
	3542	+
	3543	+ ClearUnpinned();
	3544	+ SetPinStates(group.selection.size() > 0);
	3545	+ if (group.selection.size() == 1)
	3546	+ EditSelection(false);
3283	3547	keepparent = group.parent;
3284	3548	// PARENT = NULL or not???
3285	3549	//group.parent = null; // ROOT
..	..	@@ -3293,7 +3557,7 @@
3293	3557	cameraView.ProtectCamera();
3294	3558	cameraView.repaint();
3295	3559	return;
3296		- } else if (event.getSource() == revertCameraItem)
	3560	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3297	3561	{
3298	3562	cameraView.RevertCamera();
3299	3563	cameraView.repaint();
..	..	@@ -4347,10 +4611,6 @@
4347	4611	// }
4348	4612	// }
4349	4613
4350		- static boolean allparams = true;
4351		-
4352		- static Vector<Object3D> listUI = new Vector<Object3D>();
4353		-
4354	4614	void EditSelection(boolean newWindow)
4355	4615	{
4356	4616	// aConstraints.gridy = 0;
..	..	@@ -4358,7 +4618,7 @@
4358	4618	{
4359	4619	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4360	4620	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4361		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4621	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4362	4622
4363	4623	Object3D elem = (Object3D)group.selection.elementAt(i);
4364	4624	if(elem != group \|\| !newWindow)
..	..	@@ -4443,7 +4703,8 @@
4443	4703	//new Exception().printStackTrace();
4444	4704
4445	4705	freezemodel = true;
4446		-
	4706	+ ClearUnpinned();
	4707	+
4447	4708	/**/
4448	4709	//switch (event.id)
4449	4710	{
..	..	@@ -4476,7 +4737,7 @@
4476	4737	if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4477	4738	// a camera
4478	4739	{
4479		- if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	4740	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
4480	4741	{
4481	4742	CameraPane.camerachangeframe = 0; // don't refuse it
4482	4743	Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
..	..	@@ -4485,6 +4746,13 @@
4485	4746	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4486	4747	}
4487	4748
	4749	+ if (tps != null && tps.length == 1)
	4750	+ {
	4751	+ EditSelection(false);
	4752	+ }
	4753	+
	4754	+ SetPinStates(tps != null && tps.length > 0);
	4755	+
4488	4756	refreshContents();
4489	4757	//return true;
4490	4758	}
..	..	@@ -4494,9 +4762,18 @@
4494	4762	freezemodel = false;
4495	4763	}
4496	4764
	4765	+ void SetPinStates(boolean enabled)
	4766	+ {
	4767	+ editButton.setEnabled(enabled);
	4768	+ uneditButton.setEnabled(enabled);
	4769	+ unselectButton.setEnabled(enabled);
	4770	+ flashSelectionButton.setEnabled(enabled);
	4771	+ }
	4772	+
4497	4773	void refreshContents(boolean cp)
4498	4774	{
4499		- if (!Globals.MOUSEDRAGGED)
	4775	+ if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
	4776	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
4500	4777	{
4501	4778	objEditor.ClearInfo(); // .GetMaterial());
4502	4779
..	..	@@ -4595,7 +4872,8 @@
4595	4872
4596	4873	if (cut)
4597	4874	{
4598		- Save();
	4875	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	4876	+// Save();
4599	4877	//int indices[] = jList.getSelectedIndices();
4600	4878	//for (int i = indices.length - 1; i >= 0; i--)
4601	4879	//jList.remove(indices[i]);
..	..	@@ -4698,6 +4976,10 @@
4698	4976
4699	4977	void paste(boolean expand)
4700	4978	{
	4979	+ if (Globals.REPLACEONMAKE)
	4980	+ Save();
	4981	+ boolean keep = Globals.REPLACEONMAKE;
	4982	+ Globals.REPLACEONMAKE = false;
4701	4983	// if (GrafreeD.clipboard == null)
4702	4984	// return;
4703	4985	boolean first = true;
..	..	@@ -4757,6 +5039,7 @@
4757	5039	Grafreed.clipboard.get(0).parent = keepparent;
4758	5040	}
4759	5041
	5042	+ Globals.REPLACEONMAKE = keep;
4760	5043	ResetModel();
4761	5044	refreshContents();
4762	5045	}
..	..	@@ -4892,6 +5175,10 @@
4892	5175
4893	5176	void group(Object3D csg, boolean grab)
4894	5177	{
	5178	+ if (Globals.REPLACEONMAKE)
	5179	+ Save();
	5180	+ boolean keep = Globals.REPLACEONMAKE;
	5181	+ Globals.REPLACEONMAKE = false;
4895	5182	if (//false) // why??
4896	5183	!group.selection.isEmpty())
4897	5184	{
..	..	@@ -5005,10 +5292,15 @@
5005	5292	//node.add(csg);
5006	5293	//makeSomething(node);
5007	5294	makeSomething(csg);
	5295	+ Globals.REPLACEONMAKE = keep;
5008	5296	}
5009	5297
5010	5298	void Ungroup(Object3D g)
5011	5299	{
	5300	+ if (Globals.REPLACEONMAKE)
	5301	+ Save();
	5302	+ boolean keep = Globals.REPLACEONMAKE;
	5303	+ Globals.REPLACEONMAKE = false;
5012	5304	if (g instanceof HiddenObject)
5013	5305	{
5014	5306	HiddenObject h = (HiddenObject) g;
..	..	@@ -5025,6 +5317,7 @@
5025	5317	objEditor.makeSomething(g.get(i), false);
5026	5318	}
5027	5319	}
	5320	+ Globals.REPLACEONMAKE = keep;
5028	5321	}
5029	5322
5030	5323	void ungroup()
..	..	@@ -5313,13 +5606,28 @@
5313	5606	cButton clearpanelButton;
5314	5607	cButton unselectButton;
5315	5608
5316		- cButton minButton;
5317		- cButton maxButton;
5318		- cButton fullButton;
5319		- cButton undoButton;
5320		- cButton redoButton;
	5609	+ cButton restoreCameraButton;
	5610	+
5321	5611	cButton saveButton;
5322	5612	cButton oneStepButton;
	5613	+
	5614	+ cButton groupButton;
	5615	+ cButton ungroupButton;
	5616	+ cButton compositeButton;
	5617	+ cButton switchButton;
	5618	+ cButton loopButton;
	5619	+ cButton textureButton;
	5620	+
	5621	+ cButton gridButton;
	5622	+ cButton boxButton;
	5623	+ cButton sphereButton;
	5624	+ cButton coneButton;
	5625	+ cButton torusButton;
	5626	+ cButton superButton;
	5627	+ cButton kleinButton;
	5628	+ cButton particlesButton;
	5629	+ cButton overlayButton;
	5630	+ cButton lightButton;
5323	5631
5324	5632	cButton screenfitButton;
5325	5633	cButton screenfitpointButton;
..	..	@@ -5341,11 +5649,11 @@
5341	5649	//JTree jTree;
5342	5650	private MenuItem lookAtItem;
5343	5651	private MenuItem lookFromItem;
5344		- private MenuItem switchItem;
	5652	+ private MenuItem switchViewItem;
5345	5653	private MenuItem cutItem;
5346	5654	private MenuItem undoItem;
5347	5655	private MenuItem redoItem;
5348		- private MenuItem duplicateItem;
	5656	+ private JMenuItem duplicateItem;
5349	5657	private MenuItem cloneItem;
5350	5658	private MenuItem cloneSupportItem;
5351	5659	private MenuItem overwriteGeoItem;
..	..	@@ -5433,7 +5741,7 @@
5433	5741	private MenuItem frontItem;
5434	5742	private MenuItem cameraItem;
5435	5743	private MenuItem compositeItem;
5436		- private MenuItem randomItem;
	5744	+ private MenuItem switchItem;
5437	5745	private MenuItem physicsItem;
5438	5746	private MenuItem frameselectorItem;
5439	5747	private MenuItem scriptNodeItem;
..	..	@@ -5507,5 +5815,5 @@
5507	5815
5508	5816	Menu cameraMenu;
5509	5817	MenuItem editCameraItem;
5510		- MenuItem revertCameraItem;
	5818	+ MenuItem restoreCameraItem;
5511	5819	}