~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,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);
..	..	@@ -524,8 +544,21 @@
524	544	buildToolsMenu(menu);
525	545	}
526	546
	547	+
527	548	void SetupUI2(ObjEditor oe)
528	549	{
	550	+ // June 2019
	551	+ if (oe == null)
	552	+ {
	553	+ //super.SetupUI2(this);
	554	+ //return;
	555	+ }
	556	+
	557	+ if (copy != group)
	558	+ {
	559	+ //super.SetupUI2(this);
	560	+ }
	561	+
529	562	//new Exception().printStackTrace();
530	563
531	564	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -554,27 +587,79 @@
554	587	oe.radioPanel.add(dummyButton);
555	588	oe.buttonGroup.add(dummyButton);
556	589	*/
	590	+ cGridBag copyOptionsPanel = new cGridBag();
	591	+
	592	+ copyOptionsPanel.preferredHeight = 1;
	593	+
557	594	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
558	595
559		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
	596	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	597	+ //minButton.setToolTipText("Minimize window");
	598	+ //minButton.addActionListener(this);
	599	+
	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	+ }
	606	+
	607	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	608	+ fullButton.setToolTipText("Full-screen window");
	609	+ fullButton.addActionListener(this);
	610	+
	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);
	618	+
	619	+ copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	620	+ saveButton.setToolTipText("New version");
	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);
	627	+
	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);
560	647	liveCB.setToolTipText("Enable animation");
561	648	liveCB.addItemListener(this);
562	649
563		- oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	650	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
564	651	oneStepButton.setToolTipText("Animate one step forward");
565	652	oneStepButton.addActionListener(this);
566	653
567		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	654	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
568	655	fastCB.setToolTipText("Fast mode");
569	656	fastCB.addItemListener(this);
570	657
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);
	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);
578	663
579	664	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
580	665	// screenfitpointButton.addActionListener(this);
..	..	@@ -586,65 +671,145 @@
586	671	snapobjectButton.setToolTipText("Snap Object");
587	672	}
588	673
589		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
590		- flashSelectionButton.setToolTipText("Show selection");
591		- flashSelectionButton.addActionListener(this);
	674	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
592	675
593		- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
594		-
595		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	676	+ oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
596	677	twoButton.setToolTipText("Show center view only");
597	678	twoButton.addActionListener(this);
598		- oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	679	+ this.fullscreenLayout = twoButton;
	680	+
	681	+ oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
599	682	fourButton.addActionListener(this);
600	683	fourButton.setToolTipText("Show left panel only");
601		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	684	+ oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
602	685	sixButton.setToolTipText("2-column layout left");
603	686	sixButton.addActionListener(this);
604		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	687	+ oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
605	688	threeButton.setToolTipText("2-column layout right");
606	689	threeButton.addActionListener(this);
607		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	690	+ oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
608	691	sevenButton.setToolTipText("3-column layout");
609	692	sevenButton.addActionListener(this);
610	693	//
611	694
612		- 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);
613	696	rootButton.setToolTipText("Edit selection in new tab");
614	697	rootButton.addActionListener(this);
615	698
616		- 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);
617	700	closeButton.setToolTipText("Close tab");
618	701	closeButton.addActionListener(this);
619	702	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
620	703	//clearButton.addActionListener(this);
621		-
622		- cGridBag commandsPanel = new cGridBag();
	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	+ }
623	736
624		- commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
625		- editButton.setToolTipText("Edit selection");
	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");
626	786	editButton.addActionListener(this);
627	787
628		- commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
629		- uneditButton.setToolTipText("Unedit selection");
	788	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	789	+ uneditButton.setToolTipText("Remove selection controls");
630	790	uneditButton.addActionListener(this);
631	791
632		- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
633		- allParamsButton.setToolTipText("Edit all params");
	792	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	793	+ allParamsButton.setToolTipText("Show all controle");
634	794	allParamsButton.addActionListener(this);
635	795
636		- commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	796	+ editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
637	797	clearPanelButton.setToolTipText("Clear edit panel");
638	798	clearPanelButton.addActionListener(this);
639	799
640		- commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	800	+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
641	801	unselectButton.setToolTipText("Unselect");
642	802	unselectButton.addActionListener(this);
643	803
644		- commandsPanel.preferredHeight = 1;
	804	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	805	+ flashSelectionButton.setToolTipText("Highlight selection");
	806	+ flashSelectionButton.addActionListener(this);
645	807
646		- oe.treePanel.add(commandsPanel);
647		- oe.treePanel.Return();
	808	+ editCommandsPanel.preferredHeight = 1;
	809	+
	810	+ SetPinStates(false);
	811	+// oe.treePanel.add(commandsPanel);
	812	+// oe.treePanel.Return();
648	813
649	814	// oe.aConstraints.gridx += 1;
650	815	// oe.aConstraints.weighty = 0;
..	..	@@ -661,29 +826,17 @@
661	826
662	827	JScrollPane jSP;
663	828	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
664		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	829	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
665	830	ResetModel();
666	831
667	832	oe.treePanel.add(jSPPanel);
668	833	oe.treePanel.Return();
669	834
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	835	oe.treePanel.add(copyOptionsPanel);
686	836	oe.treePanel.Return();
	837	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 10, 0);
	838	+ versionField = (cNumberSlider)sliderPane.getComponent(1);
	839	+ sliderPane.preferredHeight = 1;
