~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -60,6 +60,12 @@
60	60	this.copy = this.group = group;
61	61	//selectees = this.group.selectees;
62	62
	63	+ if (copy.versions == null)
	64	+ {
	65	+ copy.versions = new byte[100][];
	66	+ copy.versionindex = -1;
	67	+ }
	68	+
63	69	if(ui)
64	70	SetupUI(objEditor);
65	71	}
..	..	@@ -74,6 +80,12 @@
74	80	this.copy = this.group = copy;
75	81	//selectees = this.group.selectees;
76	82
	83	+ if (copy.versions == null)
	84	+ {
	85	+ copy.versions = new byte[100][];
	86	+ copy.versionindex = -1;
	87	+ }
	88	+
77	89	SetupMenu2(this); //objEditor);
78	90	SetupUI2(objEditor);
79	91	objEditor.SetupUI(true);
..	..	@@ -84,6 +96,10 @@
84	96
85	97	void CloneSelection(boolean supports)
86	98	{
	99	+ if (Globals.REPLACEONMAKE)
	100	+ Save();
	101	+ boolean keep = Globals.REPLACEONMAKE;
	102	+ Globals.REPLACEONMAKE = false;
87	103	// Object3D keep = GrafreeD.clipboard;
88	104	//Object3D obj;
89	105	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -94,6 +110,7 @@
94	110
95	111	makeSomething(clone, i==group.selection.size()-1);
96	112	}
	113	+ Globals.REPLACEONMAKE = keep;
97	114	}
98	115
99	116	void CloneClipboard(boolean supports)
..	..	@@ -150,16 +167,19 @@
150	167
151	168	void SetupMenu2(GroupEditor oe)
152	169	{
	170	+ oe.jTree = new cTree();
	171	+
153	172	Menu menu;
154	173	oe.menuBar.add(menu = new Menu("Edit"));
155	174	//editItem = menu.add(new MenuItem("Edit"));
156	175	//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"));
	176	+
	177	+// undoItem = menu.add(new MenuItem("Undo"));
	178	+// undoItem.addActionListener(this);
	179	+// redoItem = menu.add(new MenuItem("Redo"));
	180	+// redoItem.addActionListener(this);
	181	+// menu.add("-");
	182	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
163	183	duplicateItem.addActionListener(this);
164	184	cloneItem = menu.add(new MenuItem("Clone"));
165	185	cloneItem.addActionListener(this);
..	..	@@ -175,7 +195,6 @@
175	195	copyItem.addActionListener(this);
176	196	pasteItem = menu.add(new MenuItem("Paste"));
177	197	pasteItem.addActionListener(this);
178		- menu.add("-");
179	198
180	199	menu.add("-");
181	200	pasteIntoItem = menu.add(new MenuItem("Paste into"));
..	..	@@ -202,23 +221,23 @@
202	221	//zBufferItem.addActionListener(this);
203	222	//cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
204	223	//normalLensItem.addActionListener(this);
205		- cameraMenu.add(revertCameraItem = new MenuItem("Restore Camera"));
206		- revertCameraItem.addActionListener(this);
	224	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	225	+ restoreCameraItem.addActionListener(this);
207	226
208		- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
209		- toggleFullScreenItem.addItemListener(this);
210		- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
211		- cameraMenu.add("-");
	227	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	228	+// toggleFullScreenItem.addItemListener(this);
	229	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	230	+// cameraMenu.add("-");
	231	+//
	232	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	233	+// toggleTextureItem.addItemListener(this);
	234	+// toggleTextureItem.setState(CameraPane.textureon);
	235	+//
	236	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	237	+// toggleSwitchItem.addItemListener(this);
	238	+// toggleSwitchItem.setState(CameraPane.SWITCH);
212	239
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"));
	240	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
222	241	toggleHandleItem.addItemListener(this);
223	242	toggleHandleItem.setState(CameraPane.HANDLES);
224	243
..	..	@@ -245,7 +264,7 @@
245	264
246	265	cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
247	266	toggleDebugItem.addItemListener(this);
248		- toggleDebugItem.setState(CameraPane.DEBUG);
	267	+ toggleDebugItem.setState(Globals.DEBUG);
249	268
250	269	cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
251	270	toggleFrustumItem.addItemListener(this);
..	..	@@ -266,14 +285,14 @@
266	285	// animationItem.addItemListener(this);
267	286	// animationItem.setState(CameraPane.ANIMATION);
268	287	cameraMenu.add("-");
269		- cameraMenu.add(editCameraItem = new MenuItem("Save Camera"));
	288	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
270	289	editCameraItem.addActionListener(this);
271	290
272	291	if (Globals.ADVANCED)
273	292	{
274	293	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
275	294	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
276		- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
	295	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
277	296	editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
278	297	oe.cameraMenu.add("-");
279	298	openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
..	..	@@ -281,7 +300,7 @@
281	300	editLeafItem.addActionListener(this);
282	301	lookAtItem.addActionListener(this);
283	302	//lookFromItem.addActinoListener(this);
284		- //switchItem.addActionListener(this);
	303	+ //switchViewItem.addActionListener(this);
285	304	}
286	305
287	306	oe.menuBar.add(menu = new Menu("Setting"));
..	..	@@ -326,21 +345,29 @@
326	345	}
327	346
328	347	oe.menuBar.add(menu = new Menu("Group"));
329		- grabItem = menu.add(new MenuItem("Grab"));
330		- grabItem.addActionListener(this);
	348	+// grabItem = menu.add(new MenuItem("Grab"));
	349	+// grabItem.addActionListener(this);
331	350	backItem = menu.add(new MenuItem("Back"));
332	351	backItem.addActionListener(this);
333	352	frontItem = menu.add(new MenuItem("Front"));
334	353	frontItem.addActionListener(this);
335		- compositeItem = menu.add(new MenuItem("Composite"));
336		- compositeItem.addActionListener(this);
	354	+// compositeItem = menu.add(new MenuItem("Composite"));
	355	+// compositeItem.addActionListener(this);
	356	+
	357	+ if (Globals.ADVANCED)
	358	+ {
337	359	hideItem = menu.add(new MenuItem("Hidden Group"));
338	360	hideItem.addActionListener(this);
	361	+ }
