~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,16 +155,19 @@
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"));
156	163	//editItem.addActionListener(this);
157		- undoItem = menu.add(new MenuItem("Undo"));
158		- undoItem.addActionListener(this);
159		- redoItem = menu.add(new MenuItem("Redo"));
160		- redoItem.addActionListener(this);
161		- menu.add("-");
162		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	164	+
	165	+// undoItem = menu.add(new MenuItem("Undo"));
	166	+// undoItem.addActionListener(this);
	167	+// redoItem = menu.add(new MenuItem("Redo"));
	168	+// redoItem.addActionListener(this);
	169	+// menu.add("-");
	170	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
163	171	duplicateItem.addActionListener(this);
164	172	cloneItem = menu.add(new MenuItem("Clone"));
165	173	cloneItem.addActionListener(this);
..	..	@@ -175,7 +183,6 @@
175	183	copyItem.addActionListener(this);
176	184	pasteItem = menu.add(new MenuItem("Paste"));
177	185	pasteItem.addActionListener(this);
178		- menu.add("-");
179	186
180	187	menu.add("-");
181	188	pasteIntoItem = menu.add(new MenuItem("Paste into"));
..	..	@@ -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 Camera"));
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
..	..	@@ -245,7 +252,7 @@
245	252
246	253	cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
247	254	toggleDebugItem.addItemListener(this);
248		- toggleDebugItem.setState(CameraPane.DEBUG);
	255	+ toggleDebugItem.setState(Globals.DEBUG);
249	256
250	257	cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
251	258	toggleFrustumItem.addItemListener(this);
..	..	@@ -266,14 +273,14 @@
266	273	// animationItem.addItemListener(this);
267	274	// animationItem.setState(CameraPane.ANIMATION);
268	275	cameraMenu.add("-");
269		- cameraMenu.add(editCameraItem = new MenuItem("Save Camera"));
	276	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
270	277	editCameraItem.addActionListener(this);
271	278
272	279	if (Globals.ADVANCED)
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,30 +370,29 @@
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"));
370	381	csgItem.addActionListener(this);
371		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	382	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
372	383	shadowXItem.addActionListener(this);
373		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	384	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
374	385	shadowYItem.addActionListener(this);
375		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	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"));
..	..	@@ -469,6 +481,14 @@
469	481	markleavesItem.addActionListener(this);
470	482	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
471	483	unmarkleavesItem.addActionListener(this);
	484	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	485	+ rewindleavesItem.addActionListener(this);
	486	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	487	+ unrewindleavesItem.addActionListener(this);
	488	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	489	+ randomleavesItem.addActionListener(this);
	490	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	491	+ unrandomleavesItem.addActionListener(this);
472	492	menu.add("-");
473	493	flipVItem = menu.add(new MenuItem("Flip V"));
474	494	flipVItem.addActionListener(this);
..	..	@@ -526,6 +546,18 @@
526	546
527	547	void SetupUI2(ObjEditor oe)
528	548	{
	549	+ // June 2019
	550	+ if (oe == null)
	551	+ {
	552	+ //super.SetupUI2(this);
	553	+ //return;
	554	+ }
	555	+
	556	+ if (copy != group)
	557	+ {
	558	+ //super.SetupUI2(this);
	559	+ }
	560	+
529	561	//new Exception().printStackTrace();
530	562
531	563	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -554,27 +586,66 @@
554	586	oe.radioPanel.add(dummyButton);
555	587	oe.buttonGroup.add(dummyButton);
556	588	*/
	589	+ cGridBag copyOptionsPanel = new cGridBag();
	590	+
	591	+ copyOptionsPanel.preferredHeight = 1;
	592	+
557	593	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
558	594
559		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
	595	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	596	+ //minButton.setToolTipText("Minimize window");
	597	+ //minButton.addActionListener(this);
	598	+
	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	+ }
	605	+
	606	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	607	+ fullButton.setToolTipText("Full-screen window");
	608	+ fullButton.addActionListener(this);
	609	+
	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);
	619	+ undoButton.setToolTipText("Undo changes");
	620	+ undoButton.addActionListener(this);
	621	+ undoButton.setEnabled(false);
	622	+
	623	+ copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	624	+ redoButton.setToolTipText("Redo changes");
	625	+ redoButton.addActionListener(this);
	626	+ redoButton.setEnabled(false);
	627	+
	628	+ copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	629	+ saveButton.setToolTipText("Save changes");
	630	+ saveButton.addActionListener(this);
	631	+
	632	+ copyOptionsPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
560	633	liveCB.setToolTipText("Enable animation");
561	634	liveCB.addItemListener(this);
562	635
563		- oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	636	+ copyOptionsPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
564	637	oneStepButton.setToolTipText("Animate one step forward");
565	638	oneStepButton.addActionListener(this);
566	639
567		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	640	+ copyOptionsPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
568	641	fastCB.setToolTipText("Fast mode");
569	642	fastCB.addItemListener(this);
570	643
571		- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
572		- trackCB.setToolTipText("Enable tracking");
573		- trackCB.addItemListener(this);
574		-
575		- oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
576		- screenfitButton.setToolTipText("Screen fit");
577		- 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);
578	649
579	650	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
580	651	// screenfitpointButton.addActionListener(this);
..	..	@@ -586,65 +657,145 @@
586	657	snapobjectButton.setToolTipText("Snap Object");
587	658	}
588	659
589		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
590		- flashSelectionButton.setToolTipText("Show selection");
591		- flashSelectionButton.addActionListener(this);
	660	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
592	661
593		- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
594		-
595		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	662	+ oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
596	663	twoButton.setToolTipText("Show center view only");
597	664	twoButton.addActionListener(this);
598		- oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	665	+ this.fullscreenLayout = twoButton;
	666	+
	667	+ oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
