~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
..	..	@@ -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,6 +558,7 @@
533	558	buildToolsMenu(menu);
534	559	}
535	560
	561	+
536	562	void SetupUI2(ObjEditor oe)
537	563	{
538	564	// June 2019
..	..	@@ -575,51 +601,79 @@
575	601	oe.radioPanel.add(dummyButton);
576	602	oe.buttonGroup.add(dummyButton);
577	603	*/
	604	+ cGridBag copyOptionsPanel = new cGridBag();
	605	+
	606	+ copyOptionsPanel.preferredHeight = 1;
	607	+
578	608	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
579	609
580	610	//oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
581	611	//minButton.setToolTipText("Minimize window");
582	612	//minButton.addActionListener(this);
583	613
584		- oe.toolbarPanel.add(maxButton = new cButton("\u271A", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
585		- maxButton.setToolTipText("Maximize window");
586		- maxButton.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	+ }
587	620
588		- oe.toolbarPanel.add(fullButton = new cButton("\u2b1c", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	621	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
589	622	fullButton.setToolTipText("Full-screen window");
590	623	fullButton.addActionListener(this);
591	624
592		- oe.toolbarPanel.add(undoButton = new cButton("\u21a9", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
593		- undoButton.setToolTipText("Undo changes");
594		- undoButton.addActionListener(this);
	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);
595	632
596		- oe.toolbarPanel.add(redoButton = new cButton("\u21aa", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
597		- redoButton.setToolTipText("Redo changes");
598		- redoButton.addActionListener(this);
599		-
600		- oe.toolbarPanel.add(saveButton = new cButton("\u21e3", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
601		- saveButton.setToolTipText("Save changes");
	633	+ copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	634	+ saveButton.setToolTipText("New version");
602	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);
603	641
604		- 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);
605	661	liveCB.setToolTipText("Enable animation");
606	662	liveCB.addItemListener(this);
607	663
608		- oe.toolbarPanel.add(oneStepButton = new cButton("\u29f4", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	664	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
609	665	oneStepButton.setToolTipText("Animate one step forward");
610	666	oneStepButton.addActionListener(this);
611	667
612		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	668	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
613	669	fastCB.setToolTipText("Fast mode");
614	670	fastCB.addItemListener(this);
615	671
616		- oe.toolbarPanel.add(trackCB = new cCheckBox(":", CameraPane.TRACK)); //, oe.aConstraints);
617		- trackCB.setToolTipText("Enable tracking");
618		- trackCB.addItemListener(this);
619		-
620		- oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
621		- screenfitButton.setToolTipText("Screen fit");
622		- 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);
623	677
624	678	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
625	679	// screenfitpointButton.addActionListener(this);
..	..	@@ -631,65 +685,146 @@
631	685	snapobjectButton.setToolTipText("Snap Object");
632	686	}
633	687
634		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
635		- flashSelectionButton.setToolTipText("Show selection");
636		- flashSelectionButton.addActionListener(this);
	688	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
637	689
638		- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
639		-
640		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
641		- twoButton.setToolTipText("Show center view only");
642		- twoButton.addActionListener(this);
643		- oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	690	+ oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
644	691	fourButton.addActionListener(this);
645	692	fourButton.setToolTipText("Show left panel only");
646		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
647		- 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");
648	701	sixButton.addActionListener(this);
649		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
650		- threeButton.setToolTipText("2-column layout right");
651		- threeButton.addActionListener(this);
652		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
653		- sevenButton.setToolTipText("3-column layout");
654		- 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);
655	708	//
656	709
657		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
658		- 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");
659	712	rootButton.addActionListener(this);
660	713
661		- 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);
662	715	closeButton.setToolTipText("Close tab");
663	716	closeButton.addActionListener(this);
664	717	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
665	718	//clearButton.addActionListener(this);
666		-
667		- 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	+ }
668	751
669		- commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
670		- 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");
671	801	editButton.addActionListener(this);
672	802
673		- commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
674		- uneditButton.setToolTipText("Unedit selection");
	803	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	804	+ uneditButton.setToolTipText("Remove selection controls");
675	805	uneditButton.addActionListener(this);
676	806
677		- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
678		- allParamsButton.setToolTipText("Edit all params");
	807	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	808	+ allParamsButton.setToolTipText("Show all controle");
679	809	allParamsButton.addActionListener(this);
680	810
681		- commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	811	+ editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
682	812	clearPanelButton.setToolTipText("Clear edit panel");
683	813	clearPanelButton.addActionListener(this);
684	814
685		- commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	815	+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
686	816	unselectButton.setToolTipText("Unselect");
687	817	unselectButton.addActionListener(this);
688	818
689		- 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);
690	822
691		- oe.treePanel.add(commandsPanel);
692		- oe.treePanel.Return();
	823	+ editCommandsPanel.preferredHeight = 1;
	824	+
	825	+ SetPinStates(false);
	826	+// oe.treePanel.add(commandsPanel);
	827	+// oe.treePanel.Return();
693	828
694	829	// oe.aConstraints.gridx += 1;
695	830	// oe.aConstraints.weighty = 0;
..	..	@@ -706,29 +841,17 @@
706	841
707	842	JScrollPane jSP;
708	843	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
709		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	844	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
710	845	ResetModel();
711	846
712	847	oe.treePanel.add(jSPPanel);
713	848	oe.treePanel.Return();
714	849
715		- cGridBag copyOptionsPanel = new cGridBag();
716		-
717		- copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
718		- colorCB.setToolTipText("Copy color when dropped");
719		- colorCB.addItemListener(this);
720		-
721		- copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
722		- materialCB.setToolTipText("Copy material when dropped");
723		- materialCB.addItemListener(this);
724		-
725		- copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
726		- textureCB.setToolTipText("Copy texture when dropped");
727		- textureCB.addItemListener(this);
728		-
729		- copyOptionsPanel.preferredHeight = 1;
730	850	oe.treePanel.add(copyOptionsPanel);
731	851	oe.treePanel.Return();
	852	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	853	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	854	+ sliderPane.preferredHeight = 1;
732	855
733	856	// mainPanel.setDividerLocation(0.5); //1.0);
734	857	// mainPanel.setResizeWeight(0.5);
..	..	@@ -751,29 +874,49 @@
751	874	dgr.addDragGestureListener(this);
752	875	}catch(Exception e) {}
753	876	*/
754		- radio.layout = sevenButton;
	877	+ radio.layout = sixButton; // sevenButton;
755	878	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
756	879	}
757	880
758	881	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
759	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	+
760	897	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
761	898	boxCB.setToolTipText("Display bounding boxes");
762	899	boxCB.addItemListener(this);
763	900
764	901	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
765		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	902	+ zoomBoxCB.setToolTipText("Display only for wheel");
766	903	zoomBoxCB.addItemListener(this);
767	904
768	905	if (true) // Globals.ADVANCED)
769	906	{
770		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
771		- supportCB.setToolTipText("Enable rigging");
772		- 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);
773	914
774	915	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
775	916	// localCB.addItemListener(this);
776	917
	918	+ panel.Return();
	919	+
777	920	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
778	921	crowdCB.setToolTipText("Used for crowds");
779	922	crowdCB.addItemListener(this);
..	..	@@ -790,6 +933,8 @@
790	933	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
791	934	// speakerMocapCB.addItemListener(this);
792	935
	936	+ panel.Return();
	937	+
793	938	if (false)
794	939	{
795	940	// handled in scripts
..	..	@@ -804,34 +949,74 @@
804	949	//constraints.gridy += 1;
805	950	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
806	951	smoothfocusCB.addItemListener(this);
	952	+ panel.Return();
807	953	}
808	954
809	955	//constraints.gridx += 1;
810	956	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
811	957	// debugCB.addItemListener(this);
812	958
	959	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	960	+ trackCB.setToolTipText("Enable tracking target");
	961	+ trackCB.addItemListener(this);
	962	+
813	963	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	964	+ oeilCB.setToolTipText("Move camera when tracking");
814	965	oeilCB.addItemListener(this);
815	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	+ {
816	987	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
817	988	lookAtCB.setToolTipText("Look-at target");
818	989	lookAtCB.addItemListener(this);
	990	+ }
819	991
820	992	}
821	993
822	994	cGridBag fill = new cGridBag();
823		-
824	995	fill.preferredHeight = 200;
	996	+ cGridBag fill2 = new cGridBag();
	997	+ fill2.preferredHeight = 200;
	998	+ cGridBag fill3 = new cGridBag();
	999	+ fill3.preferredHeight = 200;