339	362	ungroupItem = menu.add(new MenuItem("Ungroup"));
340	363	ungroupItem.addActionListener(this);
341		- menu.add("-");
342		- randomItem = menu.add(new MenuItem("Switch node"));
343		- randomItem.addActionListener(this);
	364	+
	365	+// menu.add("-");
	366	+//
	367	+// switchItem = menu.add(new MenuItem("Switch node"));
	368	+// switchItem.addActionListener(this);
	369	+ if (Globals.ADVANCED)
	370	+ {
344	371	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
345	372	switchGeoItem.addActionListener(this);
346	373	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
..	..	@@ -348,8 +375,6 @@
348	375	morphItem = menu.add(new MenuItem("Morph Group"));
349	376	morphItem.addActionListener(this);
350	377
351		- if (Globals.ADVANCED)
352		- {
353	378	menu.add("-");
354	379	physicsItem = menu.add(new MenuItem("Physics"));
355	380	physicsItem.addActionListener(this);
..	..	@@ -357,30 +382,29 @@
357	382	frameselectorItem.addActionListener(this);
358	383	scriptNodeItem = menu.add(new MenuItem("Script Node"));
359	384	scriptNodeItem.addActionListener(this);
360		- cameraItem = menu.add(new MenuItem("Camera"));
361		- cameraItem.addActionListener(this);
362	385	}
363	386
364	387	oe.menuBar.add(menu = new Menu("Object"));
365		- textureItem = menu.add(new MenuItem("Texture"));
366		- textureItem.addActionListener(this);
	388	+// textureItem = menu.add(new MenuItem("Texture"));
	389	+// textureItem.addActionListener(this);
367	390	billboardItem = menu.add(new MenuItem("Billboard"));
368	391	billboardItem.addActionListener(this);
369	392	csgItem = menu.add(new MenuItem("CSG"));
370	393	csgItem.addActionListener(this);
371		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	394	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
372	395	shadowXItem.addActionListener(this);
373		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	396	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
374	397	shadowYItem.addActionListener(this);
375		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	398	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
376	399	shadowZItem.addActionListener(this);
	400	+ attributeItem = menu.add(new MenuItem("Attribute"));
	401	+ attributeItem.addActionListener(this);
	402	+
377	403	if (Globals.ADVANCED)
378	404	{
379	405	menu.add("-");
380	406	linkerItem = menu.add(new MenuItem("Linker"));
381	407	linkerItem.addActionListener(this);
382		- attributeItem = menu.add(new MenuItem("Attribute"));
383		- attributeItem.addActionListener(this);
384	408	templateItem = menu.add(new MenuItem("Template"));
385	409	templateItem.addActionListener(this);
386	410	pointflowItem = menu.add(new MenuItem("Point Flow"));
..	..	@@ -469,6 +493,14 @@
469	493	markleavesItem.addActionListener(this);
470	494	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
471	495	unmarkleavesItem.addActionListener(this);
	496	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	497	+ rewindleavesItem.addActionListener(this);
	498	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	499	+ unrewindleavesItem.addActionListener(this);
	500	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	501	+ randomleavesItem.addActionListener(this);
	502	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	503	+ unrandomleavesItem.addActionListener(this);
472	504	menu.add("-");
473	505	flipVItem = menu.add(new MenuItem("Flip V"));
474	506	flipVItem.addActionListener(this);
..	..	@@ -524,8 +556,21 @@
524	556	buildToolsMenu(menu);
525	557	}
526	558
	559	+
527	560	void SetupUI2(ObjEditor oe)
528	561	{
	562	+ // June 2019
	563	+ if (oe == null)
	564	+ {
	565	+ //super.SetupUI2(this);
	566	+ //return;
	567	+ }
	568	+
	569	+ if (copy != group)
	570	+ {
	571	+ //super.SetupUI2(this);
	572	+ }
	573	+
529	574	//new Exception().printStackTrace();
530	575
531	576	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -554,27 +599,79 @@
554	599	oe.radioPanel.add(dummyButton);
555	600	oe.buttonGroup.add(dummyButton);
556	601	*/
	602	+ cGridBag copyOptionsPanel = new cGridBag();
	603	+
	604	+ copyOptionsPanel.preferredHeight = 1;
	605	+
557	606	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
558	607
559		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
	608	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	609	+ //minButton.setToolTipText("Minimize window");
	610	+ //minButton.addActionListener(this);
	611	+
	612	+ if (Globals.ADVANCED)
	613	+ {
	614	+ oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	615	+ maxButton.setToolTipText("Maximize window");
	616	+ maxButton.addActionListener(this);
	617	+ }
	618	+
	619	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	620	+ fullButton.setToolTipText("Full-screen window");
	621	+ fullButton.addActionListener(this);
	622	+
	623	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	624	+ screenfitButton.setToolTipText("Screen fit");
	625	+ screenfitButton.addActionListener(this);
	626	+
	627	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	628	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	629	+ restoreCameraButton.addActionListener(this);
	630	+
	631	+ copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	632	+ saveButton.setToolTipText("New version");
	633	+ saveButton.addActionListener(this);
	634	+
	635	+ copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	636	+ undoButton.setToolTipText("Previous version");
	637	+ undoButton.addActionListener(this);
	638	+ undoButton.setEnabled(false);
	639	+
	640	+ cGridBag updown = new cGridBag().setVertical(true);
	641	+ updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	642	+ restoreButton.setToolTipText("Restore current");
	643	+ restoreButton.addActionListener(this);
	644	+ restoreButton.setEnabled(false);
	645	+
	646	+ updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	647	+ replaceButton.setToolTipText("Replace current");
	648	+ replaceButton.addActionListener(this);
	649	+ replaceButton.setEnabled(false);
	650	+
	651	+ copyOptionsPanel.add(updown);
	652	+
	653	+ copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	654	+ redoButton.setToolTipText("Next version");
	655	+ redoButton.addActionListener(this);
	656	+ redoButton.setEnabled(false);
	657	+
	658	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
560	659	liveCB.setToolTipText("Enable animation");
561	660	liveCB.addItemListener(this);
562	661
563		- oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	662	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
564	663	oneStepButton.setToolTipText("Animate one step forward");
565	664	oneStepButton.addActionListener(this);
566	665
567		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	666	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
568	667	fastCB.setToolTipText("Fast mode");
569	668	fastCB.addItemListener(this);
570	669
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);
	670	+ //oe.toolboxPanel.Return();
	671	+
	672	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	673	+// trackCB.setToolTipText("Enable tracking");
	674	+// trackCB.addItemListener(this);
578	675
579	676	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
580	677	// screenfitpointButton.addActionListener(this);
..	..	@@ -586,65 +683,145 @@
586	683	snapobjectButton.setToolTipText("Snap Object");
587	684	}
588	685
589		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
590		- flashSelectionButton.setToolTipText("Show selection");
591		- flashSelectionButton.addActionListener(this);
	686	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
592	687
593		- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
594		-
595		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	688	+ oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
596	689	twoButton.setToolTipText("Show center view only");
597	690	twoButton.addActionListener(this);
598		- oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	691	+ this.fullscreenLayout = twoButton;
	692	+
	693	+ oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