599	668	fourButton.addActionListener(this);
600	669	fourButton.setToolTipText("Show left panel only");
601		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	670	+ oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
602	671	sixButton.setToolTipText("2-column layout left");
603	672	sixButton.addActionListener(this);
604		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	673	+ oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
605	674	threeButton.setToolTipText("2-column layout right");
606	675	threeButton.addActionListener(this);
607		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	676	+ oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
608	677	sevenButton.setToolTipText("3-column layout");
609	678	sevenButton.addActionListener(this);
610	679	//
611	680
612		- 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);
613	682	rootButton.setToolTipText("Edit selection in new tab");
614	683	rootButton.addActionListener(this);
615	684
616		- 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);
617	686	closeButton.setToolTipText("Close tab");
618	687	closeButton.addActionListener(this);
619	688	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
620	689	//clearButton.addActionListener(this);
621		-
622		- cGridBag commandsPanel = new cGridBag();
	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	+ }
623	722
624		- commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
625		- editButton.setToolTipText("Edit selection");
	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");
626	772	editButton.addActionListener(this);
627	773
628		- commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
629		- uneditButton.setToolTipText("Unedit selection");
	774	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	775	+ uneditButton.setToolTipText("Remove selection controls");
630	776	uneditButton.addActionListener(this);
631	777
632		- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
633		- allParamsButton.setToolTipText("Edit all params");
	778	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	779	+ allParamsButton.setToolTipText("Show all controle");
634	780	allParamsButton.addActionListener(this);
635	781
636		- commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	782	+ editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
637	783	clearPanelButton.setToolTipText("Clear edit panel");
638	784	clearPanelButton.addActionListener(this);
639	785
640		- commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	786	+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
641	787	unselectButton.setToolTipText("Unselect");
642	788	unselectButton.addActionListener(this);
643	789
644		- commandsPanel.preferredHeight = 1;
	790	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	791	+ flashSelectionButton.setToolTipText("Highlight selection");
	792	+ flashSelectionButton.addActionListener(this);
645	793
646		- oe.treePanel.add(commandsPanel);
647		- oe.treePanel.Return();
	794	+ editCommandsPanel.preferredHeight = 1;
	795	+
	796	+ SetPinStates(false);
	797	+// oe.treePanel.add(commandsPanel);
	798	+// oe.treePanel.Return();
648	799
649	800	// oe.aConstraints.gridx += 1;
650	801	// oe.aConstraints.weighty = 0;
..	..	@@ -661,27 +812,12 @@
661	812
662	813	JScrollPane jSP;
663	814	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
664		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	815	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
665	816	ResetModel();
666	817
667	818	oe.treePanel.add(jSPPanel);
668	819	oe.treePanel.Return();
669	820
670		- cGridBag copyOptionsPanel = new cGridBag();
671		-
672		- copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
673		- colorCB.setToolTipText("Copy color when dropped");
674		- colorCB.addItemListener(this);
675		-
676		- copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
677		- materialCB.setToolTipText("Copy material when dropped");
678		- materialCB.addItemListener(this);
679		-
680		- copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
681		- textureCB.setToolTipText("Copy texture when dropped");
682		- textureCB.addItemListener(this);
683		-
684		- copyOptionsPanel.preferredHeight = 1;
685	821	oe.treePanel.add(copyOptionsPanel);
686	822	oe.treePanel.Return();
687	823
..	..	@@ -712,23 +848,43 @@
712	848
713	849	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
714	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	+
715	865	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
716	866	boxCB.setToolTipText("Display bounding boxes");
717	867	boxCB.addItemListener(this);
718	868
719	869	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
720		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	870	+ zoomBoxCB.setToolTipText("Display only for wheel");
721	871	zoomBoxCB.addItemListener(this);
722	872
723	873	if (true) // Globals.ADVANCED)
724	874	{
725		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
726		- supportCB.setToolTipText("Enable rigging");
727		- 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);
728	882
729	883	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
730	884	// localCB.addItemListener(this);
731	885
	886	+ panel.Return();
	887	+
732	888	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
733	889	crowdCB.setToolTipText("Used for crowds");
734	890	crowdCB.addItemListener(this);
..	..	@@ -745,6 +901,8 @@
745	901	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
746	902	// speakerMocapCB.addItemListener(this);
747	903
	904	+ panel.Return();
	905	+
748	906	if (false)
749	907	{
750	908	// handled in scripts
..	..	@@ -759,32 +917,72 @@
759	917	//constraints.gridy += 1;
760	918	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
761	919	smoothfocusCB.addItemListener(this);
	920	+ panel.Return();
762	921	}
763	922
764	923	//constraints.gridx += 1;
765	924	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
766	925	// debugCB.addItemListener(this);
767	926
	927	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	928	+ trackCB.setToolTipText("Enable tracking target");
	929	+ trackCB.addItemListener(this);
	930	+
768	931	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	932	+ oeilCB.setToolTipText("Move camera when tracking");
769	933	oeilCB.addItemListener(this);
770	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	+ {
771	955	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
772	956	lookAtCB.setToolTipText("Look-at target");
773	957	lookAtCB.addItemListener(this);
	958	+ }
774	959
775	960	}
776	961
777	962	cGridBag fill = new cGridBag();
778		-
779	963	fill.preferredHeight = 200;
	964	+ cGridBag fill2 = new cGridBag();
	965	+ fill2.preferredHeight = 200;
	966	+ cGridBag fill3 = new cGridBag();
	967	+ fill3.preferredHeight = 200;
780	968
781	969	panel.add(fill);
	970	+ panel.add(fill2);
	971	+ panel.add(fill3);