825	1000
826	1001	panel.add(fill);
	1002	+ panel.add(fill2);
	1003	+ panel.add(fill3);
827	1004
828	1005	}
829	1006
830	1007	void EditObject(Object3D obj)
831	1008	{
832	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	+
833	1018	radioButton.SetObject(obj);
834		- radioButton.layout = sevenButton;
	1019	+ radioButton.layout = sixButton; // sevenButton;
835	1020	radioButton.SetCamera(cameraView.renderCamera, false);
836	1021	radioButton.addActionListener(this);
837	1022	radioPanel.add(radioButton);
..	..	@@ -851,23 +1036,28 @@
851	1036	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
852	1037	}
853	1038
854		- JCheckBox liveCB;
855		- JCheckBox supportCB;
856		- JCheckBox localCB;
857		- JCheckBox crowdCB;
858		- JCheckBox smoothCB;
859		- JCheckBox fastCB;
860		- JCheckBox slowCB;
861		- JCheckBox boxCB;
862		- JCheckBox zoomBoxCB;
863		- JCheckBox trackCB;
864		- 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;
865	1052	// JCheckBox speakerMocapCB;
866		- JCheckBox speakerCameraCB;
867		- JCheckBox speakerFocusCB;
868		- JCheckBox debugCB;
869		- JCheckBox oeilCB;
870		- JCheckBox lookAtCB;
	1053	+ cCheckBox speakerCameraCB;
	1054	+ cCheckBox speakerFocusCB;
	1055	+ cCheckBox debugCB;
	1056	+
	1057	+ cCheckBox oeilCB;
	1058	+ cCheckBox shadowCB;
	1059	+ cCheckBox autokeepCB;
	1060	+ cCheckBox lookAtCB;