687	840
688	841	// mainPanel.setDividerLocation(0.5); //1.0);
689	842	// mainPanel.setResizeWeight(0.5);
..	..	@@ -712,23 +865,43 @@
712	865
713	866	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
714	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	+
715	882	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
716	883	boxCB.setToolTipText("Display bounding boxes");
717	884	boxCB.addItemListener(this);
718	885
719	886	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
720		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	887	+ zoomBoxCB.setToolTipText("Display only for wheel");
721	888	zoomBoxCB.addItemListener(this);
722	889
723	890	if (true) // Globals.ADVANCED)
724	891	{
725		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
726		- supportCB.setToolTipText("Enable rigging");
727		- 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);
728	899
729	900	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
730	901	// localCB.addItemListener(this);
731	902
	903	+ panel.Return();
	904	+
732	905	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
733	906	crowdCB.setToolTipText("Used for crowds");
734	907	crowdCB.addItemListener(this);
..	..	@@ -745,6 +918,8 @@
745	918	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
746	919	// speakerMocapCB.addItemListener(this);
747	920
	921	+ panel.Return();
	922	+
748	923	if (false)
749	924	{
750	925	// handled in scripts
..	..	@@ -759,32 +934,72 @@
759	934	//constraints.gridy += 1;
760	935	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
761	936	smoothfocusCB.addItemListener(this);
	937	+ panel.Return();
762	938	}
763	939
764	940	//constraints.gridx += 1;
765	941	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
766	942	// debugCB.addItemListener(this);
767	943
	944	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	945	+ trackCB.setToolTipText("Enable tracking target");
	946	+ trackCB.addItemListener(this);
	947	+
768	948	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	949	+ oeilCB.setToolTipText("Move camera when tracking");
769	950	oeilCB.addItemListener(this);
770	951
	952	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	953	+ shadowCB.setToolTipText("When live compute shadows");
	954	+ shadowCB.addItemListener(this);
	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();
	970	+ if (Globals.ADVANCED)
	971	+ {
771	972	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
772	973	lookAtCB.setToolTipText("Look-at target");
773	974	lookAtCB.addItemListener(this);
	975	+ }
774	976
775	977	}
776	978
777	979	cGridBag fill = new cGridBag();
778		-
779	980	fill.preferredHeight = 200;
	981	+ cGridBag fill2 = new cGridBag();
	982	+ fill2.preferredHeight = 200;
	983	+ cGridBag fill3 = new cGridBag();
	984	+ fill3.preferredHeight = 200;
780	985
781	986	panel.add(fill);
	987	+ panel.add(fill2);
	988	+ panel.add(fill3);
782	989
783	990	}
784	991
785	992	void EditObject(Object3D obj)
786	993	{
787	994	cRadio radioButton = new cRadio(obj.name);
	995	+
	996	+ // June 2019. Patch to avoid bug with transparency.
	997	+ radioButton.hadMaterial = obj.material != null;
	998	+ if (!radioButton.hadMaterial)
	999	+ {
	1000	+ obj.material = new cMaterial();
	1001	+ }
	1002	+
788	1003	radioButton.SetObject(obj);
789	1004	radioButton.layout = sevenButton;
790	1005	radioButton.SetCamera(cameraView.renderCamera, false);
..	..	@@ -796,6 +1011,8 @@
796	1011
797	1012	void SetupViews(ObjEditor oe)
798	1013	{
	1014	+ theFrame = this;
	1015	+
799	1016	oe.SetupViews();
800	1017
801	1018	System.out.println("SetupViews");
..	..	@@ -804,23 +1021,28 @@
804	1021	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
805	1022	}
806	1023
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;
	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;
818	1037	// JCheckBox speakerMocapCB;
819		- JCheckBox speakerCameraCB;
820		- JCheckBox speakerFocusCB;
821		- JCheckBox debugCB;
822		- JCheckBox oeilCB;
823		- JCheckBox lookAtCB;
	1038	+ cCheckBox speakerCameraCB;
	1039	+ cCheckBox speakerFocusCB;
	1040	+ cCheckBox debugCB;
	1041	+
	1042	+ cCheckBox oeilCB;
	1043	+ cCheckBox shadowCB;
	1044	+ cCheckBox autokeepCB;
	1045	+ cCheckBox lookAtCB;
824	1046
825	1047	// static int COLOR = 1;
826	1048	// static int MATERIAL = 2;
..	..	@@ -828,9 +1050,9 @@
828	1050
829	1051	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
830	1052
831		- JCheckBox colorCB;
832		- JCheckBox materialCB;
833		- JCheckBox textureCB;
	1053	+ cCheckBox colorCB;
	1054	+ cCheckBox materialCB;
	1055	+ cCheckBox textureCB;
834	1056
835	1057	public void itemStateChanged(ItemEvent e)
836	1058	{
..	..	@@ -858,6 +1080,7 @@
858	1080	} else if(e.getSource() == liveCB)
859	1081	{
860	1082	cameraView.ToggleLive();
	1083	+ refreshContents(false);
861	1084	}
862	1085	else if(e.getSource() == supportCB)
863	1086	{
..	..	@@ -922,6 +1145,18 @@
922	1145	{
923	1146	cameraView.ToggleOeil();
924	1147	}
	1148	+ else if(e.getSource() == shadowCB)
	1149	+ {
	1150	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	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	+ }
925	1160	else if(e.getSource() == lookAtCB)
926	1161	{
927	1162	cameraView.ToggleLookAt();
..	..	@@ -938,7 +1173,8 @@
938	1173
939	1174	/**/
940	1175	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
941		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1176	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1177	+ TreePath path = objEditor.jTree.getSelectionPath();
942	1178	if ((path == null) \|\| (path.getPathCount() <= 1)) {
943	1179	// We can't move the root node or an empty selection
944	1180	return;
..	..	@@ -1001,8 +1237,6 @@
1001	1237	}
1002	1238	}
1003	1239
1004		- String string = (String) object;
1005		-
1006	1240	System.out.println("Transfer = " + object + "; drop : " + target);
1007	1241	// if( object instanceof java.io.File[])
1008	1242	// {
..	..	@@ -1010,6 +1244,8 @@
1010	1244	// objEditor.DropFile((java.io.File[]) object, true);
1011	1245	// return;
1012	1246	// }
	1247	+
	1248	+ String string = object.toString();
1013	1249
1014	1250	// File path for Mac and Windows
1015	1251	if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
..	..	@@ -1055,23 +1291,33 @@
1055	1291
1056	1292	assert target == objEditor.jTree;
1057	1293	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1294	+ Object3D destinationLeaf;
1058	1295	try {
1059		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1296	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
1060	1297	} catch (Exception e) {
1061	1298	System.out.println("destinationPath : " + destinationPath);
1062	1299	return;
1063	1300	}
1064	1301
1065		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1302	+ for (int i=group.selection.size(); --i>=0;)
1066	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	+// {
1067	1313	loadClipboard(true);
1068	1314	objEditor.jTree.setSelectionPath(destinationPath);
1069	1315	pasteInto(false, false);
1070		- } else {
1071		- loadClipboard(false);
1072		- objEditor.jTree.setSelectionPath(destinationPath);
1073		- pasteInto(false, false); // true); // ???
1074		- }
	1316	+// } else {
	1317	+// loadClipboard(false);
	1318	+// objEditor.jTree.setSelectionPath(destinationPath);
	1319	+// pasteInto(false, false); // true); // ???
	1320	+// }
1075	1321	}
1076	1322	public void dropActionChanged(DropTargetDragEvent dtde)
1077	1323	// Called if the user has modified the current drop gesture
..	..	@@ -1176,22 +1422,30 @@
1176	1422	{
1177	1423	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1178	1424	//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);
	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	+ {
1191	1443	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1192	1444	kleinItem.addActionListener(this);
1193		- particleItem = menu.add(new MenuItem("Particle system"));
1194		- particleItem.addActionListener(this);
	1445	+ }
	1446	+
	1447	+// particleItem = menu.add(new MenuItem("Particle system"));
	1448	+// particleItem.addActionListener(this);
1195	1449	if (Globals.ADVANCED)
1196	1450	{
1197	1451	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1217,15 +1471,15 @@
1217	1471	}
1218	1472	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1219	1473	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);
	1474	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1475	+// overlayItem.addActionListener(this);
	1476	+// lightItem = menu.add(new MenuItem("Light"));
	1477	+// lightItem.addActionListener(this);
