~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);
..	..	@@ -187,8 +208,8 @@
187	208	// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
188	209	// pasteExpandItem.addActionListener(this);
189	210	menu.add("-");
190		- clearItem = menu.add(new MenuItem("Clear"));
191		- clearItem.addActionListener(this);
	211	+ deleteItem = menu.add(new MenuItem("Delete"));
	212	+ deleteItem.addActionListener(this);
192	213
193	214	if (Globals.ADVANCED)
194	215	{
..	..	@@ -202,23 +223,23 @@
202	223	//zBufferItem.addActionListener(this);
203	224	//cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
204	225	//normalLensItem.addActionListener(this);
205		- cameraMenu.add(revertCameraItem = new MenuItem("Restore Viewpoint"));
206		- revertCameraItem.addActionListener(this);
	226	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	227	+ restoreCameraItem.addActionListener(this);
207	228
208		- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
209		- toggleFullScreenItem.addItemListener(this);
210		- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
211		- 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);
212	241
213		- cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
214		- toggleTextureItem.addItemListener(this);
215		- toggleTextureItem.setState(CameraPane.textureon);
216		-
217		- cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
218		- toggleSwitchItem.addItemListener(this);
219		- toggleSwitchItem.setState(CameraPane.SWITCH);
220		-
221		- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
	242	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
222	243	toggleHandleItem.addItemListener(this);
223	244	toggleHandleItem.setState(CameraPane.HANDLES);
224	245
..	..	@@ -273,7 +294,7 @@
273	294	{
274	295	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
275	296	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
276		- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
	297	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
277	298	editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
278	299	oe.cameraMenu.add("-");
279	300	openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
..	..	@@ -281,7 +302,7 @@
281	302	editLeafItem.addActionListener(this);
282	303	lookAtItem.addActionListener(this);
283	304	//lookFromItem.addActinoListener(this);
284		- //switchItem.addActionListener(this);
	305	+ //switchViewItem.addActionListener(this);
285	306	}
286	307
287	308	oe.menuBar.add(menu = new Menu("Setting"));
..	..	@@ -326,21 +347,29 @@
326	347	}
327	348
328	349	oe.menuBar.add(menu = new Menu("Group"));
329		- grabItem = menu.add(new MenuItem("Grab"));
330		- grabItem.addActionListener(this);
	350	+// grabItem = menu.add(new MenuItem("Grab"));
	351	+// grabItem.addActionListener(this);
331	352	backItem = menu.add(new MenuItem("Back"));
332	353	backItem.addActionListener(this);
333	354	frontItem = menu.add(new MenuItem("Front"));
334	355	frontItem.addActionListener(this);
335		- compositeItem = menu.add(new MenuItem("Composite"));
336		- compositeItem.addActionListener(this);
	356	+// compositeItem = menu.add(new MenuItem("Composite"));
	357	+// compositeItem.addActionListener(this);
	358	+
	359	+ if (Globals.ADVANCED)
	360	+ {
337	361	hideItem = menu.add(new MenuItem("Hidden Group"));
338	362	hideItem.addActionListener(this);
	363	+ }
339	364	ungroupItem = menu.add(new MenuItem("Ungroup"));
340	365	ungroupItem.addActionListener(this);
341		- menu.add("-");
342		- randomItem = menu.add(new MenuItem("Switch node"));
343		- 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	+ {
344	373	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
345	374	switchGeoItem.addActionListener(this);
346	375	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
..	..	@@ -348,8 +377,6 @@
348	377	morphItem = menu.add(new MenuItem("Morph Group"));
349	378	morphItem.addActionListener(this);
350	379
351		- if (Globals.ADVANCED)
352		- {
353	380	menu.add("-");
354	381	physicsItem = menu.add(new MenuItem("Physics"));
355	382	physicsItem.addActionListener(this);
..	..	@@ -357,13 +384,11 @@
357	384	frameselectorItem.addActionListener(this);
358	385	scriptNodeItem = menu.add(new MenuItem("Script Node"));
359	386	scriptNodeItem.addActionListener(this);
360		- cameraItem = menu.add(new MenuItem("Camera"));
361		- cameraItem.addActionListener(this);
362	387	}
363	388
364	389	oe.menuBar.add(menu = new Menu("Object"));
365		- textureItem = menu.add(new MenuItem("Texture"));
366		- textureItem.addActionListener(this);
	390	+// textureItem = menu.add(new MenuItem("Texture"));
	391	+// textureItem.addActionListener(this);
367	392	billboardItem = menu.add(new MenuItem("Billboard"));
368	393	billboardItem.addActionListener(this);
369	394	csgItem = menu.add(new MenuItem("CSG"));
..	..	@@ -374,13 +399,14 @@
374	399	shadowYItem.addActionListener(this);
375	400	shadowZItem = menu.add(new MenuItem("Shadow Blue"));
376	401	shadowZItem.addActionListener(this);
	402	+ attributeItem = menu.add(new MenuItem("Attribute"));
	403	+ attributeItem.addActionListener(this);
	404	+
377	405	if (Globals.ADVANCED)
378	406	{
379	407	menu.add("-");
380	408	linkerItem = menu.add(new MenuItem("Linker"));
381	409	linkerItem.addActionListener(this);
382		- attributeItem = menu.add(new MenuItem("Attribute"));
383		- attributeItem.addActionListener(this);
384	410	templateItem = menu.add(new MenuItem("Template"));
385	411	templateItem.addActionListener(this);
386	412	pointflowItem = menu.add(new MenuItem("Point Flow"));
..	..	@@ -409,7 +435,7 @@
409	435	genNormalsMESHItem.addActionListener(this);
410	436	if (Globals.ADVANCED)
411	437	{
412		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	438	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
413	439	genNormalsMINEItem.addActionListener(this);
414	440	}
415	441	stripifyItem = menu.add(new MenuItem("Stripify"));
..	..	@@ -532,6 +558,7 @@
532	558	buildToolsMenu(menu);
533	559	}
534	560
	561	+
535	562	void SetupUI2(ObjEditor oe)
536	563	{
537	564	// June 2019
..	..	@@ -574,51 +601,79 @@
574	601	oe.radioPanel.add(dummyButton);
575	602	oe.buttonGroup.add(dummyButton);
576	603	*/
	604	+ cGridBag copyOptionsPanel = new cGridBag();
	605	+
	606	+ copyOptionsPanel.preferredHeight = 1;
	607	+
577	608	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
578	609
579	610	//oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
580	611	//minButton.setToolTipText("Minimize window");
581	612	//minButton.addActionListener(this);
582	613
583		- oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
584		- maxButton.setToolTipText("Maximize window");
585		- 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	+ }
586	620
587	621	oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
588	622	fullButton.setToolTipText("Full-screen window");
589	623	fullButton.addActionListener(this);
590	624
591		- oe.toolbarPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
592		- undoButton.setToolTipText("Undo changes");
593		- 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);
594	632
595		- oe.toolbarPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
596		- redoButton.setToolTipText("Redo changes");
597		- redoButton.addActionListener(this);
598		-
599		- oe.toolbarPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
600		- saveButton.setToolTipText("Save changes");
	633	+ copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	634	+ saveButton.setToolTipText("New version");