871	1061
872	1062	// static int COLOR = 1;
873	1063	// static int MATERIAL = 2;
..	..	@@ -875,9 +1065,9 @@
875	1065
876	1066	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
877	1067
878		- JCheckBox colorCB;
879		- JCheckBox materialCB;
880		- JCheckBox textureCB;
	1068	+ cCheckBox colorCB;
	1069	+ cCheckBox materialCB;
	1070	+ cCheckBox textureCB;
881	1071
882	1072	public void itemStateChanged(ItemEvent e)
883	1073	{
..	..	@@ -970,6 +1160,18 @@
970	1160	{
971	1161	cameraView.ToggleOeil();
972	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	+ }
973	1175	else if(e.getSource() == lookAtCB)
974	1176	{
975	1177	cameraView.ToggleLookAt();
..	..	@@ -986,7 +1188,8 @@
986	1188
987	1189	/**/
988	1190	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
989		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1191	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1192	+ TreePath path = objEditor.jTree.getSelectionPath();
990	1193	if ((path == null) \|\| (path.getPathCount() <= 1)) {
991	1194	// We can't move the root node or an empty selection
992	1195	return;
..	..	@@ -1049,8 +1252,6 @@
1049	1252	}
1050	1253	}
1051	1254
1052		- String string = (String) object;
1053		-
1054	1255	System.out.println("Transfer = " + object + "; drop : " + target);
1055	1256	// if( object instanceof java.io.File[])
1056	1257	// {
..	..	@@ -1058,6 +1259,8 @@
1058	1259	// objEditor.DropFile((java.io.File[]) object, true);
1059	1260	// return;
1060	1261	// }
	1262	+
	1263	+ String string = object.toString();
1061	1264
1062	1265	// File path for Mac and Windows
1063	1266	if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
..	..	@@ -1103,23 +1306,33 @@
1103	1306
1104	1307	assert target == objEditor.jTree;
1105	1308	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1309	+ Object3D destinationLeaf;
1106	1310	try {
1107		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1311	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
1108	1312	} catch (Exception e) {
1109	1313	System.out.println("destinationPath : " + destinationPath);
1110	1314	return;
1111	1315	}
1112	1316
1113		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1317	+ for (int i=group.selection.size(); --i>=0;)
1114	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	+// {
1115	1328	loadClipboard(true);
1116	1329	objEditor.jTree.setSelectionPath(destinationPath);
1117	1330	pasteInto(false, false);
1118		- } else {
1119		- loadClipboard(false);
1120		- objEditor.jTree.setSelectionPath(destinationPath);
1121		- pasteInto(false, false); // true); // ???
1122		- }
	1331	+// } else {
	1332	+// loadClipboard(false);
	1333	+// objEditor.jTree.setSelectionPath(destinationPath);
	1334	+// pasteInto(false, false); // true); // ???
	1335	+// }
1123	1336	}
1124	1337	public void dropActionChanged(DropTargetDragEvent dtde)
1125	1338	// Called if the user has modified the current drop gesture
..	..	@@ -1224,22 +1437,30 @@
1224	1437	{
1225	1438	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1226	1439	//heightFieldItem.addActionListener(this);
1227		- gridItem = menu.add(new MenuItem("Grid"));
1228		- gridItem.addActionListener(this);
1229		- rectoidItem = menu.add(new MenuItem("Box"));
1230		- rectoidItem.addActionListener(this);
1231		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1232		- ellipsoidItem.addActionListener(this);
1233		- coneItem = menu.add(new MenuItem("Cone"));
1234		- coneItem.addActionListener(this);
1235		- torusItem = menu.add(new MenuItem("Torus"));
1236		- torusItem.addActionListener(this);
1237		- superItem = menu.add(new MenuItem("Superellipsoid"));
1238		- 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	+ {
1239	1458	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1240	1459	kleinItem.addActionListener(this);
1241		- particleItem = menu.add(new MenuItem("Particle system"));
1242		- particleItem.addActionListener(this);
	1460	+ }
	1461	+
	1462	+// particleItem = menu.add(new MenuItem("Particle system"));
	1463	+// particleItem.addActionListener(this);
1243	1464	if (Globals.ADVANCED)
1244	1465	{
1245	1466	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1265,15 +1486,15 @@
1265	1486	}
1266	1487	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1267	1488	bezierItem.addActionListener(this);
1268		- overlayItem = menu.add(new MenuItem("Overlay"));
1269		- overlayItem.addActionListener(this);
1270		- lightItem = menu.add(new MenuItem("Light"));
1271		- 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);
1272	1493	menu.add("-");
1273	1494	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1274	1495	//superLoopItem.addActionListener(this);
1275		- loopItem = menu.add(new MenuItem("Loop"));
1276		- loopItem.addActionListener(this);
	1496	+// loopItem = menu.add(new MenuItem("Loop"));
	1497	+// loopItem.addActionListener(this);