1224	1478	menu.add("-");
1225	1479	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1226	1480	//superLoopItem.addActionListener(this);
1227		- loopItem = menu.add(new MenuItem("Loop"));
1228		- loopItem.addActionListener(this);
	1481	+// loopItem = menu.add(new MenuItem("Loop"));
	1482	+// loopItem.addActionListener(this);
1229	1483	doubleItem = menu.add(new MenuItem("Fork"));
1230	1484	doubleItem.addActionListener(this);
1231	1485	if (Globals.ADVANCED)
..	..	@@ -1241,6 +1495,9 @@
1241	1495	animationItem.addItemListener(this);
1242	1496	animationItem.setState(Globals.ANIMATION);
1243	1497
	1498	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1499	+ archiveItem.addActionListener(this);
	1500	+
1244	1501	menu.add("-");
1245	1502	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1246	1503	parseverticesItem.addActionListener(this);
..	..	@@ -1253,6 +1510,8 @@
1253	1510	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1254	1511	reduce34MorphItem.addActionListener(this);
1255	1512	menu.add("-");
	1513	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	1514	+ memoryItem.addActionListener(this);
1256	1515	menu.add(computeAOItem = new MenuItem("Compute AO"));
1257	1516	computeAOItem.addActionListener(this);
1258	1517
..	..	@@ -1261,11 +1520,9 @@
1261	1520	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1262	1521	mirrorItem.addActionListener(this);
1263	1522	menu.add("-");
1264		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1265		- memoryItem.addActionListener(this);
1266	1523	menu.add(analyzeItem = new MenuItem("Analyze"));
1267	1524	analyzeItem.addActionListener(this);
1268		- menu.add(dumpItem = new MenuItem("Dump"));
	1525	+ menu.add(dumpItem = new MenuItem("Print"));
1269	1526	dumpItem.addActionListener(this);
1270	1527	// menu.add(pathItem = new MenuItem("From-to path"));
1271	1528	// pathItem.addActionListener(this);
..	..	@@ -1406,9 +1663,24 @@
1406	1663	shadow.material = new cMaterial(obj.material);
1407	1664	shadow.material.diffuse = 0.0001f;
1408	1665	shadow.material.specular = 0.0001f;
	1666	+ //shadow.projectedVertices[1].x = 300;