782	972
783	973	}
784	974
785	975	void EditObject(Object3D obj)
786	976	{
787	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	+
788	986	radioButton.SetObject(obj);
789	987	radioButton.layout = sevenButton;
790	988	radioButton.SetCamera(cameraView.renderCamera, false);
..	..	@@ -796,6 +994,8 @@
796	994
797	995	void SetupViews(ObjEditor oe)
798	996	{
	997	+ theFrame = this;
	998	+
799	999	oe.SetupViews();
800	1000
801	1001	System.out.println("SetupViews");
..	..	@@ -804,23 +1004,28 @@
804	1004	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
805	1005	}
806	1006
807		- JCheckBox liveCB;
808		- JCheckBox supportCB;
809		- JCheckBox localCB;
810		- JCheckBox crowdCB;
811		- JCheckBox smoothCB;
812		- JCheckBox fastCB;
813		- JCheckBox slowCB;
814		- JCheckBox boxCB;
815		- JCheckBox zoomBoxCB;
816		- JCheckBox trackCB;
817		- 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;
818	1020	// JCheckBox speakerMocapCB;
819		- JCheckBox speakerCameraCB;
820		- JCheckBox speakerFocusCB;
821		- JCheckBox debugCB;
822		- JCheckBox oeilCB;
823		- JCheckBox lookAtCB;
	1021	+ cCheckBox speakerCameraCB;
	1022	+ cCheckBox speakerFocusCB;
	1023	+ cCheckBox debugCB;
	1024	+
	1025	+ cCheckBox oeilCB;
	1026	+ cCheckBox shadowCB;
	1027	+ cCheckBox autosaveCB;
	1028	+ cCheckBox lookAtCB;
824	1029
825	1030	// static int COLOR = 1;
826	1031	// static int MATERIAL = 2;
..	..	@@ -828,9 +1033,9 @@
828	1033
829	1034	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
830	1035
831		- JCheckBox colorCB;
832		- JCheckBox materialCB;
833		- JCheckBox textureCB;
	1036	+ cCheckBox colorCB;
	1037	+ cCheckBox materialCB;
	1038	+ cCheckBox textureCB;
834	1039
835	1040	public void itemStateChanged(ItemEvent e)
836	1041	{
..	..	@@ -858,6 +1063,7 @@
858	1063	} else if(e.getSource() == liveCB)
859	1064	{
860	1065	cameraView.ToggleLive();
	1066	+ refreshContents(false);
861	1067	}
862	1068	else if(e.getSource() == supportCB)
863	1069	{
..	..	@@ -922,6 +1128,18 @@
922	1128	{
923	1129	cameraView.ToggleOeil();
924	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	+ }
925	1143	else if(e.getSource() == lookAtCB)
926	1144	{
927	1145	cameraView.ToggleLookAt();
..	..	@@ -938,7 +1156,8 @@
938	1156
939	1157	/**/
940	1158	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
941		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1159	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1160	+ TreePath path = objEditor.jTree.getSelectionPath();
942	1161	if ((path == null) \|\| (path.getPathCount() <= 1)) {
943	1162	// We can't move the root node or an empty selection
944	1163	return;
..	..	@@ -1001,8 +1220,6 @@
1001	1220	}
1002	1221	}
1003	1222
1004		- String string = (String) object;
1005		-
1006	1223	System.out.println("Transfer = " + object + "; drop : " + target);
1007	1224	// if( object instanceof java.io.File[])
1008	1225	// {
..	..	@@ -1010,6 +1227,8 @@
1010	1227	// objEditor.DropFile((java.io.File[]) object, true);
1011	1228	// return;
1012	1229	// }
	1230	+
	1231	+ String string = object.toString();
1013	1232
1014	1233	// File path for Mac and Windows
1015	1234	if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
..	..	@@ -1055,23 +1274,33 @@
1055	1274
1056	1275	assert target == objEditor.jTree;
1057	1276	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1277	+ Object3D destinationLeaf;
1058	1278	try {
1059		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1279	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
1060	1280	} catch (Exception e) {
1061	1281	System.out.println("destinationPath : " + destinationPath);
1062	1282	return;
1063	1283	}
1064	1284
1065		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1285	+ for (int i=group.selection.size(); --i>=0;)
1066	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	+// {
1067	1296	loadClipboard(true);
1068	1297	objEditor.jTree.setSelectionPath(destinationPath);
1069	1298	pasteInto(false, false);
1070		- } else {
1071		- loadClipboard(false);
1072		- objEditor.jTree.setSelectionPath(destinationPath);
1073		- pasteInto(false, false); // true); // ???
1074		- }
	1299	+// } else {
	1300	+// loadClipboard(false);
	1301	+// objEditor.jTree.setSelectionPath(destinationPath);
	1302	+// pasteInto(false, false); // true); // ???
	1303	+// }
1075	1304	}
1076	1305	public void dropActionChanged(DropTargetDragEvent dtde)
1077	1306	// Called if the user has modified the current drop gesture
..	..	@@ -1176,22 +1405,30 @@
1176	1405	{
1177	1406	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1178	1407	//heightFieldItem.addActionListener(this);
1179		- gridItem = menu.add(new MenuItem("Grid"));
1180		- gridItem.addActionListener(this);
1181		- rectoidItem = menu.add(new MenuItem("Box"));
1182		- rectoidItem.addActionListener(this);
1183		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1184		- ellipsoidItem.addActionListener(this);
1185		- coneItem = menu.add(new MenuItem("Cone"));
1186		- coneItem.addActionListener(this);
1187		- torusItem = menu.add(new MenuItem("Torus"));
1188		- torusItem.addActionListener(this);
1189		- superItem = menu.add(new MenuItem("Superellipsoid"));
1190		- 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	+ {
1191	1426	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1192	1427	kleinItem.addActionListener(this);
1193		- particleItem = menu.add(new MenuItem("Particle system"));
1194		- particleItem.addActionListener(this);
	1428	+ }
	1429	+
	1430	+// particleItem = menu.add(new MenuItem("Particle system"));
	1431	+// particleItem.addActionListener(this);
1195	1432	if (Globals.ADVANCED)
1196	1433	{
1197	1434	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1217,15 +1454,15 @@
1217	1454	}
1218	1455	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1219	1456	bezierItem.addActionListener(this);
1220		- overlayItem = menu.add(new MenuItem("Overlay"));
1221		- overlayItem.addActionListener(this);
1222		- lightItem = menu.add(new MenuItem("Light"));
1223		- 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);
1224	1461	menu.add("-");
1225	1462	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1226	1463	//superLoopItem.addActionListener(this);
1227		- loopItem = menu.add(new MenuItem("Loop"));
1228		- loopItem.addActionListener(this);
	1464	+// loopItem = menu.add(new MenuItem("Loop"));
	1465	+// loopItem.addActionListener(this);