1277	1498	doubleItem = menu.add(new MenuItem("Fork"));
1278	1499	doubleItem.addActionListener(this);
1279	1500	if (Globals.ADVANCED)
..	..	@@ -1289,6 +1510,9 @@
1289	1510	animationItem.addItemListener(this);
1290	1511	animationItem.setState(Globals.ANIMATION);
1291	1512
	1513	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1514	+ archiveItem.addActionListener(this);
	1515	+
1292	1516	menu.add("-");
1293	1517	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1294	1518	parseverticesItem.addActionListener(this);
..	..	@@ -1301,6 +1525,8 @@
1301	1525	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1302	1526	reduce34MorphItem.addActionListener(this);
1303	1527	menu.add("-");
	1528	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	1529	+ memoryItem.addActionListener(this);
1304	1530	menu.add(computeAOItem = new MenuItem("Compute AO"));
1305	1531	computeAOItem.addActionListener(this);
1306	1532
..	..	@@ -1309,8 +1535,6 @@
1309	1535	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1310	1536	mirrorItem.addActionListener(this);
1311	1537	menu.add("-");
1312		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1313		- memoryItem.addActionListener(this);
1314	1538	menu.add(analyzeItem = new MenuItem("Analyze"));
1315	1539	analyzeItem.addActionListener(this);
1316	1540	menu.add(dumpItem = new MenuItem("Print"));
..	..	@@ -1454,9 +1678,34 @@
1454	1678	shadow.material = new cMaterial(obj.material);
1455	1679	shadow.material.diffuse = 0.0001f;
1456	1680	shadow.material.specular = 0.0001f;
	1681	+ //shadow.projectedVertices[1].x = 300;
