~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,6 +167,8 @@
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"));
..	..	@@ -160,7 +179,7 @@
160	179	// redoItem = menu.add(new MenuItem("Redo"));
161	180	// redoItem.addActionListener(this);
162	181	// menu.add("-");
163		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	182	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
164	183	duplicateItem.addActionListener(this);
165	184	cloneItem = menu.add(new MenuItem("Clone"));
166	185	cloneItem.addActionListener(this);
..	..	@@ -176,7 +195,6 @@
176	195	copyItem.addActionListener(this);
177	196	pasteItem = menu.add(new MenuItem("Paste"));
178	197	pasteItem.addActionListener(this);
179		- menu.add("-");
180	198
181	199	menu.add("-");
182	200	pasteIntoItem = menu.add(new MenuItem("Paste into"));
..	..	@@ -188,8 +206,8 @@
188	206	// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
189	207	// pasteExpandItem.addActionListener(this);
190	208	menu.add("-");
191		- clearItem = menu.add(new MenuItem("Clear"));
192		- clearItem.addActionListener(this);
	209	+ deleteItem = menu.add(new MenuItem("Delete"));
	210	+ deleteItem.addActionListener(this);
193	211
194	212	if (Globals.ADVANCED)
195	213	{
..	..	@@ -203,23 +221,23 @@
203	221	//zBufferItem.addActionListener(this);
204	222	//cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
205	223	//normalLensItem.addActionListener(this);
206		- cameraMenu.add(revertCameraItem = new MenuItem("Restore Viewpoint"));
207		- revertCameraItem.addActionListener(this);
	224	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	225	+ restoreCameraItem.addActionListener(this);
208	226
209		- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
210		- toggleFullScreenItem.addItemListener(this);
211		- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
212		- 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);
213	239
214		- cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
215		- toggleTextureItem.addItemListener(this);
216		- toggleTextureItem.setState(CameraPane.textureon);
217		-
218		- cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
219		- toggleSwitchItem.addItemListener(this);
220		- toggleSwitchItem.setState(CameraPane.SWITCH);
221		-
222		- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
	240	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
223	241	toggleHandleItem.addItemListener(this);
224	242	toggleHandleItem.setState(CameraPane.HANDLES);
225	243
..	..	@@ -246,7 +264,7 @@
246	264
247	265	cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
248	266	toggleDebugItem.addItemListener(this);
249		- toggleDebugItem.setState(CameraPane.DEBUG);
	267	+ toggleDebugItem.setState(Globals.DEBUG);
250	268
251	269	cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
252	270	toggleFrustumItem.addItemListener(this);
..	..	@@ -274,7 +292,7 @@
274	292	{
275	293	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
276	294	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
277		- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
	295	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
278	296	editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
279	297	oe.cameraMenu.add("-");
280	298	openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
..	..	@@ -282,7 +300,7 @@
282	300	editLeafItem.addActionListener(this);
283	301	lookAtItem.addActionListener(this);
284	302	//lookFromItem.addActinoListener(this);
285		- //switchItem.addActionListener(this);
	303	+ //switchViewItem.addActionListener(this);
286	304	}
287	305
288	306	oe.menuBar.add(menu = new Menu("Setting"));
..	..	@@ -327,21 +345,29 @@
327	345	}
328	346
329	347	oe.menuBar.add(menu = new Menu("Group"));
330		- grabItem = menu.add(new MenuItem("Grab"));
331		- grabItem.addActionListener(this);
	348	+// grabItem = menu.add(new MenuItem("Grab"));
	349	+// grabItem.addActionListener(this);
332	350	backItem = menu.add(new MenuItem("Back"));
333	351	backItem.addActionListener(this);
334	352	frontItem = menu.add(new MenuItem("Front"));
335	353	frontItem.addActionListener(this);
336		- compositeItem = menu.add(new MenuItem("Composite"));
337		- compositeItem.addActionListener(this);
	354	+// compositeItem = menu.add(new MenuItem("Composite"));
	355	+// compositeItem.addActionListener(this);
	356	+
	357	+ if (Globals.ADVANCED)
	358	+ {
338	359	hideItem = menu.add(new MenuItem("Hidden Group"));
339	360	hideItem.addActionListener(this);
	361	+ }