1229	1466	doubleItem = menu.add(new MenuItem("Fork"));
1230	1467	doubleItem.addActionListener(this);
1231	1468	if (Globals.ADVANCED)
..	..	@@ -1241,6 +1478,9 @@
1241	1478	animationItem.addItemListener(this);
1242	1479	animationItem.setState(Globals.ANIMATION);
1243	1480
	1481	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1482	+ archiveItem.addActionListener(this);
	1483	+
1244	1484	menu.add("-");
1245	1485	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1246	1486	parseverticesItem.addActionListener(this);
..	..	@@ -1253,6 +1493,8 @@
1253	1493	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1254	1494	reduce34MorphItem.addActionListener(this);
1255	1495	menu.add("-");
	1496	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	1497	+ memoryItem.addActionListener(this);
1256	1498	menu.add(computeAOItem = new MenuItem("Compute AO"));
1257	1499	computeAOItem.addActionListener(this);
1258	1500
..	..	@@ -1261,11 +1503,9 @@
1261	1503	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1262	1504	mirrorItem.addActionListener(this);
1263	1505	menu.add("-");
1264		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1265		- memoryItem.addActionListener(this);
1266	1506	menu.add(analyzeItem = new MenuItem("Analyze"));
1267	1507	analyzeItem.addActionListener(this);
1268		- menu.add(dumpItem = new MenuItem("Dump"));
	1508	+ menu.add(dumpItem = new MenuItem("Print"));
1269	1509	dumpItem.addActionListener(this);
1270	1510	// menu.add(pathItem = new MenuItem("From-to path"));
1271	1511	// pathItem.addActionListener(this);
..	..	@@ -1406,9 +1646,24 @@
1406	1646	shadow.material = new cMaterial(obj.material);
1407	1647	shadow.material.diffuse = 0.0001f;
1408	1648	shadow.material.specular = 0.0001f;
	1649	+ //shadow.projectedVertices[1].x = 300;