1457	1682
1458	1683	makeSomething(shadow);
1459	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	+ }
1460	1709
1461	1710	/**
1462	1711	* applyExample
..	..	@@ -1701,7 +1950,7 @@
1701	1950	{
1702	1951	ScreenFit();
1703	1952	} else
1704		- if (source == switchItem)
	1953	+ if (source == switchViewItem)
1705	1954	{
1706	1955	cVector v1 = new cVector();
1707	1956	cVector v2 = new cVector();
..	..	@@ -1710,11 +1959,11 @@
1710	1959	objEditor.cameraView.renderCamera.setAim(v2, v1);
1711	1960	objEditor.cameraView.repaint();
1712	1961	} else
1713		- if (source == rectoidItem)
	1962	+ if (source == rectoidItem \|\| source == boxButton)
1714	1963	{
1715	1964	makeSomething(new Box());
1716	1965	} else
1717		- if (source == particleItem)
	1966	+ if (source == particleItem \|\| source == particlesButton)
1718	1967	{
1719	1968	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1720	1969	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1793,27 +2042,27 @@
1793	2042
1794	2043	makeSomething(obj);
1795	2044	} else
1796		- if (source == gridItem)
	2045	+ if (source == gridItem \|\| source == gridButton)
1797	2046	{
1798	2047	makeSomething(new Grid());
1799	2048	} else
1800		- if (source == ellipsoidItem)
	2049	+ if (source == ellipsoidItem \|\| source == sphereButton)
1801	2050	{
1802	2051	makeSomething(new Sphere());
1803	2052	} else
1804		- if (source == coneItem)
	2053	+ if (source == coneItem \|\| source == coneButton)
1805	2054	{
1806	2055	makeSomething(new Cone());
1807	2056	} else
1808		- if (source == torusItem)
	2057	+ if (source == torusItem \|\| source == torusButton)
1809	2058	{
1810	2059	makeSomething(new Torus());
1811	2060	} else
1812		- if (source == superItem)
	2061	+ if (source == superItem \|\| source == superButton)
1813	2062	{
1814	2063	makeSomething(new Superellipsoid());
1815	2064	} else
1816		- if (source == kleinItem)
	2065	+ if (source == kleinItem \|\| source == kleinButton)
1817	2066	{
1818	2067	makeSomething(new Klein());
1819	2068	} else
..	..	@@ -1833,7 +2082,7 @@
1833	2082	{
1834	2083	makeSomething(new BezierSurface());
1835	2084	} else
1836		- if (source == overlayItem)
	2085	+ if (source == overlayItem \|\| source == overlayButton)
1837	2086	{
1838	2087	/*
1839	2088	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1881,7 +2130,7 @@
1881	2130	s.setup();
1882	2131	makeSomething(s);
1883	2132	} else
1884		- if (source == lightItem)
	2133	+ if (source == lightItem \|\| source == lightButton)
1885	2134	{
1886	2135	makeSomething(new Light());
1887	2136	} else
..	..	@@ -1931,30 +2180,30 @@
1931	2180
1932	2181	group(g);
1933	2182	} else
1934		- if (source == loopItem)
	2183	+ if (source == loopItem \|\| source == loopButton)
1935	2184	{
1936	2185	Composite csg = new GroupLeaf();
1937	2186	csg.count = 5;
1938	2187	group(csg);
1939		- Composite child = new cGroup();
	2188	+ Composite child = new cGroup("Branch");
1940	2189	csg.addChild(child);
1941	2190	child.addChild(csg);
1942	2191	} else
1943	2192	if (source == doubleItem)
1944	2193	{
1945		- Composite csg = new GroupLeaf();
	2194	+ Composite csg = new GroupLeaf("Fork");
1946	2195	csg.count = 5;
1947	2196	group(csg);
1948		- Composite child = new cGroup();
	2197	+ Composite child = new cGroup("Branch A");
1949	2198	csg.addChild(child);
1950	2199	child.addChild(csg);
1951		- child = new cGroup();
	2200	+ child = new cGroup("Branch B");
1952	2201	csg.addChild(child);
1953	2202	child.addChild(csg);
1954	2203	} else
1955	2204	if (source == tripleItem)
1956	2205	{
1957		- Composite csg = new GroupLeaf();
	2206	+ Composite csg = new GroupLeaf("Trident");
1958	2207	csg.count = 4;
1959	2208	group(csg);
1960	2209	Composite child = new cGroup();
..	..	@@ -2018,15 +2267,31 @@
2018	2267	} else
2019	2268	if (source == undoButton)
2020	2269	{
	2270	+ // Go to previous version
	2271	+ //if (!Undo())
	2272	+ //java.awt.Toolkit.getDefaultToolkit().beep();
2021	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();
2022	2284	} else
2023	2285	if (source == redoButton)
2024	2286	{
	2287	+ // Go to next version
2025	2288	Redo();
2026	2289	} else
2027	2290	if (source == saveButton)
2028	2291	{
2029		- Save();
	2292	+ // Save a new version
	2293	+ if (!Save(true))
	2294	+ java.awt.Toolkit.getDefaultToolkit().beep();
2030	2295	} else
2031	2296	if (source == oneStepButton)
2032	2297	{
..	..	@@ -2035,17 +2300,14 @@
2035	2300	} else
2036	2301	if (source == screenfitButton)
2037	2302	{
2038		- //Reload(lastConverter, lastFilename, true);
2039	2303	ScreenFit();
2040	2304	} else
2041	2305	if (source == screenfitpointButton)
2042	2306	{
2043		- //Reload(lastConverter, lastFilename, true);
2044	2307	ScreenFitPoint();
2045	2308	} else
2046	2309	if (source == snapobjectButton)
2047	2310	{
2048		- //Reload(lastConverter, lastFilename, true);
2049	2311	SnapObject();
2050	2312	} else
2051	2313	// if (event.getSource() == recompileButton)
..	..	@@ -2409,7 +2671,7 @@
2409	2671	{
2410	2672	StepAll();
2411	2673	} else
2412		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	2674	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2413	2675	{
2414	2676	//int indices[] = jList.getSelectedIndices();
2415	2677	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2421,9 +2683,9 @@
2421	2683	{
2422	2684	ClearSelection(true);
2423	2685	} else
2424		- if (source == grabItem)
	2686	+ if (source == grabItem \|\| source == groupButton)
2425	2687	{
2426		- group(new cGroup(), true);
	2688	+ group(new cGroup(), false); // true);
2427	2689	} else
2428	2690	if (source == hideItem)
2429	2691	{
..	..	@@ -2441,11 +2703,11 @@
2441	2703	{
2442	2704	makeSomething(new Camera());
2443	2705	} else
2444		- if (source == compositeItem)
	2706	+ if (source == compositeItem \|\| source == compositeButton)
2445	2707	{
2446	2708	group(new Composite());
2447	2709	} else
2448		- if (source == randomItem)
	2710	+ if (source == switchItem \|\| source == switchButton)
2449	2711	{
2450	2712	RandomNode random = new RandomNode();
2451	2713	group(random);
..	..	@@ -2547,7 +2809,7 @@
2547	2809	{
2548	2810	group(new cLinker());
2549	2811	} else
2550		- if (source == textureItem)
	2812	+ if (source == textureItem \|\| source == textureButton)
2551	2813	{
2552	2814	group(new TextureNode());
2553	2815	} else
..	..	@@ -2567,17 +2829,30 @@
2567	2829	{
2568	2830	CastShadow(2);
2569	2831	} else
2570		- if (source == ungroupItem)
	2832	+ if (source == ungroupItem \|\| source == ungroupButton)
2571	2833	{
2572		- //ungroup();
	2834	+ boolean hasRoot = false;
	2835	+
2573	2836	for (int i=0; i<group.selection.size(); i++)
2574	2837	{
2575		- Ungroup(group.selection.get(i));
	2838	+ if (group.selection.get(i) == group)
	2839	+ {
	2840	+ hasRoot = true;
	2841	+ break;
	2842	+ }
2576	2843	}
2577	2844
2578		- ClearSelection(false);
2579		-
2580		- 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	+ }
2581	2856	} else
2582	2857	if (source == genUVItem)
2583	2858	{
..	..	@@ -2905,6 +3180,10 @@
2905	3180	if (source == twoButton)
2906	3181	{
2907	3182	radio.layout = twoButton;
	3183	+
	3184	+ if (CameraPane.FULLSCREEN)
	3185	+ fullscreenLayout = radio.layout;
	3186	+
2908	3187	// bug
2909	3188	//gridPanel.setDividerLocation(1.0);
2910	3189	//bigPanel.setDividerLocation(0.0);
..	..	@@ -2960,6 +3239,9 @@
2960	3239	{
2961	3240	radio.layout = threeButton;
2962	3241
	3242	+ if (CameraPane.FULLSCREEN)
	3243	+ fullscreenLayout = radio.layout;
	3244	+
2963	3245	// bigThree.remove(scenePanel);
2964	3246	// bigThree.remove(centralPanel);
2965	3247	// bigThree.remove(XYZPanel);
..	..	@@ -2998,6 +3280,9 @@
2998	3280	{
2999	3281	radio.layout = fourButton;
3000	3282
	3283	+ if (CameraPane.FULLSCREEN)
	3284	+ fullscreenLayout = radio.layout;
	3285	+
3001	3286	// bigThree.remove(scenePanel);
3002	3287	// bigThree.remove(centralPanel);
3003	3288	// bigThree.remove(XYZPanel);
..	..	@@ -3034,6 +3319,9 @@
3034	3319	if (source == sixButton)
3035	3320	{
3036	3321	radio.layout = sixButton;
	3322	+
	3323	+ if (CameraPane.FULLSCREEN)
	3324	+ fullscreenLayout = radio.layout;
3037	3325
3038	3326	// bigThree.remove(scenePanel);
3039	3327	// bigThree.remove(centralPanel);
..	..	@@ -3072,6 +3360,9 @@
3072	3360	if (source == sevenButton)
3073	3361	{
3074	3362	radio.layout = sevenButton;
	3363	+
	3364	+ if (CameraPane.FULLSCREEN)
	3365	+ fullscreenLayout = radio.layout;
3075	3366
3076	3367	// bigThree.remove(scenePanel);
3077	3368	// bigThree.remove(centralPanel);
..	..	@@ -3128,12 +3419,19 @@
3128	3419	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3129	3420	{
3130	3421	ab = (cRadio)e.nextElement();
3131		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3422	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
3132	3423	{
	3424	+ // Patch to avoid bug with transparency.
	3425	+ if (!ab.hadMaterial)
	3426	+ {
	3427	+ ab.object.material = null;
	3428	+ }
	3429	+
3133	3430	buttonGroup.remove(ab);
3134	3431	radioPanel.remove(ab);
3135	3432
3136		- ab.GetObject().editWindow = null;
	3433	+ //ab.GetObject().editWindow = null;
	3434	+ ab.GetObject().manipWindow = null;
3137	3435	// ab.GetObject().objectUI = null; // ?????????
3138	3436
3139	3437	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
..	..	@@ -3146,6 +3444,12 @@
3146	3444	} else
3147	3445	if (source == editItem \|\| source == editButton)
3148	3446	{
	3447	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3448	+ {
	3449	+ Object3D child = (Object3D)e.nextElement();
	3450	+ child.pinned = true;
	3451	+ }
	3452	+
3149	3453	EditSelection(false);
3150	3454	} else
3151	3455	if (source == uneditButton)
..	..	@@ -3155,6 +3459,7 @@
3155	3459	Object3D child = (Object3D)e.nextElement();
3156	3460	if(child.editWindow != null)
3157	3461	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3462	+ child.pinned = false;
3158	3463	child.CloseUI();
3159	3464	listUI.remove(child);
3160	3465
..	..	@@ -3171,6 +3476,7 @@
3171	3476	//copy.ClearUI();
3172	3477	for (Object3D obj : listUI)
3173	3478	{
	3479	+ obj.pinned = false;
3174	3480	obj.CloseUI();
3175	3481	}
3176	3482	listUI.clear();
..	..	@@ -3180,7 +3486,7 @@
3180	3486	{
3181	3487	assert(copy == group);
3182	3488
3183		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3489	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3184	3490
3185	3491	for (Object3D obj : listUI)
3186	3492	{
..	..	@@ -3229,6 +3535,9 @@
3229	3535	}
3230	3536
3231	3537	copy = group;
	3538	+
	3539	+ SetUndoStates();
	3540	+
3232	3541	//Globals.theRenderer.object = group;
3233	3542	if(!useclient)
3234	3543	{
..	..	@@ -3247,6 +3556,7 @@
3247	3556
3248	3557	// fix "+" issue
3249	3558	//group.editWindow = this;
	3559	+ group.manipWindow = this;
3250	3560
3251	3561	/*
3252	3562	currentLayout = radio.layout;
..	..	@@ -3254,6 +3564,13 @@
3254	3564	currentLayout = sevenButton;
3255	3565	*/
3256	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);
3257	3574	keepparent = group.parent;
3258	3575	// PARENT = NULL or not???
3259	3576	//group.parent = null; // ROOT
..	..	@@ -3267,7 +3584,7 @@
3267	3584	cameraView.ProtectCamera();
3268	3585	cameraView.repaint();
3269	3586	return;
3270		- } else if (event.getSource() == revertCameraItem)
	3587	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3271	3588	{
3272	3589	cameraView.RevertCamera();
3273	3590	cameraView.repaint();
..	..	@@ -3846,7 +4163,7 @@
3846	4163
3847	4164	try
3848	4165	{
3849		- texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4166	+ texturedata = Globals.theRenderer.GetTextureData(tex.pigmenttexture, pigment, false, node.texres);
3850	4167	}
3851	4168	catch (Exception e)
3852	4169	{
..	..	@@ -4321,28 +4638,25 @@
4321	4638	// }
4322	4639	// }
4323	4640
4324		- static boolean allparams = true;
4325		-
4326		- static Vector<Object3D> listUI = new Vector<Object3D>();
4327		-
4328	4641	void EditSelection(boolean newWindow)
4329	4642	{
	4643	+ if (group.selection == null)
	4644	+ {
	4645	+ EditElement(group, newWindow); // ? new
	4646	+ return;
	4647	+ }
	4648	+
4330	4649	// aConstraints.gridy = 0;
4331	4650	for (int i=0; i<group.selection.size(); i++)
4332	4651	{
4333	4652	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4334	4653	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4335		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4654	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4336	4655
4337	4656	Object3D elem = (Object3D)group.selection.elementAt(i);
4338	4657	if(elem != group \|\| !newWindow)
4339	4658	{
4340		- // if (!(elem instanceof Composite))
4341		- // newWindow = false;
4342		- listUI.add(elem);
4343		- elem.openEditWindow(this, newWindow); //, false);
4344		- System.out.println("edit : " + elem);
4345		- elem.editWindow.refreshContents(true); // ? new
	4659	+ EditElement(elem, newWindow); // ? new
4346	4660	}
4347	4661	}
4348	4662	}
..	..	@@ -4417,7 +4731,8 @@
4417	4731	//new Exception().printStackTrace();
4418	4732
4419	4733	freezemodel = true;
4420		-
	4734	+ ClearUnpinned();
	4735	+
4421	4736	/**/
4422	4737	//switch (event.id)
4423	4738	{
..	..	@@ -4450,7 +4765,7 @@
4450	4765	if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4451	4766	// a camera
4452	4767	{
4453		- if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	4768	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
4454	4769	{
4455	4770	CameraPane.camerachangeframe = 0; // don't refuse it
4456	4771	Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
..	..	@@ -4459,6 +4774,13 @@
4459	4774	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4460	4775	}
4461	4776
	4777	+ if (tps != null && tps.length == 1)
	4778	+ {
	4779	+ EditSelection(false);
	4780	+ }
	4781	+
	4782	+ SetPinStates(tps != null && tps.length > 0);
	4783	+
4462	4784	refreshContents();
4463	4785	//return true;
4464	4786	}
..	..	@@ -4468,9 +4790,18 @@
4468	4790	freezemodel = false;
4469	4791	}
4470	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	+
4471	4801	void refreshContents(boolean cp)
4472	4802	{
4473		- if (!Globals.MOUSEDRAGGED)
	4803	+ if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	4804	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
4474	4805	{
4475	4806	objEditor.ClearInfo(); // .GetMaterial());
4476	4807
..	..	@@ -4569,7 +4900,8 @@
4569	4900
4570	4901	if (cut)
4571	4902	{
4572		- Save();
	4903	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	4904	+// Save();
4573	4905	//int indices[] = jList.getSelectedIndices();
4574	4906	//for (int i = indices.length - 1; i >= 0; i--)
4575	4907	//jList.remove(indices[i]);
..	..	@@ -4672,6 +5004,10 @@
4672	5004
4673	5005	void paste(boolean expand)
4674	5006	{
	5007	+ if (Globals.REPLACEONMAKE)
	5008	+ Save();
	5009	+ boolean keep = Globals.REPLACEONMAKE;
	5010	+ Globals.REPLACEONMAKE = false;
4675	5011	// if (GrafreeD.clipboard == null)
4676	5012	// return;
4677	5013	boolean first = true;
..	..	@@ -4731,6 +5067,7 @@
4731	5067	Grafreed.clipboard.get(0).parent = keepparent;
4732	5068	}
4733	5069
	5070	+ Globals.REPLACEONMAKE = keep;
4734	5071	ResetModel();
4735	5072	refreshContents();
4736	5073	}
..	..	@@ -4866,6 +5203,10 @@
4866	5203
4867	5204	void group(Object3D csg, boolean grab)
4868	5205	{
	5206	+ if (Globals.REPLACEONMAKE)
	5207	+ Save();
	5208	+ boolean keep = Globals.REPLACEONMAKE;
	5209	+ Globals.REPLACEONMAKE = false;
4869	5210	if (//false) // why??
4870	5211	!group.selection.isEmpty())
4871	5212	{
..	..	@@ -4979,10 +5320,15 @@
4979	5320	//node.add(csg);
4980	5321	//makeSomething(node);
4981	5322	makeSomething(csg);
	5323	+ Globals.REPLACEONMAKE = keep;
4982	5324	}
4983	5325
4984	5326	void Ungroup(Object3D g)
4985	5327	{
	5328	+ if (Globals.REPLACEONMAKE)
	5329	+ Save();
	5330	+ boolean keep = Globals.REPLACEONMAKE;
	5331	+ Globals.REPLACEONMAKE = false;
4986	5332	if (g instanceof HiddenObject)
4987	5333	{
4988	5334	HiddenObject h = (HiddenObject) g;
..	..	@@ -4999,6 +5345,7 @@
4999	5345	objEditor.makeSomething(g.get(i), false);
5000	5346	}
5001	5347	}
	5348	+ Globals.REPLACEONMAKE = keep;
5002	5349	}
5003	5350
5004	5351	void ungroup()
..	..	@@ -5287,13 +5634,28 @@
5287	5634	cButton clearpanelButton;
5288	5635	cButton unselectButton;
5289	5636
5290		- cButton minButton;
5291		- cButton maxButton;
5292		- cButton fullButton;
5293		- cButton undoButton;
5294		- cButton redoButton;
	5637	+ cButton restoreCameraButton;
	5638	+
5295	5639	cButton saveButton;
5296	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;
5297	5659
5298	5660	cButton screenfitButton;
5299	5661	cButton screenfitpointButton;
..	..	@@ -5315,11 +5677,11 @@
5315	5677	//JTree jTree;
5316	5678	private MenuItem lookAtItem;
5317	5679	private MenuItem lookFromItem;
5318		- private MenuItem switchItem;
	5680	+ private MenuItem switchViewItem;
5319	5681	private MenuItem cutItem;
5320	5682	private MenuItem undoItem;
5321	5683	private MenuItem redoItem;
5322		- private MenuItem duplicateItem;
	5684	+ private JMenuItem duplicateItem;
5323	5685	private MenuItem cloneItem;
5324	5686	private MenuItem cloneSupportItem;
5325	5687	private MenuItem overwriteGeoItem;
..	..	@@ -5347,7 +5709,7 @@
5347	5709	private MenuItem pasteLinkItem;
5348	5710	private MenuItem pasteCloneItem;
5349	5711	private MenuItem pasteExpandItem;
5350		- private MenuItem clearItem;
	5712	+ private MenuItem deleteItem;
5351	5713	private MenuItem clearAllItem;
5352	5714	private MenuItem genUVItem;
5353	5715	private MenuItem genNormalsMESHItem;
..	..	@@ -5407,7 +5769,7 @@
5407	5769	private MenuItem frontItem;
5408	5770	private MenuItem cameraItem;
5409	5771	private MenuItem compositeItem;
5410		- private MenuItem randomItem;
	5772	+ private MenuItem switchItem;
5411	5773	private MenuItem physicsItem;
5412	5774	private MenuItem frameselectorItem;
5413	5775	private MenuItem scriptNodeItem;
..	..	@@ -5481,5 +5843,5 @@
5481	5843
5482	5844	Menu cameraMenu;
5483	5845	MenuItem editCameraItem;
5484		- MenuItem revertCameraItem;
	5846	+ MenuItem restoreCameraItem;
5485	5847	}