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