1409	1650
1410	1651	makeSomething(shadow);
1411	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	+ }
1412	1667
1413	1668	/**
1414	1669	* applyExample
..	..	@@ -1653,7 +1908,7 @@
1653	1908	{
1654	1909	ScreenFit();
1655	1910	} else
1656		- if (source == switchItem)
	1911	+ if (source == switchViewItem)
1657	1912	{
1658	1913	cVector v1 = new cVector();
1659	1914	cVector v2 = new cVector();
..	..	@@ -1662,11 +1917,11 @@
1662	1917	objEditor.cameraView.renderCamera.setAim(v2, v1);
1663	1918	objEditor.cameraView.repaint();
1664	1919	} else
1665		- if (source == rectoidItem)
	1920	+ if (source == rectoidItem \|\| source == boxButton)
1666	1921	{
1667	1922	makeSomething(new Box());
1668	1923	} else
1669		- if (source == particleItem)
	1924	+ if (source == particleItem \|\| source == particlesButton)
1670	1925	{
1671	1926	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1672	1927	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1745,27 +2000,27 @@
1745	2000
1746	2001	makeSomething(obj);
1747	2002	} else
1748		- if (source == gridItem)
	2003	+ if (source == gridItem \|\| source == gridButton)
1749	2004	{
1750	2005	makeSomething(new Grid());
1751	2006	} else
1752		- if (source == ellipsoidItem)
	2007	+ if (source == ellipsoidItem \|\| source == sphereButton)
1753	2008	{
1754	2009	makeSomething(new Sphere());
1755	2010	} else
1756		- if (source == coneItem)
	2011	+ if (source == coneItem \|\| source == coneButton)
1757	2012	{
1758	2013	makeSomething(new Cone());
1759	2014	} else
1760		- if (source == torusItem)
	2015	+ if (source == torusItem \|\| source == torusButton)
1761	2016	{
1762	2017	makeSomething(new Torus());
1763	2018	} else
1764		- if (source == superItem)
	2019	+ if (source == superItem \|\| source == superButton)
1765	2020	{
1766	2021	makeSomething(new Superellipsoid());
1767	2022	} else
1768		- if (source == kleinItem)
	2023	+ if (source == kleinItem \|\| source == kleinButton)
1769	2024	{
1770	2025	makeSomething(new Klein());
1771	2026	} else
..	..	@@ -1785,7 +2040,7 @@
1785	2040	{
1786	2041	makeSomething(new BezierSurface());
1787	2042	} else
1788		- if (source == overlayItem)
	2043	+ if (source == overlayItem \|\| source == overlayButton)
1789	2044	{
1790	2045	/*
1791	2046	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1833,7 +2088,7 @@
1833	2088	s.setup();
1834	2089	makeSomething(s);
1835	2090	} else
1836		- if (source == lightItem)
	2091	+ if (source == lightItem \|\| source == lightButton)
1837	2092	{
1838	2093	makeSomething(new Light());
1839	2094	} else
..	..	@@ -1883,30 +2138,30 @@
1883	2138
1884	2139	group(g);
1885	2140	} else
1886		- if (source == loopItem)
	2141	+ if (source == loopItem \|\| source == loopButton)
1887	2142	{
1888	2143	Composite csg = new GroupLeaf();
1889	2144	csg.count = 5;
1890	2145	group(csg);
1891		- Composite child = new cGroup();
	2146	+ Composite child = new cGroup("Branch");
1892	2147	csg.addChild(child);
1893	2148	child.addChild(csg);
1894	2149	} else
1895	2150	if (source == doubleItem)
1896	2151	{
1897		- Composite csg = new GroupLeaf();
	2152	+ Composite csg = new GroupLeaf("Fork");
1898	2153	csg.count = 5;
1899	2154	group(csg);
1900		- Composite child = new cGroup();
	2155	+ Composite child = new cGroup("Branch A");
1901	2156	csg.addChild(child);
1902	2157	child.addChild(csg);
1903		- child = new cGroup();
	2158	+ child = new cGroup("Branch B");
1904	2159	csg.addChild(child);
1905	2160	child.addChild(csg);
1906	2161	} else
1907	2162	if (source == tripleItem)
1908	2163	{
1909		- Composite csg = new GroupLeaf();
	2164	+ Composite csg = new GroupLeaf("Trident");
1910	2165	csg.count = 4;
1911	2166	group(csg);
1912	2167	Composite child = new cGroup();
..	..	@@ -1956,6 +2211,32 @@
1956	2211	{
1957	2212	DumpObject();
1958	2213	} else
	2214	+ if (source == minButton)
	2215	+ {
	2216	+ Minimize();
	2217	+ } else
	2218	+ if (source == maxButton)
	2219	+ {
	2220	+ Maximize();
	2221	+ } else
	2222	+ if (source == fullButton)
	2223	+ {
	2224	+ ToggleFullScreen();
	2225	+ } else
	2226	+ if (source == undoButton)
	2227	+ {
	2228	+ if (!Undo())
	2229	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2230	+ } else
	2231	+ if (source == redoButton)
	2232	+ {
	2233	+ Redo();
	2234	+ } else
	2235	+ if (source == saveButton)
	2236	+ {
	2237	+ if (!Save(true))
	2238	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2239	+ } else
1959	2240	if (source == oneStepButton)
1960	2241	{
1961	2242	Globals.ONESTEP = true;
..	..	@@ -1963,17 +2244,14 @@
1963	2244	} else
1964	2245	if (source == screenfitButton)
1965	2246	{
1966		- //Reload(lastConverter, lastFilename, true);
1967	2247	ScreenFit();
1968	2248	} else
1969	2249	if (source == screenfitpointButton)
1970	2250	{
1971		- //Reload(lastConverter, lastFilename, true);
1972	2251	ScreenFitPoint();
1973	2252	} else
1974	2253	if (source == snapobjectButton)
1975	2254	{
1976		- //Reload(lastConverter, lastFilename, true);
1977	2255	SnapObject();
1978	2256	} else
1979	2257	// if (event.getSource() == recompileButton)
..	..	@@ -2349,9 +2627,9 @@
2349	2627	{
2350	2628	ClearSelection(true);
2351	2629	} else
2352		- if (source == grabItem)
	2630	+ if (source == grabItem \|\| source == groupButton)
2353	2631	{
2354		- group(new cGroup(), true);
	2632	+ group(new cGroup(), false); // true);
2355	2633	} else
2356	2634	if (source == hideItem)
2357	2635	{
..	..	@@ -2369,11 +2647,11 @@
2369	2647	{
2370	2648	makeSomething(new Camera());
2371	2649	} else
2372		- if (source == compositeItem)
	2650	+ if (source == compositeItem \|\| source == compositeButton)
2373	2651	{
2374	2652	group(new Composite());
2375	2653	} else
2376		- if (source == randomItem)
	2654	+ if (source == switchItem \|\| source == switchButton)
2377	2655	{
2378	2656	RandomNode random = new RandomNode();
2379	2657	group(random);
..	..	@@ -2475,7 +2753,7 @@
2475	2753	{
2476	2754	group(new cLinker());
2477	2755	} else
2478		- if (source == textureItem)
	2756	+ if (source == textureItem \|\| source == textureButton)
2479	2757	{
2480	2758	group(new TextureNode());
2481	2759	} else
..	..	@@ -2495,17 +2773,30 @@
2495	2773	{
2496	2774	CastShadow(2);
2497	2775	} else
2498		- if (source == ungroupItem)
	2776	+ if (source == ungroupItem \|\| source == ungroupButton)
2499	2777	{
2500		- //ungroup();
	2778	+ boolean hasRoot = false;
	2779	+
2501	2780	for (int i=0; i<group.selection.size(); i++)
2502	2781	{
2503		- Ungroup(group.selection.get(i));
	2782	+ if (group.selection.get(i) == group)
	2783	+ {
	2784	+ hasRoot = true;
	2785	+ break;
	2786	+ }
2504	2787	}
2505	2788
2506		- ClearSelection(false);
2507		-
2508		- 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	+ }
2509	2800	} else
2510	2801	if (source == genUVItem)
2511	2802	{
..	..	@@ -2517,7 +2808,7 @@
2517	2808	} else
2518	2809	if (source == genNormalsMESHItem)
2519	2810	{
2520		- GenNormals(true); // TODO
	2811	+ GenNormalsMESH();
2521	2812	} else
2522	2813	if (source == genNormalsORGANItem)
2523	2814	{
..	..	@@ -2582,6 +2873,22 @@
2582	2873	if (source == unmarkleavesItem)
2583	2874	{
2584	2875	MarkLeaves(false);
	2876	+ } else
	2877	+ if (source == rewindleavesItem)
	2878	+ {
	2879	+ RewindLeaves(true);
	2880	+ } else
	2881	+ if (source == unrewindleavesItem)
	2882	+ {
	2883	+ RewindLeaves(false);
	2884	+ } else
	2885	+ if (source == randomleavesItem)
	2886	+ {
	2887	+ RandomLeaves(true);
	2888	+ } else
	2889	+ if (source == unrandomleavesItem)
	2890	+ {
	2891	+ RandomLeaves(false);
2585	2892	} else
2586	2893	if (source == flipVItem)
2587	2894	{
..	..	@@ -2817,6 +3124,10 @@
2817	3124	if (source == twoButton)
2818	3125	{
2819	3126	radio.layout = twoButton;
	3127	+
	3128	+ if (CameraPane.FULLSCREEN)
	3129	+ fullscreenLayout = radio.layout;
	3130	+
2820	3131	// bug
2821	3132	//gridPanel.setDividerLocation(1.0);
2822	3133	//bigPanel.setDividerLocation(0.0);
..	..	@@ -2849,10 +3160,31 @@
2849	3160	bigThree.ClearUI();
2850	3161	bigThree.add(centralPanel);
2851	3162	bigThree.FlushUI();
	3163	+
	3164	+ cameraView.requestFocusInWindow();
	3165	+
	3166	+// refreshContents(true);
	3167	+//
	3168	+// try
	3169	+// {
	3170	+// java.awt.Robot bot = new java.awt.Robot();
	3171	+// int mask = InputEvent.BUTTON1_MASK;
	3172	+// bot.mouseMove(100, 100);
	3173	+// bot.mousePress(mask);
	3174	+// bot.mouseRelease(mask);
	3175	+// }
	3176	+// catch (Exception e)
	3177	+// {
	3178	+//
	3179	+// }
	3180	+
2852	3181	} else
2853	3182	if (source == threeButton)
2854	3183	{
2855	3184	radio.layout = threeButton;
	3185	+
	3186	+ if (CameraPane.FULLSCREEN)
	3187	+ fullscreenLayout = radio.layout;
2856	3188
2857	3189	// bigThree.remove(scenePanel);
2858	3190	// bigThree.remove(centralPanel);
..	..	@@ -2885,10 +3217,15 @@
2885	3217	bigThree.add(centralPanel);
2886	3218	bigThree.add(XYZPanel);
2887	3219	bigThree.FlushUI();
	3220	+
	3221	+ cameraView.requestFocusInWindow();
2888	3222	} else
2889	3223	if (source == fourButton)
2890	3224	{
2891	3225	radio.layout = fourButton;
	3226	+
	3227	+ if (CameraPane.FULLSCREEN)
	3228	+ fullscreenLayout = radio.layout;
2892	3229
2893	3230	// bigThree.remove(scenePanel);
2894	3231	// bigThree.remove(centralPanel);
..	..	@@ -2920,10 +3257,15 @@
2920	3257	bigThree.ClearUI();
2921	3258	bigThree.add(scenePanel);
2922	3259	bigThree.FlushUI();
	3260	+
	3261	+ cameraView.requestFocusInWindow();
2923	3262	} else
2924	3263	if (source == sixButton)
2925	3264	{
2926	3265	radio.layout = sixButton;
	3266	+
	3267	+ if (CameraPane.FULLSCREEN)
	3268	+ fullscreenLayout = radio.layout;
2927	3269
2928	3270	// bigThree.remove(scenePanel);
2929	3271	// bigThree.remove(centralPanel);
..	..	@@ -2956,10 +3298,15 @@
2956	3298	bigThree.add(scenePanel);
2957	3299	bigThree.add(centralPanel);
2958	3300	bigThree.FlushUI();
	3301	+
	3302	+ cameraView.requestFocusInWindow();
2959	3303	} else
2960	3304	if (source == sevenButton)
2961	3305	{
2962	3306	radio.layout = sevenButton;
	3307	+
	3308	+ if (CameraPane.FULLSCREEN)
	3309	+ fullscreenLayout = radio.layout;
2963	3310
2964	3311	// bigThree.remove(scenePanel);
2965	3312	// bigThree.remove(centralPanel);
..	..	@@ -2993,6 +3340,8 @@
2993	3340	bigThree.add(centralPanel);
2994	3341	bigThree.add(XYZPanel);
2995	3342	bigThree.FlushUI();
	3343	+
	3344	+ cameraView.requestFocusInWindow();
2996	3345	} else
2997	3346	if (source == rootButton)
2998	3347	{
..	..	@@ -3004,6 +3353,7 @@
3004	3353	EditObject(obj);
3005	3354	}
3006	3355
	3356	+ cameraView.requestFocusInWindow();
3007	3357	refreshContents(true);
3008	3358	} else
3009	3359	if (source == closeButton)
..	..	@@ -3013,22 +3363,37 @@
3013	3363	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3014	3364	{
3015	3365	ab = (cRadio)e.nextElement();
3016		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3366	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
3017	3367	{
	3368	+ // Patch to avoid bug with transparency.
	3369	+ if (!ab.hadMaterial)
	3370	+ {
	3371	+ ab.object.material = null;
	3372	+ }
	3373	+
3018	3374	buttonGroup.remove(ab);
3019	3375	radioPanel.remove(ab);
3020	3376
3021		- ab.GetObject().editWindow = null;
	3377	+ //ab.GetObject().editWindow = null;
	3378	+ ab.GetObject().manipWindow = null;
3022	3379	// ab.GetObject().objectUI = null; // ?????????
3023	3380
3024	3381	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
3025	3382	break;
3026	3383	}
3027	3384	}
	3385	+
	3386	+ cameraView.requestFocusInWindow();
3028	3387	refreshContents(true);
3029	3388	} else
3030	3389	if (source == editItem \|\| source == editButton)
3031	3390	{
	3391	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3392	+ {
	3393	+ Object3D child = (Object3D)e.nextElement();
	3394	+ child.pinned = true;
	3395	+ }
	3396	+
3032	3397	EditSelection(false);
3033	3398	} else
3034	3399	if (source == uneditButton)
..	..	@@ -3038,10 +3403,11 @@
3038	3403	Object3D child = (Object3D)e.nextElement();
3039	3404	if(child.editWindow != null)
3040	3405	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3406	+ child.pinned = false;
3041	3407	child.CloseUI();
3042	3408	listUI.remove(child);
3043	3409
3044		- child.editWindow = null; // ???????????
	3410	+ //child.editWindow = null; // ???????????
3045	3411	}
3046	3412	objEditor.ctrlPanel.FlushUI();
3047	3413	//objEditor.jTree.clearSelection();
..	..	@@ -3054,6 +3420,7 @@
3054	3420	//copy.ClearUI();
3055	3421	for (Object3D obj : listUI)
3056	3422	{
	3423	+ obj.pinned = false;
3057	3424	obj.CloseUI();
3058	3425	}
3059	3426	listUI.clear();
..	..	@@ -3063,7 +3430,7 @@
3063	3430	{
3064	3431	assert(copy == group);
3065	3432
3066		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3433	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3067	3434
3068	3435	for (Object3D obj : listUI)
3069	3436	{
..	..	@@ -3128,7 +3495,9 @@
3128	3495	sideView.object = group;
3129	3496	}
3130	3497
3131		-// fix "+" issue group.editWindow = this;
	3498	+// fix "+" issue
	3499	+ //group.editWindow = this;
	3500	+ group.manipWindow = this;
3132	3501
3133	3502	/*
3134	3503	currentLayout = radio.layout;
..	..	@@ -3136,18 +3505,25 @@
3136	3505	currentLayout = sevenButton;
3137	3506	*/
3138	3507	radio.layout.doClick();
	3508	+
	3509	+ ClearUnpinned();
	3510	+ SetPinStates(group.selection.size() > 0);
	3511	+ if (group.selection.size() == 1)
	3512	+ EditSelection(false);