599	694	fourButton.addActionListener(this);
600	695	fourButton.setToolTipText("Show left panel only");
601		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	696	+ oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
602	697	sixButton.setToolTipText("2-column layout left");
603	698	sixButton.addActionListener(this);
604		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	699	+ oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
605	700	threeButton.setToolTipText("2-column layout right");
606	701	threeButton.addActionListener(this);
607		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	702	+ oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
608	703	sevenButton.setToolTipText("3-column layout");
609	704	sevenButton.addActionListener(this);
610	705	//
611	706
612		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	707	+ oe.toolbarPanel.add(rootButton = GetButton("icons/write.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
613	708	rootButton.setToolTipText("Edit selection in new tab");
614	709	rootButton.addActionListener(this);
615	710
616		- oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	711	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
617	712	closeButton.setToolTipText("Close tab");
618	713	closeButton.addActionListener(this);
619	714	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
620	715	//clearButton.addActionListener(this);
621		-
622		- cGridBag commandsPanel = new cGridBag();
	716	+
	717	+ // INSERT
	718	+ oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	719	+ gridButton.setToolTipText("Create grid");
	720	+ gridButton.addActionListener(this);
	721	+
	722	+ oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	723	+ boxButton.setToolTipText("Create box");
	724	+ boxButton.addActionListener(this);
	725	+
	726	+ oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	727	+ sphereButton.setToolTipText("Create sphere");
	728	+ sphereButton.addActionListener(this);
	729	+
	730	+ oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	731	+ coneButton.setToolTipText("Create cone");
	732	+ coneButton.addActionListener(this);
	733	+
	734	+ oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	735	+ torusButton.setToolTipText("Create torus");
	736	+ torusButton.addActionListener(this);
	737	+
	738	+ oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	739	+ superButton.setToolTipText("Create superellipsoid");
	740	+ superButton.addActionListener(this);
	741	+
	742	+ if (Globals.ADVANCED)
	743	+ {
	744	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	745	+ kleinButton.setToolTipText("Create Klein bottle");
	746	+ kleinButton.addActionListener(this);
	747	+ }
623	748
624		- commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
625		- editButton.setToolTipText("Edit selection");
	749	+ oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	750	+ particlesButton.setToolTipText("Create particle system");
	751	+ particlesButton.addActionListener(this);
	752	+
	753	+ oe.toolboxPanel.Return();
	754	+
	755	+ oe.toolboxPanel.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	756	+ groupButton.setToolTipText("Create group");
	757	+ groupButton.addActionListener(this);
	758	+
	759	+ oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	760	+ compositeButton.setToolTipText("Create composite");
	761	+ compositeButton.addActionListener(this);
	762	+
	763	+ oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	764	+ switchButton.setToolTipText("Create item switcher");
	765	+ switchButton.addActionListener(this);
	766	+
	767	+ oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	768	+ loopButton.setToolTipText("Create loop");
	769	+ loopButton.addActionListener(this);
	770	+
	771	+ oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	772	+ textureButton.setToolTipText("Create texture");
	773	+ textureButton.addActionListener(this);
	774	+
	775	+ oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	776	+ overlayButton.setToolTipText("Create overlay");
	777	+ overlayButton.addActionListener(this);
	778	+
	779	+ oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	780	+ lightButton.setToolTipText("Create light");
	781	+ lightButton.addActionListener(this);
	782	+
	783	+ for (int i=6; --i>=0;)
	784	+ {
	785	+ oe.toolboxPanel.Return();
	786	+ oe.toolboxPanel.add(new cGridBag());
	787	+ oe.toolboxPanel.add(new cGridBag());
	788	+ oe.toolboxPanel.add(new cGridBag());
	789	+ oe.toolboxPanel.add(new cGridBag());
	790	+ oe.toolboxPanel.add(new cGridBag());
	791	+ oe.toolboxPanel.add(new cGridBag());
	792	+ oe.toolboxPanel.add(new cGridBag());
	793	+ }
	794	+
	795	+ // EDIT panel
	796	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	797	+ editButton.setToolTipText("Pin selection controls");
626	798	editButton.addActionListener(this);
627	799
628		- commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
629		- uneditButton.setToolTipText("Unedit selection");
	800	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	801	+ uneditButton.setToolTipText("Remove selection controls");
630	802	uneditButton.addActionListener(this);
631	803
632		- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
633		- allParamsButton.setToolTipText("Edit all params");
	804	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	805	+ allParamsButton.setToolTipText("Show all controle");
634	806	allParamsButton.addActionListener(this);
635	807
636		- commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	808	+ editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
637	809	clearPanelButton.setToolTipText("Clear edit panel");
638	810	clearPanelButton.addActionListener(this);
639	811
640		- commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	812	+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
641	813	unselectButton.setToolTipText("Unselect");
642	814	unselectButton.addActionListener(this);
643	815
644		- commandsPanel.preferredHeight = 1;
	816	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	817	+ flashSelectionButton.setToolTipText("Highlight selection");
	818	+ flashSelectionButton.addActionListener(this);
645	819
646		- oe.treePanel.add(commandsPanel);
647		- oe.treePanel.Return();
	820	+ editCommandsPanel.preferredHeight = 1;
	821	+
	822	+ SetPinStates(false);
	823	+// oe.treePanel.add(commandsPanel);
	824	+// oe.treePanel.Return();
648	825
649	826	// oe.aConstraints.gridx += 1;
650	827	// oe.aConstraints.weighty = 0;
..	..	@@ -661,29 +838,17 @@
661	838
662	839	JScrollPane jSP;
663	840	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
664		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	841	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
665	842	ResetModel();
666	843
667	844	oe.treePanel.add(jSPPanel);
668	845	oe.treePanel.Return();
669	846
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	847	oe.treePanel.add(copyOptionsPanel);
686	848	oe.treePanel.Return();
	849	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	850	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	851	+ sliderPane.preferredHeight = 1;
687	852
688	853	// mainPanel.setDividerLocation(0.5); //1.0);
689	854	// mainPanel.setResizeWeight(0.5);
..	..	@@ -712,23 +877,43 @@
712	877
713	878	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
714	879	{
	880	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	881	+ colorCB.setToolTipText("Copy color when dropped");
	882	+ colorCB.addItemListener(this);
	883	+
	884	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	885	+ materialCB.setToolTipText("Copy material when dropped");
	886	+ materialCB.addItemListener(this);
	887	+
	888	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	889	+ textureCB.setToolTipText("Copy texture when dropped");
	890	+ textureCB.addItemListener(this);
	891	+
	892	+ panel.Return();
	893	+
715	894	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
716	895	boxCB.setToolTipText("Display bounding boxes");
717	896	boxCB.addItemListener(this);
718	897
719	898	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
720		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	899	+ zoomBoxCB.setToolTipText("Display only for wheel");
721	900	zoomBoxCB.addItemListener(this);
722	901
723	902	if (true) // Globals.ADVANCED)
724	903	{
725		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
726		- supportCB.setToolTipText("Enable rigging");
727		- supportCB.addItemListener(this);
	904	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	905	+// supportCB.setToolTipText("Enable rigging");
	906	+// supportCB.addItemListener(this);
	907	+
	908	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	909	+ freezeCB.setToolTipText("Fast moving camera");
	910	+ freezeCB.addItemListener(this);
728	911
729	912	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
730	913	// localCB.addItemListener(this);
731	914
	915	+ panel.Return();
	916	+
732	917	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
733	918	crowdCB.setToolTipText("Used for crowds");
734	919	crowdCB.addItemListener(this);
..	..	@@ -745,6 +930,8 @@
745	930	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
746	931	// speakerMocapCB.addItemListener(this);
747	932
	933	+ panel.Return();
	934	+
748	935	if (false)
749	936	{
750	937	// handled in scripts
..	..	@@ -759,32 +946,72 @@
759	946	//constraints.gridy += 1;
760	947	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
761	948	smoothfocusCB.addItemListener(this);
	949	+ panel.Return();
762	950	}
763	951
764	952	//constraints.gridx += 1;
765	953	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
766	954	// debugCB.addItemListener(this);
767	955
	956	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	957	+ trackCB.setToolTipText("Enable tracking target");
	958	+ trackCB.addItemListener(this);
	959	+
768	960	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	961	+ oeilCB.setToolTipText("Move camera when tracking");
769	962	oeilCB.addItemListener(this);
770	963
	964	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	965	+ shadowCB.setToolTipText("When live compute shadows");
	966	+ shadowCB.addItemListener(this);
	967	+
	968	+ panel.Return();
	969	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	970	+ toggleTextureCB.setToolTipText("Load textures");
	971	+ toggleTextureCB.addItemListener(this);
	972	+
	973	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	974	+ toggleSwitchCB.setToolTipText("Choose a single item");
	975	+ toggleSwitchCB.addItemListener(this);
	976	+
	977	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	978	+ autokeepCB.setToolTipText("On structure change");
	979	+ autokeepCB.addItemListener(this);
	980	+
	981	+ panel.Return();
	982	+ if (Globals.ADVANCED)
	983	+ {
771	984	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
772	985	lookAtCB.setToolTipText("Look-at target");
773	986	lookAtCB.addItemListener(this);
	987	+ }
774	988
775	989	}
776	990
777	991	cGridBag fill = new cGridBag();
778		-
779	992	fill.preferredHeight = 200;
	993	+ cGridBag fill2 = new cGridBag();
	994	+ fill2.preferredHeight = 200;
	995	+ cGridBag fill3 = new cGridBag();
	996	+ fill3.preferredHeight = 200;
780	997
781	998	panel.add(fill);
	999	+ panel.add(fill2);
	1000	+ panel.add(fill3);
782	1001
783	1002	}
784	1003
785	1004	void EditObject(Object3D obj)
786	1005	{
787	1006	cRadio radioButton = new cRadio(obj.name);
	1007	+
	1008	+ // June 2019. Patch to avoid bug with transparency.
	1009	+ radioButton.hadMaterial = obj.material != null;
	1010	+ if (!radioButton.hadMaterial)
	1011	+ {
	1012	+ obj.material = new cMaterial();
	1013	+ }
	1014	+
788	1015	radioButton.SetObject(obj);
789	1016	radioButton.layout = sevenButton;
790	1017	radioButton.SetCamera(cameraView.renderCamera, false);
..	..	@@ -796,6 +1023,8 @@
796	1023
797	1024	void SetupViews(ObjEditor oe)
798	1025	{
	1026	+ theFrame = this;
	1027	+
799	1028	oe.SetupViews();
800	1029
801	1030	System.out.println("SetupViews");
..	..	@@ -804,23 +1033,28 @@
804	1033	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
805	1034	}
806	1035
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;
	1036	+ cToggleButton liveCB;
	1037	+ cCheckBox supportCB;
	1038	+ cCheckBox localCB;
	1039	+ cCheckBox crowdCB;
	1040	+ cCheckBox smoothCB;
	1041	+ cToggleButton fastCB;
	1042	+ cCheckBox slowCB;
	1043	+ cCheckBox boxCB;
	1044	+ cCheckBox zoomBoxCB;
	1045	+ cCheckBox freezeCB;
	1046	+ //cToggleButton trackCB;
	1047	+ cCheckBox trackCB;
	1048	+ cCheckBox smoothfocusCB;
818	1049	// JCheckBox speakerMocapCB;
819		- JCheckBox speakerCameraCB;
820		- JCheckBox speakerFocusCB;
821		- JCheckBox debugCB;
822		- JCheckBox oeilCB;
823		- JCheckBox lookAtCB;
	1050	+ cCheckBox speakerCameraCB;
	1051	+ cCheckBox speakerFocusCB;
	1052	+ cCheckBox debugCB;
	1053	+
	1054	+ cCheckBox oeilCB;
	1055	+ cCheckBox shadowCB;
	1056	+ cCheckBox autokeepCB;
	1057	+ cCheckBox lookAtCB;
824	1058
825	1059	// static int COLOR = 1;
826	1060	// static int MATERIAL = 2;
..	..	@@ -828,9 +1062,9 @@
828	1062
829	1063	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
830	1064
831		- JCheckBox colorCB;
832		- JCheckBox materialCB;
833		- JCheckBox textureCB;
	1065	+ cCheckBox colorCB;
	1066	+ cCheckBox materialCB;
	1067	+ cCheckBox textureCB;
834	1068
835	1069	public void itemStateChanged(ItemEvent e)
836	1070	{
..	..	@@ -858,6 +1092,7 @@
858	1092	} else if(e.getSource() == liveCB)
859	1093	{
860	1094	cameraView.ToggleLive();
	1095	+ refreshContents(false);
861	1096	}
862	1097	else if(e.getSource() == supportCB)
863	1098	{
..	..	@@ -922,6 +1157,18 @@
922	1157	{
923	1158	cameraView.ToggleOeil();
924	1159	}
	1160	+ else if(e.getSource() == shadowCB)
	1161	+ {
	1162	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1163	+ }
	1164	+ else if(e.getSource() == freezeCB)
	1165	+ {
	1166	+ Globals.FREEZEONMOVE ^= true;
	1167	+ }
	1168	+ else if(e.getSource() == autokeepCB)
	1169	+ {
	1170	+ Globals.REPLACEONMAKE ^= true;
	1171	+ }
925	1172	else if(e.getSource() == lookAtCB)
926	1173	{
927	1174	cameraView.ToggleLookAt();
..	..	@@ -938,7 +1185,8 @@
938	1185
939	1186	/**/
940	1187	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
941		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1188	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1189	+ TreePath path = objEditor.jTree.getSelectionPath();
942	1190	if ((path == null) \|\| (path.getPathCount() <= 1)) {
943	1191	// We can't move the root node or an empty selection
944	1192	return;
..	..	@@ -1001,8 +1249,6 @@
1001	1249	}
1002	1250	}
1003	1251
1004		- String string = (String) object;
1005		-
1006	1252	System.out.println("Transfer = " + object + "; drop : " + target);
1007	1253	// if( object instanceof java.io.File[])
1008	1254	// {
..	..	@@ -1010,6 +1256,8 @@
1010	1256	// objEditor.DropFile((java.io.File[]) object, true);
1011	1257	// return;
1012	1258	// }
	1259	+
	1260	+ String string = object.toString();
1013	1261
1014	1262	// File path for Mac and Windows
1015	1263	if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
..	..	@@ -1055,23 +1303,33 @@
1055	1303
1056	1304	assert target == objEditor.jTree;
1057	1305	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1306	+ Object3D destinationLeaf;
1058	1307	try {
1059		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1308	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
1060	1309	} catch (Exception e) {
1061	1310	System.out.println("destinationPath : " + destinationPath);
1062	1311	return;
1063	1312	}
1064	1313
1065		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1314	+ for (int i=group.selection.size(); --i>=0;)
1066	1315	{
	1316	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1317	+
	1318	+ // Cannot move into itself
	1319	+ if (child == destinationLeaf)
	1320	+ return;
	1321	+ }
	1322	+
	1323	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1324	+// {
1067	1325	loadClipboard(true);
1068	1326	objEditor.jTree.setSelectionPath(destinationPath);
1069	1327	pasteInto(false, false);
1070		- } else {
1071		- loadClipboard(false);
1072		- objEditor.jTree.setSelectionPath(destinationPath);
1073		- pasteInto(false, false); // true); // ???
1074		- }
	1328	+// } else {
	1329	+// loadClipboard(false);
	1330	+// objEditor.jTree.setSelectionPath(destinationPath);
	1331	+// pasteInto(false, false); // true); // ???
	1332	+// }
1075	1333	}
1076	1334	public void dropActionChanged(DropTargetDragEvent dtde)
1077	1335	// Called if the user has modified the current drop gesture
..	..	@@ -1176,22 +1434,30 @@
1176	1434	{
1177	1435	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1178	1436	//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);
	1437	+// gridItem = menu.add(new MenuItem("Grid"));
	1438	+// gridItem.addActionListener(this);
	1439	+// rectoidItem = menu.add(new MenuItem("Box"));
	1440	+// rectoidItem.addActionListener(this);
	1441	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1442	+// ellipsoidItem.addActionListener(this);
	1443	+// coneItem = menu.add(new MenuItem("Cone"));
	1444	+// coneItem.addActionListener(this);
	1445	+// torusItem = menu.add(new MenuItem("Torus"));
	1446	+// torusItem.addActionListener(this);
	1447	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1448	+// superItem.addActionListener(this);
	1449	+
	1450	+ cameraItem = menu.add(new MenuItem("Camera"));
	1451	+ cameraItem.addActionListener(this);
	1452	+
	1453	+ if (!Globals.ADVANCED)
	1454	+ {
1191	1455	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1192	1456	kleinItem.addActionListener(this);
1193		- particleItem = menu.add(new MenuItem("Particle system"));
1194		- particleItem.addActionListener(this);
	1457	+ }
	1458	+
	1459	+// particleItem = menu.add(new MenuItem("Particle system"));
	1460	+// particleItem.addActionListener(this);
1195	1461	if (Globals.ADVANCED)
1196	1462	{
1197	1463	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1217,15 +1483,15 @@
1217	1483	}
1218	1484	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1219	1485	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);
	1486	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1487	+// overlayItem.addActionListener(this);
	1488	+// lightItem = menu.add(new MenuItem("Light"));
	1489	+// lightItem.addActionListener(this);
1224	1490	menu.add("-");
1225	1491	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1226	1492	//superLoopItem.addActionListener(this);
1227		- loopItem = menu.add(new MenuItem("Loop"));
1228		- loopItem.addActionListener(this);
	1493	+// loopItem = menu.add(new MenuItem("Loop"));
	1494	+// loopItem.addActionListener(this);
1229	1495	doubleItem = menu.add(new MenuItem("Fork"));
1230	1496	doubleItem.addActionListener(this);
1231	1497	if (Globals.ADVANCED)
..	..	@@ -1241,6 +1507,9 @@
1241	1507	animationItem.addItemListener(this);
1242	1508	animationItem.setState(Globals.ANIMATION);
1243	1509
	1510	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1511	+ archiveItem.addActionListener(this);
	1512	+
1244	1513	menu.add("-");
1245	1514	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1246	1515	parseverticesItem.addActionListener(this);
..	..	@@ -1253,6 +1522,8 @@
1253	1522	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1254	1523	reduce34MorphItem.addActionListener(this);
1255	1524	menu.add("-");
	1525	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	1526	+ memoryItem.addActionListener(this);
1256	1527	menu.add(computeAOItem = new MenuItem("Compute AO"));
1257	1528	computeAOItem.addActionListener(this);
1258	1529
..	..	@@ -1261,11 +1532,9 @@
1261	1532	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1262	1533	mirrorItem.addActionListener(this);
1263	1534	menu.add("-");
1264		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1265		- memoryItem.addActionListener(this);
1266	1535	menu.add(analyzeItem = new MenuItem("Analyze"));
1267	1536	analyzeItem.addActionListener(this);
1268		- menu.add(dumpItem = new MenuItem("Dump"));
	1537	+ menu.add(dumpItem = new MenuItem("Print"));
1269	1538	dumpItem.addActionListener(this);
1270	1539	// menu.add(pathItem = new MenuItem("From-to path"));
1271	1540	// pathItem.addActionListener(this);
..	..	@@ -1406,9 +1675,24 @@
1406	1675	shadow.material = new cMaterial(obj.material);
1407	1676	shadow.material.diffuse = 0.0001f;
1408	1677	shadow.material.specular = 0.0001f;
	1678	+ //shadow.projectedVertices[1].x = 300;
1409	1679
1410	1680	makeSomething(shadow);
1411	1681	}
	1682	+
	1683	+ private void ClearUnpinned()
	1684	+ {
	1685	+ //for (Object3D obj : listUI)
	1686	+ for (int i=listUI.size(); --i>=0;)
	1687	+ {
	1688	+ Object3D obj = listUI.elementAt(i);
	1689	+ if (!obj.pinned)
	1690	+ {
	1691	+ obj.CloseUI();
	1692	+ listUI.remove(i);
	1693	+ }
	1694	+ }
	1695	+ }
1412	1696
1413	1697	/**
1414	1698	* applyExample
..	..	@@ -1653,7 +1937,7 @@
1653	1937	{
1654	1938	ScreenFit();
1655	1939	} else
1656		- if (source == switchItem)
	1940	+ if (source == switchViewItem)
1657	1941	{
1658	1942	cVector v1 = new cVector();
1659	1943	cVector v2 = new cVector();
..	..	@@ -1662,11 +1946,11 @@
1662	1946	objEditor.cameraView.renderCamera.setAim(v2, v1);
1663	1947	objEditor.cameraView.repaint();
1664	1948	} else
1665		- if (source == rectoidItem)
	1949	+ if (source == rectoidItem \|\| source == boxButton)
1666	1950	{
1667	1951	makeSomething(new Box());
1668	1952	} else
1669		- if (source == particleItem)
	1953	+ if (source == particleItem \|\| source == particlesButton)
1670	1954	{
1671	1955	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1672	1956	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1745,27 +2029,27 @@
1745	2029
1746	2030	makeSomething(obj);
1747	2031	} else
1748		- if (source == gridItem)
	2032	+ if (source == gridItem \|\| source == gridButton)
1749	2033	{
1750	2034	makeSomething(new Grid());
1751	2035	} else
1752		- if (source == ellipsoidItem)
	2036	+ if (source == ellipsoidItem \|\| source == sphereButton)
1753	2037	{
1754	2038	makeSomething(new Sphere());
1755	2039	} else
1756		- if (source == coneItem)
	2040	+ if (source == coneItem \|\| source == coneButton)
1757	2041	{
1758	2042	makeSomething(new Cone());
1759	2043	} else
1760		- if (source == torusItem)
	2044	+ if (source == torusItem \|\| source == torusButton)
1761	2045	{
1762	2046	makeSomething(new Torus());
1763	2047	} else
1764		- if (source == superItem)
	2048	+ if (source == superItem \|\| source == superButton)
1765	2049	{
1766	2050	makeSomething(new Superellipsoid());
1767	2051	} else
1768		- if (source == kleinItem)
	2052	+ if (source == kleinItem \|\| source == kleinButton)
1769	2053	{
1770	2054	makeSomething(new Klein());
1771	2055	} else
..	..	@@ -1785,7 +2069,7 @@
1785	2069	{
1786	2070	makeSomething(new BezierSurface());
1787	2071	} else
1788		- if (source == overlayItem)
	2072	+ if (source == overlayItem \|\| source == overlayButton)
1789	2073	{
1790	2074	/*
1791	2075	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1833,7 +2117,7 @@
1833	2117	s.setup();
1834	2118	makeSomething(s);
1835	2119	} else
1836		- if (source == lightItem)
	2120	+ if (source == lightItem \|\| source == lightButton)
1837	2121	{
1838	2122	makeSomething(new Light());
1839	2123	} else
..	..	@@ -1883,30 +2167,30 @@
1883	2167
1884	2168	group(g);
1885	2169	} else
1886		- if (source == loopItem)
	2170	+ if (source == loopItem \|\| source == loopButton)
1887	2171	{
1888	2172	Composite csg = new GroupLeaf();
1889	2173	csg.count = 5;
1890	2174	group(csg);
1891		- Composite child = new cGroup();
	2175	+ Composite child = new cGroup("Branch");
1892	2176	csg.addChild(child);
1893	2177	child.addChild(csg);
1894	2178	} else
1895	2179	if (source == doubleItem)
1896	2180	{
1897		- Composite csg = new GroupLeaf();
	2181	+ Composite csg = new GroupLeaf("Fork");
1898	2182	csg.count = 5;
1899	2183	group(csg);
1900		- Composite child = new cGroup();
	2184	+ Composite child = new cGroup("Branch A");
1901	2185	csg.addChild(child);
1902	2186	child.addChild(csg);
1903		- child = new cGroup();
	2187	+ child = new cGroup("Branch B");
1904	2188	csg.addChild(child);
1905	2189	child.addChild(csg);
1906	2190	} else
1907	2191	if (source == tripleItem)
1908	2192	{
1909		- Composite csg = new GroupLeaf();
	2193	+ Composite csg = new GroupLeaf("Trident");
1910	2194	csg.count = 4;
1911	2195	group(csg);
1912	2196	Composite child = new cGroup();
..	..	@@ -1956,6 +2240,46 @@
1956	2240	{
1957	2241	DumpObject();
1958	2242	} else
	2243	+ if (source == minButton)
	2244	+ {
	2245	+ Minimize();
	2246	+ } else
	2247	+ if (source == maxButton)
	2248	+ {
	2249	+ Maximize();
	2250	+ } else
	2251	+ if (source == fullButton)
	2252	+ {
	2253	+ ToggleFullScreen();
	2254	+ } else
	2255	+ if (source == undoButton)
	2256	+ {
	2257	+ // Go to previous version
	2258	+ //if (!Undo())
	2259	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2260	+ Undo();
	2261	+ } else
	2262	+ if (source == restoreButton)
	2263	+ {
	2264	+ // Restore current version
	2265	+ Restore();
	2266	+ } else
	2267	+ if (source == replaceButton)
	2268	+ {
	2269	+ // Overwrite current version
	2270	+ Replace();
	2271	+ } else
	2272	+ if (source == redoButton)
	2273	+ {
	2274	+ // Go to next version
	2275	+ Redo();
	2276	+ } else
	2277	+ if (source == saveButton)
	2278	+ {
	2279	+ // Save a new version
	2280	+ if (!Save(true))
	2281	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2282	+ } else
1959	2283	if (source == oneStepButton)
1960	2284	{
1961	2285	Globals.ONESTEP = true;
..	..	@@ -1963,17 +2287,14 @@
1963	2287	} else
1964	2288	if (source == screenfitButton)
1965	2289	{
1966		- //Reload(lastConverter, lastFilename, true);
1967	2290	ScreenFit();
1968	2291	} else
1969	2292	if (source == screenfitpointButton)
1970	2293	{
1971		- //Reload(lastConverter, lastFilename, true);
1972	2294	ScreenFitPoint();
1973	2295	} else
1974	2296	if (source == snapobjectButton)
1975	2297	{
1976		- //Reload(lastConverter, lastFilename, true);
1977	2298	SnapObject();
1978	2299	} else
1979	2300	// if (event.getSource() == recompileButton)
..	..	@@ -2349,9 +2670,9 @@
2349	2670	{
2350	2671	ClearSelection(true);
2351	2672	} else
2352		- if (source == grabItem)
	2673	+ if (source == grabItem \|\| source == groupButton)
2353	2674	{
2354		- group(new cGroup(), true);
	2675	+ group(new cGroup(), false); // true);
2355	2676	} else
2356	2677	if (source == hideItem)
2357	2678	{
..	..	@@ -2369,11 +2690,11 @@
2369	2690	{
2370	2691	makeSomething(new Camera());
2371	2692	} else
2372		- if (source == compositeItem)
	2693	+ if (source == compositeItem \|\| source == compositeButton)
2373	2694	{
2374	2695	group(new Composite());
2375	2696	} else
2376		- if (source == randomItem)
	2697	+ if (source == switchItem \|\| source == switchButton)
2377	2698	{
2378	2699	RandomNode random = new RandomNode();
2379	2700	group(random);
..	..	@@ -2475,7 +2796,7 @@
2475	2796	{
2476	2797	group(new cLinker());
2477	2798	} else
2478		- if (source == textureItem)
	2799	+ if (source == textureItem \|\| source == textureButton)
2479	2800	{
2480	2801	group(new TextureNode());
2481	2802	} else
..	..	@@ -2495,17 +2816,30 @@
2495	2816	{
2496	2817	CastShadow(2);
2497	2818	} else
2498		- if (source == ungroupItem)
	2819	+ if (source == ungroupItem \|\| source == ungroupButton)
2499	2820	{
2500		- //ungroup();
	2821	+ boolean hasRoot = false;
	2822	+
2501	2823	for (int i=0; i<group.selection.size(); i++)
2502	2824	{
2503		- Ungroup(group.selection.get(i));
	2825	+ if (group.selection.get(i) == group)
	2826	+ {
	2827	+ hasRoot = true;
	2828	+ break;
	2829	+ }
2504	2830	}
2505	2831
2506		- ClearSelection(false);
2507		-
2508		- refreshContents();
	2832	+ if (!hasRoot)
	2833	+ {
	2834	+ for (int i=0; i<group.selection.size(); i++)
	2835	+ {
	2836	+ Ungroup(group.selection.get(i));
	2837	+ }
	2838	+
	2839	+ ClearSelection(false);
	2840	+
	2841	+ refreshContents();
	2842	+ }
2509	2843	} else
2510	2844	if (source == genUVItem)
2511	2845	{
..	..	@@ -2517,7 +2851,7 @@
2517	2851	} else
2518	2852	if (source == genNormalsMESHItem)
2519	2853	{
2520		- GenNormals(true); // TODO
	2854	+ GenNormalsMESH();
2521	2855	} else
2522	2856	if (source == genNormalsORGANItem)
2523	2857	{
..	..	@@ -2582,6 +2916,22 @@
2582	2916	if (source == unmarkleavesItem)
2583	2917	{
2584	2918	MarkLeaves(false);
	2919	+ } else
	2920	+ if (source == rewindleavesItem)
	2921	+ {
	2922	+ RewindLeaves(true);
	2923	+ } else
	2924	+ if (source == unrewindleavesItem)
	2925	+ {
	2926	+ RewindLeaves(false);
	2927	+ } else
	2928	+ if (source == randomleavesItem)
	2929	+ {
	2930	+ RandomLeaves(true);
	2931	+ } else
	2932	+ if (source == unrandomleavesItem)
	2933	+ {
	2934	+ RandomLeaves(false);
2585	2935	} else
2586	2936	if (source == flipVItem)
2587	2937	{
..	..	@@ -2817,6 +3167,10 @@
2817	3167	if (source == twoButton)
2818	3168	{
2819	3169	radio.layout = twoButton;
	3170	+
	3171	+ if (CameraPane.FULLSCREEN)
	3172	+ fullscreenLayout = radio.layout;
	3173	+
2820	3174	// bug
2821	3175	//gridPanel.setDividerLocation(1.0);
2822	3176	//bigPanel.setDividerLocation(0.0);
..	..	@@ -2849,10 +3203,31 @@
2849	3203	bigThree.ClearUI();
2850	3204	bigThree.add(centralPanel);
2851	3205	bigThree.FlushUI();
	3206	+
	3207	+ cameraView.requestFocusInWindow();
	3208	+
	3209	+// refreshContents(true);
	3210	+//
	3211	+// try
	3212	+// {
	3213	+// java.awt.Robot bot = new java.awt.Robot();
	3214	+// int mask = InputEvent.BUTTON1_MASK;
	3215	+// bot.mouseMove(100, 100);
	3216	+// bot.mousePress(mask);
	3217	+// bot.mouseRelease(mask);
	3218	+// }
	3219	+// catch (Exception e)
	3220	+// {
	3221	+//
	3222	+// }
	3223	+
2852	3224	} else
2853	3225	if (source == threeButton)
2854	3226	{
2855	3227	radio.layout = threeButton;
	3228	+
	3229	+ if (CameraPane.FULLSCREEN)
	3230	+ fullscreenLayout = radio.layout;
2856	3231
2857	3232	// bigThree.remove(scenePanel);
2858	3233	// bigThree.remove(centralPanel);
..	..	@@ -2885,10 +3260,15 @@
2885	3260	bigThree.add(centralPanel);
2886	3261	bigThree.add(XYZPanel);
2887	3262	bigThree.FlushUI();
	3263	+
	3264	+ cameraView.requestFocusInWindow();
2888	3265	} else
2889	3266	if (source == fourButton)
2890	3267	{
2891	3268	radio.layout = fourButton;
	3269	+
	3270	+ if (CameraPane.FULLSCREEN)
	3271	+ fullscreenLayout = radio.layout;
2892	3272
2893	3273	// bigThree.remove(scenePanel);
2894	3274	// bigThree.remove(centralPanel);
..	..	@@ -2920,10 +3300,15 @@
2920	3300	bigThree.ClearUI();
2921	3301	bigThree.add(scenePanel);
2922	3302	bigThree.FlushUI();
	3303	+
	3304	+ cameraView.requestFocusInWindow();
2923	3305	} else
2924	3306	if (source == sixButton)
2925	3307	{
2926	3308	radio.layout = sixButton;
	3309	+
	3310	+ if (CameraPane.FULLSCREEN)
	3311	+ fullscreenLayout = radio.layout;
2927	3312
2928	3313	// bigThree.remove(scenePanel);
2929	3314	// bigThree.remove(centralPanel);
..	..	@@ -2956,10 +3341,15 @@
2956	3341	bigThree.add(scenePanel);
2957	3342	bigThree.add(centralPanel);
2958	3343	bigThree.FlushUI();
	3344	+
	3345	+ cameraView.requestFocusInWindow();
2959	3346	} else
2960	3347	if (source == sevenButton)
2961	3348	{
2962	3349	radio.layout = sevenButton;
	3350	+
	3351	+ if (CameraPane.FULLSCREEN)
	3352	+ fullscreenLayout = radio.layout;
2963	3353
2964	3354	// bigThree.remove(scenePanel);
2965	3355	// bigThree.remove(centralPanel);
..	..	@@ -2993,6 +3383,8 @@
2993	3383	bigThree.add(centralPanel);
2994	3384	bigThree.add(XYZPanel);
2995	3385	bigThree.FlushUI();
	3386	+
	3387	+ cameraView.requestFocusInWindow();
2996	3388	} else
2997	3389	if (source == rootButton)
2998	3390	{
..	..	@@ -3004,6 +3396,7 @@
3004	3396	EditObject(obj);
3005	3397	}
3006	3398
	3399	+ cameraView.requestFocusInWindow();
3007	3400	refreshContents(true);
3008	3401	} else
3009	3402	if (source == closeButton)
..	..	@@ -3013,22 +3406,37 @@
3013	3406	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3014	3407	{
3015	3408	ab = (cRadio)e.nextElement();
3016		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3409	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
3017	3410	{
	3411	+ // Patch to avoid bug with transparency.
	3412	+ if (!ab.hadMaterial)
	3413	+ {
	3414	+ ab.object.material = null;
	3415	+ }
	3416	+
3018	3417	buttonGroup.remove(ab);
3019	3418	radioPanel.remove(ab);
3020	3419
3021		- ab.GetObject().editWindow = null;
	3420	+ //ab.GetObject().editWindow = null;
	3421	+ ab.GetObject().manipWindow = null;
3022	3422	// ab.GetObject().objectUI = null; // ?????????
3023	3423
3024	3424	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
3025	3425	break;
3026	3426	}
3027	3427	}
	3428	+
	3429	+ cameraView.requestFocusInWindow();
3028	3430	refreshContents(true);
3029	3431	} else
3030	3432	if (source == editItem \|\| source == editButton)
3031	3433	{
	3434	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3435	+ {
	3436	+ Object3D child = (Object3D)e.nextElement();
	3437	+ child.pinned = true;
	3438	+ }
	3439	+
3032	3440	EditSelection(false);
3033	3441	} else
3034	3442	if (source == uneditButton)
..	..	@@ -3038,10 +3446,11 @@
3038	3446	Object3D child = (Object3D)e.nextElement();
3039	3447	if(child.editWindow != null)
3040	3448	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3449	+ child.pinned = false;
3041	3450	child.CloseUI();
3042	3451	listUI.remove(child);
3043	3452
3044		- child.editWindow = null; // ???????????
	3453	+ //child.editWindow = null; // ???????????
3045	3454	}
3046	3455	objEditor.ctrlPanel.FlushUI();
3047	3456	//objEditor.jTree.clearSelection();
..	..	@@ -3054,6 +3463,7 @@
3054	3463	//copy.ClearUI();
3055	3464	for (Object3D obj : listUI)
3056	3465	{
	3466	+ obj.pinned = false;
3057	3467	obj.CloseUI();
3058	3468	}
3059	3469	listUI.clear();
..	..	@@ -3063,7 +3473,7 @@
3063	3473	{
3064	3474	assert(copy == group);
3065	3475
3066		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3476	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3067	3477
3068	3478	for (Object3D obj : listUI)
3069	3479	{
..	..	@@ -3112,6 +3522,9 @@
3112	3522	}
3113	3523
3114	3524	copy = group;
	3525	+
	3526	+ SetUndoStates();
	3527	+
3115	3528	//Globals.theRenderer.object = group;
3116	3529	if(!useclient)
3117	3530	{
..	..	@@ -3128,7 +3541,9 @@
3128	3541	sideView.object = group;
3129	3542	}
3130	3543
3131		-// fix "+" issue group.editWindow = this;
	3544	+// fix "+" issue
	3545	+ //group.editWindow = this;
	3546	+ group.manipWindow = this;
3132	3547
3133	3548	/*
3134	3549	currentLayout = radio.layout;
..	..	@@ -3136,18 +3551,27 @@
3136	3551	currentLayout = sevenButton;
3137	3552	*/
3138	3553	radio.layout.doClick();
	3554	+
	3555	+ ClearUnpinned();
	3556	+ Grafreed.Assert(group != null);
	3557	+ Grafreed.Assert(group.selection != null);
	3558	+ SetPinStates(group.selection.size() > 0);
	3559	+ if (group.selection.size() == 1)
	3560	+ EditSelection(false);
3139	3561	keepparent = group.parent;
3140	3562	// PARENT = NULL or not???
3141	3563	//group.parent = null; // ROOT
3142	3564	//group.attributes = -1;
3143	3565	ResetModel();
	3566	+
	3567	+ cameraView.requestFocusInWindow();
3144	3568	refreshContents(true);
3145	3569	} else if (event.getSource() == editCameraItem)
3146	3570	{
3147	3571	cameraView.ProtectCamera();
3148	3572	cameraView.repaint();
3149	3573	return;
3150		- } else if (event.getSource() == revertCameraItem)
	3574	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3151	3575	{
3152	3576	cameraView.RevertCamera();
3153	3577	cameraView.repaint();
..	..	@@ -3164,7 +3588,6 @@
3164	3588	}
3165	3589
3166	3590	boolean useclient = false;
3167		- cRadio radio;
3168	3591
3169	3592	void ToggleRoot()
3170	3593	{
..	..	@@ -3403,7 +3826,8 @@
3403	3826
3404	3827	int size = obj.MemorySize();
3405	3828
3406		- System.err.println((size/1024) + " KB is the size of " + obj);
	3829	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	3830	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3407	3831	}