1409	1667
1410	1668	makeSomething(shadow);
1411	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	+ }
1412	1684
1413	1685	/**
1414	1686	* applyExample
..	..	@@ -1653,7 +1925,7 @@
1653	1925	{
1654	1926	ScreenFit();
1655	1927	} else
1656		- if (source == switchItem)
	1928	+ if (source == switchViewItem)
1657	1929	{
1658	1930	cVector v1 = new cVector();
1659	1931	cVector v2 = new cVector();
..	..	@@ -1662,11 +1934,11 @@
1662	1934	objEditor.cameraView.renderCamera.setAim(v2, v1);
1663	1935	objEditor.cameraView.repaint();
1664	1936	} else
1665		- if (source == rectoidItem)
	1937	+ if (source == rectoidItem \|\| source == boxButton)
1666	1938	{
1667	1939	makeSomething(new Box());
1668	1940	} else
1669		- if (source == particleItem)
	1941	+ if (source == particleItem \|\| source == particlesButton)
1670	1942	{
1671	1943	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1672	1944	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1745,27 +2017,27 @@
1745	2017
1746	2018	makeSomething(obj);
1747	2019	} else
1748		- if (source == gridItem)
	2020	+ if (source == gridItem \|\| source == gridButton)
1749	2021	{
1750	2022	makeSomething(new Grid());
1751	2023	} else
1752		- if (source == ellipsoidItem)
	2024	+ if (source == ellipsoidItem \|\| source == sphereButton)
1753	2025	{
1754	2026	makeSomething(new Sphere());
1755	2027	} else
1756		- if (source == coneItem)
	2028	+ if (source == coneItem \|\| source == coneButton)
1757	2029	{
1758	2030	makeSomething(new Cone());
1759	2031	} else
1760		- if (source == torusItem)
	2032	+ if (source == torusItem \|\| source == torusButton)
1761	2033	{
1762	2034	makeSomething(new Torus());
1763	2035	} else
1764		- if (source == superItem)
	2036	+ if (source == superItem \|\| source == superButton)
1765	2037	{
1766	2038	makeSomething(new Superellipsoid());
1767	2039	} else
1768		- if (source == kleinItem)
	2040	+ if (source == kleinItem \|\| source == kleinButton)
1769	2041	{
1770	2042	makeSomething(new Klein());
1771	2043	} else
..	..	@@ -1785,7 +2057,7 @@
1785	2057	{
1786	2058	makeSomething(new BezierSurface());
1787	2059	} else
1788		- if (source == overlayItem)
	2060	+ if (source == overlayItem \|\| source == overlayButton)
1789	2061	{
1790	2062	/*
1791	2063	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1833,7 +2105,7 @@
1833	2105	s.setup();
1834	2106	makeSomething(s);
1835	2107	} else
1836		- if (source == lightItem)
	2108	+ if (source == lightItem \|\| source == lightButton)
1837	2109	{
1838	2110	makeSomething(new Light());
1839	2111	} else
..	..	@@ -1883,30 +2155,30 @@
1883	2155
1884	2156	group(g);
1885	2157	} else
1886		- if (source == loopItem)
	2158	+ if (source == loopItem \|\| source == loopButton)
1887	2159	{
1888	2160	Composite csg = new GroupLeaf();
1889	2161	csg.count = 5;
1890	2162	group(csg);
1891		- Composite child = new cGroup();
	2163	+ Composite child = new cGroup("Branch");
1892	2164	csg.addChild(child);
1893	2165	child.addChild(csg);
1894	2166	} else
1895	2167	if (source == doubleItem)
1896	2168	{
1897		- Composite csg = new GroupLeaf();
	2169	+ Composite csg = new GroupLeaf("Fork");
1898	2170	csg.count = 5;
1899	2171	group(csg);
1900		- Composite child = new cGroup();
	2172	+ Composite child = new cGroup("Branch A");
1901	2173	csg.addChild(child);
1902	2174	child.addChild(csg);
1903		- child = new cGroup();
	2175	+ child = new cGroup("Branch B");
1904	2176	csg.addChild(child);
1905	2177	child.addChild(csg);
1906	2178	} else
1907	2179	if (source == tripleItem)
1908	2180	{
1909		- Composite csg = new GroupLeaf();
	2181	+ Composite csg = new GroupLeaf("Trident");
1910	2182	csg.count = 4;
1911	2183	group(csg);
1912	2184	Composite child = new cGroup();
..	..	@@ -1956,6 +2228,46 @@
1956	2228	{
1957	2229	DumpObject();
1958	2230	} else
	2231	+ if (source == minButton)
	2232	+ {
	2233	+ Minimize();
	2234	+ } else
	2235	+ if (source == maxButton)
	2236	+ {
	2237	+ Maximize();
	2238	+ } else
	2239	+ if (source == fullButton)
	2240	+ {
	2241	+ ToggleFullScreen();
	2242	+ } else
	2243	+ if (source == undoButton)
	2244	+ {
	2245	+ // Go to previous version
	2246	+ //if (!Undo())
	2247	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	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();
	2259	+ } else
	2260	+ if (source == redoButton)
	2261	+ {
	2262	+ // Go to next version
	2263	+ Redo();
	2264	+ } else
	2265	+ if (source == saveButton)
	2266	+ {
	2267	+ // Save a new version
	2268	+ if (!Save(true))
	2269	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2270	+ } else
1959	2271	if (source == oneStepButton)
1960	2272	{
1961	2273	Globals.ONESTEP = true;
..	..	@@ -1963,17 +2275,14 @@
1963	2275	} else
1964	2276	if (source == screenfitButton)
1965	2277	{
1966		- //Reload(lastConverter, lastFilename, true);
1967	2278	ScreenFit();
1968	2279	} else
1969	2280	if (source == screenfitpointButton)
1970	2281	{
1971		- //Reload(lastConverter, lastFilename, true);
1972	2282	ScreenFitPoint();
1973	2283	} else
1974	2284	if (source == snapobjectButton)
1975	2285	{
1976		- //Reload(lastConverter, lastFilename, true);
1977	2286	SnapObject();
1978	2287	} else
1979	2288	// if (event.getSource() == recompileButton)
..	..	@@ -2349,9 +2658,9 @@
2349	2658	{
2350	2659	ClearSelection(true);
2351	2660	} else
2352		- if (source == grabItem)
	2661	+ if (source == grabItem \|\| source == groupButton)
2353	2662	{
2354		- group(new cGroup(), true);
	2663	+ group(new cGroup(), false); // true);
2355	2664	} else
2356	2665	if (source == hideItem)
2357	2666	{
..	..	@@ -2369,11 +2678,11 @@
2369	2678	{
2370	2679	makeSomething(new Camera());
2371	2680	} else
2372		- if (source == compositeItem)
	2681	+ if (source == compositeItem \|\| source == compositeButton)
2373	2682	{
2374	2683	group(new Composite());
2375	2684	} else
2376		- if (source == randomItem)
	2685	+ if (source == switchItem \|\| source == switchButton)
2377	2686	{
2378	2687	RandomNode random = new RandomNode();
2379	2688	group(random);
..	..	@@ -2475,7 +2784,7 @@
2475	2784	{
2476	2785	group(new cLinker());
2477	2786	} else
2478		- if (source == textureItem)
	2787	+ if (source == textureItem \|\| source == textureButton)
2479	2788	{
2480	2789	group(new TextureNode());
2481	2790	} else
..	..	@@ -2495,17 +2804,30 @@
2495	2804	{
2496	2805	CastShadow(2);
2497	2806	} else
2498		- if (source == ungroupItem)
	2807	+ if (source == ungroupItem \|\| source == ungroupButton)
2499	2808	{
2500		- //ungroup();
	2809	+ boolean hasRoot = false;
	2810	+
2501	2811	for (int i=0; i<group.selection.size(); i++)
2502	2812	{
2503		- Ungroup(group.selection.get(i));
	2813	+ if (group.selection.get(i) == group)
	2814	+ {
	2815	+ hasRoot = true;
	2816	+ break;
	2817	+ }
2504	2818	}
2505	2819
2506		- ClearSelection(false);
2507		-
2508		- 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	+ }
2509	2831	} else
2510	2832	if (source == genUVItem)
2511	2833	{
..	..	@@ -2517,7 +2839,7 @@
2517	2839	} else
2518	2840	if (source == genNormalsMESHItem)
2519	2841	{
2520		- GenNormals(true); // TODO
	2842	+ GenNormalsMESH();
2521	2843	} else
2522	2844	if (source == genNormalsORGANItem)
2523	2845	{
..	..	@@ -2582,6 +2904,22 @@
2582	2904	if (source == unmarkleavesItem)
2583	2905	{
2584	2906	MarkLeaves(false);
	2907	+ } else
	2908	+ if (source == rewindleavesItem)
	2909	+ {
	2910	+ RewindLeaves(true);
	2911	+ } else
	2912	+ if (source == unrewindleavesItem)
	2913	+ {
	2914	+ RewindLeaves(false);
	2915	+ } else
	2916	+ if (source == randomleavesItem)
	2917	+ {
	2918	+ RandomLeaves(true);
	2919	+ } else
	2920	+ if (source == unrandomleavesItem)
	2921	+ {
	2922	+ RandomLeaves(false);
2585	2923	} else
2586	2924	if (source == flipVItem)
2587	2925	{
..	..	@@ -2817,6 +3155,10 @@
2817	3155	if (source == twoButton)
2818	3156	{
2819	3157	radio.layout = twoButton;
	3158	+
	3159	+ if (CameraPane.FULLSCREEN)
	3160	+ fullscreenLayout = radio.layout;
	3161	+
2820	3162	// bug
2821	3163	//gridPanel.setDividerLocation(1.0);
2822	3164	//bigPanel.setDividerLocation(0.0);
..	..	@@ -2849,10 +3191,31 @@
2849	3191	bigThree.ClearUI();
2850	3192	bigThree.add(centralPanel);
2851	3193	bigThree.FlushUI();
	3194	+
	3195	+ cameraView.requestFocusInWindow();
	3196	+
	3197	+// refreshContents(true);
	3198	+//
	3199	+// try
	3200	+// {
	3201	+// java.awt.Robot bot = new java.awt.Robot();
	3202	+// int mask = InputEvent.BUTTON1_MASK;
	3203	+// bot.mouseMove(100, 100);
	3204	+// bot.mousePress(mask);
	3205	+// bot.mouseRelease(mask);
	3206	+// }
	3207	+// catch (Exception e)
	3208	+// {
	3209	+//
	3210	+// }
	3211	+
2852	3212	} else
2853	3213	if (source == threeButton)
2854	3214	{
2855	3215	radio.layout = threeButton;
	3216	+
	3217	+ if (CameraPane.FULLSCREEN)
	3218	+ fullscreenLayout = radio.layout;
2856	3219
2857	3220	// bigThree.remove(scenePanel);
2858	3221	// bigThree.remove(centralPanel);
..	..	@@ -2885,10 +3248,15 @@
2885	3248	bigThree.add(centralPanel);
2886	3249	bigThree.add(XYZPanel);
2887	3250	bigThree.FlushUI();
	3251	+
	3252	+ cameraView.requestFocusInWindow();
2888	3253	} else
2889	3254	if (source == fourButton)
2890	3255	{
2891	3256	radio.layout = fourButton;
	3257	+
	3258	+ if (CameraPane.FULLSCREEN)
	3259	+ fullscreenLayout = radio.layout;
2892	3260
2893	3261	// bigThree.remove(scenePanel);
2894	3262	// bigThree.remove(centralPanel);
..	..	@@ -2920,10 +3288,15 @@
2920	3288	bigThree.ClearUI();
2921	3289	bigThree.add(scenePanel);
2922	3290	bigThree.FlushUI();
	3291	+
	3292	+ cameraView.requestFocusInWindow();
2923	3293	} else
2924	3294	if (source == sixButton)
2925	3295	{
2926	3296	radio.layout = sixButton;
	3297	+
	3298	+ if (CameraPane.FULLSCREEN)
	3299	+ fullscreenLayout = radio.layout;
2927	3300
2928	3301	// bigThree.remove(scenePanel);
2929	3302	// bigThree.remove(centralPanel);
..	..	@@ -2956,10 +3329,15 @@
2956	3329	bigThree.add(scenePanel);
2957	3330	bigThree.add(centralPanel);
2958	3331	bigThree.FlushUI();
	3332	+
	3333	+ cameraView.requestFocusInWindow();
2959	3334	} else
2960	3335	if (source == sevenButton)
2961	3336	{
2962	3337	radio.layout = sevenButton;
	3338	+
	3339	+ if (CameraPane.FULLSCREEN)
	3340	+ fullscreenLayout = radio.layout;
2963	3341
2964	3342	// bigThree.remove(scenePanel);
2965	3343	// bigThree.remove(centralPanel);
..	..	@@ -2993,6 +3371,8 @@
2993	3371	bigThree.add(centralPanel);
2994	3372	bigThree.add(XYZPanel);
2995	3373	bigThree.FlushUI();
	3374	+
	3375	+ cameraView.requestFocusInWindow();
2996	3376	} else
2997	3377	if (source == rootButton)
2998	3378	{
..	..	@@ -3004,6 +3384,7 @@
3004	3384	EditObject(obj);
3005	3385	}
3006	3386
	3387	+ cameraView.requestFocusInWindow();
3007	3388	refreshContents(true);
3008	3389	} else
3009	3390	if (source == closeButton)
..	..	@@ -3013,22 +3394,37 @@
3013	3394	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3014	3395	{
3015	3396	ab = (cRadio)e.nextElement();
3016		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3397	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
3017	3398	{
	3399	+ // Patch to avoid bug with transparency.
	3400	+ if (!ab.hadMaterial)
	3401	+ {
	3402	+ ab.object.material = null;
	3403	+ }
	3404	+
3018	3405	buttonGroup.remove(ab);
3019	3406	radioPanel.remove(ab);
3020	3407
3021		- ab.GetObject().editWindow = null;
	3408	+ //ab.GetObject().editWindow = null;
	3409	+ ab.GetObject().manipWindow = null;
3022	3410	// ab.GetObject().objectUI = null; // ?????????
3023	3411
3024	3412	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
3025	3413	break;
3026	3414	}
3027	3415	}
	3416	+
	3417	+ cameraView.requestFocusInWindow();
3028	3418	refreshContents(true);
3029	3419	} else
3030	3420	if (source == editItem \|\| source == editButton)
3031	3421	{
	3422	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3423	+ {
	3424	+ Object3D child = (Object3D)e.nextElement();
	3425	+ child.pinned = true;
	3426	+ }
	3427	+
3032	3428	EditSelection(false);
3033	3429	} else
3034	3430	if (source == uneditButton)
..	..	@@ -3038,10 +3434,11 @@
3038	3434	Object3D child = (Object3D)e.nextElement();
3039	3435	if(child.editWindow != null)
3040	3436	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3437	+ child.pinned = false;
3041	3438	child.CloseUI();
3042	3439	listUI.remove(child);
3043	3440
3044		- child.editWindow = null; // ???????????
	3441	+ //child.editWindow = null; // ???????????
3045	3442	}
3046	3443	objEditor.ctrlPanel.FlushUI();
3047	3444	//objEditor.jTree.clearSelection();
..	..	@@ -3054,6 +3451,7 @@
3054	3451	//copy.ClearUI();
3055	3452	for (Object3D obj : listUI)
3056	3453	{
	3454	+ obj.pinned = false;
3057	3455	obj.CloseUI();
3058	3456	}
3059	3457	listUI.clear();
..	..	@@ -3063,7 +3461,7 @@
3063	3461	{
3064	3462	assert(copy == group);
3065	3463
3066		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3464	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3067	3465
3068	3466	for (Object3D obj : listUI)
3069	3467	{
..	..	@@ -3112,6 +3510,9 @@
3112	3510	}
3113	3511
3114	3512	copy = group;
	3513	+
	3514	+ SetUndoStates();
	3515	+
3115	3516	//Globals.theRenderer.object = group;
3116	3517	if(!useclient)
3117	3518	{
..	..	@@ -3128,7 +3529,9 @@
3128	3529	sideView.object = group;
3129	3530	}
3130	3531
3131		-// fix "+" issue group.editWindow = this;
	3532	+// fix "+" issue
	3533	+ //group.editWindow = this;
	3534	+ group.manipWindow = this;
3132	3535
3133	3536	/*
3134	3537	currentLayout = radio.layout;
..	..	@@ -3136,18 +3539,25 @@
3136	3539	currentLayout = sevenButton;
3137	3540	*/
3138	3541	radio.layout.doClick();
	3542	+
	3543	+ ClearUnpinned();
	3544	+ SetPinStates(group.selection.size() > 0);
	3545	+ if (group.selection.size() == 1)
	3546	+ EditSelection(false);
