~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -23,6 +23,31 @@
23	23	DragGestureListener, DragSourceListener, DropTargetListener,
24	24	ItemListener // ListSelectionListener
25	25	{
	26	+
	27	+ public void AddSkyboxButton(String f, String s, cGridBag row3)
	28	+ {
	29	+ cButton skyboxButton;
	30	+ final String path = "cubemaps/" + f + "-skyboxes/" + s;
	31	+ row3.add(skyboxButton = GetButton(path + "/" + s + ".jpg", !Grafreed.NIMBUSLAF));
	32	+ skyboxButton.setToolTipText(s);
	33	+ skyboxButton.addActionListener(new ActionListener()
	34	+ {
	35	+ @Override
	36	+ public void actionPerformed(ActionEvent e)
	37	+ {
	38	+ ChangeSkybox(path);
	39	+ }
	40	+ });
	41	+ }
	42	+
	43	+ public void ChangeSkybox(String name)
	44	+ {
	45	+ cameraView.envyoff = false;
	46	+ cameraView.skyboxname = name;
	47	+ cameraView.skyboxext = "jpg";
	48	+ cameraView.repaint();
	49	+ }
	50	+
26	51	//ObjEditor objEditor;
27	52	public void closeUI2()
28	53	{
..	..	@@ -60,6 +85,12 @@
60	85	this.copy = this.group = group;
61	86	//selectees = this.group.selectees;
62	87
	88	+ if (copy.versions == null)
	89	+ {
	90	+ copy.versions = new byte[100][];
	91	+ copy.versionindex = -1;
	92	+ }
	93	+
63	94	if(ui)
64	95	SetupUI(objEditor);
65	96	}
..	..	@@ -80,10 +111,22 @@
80	111	SetupViews(objEditor);
81	112
82	113	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
	114	+
	115	+ if (copy.versions == null)
	116	+ {
	117	+ copy.versions = new byte[100][];
	118	+ copy.versionindex = -1;
	119	+
	120	+ Save(true);
	121	+ }
83	122	}
84	123
85	124	void CloneSelection(boolean supports)
86	125	{
	126	+ if (Globals.REPLACEONMAKE)
	127	+ Save();
	128	+ boolean keep = Globals.REPLACEONMAKE;
	129	+ Globals.REPLACEONMAKE = false;
87	130	// Object3D keep = GrafreeD.clipboard;
88	131	//Object3D obj;
89	132	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -94,6 +137,7 @@
94	137
95	138	makeSomething(clone, i==group.selection.size()-1);
96	139	}
	140	+ Globals.REPLACEONMAKE = keep;