3408	3832	}
3409	3833	catch (Exception e)
..	..	@@ -3484,6 +3908,13 @@
3484	3908	void GenNormals(boolean crease)
3485	3909	{
3486	3910	group.GenNormalsS(crease);
	3911	+
	3912	+ refreshContents();
	3913	+ }
	3914	+
	3915	+ void GenNormalsMESH()
	3916	+ {
	3917	+ group.GenNormalsMeshS();
3487	3918
3488	3919	refreshContents();
3489	3920	}
..	..	@@ -4111,6 +4542,18 @@
4111	4542	refreshContents();
4112	4543	}
4113	4544
	4545	+ void RewindLeaves(boolean hide)
	4546	+ {
	4547	+ group.selection.RewindLeaves(hide);
	4548	+ refreshContents();
	4549	+ }
	4550	+
	4551	+ void RandomLeaves(boolean hide)
	4552	+ {
	4553	+ group.selection.RandomLeaves(hide);
	4554	+ refreshContents();
	4555	+ }
	4556	+
4114	4557	void SetTexRes(int tr)
4115	4558	{
4116	4559	group.selection.SetTexRes(tr);
..	..	@@ -4182,10 +4625,6 @@
4182	4625	// }
4183	4626	// }
4184	4627
4185		- static boolean allparams = true;
4186		-
4187		- static Vector<Object3D> listUI = new Vector<Object3D>();
4188		-
4189	4628	void EditSelection(boolean newWindow)
4190	4629	{
4191	4630	// aConstraints.gridy = 0;
..	..	@@ -4193,7 +4632,7 @@
4193	4632	{
4194	4633	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4195	4634	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4196		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4635	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4197	4636
4198	4637	Object3D elem = (Object3D)group.selection.elementAt(i);
4199	4638	if(elem != group \|\| !newWindow)
..	..	@@ -4278,7 +4717,8 @@
4278	4717	//new Exception().printStackTrace();
4279	4718
4280	4719	freezemodel = true;
4281		-
	4720	+ ClearUnpinned();
	4721	+
4282	4722	/**/
4283	4723	//switch (event.id)
4284	4724	{
..	..	@@ -4286,7 +4726,6 @@
4286	4726	//case 702: // Event.LIST_DESELECT
4287	4727	group.deselectAll();
4288	4728	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4289		- objEditor.ClearInfo(); // .GetMaterial());
4290	4729	if (tps != null)
4291	4730	{
4292	4731	for (int i=0; i < tps.length; i++)
..	..	@@ -4295,10 +4734,8 @@
4295	4734
4296	4735	//if (child.parent != null)
4297	4736	//child.parent.addSelectee(child);
	4737	+ objEditor.SetMaterial(child);
4298	4738	group.addSelectee(child);
4299		- objEditor.SetMaterial(child); // .GetMaterial());
4300		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4301		- System.err.println("info : " + child.GetPath());
4302	4739	}
4303	4740	}
4304	4741	// else
..	..	@@ -4308,17 +4745,13 @@
4308	4745	// System.err.println("info : " + group.GetPath());
4309	4746	// }
4310	4747
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))
	4748	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4316	4749	CameraPane.flash = true;
4317	4750
4318		- if (tps != null && tps.length > 0 && object instanceof Camera)
	4751	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4319	4752	// a camera
4320	4753	{
4321		- if (object != Globals.theRenderer.LightCamera())
	4754	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
4322	4755	{
4323	4756	CameraPane.camerachangeframe = 0; // don't refuse it
4324	4757	Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
..	..	@@ -4327,6 +4760,13 @@
4327	4760	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4328	4761	}
4329	4762
	4763	+ if (tps != null && tps.length == 1)
	4764	+ {
	4765	+ EditSelection(false);
	4766	+ }
	4767	+
	4768	+ SetPinStates(tps != null && tps.length > 0);
	4769	+
4330	4770	refreshContents();
4331	4771	//return true;
4332	4772	}
..	..	@@ -4335,6 +4775,35 @@
4335	4775
4336	4776	freezemodel = false;
4337	4777	}
	4778	+
	4779	+ void SetPinStates(boolean enabled)
	4780	+ {
	4781	+ editButton.setEnabled(enabled);
	4782	+ uneditButton.setEnabled(enabled);
	4783	+ unselectButton.setEnabled(enabled);
	4784	+ flashSelectionButton.setEnabled(enabled);
	4785	+ }
	4786	+
	4787	+ void refreshContents(boolean cp)
	4788	+ {
	4789	+ if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
	4790	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
	4791	+ {
	4792	+ objEditor.ClearInfo(); // .GetMaterial());
	4793	+
	4794	+ for (int i=0; i < group.selection.Size(); i++)
	4795	+ {
	4796	+ Object3D child = (Object3D) group.selection.get(i);
	4797	+
	4798	+ objEditor.AddInfo(child, this, true);
	4799	+ System.err.println("info : " + child.GetPath());
	4800	+ }
	4801	+
	4802	+ objEditor.SetText(); // jan 2014
	4803	+ }
	4804	+
	4805	+ super.refreshContents(cp);
	4806	+ }