3139	3547	keepparent = group.parent;
3140	3548	// PARENT = NULL or not???
3141	3549	//group.parent = null; // ROOT
3142	3550	//group.attributes = -1;
3143	3551	ResetModel();
	3552	+
	3553	+ cameraView.requestFocusInWindow();
3144	3554	refreshContents(true);
3145	3555	} else if (event.getSource() == editCameraItem)
3146	3556	{
3147	3557	cameraView.ProtectCamera();
3148	3558	cameraView.repaint();
3149	3559	return;
3150		- } else if (event.getSource() == revertCameraItem)
	3560	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3151	3561	{
3152	3562	cameraView.RevertCamera();
3153	3563	cameraView.repaint();
..	..	@@ -3164,7 +3574,6 @@
3164	3574	}
3165	3575
3166	3576	boolean useclient = false;
3167		- cRadio radio;
3168	3577
3169	3578	void ToggleRoot()
3170	3579	{
..	..	@@ -3403,7 +3812,8 @@
3403	3812
3404	3813	int size = obj.MemorySize();
3405	3814
3406		- System.err.println((size/1024) + " KB is the size of " + obj);
	3815	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	3816	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3407	3817	}
3408	3818	}
3409	3819	catch (Exception e)
..	..	@@ -3484,6 +3894,13 @@
3484	3894	void GenNormals(boolean crease)
3485	3895	{
3486	3896	group.GenNormalsS(crease);
	3897	+
	3898	+ refreshContents();
	3899	+ }
	3900	+
	3901	+ void GenNormalsMESH()
	3902	+ {
	3903	+ group.GenNormalsMeshS();
3487	3904
3488	3905	refreshContents();
3489	3906	}
..	..	@@ -4111,6 +4528,18 @@
4111	4528	refreshContents();
4112	4529	}
4113	4530
	4531	+ void RewindLeaves(boolean hide)
	4532	+ {
	4533	+ group.selection.RewindLeaves(hide);
	4534	+ refreshContents();
	4535	+ }
	4536	+
	4537	+ void RandomLeaves(boolean hide)
	4538	+ {
	4539	+ group.selection.RandomLeaves(hide);
	4540	+ refreshContents();
	4541	+ }
	4542	+