3139	3513	keepparent = group.parent;
3140	3514	// PARENT = NULL or not???
3141	3515	//group.parent = null; // ROOT
3142	3516	//group.attributes = -1;
3143	3517	ResetModel();
	3518	+
	3519	+ cameraView.requestFocusInWindow();
3144	3520	refreshContents(true);
3145	3521	} else if (event.getSource() == editCameraItem)
3146	3522	{
3147	3523	cameraView.ProtectCamera();
3148	3524	cameraView.repaint();
3149	3525	return;
3150		- } else if (event.getSource() == revertCameraItem)
	3526	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3151	3527	{
3152	3528	cameraView.RevertCamera();
3153	3529	cameraView.repaint();
..	..	@@ -3164,7 +3540,6 @@
3164	3540	}
3165	3541
3166	3542	boolean useclient = false;
3167		- cRadio radio;
3168	3543
3169	3544	void ToggleRoot()
3170	3545	{
..	..	@@ -3403,7 +3778,8 @@
3403	3778
3404	3779	int size = obj.MemorySize();
3405	3780
3406		- System.err.println((size/1024) + " KB is the size of " + obj);
	3781	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	3782	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3407	3783	}
3408	3784	}
3409	3785	catch (Exception e)
..	..	@@ -3484,6 +3860,13 @@
3484	3860	void GenNormals(boolean crease)
3485	3861	{
3486	3862	group.GenNormalsS(crease);
	3863	+
	3864	+ refreshContents();
	3865	+ }
	3866	+
	3867	+ void GenNormalsMESH()
	3868	+ {
	3869	+ group.GenNormalsMeshS();
3487	3870
3488	3871	refreshContents();
3489	3872	}
..	..	@@ -4111,6 +4494,18 @@
4111	4494	refreshContents();
4112	4495	}
4113	4496
	4497	+ void RewindLeaves(boolean hide)
	4498	+ {
	4499	+ group.selection.RewindLeaves(hide);
	4500	+ refreshContents();
	4501	+ }
	4502	+
	4503	+ void RandomLeaves(boolean hide)
	4504	+ {
	4505	+ group.selection.RandomLeaves(hide);
	4506	+ refreshContents();
	4507	+ }
	4508	+