97	141	}
98	142
99	143	void CloneClipboard(boolean supports)
..	..	@@ -150,6 +194,8 @@
150	194
151	195	void SetupMenu2(GroupEditor oe)
152	196	{
	197	+ oe.jTree = new cTree();
	198	+
153	199	Menu menu;
154	200	oe.menuBar.add(menu = new Menu("Edit"));
155	201	//editItem = menu.add(new MenuItem("Edit"));
..	..	@@ -160,7 +206,7 @@
160	206	// redoItem = menu.add(new MenuItem("Redo"));
161	207	// redoItem.addActionListener(this);
162	208	// menu.add("-");
163		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	209	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
164	210	duplicateItem.addActionListener(this);
165	211	cloneItem = menu.add(new MenuItem("Clone"));
166	212	cloneItem.addActionListener(this);
..	..	@@ -187,8 +233,8 @@
187	233	// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
188	234	// pasteExpandItem.addActionListener(this);
189	235	menu.add("-");
190		- clearItem = menu.add(new MenuItem("Clear"));
191		- clearItem.addActionListener(this);
	236	+ deleteItem = menu.add(new MenuItem("Delete"));
	237	+ deleteItem.addActionListener(this);
192	238
193	239	if (Globals.ADVANCED)
194	240	{
..	..	@@ -202,23 +248,23 @@
202	248	//zBufferItem.addActionListener(this);
203	249	//cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
204	250	//normalLensItem.addActionListener(this);
205		- cameraMenu.add(revertCameraItem = new MenuItem("Restore Viewpoint"));
206		- revertCameraItem.addActionListener(this);
	251	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	252	+ restoreCameraItem.addActionListener(this);
207	253
208		- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
209		- toggleFullScreenItem.addItemListener(this);
210		- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
211		- cameraMenu.add("-");
	254	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	255	+// toggleFullScreenItem.addItemListener(this);
	256	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	257	+// cameraMenu.add("-");
	258	+//
	259	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	260	+// toggleTextureItem.addItemListener(this);
	261	+// toggleTextureItem.setState(CameraPane.textureon);
	262	+//
	263	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	264	+// toggleSwitchItem.addItemListener(this);
	265	+// toggleSwitchItem.setState(CameraPane.SWITCH);
212	266
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"));
	267	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
222	268	toggleHandleItem.addItemListener(this);
223	269	toggleHandleItem.setState(CameraPane.HANDLES);
224	270
..	..	@@ -273,7 +319,7 @@
273	319	{
274	320	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
275	321	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
276		- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
	322	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
277	323	editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
278	324	oe.cameraMenu.add("-");
279	325	openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
..	..	@@ -281,7 +327,7 @@
281	327	editLeafItem.addActionListener(this);
282	328	lookAtItem.addActionListener(this);
283	329	//lookFromItem.addActinoListener(this);
284		- //switchItem.addActionListener(this);
	330	+ //switchViewItem.addActionListener(this);
285	331	}
286	332
287	333	oe.menuBar.add(menu = new Menu("Setting"));
..	..	@@ -326,21 +372,29 @@
326	372	}
327	373
328	374	oe.menuBar.add(menu = new Menu("Group"));
329		- grabItem = menu.add(new MenuItem("Grab"));
330		- grabItem.addActionListener(this);
	375	+// grabItem = menu.add(new MenuItem("Grab"));
	376	+// grabItem.addActionListener(this);
331	377	backItem = menu.add(new MenuItem("Back"));
332	378	backItem.addActionListener(this);
333	379	frontItem = menu.add(new MenuItem("Front"));
334	380	frontItem.addActionListener(this);
335		- compositeItem = menu.add(new MenuItem("Composite"));
336		- compositeItem.addActionListener(this);
	381	+// compositeItem = menu.add(new MenuItem("Composite"));
	382	+// compositeItem.addActionListener(this);
	383	+
	384	+ if (Globals.ADVANCED)
	385	+ {
337	386	hideItem = menu.add(new MenuItem("Hidden Group"));
338	387	hideItem.addActionListener(this);
	388	+ }
339	389	ungroupItem = menu.add(new MenuItem("Ungroup"));
340	390	ungroupItem.addActionListener(this);
341		- menu.add("-");
342		- randomItem = menu.add(new MenuItem("Switch node"));
343		- randomItem.addActionListener(this);
	391	+
	392	+// menu.add("-");
	393	+//
	394	+// switchItem = menu.add(new MenuItem("Switch node"));
	395	+// switchItem.addActionListener(this);
	396	+ if (Globals.ADVANCED)
	397	+ {
344	398	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
345	399	switchGeoItem.addActionListener(this);
346	400	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
..	..	@@ -348,8 +402,6 @@
348	402	morphItem = menu.add(new MenuItem("Morph Group"));
349	403	morphItem.addActionListener(this);
350	404
351		- if (Globals.ADVANCED)
352		- {
353	405	menu.add("-");
354	406	physicsItem = menu.add(new MenuItem("Physics"));
355	407	physicsItem.addActionListener(this);
..	..	@@ -357,13 +409,11 @@
357	409	frameselectorItem.addActionListener(this);
358	410	scriptNodeItem = menu.add(new MenuItem("Script Node"));
359	411	scriptNodeItem.addActionListener(this);
360		- cameraItem = menu.add(new MenuItem("Camera"));
361		- cameraItem.addActionListener(this);
362	412	}
363	413
364	414	oe.menuBar.add(menu = new Menu("Object"));
365		- textureItem = menu.add(new MenuItem("Texture"));
366		- textureItem.addActionListener(this);
	415	+// textureItem = menu.add(new MenuItem("Texture"));
	416	+// textureItem.addActionListener(this);
367	417	billboardItem = menu.add(new MenuItem("Billboard"));
368	418	billboardItem.addActionListener(this);
369	419	csgItem = menu.add(new MenuItem("CSG"));
..	..	@@ -374,13 +424,14 @@
374	424	shadowYItem.addActionListener(this);
375	425	shadowZItem = menu.add(new MenuItem("Shadow Blue"));
376	426	shadowZItem.addActionListener(this);
	427	+ attributeItem = menu.add(new MenuItem("Attribute"));
	428	+ attributeItem.addActionListener(this);
	429	+
377	430	if (Globals.ADVANCED)
378	431	{
379	432	menu.add("-");
380	433	linkerItem = menu.add(new MenuItem("Linker"));
381	434	linkerItem.addActionListener(this);
382		- attributeItem = menu.add(new MenuItem("Attribute"));
383		- attributeItem.addActionListener(this);
384	435	templateItem = menu.add(new MenuItem("Template"));
385	436	templateItem.addActionListener(this);
386	437	pointflowItem = menu.add(new MenuItem("Point Flow"));
..	..	@@ -409,7 +460,7 @@
409	460	genNormalsMESHItem.addActionListener(this);
410	461	if (Globals.ADVANCED)
411	462	{
412		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	463	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
413	464	genNormalsMINEItem.addActionListener(this);
414	465	}
415	466	stripifyItem = menu.add(new MenuItem("Stripify"));
..	..	@@ -502,10 +553,15 @@
502	553	attachBumpItem.addActionListener(this);
503	554	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
504	555	pigmentBumpItem.addActionListener(this);
	556	+ //embedTexturesItem
505	557	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
506	558	detachPigmentItem.addActionListener(this);
507	559	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
508	560	detachBumpItem.addActionListener(this);
	561	+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
	562	+ embedTexturesItem.addActionListener(this);
	563	+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
	564	+ deEmbedTexturesItem.addActionListener(this);
509	565	menu.add("-");
510	566	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
511	567	sortbysizeItem.addActionListener(this);
..	..	@@ -532,6 +588,7 @@
532	588	buildToolsMenu(menu);
533	589	}
534	590
	591	+
535	592	void SetupUI2(ObjEditor oe)
536	593	{
537	594	// June 2019
..	..	@@ -574,51 +631,79 @@
574	631	oe.radioPanel.add(dummyButton);
575	632	oe.buttonGroup.add(dummyButton);
576	633	*/
	634	+ cGridBag copyOptionsPanel = new cGridBag();
	635	+
	636	+ copyOptionsPanel.preferredHeight = 2;
	637	+
577	638	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
578	639
579	640	//oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
580	641	//minButton.setToolTipText("Minimize window");
581	642	//minButton.addActionListener(this);
582	643
583		- oe.toolbarPanel.add(maxButton = new cButton("\u271A", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
584		- maxButton.setToolTipText("Maximize window");
585		- maxButton.addActionListener(this);
	644	+ if (Globals.ADVANCED)
	645	+ {
	646	+ oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	647	+ maxButton.setToolTipText("Maximize window");
	648	+ maxButton.addActionListener(this);
	649	+ }
586	650
587		- oe.toolbarPanel.add(fullButton = new cButton("\u2b1c", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	651	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
588	652	fullButton.setToolTipText("Full-screen window");
589	653	fullButton.addActionListener(this);
590	654
591		- oe.toolbarPanel.add(undoButton = new cButton("\u21a9", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
592		- undoButton.setToolTipText("Undo changes");
593		- undoButton.addActionListener(this);
	655	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	656	+ screenfitButton.setToolTipText("Screen fit");
	657	+ screenfitButton.addActionListener(this);
	658	+
	659	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	660	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	661	+ restoreCameraButton.addActionListener(this);
594	662
595		- oe.toolbarPanel.add(redoButton = new cButton("\u21aa", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
596		- redoButton.setToolTipText("Redo changes");
597		- redoButton.addActionListener(this);
598		-
599		- oe.toolbarPanel.add(saveButton = new cButton("\u21e3", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
600		- saveButton.setToolTipText("Save changes");
	663	+ copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	664	+ saveButton.setToolTipText("New version");
601	665	saveButton.addActionListener(this);
	666	+
	667	+ copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	668	+ undoButton.setToolTipText("Previous version");
	669	+ undoButton.addActionListener(this);
	670	+ undoButton.setEnabled(false);
602	671
603		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
	672	+ cGridBag updown = new cGridBag().setVertical(true);
	673	+ updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	674	+ restoreButton.setToolTipText("Restore current");
	675	+ restoreButton.addActionListener(this);
	676	+ restoreButton.setEnabled(false);
	677	+
	678	+ updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	679	+ replaceButton.setToolTipText("Replace current");
	680	+ replaceButton.addActionListener(this);
	681	+ replaceButton.setEnabled(false);
	682	+
	683	+ copyOptionsPanel.add(updown);
	684	+
	685	+ copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	686	+ redoButton.setToolTipText("Next version");
	687	+ redoButton.addActionListener(this);
	688	+ redoButton.setEnabled(false);
	689	+
	690	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
604	691	liveCB.setToolTipText("Enable animation");
605	692	liveCB.addItemListener(this);
606	693
607		- oe.toolbarPanel.add(oneStepButton = new cButton("\u29f4", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	694	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
608	695	oneStepButton.setToolTipText("Animate one step forward");
609	696	oneStepButton.addActionListener(this);
610	697
611		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	698	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
612	699	fastCB.setToolTipText("Fast mode");
613	700	fastCB.addItemListener(this);
614	701
615		- oe.toolbarPanel.add(trackCB = new cCheckBox(":", CameraPane.TRACK)); //, oe.aConstraints);
616		- trackCB.setToolTipText("Enable tracking");
617		- trackCB.addItemListener(this);
618		-
619		- oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
620		- screenfitButton.setToolTipText("Screen fit");
621		- screenfitButton.addActionListener(this);
	702	+ //oe.toolboxPanel.Return();
	703	+
	704	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	705	+// trackCB.setToolTipText("Enable tracking");
	706	+// trackCB.addItemListener(this);
622	707
623	708	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
624	709	// screenfitpointButton.addActionListener(this);
..	..	@@ -628,51 +713,225 @@
628	713	oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
629	714	snapobjectButton.addActionListener(this);
630	715	snapobjectButton.setToolTipText("Snap Object");
	716	+
	717	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	718	+ fourButton.addActionListener(this);
	719	+ fourButton.setToolTipText("Show control panel only");
631	720	}
632	721
633		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
634		- flashSelectionButton.setToolTipText("Show selection");
635		- flashSelectionButton.addActionListener(this);
	722	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
636	723
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");
	724	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	725	+ twoButton.setToolTipText("Show 3D view only");
641	726	twoButton.addActionListener(this);
642		- oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
643		- fourButton.addActionListener(this);
644		- fourButton.setToolTipText("Show left panel only");
645		- oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
646		- sixButton.setToolTipText("2-column layout left");
647		- sixButton.addActionListener(this);
648		- oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
649		- threeButton.setToolTipText("2-column layout right");
	727	+ this.fullscreenLayout = twoButton;
	728	+
	729	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	730	+ threeButton.setToolTipText("Show controls and 3D view");
650	731	threeButton.addActionListener(this);
651		- oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
652		- sevenButton.setToolTipText("3-column layout");
653		- sevenButton.addActionListener(this);
	732	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	733	+ sixButton.setToolTipText("Show 3D view and controls");
	734	+ sixButton.addActionListener(this);
	735	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	736	+// sevenButton.setToolTipText("3-column layout");
	737	+// sevenButton.addActionListener(this);
654	738	//
655	739
656		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
657		- rootButton.setToolTipText("Edit selection in new tab");
	740	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	741	+ rootButton.setToolTipText("Open selection in new tab");
658	742	rootButton.addActionListener(this);
659	743
660		- oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	744	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
661	745	closeButton.setToolTipText("Close tab");
662	746	closeButton.addActionListener(this);
663	747	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
664	748	//clearButton.addActionListener(this);
665		-
666		- editCommandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
667		- editButton.setToolTipText("Edit selection");
	749	+
	750	+ cGridBag row1 = new cGridBag();
	751	+
	752	+ // INSERT
	753	+ row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	754	+ gridButton.setToolTipText("Create grid");
	755	+ gridButton.addActionListener(this);
	756	+
	757	+ row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	758	+ boxButton.setToolTipText("Create box");
	759	+ boxButton.addActionListener(this);
	760	+
	761	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	762	+ sphereButton.setToolTipText("Create sphere");
	763	+ sphereButton.addActionListener(this);
	764	+
	765	+ row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	766	+ coneButton.setToolTipText("Create cone");
	767	+ coneButton.addActionListener(this);
	768	+
	769	+ row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	770	+ torusButton.setToolTipText("Create torus");
	771	+ torusButton.addActionListener(this);
	772	+
	773	+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	774	+ superButton.setToolTipText("Create superellipsoid");
	775	+ superButton.addActionListener(this);
	776	+
	777	+ if (Globals.ADVANCED)
	778	+ {
	779	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	780	+ kleinButton.setToolTipText("Create Klein bottle");
	781	+ kleinButton.addActionListener(this);
	782	+ }
	783	+
	784	+ row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	785	+ particlesButton.setToolTipText("Create particle system");
	786	+ particlesButton.addActionListener(this);
	787	+
	788	+ oe.toolboxPanel.add(row1);
	789	+
	790	+ cGridBag row2 = new cGridBag();
	791	+
	792	+ row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	793	+ groupButton.setToolTipText("Create group");
	794	+ groupButton.addActionListener(this);
	795	+
	796	+ row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	797	+ compositeButton.setToolTipText("Create composite");
	798	+ compositeButton.addActionListener(this);
	799	+
	800	+ row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	801	+ switchButton.setToolTipText("Create item switcher");
	802	+ switchButton.addActionListener(this);
	803	+
	804	+ row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	805	+ loopButton.setToolTipText("Create loop");
	806	+ loopButton.addActionListener(this);
	807	+
	808	+ row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	809	+ textureButton.setToolTipText("Create texture");
	810	+ textureButton.addActionListener(this);
	811	+
	812	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	813	+ overlayButton.setToolTipText("Create overlay");
	814	+ overlayButton.addActionListener(this);
	815	+
	816	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	817	+ lightButton.setToolTipText("Create light");
	818	+ lightButton.addActionListener(this);
	819	+
	820	+ oe.toolboxPanel.add(row2);
	821	+
	822	+ // ENVYMAPS
	823	+ cGridBag row3 = new cGridBag();
	824	+ row3.preferredHeight = 20;
	825	+
	826	+ AddSkyboxButton("default", "rgb", row3);
	827	+ AddSkyboxButton("default", "cornell", row3);
	828	+ AddSkyboxButton("default", "uffizi", row3);
	829	+ AddSkyboxButton("default", "CloudyHills", row3);
	830	+ AddSkyboxButton("default", "skycube", row3);
	831	+
	832	+ oe.toolboxPanel.add(row3);
	833	+
	834	+ cGridBag row4 = new cGridBag();
	835	+ row4.preferredHeight = 20;
	836	+
	837	+ AddSkyboxButton("bridge", "Bridge2", row4);
	838	+ AddSkyboxButton("urban", "GamlaStan2", row4);
	839	+ AddSkyboxButton("urban", "Parliament", row4);
	840	+ AddSkyboxButton("urban", "Roundabout", row4);
	841	+
	842	+ oe.toolboxPanel.add(row4);
	843	+
	844	+ cGridBag row5 = new cGridBag();
	845	+ row5.preferredHeight = 20;
	846	+
	847	+ AddSkyboxButton("urban", "SaintLazarusChurch", row5);
	848	+ AddSkyboxButton("urban", "SaintLazarusChurch2", row5);
	849	+ AddSkyboxButton("urban", "SaintLazarusChurch3", row5);
	850	+ AddSkyboxButton("urban", "UnionSquare", row5);
	851	+
	852	+ oe.toolboxPanel.add(row5);
	853	+
	854	+ cGridBag row6 = new cGridBag();
	855	+ row6.preferredHeight = 20;
	856	+
	857	+ AddSkyboxButton("park", "BerzeliiPark", row6);
	858	+ AddSkyboxButton("park", "Buddha", row6);
	859	+ AddSkyboxButton("park", "CNTower2", row6);
	860	+ //AddSkyboxButton("park", "Fatbursparken", row6);
	861	+ AddSkyboxButton("park", "NiagaraFalls1", row6);
	862	+
	863	+ oe.toolboxPanel.add(row6);
	864	+
	865	+ cGridBag row7 = new cGridBag();
	866	+ row7.preferredHeight = 20;
	867	+
	868	+ AddSkyboxButton("park", "NiagaraFalls3", row7);
	869	+ AddSkyboxButton("park", "Park", row7);
	870	+ //AddSkyboxButton("park", "Park2", row6);
	871	+ //AddSkyboxButton("park", "Path", row6);
	872	+ AddSkyboxButton("park", "Pond", row7);
	873	+ AddSkyboxButton("park", "Skansen", row7);
	874	+
	875	+ oe.toolboxPanel.add(row7);
	876	+
	877	+ cGridBag row8 = new cGridBag();
	878	+ row8.preferredHeight = 20;
	879	+
	880	+ AddSkyboxButton("park", "Skansen2", row8);
	881	+ AddSkyboxButton("park", "Skansen3", row8);
	882	+ AddSkyboxButton("park", "Skansen4", row8);
	883	+ AddSkyboxButton("park", "Skansen5", row8);
	884	+
	885	+ oe.toolboxPanel.add(row8);
	886	+
	887	+ cGridBag row9 = new cGridBag();
	888	+ row9.preferredHeight = 20;
	889	+
	890	+ AddSkyboxButton("park", "Stairs", row9);
	891	+ //AddSkyboxButton("park", "Tantolunden", row6);
	892	+ //AddSkyboxButton("park", "Tantolunden3", row6);
	893	+ AddSkyboxButton("park", "Tantolunden4", row9);
	894	+
	895	+ oe.toolboxPanel.add(row9);
	896	+/*
	897	+BerzeliiPark
	898	+Buddha
	899	+CNTower2
	900	+Fatbursparken
	901	+NiagaraFalls1
	902	+NiagaraFalls3
	903	+Park
	904	+Park2
	905	+Path
	906	+Pond
	907	+Skansen
	908	+Skansen2
	909	+Skansen3
	910	+Skansen4
	911	+Skansen5
	912	+Stairs
	913	+Tantolunden
	914	+Tantolunden3
	915	+Tantolunden4
	916	+ */
	917	+
	918	+ for (int i=1; --i>=0;)
	919	+ {
	920	+ //oe.toolboxPanel.Return();
	921	+ oe.toolboxPanel.add(new cGridBag());
	922	+ }
	923	+
	924	+ // EDIT panel
	925	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	926	+ editButton.setToolTipText("Pin selection controls");
668	927	editButton.addActionListener(this);
669	928
670		- editCommandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
671		- uneditButton.setToolTipText("Unedit selection");
	929	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	930	+ uneditButton.setToolTipText("Remove selection controls");
672	931	uneditButton.addActionListener(this);
673	932
674	933	editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
675		- allParamsButton.setToolTipText("Edit all params");
	934	+ allParamsButton.setToolTipText("Show all controle");
676	935	allParamsButton.addActionListener(this);
677	936
678	937	editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..	..	@@ -683,8 +942,13 @@
683	942	unselectButton.setToolTipText("Unselect");
684	943	unselectButton.addActionListener(this);
685	944
	945	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	946	+ flashSelectionButton.setToolTipText("Highlight selection");
	947	+ flashSelectionButton.addActionListener(this);
	948	+
686	949	editCommandsPanel.preferredHeight = 1;
687	950
	951	+ SetPinStates(false);
688	952	// oe.treePanel.add(commandsPanel);
689	953	// oe.treePanel.Return();
690	954
..	..	@@ -703,32 +967,20 @@
703	967
704	968	JScrollPane jSP;
705	969	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
706		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	970	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
707	971	ResetModel();
708	972
709	973	oe.treePanel.add(jSPPanel);
710	974	oe.treePanel.Return();
711	975
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	976	oe.treePanel.add(copyOptionsPanel);
728	977	oe.treePanel.Return();
	978	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	979	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	980	+ sliderPane.preferredHeight = 1;
729	981
730		-// mainPanel.setDividerLocation(0.5); //1.0);
731		-// mainPanel.setResizeWeight(0.5);
	982	+// mainPanel.setDividerLocation(0.1); //1.0);
	983	+ mainPanel.setResizeWeight(0.4);
732	984
733	985	//jList.addListSelectionListener(this);
734	986	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -736,7 +988,7 @@
736	988	//jTree.setEditable(true);
737	989	oe.jTree.setDragEnabled(true);
738	990	//jTree.setPreferredSize(new Dimension(10,10));
739		- jSP.setPreferredSize(new Dimension(100,200));
	991	+ //jSP.setPreferredSize(new Dimension(100,200));
740	992
741	993	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
742	994
..	..	@@ -748,29 +1000,49 @@
748	1000	dgr.addDragGestureListener(this);
749	1001	}catch(Exception e) {}
750	1002	*/
751		- radio.layout = sevenButton;
	1003	+ radio.layout = sixButton; // sevenButton;
752	1004	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
753	1005	}
754	1006
755	1007	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
756	1008	{
	1009	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	1010	+ colorCB.setToolTipText("Copy color when dropped");
	1011	+ colorCB.addItemListener(this);
	1012	+
	1013	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	1014	+ materialCB.setToolTipText("Copy material when dropped");
	1015	+ materialCB.addItemListener(this);
	1016	+
	1017	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	1018	+ textureCB.setToolTipText("Copy texture when dropped");
	1019	+ textureCB.addItemListener(this);
	1020	+
	1021	+ panel.Return();
	1022	+
757	1023	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
758	1024	boxCB.setToolTipText("Display bounding boxes");
759	1025	boxCB.addItemListener(this);
760	1026
761	1027	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
762		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	1028	+ zoomBoxCB.setToolTipText("Display only for wheel");
763	1029	zoomBoxCB.addItemListener(this);
764	1030
765	1031	if (true) // Globals.ADVANCED)
766	1032	{
767		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
768		- supportCB.setToolTipText("Enable rigging");
769		- supportCB.addItemListener(this);
	1033	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	1034	+// supportCB.setToolTipText("Enable rigging");
	1035	+// supportCB.addItemListener(this);
	1036	+
	1037	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	1038	+ freezeCB.setToolTipText("Fast moving camera");
	1039	+ freezeCB.addItemListener(this);
770	1040
771	1041	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
772	1042	// localCB.addItemListener(this);
773	1043
	1044	+ panel.Return();
	1045	+
774	1046	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
775	1047	crowdCB.setToolTipText("Used for crowds");
776	1048	crowdCB.addItemListener(this);
..	..	@@ -787,6 +1059,8 @@
787	1059	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
788	1060	// speakerMocapCB.addItemListener(this);
789	1061
	1062	+ panel.Return();
	1063	+
790	1064	if (false)
791	1065	{
792	1066	// handled in scripts
..	..	@@ -801,34 +1075,74 @@
801	1075	//constraints.gridy += 1;
802	1076	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
803	1077	smoothfocusCB.addItemListener(this);
	1078	+ panel.Return();
804	1079	}
805	1080
806	1081	//constraints.gridx += 1;
807	1082	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
808	1083	// debugCB.addItemListener(this);
809	1084
	1085	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	1086	+ trackCB.setToolTipText("Enable tracking target");
	1087	+ trackCB.addItemListener(this);
	1088	+
810	1089	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	1090	+ oeilCB.setToolTipText("Move camera when tracking");
811	1091	oeilCB.addItemListener(this);
812	1092
	1093	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	1094	+ shadowCB.setToolTipText("When live compute shadows");
	1095	+ shadowCB.addItemListener(this);
	1096	+
	1097	+ panel.Return();
	1098	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	1099	+ toggleTextureCB.setToolTipText("Load textures");
	1100	+ toggleTextureCB.addItemListener(this);
	1101	+
	1102	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	1103	+ toggleSwitchCB.setToolTipText("Choose a single item");
	1104	+ toggleSwitchCB.addItemListener(this);
	1105	+
	1106	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1107	+ autokeepCB.setToolTipText("On structure change");
	1108	+ autokeepCB.addItemListener(this);
	1109	+
	1110	+ panel.Return();
	1111	+ if (Globals.ADVANCED)
	1112	+ {
813	1113	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
814	1114	lookAtCB.setToolTipText("Look-at target");
815	1115	lookAtCB.addItemListener(this);
	1116	+ }
816	1117
817	1118	}
818	1119
819	1120	cGridBag fill = new cGridBag();
820		-
821	1121	fill.preferredHeight = 200;
	1122	+ cGridBag fill2 = new cGridBag();
	1123	+ fill2.preferredHeight = 200;
	1124	+ cGridBag fill3 = new cGridBag();
	1125	+ fill3.preferredHeight = 200;
822	1126
823	1127	panel.add(fill);
	1128	+ panel.add(fill2);
	1129	+ panel.add(fill3);
824	1130
825	1131	}
826	1132
827	1133	void EditObject(Object3D obj)
828	1134	{
829	1135	cRadio radioButton = new cRadio(obj.name);
	1136	+
	1137	+ // June 2019. Patch to avoid bug with transparency.
	1138	+ radioButton.hadMaterial = obj.material != null;
	1139	+ if (!radioButton.hadMaterial)
	1140	+ {
	1141	+ obj.material = new cMaterial();
	1142	+ }
	1143	+
830	1144	radioButton.SetObject(obj);
831		- radioButton.layout = sevenButton;
	1145	+ radioButton.layout = sixButton; // sevenButton;
832	1146	radioButton.SetCamera(cameraView.renderCamera, false);
833	1147	radioButton.addActionListener(this);
834	1148	radioPanel.add(radioButton);
..	..	@@ -848,23 +1162,28 @@
848	1162	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
849	1163	}
850	1164
851		- JCheckBox liveCB;
852		- JCheckBox supportCB;
853		- JCheckBox localCB;
854		- JCheckBox crowdCB;
855		- JCheckBox smoothCB;
856		- JCheckBox fastCB;
857		- JCheckBox slowCB;
858		- JCheckBox boxCB;
859		- JCheckBox zoomBoxCB;
860		- JCheckBox trackCB;
861		- JCheckBox smoothfocusCB;
	1165	+ cToggleButton liveCB;
	1166	+ cCheckBox supportCB;
	1167	+ cCheckBox localCB;
	1168	+ cCheckBox crowdCB;
	1169	+ cCheckBox smoothCB;
	1170	+ cToggleButton fastCB;
	1171	+ cCheckBox slowCB;
	1172	+ cCheckBox boxCB;
	1173	+ cCheckBox zoomBoxCB;
	1174	+ cCheckBox freezeCB;
	1175	+ //cToggleButton trackCB;
	1176	+ cCheckBox trackCB;
	1177	+ cCheckBox smoothfocusCB;
862	1178	// JCheckBox speakerMocapCB;
863		- JCheckBox speakerCameraCB;
864		- JCheckBox speakerFocusCB;
865		- JCheckBox debugCB;
866		- JCheckBox oeilCB;
867		- JCheckBox lookAtCB;
	1179	+ cCheckBox speakerCameraCB;
	1180	+ cCheckBox speakerFocusCB;
	1181	+ cCheckBox debugCB;
	1182	+
	1183	+ cCheckBox oeilCB;
	1184	+ cCheckBox shadowCB;
	1185	+ cCheckBox autokeepCB;
	1186	+ cCheckBox lookAtCB;
868	1187
869	1188	// static int COLOR = 1;
870	1189	// static int MATERIAL = 2;
..	..	@@ -872,9 +1191,9 @@
872	1191
873	1192	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
874	1193
875		- JCheckBox colorCB;
876		- JCheckBox materialCB;
877		- JCheckBox textureCB;
	1194	+ cCheckBox colorCB;
	1195	+ cCheckBox materialCB;
	1196	+ cCheckBox textureCB;
878	1197
879	1198	public void itemStateChanged(ItemEvent e)
880	1199	{
..	..	@@ -967,6 +1286,18 @@
967	1286	{
968	1287	cameraView.ToggleOeil();
969	1288	}
	1289	+ else if(e.getSource() == shadowCB)
	1290	+ {
	1291	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1292	+ }
	1293	+ else if(e.getSource() == freezeCB)
	1294	+ {
	1295	+ Globals.FREEZEONMOVE ^= true;
	1296	+ }
	1297	+ else if(e.getSource() == autokeepCB)
	1298	+ {
	1299	+ Globals.REPLACEONMAKE ^= true;
	1300	+ }
970	1301	else if(e.getSource() == lookAtCB)
971	1302	{
972	1303	cameraView.ToggleLookAt();
..	..	@@ -983,7 +1314,8 @@
983	1314
984	1315	/**/
985	1316	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
986		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1317	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1318	+ TreePath path = objEditor.jTree.getSelectionPath();
987	1319	if ((path == null) \|\| (path.getPathCount() <= 1)) {
988	1320	// We can't move the root node or an empty selection
989	1321	return;
..	..	@@ -1046,8 +1378,6 @@
1046	1378	}
1047	1379	}
1048	1380
1049		- String string = (String) object;
1050		-
1051	1381	System.out.println("Transfer = " + object + "; drop : " + target);
1052	1382	// if( object instanceof java.io.File[])
1053	1383	// {
..	..	@@ -1055,6 +1385,8 @@
1055	1385	// objEditor.DropFile((java.io.File[]) object, true);
1056	1386	// return;
1057	1387	// }
	1388	+
	1389	+ String string = object.toString();
1058	1390
1059	1391	// File path for Mac and Windows
1060	1392	if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
..	..	@@ -1100,23 +1432,33 @@
1100	1432
1101	1433	assert target == objEditor.jTree;
1102	1434	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1435	+ Object3D destinationLeaf;
1103	1436	try {
1104		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1437	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
1105	1438	} catch (Exception e) {
1106	1439	System.out.println("destinationPath : " + destinationPath);
1107	1440	return;
1108	1441	}
1109	1442
1110		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1443	+ for (int i=group.selection.size(); --i>=0;)
1111	1444	{
	1445	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1446	+
	1447	+ // Cannot move into itself
	1448	+ if (child == destinationLeaf)
	1449	+ return;
	1450	+ }
	1451	+
	1452	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1453	+// {
1112	1454	loadClipboard(true);
1113	1455	objEditor.jTree.setSelectionPath(destinationPath);
1114	1456	pasteInto(false, false);
1115		- } else {
1116		- loadClipboard(false);
1117		- objEditor.jTree.setSelectionPath(destinationPath);
1118		- pasteInto(false, false); // true); // ???
1119		- }
	1457	+// } else {
	1458	+// loadClipboard(false);
	1459	+// objEditor.jTree.setSelectionPath(destinationPath);
	1460	+// pasteInto(false, false); // true); // ???
	1461	+// }
1120	1462	}
1121	1463	public void dropActionChanged(DropTargetDragEvent dtde)
1122	1464	// Called if the user has modified the current drop gesture
..	..	@@ -1221,22 +1563,30 @@
1221	1563	{
1222	1564	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1223	1565	//heightFieldItem.addActionListener(this);
1224		- gridItem = menu.add(new MenuItem("Grid"));
1225		- gridItem.addActionListener(this);
1226		- rectoidItem = menu.add(new MenuItem("Box"));
1227		- rectoidItem.addActionListener(this);
1228		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1229		- ellipsoidItem.addActionListener(this);
1230		- coneItem = menu.add(new MenuItem("Cone"));
1231		- coneItem.addActionListener(this);
1232		- torusItem = menu.add(new MenuItem("Torus"));
1233		- torusItem.addActionListener(this);
1234		- superItem = menu.add(new MenuItem("Superellipsoid"));
1235		- superItem.addActionListener(this);
	1566	+// gridItem = menu.add(new MenuItem("Grid"));
	1567	+// gridItem.addActionListener(this);
	1568	+// rectoidItem = menu.add(new MenuItem("Box"));
	1569	+// rectoidItem.addActionListener(this);
	1570	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1571	+// ellipsoidItem.addActionListener(this);
	1572	+// coneItem = menu.add(new MenuItem("Cone"));
	1573	+// coneItem.addActionListener(this);
	1574	+// torusItem = menu.add(new MenuItem("Torus"));
	1575	+// torusItem.addActionListener(this);
	1576	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1577	+// superItem.addActionListener(this);
	1578	+
	1579	+ cameraItem = menu.add(new MenuItem("Camera"));
	1580	+ cameraItem.addActionListener(this);
	1581	+
	1582	+ if (!Globals.ADVANCED)
	1583	+ {
1236	1584	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1237	1585	kleinItem.addActionListener(this);
1238		- particleItem = menu.add(new MenuItem("Particle system"));
1239		- particleItem.addActionListener(this);
	1586	+ }
	1587	+
	1588	+// particleItem = menu.add(new MenuItem("Particle system"));
	1589	+// particleItem.addActionListener(this);
1240	1590	if (Globals.ADVANCED)
1241	1591	{
1242	1592	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1262,15 +1612,15 @@
1262	1612	}
1263	1613	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1264	1614	bezierItem.addActionListener(this);
1265		- overlayItem = menu.add(new MenuItem("Overlay"));
1266		- overlayItem.addActionListener(this);
1267		- lightItem = menu.add(new MenuItem("Light"));
1268		- lightItem.addActionListener(this);
	1615	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1616	+// overlayItem.addActionListener(this);
	1617	+// lightItem = menu.add(new MenuItem("Light"));
	1618	+// lightItem.addActionListener(this);
1269	1619	menu.add("-");
1270	1620	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1271	1621	//superLoopItem.addActionListener(this);
1272		- loopItem = menu.add(new MenuItem("Loop"));
1273		- loopItem.addActionListener(this);
	1622	+// loopItem = menu.add(new MenuItem("Loop"));
	1623	+// loopItem.addActionListener(this);
1274	1624	doubleItem = menu.add(new MenuItem("Fork"));
1275	1625	doubleItem.addActionListener(this);
1276	1626	if (Globals.ADVANCED)
..	..	@@ -1286,6 +1636,9 @@
1286	1636	animationItem.addItemListener(this);
1287	1637	animationItem.setState(Globals.ANIMATION);
1288	1638
	1639	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1640	+ archiveItem.addActionListener(this);
	1641	+
1289	1642	menu.add("-");
1290	1643	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1291	1644	parseverticesItem.addActionListener(this);
..	..	@@ -1298,6 +1651,8 @@
1298	1651	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1299	1652	reduce34MorphItem.addActionListener(this);
1300	1653	menu.add("-");
	1654	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	1655	+ memoryItem.addActionListener(this);
1301	1656	menu.add(computeAOItem = new MenuItem("Compute AO"));
1302	1657	computeAOItem.addActionListener(this);
1303	1658
..	..	@@ -1306,8 +1661,6 @@
1306	1661	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1307	1662	mirrorItem.addActionListener(this);
1308	1663	menu.add("-");
1309		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1310		- memoryItem.addActionListener(this);
1311	1664	menu.add(analyzeItem = new MenuItem("Analyze"));
1312	1665	analyzeItem.addActionListener(this);
1313	1666	menu.add(dumpItem = new MenuItem("Print"));
..	..	@@ -1455,6 +1808,30 @@
1455	1808
1456	1809	makeSomething(shadow);
1457	1810	}
	1811	+
	1812	+ private void ClearUnpinned()
	1813	+ {
	1814	+ //for (Object3D obj : listUI)
	1815	+ for (int i=listUI.size(); --i>=0;)
	1816	+ {
	1817	+ Object3D obj = listUI.elementAt(i);
	1818	+ if (!obj.pinned)
	1819	+ {
	1820	+ obj.CloseUI();
	1821	+ listUI.remove(i);
	1822	+ }
	1823	+ }
	1824	+ }
	1825	+
	1826	+ private void EditElement(Object3D elem, boolean newWindow)
	1827	+ {
	1828	+ // if (!(elem instanceof Composite))
	1829	+ // newWindow = false;
	1830	+ listUI.add(elem);
	1831	+ elem.openEditWindow(this, newWindow); //, false);
	1832	+ System.out.println("edit : " + elem);
	1833	+ elem.editWindow.refreshContents(true); // ? new
	1834	+ }
1458	1835
1459	1836	/**
1460	1837	* applyExample
..	..	@@ -1699,7 +2076,7 @@
1699	2076	{
1700	2077	ScreenFit();
1701	2078	} else
1702		- if (source == switchItem)
	2079	+ if (source == switchViewItem)
1703	2080	{
1704	2081	cVector v1 = new cVector();
1705	2082	cVector v2 = new cVector();
..	..	@@ -1708,11 +2085,11 @@
1708	2085	objEditor.cameraView.renderCamera.setAim(v2, v1);
1709	2086	objEditor.cameraView.repaint();
1710	2087	} else
1711		- if (source == rectoidItem)
	2088	+ if (source == rectoidItem \|\| source == boxButton)
1712	2089	{
1713	2090	makeSomething(new Box());
1714	2091	} else
1715		- if (source == particleItem)
	2092	+ if (source == particleItem \|\| source == particlesButton)
1716	2093	{
1717	2094	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1718	2095	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1791,27 +2168,27 @@
1791	2168
1792	2169	makeSomething(obj);
1793	2170	} else
1794		- if (source == gridItem)
	2171	+ if (source == gridItem \|\| source == gridButton)
1795	2172	{
1796	2173	makeSomething(new Grid());
1797	2174	} else
1798		- if (source == ellipsoidItem)
	2175	+ if (source == ellipsoidItem \|\| source == sphereButton)
1799	2176	{
1800	2177	makeSomething(new Sphere());
1801	2178	} else
1802		- if (source == coneItem)
	2179	+ if (source == coneItem \|\| source == coneButton)
1803	2180	{
1804	2181	makeSomething(new Cone());
1805	2182	} else
1806		- if (source == torusItem)
	2183	+ if (source == torusItem \|\| source == torusButton)
1807	2184	{
1808	2185	makeSomething(new Torus());
1809	2186	} else
1810		- if (source == superItem)
	2187	+ if (source == superItem \|\| source == superButton)
1811	2188	{
1812	2189	makeSomething(new Superellipsoid());
1813	2190	} else
1814		- if (source == kleinItem)
	2191	+ if (source == kleinItem \|\| source == kleinButton)
1815	2192	{
1816	2193	makeSomething(new Klein());
1817	2194	} else
..	..	@@ -1831,7 +2208,7 @@
1831	2208	{
1832	2209	makeSomething(new BezierSurface());
1833	2210	} else
1834		- if (source == overlayItem)
	2211	+ if (source == overlayItem \|\| source == overlayButton)
1835	2212	{
1836	2213	/*
1837	2214	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1879,10 +2256,27 @@
1879	2256	s.setup();
1880	2257	makeSomething(s);
1881	2258	} else
1882		- if (source == lightItem)
	2259	+ if (source == lightItem \|\| source == lightButton)
1883	2260	{
1884	2261	makeSomething(new Light());
1885	2262	} else
	2263	+// if (source == skybox1Button \|\|
	2264	+// source == skybox2Button \|\|
	2265	+// source == skybox3Button \|\|
	2266	+// source == skybox4Button \|\|
	2267	+// source == skybox5Button \|\|
	2268	+// source == skybox6Button \|\|
	2269	+// source == skybox7Button \|\|
	2270	+// source == skybox11Button \|\|
	2271	+// source == skybox12Button \|\|
	2272	+// source == skybox13Button \|\|
	2273	+// source == skybox14Button \|\|
	2274	+// source == skybox15Button \|\|
	2275	+// source == skybox16Button \|\|
	2276	+// source == skybox17Button)
	2277	+// {
	2278	+// ChangeSkybox(source);
	2279	+// } else
1886	2280	if (source == csgItem)
1887	2281	{
1888	2282	group(new CSG());
..	..	@@ -1929,30 +2323,30 @@
1929	2323
1930	2324	group(g);
1931	2325	} else
1932		- if (source == loopItem)
	2326	+ if (source == loopItem \|\| source == loopButton)
1933	2327	{
1934	2328	Composite csg = new GroupLeaf();
1935	2329	csg.count = 5;
1936	2330	group(csg);
1937		- Composite child = new cGroup();
	2331	+ Composite child = new cGroup("Branch");
1938	2332	csg.addChild(child);
1939	2333	child.addChild(csg);
1940	2334	} else
1941	2335	if (source == doubleItem)
1942	2336	{
1943		- Composite csg = new GroupLeaf();
	2337	+ Composite csg = new GroupLeaf("Fork");
1944	2338	csg.count = 5;
1945	2339	group(csg);
1946		- Composite child = new cGroup();
	2340	+ Composite child = new cGroup("Branch A");
1947	2341	csg.addChild(child);
1948	2342	child.addChild(csg);
1949		- child = new cGroup();
	2343	+ child = new cGroup("Branch B");
1950	2344	csg.addChild(child);
1951	2345	child.addChild(csg);
1952	2346	} else
1953	2347	if (source == tripleItem)
1954	2348	{
1955		- Composite csg = new GroupLeaf();
	2349	+ Composite csg = new GroupLeaf("Trident");
1956	2350	csg.count = 4;
1957	2351	group(csg);
1958	2352	Composite child = new cGroup();
..	..	@@ -1968,7 +2362,7 @@
1968	2362	if (source == computeAOItem)
1969	2363	{
1970	2364	Globals.drawMode = CameraPane.OCCLUSION;
1971		- Globals.theRenderer.repaint();
	2365	+ cameraView.repaint();
1972	2366	} else
1973	2367	if (source == recompileItem)
1974	2368	{
..	..	@@ -2016,15 +2410,31 @@
2016	2410	} else
2017	2411	if (source == undoButton)
2018	2412	{
	2413	+ // Go to previous version
	2414	+ //if (!Undo())
	2415	+ //java.awt.Toolkit.getDefaultToolkit().beep();
2019	2416	Undo();
	2417	+ } else
	2418	+ if (source == restoreButton)
	2419	+ {
	2420	+ // Restore current version
	2421	+ Restore();
	2422	+ } else
	2423	+ if (source == replaceButton)
	2424	+ {
	2425	+ // Overwrite current version
	2426	+ Replace();
2020	2427	} else
2021	2428	if (source == redoButton)
2022	2429	{
	2430	+ // Go to next version
2023	2431	Redo();
2024	2432	} else
2025	2433	if (source == saveButton)
2026	2434	{
2027		- Save();
	2435	+ // Save a new version
	2436	+ if (!Save(true))
	2437	+ java.awt.Toolkit.getDefaultToolkit().beep();
2028	2438	} else
2029	2439	if (source == oneStepButton)
2030	2440	{
..	..	@@ -2033,17 +2443,14 @@
2033	2443	} else
2034	2444	if (source == screenfitButton)
2035	2445	{
2036		- //Reload(lastConverter, lastFilename, true);
2037	2446	ScreenFit();
2038	2447	} else
2039	2448	if (source == screenfitpointButton)
2040	2449	{
2041		- //Reload(lastConverter, lastFilename, true);
2042	2450	ScreenFitPoint();
2043	2451	} else
2044	2452	if (source == snapobjectButton)
2045	2453	{
2046		- //Reload(lastConverter, lastFilename, true);
2047	2454	SnapObject();
2048	2455	} else
2049	2456	// if (event.getSource() == recompileButton)
..	..	@@ -2407,7 +2814,7 @@
2407	2814	{
2408	2815	StepAll();
2409	2816	} else
2410		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	2817	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2411	2818	{
2412	2819	//int indices[] = jList.getSelectedIndices();
2413	2820	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2419,9 +2826,9 @@
2419	2826	{
2420	2827	ClearSelection(true);
2421	2828	} else
2422		- if (source == grabItem)
	2829	+ if (source == grabItem \|\| source == groupButton)
2423	2830	{
2424		- group(new cGroup(), true);
	2831	+ group(new cGroup(), false); // true);
2425	2832	} else
2426	2833	if (source == hideItem)
2427	2834	{
..	..	@@ -2439,11 +2846,11 @@
2439	2846	{
2440	2847	makeSomething(new Camera());
2441	2848	} else
2442		- if (source == compositeItem)
	2849	+ if (source == compositeItem \|\| source == compositeButton)
2443	2850	{
2444	2851	group(new Composite());
2445	2852	} else
2446		- if (source == randomItem)
	2853	+ if (source == switchItem \|\| source == switchButton)
2447	2854	{
2448	2855	RandomNode random = new RandomNode();
2449	2856	group(random);
..	..	@@ -2545,7 +2952,7 @@
2545	2952	{
2546	2953	group(new cLinker());
2547	2954	} else
2548		- if (source == textureItem)
	2955	+ if (source == textureItem \|\| source == textureButton)
2549	2956	{
2550	2957	group(new TextureNode());
2551	2958	} else
..	..	@@ -2565,17 +2972,30 @@
2565	2972	{
2566	2973	CastShadow(2);
2567	2974	} else
2568		- if (source == ungroupItem)
	2975	+ if (source == ungroupItem \|\| source == ungroupButton)
2569	2976	{
2570		- //ungroup();
	2977	+ boolean hasRoot = false;
	2978	+
2571	2979	for (int i=0; i<group.selection.size(); i++)
2572	2980	{
2573		- Ungroup(group.selection.get(i));
	2981	+ if (group.selection.get(i) == group)
	2982	+ {
	2983	+ hasRoot = true;
	2984	+ break;
	2985	+ }
2574	2986	}
2575	2987
2576		- ClearSelection(false);
2577		-
2578		- refreshContents();
	2988	+ if (!hasRoot)
	2989	+ {
	2990	+ for (int i=0; i<group.selection.size(); i++)
	2991	+ {
	2992	+ Ungroup(group.selection.get(i));
	2993	+ }
	2994	+
	2995	+ ClearSelection(false);
	2996	+
	2997	+ refreshContents();
	2998	+ }
2579	2999	} else
2580	3000	if (source == genUVItem)
2581	3001	{
..	..	@@ -2876,7 +3296,7 @@
2876	3296	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2877	3297	{
2878	3298	obj = (Object3D)e.nextElement();
2879		- obj.SetBumpTexture(null);
	3299	+ obj.ResetBumpTexture();
2880	3300	}
2881	3301
2882	3302	refreshContents();
..	..	@@ -2892,6 +3312,31 @@
2892	3312
2893	3313	refreshContents();
2894	3314	} else
	3315	+ if (source == embedTexturesItem)
	3316	+ {
	3317	+ Object3D obj;
	3318	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3319	+ {
	3320	+ obj = (Object3D)e.nextElement();
	3321	+ obj.EmbedTextures(true);
	3322	+ }
	3323	+
	3324	+ refreshContents();
	3325	+ } else
	3326	+ if (source == deEmbedTexturesItem)
	3327	+ {
	3328	+ Object3D obj;
	3329	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3330	+ {
	3331	+ obj = (Object3D)e.nextElement();
	3332	+ obj.EmbedTextures(false);
	3333	+ }
	3334	+
	3335	+ CameraPane.texturepigment.clear();
	3336	+ CameraPane.texturebump.clear();
	3337	+
	3338	+ refreshContents();
	3339	+ } else
2895	3340	if (source == flashSelectionButton)
2896	3341	{
2897	3342	CameraPane.flash = true;
..	..	@@ -2903,6 +3348,10 @@
2903	3348	if (source == twoButton)
2904	3349	{
2905	3350	radio.layout = twoButton;
	3351	+
	3352	+ if (CameraPane.FULLSCREEN)
	3353	+ fullscreenLayout = radio.layout;
	3354	+
2906	3355	// bug
2907	3356	//gridPanel.setDividerLocation(1.0);
2908	3357	//bigPanel.setDividerLocation(0.0);
..	..	@@ -2958,6 +3407,9 @@
2958	3407	{
2959	3408	radio.layout = threeButton;
2960	3409
	3410	+ if (CameraPane.FULLSCREEN)
	3411	+ fullscreenLayout = radio.layout;
	3412	+
2961	3413	// bigThree.remove(scenePanel);
2962	3414	// bigThree.remove(centralPanel);
2963	3415	// bigThree.remove(XYZPanel);
..	..	@@ -2986,8 +3438,8 @@
2986	3438	// centralPanel.setVisible(true);
2987	3439	// XYZPanel.setVisible(true);
2988	3440	bigThree.ClearUI();
	3441	+ bigThree.add(scenePanel);
2989	3442	bigThree.add(centralPanel);
2990		- bigThree.add(XYZPanel);
2991	3443	bigThree.FlushUI();
2992	3444
2993	3445	cameraView.requestFocusInWindow();
..	..	@@ -2995,6 +3447,9 @@
2995	3447	if (source == fourButton)
2996	3448	{
2997	3449	radio.layout = fourButton;
	3450	+
	3451	+ if (CameraPane.FULLSCREEN)
	3452	+ fullscreenLayout = radio.layout;
2998	3453
2999	3454	// bigThree.remove(scenePanel);
3000	3455	// bigThree.remove(centralPanel);
..	..	@@ -3033,6 +3488,9 @@
3033	3488	{
3034	3489	radio.layout = sixButton;
3035	3490
	3491	+ if (CameraPane.FULLSCREEN)
	3492	+ fullscreenLayout = radio.layout;
	3493	+
3036	3494	// bigThree.remove(scenePanel);
3037	3495	// bigThree.remove(centralPanel);
3038	3496	// bigThree.remove(XYZPanel);
..	..	@@ -3061,8 +3519,8 @@
3061	3519	// centralPanel.setVisible(true);
3062	3520	// XYZPanel.setVisible(false);
3063	3521	bigThree.ClearUI();
3064		- bigThree.add(scenePanel);
3065	3522	bigThree.add(centralPanel);
	3523	+ bigThree.add(scenePanel);
3066	3524	bigThree.FlushUI();
3067	3525
3068	3526	cameraView.requestFocusInWindow();
..	..	@@ -3070,6 +3528,9 @@
3070	3528	if (source == sevenButton)
3071	3529	{
3072	3530	radio.layout = sevenButton;
	3531	+
	3532	+ if (CameraPane.FULLSCREEN)
	3533	+ fullscreenLayout = radio.layout;
3073	3534
3074	3535	// bigThree.remove(scenePanel);
3075	3536	// bigThree.remove(centralPanel);
..	..	@@ -3126,12 +3587,19 @@
3126	3587	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3127	3588	{
3128	3589	ab = (cRadio)e.nextElement();
3129		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3590	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
3130	3591	{
	3592	+ // Patch to avoid bug with transparency.
	3593	+ if (!ab.hadMaterial)
	3594	+ {
	3595	+ ab.object.material = null;
	3596	+ }
	3597	+
3131	3598	buttonGroup.remove(ab);
3132	3599	radioPanel.remove(ab);
3133	3600
3134		- ab.GetObject().editWindow = null;
	3601	+ //ab.GetObject().editWindow = null;
	3602	+ ab.GetObject().manipWindow = null;
3135	3603	// ab.GetObject().objectUI = null; // ?????????
3136	3604
3137	3605	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
..	..	@@ -3144,6 +3612,12 @@
3144	3612	} else
3145	3613	if (source == editItem \|\| source == editButton)
3146	3614	{
	3615	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3616	+ {
	3617	+ Object3D child = (Object3D)e.nextElement();
	3618	+ child.pinned = true;
	3619	+ }
	3620	+
3147	3621	EditSelection(false);
3148	3622	} else
3149	3623	if (source == uneditButton)
..	..	@@ -3153,6 +3627,7 @@
3153	3627	Object3D child = (Object3D)e.nextElement();
3154	3628	if(child.editWindow != null)
3155	3629	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3630	+ child.pinned = false;
3156	3631	child.CloseUI();
3157	3632	listUI.remove(child);
3158	3633
..	..	@@ -3169,6 +3644,7 @@
3169	3644	//copy.ClearUI();
3170	3645	for (Object3D obj : listUI)
3171	3646	{
	3647	+ obj.pinned = false;
3172	3648	obj.CloseUI();
3173	3649	}
3174	3650	listUI.clear();
..	..	@@ -3178,7 +3654,7 @@
3178	3654	{
3179	3655	assert(copy == group);
3180	3656
3181		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3657	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3182	3658
3183	3659	for (Object3D obj : listUI)
3184	3660	{
..	..	@@ -3227,6 +3703,9 @@
3227	3703	}
3228	3704
3229	3705	copy = group;
	3706	+
	3707	+ SetUndoStates();
	3708	+
3230	3709	//Globals.theRenderer.object = group;
3231	3710	if(!useclient)
3232	3711	{
..	..	@@ -3245,6 +3724,7 @@
3245	3724
3246	3725	// fix "+" issue
3247	3726	//group.editWindow = this;
	3727	+ group.manipWindow = this;
3248	3728
3249	3729	/*
3250	3730	currentLayout = radio.layout;
..	..	@@ -3252,6 +3732,13 @@
3252	3732	currentLayout = sevenButton;
3253	3733	*/
3254	3734	radio.layout.doClick();
	3735	+
	3736	+ ClearUnpinned();
	3737	+ //Grafreed.Assert(group != null);
	3738	+ //Grafreed.Assert(group.selection != null);
	3739	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	3740	+ if (group.selection == null \|\| group.selection.size() == 1)
	3741	+ EditSelection(false);
3255	3742	keepparent = group.parent;
3256	3743	// PARENT = NULL or not???
3257	3744	//group.parent = null; // ROOT
..	..	@@ -3265,7 +3752,7 @@
3265	3752	cameraView.ProtectCamera();
3266	3753	cameraView.repaint();
3267	3754	return;
3268		- } else if (event.getSource() == revertCameraItem)
	3755	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3269	3756	{
3270	3757	cameraView.RevertCamera();
3271	3758	cameraView.repaint();
..	..	@@ -3844,7 +4331,7 @@
3844	4331
3845	4332	try
3846	4333	{
3847		- texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4334	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
3848	4335	}
3849	4336	catch (Exception e)
3850	4337	{
..	..	@@ -4319,28 +4806,25 @@
4319	4806	// }
4320	4807	// }
4321	4808
4322		- static boolean allparams = true;
4323		-
4324		- static Vector<Object3D> listUI = new Vector<Object3D>();
4325		-
4326	4809	void EditSelection(boolean newWindow)
4327	4810	{
	4811	+ if (group.selection == null)
	4812	+ {
	4813	+ EditElement(group, newWindow); // ? new
	4814	+ return;
	4815	+ }
	4816	+
4328	4817	// aConstraints.gridy = 0;
4329	4818	for (int i=0; i<group.selection.size(); i++)
4330	4819	{
4331	4820	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4332	4821	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4333		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4822	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4334	4823
4335	4824	Object3D elem = (Object3D)group.selection.elementAt(i);
4336	4825	if(elem != group \|\| !newWindow)
4337	4826	{
4338		- // if (!(elem instanceof Composite))
4339		- // newWindow = false;
4340		- listUI.add(elem);
4341		- elem.openEditWindow(this, newWindow); //, false);
4342		- System.out.println("edit : " + elem);
4343		- elem.editWindow.refreshContents(true); // ? new
	4827	+ EditElement(elem, newWindow); // ? new
4344	4828	}
4345	4829	}
4346	4830	}
..	..	@@ -4415,7 +4899,8 @@
4415	4899	//new Exception().printStackTrace();
4416	4900
4417	4901	freezemodel = true;
4418		-
	4902	+ ClearUnpinned();
	4903	+
4419	4904	/**/
4420	4905	//switch (event.id)
4421	4906	{
..	..	@@ -4448,7 +4933,7 @@
4448	4933	if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4449	4934	// a camera
4450	4935	{
4451		- if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	4936	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
4452	4937	{
4453	4938	CameraPane.camerachangeframe = 0; // don't refuse it
4454	4939	Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
..	..	@@ -4457,6 +4942,13 @@
4457	4942	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4458	4943	}
4459	4944
	4945	+ if (tps != null && tps.length == 1)
	4946	+ {
	4947	+ EditSelection(false);
	4948	+ }
	4949	+
	4950	+ SetPinStates(tps != null && tps.length > 0);
	4951	+
4460	4952	refreshContents();
4461	4953	//return true;
4462	4954	}
..	..	@@ -4466,9 +4958,18 @@
4466	4958	freezemodel = false;
4467	4959	}
4468	4960
	4961	+ void SetPinStates(boolean enabled)
	4962	+ {
	4963	+ editButton.setEnabled(enabled);
	4964	+ uneditButton.setEnabled(enabled);
	4965	+ unselectButton.setEnabled(enabled);
	4966	+ flashSelectionButton.setEnabled(enabled);
	4967	+ }
	4968	+
4469	4969	void refreshContents(boolean cp)
4470	4970	{
4471		- if (!Globals.MOUSEDRAGGED)
	4971	+ if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	4972	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
4472	4973	{
4473	4974	objEditor.ClearInfo(); // .GetMaterial());
4474	4975
..	..	@@ -4567,7 +5068,8 @@
4567	5068
4568	5069	if (cut)
4569	5070	{
4570		- Save();
	5071	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5072	+// Save();
4571	5073	//int indices[] = jList.getSelectedIndices();
4572	5074	//for (int i = indices.length - 1; i >= 0; i--)
4573	5075	//jList.remove(indices[i]);
..	..	@@ -4670,6 +5172,10 @@
4670	5172
4671	5173	void paste(boolean expand)
4672	5174	{
	5175	+ if (Globals.REPLACEONMAKE)
	5176	+ Save();
	5177	+ boolean keep = Globals.REPLACEONMAKE;
	5178	+ Globals.REPLACEONMAKE = false;
4673	5179	// if (GrafreeD.clipboard == null)
4674	5180	// return;
4675	5181	boolean first = true;
..	..	@@ -4729,6 +5235,7 @@
4729	5235	Grafreed.clipboard.get(0).parent = keepparent;
4730	5236	}
4731	5237
	5238	+ Globals.REPLACEONMAKE = keep;
4732	5239	ResetModel();
4733	5240	refreshContents();
4734	5241	}
..	..	@@ -4864,6 +5371,10 @@
4864	5371
4865	5372	void group(Object3D csg, boolean grab)
4866	5373	{
	5374	+ if (Globals.REPLACEONMAKE)
	5375	+ Save();
	5376	+ boolean keep = Globals.REPLACEONMAKE;
	5377	+ Globals.REPLACEONMAKE = false;
4867	5378	if (//false) // why??
4868	5379	!group.selection.isEmpty())
4869	5380	{
..	..	@@ -4977,10 +5488,15 @@
4977	5488	//node.add(csg);
4978	5489	//makeSomething(node);
4979	5490	makeSomething(csg);
	5491	+ Globals.REPLACEONMAKE = keep;
4980	5492	}
4981	5493
4982	5494	void Ungroup(Object3D g)
4983	5495	{
	5496	+ if (Globals.REPLACEONMAKE)
	5497	+ Save();
	5498	+ boolean keep = Globals.REPLACEONMAKE;
	5499	+ Globals.REPLACEONMAKE = false;
4984	5500	if (g instanceof HiddenObject)
4985	5501	{
4986	5502	HiddenObject h = (HiddenObject) g;
..	..	@@ -4997,6 +5513,7 @@
4997	5513	objEditor.makeSomething(g.get(i), false);
4998	5514	}
4999	5515	}
	5516	+ Globals.REPLACEONMAKE = keep;
5000	5517	}
5001	5518
5002	5519	void ungroup()
..	..	@@ -5285,13 +5802,44 @@
5285	5802	cButton clearpanelButton;
5286	5803	cButton unselectButton;
5287	5804
5288		- cButton minButton;
5289		- cButton maxButton;
5290		- cButton fullButton;
5291		- cButton undoButton;
5292		- cButton redoButton;
	5805	+ cButton restoreCameraButton;
	5806	+
5293	5807	cButton saveButton;
5294	5808	cButton oneStepButton;
	5809	+
	5810	+ cButton groupButton;
	5811	+ cButton ungroupButton;
	5812	+ cButton compositeButton;
	5813	+ cButton switchButton;
	5814	+ cButton loopButton;
	5815	+ cButton textureButton;
	5816	+
	5817	+ cButton skybox1Button;
	5818	+ cButton skybox2Button;
	5819	+ cButton skybox3Button;
	5820	+ cButton skybox4Button;
	5821	+ cButton skybox5Button;
	5822	+ cButton skybox6Button;
	5823	+ cButton skybox7Button;
	5824	+
	5825	+ cButton skybox11Button;
	5826	+ cButton skybox12Button;
	5827	+ cButton skybox13Button;
	5828	+ cButton skybox14Button;
	5829	+ cButton skybox15Button;
	5830	+ cButton skybox16Button;
	5831	+ cButton skybox17Button;
	5832	+
	5833	+ cButton gridButton;
	5834	+ cButton boxButton;
	5835	+ cButton sphereButton;
	5836	+ cButton coneButton;
	5837	+ cButton torusButton;
	5838	+ cButton superButton;
	5839	+ cButton kleinButton;
	5840	+ cButton particlesButton;
	5841	+ cButton overlayButton;
	5842	+ cButton lightButton;
5295	5843
5296	5844	cButton screenfitButton;
5297	5845	cButton screenfitpointButton;
..	..	@@ -5313,11 +5861,11 @@
5313	5861	//JTree jTree;
5314	5862	private MenuItem lookAtItem;
5315	5863	private MenuItem lookFromItem;
5316		- private MenuItem switchItem;
	5864	+ private MenuItem switchViewItem;
5317	5865	private MenuItem cutItem;
5318	5866	private MenuItem undoItem;
5319	5867	private MenuItem redoItem;
5320		- private MenuItem duplicateItem;
	5868	+ private JMenuItem duplicateItem;
5321	5869	private MenuItem cloneItem;
5322	5870	private MenuItem cloneSupportItem;
5323	5871	private MenuItem overwriteGeoItem;
..	..	@@ -5345,7 +5893,7 @@
5345	5893	private MenuItem pasteLinkItem;
5346	5894	private MenuItem pasteCloneItem;
5347	5895	private MenuItem pasteExpandItem;
5348		- private MenuItem clearItem;
	5896	+ private MenuItem deleteItem;
5349	5897	private MenuItem clearAllItem;
5350	5898	private MenuItem genUVItem;
5351	5899	private MenuItem genNormalsMESHItem;
..	..	@@ -5405,7 +5953,7 @@
5405	5953	private MenuItem frontItem;
5406	5954	private MenuItem cameraItem;
5407	5955	private MenuItem compositeItem;
5408		- private MenuItem randomItem;
	5956	+ private MenuItem switchItem;
5409	5957	private MenuItem physicsItem;
5410	5958	private MenuItem frameselectorItem;
5411	5959	private MenuItem scriptNodeItem;
..	..	@@ -5429,6 +5977,8 @@
5429	5977	private MenuItem attachBumpItem;
5430	5978	private MenuItem detachBumpItem;
5431	5979	private MenuItem pigmentBumpItem;
	5980	+ private MenuItem embedTexturesItem;
	5981	+ private MenuItem deEmbedTexturesItem;
5432	5982
5433	5983	private MenuItem particleItem;
5434	5984	private MenuItem ragdollItem;
..	..	@@ -5479,5 +6029,5 @@
5479	6029
5480	6030	Menu cameraMenu;
5481	6031	MenuItem editCameraItem;
5482		- MenuItem revertCameraItem;
	6032	+ MenuItem restoreCameraItem;
5483	6033	}