601	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);
602	641
603		- oe.toolbarPanel.add(liveCB = GetCheckBox("icons/run.png", 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);
604	661	liveCB.setToolTipText("Enable animation");
605	662	liveCB.addItemListener(this);
606	663
607		- oe.toolbarPanel.add(fastCB = GetCheckBox("icons/runfast.png", CameraPane.FAST)); //, constraints);
608		- fastCB.setToolTipText("Fast mode");
609		- fastCB.addItemListener(this);
610		-
611	664	oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
612	665	oneStepButton.setToolTipText("Animate one step forward");
613	666	oneStepButton.addActionListener(this);
614	667
615		- oe.toolbarPanel.add(trackCB = GetCheckBox("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
616		- trackCB.setToolTipText("Enable tracking");
617		- trackCB.addItemListener(this);
618		-
619		- oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
620		- screenfitButton.setToolTipText("Screen fit");
621		- screenfitButton.addActionListener(this);
	668	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
	669	+ fastCB.setToolTipText("Fast mode");
	670	+ fastCB.addItemListener(this);
	671	+
	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);
622	677
623	678	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
624	679	// screenfitpointButton.addActionListener(this);
..	..	@@ -630,49 +685,127 @@
630	685	snapobjectButton.setToolTipText("Snap Object");
631	686	}
632	687
633		- oe.toolbarPanel.add(flashSelectionButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
634		- flashSelectionButton.setToolTipText("Highlight selection");
635		- flashSelectionButton.addActionListener(this);
	688	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
636	689
637		- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
638		-
639		- oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
640		- twoButton.setToolTipText("Show center view only");
641		- twoButton.addActionListener(this);
642	690	oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
643	691	fourButton.addActionListener(this);
644	692	fourButton.setToolTipText("Show left panel only");
	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	+
645	699	oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
646		- sixButton.setToolTipText("2-column layout left");
	700	+ sixButton.setToolTipText("Show left and right");
647	701	sixButton.addActionListener(this);
648		- oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
649		- threeButton.setToolTipText("2-column layout right");
650		- threeButton.addActionListener(this);
651		- oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
652		- sevenButton.setToolTipText("3-column layout");
653		- 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);
654	708	//
655	709
656		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
657		- 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");
658	712	rootButton.addActionListener(this);
659	713
660		- 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);
661	715	closeButton.setToolTipText("Close tab");
662	716	closeButton.addActionListener(this);
663	717	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
664	718	//clearButton.addActionListener(this);
665		-
666		- editCommandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
667		- editButton.setToolTipText("Edit selection");
	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	+ }
	751	+
	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");
668	801	editButton.addActionListener(this);
669	802
670		- editCommandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
671		- uneditButton.setToolTipText("Unedit selection");
	803	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	804	+ uneditButton.setToolTipText("Remove selection controls");
672	805	uneditButton.addActionListener(this);
673	806
674	807	editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
675		- allParamsButton.setToolTipText("Edit all params");
	808	+ allParamsButton.setToolTipText("Show all controle");
676	809	allParamsButton.addActionListener(this);
677	810
678	811	editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..	..	@@ -683,8 +816,13 @@
683	816	unselectButton.setToolTipText("Unselect");
684	817	unselectButton.addActionListener(this);
685	818
	819	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	820	+ flashSelectionButton.setToolTipText("Highlight selection");
	821	+ flashSelectionButton.addActionListener(this);
	822	+
686	823	editCommandsPanel.preferredHeight = 1;
687	824
	825	+ SetPinStates(false);