340	362	ungroupItem = menu.add(new MenuItem("Ungroup"));
341	363	ungroupItem.addActionListener(this);
342		- menu.add("-");
343		- randomItem = menu.add(new MenuItem("Switch node"));
344		- 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	+ {
345	371	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
346	372	switchGeoItem.addActionListener(this);
347	373	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
..	..	@@ -349,8 +375,6 @@
349	375	morphItem = menu.add(new MenuItem("Morph Group"));
350	376	morphItem.addActionListener(this);
351	377
352		- if (Globals.ADVANCED)
353		- {
354	378	menu.add("-");
355	379	physicsItem = menu.add(new MenuItem("Physics"));
356	380	physicsItem.addActionListener(this);
..	..	@@ -358,30 +382,29 @@
358	382	frameselectorItem.addActionListener(this);
359	383	scriptNodeItem = menu.add(new MenuItem("Script Node"));
360	384	scriptNodeItem.addActionListener(this);
361		- cameraItem = menu.add(new MenuItem("Camera"));
362		- cameraItem.addActionListener(this);
363	385	}
364	386
365	387	oe.menuBar.add(menu = new Menu("Object"));
366		- textureItem = menu.add(new MenuItem("Texture"));
367		- textureItem.addActionListener(this);
	388	+// textureItem = menu.add(new MenuItem("Texture"));
	389	+// textureItem.addActionListener(this);
368	390	billboardItem = menu.add(new MenuItem("Billboard"));
369	391	billboardItem.addActionListener(this);
370	392	csgItem = menu.add(new MenuItem("CSG"));
371	393	csgItem.addActionListener(this);
372		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	394	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
373	395	shadowXItem.addActionListener(this);
374		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	396	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
375	397	shadowYItem.addActionListener(this);
376		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	398	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
377	399	shadowZItem.addActionListener(this);
	400	+ attributeItem = menu.add(new MenuItem("Attribute"));
	401	+ attributeItem.addActionListener(this);
	402	+
378	403	if (Globals.ADVANCED)
379	404	{
380	405	menu.add("-");
381	406	linkerItem = menu.add(new MenuItem("Linker"));
382	407	linkerItem.addActionListener(this);
383		- attributeItem = menu.add(new MenuItem("Attribute"));
384		- attributeItem.addActionListener(this);
385	408	templateItem = menu.add(new MenuItem("Template"));
386	409	templateItem.addActionListener(this);
387	410	pointflowItem = menu.add(new MenuItem("Point Flow"));
..	..	@@ -410,7 +433,7 @@
410	433	genNormalsMESHItem.addActionListener(this);
411	434	if (Globals.ADVANCED)
412	435	{
413		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	436	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
414	437	genNormalsMINEItem.addActionListener(this);
415	438	}
416	439	stripifyItem = menu.add(new MenuItem("Stripify"));
..	..	@@ -533,8 +556,21 @@
533	556	buildToolsMenu(menu);
534	557	}
535	558
	559	+
536	560	void SetupUI2(ObjEditor oe)
537	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	+
538	574	//new Exception().printStackTrace();
539	575
540	576	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -563,39 +599,79 @@
563	599	oe.radioPanel.add(dummyButton);
564	600	oe.buttonGroup.add(dummyButton);
565	601	*/
	602	+ cGridBag copyOptionsPanel = new cGridBag();
	603	+
	604	+ copyOptionsPanel.preferredHeight = 1;
	605	+
566	606	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
567	607
568		- oe.toolbarPanel.add(undoButton = new cButton("Undo", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
569		- undoButton.setToolTipText("Undo changes");
570		- undoButton.addActionListener(this);
	608	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	609	+ //minButton.setToolTipText("Minimize window");
	610	+ //minButton.addActionListener(this);
571	611
572		- oe.toolbarPanel.add(redoButton = new cButton("Redo", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
573		- redoButton.setToolTipText("Redo changes");
574		- redoButton.addActionListener(this);
	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	+ }
575	618
576		- oe.toolbarPanel.add(saveButton = new cButton("Save", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
577		- saveButton.setToolTipText("Save changes");
	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");
578	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);
579	639
580		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
	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);
581	659	liveCB.setToolTipText("Enable animation");
582	660	liveCB.addItemListener(this);
583	661
584		- oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	662	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
585	663	oneStepButton.setToolTipText("Animate one step forward");
586	664	oneStepButton.addActionListener(this);
587	665
588		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	666	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
589	667	fastCB.setToolTipText("Fast mode");
590	668	fastCB.addItemListener(this);
591	669
592		- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
593		- trackCB.setToolTipText("Enable tracking");
594		- trackCB.addItemListener(this);
595		-
596		- oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
597		- screenfitButton.setToolTipText("Screen fit");
598		- 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);
599	675
600	676	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
601	677	// screenfitpointButton.addActionListener(this);
..	..	@@ -607,65 +683,146 @@
607	683	snapobjectButton.setToolTipText("Snap Object");
608	684	}
609	685
610		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
611		- flashSelectionButton.setToolTipText("Show selection");
612		- flashSelectionButton.addActionListener(this);
	686	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
613	687
614		- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
615		-
616		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
617		- twoButton.setToolTipText("Show center view only");
618		- twoButton.addActionListener(this);
619		- oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	688	+ oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
620	689	fourButton.addActionListener(this);
621	690	fourButton.setToolTipText("Show left panel only");
622		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
623		- sixButton.setToolTipText("2-column layout left");
	691	+
	692	+ oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	693	+ twoButton.setToolTipText("Show right view only");
	694	+ twoButton.addActionListener(this);
	695	+ this.fullscreenLayout = twoButton;
	696	+
	697	+ oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	698	+ sixButton.setToolTipText("Show left and right");
624	699	sixButton.addActionListener(this);
625		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
626		- threeButton.setToolTipText("2-column layout right");
627		- threeButton.addActionListener(this);
628		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
629		- sevenButton.setToolTipText("3-column layout");
630		- sevenButton.addActionListener(this);
	700	+// oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	701	+// threeButton.setToolTipText("2-column layout right");
	702	+// threeButton.addActionListener(this);
	703	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	704	+// sevenButton.setToolTipText("3-column layout");
	705	+// sevenButton.addActionListener(this);
631	706	//
632	707
633		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
634		- rootButton.setToolTipText("Edit selection in new tab");
	708	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	709	+ rootButton.setToolTipText("Open selection in new tab");
635	710	rootButton.addActionListener(this);
636	711
637		- oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	712	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
638	713	closeButton.setToolTipText("Close tab");
639	714	closeButton.addActionListener(this);
640	715	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
641	716	//clearButton.addActionListener(this);
642		-
643		- cGridBag commandsPanel = new cGridBag();
	717	+
	718	+ // INSERT
	719	+ oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	720	+ gridButton.setToolTipText("Create grid");
	721	+ gridButton.addActionListener(this);
	722	+
	723	+ oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	724	+ boxButton.setToolTipText("Create box");
	725	+ boxButton.addActionListener(this);
	726	+
	727	+ oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	728	+ sphereButton.setToolTipText("Create sphere");
	729	+ sphereButton.addActionListener(this);
	730	+
	731	+ oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	732	+ coneButton.setToolTipText("Create cone");
	733	+ coneButton.addActionListener(this);
	734	+
	735	+ oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	736	+ torusButton.setToolTipText("Create torus");
	737	+ torusButton.addActionListener(this);
	738	+
	739	+ oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	740	+ superButton.setToolTipText("Create superellipsoid");
	741	+ superButton.addActionListener(this);
	742	+
	743	+ if (Globals.ADVANCED)
	744	+ {
	745	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	746	+ kleinButton.setToolTipText("Create Klein bottle");
	747	+ kleinButton.addActionListener(this);
	748	+ }
644	749
645		- commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
646		- editButton.setToolTipText("Edit selection");
	750	+ oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	751	+ particlesButton.setToolTipText("Create particle system");
	752	+ particlesButton.addActionListener(this);
	753	+
	754	+ oe.toolboxPanel.Return();
	755	+
	756	+ oe.toolboxPanel.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	757	+ groupButton.setToolTipText("Create group");
	758	+ groupButton.addActionListener(this);
	759	+
	760	+ oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	761	+ compositeButton.setToolTipText("Create composite");
	762	+ compositeButton.addActionListener(this);
	763	+
	764	+ oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	765	+ switchButton.setToolTipText("Create item switcher");
	766	+ switchButton.addActionListener(this);
	767	+
	768	+ oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	769	+ loopButton.setToolTipText("Create loop");
	770	+ loopButton.addActionListener(this);
	771	+
	772	+ oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	773	+ textureButton.setToolTipText("Create texture");
	774	+ textureButton.addActionListener(this);
	775	+
	776	+ oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	777	+ overlayButton.setToolTipText("Create overlay");
	778	+ overlayButton.addActionListener(this);
	779	+
	780	+ oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	781	+ lightButton.setToolTipText("Create light");
	782	+ lightButton.addActionListener(this);
	783	+
	784	+ for (int i=6; --i>=0;)
	785	+ {
	786	+ oe.toolboxPanel.Return();
	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	+ oe.toolboxPanel.add(new cGridBag());
	794	+ }
	795	+
	796	+ // EDIT panel
	797	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	798	+ editButton.setToolTipText("Pin selection controls");
647	799	editButton.addActionListener(this);
648	800
649		- commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
650		- uneditButton.setToolTipText("Unedit selection");
	801	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	802	+ uneditButton.setToolTipText("Remove selection controls");
651	803	uneditButton.addActionListener(this);
652	804
653		- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
654		- allParamsButton.setToolTipText("Edit all params");
	805	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	806	+ allParamsButton.setToolTipText("Show all controle");
655	807	allParamsButton.addActionListener(this);
656	808
657		- commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	809	+ editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
658	810	clearPanelButton.setToolTipText("Clear edit panel");
659	811	clearPanelButton.addActionListener(this);
660	812
661		- commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	813	+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
662	814	unselectButton.setToolTipText("Unselect");
663	815	unselectButton.addActionListener(this);
664	816
665		- commandsPanel.preferredHeight = 1;
	817	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	818	+ flashSelectionButton.setToolTipText("Highlight selection");
	819	+ flashSelectionButton.addActionListener(this);
666	820
667		- oe.treePanel.add(commandsPanel);
668		- oe.treePanel.Return();
	821	+ editCommandsPanel.preferredHeight = 1;
	822	+
	823	+ SetPinStates(false);
	824	+// oe.treePanel.add(commandsPanel);
	825	+// oe.treePanel.Return();
669	826
670	827	// oe.aConstraints.gridx += 1;
671	828	// oe.aConstraints.weighty = 0;
..	..	@@ -682,29 +839,17 @@
682	839
683	840	JScrollPane jSP;
684	841	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
685		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	842	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
686	843	ResetModel();
687	844
688	845	oe.treePanel.add(jSPPanel);
689	846	oe.treePanel.Return();
690	847
691		- cGridBag copyOptionsPanel = new cGridBag();
692		-
693		- copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
694		- colorCB.setToolTipText("Copy color when dropped");
695		- colorCB.addItemListener(this);
696		-
697		- copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
698		- materialCB.setToolTipText("Copy material when dropped");
699		- materialCB.addItemListener(this);
700		-
701		- copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
702		- textureCB.setToolTipText("Copy texture when dropped");
703		- textureCB.addItemListener(this);
704		-
705		- copyOptionsPanel.preferredHeight = 1;
706	848	oe.treePanel.add(copyOptionsPanel);
707	849	oe.treePanel.Return();
	850	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	851	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	852	+ sliderPane.preferredHeight = 1;
708	853
709	854	// mainPanel.setDividerLocation(0.5); //1.0);
710	855	// mainPanel.setResizeWeight(0.5);
..	..	@@ -727,29 +872,49 @@
727	872	dgr.addDragGestureListener(this);
728	873	}catch(Exception e) {}
729	874	*/
730		- radio.layout = sevenButton;
	875	+ radio.layout = sixButton; // sevenButton;
731	876	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
732	877	}
733	878
734	879	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
735	880	{
	881	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	882	+ colorCB.setToolTipText("Copy color when dropped");
	883	+ colorCB.addItemListener(this);
	884	+
	885	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	886	+ materialCB.setToolTipText("Copy material when dropped");
	887	+ materialCB.addItemListener(this);
	888	+
	889	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	890	+ textureCB.setToolTipText("Copy texture when dropped");
	891	+ textureCB.addItemListener(this);
	892	+
	893	+ panel.Return();
	894	+
736	895	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
737	896	boxCB.setToolTipText("Display bounding boxes");
738	897	boxCB.addItemListener(this);
739	898
740	899	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
741		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	900	+ zoomBoxCB.setToolTipText("Display only for wheel");
742	901	zoomBoxCB.addItemListener(this);
743	902
744	903	if (true) // Globals.ADVANCED)
745	904	{
746		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
747		- supportCB.setToolTipText("Enable rigging");
748		- supportCB.addItemListener(this);
	905	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	906	+// supportCB.setToolTipText("Enable rigging");
	907	+// supportCB.addItemListener(this);
	908	+
	909	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	910	+ freezeCB.setToolTipText("Fast moving camera");
	911	+ freezeCB.addItemListener(this);
749	912
750	913	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
751	914	// localCB.addItemListener(this);
752	915
	916	+ panel.Return();
	917	+
753	918	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
754	919	crowdCB.setToolTipText("Used for crowds");
755	920	crowdCB.addItemListener(this);
..	..	@@ -766,6 +931,8 @@
766	931	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
767	932	// speakerMocapCB.addItemListener(this);
768	933
	934	+ panel.Return();
	935	+
769	936	if (false)
770	937	{
771	938	// handled in scripts
..	..	@@ -780,34 +947,74 @@
780	947	//constraints.gridy += 1;
781	948	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
782	949	smoothfocusCB.addItemListener(this);
	950	+ panel.Return();
783	951	}
784	952
785	953	//constraints.gridx += 1;
786	954	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
787	955	// debugCB.addItemListener(this);
788	956
	957	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	958	+ trackCB.setToolTipText("Enable tracking target");
	959	+ trackCB.addItemListener(this);
	960	+
789	961	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	962	+ oeilCB.setToolTipText("Move camera when tracking");
790	963	oeilCB.addItemListener(this);
791	964
	965	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	966	+ shadowCB.setToolTipText("When live compute shadows");
	967	+ shadowCB.addItemListener(this);
	968	+
	969	+ panel.Return();
	970	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	971	+ toggleTextureCB.setToolTipText("Load textures");
	972	+ toggleTextureCB.addItemListener(this);
	973	+
	974	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	975	+ toggleSwitchCB.setToolTipText("Choose a single item");
	976	+ toggleSwitchCB.addItemListener(this);
	977	+
	978	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	979	+ autokeepCB.setToolTipText("On structure change");
	980	+ autokeepCB.addItemListener(this);
	981	+
	982	+ panel.Return();
	983	+ if (Globals.ADVANCED)
	984	+ {
792	985	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
793	986	lookAtCB.setToolTipText("Look-at target");
794	987	lookAtCB.addItemListener(this);
	988	+ }
795	989
796	990	}
797	991
798	992	cGridBag fill = new cGridBag();
799		-
800	993	fill.preferredHeight = 200;
	994	+ cGridBag fill2 = new cGridBag();
	995	+ fill2.preferredHeight = 200;
	996	+ cGridBag fill3 = new cGridBag();
	997	+ fill3.preferredHeight = 200;
801	998
802	999	panel.add(fill);
	1000	+ panel.add(fill2);
	1001	+ panel.add(fill3);
803	1002
804	1003	}
805	1004
806	1005	void EditObject(Object3D obj)
807	1006	{
808	1007	cRadio radioButton = new cRadio(obj.name);
	1008	+
	1009	+ // June 2019. Patch to avoid bug with transparency.
	1010	+ radioButton.hadMaterial = obj.material != null;
	1011	+ if (!radioButton.hadMaterial)
	1012	+ {
	1013	+ obj.material = new cMaterial();
	1014	+ }
	1015	+
809	1016	radioButton.SetObject(obj);
810		- radioButton.layout = sevenButton;
	1017	+ radioButton.layout = sixButton; // sevenButton;
811	1018	radioButton.SetCamera(cameraView.renderCamera, false);
812	1019	radioButton.addActionListener(this);
813	1020	radioPanel.add(radioButton);
..	..	@@ -817,6 +1024,8 @@
817	1024
818	1025	void SetupViews(ObjEditor oe)
819	1026	{
	1027	+ theFrame = this;
	1028	+
820	1029	oe.SetupViews();
821	1030
822	1031	System.out.println("SetupViews");
..	..	@@ -825,23 +1034,28 @@
825	1034	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
826	1035	}
827	1036
828		- JCheckBox liveCB;
829		- JCheckBox supportCB;
830		- JCheckBox localCB;
831		- JCheckBox crowdCB;
832		- JCheckBox smoothCB;
833		- JCheckBox fastCB;
834		- JCheckBox slowCB;
835		- JCheckBox boxCB;
836		- JCheckBox zoomBoxCB;
837		- JCheckBox trackCB;
838		- JCheckBox smoothfocusCB;
	1037	+ cToggleButton liveCB;
	1038	+ cCheckBox supportCB;
	1039	+ cCheckBox localCB;
	1040	+ cCheckBox crowdCB;
	1041	+ cCheckBox smoothCB;
	1042	+ cToggleButton fastCB;
	1043	+ cCheckBox slowCB;
	1044	+ cCheckBox boxCB;
	1045	+ cCheckBox zoomBoxCB;
	1046	+ cCheckBox freezeCB;
	1047	+ //cToggleButton trackCB;
	1048	+ cCheckBox trackCB;
	1049	+ cCheckBox smoothfocusCB;
839	1050	// JCheckBox speakerMocapCB;
840		- JCheckBox speakerCameraCB;
841		- JCheckBox speakerFocusCB;
842		- JCheckBox debugCB;
843		- JCheckBox oeilCB;
844		- JCheckBox lookAtCB;
	1051	+ cCheckBox speakerCameraCB;
	1052	+ cCheckBox speakerFocusCB;
	1053	+ cCheckBox debugCB;
	1054	+
	1055	+ cCheckBox oeilCB;
	1056	+ cCheckBox shadowCB;
	1057	+ cCheckBox autokeepCB;
	1058	+ cCheckBox lookAtCB;
845	1059
846	1060	// static int COLOR = 1;
847	1061	// static int MATERIAL = 2;
..	..	@@ -849,9 +1063,9 @@
849	1063
850	1064	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
851	1065
852		- JCheckBox colorCB;
853		- JCheckBox materialCB;
854		- JCheckBox textureCB;
	1066	+ cCheckBox colorCB;
	1067	+ cCheckBox materialCB;
	1068	+ cCheckBox textureCB;
855	1069
856	1070	public void itemStateChanged(ItemEvent e)
857	1071	{
..	..	@@ -944,6 +1158,18 @@
944	1158	{
945	1159	cameraView.ToggleOeil();
946	1160	}
	1161	+ else if(e.getSource() == shadowCB)
	1162	+ {
	1163	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1164	+ }
	1165	+ else if(e.getSource() == freezeCB)
	1166	+ {
	1167	+ Globals.FREEZEONMOVE ^= true;
	1168	+ }
	1169	+ else if(e.getSource() == autokeepCB)
	1170	+ {
	1171	+ Globals.REPLACEONMAKE ^= true;
	1172	+ }
947	1173	else if(e.getSource() == lookAtCB)
948	1174	{
949	1175	cameraView.ToggleLookAt();
..	..	@@ -960,7 +1186,8 @@
960	1186
961	1187	/**/
962	1188	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
963		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1189	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1190	+ TreePath path = objEditor.jTree.getSelectionPath();
964	1191	if ((path == null) \|\| (path.getPathCount() <= 1)) {
965	1192	// We can't move the root node or an empty selection
966	1193	return;
..	..	@@ -1023,8 +1250,6 @@
1023	1250	}
1024	1251	}
1025	1252
1026		- String string = (String) object;
1027		-
1028	1253	System.out.println("Transfer = " + object + "; drop : " + target);
1029	1254	// if( object instanceof java.io.File[])
1030	1255	// {
..	..	@@ -1032,6 +1257,8 @@
1032	1257	// objEditor.DropFile((java.io.File[]) object, true);
1033	1258	// return;
1034	1259	// }
	1260	+
	1261	+ String string = object.toString();
1035	1262
1036	1263	// File path for Mac and Windows
1037	1264	if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
..	..	@@ -1077,23 +1304,33 @@
1077	1304
1078	1305	assert target == objEditor.jTree;
1079	1306	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1307	+ Object3D destinationLeaf;
1080	1308	try {
1081		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1309	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
1082	1310	} catch (Exception e) {
1083	1311	System.out.println("destinationPath : " + destinationPath);
1084	1312	return;
1085	1313	}
1086	1314
1087		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1315	+ for (int i=group.selection.size(); --i>=0;)
1088	1316	{
	1317	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1318	+
	1319	+ // Cannot move into itself
	1320	+ if (child == destinationLeaf)
	1321	+ return;
	1322	+ }
	1323	+
	1324	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1325	+// {
1089	1326	loadClipboard(true);
1090	1327	objEditor.jTree.setSelectionPath(destinationPath);
1091	1328	pasteInto(false, false);
1092		- } else {
1093		- loadClipboard(false);
1094		- objEditor.jTree.setSelectionPath(destinationPath);
1095		- pasteInto(false, false); // true); // ???
1096		- }
	1329	+// } else {
	1330	+// loadClipboard(false);
	1331	+// objEditor.jTree.setSelectionPath(destinationPath);
	1332	+// pasteInto(false, false); // true); // ???
	1333	+// }
1097	1334	}
1098	1335	public void dropActionChanged(DropTargetDragEvent dtde)
1099	1336	// Called if the user has modified the current drop gesture
..	..	@@ -1198,22 +1435,30 @@
1198	1435	{
1199	1436	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1200	1437	//heightFieldItem.addActionListener(this);
1201		- gridItem = menu.add(new MenuItem("Grid"));
1202		- gridItem.addActionListener(this);
1203		- rectoidItem = menu.add(new MenuItem("Box"));
1204		- rectoidItem.addActionListener(this);
1205		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1206		- ellipsoidItem.addActionListener(this);
1207		- coneItem = menu.add(new MenuItem("Cone"));
1208		- coneItem.addActionListener(this);
1209		- torusItem = menu.add(new MenuItem("Torus"));
1210		- torusItem.addActionListener(this);
1211		- superItem = menu.add(new MenuItem("Superellipsoid"));
1212		- superItem.addActionListener(this);
	1438	+// gridItem = menu.add(new MenuItem("Grid"));
	1439	+// gridItem.addActionListener(this);
	1440	+// rectoidItem = menu.add(new MenuItem("Box"));
	1441	+// rectoidItem.addActionListener(this);
	1442	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1443	+// ellipsoidItem.addActionListener(this);
	1444	+// coneItem = menu.add(new MenuItem("Cone"));
	1445	+// coneItem.addActionListener(this);
	1446	+// torusItem = menu.add(new MenuItem("Torus"));
	1447	+// torusItem.addActionListener(this);
	1448	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1449	+// superItem.addActionListener(this);
	1450	+
	1451	+ cameraItem = menu.add(new MenuItem("Camera"));
	1452	+ cameraItem.addActionListener(this);
	1453	+
	1454	+ if (!Globals.ADVANCED)
	1455	+ {
1213	1456	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1214	1457	kleinItem.addActionListener(this);
1215		- particleItem = menu.add(new MenuItem("Particle system"));
1216		- particleItem.addActionListener(this);
	1458	+ }
	1459	+
	1460	+// particleItem = menu.add(new MenuItem("Particle system"));
	1461	+// particleItem.addActionListener(this);
1217	1462	if (Globals.ADVANCED)
1218	1463	{
1219	1464	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1239,15 +1484,15 @@
1239	1484	}
1240	1485	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1241	1486	bezierItem.addActionListener(this);
1242		- overlayItem = menu.add(new MenuItem("Overlay"));
1243		- overlayItem.addActionListener(this);
1244		- lightItem = menu.add(new MenuItem("Light"));
1245		- lightItem.addActionListener(this);
	1487	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1488	+// overlayItem.addActionListener(this);
	1489	+// lightItem = menu.add(new MenuItem("Light"));
	1490	+// lightItem.addActionListener(this);
1246	1491	menu.add("-");
1247	1492	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1248	1493	//superLoopItem.addActionListener(this);
1249		- loopItem = menu.add(new MenuItem("Loop"));
1250		- loopItem.addActionListener(this);
	1494	+// loopItem = menu.add(new MenuItem("Loop"));
	1495	+// loopItem.addActionListener(this);
1251	1496	doubleItem = menu.add(new MenuItem("Fork"));
1252	1497	doubleItem.addActionListener(this);
1253	1498	if (Globals.ADVANCED)
..	..	@@ -1263,6 +1508,9 @@
1263	1508	animationItem.addItemListener(this);
1264	1509	animationItem.setState(Globals.ANIMATION);
1265	1510
	1511	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1512	+ archiveItem.addActionListener(this);
	1513	+
1266	1514	menu.add("-");
1267	1515	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1268	1516	parseverticesItem.addActionListener(this);
..	..	@@ -1275,6 +1523,8 @@
1275	1523	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1276	1524	reduce34MorphItem.addActionListener(this);
1277	1525	menu.add("-");
	1526	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	1527	+ memoryItem.addActionListener(this);
1278	1528	menu.add(computeAOItem = new MenuItem("Compute AO"));
1279	1529	computeAOItem.addActionListener(this);
1280	1530
..	..	@@ -1283,8 +1533,6 @@
1283	1533	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1284	1534	mirrorItem.addActionListener(this);
1285	1535	menu.add("-");
1286		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1287		- memoryItem.addActionListener(this);
1288	1536	menu.add(analyzeItem = new MenuItem("Analyze"));
1289	1537	analyzeItem.addActionListener(this);
1290	1538	menu.add(dumpItem = new MenuItem("Print"));
..	..	@@ -1428,9 +1676,34 @@
1428	1676	shadow.material = new cMaterial(obj.material);
1429	1677	shadow.material.diffuse = 0.0001f;
1430	1678	shadow.material.specular = 0.0001f;
	1679	+ //shadow.projectedVertices[1].x = 300;
1431	1680
1432	1681	makeSomething(shadow);
1433	1682	}
	1683	+
	1684	+ private void ClearUnpinned()
	1685	+ {
	1686	+ //for (Object3D obj : listUI)
	1687	+ for (int i=listUI.size(); --i>=0;)
	1688	+ {
	1689	+ Object3D obj = listUI.elementAt(i);
	1690	+ if (!obj.pinned)
	1691	+ {
	1692	+ obj.CloseUI();
	1693	+ listUI.remove(i);
	1694	+ }
	1695	+ }
	1696	+ }
	1697	+
	1698	+ private void EditElement(Object3D elem, boolean newWindow)
	1699	+ {
	1700	+ // if (!(elem instanceof Composite))
	1701	+ // newWindow = false;
	1702	+ listUI.add(elem);
	1703	+ elem.openEditWindow(this, newWindow); //, false);
	1704	+ System.out.println("edit : " + elem);
	1705	+ elem.editWindow.refreshContents(true); // ? new
	1706	+ }