4338	4807
4339	4808	void linkSomething(Object3D thing)
4340	4809	{
..	..	@@ -4406,6 +4875,7 @@
4406	4875	{
4407	4876	if (group.selection.isEmpty())
4408	4877	return;
	4878	+
4409	4879	Grafreed.clipboardIsTempGroup = false;
4410	4880	Composite tGroup = null;
4411	4881	if (group.selection.size() > 0) // 1)
..	..	@@ -4416,6 +4886,8 @@
4416	4886
4417	4887	if (cut)
4418	4888	{
	4889	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	4890	+// Save();
4419	4891	//int indices[] = jList.getSelectedIndices();
4420	4892	//for (int i = indices.length - 1; i >= 0; i--)
4421	4893	//jList.remove(indices[i]);
..	..	@@ -4505,8 +4977,10 @@
4505	4977	}
4506	4978
4507	4979	}
	4980	+
4508	4981	if (Grafreed.clipboardIsTempGroup)
4509	4982	Grafreed.clipboard = tGroup;
	4983	+
4510	4984	if (cut)
4511	4985	{
4512	4986	ResetModel();
..	..	@@ -4516,6 +4990,10 @@
4516	4990
4517	4991	void paste(boolean expand)
4518	4992	{
	4993	+ if (Globals.REPLACEONMAKE)
	4994	+ Save();
	4995	+ boolean keep = Globals.REPLACEONMAKE;
	4996	+ Globals.REPLACEONMAKE = false;
4519	4997	// if (GrafreeD.clipboard == null)
4520	4998	// return;
4521	4999	boolean first = true;
..	..	@@ -4575,6 +5053,7 @@
4575	5053	Grafreed.clipboard.get(0).parent = keepparent;
4576	5054	}
4577	5055
	5056	+ Globals.REPLACEONMAKE = keep;
4578	5057	ResetModel();
4579	5058	refreshContents();
4580	5059	}
..	..	@@ -4710,6 +5189,10 @@
4710	5189
4711	5190	void group(Object3D csg, boolean grab)
4712	5191	{
	5192	+ if (Globals.REPLACEONMAKE)
	5193	+ Save();
	5194	+ boolean keep = Globals.REPLACEONMAKE;
	5195	+ Globals.REPLACEONMAKE = false;
4713	5196	if (//false) // why??
4714	5197	!group.selection.isEmpty())
4715	5198	{
..	..	@@ -4823,10 +5306,15 @@
4823	5306	//node.add(csg);
4824	5307	//makeSomething(node);
4825	5308	makeSomething(csg);
	5309	+ Globals.REPLACEONMAKE = keep;
4826	5310	}
4827	5311
4828	5312	void Ungroup(Object3D g)
4829	5313	{
	5314	+ if (Globals.REPLACEONMAKE)
	5315	+ Save();
	5316	+ boolean keep = Globals.REPLACEONMAKE;
	5317	+ Globals.REPLACEONMAKE = false;
4830	5318	if (g instanceof HiddenObject)
4831	5319	{
4832	5320	HiddenObject h = (HiddenObject) g;
..	..	@@ -4843,6 +5331,7 @@
4843	5331	objEditor.makeSomething(g.get(i), false);
4844	5332	}
4845	5333	}
	5334	+ Globals.REPLACEONMAKE = keep;
4846	5335	}
4847	5336
4848	5337	void ungroup()
..	..	@@ -5131,7 +5620,28 @@
5131	5620	cButton clearpanelButton;
5132	5621	cButton unselectButton;
5133	5622
	5623	+ cButton restoreCameraButton;
	5624	+
	5625	+ cButton saveButton;
5134	5626	cButton oneStepButton;
	5627	+
	5628	+ cButton groupButton;
	5629	+ cButton ungroupButton;
	5630	+ cButton compositeButton;
	5631	+ cButton switchButton;
	5632	+ cButton loopButton;
	5633	+ cButton textureButton;
	5634	+
	5635	+ cButton gridButton;
	5636	+ cButton boxButton;
	5637	+ cButton sphereButton;
	5638	+ cButton coneButton;
	5639	+ cButton torusButton;
	5640	+ cButton superButton;
	5641	+ cButton kleinButton;
	5642	+ cButton particlesButton;
	5643	+ cButton overlayButton;
	5644	+ cButton lightButton;
5135	5645
5136	5646	cButton screenfitButton;
5137	5647	cButton screenfitpointButton;
..	..	@@ -5144,14 +5654,6 @@
5144	5654
5145	5655	cButton setsupportButton;
5146	5656
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	5657	//
5156	5658	//Composite
5157	5659	Object3D // to do !!
..	..	@@ -5161,11 +5663,11 @@
5161	5663	//JTree jTree;
5162	5664	private MenuItem lookAtItem;
5163	5665	private MenuItem lookFromItem;
5164		- private MenuItem switchItem;
	5666	+ private MenuItem switchViewItem;
5165	5667	private MenuItem cutItem;
5166	5668	private MenuItem undoItem;
5167	5669	private MenuItem redoItem;
5168		- private MenuItem duplicateItem;
	5670	+ private JMenuItem duplicateItem;
5169	5671	private MenuItem cloneItem;
5170	5672	private MenuItem cloneSupportItem;
5171	5673	private MenuItem overwriteGeoItem;
..	..	@@ -5228,6 +5730,10 @@
5228	5730	private MenuItem showleavesItem;
5229	5731	private MenuItem markleavesItem;
5230	5732	private MenuItem unmarkleavesItem;
	5733	+ private MenuItem rewindleavesItem;
	5734	+ private MenuItem unrewindleavesItem;
	5735	+ private MenuItem randomleavesItem;
	5736	+ private MenuItem unrandomleavesItem;
5231	5737
5232	5738	private MenuItem flipVItem;
5233	5739	private MenuItem unflipVItem;
..	..	@@ -5249,7 +5755,7 @@
5249	5755	private MenuItem frontItem;
5250	5756	private MenuItem cameraItem;
5251	5757	private MenuItem compositeItem;
5252		- private MenuItem randomItem;
	5758	+ private MenuItem switchItem;
5253	5759	private MenuItem physicsItem;
5254	5760	private MenuItem frameselectorItem;
5255	5761	private MenuItem scriptNodeItem;
..	..	@@ -5323,5 +5829,5 @@
5323	5829
5324	5830	Menu cameraMenu;
5325	5831	MenuItem editCameraItem;
5326		- MenuItem revertCameraItem;
	5832	+ MenuItem restoreCameraItem;
5327	5833	}