688	826	// oe.treePanel.add(commandsPanel);
689	827	// oe.treePanel.Return();
690	828
..	..	@@ -703,29 +841,17 @@
703	841
704	842	JScrollPane jSP;
705	843	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
706		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	844	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
707	845	ResetModel();
708	846
709	847	oe.treePanel.add(jSPPanel);
710	848	oe.treePanel.Return();
711	849
712		- cGridBag copyOptionsPanel = new cGridBag();
713		-
714		- copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
715		- colorCB.setToolTipText("Copy color when dropped");
716		- colorCB.addItemListener(this);
717		-
718		- copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
719		- materialCB.setToolTipText("Copy material when dropped");
720		- materialCB.addItemListener(this);
721		-
722		- copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
723		- textureCB.setToolTipText("Copy texture when dropped");
724		- textureCB.addItemListener(this);
725		-
726		- copyOptionsPanel.preferredHeight = 1;
727	850	oe.treePanel.add(copyOptionsPanel);
728	851	oe.treePanel.Return();
	852	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	853	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	854	+ sliderPane.preferredHeight = 1;
729	855
730	856	// mainPanel.setDividerLocation(0.5); //1.0);
731	857	// mainPanel.setResizeWeight(0.5);
..	..	@@ -748,29 +874,49 @@
748	874	dgr.addDragGestureListener(this);
749	875	}catch(Exception e) {}
750	876	*/
751		- radio.layout = sevenButton;
	877	+ radio.layout = sixButton; // sevenButton;
752	878	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
753	879	}
754	880
755	881	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
756	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	+
757	897	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
758	898	boxCB.setToolTipText("Display bounding boxes");
759	899	boxCB.addItemListener(this);
760	900
761	901	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
762		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	902	+ zoomBoxCB.setToolTipText("Display only for wheel");
763	903	zoomBoxCB.addItemListener(this);
764	904
765	905	if (true) // Globals.ADVANCED)
766	906	{
767		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
768		- supportCB.setToolTipText("Enable rigging");
769		- 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);
770	914
771	915	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
772	916	// localCB.addItemListener(this);
773	917
	918	+ panel.Return();
	919	+
774	920	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
775	921	crowdCB.setToolTipText("Used for crowds");
776	922	crowdCB.addItemListener(this);
..	..	@@ -787,6 +933,8 @@
787	933	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
788	934	// speakerMocapCB.addItemListener(this);
789	935
	936	+ panel.Return();
	937	+
790	938	if (false)
791	939	{
792	940	// handled in scripts
..	..	@@ -801,24 +949,39 @@
801	949	//constraints.gridy += 1;
802	950	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
803	951	smoothfocusCB.addItemListener(this);
	952	+ panel.Return();
804	953	}
805	954
806	955	//constraints.gridx += 1;
807	956	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
808	957	// debugCB.addItemListener(this);
809	958
	959	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	960	+ trackCB.setToolTipText("Enable tracking target");
	961	+ trackCB.addItemListener(this);
	962	+
810	963	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
811		- oeilCB.setToolTipText("Move camera when tracking target");
	964	+ oeilCB.setToolTipText("Move camera when tracking");
812	965	oeilCB.addItemListener(this);
813	966
814	967	panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
815		- shadowCB.setToolTipText("Compute shadows when live");
	968	+ shadowCB.setToolTipText("When live compute shadows");
816	969	shadowCB.addItemListener(this);
817	970
818		- panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
819		- autosaveCB.setToolTipText("Auto-save on structure change");
820		- autosaveCB.addItemListener(this);
	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);
821	983
	984	+ panel.Return();
822	985	if (Globals.ADVANCED)
823	986	{
824	987	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
..	..	@@ -829,10 +992,15 @@
829	992	}
830	993
831	994	cGridBag fill = new cGridBag();
832		-
833	995	fill.preferredHeight = 200;
	996	+ cGridBag fill2 = new cGridBag();
	997	+ fill2.preferredHeight = 200;
	998	+ cGridBag fill3 = new cGridBag();
	999	+ fill3.preferredHeight = 200;
834	1000
835	1001	panel.add(fill);
	1002	+ panel.add(fill2);
	1003	+ panel.add(fill3);
836	1004
837	1005	}
838	1006
..	..	@@ -840,7 +1008,7 @@
840	1008	{
841	1009	cRadio radioButton = new cRadio(obj.name);
842	1010
843		- // Patch to avoid bug with transparency.
	1011	+ // June 2019. Patch to avoid bug with transparency.
844	1012	radioButton.hadMaterial = obj.material != null;
845	1013	if (!radioButton.hadMaterial)
846	1014	{
..	..	@@ -848,7 +1016,7 @@
848	1016	}
849	1017
850	1018	radioButton.SetObject(obj);
851		- radioButton.layout = sevenButton;
	1019	+ radioButton.layout = sixButton; // sevenButton;
852	1020	radioButton.SetCamera(cameraView.renderCamera, false);
853	1021	radioButton.addActionListener(this);
854	1022	radioPanel.add(radioButton);
..	..	@@ -868,15 +1036,17 @@
868	1036	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
869	1037	}
870	1038
871		- cCheckBox liveCB;
	1039	+ cToggleButton liveCB;
872	1040	cCheckBox supportCB;
873	1041	cCheckBox localCB;
874	1042	cCheckBox crowdCB;
875	1043	cCheckBox smoothCB;
876		- cCheckBox fastCB;
	1044	+ cToggleButton fastCB;
877	1045	cCheckBox slowCB;
878	1046	cCheckBox boxCB;
879	1047	cCheckBox zoomBoxCB;
	1048	+ cCheckBox freezeCB;
	1049	+ //cToggleButton trackCB;