4114	4543	void SetTexRes(int tr)
4115	4544	{
4116	4545	group.selection.SetTexRes(tr);
..	..	@@ -4182,10 +4611,6 @@
4182	4611	// }
4183	4612	// }
4184	4613
4185		- static boolean allparams = true;
4186		-
4187		- static Vector<Object3D> listUI = new Vector<Object3D>();
4188		-
4189	4614	void EditSelection(boolean newWindow)
4190	4615	{
4191	4616	// aConstraints.gridy = 0;
..	..	@@ -4193,7 +4618,7 @@
4193	4618	{
4194	4619	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4195	4620	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4196		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4621	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4197	4622
4198	4623	Object3D elem = (Object3D)group.selection.elementAt(i);
4199	4624	if(elem != group \|\| !newWindow)
..	..	@@ -4278,7 +4703,8 @@
4278	4703	//new Exception().printStackTrace();
4279	4704
4280	4705	freezemodel = true;
4281		-
	4706	+ ClearUnpinned();
	4707	+
4282	4708	/**/
4283	4709	//switch (event.id)
4284	4710	{
..	..	@@ -4286,7 +4712,6 @@
4286	4712	//case 702: // Event.LIST_DESELECT
4287	4713	group.deselectAll();
4288	4714	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4289		- objEditor.ClearInfo(); // .GetMaterial());
4290	4715	if (tps != null)
4291	4716	{
4292	4717	for (int i=0; i < tps.length; i++)
..	..	@@ -4295,10 +4720,8 @@
4295	4720
4296	4721	//if (child.parent != null)
4297	4722	//child.parent.addSelectee(child);
	4723	+ objEditor.SetMaterial(child);
4298	4724	group.addSelectee(child);
4299		- objEditor.SetMaterial(child); // .GetMaterial());
4300		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4301		- System.err.println("info : " + child.GetPath());
4302	4725	}
4303	4726	}
4304	4727	// else
..	..	@@ -4308,17 +4731,13 @@
4308	4731	// System.err.println("info : " + group.GetPath());
4309	4732	// }
4310	4733
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))
	4734	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4316	4735	CameraPane.flash = true;
4317	4736
4318		- if (tps != null && tps.length > 0 && object instanceof Camera)
	4737	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4319	4738	// a camera
4320	4739	{
4321		- if (object != Globals.theRenderer.LightCamera())
	4740	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
4322	4741	{
4323	4742	CameraPane.camerachangeframe = 0; // don't refuse it
4324	4743	Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
..	..	@@ -4327,6 +4746,13 @@
4327	4746	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4328	4747	}
4329	4748
	4749	+ if (tps != null && tps.length == 1)
	4750	+ {
	4751	+ EditSelection(false);
	4752	+ }
	4753	+
	4754	+ SetPinStates(tps != null && tps.length > 0);
	4755	+
4330	4756	refreshContents();
4331	4757	//return true;
4332	4758	}
..	..	@@ -4335,6 +4761,35 @@
4335	4761
4336	4762	freezemodel = false;
4337	4763	}
	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	+
	4773	+ void refreshContents(boolean cp)
	4774	+ {
	4775	+ if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
	4776	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
	4777	+ {
	4778	+ objEditor.ClearInfo(); // .GetMaterial());
	4779	+
	4780	+ for (int i=0; i < group.selection.Size(); i++)
	4781	+ {
	4782	+ Object3D child = (Object3D) group.selection.get(i);
	4783	+
	4784	+ objEditor.AddInfo(child, this, true);
	4785	+ System.err.println("info : " + child.GetPath());
	4786	+ }
	4787	+
	4788	+ objEditor.SetText(); // jan 2014
	4789	+ }
	4790	+
	4791	+ super.refreshContents(cp);
	4792	+ }