1434	1707
1435	1708	/**
1436	1709	* applyExample
..	..	@@ -1675,7 +1948,7 @@
1675	1948	{
1676	1949	ScreenFit();
1677	1950	} else
1678		- if (source == switchItem)
	1951	+ if (source == switchViewItem)
1679	1952	{
1680	1953	cVector v1 = new cVector();
1681	1954	cVector v2 = new cVector();
..	..	@@ -1684,11 +1957,11 @@
1684	1957	objEditor.cameraView.renderCamera.setAim(v2, v1);
1685	1958	objEditor.cameraView.repaint();
1686	1959	} else
1687		- if (source == rectoidItem)
	1960	+ if (source == rectoidItem \|\| source == boxButton)
1688	1961	{
1689	1962	makeSomething(new Box());
1690	1963	} else
1691		- if (source == particleItem)
	1964	+ if (source == particleItem \|\| source == particlesButton)
1692	1965	{
1693	1966	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1694	1967	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1767,27 +2040,27 @@
1767	2040
1768	2041	makeSomething(obj);
1769	2042	} else
1770		- if (source == gridItem)
	2043	+ if (source == gridItem \|\| source == gridButton)
1771	2044	{
1772	2045	makeSomething(new Grid());
1773	2046	} else
1774		- if (source == ellipsoidItem)
	2047	+ if (source == ellipsoidItem \|\| source == sphereButton)
1775	2048	{
1776	2049	makeSomething(new Sphere());
1777	2050	} else
1778		- if (source == coneItem)
	2051	+ if (source == coneItem \|\| source == coneButton)
1779	2052	{
1780	2053	makeSomething(new Cone());
1781	2054	} else
1782		- if (source == torusItem)
	2055	+ if (source == torusItem \|\| source == torusButton)
1783	2056	{
1784	2057	makeSomething(new Torus());
1785	2058	} else
1786		- if (source == superItem)
	2059	+ if (source == superItem \|\| source == superButton)
1787	2060	{
1788	2061	makeSomething(new Superellipsoid());
1789	2062	} else
1790		- if (source == kleinItem)
	2063	+ if (source == kleinItem \|\| source == kleinButton)
1791	2064	{
1792	2065	makeSomething(new Klein());
1793	2066	} else
..	..	@@ -1807,7 +2080,7 @@
1807	2080	{
1808	2081	makeSomething(new BezierSurface());
1809	2082	} else
1810		- if (source == overlayItem)
	2083	+ if (source == overlayItem \|\| source == overlayButton)
1811	2084	{
1812	2085	/*
1813	2086	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1855,7 +2128,7 @@
1855	2128	s.setup();
1856	2129	makeSomething(s);
1857	2130	} else
1858		- if (source == lightItem)
	2131	+ if (source == lightItem \|\| source == lightButton)
1859	2132	{
1860	2133	makeSomething(new Light());
1861	2134	} else
..	..	@@ -1905,30 +2178,30 @@
1905	2178
1906	2179	group(g);
1907	2180	} else
1908		- if (source == loopItem)
	2181	+ if (source == loopItem \|\| source == loopButton)
1909	2182	{
1910	2183	Composite csg = new GroupLeaf();
1911	2184	csg.count = 5;
1912	2185	group(csg);
1913		- Composite child = new cGroup();
	2186	+ Composite child = new cGroup("Branch");
1914	2187	csg.addChild(child);
1915	2188	child.addChild(csg);
1916	2189	} else
1917	2190	if (source == doubleItem)
1918	2191	{
1919		- Composite csg = new GroupLeaf();
	2192	+ Composite csg = new GroupLeaf("Fork");
1920	2193	csg.count = 5;
1921	2194	group(csg);
1922		- Composite child = new cGroup();
	2195	+ Composite child = new cGroup("Branch A");
1923	2196	csg.addChild(child);
1924	2197	child.addChild(csg);
1925		- child = new cGroup();
	2198	+ child = new cGroup("Branch B");
1926	2199	csg.addChild(child);
1927	2200	child.addChild(csg);
1928	2201	} else
1929	2202	if (source == tripleItem)
1930	2203	{
1931		- Composite csg = new GroupLeaf();
	2204	+ Composite csg = new GroupLeaf("Trident");
1932	2205	csg.count = 4;
1933	2206	group(csg);
1934	2207	Composite child = new cGroup();
..	..	@@ -1978,17 +2251,45 @@
1978	2251	{
1979	2252	DumpObject();
1980	2253	} else
	2254	+ if (source == minButton)
	2255	+ {
	2256	+ Minimize();
	2257	+ } else
	2258	+ if (source == maxButton)
	2259	+ {
	2260	+ Maximize();
	2261	+ } else
	2262	+ if (source == fullButton)
	2263	+ {
	2264	+ ToggleFullScreen();
	2265	+ } else
1981	2266	if (source == undoButton)
1982	2267	{
	2268	+ // Go to previous version
	2269	+ //if (!Undo())
	2270	+ //java.awt.Toolkit.getDefaultToolkit().beep();
1983	2271	Undo();
	2272	+ } else
	2273	+ if (source == restoreButton)
	2274	+ {
	2275	+ // Restore current version
	2276	+ Restore();
	2277	+ } else
	2278	+ if (source == replaceButton)
	2279	+ {
	2280	+ // Overwrite current version
	2281	+ Replace();
1984	2282	} else
1985	2283	if (source == redoButton)
1986	2284	{
	2285	+ // Go to next version
1987	2286	Redo();
1988	2287	} else
1989	2288	if (source == saveButton)
1990	2289	{
1991		- Save();
	2290	+ // Save a new version
	2291	+ if (!Save(true))
	2292	+ java.awt.Toolkit.getDefaultToolkit().beep();
1992	2293	} else
1993	2294	if (source == oneStepButton)
1994	2295	{
..	..	@@ -1997,17 +2298,14 @@
1997	2298	} else
1998	2299	if (source == screenfitButton)
1999	2300	{
2000		- //Reload(lastConverter, lastFilename, true);
2001	2301	ScreenFit();
2002	2302	} else
2003	2303	if (source == screenfitpointButton)
2004	2304	{
2005		- //Reload(lastConverter, lastFilename, true);
2006	2305	ScreenFitPoint();
2007	2306	} else
2008	2307	if (source == snapobjectButton)
2009	2308	{
2010		- //Reload(lastConverter, lastFilename, true);
2011	2309	SnapObject();
2012	2310	} else
2013	2311	// if (event.getSource() == recompileButton)
..	..	@@ -2371,7 +2669,7 @@
2371	2669	{
2372	2670	StepAll();
2373	2671	} else
2374		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	2672	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2375	2673	{
2376	2674	//int indices[] = jList.getSelectedIndices();
2377	2675	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2383,9 +2681,9 @@
2383	2681	{
2384	2682	ClearSelection(true);
2385	2683	} else
2386		- if (source == grabItem)
	2684	+ if (source == grabItem \|\| source == groupButton)
2387	2685	{
2388		- group(new cGroup(), true);
	2686	+ group(new cGroup(), false); // true);
2389	2687	} else
2390	2688	if (source == hideItem)
2391	2689	{
..	..	@@ -2403,11 +2701,11 @@
2403	2701	{
2404	2702	makeSomething(new Camera());
2405	2703	} else
2406		- if (source == compositeItem)
	2704	+ if (source == compositeItem \|\| source == compositeButton)
2407	2705	{
2408	2706	group(new Composite());
2409	2707	} else
2410		- if (source == randomItem)
	2708	+ if (source == switchItem \|\| source == switchButton)
2411	2709	{
2412	2710	RandomNode random = new RandomNode();
2413	2711	group(random);
..	..	@@ -2509,7 +2807,7 @@
2509	2807	{
2510	2808	group(new cLinker());
2511	2809	} else
2512		- if (source == textureItem)
	2810	+ if (source == textureItem \|\| source == textureButton)
2513	2811	{
2514	2812	group(new TextureNode());
2515	2813	} else
..	..	@@ -2529,17 +2827,30 @@
2529	2827	{
2530	2828	CastShadow(2);
2531	2829	} else
2532		- if (source == ungroupItem)
	2830	+ if (source == ungroupItem \|\| source == ungroupButton)
2533	2831	{
2534		- //ungroup();
	2832	+ boolean hasRoot = false;
	2833	+
2535	2834	for (int i=0; i<group.selection.size(); i++)
2536	2835	{
2537		- Ungroup(group.selection.get(i));
	2836	+ if (group.selection.get(i) == group)
	2837	+ {
	2838	+ hasRoot = true;
	2839	+ break;
	2840	+ }
2538	2841	}
2539	2842
2540		- ClearSelection(false);
2541		-
2542		- refreshContents();
	2843	+ if (!hasRoot)
	2844	+ {
	2845	+ for (int i=0; i<group.selection.size(); i++)
	2846	+ {
	2847	+ Ungroup(group.selection.get(i));
	2848	+ }
	2849	+
	2850	+ ClearSelection(false);
	2851	+
	2852	+ refreshContents();
	2853	+ }
2543	2854	} else
2544	2855	if (source == genUVItem)
2545	2856	{
..	..	@@ -2867,6 +3178,10 @@
2867	3178	if (source == twoButton)
2868	3179	{
2869	3180	radio.layout = twoButton;
	3181	+
	3182	+ if (CameraPane.FULLSCREEN)
	3183	+ fullscreenLayout = radio.layout;
	3184	+
2870	3185	// bug
2871	3186	//gridPanel.setDividerLocation(1.0);
2872	3187	//bigPanel.setDividerLocation(0.0);
..	..	@@ -2899,10 +3214,31 @@
2899	3214	bigThree.ClearUI();
2900	3215	bigThree.add(centralPanel);
2901	3216	bigThree.FlushUI();
	3217	+
	3218	+ cameraView.requestFocusInWindow();
	3219	+
	3220	+// refreshContents(true);
	3221	+//
	3222	+// try
	3223	+// {
	3224	+// java.awt.Robot bot = new java.awt.Robot();
	3225	+// int mask = InputEvent.BUTTON1_MASK;
	3226	+// bot.mouseMove(100, 100);
	3227	+// bot.mousePress(mask);
	3228	+// bot.mouseRelease(mask);
	3229	+// }
	3230	+// catch (Exception e)
	3231	+// {
	3232	+//
	3233	+// }
	3234	+
2902	3235	} else
2903	3236	if (source == threeButton)
2904	3237	{
2905	3238	radio.layout = threeButton;
	3239	+
	3240	+ if (CameraPane.FULLSCREEN)
	3241	+ fullscreenLayout = radio.layout;
2906	3242
2907	3243	// bigThree.remove(scenePanel);
2908	3244	// bigThree.remove(centralPanel);
..	..	@@ -2935,10 +3271,15 @@
2935	3271	bigThree.add(centralPanel);
2936	3272	bigThree.add(XYZPanel);
2937	3273	bigThree.FlushUI();
	3274	+
	3275	+ cameraView.requestFocusInWindow();
2938	3276	} else
2939	3277	if (source == fourButton)
2940	3278	{
2941	3279	radio.layout = fourButton;
	3280	+
	3281	+ if (CameraPane.FULLSCREEN)
	3282	+ fullscreenLayout = radio.layout;
2942	3283
2943	3284	// bigThree.remove(scenePanel);
2944	3285	// bigThree.remove(centralPanel);
..	..	@@ -2970,10 +3311,15 @@
2970	3311	bigThree.ClearUI();
2971	3312	bigThree.add(scenePanel);
2972	3313	bigThree.FlushUI();
	3314	+
	3315	+ cameraView.requestFocusInWindow();
2973	3316	} else
2974	3317	if (source == sixButton)
2975	3318	{
2976	3319	radio.layout = sixButton;
	3320	+
	3321	+ if (CameraPane.FULLSCREEN)
	3322	+ fullscreenLayout = radio.layout;
2977	3323
2978	3324	// bigThree.remove(scenePanel);
2979	3325	// bigThree.remove(centralPanel);
..	..	@@ -3006,10 +3352,15 @@
3006	3352	bigThree.add(scenePanel);
3007	3353	bigThree.add(centralPanel);
3008	3354	bigThree.FlushUI();
	3355	+
	3356	+ cameraView.requestFocusInWindow();
3009	3357	} else
3010	3358	if (source == sevenButton)
3011	3359	{
3012	3360	radio.layout = sevenButton;
	3361	+
	3362	+ if (CameraPane.FULLSCREEN)
	3363	+ fullscreenLayout = radio.layout;
3013	3364
3014	3365	// bigThree.remove(scenePanel);
3015	3366	// bigThree.remove(centralPanel);
..	..	@@ -3043,6 +3394,8 @@
3043	3394	bigThree.add(centralPanel);
3044	3395	bigThree.add(XYZPanel);
3045	3396	bigThree.FlushUI();
	3397	+
	3398	+ cameraView.requestFocusInWindow();
3046	3399	} else
3047	3400	if (source == rootButton)
3048	3401	{
..	..	@@ -3054,6 +3407,7 @@
3054	3407	EditObject(obj);
3055	3408	}
3056	3409
	3410	+ cameraView.requestFocusInWindow();
3057	3411	refreshContents(true);
3058	3412	} else
3059	3413	if (source == closeButton)
..	..	@@ -3063,22 +3417,37 @@
3063	3417	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3064	3418	{
3065	3419	ab = (cRadio)e.nextElement();
3066		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3420	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
3067	3421	{
	3422	+ // Patch to avoid bug with transparency.
	3423	+ if (!ab.hadMaterial)
	3424	+ {
	3425	+ ab.object.material = null;
	3426	+ }
	3427	+
3068	3428	buttonGroup.remove(ab);
3069	3429	radioPanel.remove(ab);
3070	3430
3071		- ab.GetObject().editWindow = null;
	3431	+ //ab.GetObject().editWindow = null;
	3432	+ ab.GetObject().manipWindow = null;
3072	3433	// ab.GetObject().objectUI = null; // ?????????
3073	3434
3074	3435	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
3075	3436	break;
3076	3437	}
3077	3438	}
	3439	+
	3440	+ cameraView.requestFocusInWindow();
3078	3441	refreshContents(true);
3079	3442	} else
3080	3443	if (source == editItem \|\| source == editButton)
3081	3444	{
	3445	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3446	+ {
	3447	+ Object3D child = (Object3D)e.nextElement();
	3448	+ child.pinned = true;
	3449	+ }
	3450	+
3082	3451	EditSelection(false);
3083	3452	} else
3084	3453	if (source == uneditButton)
..	..	@@ -3088,6 +3457,7 @@
3088	3457	Object3D child = (Object3D)e.nextElement();
3089	3458	if(child.editWindow != null)
3090	3459	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3460	+ child.pinned = false;
3091	3461	child.CloseUI();
3092	3462	listUI.remove(child);
3093	3463
..	..	@@ -3104,6 +3474,7 @@
3104	3474	//copy.ClearUI();
3105	3475	for (Object3D obj : listUI)
3106	3476	{
	3477	+ obj.pinned = false;
3107	3478	obj.CloseUI();
3108	3479	}
3109	3480	listUI.clear();
..	..	@@ -3113,7 +3484,7 @@
3113	3484	{
3114	3485	assert(copy == group);
3115	3486
3116		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3487	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3117	3488
3118	3489	for (Object3D obj : listUI)
3119	3490	{
..	..	@@ -3162,6 +3533,9 @@
3162	3533	}
3163	3534
3164	3535	copy = group;
	3536	+
	3537	+ SetUndoStates();
	3538	+
3165	3539	//Globals.theRenderer.object = group;
3166	3540	if(!useclient)
3167	3541	{
..	..	@@ -3179,7 +3553,8 @@
3179	3553	}
3180	3554
3181	3555	// fix "+" issue
3182		- group.editWindow = this;
	3556	+ //group.editWindow = this;
	3557	+ group.manipWindow = this;
3183	3558
3184	3559	/*
3185	3560	currentLayout = radio.layout;
..	..	@@ -3187,18 +3562,27 @@
3187	3562	currentLayout = sevenButton;
3188	3563	*/
3189	3564	radio.layout.doClick();
	3565	+
	3566	+ ClearUnpinned();
	3567	+ //Grafreed.Assert(group != null);
	3568	+ //Grafreed.Assert(group.selection != null);
	3569	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	3570	+ if (group.selection == null \|\| group.selection.size() == 1)
	3571	+ EditSelection(false);