880	1050	cCheckBox trackCB;
881	1051	cCheckBox smoothfocusCB;
882	1052	// JCheckBox speakerMocapCB;
..	..	@@ -886,7 +1056,7 @@
886	1056
887	1057	cCheckBox oeilCB;
888	1058	cCheckBox shadowCB;
889		- cCheckBox autosaveCB;
	1059	+ cCheckBox autokeepCB;
890	1060	cCheckBox lookAtCB;
891	1061
892	1062	// static int COLOR = 1;
..	..	@@ -994,9 +1164,13 @@
994	1164	{
995	1165	Globals.COMPUTESHADOWWHENLIVE ^= true;
996	1166	}
997		- else if(e.getSource() == autosaveCB)
	1167	+ else if(e.getSource() == freezeCB)
998	1168	{
999		- Globals.SAVEONMAKE ^= true;
	1169	+ Globals.FREEZEONMOVE ^= true;
	1170	+ }
	1171	+ else if(e.getSource() == autokeepCB)
	1172	+ {
	1173	+ Globals.REPLACEONMAKE ^= true;
1000	1174	}
1001	1175	else if(e.getSource() == lookAtCB)
1002	1176	{
..	..	@@ -1014,7 +1188,8 @@
1014	1188
1015	1189	/**/
1016	1190	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
1017		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1191	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1192	+ TreePath path = objEditor.jTree.getSelectionPath();
1018	1193	if ((path == null) \|\| (path.getPathCount() <= 1)) {
1019	1194	// We can't move the root node or an empty selection
1020	1195	return;
..	..	@@ -1077,8 +1252,6 @@
1077	1252	}
1078	1253	}
1079	1254
1080		- String string = (String) object;
1081		-
1082	1255	System.out.println("Transfer = " + object + "; drop : " + target);
1083	1256	// if( object instanceof java.io.File[])
1084	1257	// {
..	..	@@ -1086,6 +1259,8 @@
1086	1259	// objEditor.DropFile((java.io.File[]) object, true);
1087	1260	// return;
1088	1261	// }
	1262	+
	1263	+ String string = object.toString();
1089	1264
1090	1265	// File path for Mac and Windows
1091	1266	if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
..	..	@@ -1131,23 +1306,33 @@
1131	1306
1132	1307	assert target == objEditor.jTree;
1133	1308	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1309	+ Object3D destinationLeaf;
1134	1310	try {
1135		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1311	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
1136	1312	} catch (Exception e) {
1137	1313	System.out.println("destinationPath : " + destinationPath);
1138	1314	return;
1139	1315	}
1140	1316
1141		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1317	+ for (int i=group.selection.size(); --i>=0;)
1142	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	+// {
1143	1328	loadClipboard(true);
1144	1329	objEditor.jTree.setSelectionPath(destinationPath);
1145	1330	pasteInto(false, false);
1146		- } else {
1147		- loadClipboard(false);
1148		- objEditor.jTree.setSelectionPath(destinationPath);
1149		- pasteInto(false, false); // true); // ???
1150		- }
	1331	+// } else {
	1332	+// loadClipboard(false);
	1333	+// objEditor.jTree.setSelectionPath(destinationPath);
	1334	+// pasteInto(false, false); // true); // ???
	1335	+// }
1151	1336	}
1152	1337	public void dropActionChanged(DropTargetDragEvent dtde)
1153	1338	// Called if the user has modified the current drop gesture
..	..	@@ -1252,22 +1437,30 @@
1252	1437	{
1253	1438	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1254	1439	//heightFieldItem.addActionListener(this);
1255		- gridItem = menu.add(new MenuItem("Grid"));
1256		- gridItem.addActionListener(this);
1257		- rectoidItem = menu.add(new MenuItem("Box"));
1258		- rectoidItem.addActionListener(this);
1259		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1260		- ellipsoidItem.addActionListener(this);
1261		- coneItem = menu.add(new MenuItem("Cone"));
1262		- coneItem.addActionListener(this);
1263		- torusItem = menu.add(new MenuItem("Torus"));
1264		- torusItem.addActionListener(this);
1265		- superItem = menu.add(new MenuItem("Superellipsoid"));
1266		- 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	+ {
1267	1458	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1268	1459	kleinItem.addActionListener(this);
1269		- particleItem = menu.add(new MenuItem("Particle system"));
1270		- particleItem.addActionListener(this);
	1460	+ }
	1461	+
	1462	+// particleItem = menu.add(new MenuItem("Particle system"));
	1463	+// particleItem.addActionListener(this);
1271	1464	if (Globals.ADVANCED)
1272	1465	{
1273	1466	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1293,15 +1486,15 @@
1293	1486	}
1294	1487	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1295	1488	bezierItem.addActionListener(this);
1296		- overlayItem = menu.add(new MenuItem("Overlay"));
1297		- overlayItem.addActionListener(this);
1298		- lightItem = menu.add(new MenuItem("Light"));
1299		- 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);
1300	1493	menu.add("-");
1301	1494	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1302	1495	//superLoopItem.addActionListener(this);
1303		- loopItem = menu.add(new MenuItem("Loop"));
1304		- loopItem.addActionListener(this);
	1496	+// loopItem = menu.add(new MenuItem("Loop"));
	1497	+// loopItem.addActionListener(this);