4338	4793
4339	4794	void linkSomething(Object3D thing)
4340	4795	{
..	..	@@ -4406,6 +4861,7 @@
4406	4861	{
4407	4862	if (group.selection.isEmpty())
4408	4863	return;
	4864	+
4409	4865	Grafreed.clipboardIsTempGroup = false;
4410	4866	Composite tGroup = null;
4411	4867	if (group.selection.size() > 0) // 1)
..	..	@@ -4416,6 +4872,8 @@
4416	4872
4417	4873	if (cut)
4418	4874	{
	4875	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	4876	+// Save();
4419	4877	//int indices[] = jList.getSelectedIndices();
4420	4878	//for (int i = indices.length - 1; i >= 0; i--)
4421	4879	//jList.remove(indices[i]);
..	..	@@ -4505,8 +4963,10 @@
4505	4963	}
4506	4964
4507	4965	}
	4966	+
4508	4967	if (Grafreed.clipboardIsTempGroup)
4509	4968	Grafreed.clipboard = tGroup;
	4969	+
4510	4970	if (cut)
4511	4971	{
4512	4972	ResetModel();
..	..	@@ -4516,6 +4976,10 @@
4516	4976
4517	4977	void paste(boolean expand)
4518	4978	{
	4979	+ if (Globals.REPLACEONMAKE)
	4980	+ Save();
	4981	+ boolean keep = Globals.REPLACEONMAKE;
	4982	+ Globals.REPLACEONMAKE = false;
4519	4983	// if (GrafreeD.clipboard == null)
4520	4984	// return;
4521	4985	boolean first = true;
..	..	@@ -4575,6 +5039,7 @@
4575	5039	Grafreed.clipboard.get(0).parent = keepparent;
4576	5040	}
4577	5041
	5042	+ Globals.REPLACEONMAKE = keep;
4578	5043	ResetModel();
4579	5044	refreshContents();
4580	5045	}
..	..	@@ -4710,6 +5175,10 @@
4710	5175
4711	5176	void group(Object3D csg, boolean grab)
4712	5177	{
	5178	+ if (Globals.REPLACEONMAKE)
	5179	+ Save();
	5180	+ boolean keep = Globals.REPLACEONMAKE;
	5181	+ Globals.REPLACEONMAKE = false;
4713	5182	if (//false) // why??
4714	5183	!group.selection.isEmpty())
4715	5184	{
..	..	@@ -4823,10 +5292,15 @@
4823	5292	//node.add(csg);
4824	5293	//makeSomething(node);
4825	5294	makeSomething(csg);
	5295	+ Globals.REPLACEONMAKE = keep;
4826	5296	}
4827	5297
4828	5298	void Ungroup(Object3D g)
4829	5299	{
	5300	+ if (Globals.REPLACEONMAKE)
	5301	+ Save();
	5302	+ boolean keep = Globals.REPLACEONMAKE;
	5303	+ Globals.REPLACEONMAKE = false;
4830	5304	if (g instanceof HiddenObject)
4831	5305	{
4832	5306	HiddenObject h = (HiddenObject) g;
..	..	@@ -4843,6 +5317,7 @@
4843	5317	objEditor.makeSomething(g.get(i), false);
4844	5318	}
4845	5319	}
	5320	+ Globals.REPLACEONMAKE = keep;
4846	5321	}
4847	5322
4848	5323	void ungroup()
..	..	@@ -5131,7 +5606,28 @@
5131	5606	cButton clearpanelButton;
5132	5607	cButton unselectButton;
5133	5608
	5609	+ cButton restoreCameraButton;
	5610	+
	5611	+ cButton saveButton;
5134	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;
5135	5631
5136	5632	cButton screenfitButton;
5137	5633	cButton screenfitpointButton;
..	..	@@ -5144,14 +5640,6 @@
5144	5640
5145	5641	cButton setsupportButton;
5146	5642
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	5643	//
5156	5644	//Composite
5157	5645	Object3D // to do !!
..	..	@@ -5161,11 +5649,11 @@
5161	5649	//JTree jTree;
5162	5650	private MenuItem lookAtItem;
5163	5651	private MenuItem lookFromItem;
5164		- private MenuItem switchItem;
	5652	+ private MenuItem switchViewItem;
5165	5653	private MenuItem cutItem;
5166	5654	private MenuItem undoItem;
5167	5655	private MenuItem redoItem;
5168		- private MenuItem duplicateItem;
	5656	+ private JMenuItem duplicateItem;
5169	5657	private MenuItem cloneItem;
5170	5658	private MenuItem cloneSupportItem;
5171	5659	private MenuItem overwriteGeoItem;
..	..	@@ -5228,6 +5716,10 @@
5228	5716	private MenuItem showleavesItem;
5229	5717	private MenuItem markleavesItem;
5230	5718	private MenuItem unmarkleavesItem;
	5719	+ private MenuItem rewindleavesItem;
	5720	+ private MenuItem unrewindleavesItem;
	5721	+ private MenuItem randomleavesItem;
	5722	+ private MenuItem unrandomleavesItem;
5231	5723
5232	5724	private MenuItem flipVItem;
5233	5725	private MenuItem unflipVItem;
..	..	@@ -5249,7 +5741,7 @@
5249	5741	private MenuItem frontItem;
5250	5742	private MenuItem cameraItem;
5251	5743	private MenuItem compositeItem;
5252		- private MenuItem randomItem;
	5744	+ private MenuItem switchItem;
5253	5745	private MenuItem physicsItem;
5254	5746	private MenuItem frameselectorItem;
5255	5747	private MenuItem scriptNodeItem;
..	..	@@ -5323,5 +5815,5 @@
5323	5815
5324	5816	Menu cameraMenu;
5325	5817	MenuItem editCameraItem;
5326		- MenuItem revertCameraItem;
	5818	+ MenuItem restoreCameraItem;
5327	5819	}