3190	3572	keepparent = group.parent;
3191	3573	// PARENT = NULL or not???
3192	3574	//group.parent = null; // ROOT
3193	3575	//group.attributes = -1;
3194	3576	ResetModel();
	3577	+
	3578	+ cameraView.requestFocusInWindow();
3195	3579	refreshContents(true);
3196	3580	} else if (event.getSource() == editCameraItem)
3197	3581	{
3198	3582	cameraView.ProtectCamera();
3199	3583	cameraView.repaint();
3200	3584	return;
3201		- } else if (event.getSource() == revertCameraItem)
	3585	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3202	3586	{
3203	3587	cameraView.RevertCamera();
3204	3588	cameraView.repaint();
..	..	@@ -3215,7 +3599,6 @@
3215	3599	}
3216	3600
3217	3601	boolean useclient = false;
3218		- cRadio radio;
3219	3602
3220	3603	void ToggleRoot()
3221	3604	{
..	..	@@ -4253,28 +4636,25 @@
4253	4636	// }
4254	4637	// }
4255	4638
4256		- static boolean allparams = true;
4257		-
4258		- static Vector<Object3D> listUI = new Vector<Object3D>();
4259		-
4260	4639	void EditSelection(boolean newWindow)
4261	4640	{
	4641	+ if (group.selection == null)
	4642	+ {
	4643	+ EditElement(group, newWindow); // ? new
	4644	+ return;
	4645	+ }
	4646	+
4262	4647	// aConstraints.gridy = 0;
4263	4648	for (int i=0; i<group.selection.size(); i++)
4264	4649	{
4265	4650	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4266	4651	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4267		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4652	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4268	4653
4269	4654	Object3D elem = (Object3D)group.selection.elementAt(i);
4270	4655	if(elem != group \|\| !newWindow)
4271	4656	{
4272		- // if (!(elem instanceof Composite))
4273		- // newWindow = false;
4274		- listUI.add(elem);
4275		- elem.openEditWindow(this, newWindow); //, false);
4276		- System.out.println("edit : " + elem);
4277		- elem.editWindow.refreshContents(true); // ? new
	4657	+ EditElement(elem, newWindow); // ? new
4278	4658	}
4279	4659	}
4280	4660	}
..	..	@@ -4349,7 +4729,8 @@
4349	4729	//new Exception().printStackTrace();
4350	4730
4351	4731	freezemodel = true;
4352		-
	4732	+ ClearUnpinned();
	4733	+
4353	4734	/**/
4354	4735	//switch (event.id)
4355	4736	{
..	..	@@ -4382,7 +4763,7 @@
4382	4763	if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4383	4764	// a camera
4384	4765	{
4385		- if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	4766	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
4386	4767	{
4387	4768	CameraPane.camerachangeframe = 0; // don't refuse it
4388	4769	Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
..	..	@@ -4391,6 +4772,13 @@
4391	4772	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4392	4773	}
4393	4774
	4775	+ if (tps != null && tps.length == 1)
	4776	+ {
	4777	+ EditSelection(false);
	4778	+ }
	4779	+
	4780	+ SetPinStates(tps != null && tps.length > 0);
	4781	+
4394	4782	refreshContents();
4395	4783	//return true;
4396	4784	}
..	..	@@ -4400,9 +4788,18 @@
4400	4788	freezemodel = false;
4401	4789	}
4402	4790
	4791	+ void SetPinStates(boolean enabled)
	4792	+ {
	4793	+ editButton.setEnabled(enabled);
	4794	+ uneditButton.setEnabled(enabled);
	4795	+ unselectButton.setEnabled(enabled);
	4796	+ flashSelectionButton.setEnabled(enabled);
	4797	+ }
	4798	+
4403	4799	void refreshContents(boolean cp)
4404	4800	{
4405		- if (!Globals.MOUSEDRAGGED)
	4801	+ if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
	4802	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
4406	4803	{
4407	4804	objEditor.ClearInfo(); // .GetMaterial());
4408	4805
..	..	@@ -4501,7 +4898,8 @@
4501	4898
4502	4899	if (cut)
4503	4900	{
4504		- Save();
	4901	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	4902	+// Save();
4505	4903	//int indices[] = jList.getSelectedIndices();
4506	4904	//for (int i = indices.length - 1; i >= 0; i--)
4507	4905	//jList.remove(indices[i]);
..	..	@@ -4604,6 +5002,10 @@
4604	5002
4605	5003	void paste(boolean expand)
4606	5004	{
	5005	+ if (Globals.REPLACEONMAKE)
	5006	+ Save();
	5007	+ boolean keep = Globals.REPLACEONMAKE;
	5008	+ Globals.REPLACEONMAKE = false;
4607	5009	// if (GrafreeD.clipboard == null)
4608	5010	// return;
4609	5011	boolean first = true;
..	..	@@ -4663,6 +5065,7 @@
4663	5065	Grafreed.clipboard.get(0).parent = keepparent;
4664	5066	}
4665	5067
	5068	+ Globals.REPLACEONMAKE = keep;
4666	5069	ResetModel();
4667	5070	refreshContents();
4668	5071	}
..	..	@@ -4798,6 +5201,10 @@
4798	5201
4799	5202	void group(Object3D csg, boolean grab)
4800	5203	{
	5204	+ if (Globals.REPLACEONMAKE)
	5205	+ Save();
	5206	+ boolean keep = Globals.REPLACEONMAKE;
	5207	+ Globals.REPLACEONMAKE = false;
4801	5208	if (//false) // why??
4802	5209	!group.selection.isEmpty())
4803	5210	{
..	..	@@ -4911,10 +5318,15 @@
4911	5318	//node.add(csg);
4912	5319	//makeSomething(node);
4913	5320	makeSomething(csg);
	5321	+ Globals.REPLACEONMAKE = keep;
4914	5322	}
4915	5323
4916	5324	void Ungroup(Object3D g)
4917	5325	{
	5326	+ if (Globals.REPLACEONMAKE)
	5327	+ Save();
	5328	+ boolean keep = Globals.REPLACEONMAKE;
	5329	+ Globals.REPLACEONMAKE = false;
4918	5330	if (g instanceof HiddenObject)
4919	5331	{
4920	5332	HiddenObject h = (HiddenObject) g;
..	..	@@ -4931,6 +5343,7 @@
4931	5343	objEditor.makeSomething(g.get(i), false);
4932	5344	}
4933	5345	}
	5346	+ Globals.REPLACEONMAKE = keep;
4934	5347	}
4935	5348
4936	5349	void ungroup()
..	..	@@ -5219,10 +5632,28 @@
5219	5632	cButton clearpanelButton;
5220	5633	cButton unselectButton;
5221	5634
	5635	+ cButton restoreCameraButton;
	5636	+
5222	5637	cButton saveButton;
5223		- cButton undoButton;
5224		- cButton redoButton;
5225	5638	cButton oneStepButton;
	5639	+
	5640	+ cButton groupButton;
	5641	+ cButton ungroupButton;
	5642	+ cButton compositeButton;
	5643	+ cButton switchButton;
	5644	+ cButton loopButton;
	5645	+ cButton textureButton;
	5646	+
	5647	+ cButton gridButton;
	5648	+ cButton boxButton;
	5649	+ cButton sphereButton;
	5650	+ cButton coneButton;
	5651	+ cButton torusButton;
	5652	+ cButton superButton;
	5653	+ cButton kleinButton;
	5654	+ cButton particlesButton;
	5655	+ cButton overlayButton;
	5656	+ cButton lightButton;
5226	5657
5227	5658	cButton screenfitButton;
5228	5659	cButton screenfitpointButton;
..	..	@@ -5235,14 +5666,6 @@
5235	5666
5236	5667	cButton setsupportButton;
5237	5668
5238		- cButton twoButton;
5239		- cButton sixButton;
5240		- cButton threeButton;
5241		- cButton sevenButton;
5242		- cButton fourButton; // full panel
5243		- cButton oneButton; // full XYZ
5244		- //cButton currentLayout;
5245		-
5246	5669	//
5247	5670	//Composite
5248	5671	Object3D // to do !!
..	..	@@ -5252,11 +5675,11 @@
5252	5675	//JTree jTree;
5253	5676	private MenuItem lookAtItem;
5254	5677	private MenuItem lookFromItem;
5255		- private MenuItem switchItem;
	5678	+ private MenuItem switchViewItem;
5256	5679	private MenuItem cutItem;
5257	5680	private MenuItem undoItem;
5258	5681	private MenuItem redoItem;
5259		- private MenuItem duplicateItem;
	5682	+ private JMenuItem duplicateItem;
5260	5683	private MenuItem cloneItem;
5261	5684	private MenuItem cloneSupportItem;
5262	5685	private MenuItem overwriteGeoItem;
..	..	@@ -5284,7 +5707,7 @@
5284	5707	private MenuItem pasteLinkItem;
5285	5708	private MenuItem pasteCloneItem;
5286	5709	private MenuItem pasteExpandItem;
5287		- private MenuItem clearItem;
	5710	+ private MenuItem deleteItem;
5288	5711	private MenuItem clearAllItem;
5289	5712	private MenuItem genUVItem;
5290	5713	private MenuItem genNormalsMESHItem;
..	..	@@ -5344,7 +5767,7 @@
5344	5767	private MenuItem frontItem;
5345	5768	private MenuItem cameraItem;
5346	5769	private MenuItem compositeItem;
5347		- private MenuItem randomItem;
	5770	+ private MenuItem switchItem;
5348	5771	private MenuItem physicsItem;
5349	5772	private MenuItem frameselectorItem;
5350	5773	private MenuItem scriptNodeItem;
..	..	@@ -5418,5 +5841,5 @@
5418	5841
5419	5842	Menu cameraMenu;
5420	5843	MenuItem editCameraItem;
5421		- MenuItem revertCameraItem;
	5844	+ MenuItem restoreCameraItem;
5422	5845	}