1305	1498	doubleItem = menu.add(new MenuItem("Fork"));
1306	1499	doubleItem.addActionListener(this);
1307	1500	if (Globals.ADVANCED)
..	..	@@ -1317,6 +1510,9 @@
1317	1510	animationItem.addItemListener(this);
1318	1511	animationItem.setState(Globals.ANIMATION);
1319	1512
	1513	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1514	+ archiveItem.addActionListener(this);
	1515	+
1320	1516	menu.add("-");
1321	1517	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1322	1518	parseverticesItem.addActionListener(this);
..	..	@@ -1329,6 +1525,8 @@
1329	1525	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1330	1526	reduce34MorphItem.addActionListener(this);
1331	1527	menu.add("-");
	1528	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	1529	+ memoryItem.addActionListener(this);
1332	1530	menu.add(computeAOItem = new MenuItem("Compute AO"));
1333	1531	computeAOItem.addActionListener(this);
1334	1532
..	..	@@ -1337,8 +1535,6 @@
1337	1535	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1338	1536	mirrorItem.addActionListener(this);
1339	1537	menu.add("-");
1340		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1341		- memoryItem.addActionListener(this);
1342	1538	menu.add(analyzeItem = new MenuItem("Analyze"));
1343	1539	analyzeItem.addActionListener(this);
1344	1540	menu.add(dumpItem = new MenuItem("Print"));
..	..	@@ -1486,6 +1682,30 @@
1486	1682
1487	1683	makeSomething(shadow);
1488	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	+ }
1489	1709
1490	1710	/**
1491	1711	* applyExample
..	..	@@ -1730,7 +1950,7 @@
1730	1950	{
1731	1951	ScreenFit();
1732	1952	} else
1733		- if (source == switchItem)
	1953	+ if (source == switchViewItem)
1734	1954	{
1735	1955	cVector v1 = new cVector();
1736	1956	cVector v2 = new cVector();
..	..	@@ -1739,11 +1959,11 @@
1739	1959	objEditor.cameraView.renderCamera.setAim(v2, v1);
1740	1960	objEditor.cameraView.repaint();
1741	1961	} else
1742		- if (source == rectoidItem)
	1962	+ if (source == rectoidItem \|\| source == boxButton)
1743	1963	{
1744	1964	makeSomething(new Box());
1745	1965	} else
1746		- if (source == particleItem)
	1966	+ if (source == particleItem \|\| source == particlesButton)
1747	1967	{
1748	1968	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1749	1969	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1822,27 +2042,27 @@
1822	2042
1823	2043	makeSomething(obj);
1824	2044	} else
1825		- if (source == gridItem)
	2045	+ if (source == gridItem \|\| source == gridButton)
1826	2046	{
1827	2047	makeSomething(new Grid());
1828	2048	} else
1829		- if (source == ellipsoidItem)
	2049	+ if (source == ellipsoidItem \|\| source == sphereButton)
1830	2050	{
1831	2051	makeSomething(new Sphere());
1832	2052	} else
1833		- if (source == coneItem)
	2053	+ if (source == coneItem \|\| source == coneButton)
1834	2054	{
1835	2055	makeSomething(new Cone());
1836	2056	} else
1837		- if (source == torusItem)
	2057	+ if (source == torusItem \|\| source == torusButton)
1838	2058	{
1839	2059	makeSomething(new Torus());
1840	2060	} else
1841		- if (source == superItem)
	2061	+ if (source == superItem \|\| source == superButton)
1842	2062	{
1843	2063	makeSomething(new Superellipsoid());
1844	2064	} else
1845		- if (source == kleinItem)
	2065	+ if (source == kleinItem \|\| source == kleinButton)
1846	2066	{
1847	2067	makeSomething(new Klein());
1848	2068	} else
..	..	@@ -1862,7 +2082,7 @@
1862	2082	{
1863	2083	makeSomething(new BezierSurface());
1864	2084	} else
1865		- if (source == overlayItem)
	2085	+ if (source == overlayItem \|\| source == overlayButton)
1866	2086	{
1867	2087	/*
1868	2088	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1910,7 +2130,7 @@
1910	2130	s.setup();
1911	2131	makeSomething(s);
1912	2132	} else
1913		- if (source == lightItem)
	2133	+ if (source == lightItem \|\| source == lightButton)
1914	2134	{
1915	2135	makeSomething(new Light());
1916	2136	} else
..	..	@@ -1960,30 +2180,30 @@
1960	2180
1961	2181	group(g);
1962	2182	} else
1963		- if (source == loopItem)
	2183	+ if (source == loopItem \|\| source == loopButton)
1964	2184	{
1965	2185	Composite csg = new GroupLeaf();
1966	2186	csg.count = 5;
1967	2187	group(csg);
1968		- Composite child = new cGroup();
	2188	+ Composite child = new cGroup("Branch");
1969	2189	csg.addChild(child);
1970	2190	child.addChild(csg);
1971	2191	} else
1972	2192	if (source == doubleItem)
1973	2193	{
1974		- Composite csg = new GroupLeaf();
	2194	+ Composite csg = new GroupLeaf("Fork");
1975	2195	csg.count = 5;
1976	2196	group(csg);
1977		- Composite child = new cGroup();
	2197	+ Composite child = new cGroup("Branch A");
1978	2198	csg.addChild(child);
1979	2199	child.addChild(csg);
1980		- child = new cGroup();
	2200	+ child = new cGroup("Branch B");
1981	2201	csg.addChild(child);
1982	2202	child.addChild(csg);
1983	2203	} else
1984	2204	if (source == tripleItem)
1985	2205	{
1986		- Composite csg = new GroupLeaf();
	2206	+ Composite csg = new GroupLeaf("Trident");
1987	2207	csg.count = 4;
1988	2208	group(csg);
1989	2209	Composite child = new cGroup();
..	..	@@ -2047,15 +2267,31 @@
2047	2267	} else
2048	2268	if (source == undoButton)
2049	2269	{
	2270	+ // Go to previous version
	2271	+ //if (!Undo())
	2272	+ //java.awt.Toolkit.getDefaultToolkit().beep();
2050	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();
2051	2284	} else
2052	2285	if (source == redoButton)
2053	2286	{
	2287	+ // Go to next version
2054	2288	Redo();
2055	2289	} else
2056	2290	if (source == saveButton)
2057	2291	{
2058		- Save();
	2292	+ // Save a new version
	2293	+ if (!Save(true))
	2294	+ java.awt.Toolkit.getDefaultToolkit().beep();
2059	2295	} else
2060	2296	if (source == oneStepButton)
2061	2297	{
..	..	@@ -2064,17 +2300,14 @@
2064	2300	} else
2065	2301	if (source == screenfitButton)
2066	2302	{
2067		- //Reload(lastConverter, lastFilename, true);
2068	2303	ScreenFit();
2069	2304	} else
2070	2305	if (source == screenfitpointButton)
2071	2306	{
2072		- //Reload(lastConverter, lastFilename, true);
2073	2307	ScreenFitPoint();
2074	2308	} else
2075	2309	if (source == snapobjectButton)
2076	2310	{
2077		- //Reload(lastConverter, lastFilename, true);
2078	2311	SnapObject();
2079	2312	} else
2080	2313	// if (event.getSource() == recompileButton)
..	..	@@ -2438,7 +2671,7 @@
2438	2671	{
2439	2672	StepAll();
2440	2673	} else
2441		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	2674	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2442	2675	{
2443	2676	//int indices[] = jList.getSelectedIndices();
2444	2677	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2450,9 +2683,9 @@
2450	2683	{
2451	2684	ClearSelection(true);
2452	2685	} else
2453		- if (source == grabItem)
	2686	+ if (source == grabItem \|\| source == groupButton)
2454	2687	{
2455		- group(new cGroup(), true);
	2688	+ group(new cGroup(), false); // true);
2456	2689	} else
2457	2690	if (source == hideItem)
2458	2691	{
..	..	@@ -2470,11 +2703,11 @@
2470	2703	{
2471	2704	makeSomething(new Camera());
2472	2705	} else
2473		- if (source == compositeItem)
	2706	+ if (source == compositeItem \|\| source == compositeButton)
2474	2707	{
2475	2708	group(new Composite());
2476	2709	} else
2477		- if (source == randomItem)
	2710	+ if (source == switchItem \|\| source == switchButton)
2478	2711	{
2479	2712	RandomNode random = new RandomNode();
2480	2713	group(random);
..	..	@@ -2576,7 +2809,7 @@
2576	2809	{
2577	2810	group(new cLinker());
2578	2811	} else
2579		- if (source == textureItem)
	2812	+ if (source == textureItem \|\| source == textureButton)
2580	2813	{
2581	2814	group(new TextureNode());
2582	2815	} else
..	..	@@ -2596,17 +2829,30 @@
2596	2829	{
2597	2830	CastShadow(2);
2598	2831	} else
2599		- if (source == ungroupItem)
	2832	+ if (source == ungroupItem \|\| source == ungroupButton)
2600	2833	{
2601		- //ungroup();
	2834	+ boolean hasRoot = false;
	2835	+
2602	2836	for (int i=0; i<group.selection.size(); i++)
2603	2837	{
2604		- Ungroup(group.selection.get(i));
	2838	+ if (group.selection.get(i) == group)
	2839	+ {
	2840	+ hasRoot = true;
	2841	+ break;
	2842	+ }
2605	2843	}
2606	2844
2607		- ClearSelection(false);
2608		-
2609		- 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	+ }
2610	2856	} else
2611	2857	if (source == genUVItem)
2612	2858	{
..	..	@@ -2934,6 +3180,10 @@
2934	3180	if (source == twoButton)
2935	3181	{
2936	3182	radio.layout = twoButton;
	3183	+
	3184	+ if (CameraPane.FULLSCREEN)
	3185	+ fullscreenLayout = radio.layout;
	3186	+
2937	3187	// bug
2938	3188	//gridPanel.setDividerLocation(1.0);
2939	3189	//bigPanel.setDividerLocation(0.0);
..	..	@@ -2989,6 +3239,9 @@
2989	3239	{
2990	3240	radio.layout = threeButton;
2991	3241
	3242	+ if (CameraPane.FULLSCREEN)
	3243	+ fullscreenLayout = radio.layout;
	3244	+
2992	3245	// bigThree.remove(scenePanel);
2993	3246	// bigThree.remove(centralPanel);
2994	3247	// bigThree.remove(XYZPanel);
..	..	@@ -3027,6 +3280,9 @@
3027	3280	{
3028	3281	radio.layout = fourButton;
3029	3282
	3283	+ if (CameraPane.FULLSCREEN)
	3284	+ fullscreenLayout = radio.layout;
	3285	+
3030	3286	// bigThree.remove(scenePanel);
3031	3287	// bigThree.remove(centralPanel);
3032	3288	// bigThree.remove(XYZPanel);
..	..	@@ -3063,6 +3319,9 @@
3063	3319	if (source == sixButton)
3064	3320	{
3065	3321	radio.layout = sixButton;
	3322	+
	3323	+ if (CameraPane.FULLSCREEN)
	3324	+ fullscreenLayout = radio.layout;
3066	3325
3067	3326	// bigThree.remove(scenePanel);
3068	3327	// bigThree.remove(centralPanel);
..	..	@@ -3101,6 +3360,9 @@
3101	3360	if (source == sevenButton)
3102	3361	{
3103	3362	radio.layout = sevenButton;
	3363	+
	3364	+ if (CameraPane.FULLSCREEN)
	3365	+ fullscreenLayout = radio.layout;
3104	3366
3105	3367	// bigThree.remove(scenePanel);
3106	3368	// bigThree.remove(centralPanel);
..	..	@@ -3182,6 +3444,12 @@
3182	3444	} else
3183	3445	if (source == editItem \|\| source == editButton)
3184	3446	{
	3447	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3448	+ {
	3449	+ Object3D child = (Object3D)e.nextElement();
	3450	+ child.pinned = true;
	3451	+ }
	3452	+
3185	3453	EditSelection(false);
3186	3454	} else
3187	3455	if (source == uneditButton)
..	..	@@ -3191,6 +3459,7 @@
3191	3459	Object3D child = (Object3D)e.nextElement();
3192	3460	if(child.editWindow != null)
3193	3461	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3462	+ child.pinned = false;
3194	3463	child.CloseUI();
3195	3464	listUI.remove(child);
3196	3465
..	..	@@ -3207,6 +3476,7 @@
3207	3476	//copy.ClearUI();
3208	3477	for (Object3D obj : listUI)
3209	3478	{
	3479	+ obj.pinned = false;
3210	3480	obj.CloseUI();
3211	3481	}
3212	3482	listUI.clear();
..	..	@@ -3216,7 +3486,7 @@
3216	3486	{
3217	3487	assert(copy == group);
3218	3488
3219		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3489	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3220	3490
3221	3491	for (Object3D obj : listUI)
3222	3492	{
..	..	@@ -3265,6 +3535,9 @@
3265	3535	}
3266	3536
3267	3537	copy = group;
	3538	+
	3539	+ SetUndoStates();
	3540	+
3268	3541	//Globals.theRenderer.object = group;
3269	3542	if(!useclient)
3270	3543	{
..	..	@@ -3291,6 +3564,13 @@
3291	3564	currentLayout = sevenButton;
3292	3565	*/
3293	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);
3294	3574	keepparent = group.parent;
3295	3575	// PARENT = NULL or not???
3296	3576	//group.parent = null; // ROOT
..	..	@@ -3304,7 +3584,7 @@
3304	3584	cameraView.ProtectCamera();
3305	3585	cameraView.repaint();
3306	3586	return;
3307		- } else if (event.getSource() == revertCameraItem)
	3587	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3308	3588	{
3309	3589	cameraView.RevertCamera();
3310	3590	cameraView.repaint();
..	..	@@ -3883,7 +4163,7 @@
3883	4163
3884	4164	try
3885	4165	{
3886		- texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4166	+ texturedata = Globals.theRenderer.GetTextureData(tex.pigmenttexture, pigment, false, node.texres);
3887	4167	}
3888	4168	catch (Exception e)
3889	4169	{
..	..	@@ -4358,28 +4638,25 @@
4358	4638	// }
4359	4639	// }
4360	4640
4361		- static boolean allparams = true;
4362		-
4363		- static Vector<Object3D> listUI = new Vector<Object3D>();
4364		-
4365	4641	void EditSelection(boolean newWindow)
4366	4642	{
	4643	+ if (group.selection == null)
	4644	+ {
	4645	+ EditElement(group, newWindow); // ? new
	4646	+ return;
	4647	+ }
	4648	+
4367	4649	// aConstraints.gridy = 0;
4368	4650	for (int i=0; i<group.selection.size(); i++)
4369	4651	{
4370	4652	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4371	4653	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4372		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4654	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4373	4655
4374	4656	Object3D elem = (Object3D)group.selection.elementAt(i);
4375	4657	if(elem != group \|\| !newWindow)
4376	4658	{
4377		- // if (!(elem instanceof Composite))
4378		- // newWindow = false;
4379		- listUI.add(elem);
4380		- elem.openEditWindow(this, newWindow); //, false);
4381		- System.out.println("edit : " + elem);
4382		- elem.editWindow.refreshContents(true); // ? new
	4659	+ EditElement(elem, newWindow); // ? new
4383	4660	}
4384	4661	}
4385	4662	}
..	..	@@ -4454,7 +4731,8 @@
4454	4731	//new Exception().printStackTrace();
4455	4732
4456	4733	freezemodel = true;
4457		-
	4734	+ ClearUnpinned();
	4735	+
4458	4736	/**/
4459	4737	//switch (event.id)
4460	4738	{
..	..	@@ -4487,7 +4765,7 @@
4487	4765	if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4488	4766	// a camera
4489	4767	{
4490		- if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	4768	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
4491	4769	{
4492	4770	CameraPane.camerachangeframe = 0; // don't refuse it
4493	4771	Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
..	..	@@ -4496,6 +4774,13 @@
4496	4774	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4497	4775	}
4498	4776
	4777	+ if (tps != null && tps.length == 1)
	4778	+ {
	4779	+ EditSelection(false);
	4780	+ }
	4781	+
	4782	+ SetPinStates(tps != null && tps.length > 0);
	4783	+
4499	4784	refreshContents();
4500	4785	//return true;
4501	4786	}
..	..	@@ -4505,9 +4790,18 @@
4505	4790	freezemodel = false;
4506	4791	}
4507	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	+
4508	4801	void refreshContents(boolean cp)
4509	4802	{
4510		- if (!Globals.MOUSEDRAGGED)
	4803	+ if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	4804	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
4511	4805	{
4512	4806	objEditor.ClearInfo(); // .GetMaterial());
4513	4807
..	..	@@ -4606,8 +4900,8 @@
4606	4900
4607	4901	if (cut)
4608	4902	{
4609		- if (Globals.SAVEONMAKE)
4610		- Save();
	4903	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	4904	+// Save();
4611	4905	//int indices[] = jList.getSelectedIndices();
4612	4906	//for (int i = indices.length - 1; i >= 0; i--)
4613	4907	//jList.remove(indices[i]);
..	..	@@ -4710,6 +5004,10 @@
4710	5004
4711	5005	void paste(boolean expand)
4712	5006	{
	5007	+ if (Globals.REPLACEONMAKE)
	5008	+ Save();
	5009	+ boolean keep = Globals.REPLACEONMAKE;
	5010	+ Globals.REPLACEONMAKE = false;
4713	5011	// if (GrafreeD.clipboard == null)
4714	5012	// return;
4715	5013	boolean first = true;
..	..	@@ -4769,6 +5067,7 @@
4769	5067	Grafreed.clipboard.get(0).parent = keepparent;
4770	5068	}
4771	5069
	5070	+ Globals.REPLACEONMAKE = keep;
4772	5071	ResetModel();
4773	5072	refreshContents();
4774	5073	}
..	..	@@ -4904,6 +5203,10 @@
4904	5203
4905	5204	void group(Object3D csg, boolean grab)
4906	5205	{
	5206	+ if (Globals.REPLACEONMAKE)
	5207	+ Save();
	5208	+ boolean keep = Globals.REPLACEONMAKE;
	5209	+ Globals.REPLACEONMAKE = false;
4907	5210	if (//false) // why??
4908	5211	!group.selection.isEmpty())
4909	5212	{
..	..	@@ -5017,10 +5320,15 @@
5017	5320	//node.add(csg);
5018	5321	//makeSomething(node);
5019	5322	makeSomething(csg);
	5323	+ Globals.REPLACEONMAKE = keep;
5020	5324	}
5021	5325
5022	5326	void Ungroup(Object3D g)
5023	5327	{
	5328	+ if (Globals.REPLACEONMAKE)
	5329	+ Save();
	5330	+ boolean keep = Globals.REPLACEONMAKE;
	5331	+ Globals.REPLACEONMAKE = false;
5024	5332	if (g instanceof HiddenObject)
5025	5333	{
5026	5334	HiddenObject h = (HiddenObject) g;
..	..	@@ -5037,6 +5345,7 @@
5037	5345	objEditor.makeSomething(g.get(i), false);
5038	5346	}
5039	5347	}
	5348	+ Globals.REPLACEONMAKE = keep;
5040	5349	}
5041	5350
5042	5351	void ungroup()
..	..	@@ -5325,13 +5634,28 @@
5325	5634	cButton clearpanelButton;
5326	5635	cButton unselectButton;
5327	5636
5328		- cButton minButton;
5329		- cButton maxButton;
5330		- cButton fullButton;
5331		- cButton undoButton;
5332		- cButton redoButton;
	5637	+ cButton restoreCameraButton;
	5638	+
5333	5639	cButton saveButton;
5334	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;
5335	5659
5336	5660	cButton screenfitButton;
5337	5661	cButton screenfitpointButton;
..	..	@@ -5353,11 +5677,11 @@
5353	5677	//JTree jTree;
5354	5678	private MenuItem lookAtItem;
5355	5679	private MenuItem lookFromItem;
5356		- private MenuItem switchItem;
	5680	+ private MenuItem switchViewItem;
5357	5681	private MenuItem cutItem;
5358	5682	private MenuItem undoItem;
5359	5683	private MenuItem redoItem;
5360		- private MenuItem duplicateItem;
	5684	+ private JMenuItem duplicateItem;
5361	5685	private MenuItem cloneItem;
5362	5686	private MenuItem cloneSupportItem;
5363	5687	private MenuItem overwriteGeoItem;
..	..	@@ -5385,7 +5709,7 @@
5385	5709	private MenuItem pasteLinkItem;
5386	5710	private MenuItem pasteCloneItem;
5387	5711	private MenuItem pasteExpandItem;
5388		- private MenuItem clearItem;
	5712	+ private MenuItem deleteItem;
5389	5713	private MenuItem clearAllItem;
5390	5714	private MenuItem genUVItem;
5391	5715	private MenuItem genNormalsMESHItem;
..	..	@@ -5445,7 +5769,7 @@
5445	5769	private MenuItem frontItem;
5446	5770	private MenuItem cameraItem;
5447	5771	private MenuItem compositeItem;
5448		- private MenuItem randomItem;
	5772	+ private MenuItem switchItem;
5449	5773	private MenuItem physicsItem;
5450	5774	private MenuItem frameselectorItem;
5451	5775	private MenuItem scriptNodeItem;
..	..	@@ -5519,5 +5843,5 @@
5519	5843
5520	5844	Menu cameraMenu;
5521	5845	MenuItem editCameraItem;
5522		- MenuItem revertCameraItem;
	5846	+ MenuItem restoreCameraItem;
5523	5847	}