4114	4509	void SetTexRes(int tr)
4115	4510	{
4116	4511	group.selection.SetTexRes(tr);
..	..	@@ -4182,10 +4577,6 @@
4182	4577	// }
4183	4578	// }
4184	4579
4185		- static boolean allparams = true;
4186		-
4187		- static Vector<Object3D> listUI = new Vector<Object3D>();
4188		-
4189	4580	void EditSelection(boolean newWindow)
4190	4581	{
4191	4582	// aConstraints.gridy = 0;
..	..	@@ -4193,7 +4584,7 @@
4193	4584	{
4194	4585	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4195	4586	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4196		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4587	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4197	4588
4198	4589	Object3D elem = (Object3D)group.selection.elementAt(i);
4199	4590	if(elem != group \|\| !newWindow)
..	..	@@ -4278,7 +4669,8 @@
4278	4669	//new Exception().printStackTrace();
4279	4670
4280	4671	freezemodel = true;
4281		-
	4672	+ ClearUnpinned();
	4673	+
4282	4674	/**/
4283	4675	//switch (event.id)
4284	4676	{
..	..	@@ -4286,7 +4678,6 @@
4286	4678	//case 702: // Event.LIST_DESELECT
4287	4679	group.deselectAll();
4288	4680	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4289		- objEditor.ClearInfo(); // .GetMaterial());
4290	4681	if (tps != null)
4291	4682	{
4292	4683	for (int i=0; i < tps.length; i++)
..	..	@@ -4295,10 +4686,8 @@
4295	4686
4296	4687	//if (child.parent != null)
4297	4688	//child.parent.addSelectee(child);
	4689	+ objEditor.SetMaterial(child);
4298	4690	group.addSelectee(child);
4299		- objEditor.SetMaterial(child); // .GetMaterial());
4300		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4301		- System.err.println("info : " + child.GetPath());
4302	4691	}
4303	4692	}
4304	4693	// else
..	..	@@ -4308,17 +4697,13 @@
4308	4697	// System.err.println("info : " + group.GetPath());
4309	4698	// }
4310	4699
4311		- objEditor.SetText(); // jan 2014
4312		-
4313		- Object3D object = (Object3D) tps[0].getLastPathComponent();
4314		-
4315		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(object instanceof Camera))
	4700	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4316	4701	CameraPane.flash = true;
4317	4702
4318		- if (tps != null && tps.length > 0 && object instanceof Camera)
	4703	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4319	4704	// a camera
4320	4705	{
4321		- if (object != Globals.theRenderer.LightCamera())
	4706	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
4322	4707	{
4323	4708	CameraPane.camerachangeframe = 0; // don't refuse it
4324	4709	Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
..	..	@@ -4327,6 +4712,13 @@
4327	4712	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4328	4713	}
4329	4714
	4715	+ if (tps != null && tps.length == 1)
	4716	+ {
	4717	+ EditSelection(false);
	4718	+ }
	4719	+
	4720	+ SetPinStates(tps != null && tps.length > 0);
	4721	+
4330	4722	refreshContents();
4331	4723	//return true;
4332	4724	}
..	..	@@ -4335,6 +4727,35 @@
4335	4727
4336	4728	freezemodel = false;
4337	4729	}
	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	+
	4739	+ void refreshContents(boolean cp)
	4740	+ {
	4741	+ if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
	4742	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
	4743	+ {
	4744	+ objEditor.ClearInfo(); // .GetMaterial());
	4745	+
	4746	+ for (int i=0; i < group.selection.Size(); i++)
	4747	+ {
	4748	+ Object3D child = (Object3D) group.selection.get(i);
	4749	+
	4750	+ objEditor.AddInfo(child, this, true);
	4751	+ System.err.println("info : " + child.GetPath());
	4752	+ }
	4753	+
	4754	+ objEditor.SetText(); // jan 2014
	4755	+ }
	4756	+
	4757	+ super.refreshContents(cp);
	4758	+ }
4338	4759
4339	4760	void linkSomething(Object3D thing)
4340	4761	{
..	..	@@ -4406,6 +4827,7 @@
4406	4827	{
4407	4828	if (group.selection.isEmpty())
4408	4829	return;
	4830	+
4409	4831	Grafreed.clipboardIsTempGroup = false;
4410	4832	Composite tGroup = null;
4411	4833	if (group.selection.size() > 0) // 1)
..	..	@@ -4416,6 +4838,8 @@
4416	4838
4417	4839	if (cut)
4418	4840	{
	4841	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	4842	+// Save();
4419	4843	//int indices[] = jList.getSelectedIndices();
4420	4844	//for (int i = indices.length - 1; i >= 0; i--)
4421	4845	//jList.remove(indices[i]);
..	..	@@ -4505,8 +4929,10 @@
4505	4929	}
4506	4930
4507	4931	}
	4932	+
4508	4933	if (Grafreed.clipboardIsTempGroup)
4509	4934	Grafreed.clipboard = tGroup;
	4935	+
4510	4936	if (cut)
4511	4937	{
4512	4938	ResetModel();
..	..	@@ -4516,6 +4942,10 @@
4516	4942
4517	4943	void paste(boolean expand)
4518	4944	{
	4945	+ if (Globals.SAVEONMAKE)
	4946	+ Save();
	4947	+ boolean keep = Globals.SAVEONMAKE;
	4948	+ Globals.SAVEONMAKE = false;
4519	4949	// if (GrafreeD.clipboard == null)
4520	4950	// return;
4521	4951	boolean first = true;
..	..	@@ -4575,6 +5005,7 @@
4575	5005	Grafreed.clipboard.get(0).parent = keepparent;
4576	5006	}
4577	5007
	5008	+ Globals.SAVEONMAKE = keep;
4578	5009	ResetModel();
4579	5010	refreshContents();
4580	5011	}
..	..	@@ -4710,6 +5141,10 @@
4710	5141
4711	5142	void group(Object3D csg, boolean grab)
4712	5143	{
	5144	+ if (Globals.SAVEONMAKE)
	5145	+ Save();
	5146	+ boolean keep = Globals.SAVEONMAKE;
	5147	+ Globals.SAVEONMAKE = false;
4713	5148	if (//false) // why??
4714	5149	!group.selection.isEmpty())
4715	5150	{
..	..	@@ -4823,10 +5258,15 @@
4823	5258	//node.add(csg);
4824	5259	//makeSomething(node);
4825	5260	makeSomething(csg);
	5261	+ Globals.SAVEONMAKE = keep;
4826	5262	}
4827	5263
4828	5264	void Ungroup(Object3D g)
4829	5265	{
	5266	+ if (Globals.SAVEONMAKE)
	5267	+ Save();
	5268	+ boolean keep = Globals.SAVEONMAKE;
	5269	+ Globals.SAVEONMAKE = false;
4830	5270	if (g instanceof HiddenObject)
4831	5271	{
4832	5272	HiddenObject h = (HiddenObject) g;
..	..	@@ -4843,6 +5283,7 @@
4843	5283	objEditor.makeSomething(g.get(i), false);
4844	5284	}
4845	5285	}
	5286	+ Globals.SAVEONMAKE = keep;
4846	5287	}
4847	5288
4848	5289	void ungroup()
..	..	@@ -5131,7 +5572,28 @@
5131	5572	cButton clearpanelButton;
5132	5573	cButton unselectButton;
5133	5574
	5575	+ cButton restoreCameraButton;
	5576	+
	5577	+ cButton saveButton;
5134	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;
5135	5597
5136	5598	cButton screenfitButton;
5137	5599	cButton screenfitpointButton;
..	..	@@ -5144,14 +5606,6 @@
5144	5606
5145	5607	cButton setsupportButton;
5146	5608
5147		- cButton twoButton;
5148		- cButton sixButton;
5149		- cButton threeButton;
5150		- cButton sevenButton;
5151		- cButton fourButton; // full panel
5152		- cButton oneButton; // full XYZ
5153		- //cButton currentLayout;
5154		-
5155	5609	//
5156	5610	//Composite
5157	5611	Object3D // to do !!
..	..	@@ -5161,11 +5615,11 @@
5161	5615	//JTree jTree;
5162	5616	private MenuItem lookAtItem;
5163	5617	private MenuItem lookFromItem;
5164		- private MenuItem switchItem;
	5618	+ private MenuItem switchViewItem;
5165	5619	private MenuItem cutItem;
5166	5620	private MenuItem undoItem;
5167	5621	private MenuItem redoItem;
5168		- private MenuItem duplicateItem;
	5622	+ private JMenuItem duplicateItem;
5169	5623	private MenuItem cloneItem;
5170	5624	private MenuItem cloneSupportItem;
5171	5625	private MenuItem overwriteGeoItem;
..	..	@@ -5228,6 +5682,10 @@
5228	5682	private MenuItem showleavesItem;
5229	5683	private MenuItem markleavesItem;
5230	5684	private MenuItem unmarkleavesItem;
	5685	+ private MenuItem rewindleavesItem;
	5686	+ private MenuItem unrewindleavesItem;
	5687	+ private MenuItem randomleavesItem;
	5688	+ private MenuItem unrandomleavesItem;
5231	5689
5232	5690	private MenuItem flipVItem;
5233	5691	private MenuItem unflipVItem;
..	..	@@ -5249,7 +5707,7 @@
5249	5707	private MenuItem frontItem;
5250	5708	private MenuItem cameraItem;
5251	5709	private MenuItem compositeItem;
5252		- private MenuItem randomItem;
	5710	+ private MenuItem switchItem;
5253	5711	private MenuItem physicsItem;
5254	5712	private MenuItem frameselectorItem;
5255	5713	private MenuItem scriptNodeItem;
..	..	@@ -5323,5 +5781,5 @@
5323	5781
5324	5782	Menu cameraMenu;
5325	5783	MenuItem editCameraItem;
5326		- MenuItem revertCameraItem;
	5784	+ MenuItem restoreCameraItem;
5327	5785	}