~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,16 +194,19 @@
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"));
156	202	//editItem.addActionListener(this);
157		- undoItem = menu.add(new MenuItem("Undo"));
158		- undoItem.addActionListener(this);
159		- redoItem = menu.add(new MenuItem("Redo"));
160		- redoItem.addActionListener(this);
161		- menu.add("-");
162		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	203	+
	204	+// undoItem = menu.add(new MenuItem("Undo"));
	205	+// undoItem.addActionListener(this);
	206	+// redoItem = menu.add(new MenuItem("Redo"));
	207	+// redoItem.addActionListener(this);
	208	+// menu.add("-");
	209	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
163	210	duplicateItem.addActionListener(this);
164	211	cloneItem = menu.add(new MenuItem("Clone"));
165	212	cloneItem.addActionListener(this);
..	..	@@ -175,7 +222,6 @@
175	222	copyItem.addActionListener(this);
176	223	pasteItem = menu.add(new MenuItem("Paste"));
177	224	pasteItem.addActionListener(this);
178		- menu.add("-");
179	225
180	226	menu.add("-");
181	227	pasteIntoItem = menu.add(new MenuItem("Paste into"));
..	..	@@ -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 Camera"));
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
..	..	@@ -245,7 +291,7 @@
245	291
246	292	cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
247	293	toggleDebugItem.addItemListener(this);
248		- toggleDebugItem.setState(CameraPane.DEBUG);
	294	+ toggleDebugItem.setState(Globals.DEBUG);
249	295
250	296	cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
251	297	toggleFrustumItem.addItemListener(this);
..	..	@@ -266,14 +312,14 @@
266	312	// animationItem.addItemListener(this);
267	313	// animationItem.setState(CameraPane.ANIMATION);
268	314	cameraMenu.add("-");
269		- cameraMenu.add(editCameraItem = new MenuItem("Save Camera"));
	315	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
270	316	editCameraItem.addActionListener(this);
271	317
272	318	if (Globals.ADVANCED)
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,30 +409,29 @@
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"));
370	420	csgItem.addActionListener(this);
371		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	421	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
372	422	shadowXItem.addActionListener(this);
373		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	423	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
374	424	shadowYItem.addActionListener(this);
375		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	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"));
..	..	@@ -469,6 +520,14 @@
469	520	markleavesItem.addActionListener(this);
470	521	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
471	522	unmarkleavesItem.addActionListener(this);
	523	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	524	+ rewindleavesItem.addActionListener(this);
	525	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	526	+ unrewindleavesItem.addActionListener(this);
	527	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	528	+ randomleavesItem.addActionListener(this);
	529	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	530	+ unrandomleavesItem.addActionListener(this);
472	531	menu.add("-");
473	532	flipVItem = menu.add(new MenuItem("Flip V"));
474	533	flipVItem.addActionListener(this);
..	..	@@ -494,10 +553,15 @@
494	553	attachBumpItem.addActionListener(this);
495	554	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
496	555	pigmentBumpItem.addActionListener(this);
	556	+ //embedTexturesItem
497	557	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
498	558	detachPigmentItem.addActionListener(this);
499	559	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
500	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);
501	565	menu.add("-");
502	566	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
503	567	sortbysizeItem.addActionListener(this);
..	..	@@ -524,8 +588,21 @@
524	588	buildToolsMenu(menu);
525	589	}
526	590
	591	+
527	592	void SetupUI2(ObjEditor oe)
528	593	{
	594	+ // June 2019
	595	+ if (oe == null)
	596	+ {
	597	+ //super.SetupUI2(this);
	598	+ //return;
	599	+ }
	600	+
	601	+ if (copy != group)
	602	+ {
	603	+ //super.SetupUI2(this);
	604	+ }
	605	+
529	606	//new Exception().printStackTrace();
530	607
531	608	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -554,27 +631,79 @@
554	631	oe.radioPanel.add(dummyButton);
555	632	oe.buttonGroup.add(dummyButton);
556	633	*/
	634	+ cGridBag copyOptionsPanel = new cGridBag();
	635	+
	636	+ copyOptionsPanel.preferredHeight = 2;
	637	+
557	638	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
558	639
559		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
	640	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	641	+ //minButton.setToolTipText("Minimize window");
	642	+ //minButton.addActionListener(this);
	643	+
	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	+ }
	650	+
	651	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	652	+ fullButton.setToolTipText("Full-screen window");
	653	+ fullButton.addActionListener(this);
	654	+
	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);
	662	+
	663	+ copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	664	+ saveButton.setToolTipText("New version");
	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);
	671	+
	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);
560	691	liveCB.setToolTipText("Enable animation");
561	692	liveCB.addItemListener(this);
562	693
563		- oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	694	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
564	695	oneStepButton.setToolTipText("Animate one step forward");
565	696	oneStepButton.addActionListener(this);
566	697
567		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	698	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
568	699	fastCB.setToolTipText("Fast mode");
569	700	fastCB.addItemListener(this);
570	701
571		- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
572		- trackCB.setToolTipText("Enable tracking");
573		- trackCB.addItemListener(this);
574		-
575		- oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
576		- screenfitButton.setToolTipText("Screen fit");
577		- 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);
578	707
579	708	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
580	709	// screenfitpointButton.addActionListener(this);
..	..	@@ -584,67 +713,244 @@
584	713	oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
585	714	snapobjectButton.addActionListener(this);
586	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");
587	720	}
588	721
589		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
590		- flashSelectionButton.setToolTipText("Show selection");
591		- flashSelectionButton.addActionListener(this);
	722	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
592	723
593		- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
594		-
595		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
596		- 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");
597	726	twoButton.addActionListener(this);
598		- oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
599		- fourButton.addActionListener(this);
600		- fourButton.setToolTipText("Show left panel only");
601		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
602		- sixButton.setToolTipText("2-column layout left");
603		- sixButton.addActionListener(this);
604		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
605		- 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");
606	731	threeButton.addActionListener(this);
607		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
608		- sevenButton.setToolTipText("3-column layout");
609		- 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);
610	738	//
611	739
612		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
613		- 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");
614	742	rootButton.addActionListener(this);
615	743
616		- 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);
617	745	closeButton.setToolTipText("Close tab");
618	746	closeButton.addActionListener(this);
619	747	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
620	748	//clearButton.addActionListener(this);
621		-
622		- cGridBag commandsPanel = new cGridBag();
	749	+
	750	+ cGridBag row1 = new cGridBag();
623	751
624		- commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
625		- editButton.setToolTipText("Edit selection");
	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");
626	927	editButton.addActionListener(this);
627	928
628		- commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
629		- uneditButton.setToolTipText("Unedit selection");
	929	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	930	+ uneditButton.setToolTipText("Remove selection controls");
630	931	uneditButton.addActionListener(this);
631	932
632		- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
633		- allParamsButton.setToolTipText("Edit all params");
	933	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	934	+ allParamsButton.setToolTipText("Show all controle");
634	935	allParamsButton.addActionListener(this);
635	936
636		- commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	937	+ editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
637	938	clearPanelButton.setToolTipText("Clear edit panel");
638	939	clearPanelButton.addActionListener(this);
639	940
640		- commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	941	+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
641	942	unselectButton.setToolTipText("Unselect");
642	943	unselectButton.addActionListener(this);
643	944
644		- commandsPanel.preferredHeight = 1;
	945	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	946	+ flashSelectionButton.setToolTipText("Highlight selection");
	947	+ flashSelectionButton.addActionListener(this);
645	948
646		- oe.treePanel.add(commandsPanel);
647		- oe.treePanel.Return();
	949	+ editCommandsPanel.preferredHeight = 1;
	950	+
	951	+ SetPinStates(false);
	952	+// oe.treePanel.add(commandsPanel);
	953	+// oe.treePanel.Return();
648	954
649	955	// oe.aConstraints.gridx += 1;
650	956	// oe.aConstraints.weighty = 0;
..	..	@@ -661,32 +967,20 @@
661	967
662	968	JScrollPane jSP;
663	969	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
664		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	970	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
665	971	ResetModel();
666	972
667	973	oe.treePanel.add(jSPPanel);
668	974	oe.treePanel.Return();
669	975
670		- cGridBag copyOptionsPanel = new cGridBag();
671		-
672		- copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
673		- colorCB.setToolTipText("Copy color when dropped");
674		- colorCB.addItemListener(this);
675		-
676		- copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
677		- materialCB.setToolTipText("Copy material when dropped");
678		- materialCB.addItemListener(this);
679		-
680		- copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
681		- textureCB.setToolTipText("Copy texture when dropped");
682		- textureCB.addItemListener(this);
683		-
684		- copyOptionsPanel.preferredHeight = 1;
685	976	oe.treePanel.add(copyOptionsPanel);
686	977	oe.treePanel.Return();
	978	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	979	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	980	+ sliderPane.preferredHeight = 1;
687	981
688		-// mainPanel.setDividerLocation(0.5); //1.0);
689		-// mainPanel.setResizeWeight(0.5);
	982	+// mainPanel.setDividerLocation(0.1); //1.0);
	983	+ mainPanel.setResizeWeight(0.4);
690	984
691	985	//jList.addListSelectionListener(this);
692	986	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -694,7 +988,7 @@
694	988	//jTree.setEditable(true);
695	989	oe.jTree.setDragEnabled(true);
696	990	//jTree.setPreferredSize(new Dimension(10,10));
697		- jSP.setPreferredSize(new Dimension(100,200));
	991	+ //jSP.setPreferredSize(new Dimension(100,200));
698	992
699	993	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
700	994
..	..	@@ -706,29 +1000,49 @@
706	1000	dgr.addDragGestureListener(this);
707	1001	}catch(Exception e) {}
708	1002	*/
709		- radio.layout = sevenButton;
	1003	+ radio.layout = sixButton; // sevenButton;
710	1004	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
711	1005	}
712	1006
713	1007	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
714	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	+
715	1023	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
716	1024	boxCB.setToolTipText("Display bounding boxes");
717	1025	boxCB.addItemListener(this);
718	1026
719	1027	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
720		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	1028	+ zoomBoxCB.setToolTipText("Display only for wheel");
721	1029	zoomBoxCB.addItemListener(this);
722	1030
723	1031	if (true) // Globals.ADVANCED)
724	1032	{
725		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
726		- supportCB.setToolTipText("Enable rigging");
727		- 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);
728	1040
729	1041	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
730	1042	// localCB.addItemListener(this);
731	1043
	1044	+ panel.Return();
	1045	+
732	1046	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
733	1047	crowdCB.setToolTipText("Used for crowds");
734	1048	crowdCB.addItemListener(this);
..	..	@@ -745,6 +1059,8 @@
745	1059	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
746	1060	// speakerMocapCB.addItemListener(this);
747	1061
	1062	+ panel.Return();
	1063	+
748	1064	if (false)
749	1065	{
750	1066	// handled in scripts
..	..	@@ -759,34 +1075,74 @@
759	1075	//constraints.gridy += 1;
760	1076	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
761	1077	smoothfocusCB.addItemListener(this);
	1078	+ panel.Return();
762	1079	}
763	1080
764	1081	//constraints.gridx += 1;
765	1082	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
766	1083	// debugCB.addItemListener(this);
767	1084
	1085	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	1086	+ trackCB.setToolTipText("Enable tracking target");
	1087	+ trackCB.addItemListener(this);
	1088	+
768	1089	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	1090	+ oeilCB.setToolTipText("Move camera when tracking");
769	1091	oeilCB.addItemListener(this);
770	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	+ {
771	1113	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
772	1114	lookAtCB.setToolTipText("Look-at target");
773	1115	lookAtCB.addItemListener(this);
	1116	+ }
774	1117
775	1118	}
776	1119
777	1120	cGridBag fill = new cGridBag();
778		-
779	1121	fill.preferredHeight = 200;
	1122	+ cGridBag fill2 = new cGridBag();
	1123	+ fill2.preferredHeight = 200;
	1124	+ cGridBag fill3 = new cGridBag();
	1125	+ fill3.preferredHeight = 200;
780	1126
781	1127	panel.add(fill);
	1128	+ panel.add(fill2);
	1129	+ panel.add(fill3);
782	1130
783	1131	}
784	1132
785	1133	void EditObject(Object3D obj)
786	1134	{
787	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	+
788	1144	radioButton.SetObject(obj);
789		- radioButton.layout = sevenButton;
	1145	+ radioButton.layout = sixButton; // sevenButton;
790	1146	radioButton.SetCamera(cameraView.renderCamera, false);
791	1147	radioButton.addActionListener(this);
792	1148	radioPanel.add(radioButton);
..	..	@@ -796,6 +1152,8 @@
796	1152
797	1153	void SetupViews(ObjEditor oe)
798	1154	{
	1155	+ theFrame = this;
	1156	+
799	1157	oe.SetupViews();
800	1158
801	1159	System.out.println("SetupViews");
..	..	@@ -804,23 +1162,28 @@
804	1162	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
805	1163	}
806	1164
807		- JCheckBox liveCB;
808		- JCheckBox supportCB;
809		- JCheckBox localCB;
810		- JCheckBox crowdCB;
811		- JCheckBox smoothCB;
812		- JCheckBox fastCB;
813		- JCheckBox slowCB;
814		- JCheckBox boxCB;
815		- JCheckBox zoomBoxCB;
816		- JCheckBox trackCB;
817		- 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;
818	1178	// JCheckBox speakerMocapCB;
819		- JCheckBox speakerCameraCB;
820		- JCheckBox speakerFocusCB;
821		- JCheckBox debugCB;
822		- JCheckBox oeilCB;
823		- JCheckBox lookAtCB;
	1179	+ cCheckBox speakerCameraCB;
	1180	+ cCheckBox speakerFocusCB;
	1181	+ cCheckBox debugCB;
	1182	+
	1183	+ cCheckBox oeilCB;
	1184	+ cCheckBox shadowCB;
	1185	+ cCheckBox autokeepCB;
	1186	+ cCheckBox lookAtCB;
824	1187
825	1188	// static int COLOR = 1;
826	1189	// static int MATERIAL = 2;
..	..	@@ -828,9 +1191,9 @@
828	1191
829	1192	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
830	1193
831		- JCheckBox colorCB;
832		- JCheckBox materialCB;
833		- JCheckBox textureCB;
	1194	+ cCheckBox colorCB;
	1195	+ cCheckBox materialCB;
	1196	+ cCheckBox textureCB;
834	1197
835	1198	public void itemStateChanged(ItemEvent e)
836	1199	{
..	..	@@ -858,6 +1221,7 @@
858	1221	} else if(e.getSource() == liveCB)
859	1222	{
860	1223	cameraView.ToggleLive();
	1224	+ refreshContents(false);
861	1225	}
862	1226	else if(e.getSource() == supportCB)
863	1227	{
..	..	@@ -922,6 +1286,18 @@
922	1286	{
923	1287	cameraView.ToggleOeil();
924	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	+ }
925	1301	else if(e.getSource() == lookAtCB)
926	1302	{
927	1303	cameraView.ToggleLookAt();
..	..	@@ -938,7 +1314,8 @@
938	1314
939	1315	/**/
940	1316	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
941		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1317	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1318	+ TreePath path = objEditor.jTree.getSelectionPath();
942	1319	if ((path == null) \|\| (path.getPathCount() <= 1)) {
943	1320	// We can't move the root node or an empty selection
944	1321	return;
..	..	@@ -1001,8 +1378,6 @@
1001	1378	}
1002	1379	}
1003	1380
1004		- String string = (String) object;
1005		-
1006	1381	System.out.println("Transfer = " + object + "; drop : " + target);
1007	1382	// if( object instanceof java.io.File[])
1008	1383	// {
..	..	@@ -1010,6 +1385,8 @@
1010	1385	// objEditor.DropFile((java.io.File[]) object, true);
1011	1386	// return;
1012	1387	// }
	1388	+
	1389	+ String string = object.toString();
1013	1390
1014	1391	// File path for Mac and Windows
1015	1392	if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
..	..	@@ -1055,23 +1432,33 @@
1055	1432
1056	1433	assert target == objEditor.jTree;
1057	1434	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1435	+ Object3D destinationLeaf;
1058	1436	try {
1059		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1437	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
1060	1438	} catch (Exception e) {
1061	1439	System.out.println("destinationPath : " + destinationPath);
1062	1440	return;
1063	1441	}
1064	1442
1065		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1443	+ for (int i=group.selection.size(); --i>=0;)
1066	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	+// {
1067	1454	loadClipboard(true);
1068	1455	objEditor.jTree.setSelectionPath(destinationPath);
1069	1456	pasteInto(false, false);
1070		- } else {
1071		- loadClipboard(false);
1072		- objEditor.jTree.setSelectionPath(destinationPath);
1073		- pasteInto(false, false); // true); // ???
1074		- }
	1457	+// } else {
	1458	+// loadClipboard(false);
	1459	+// objEditor.jTree.setSelectionPath(destinationPath);
	1460	+// pasteInto(false, false); // true); // ???
	1461	+// }
1075	1462	}
1076	1463	public void dropActionChanged(DropTargetDragEvent dtde)
1077	1464	// Called if the user has modified the current drop gesture
..	..	@@ -1176,22 +1563,30 @@
1176	1563	{
1177	1564	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1178	1565	//heightFieldItem.addActionListener(this);
1179		- gridItem = menu.add(new MenuItem("Grid"));
1180		- gridItem.addActionListener(this);
1181		- rectoidItem = menu.add(new MenuItem("Box"));
1182		- rectoidItem.addActionListener(this);
1183		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1184		- ellipsoidItem.addActionListener(this);
1185		- coneItem = menu.add(new MenuItem("Cone"));
1186		- coneItem.addActionListener(this);
1187		- torusItem = menu.add(new MenuItem("Torus"));
1188		- torusItem.addActionListener(this);
1189		- superItem = menu.add(new MenuItem("Superellipsoid"));
1190		- 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	+ {
1191	1584	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1192	1585	kleinItem.addActionListener(this);
1193		- particleItem = menu.add(new MenuItem("Particle system"));
1194		- particleItem.addActionListener(this);
	1586	+ }
	1587	+
	1588	+// particleItem = menu.add(new MenuItem("Particle system"));
	1589	+// particleItem.addActionListener(this);
1195	1590	if (Globals.ADVANCED)
1196	1591	{
1197	1592	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1217,15 +1612,15 @@
1217	1612	}
1218	1613	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1219	1614	bezierItem.addActionListener(this);
1220		- overlayItem = menu.add(new MenuItem("Overlay"));
1221		- overlayItem.addActionListener(this);
1222		- lightItem = menu.add(new MenuItem("Light"));
1223		- 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);
1224	1619	menu.add("-");
1225	1620	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1226	1621	//superLoopItem.addActionListener(this);
1227		- loopItem = menu.add(new MenuItem("Loop"));
1228		- loopItem.addActionListener(this);
	1622	+// loopItem = menu.add(new MenuItem("Loop"));
	1623	+// loopItem.addActionListener(this);
1229	1624	doubleItem = menu.add(new MenuItem("Fork"));
1230	1625	doubleItem.addActionListener(this);
1231	1626	if (Globals.ADVANCED)
..	..	@@ -1241,6 +1636,9 @@
1241	1636	animationItem.addItemListener(this);
1242	1637	animationItem.setState(Globals.ANIMATION);
1243	1638
	1639	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1640	+ archiveItem.addActionListener(this);
	1641	+
1244	1642	menu.add("-");
1245	1643	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1246	1644	parseverticesItem.addActionListener(this);
..	..	@@ -1253,6 +1651,8 @@
1253	1651	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1254	1652	reduce34MorphItem.addActionListener(this);
1255	1653	menu.add("-");
	1654	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	1655	+ memoryItem.addActionListener(this);
1256	1656	menu.add(computeAOItem = new MenuItem("Compute AO"));
1257	1657	computeAOItem.addActionListener(this);
1258	1658
..	..	@@ -1261,11 +1661,9 @@
1261	1661	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1262	1662	mirrorItem.addActionListener(this);
1263	1663	menu.add("-");
1264		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1265		- memoryItem.addActionListener(this);
1266	1664	menu.add(analyzeItem = new MenuItem("Analyze"));
1267	1665	analyzeItem.addActionListener(this);
1268		- menu.add(dumpItem = new MenuItem("Dump"));
	1666	+ menu.add(dumpItem = new MenuItem("Print"));
1269	1667	dumpItem.addActionListener(this);
1270	1668	// menu.add(pathItem = new MenuItem("From-to path"));
1271	1669	// pathItem.addActionListener(this);
..	..	@@ -1406,9 +1804,34 @@
1406	1804	shadow.material = new cMaterial(obj.material);
1407	1805	shadow.material.diffuse = 0.0001f;
1408	1806	shadow.material.specular = 0.0001f;
	1807	+ //shadow.projectedVertices[1].x = 300;
1409	1808
1410	1809	makeSomething(shadow);
1411	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	+ }
1412	1835
1413	1836	/**
1414	1837	* applyExample
..	..	@@ -1653,7 +2076,7 @@
1653	2076	{
1654	2077	ScreenFit();
1655	2078	} else
1656		- if (source == switchItem)
	2079	+ if (source == switchViewItem)
1657	2080	{
1658	2081	cVector v1 = new cVector();
1659	2082	cVector v2 = new cVector();
..	..	@@ -1662,11 +2085,11 @@
1662	2085	objEditor.cameraView.renderCamera.setAim(v2, v1);
1663	2086	objEditor.cameraView.repaint();
1664	2087	} else
1665		- if (source == rectoidItem)
	2088	+ if (source == rectoidItem \|\| source == boxButton)
1666	2089	{
1667	2090	makeSomething(new Box());
1668	2091	} else
1669		- if (source == particleItem)
	2092	+ if (source == particleItem \|\| source == particlesButton)
1670	2093	{
1671	2094	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1672	2095	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1745,27 +2168,27 @@
1745	2168
1746	2169	makeSomething(obj);
1747	2170	} else
1748		- if (source == gridItem)
	2171	+ if (source == gridItem \|\| source == gridButton)
1749	2172	{
1750	2173	makeSomething(new Grid());
1751	2174	} else
1752		- if (source == ellipsoidItem)
	2175	+ if (source == ellipsoidItem \|\| source == sphereButton)
1753	2176	{
1754	2177	makeSomething(new Sphere());
1755	2178	} else
1756		- if (source == coneItem)
	2179	+ if (source == coneItem \|\| source == coneButton)
1757	2180	{
1758	2181	makeSomething(new Cone());
1759	2182	} else
1760		- if (source == torusItem)
	2183	+ if (source == torusItem \|\| source == torusButton)
1761	2184	{
1762	2185	makeSomething(new Torus());
1763	2186	} else
1764		- if (source == superItem)
	2187	+ if (source == superItem \|\| source == superButton)
1765	2188	{
1766	2189	makeSomething(new Superellipsoid());
1767	2190	} else
1768		- if (source == kleinItem)
	2191	+ if (source == kleinItem \|\| source == kleinButton)
1769	2192	{
1770	2193	makeSomething(new Klein());
1771	2194	} else
..	..	@@ -1785,7 +2208,7 @@
1785	2208	{
1786	2209	makeSomething(new BezierSurface());
1787	2210	} else
1788		- if (source == overlayItem)
	2211	+ if (source == overlayItem \|\| source == overlayButton)
1789	2212	{
1790	2213	/*
1791	2214	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1833,10 +2256,27 @@
1833	2256	s.setup();
1834	2257	makeSomething(s);
1835	2258	} else
1836		- if (source == lightItem)
	2259	+ if (source == lightItem \|\| source == lightButton)
1837	2260	{
1838	2261	makeSomething(new Light());
1839	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
1840	2280	if (source == csgItem)
1841	2281	{
1842	2282	group(new CSG());
..	..	@@ -1883,30 +2323,30 @@
1883	2323
1884	2324	group(g);
1885	2325	} else
1886		- if (source == loopItem)
	2326	+ if (source == loopItem \|\| source == loopButton)
1887	2327	{
1888	2328	Composite csg = new GroupLeaf();
1889	2329	csg.count = 5;
1890	2330	group(csg);
1891		- Composite child = new cGroup();
	2331	+ Composite child = new cGroup("Branch");
1892	2332	csg.addChild(child);
1893	2333	child.addChild(csg);
1894	2334	} else
1895	2335	if (source == doubleItem)
1896	2336	{
1897		- Composite csg = new GroupLeaf();
	2337	+ Composite csg = new GroupLeaf("Fork");
1898	2338	csg.count = 5;
1899	2339	group(csg);
1900		- Composite child = new cGroup();
	2340	+ Composite child = new cGroup("Branch A");
1901	2341	csg.addChild(child);
1902	2342	child.addChild(csg);
1903		- child = new cGroup();
	2343	+ child = new cGroup("Branch B");
1904	2344	csg.addChild(child);
1905	2345	child.addChild(csg);
1906	2346	} else
1907	2347	if (source == tripleItem)
1908	2348	{
1909		- Composite csg = new GroupLeaf();
	2349	+ Composite csg = new GroupLeaf("Trident");
1910	2350	csg.count = 4;
1911	2351	group(csg);
1912	2352	Composite child = new cGroup();
..	..	@@ -1922,7 +2362,7 @@
1922	2362	if (source == computeAOItem)
1923	2363	{
1924	2364	Globals.drawMode = CameraPane.OCCLUSION;
1925		- Globals.theRenderer.repaint();
	2365	+ cameraView.repaint();
1926	2366	} else
1927	2367	if (source == recompileItem)
1928	2368	{
..	..	@@ -1956,6 +2396,46 @@
1956	2396	{
1957	2397	DumpObject();
1958	2398	} else
	2399	+ if (source == minButton)
	2400	+ {
	2401	+ Minimize();
	2402	+ } else
	2403	+ if (source == maxButton)
	2404	+ {
	2405	+ Maximize();
	2406	+ } else
	2407	+ if (source == fullButton)
	2408	+ {
	2409	+ ToggleFullScreen();
	2410	+ } else
	2411	+ if (source == undoButton)
	2412	+ {
	2413	+ // Go to previous version
	2414	+ //if (!Undo())
	2415	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	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();
	2427	+ } else
	2428	+ if (source == redoButton)
	2429	+ {
	2430	+ // Go to next version
	2431	+ Redo();
	2432	+ } else
	2433	+ if (source == saveButton)
	2434	+ {
	2435	+ // Save a new version
	2436	+ if (!Save(true))
	2437	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2438	+ } else
1959	2439	if (source == oneStepButton)
1960	2440	{
1961	2441	Globals.ONESTEP = true;
..	..	@@ -1963,17 +2443,14 @@
1963	2443	} else
1964	2444	if (source == screenfitButton)
1965	2445	{
1966		- //Reload(lastConverter, lastFilename, true);
1967	2446	ScreenFit();
1968	2447	} else
1969	2448	if (source == screenfitpointButton)
1970	2449	{
1971		- //Reload(lastConverter, lastFilename, true);
1972	2450	ScreenFitPoint();
1973	2451	} else
1974	2452	if (source == snapobjectButton)
1975	2453	{
1976		- //Reload(lastConverter, lastFilename, true);
1977	2454	SnapObject();
1978	2455	} else
1979	2456	// if (event.getSource() == recompileButton)
..	..	@@ -2337,7 +2814,7 @@
2337	2814	{
2338	2815	StepAll();
2339	2816	} else
2340		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	2817	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2341	2818	{
2342	2819	//int indices[] = jList.getSelectedIndices();
2343	2820	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2349,9 +2826,9 @@
2349	2826	{
2350	2827	ClearSelection(true);
2351	2828	} else
2352		- if (source == grabItem)
	2829	+ if (source == grabItem \|\| source == groupButton)
2353	2830	{
2354		- group(new cGroup(), true);
	2831	+ group(new cGroup(), false); // true);
2355	2832	} else
2356	2833	if (source == hideItem)
2357	2834	{
..	..	@@ -2369,11 +2846,11 @@
2369	2846	{
2370	2847	makeSomething(new Camera());
2371	2848	} else
2372		- if (source == compositeItem)
	2849	+ if (source == compositeItem \|\| source == compositeButton)
2373	2850	{
2374	2851	group(new Composite());
2375	2852	} else
2376		- if (source == randomItem)
	2853	+ if (source == switchItem \|\| source == switchButton)
2377	2854	{
2378	2855	RandomNode random = new RandomNode();
2379	2856	group(random);
..	..	@@ -2475,7 +2952,7 @@
2475	2952	{
2476	2953	group(new cLinker());
2477	2954	} else
2478		- if (source == textureItem)
	2955	+ if (source == textureItem \|\| source == textureButton)
2479	2956	{
2480	2957	group(new TextureNode());
2481	2958	} else
..	..	@@ -2495,17 +2972,30 @@
2495	2972	{
2496	2973	CastShadow(2);
2497	2974	} else
2498		- if (source == ungroupItem)
	2975	+ if (source == ungroupItem \|\| source == ungroupButton)
2499	2976	{
2500		- //ungroup();
	2977	+ boolean hasRoot = false;
	2978	+
2501	2979	for (int i=0; i<group.selection.size(); i++)
2502	2980	{
2503		- Ungroup(group.selection.get(i));
	2981	+ if (group.selection.get(i) == group)
	2982	+ {
	2983	+ hasRoot = true;
	2984	+ break;
	2985	+ }
2504	2986	}
2505	2987
2506		- ClearSelection(false);
2507		-
2508		- 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	+ }
2509	2999	} else
2510	3000	if (source == genUVItem)
2511	3001	{
..	..	@@ -2517,7 +3007,7 @@
2517	3007	} else
2518	3008	if (source == genNormalsMESHItem)
2519	3009	{
2520		- GenNormals(true); // TODO
	3010	+ GenNormalsMESH();
2521	3011	} else
2522	3012	if (source == genNormalsORGANItem)
2523	3013	{
..	..	@@ -2582,6 +3072,22 @@
2582	3072	if (source == unmarkleavesItem)
2583	3073	{
2584	3074	MarkLeaves(false);
	3075	+ } else
	3076	+ if (source == rewindleavesItem)
	3077	+ {
	3078	+ RewindLeaves(true);
	3079	+ } else
	3080	+ if (source == unrewindleavesItem)
	3081	+ {
	3082	+ RewindLeaves(false);
	3083	+ } else
	3084	+ if (source == randomleavesItem)
	3085	+ {
	3086	+ RandomLeaves(true);
	3087	+ } else
	3088	+ if (source == unrandomleavesItem)
	3089	+ {
	3090	+ RandomLeaves(false);
2585	3091	} else
2586	3092	if (source == flipVItem)
2587	3093	{
..	..	@@ -2790,7 +3296,7 @@
2790	3296	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2791	3297	{
2792	3298	obj = (Object3D)e.nextElement();
2793		- obj.SetBumpTexture(null);
	3299	+ obj.ResetBumpTexture();
2794	3300	}
2795	3301
2796	3302	refreshContents();
..	..	@@ -2806,6 +3312,31 @@
2806	3312
2807	3313	refreshContents();
2808	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
2809	3340	if (source == flashSelectionButton)
2810	3341	{
2811	3342	CameraPane.flash = true;
..	..	@@ -2817,6 +3348,10 @@
2817	3348	if (source == twoButton)
2818	3349	{
2819	3350	radio.layout = twoButton;
	3351	+
	3352	+ if (CameraPane.FULLSCREEN)
	3353	+ fullscreenLayout = radio.layout;
	3354	+
2820	3355	// bug
2821	3356	//gridPanel.setDividerLocation(1.0);
2822	3357	//bigPanel.setDividerLocation(0.0);
..	..	@@ -2849,10 +3384,31 @@
2849	3384	bigThree.ClearUI();
2850	3385	bigThree.add(centralPanel);
2851	3386	bigThree.FlushUI();
	3387	+
	3388	+ cameraView.requestFocusInWindow();
	3389	+
	3390	+// refreshContents(true);
	3391	+//
	3392	+// try
	3393	+// {
	3394	+// java.awt.Robot bot = new java.awt.Robot();
	3395	+// int mask = InputEvent.BUTTON1_MASK;
	3396	+// bot.mouseMove(100, 100);
	3397	+// bot.mousePress(mask);
	3398	+// bot.mouseRelease(mask);
	3399	+// }
	3400	+// catch (Exception e)
	3401	+// {
	3402	+//
	3403	+// }
	3404	+
2852	3405	} else
2853	3406	if (source == threeButton)
2854	3407	{
2855	3408	radio.layout = threeButton;
	3409	+
	3410	+ if (CameraPane.FULLSCREEN)
	3411	+ fullscreenLayout = radio.layout;
2856	3412
2857	3413	// bigThree.remove(scenePanel);
2858	3414	// bigThree.remove(centralPanel);
..	..	@@ -2882,13 +3438,18 @@
2882	3438	// centralPanel.setVisible(true);
2883	3439	// XYZPanel.setVisible(true);
2884	3440	bigThree.ClearUI();
	3441	+ bigThree.add(scenePanel);
2885	3442	bigThree.add(centralPanel);
2886		- bigThree.add(XYZPanel);
2887	3443	bigThree.FlushUI();
	3444	+
	3445	+ cameraView.requestFocusInWindow();
2888	3446	} else
2889	3447	if (source == fourButton)
2890	3448	{
2891	3449	radio.layout = fourButton;
	3450	+
	3451	+ if (CameraPane.FULLSCREEN)
	3452	+ fullscreenLayout = radio.layout;
2892	3453
2893	3454	// bigThree.remove(scenePanel);
2894	3455	// bigThree.remove(centralPanel);
..	..	@@ -2920,10 +3481,15 @@
2920	3481	bigThree.ClearUI();
2921	3482	bigThree.add(scenePanel);
2922	3483	bigThree.FlushUI();
	3484	+
	3485	+ cameraView.requestFocusInWindow();
2923	3486	} else
2924	3487	if (source == sixButton)
2925	3488	{
2926	3489	radio.layout = sixButton;
	3490	+
	3491	+ if (CameraPane.FULLSCREEN)
	3492	+ fullscreenLayout = radio.layout;
2927	3493
2928	3494	// bigThree.remove(scenePanel);
2929	3495	// bigThree.remove(centralPanel);
..	..	@@ -2953,13 +3519,18 @@
2953	3519	// centralPanel.setVisible(true);
2954	3520	// XYZPanel.setVisible(false);
2955	3521	bigThree.ClearUI();
2956		- bigThree.add(scenePanel);
2957	3522	bigThree.add(centralPanel);
	3523	+ bigThree.add(scenePanel);
2958	3524	bigThree.FlushUI();
	3525	+
	3526	+ cameraView.requestFocusInWindow();
2959	3527	} else
2960	3528	if (source == sevenButton)
2961	3529	{
2962	3530	radio.layout = sevenButton;
	3531	+
	3532	+ if (CameraPane.FULLSCREEN)
	3533	+ fullscreenLayout = radio.layout;
2963	3534
2964	3535	// bigThree.remove(scenePanel);
2965	3536	// bigThree.remove(centralPanel);
..	..	@@ -2993,6 +3564,8 @@
2993	3564	bigThree.add(centralPanel);
2994	3565	bigThree.add(XYZPanel);
2995	3566	bigThree.FlushUI();
	3567	+
	3568	+ cameraView.requestFocusInWindow();
2996	3569	} else
2997	3570	if (source == rootButton)
2998	3571	{
..	..	@@ -3004,6 +3577,7 @@
3004	3577	EditObject(obj);
3005	3578	}
3006	3579
	3580	+ cameraView.requestFocusInWindow();
3007	3581	refreshContents(true);
3008	3582	} else
3009	3583	if (source == closeButton)
..	..	@@ -3013,22 +3587,37 @@
3013	3587	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3014	3588	{
3015	3589	ab = (cRadio)e.nextElement();
3016		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3590	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
3017	3591	{
	3592	+ // Patch to avoid bug with transparency.
	3593	+ if (!ab.hadMaterial)
	3594	+ {
	3595	+ ab.object.material = null;
	3596	+ }
	3597	+
3018	3598	buttonGroup.remove(ab);
3019	3599	radioPanel.remove(ab);
3020	3600
3021		- ab.GetObject().editWindow = null;
	3601	+ //ab.GetObject().editWindow = null;
	3602	+ ab.GetObject().manipWindow = null;
3022	3603	// ab.GetObject().objectUI = null; // ?????????
3023	3604
3024	3605	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
3025	3606	break;
3026	3607	}
3027	3608	}
	3609	+
	3610	+ cameraView.requestFocusInWindow();
3028	3611	refreshContents(true);
3029	3612	} else
3030	3613	if (source == editItem \|\| source == editButton)
3031	3614	{
	3615	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3616	+ {
	3617	+ Object3D child = (Object3D)e.nextElement();
	3618	+ child.pinned = true;
	3619	+ }
	3620	+
3032	3621	EditSelection(false);
3033	3622	} else
3034	3623	if (source == uneditButton)
..	..	@@ -3038,10 +3627,11 @@
3038	3627	Object3D child = (Object3D)e.nextElement();
3039	3628	if(child.editWindow != null)
3040	3629	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3630	+ child.pinned = false;
3041	3631	child.CloseUI();
3042	3632	listUI.remove(child);
3043	3633
3044		- child.editWindow = null; // ???????????
	3634	+ //child.editWindow = null; // ???????????
3045	3635	}
3046	3636	objEditor.ctrlPanel.FlushUI();
3047	3637	//objEditor.jTree.clearSelection();
..	..	@@ -3054,6 +3644,7 @@
3054	3644	//copy.ClearUI();
3055	3645	for (Object3D obj : listUI)
3056	3646	{
	3647	+ obj.pinned = false;
3057	3648	obj.CloseUI();
3058	3649	}
3059	3650	listUI.clear();
..	..	@@ -3063,7 +3654,7 @@
3063	3654	{
3064	3655	assert(copy == group);
3065	3656
3066		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3657	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3067	3658
3068	3659	for (Object3D obj : listUI)
3069	3660	{
..	..	@@ -3112,6 +3703,9 @@
3112	3703	}
3113	3704
3114	3705	copy = group;
	3706	+
	3707	+ SetUndoStates();
	3708	+
3115	3709	//Globals.theRenderer.object = group;
3116	3710	if(!useclient)
3117	3711	{
..	..	@@ -3128,7 +3722,9 @@
3128	3722	sideView.object = group;
3129	3723	}
3130	3724
3131		-// fix "+" issue group.editWindow = this;
	3725	+// fix "+" issue
	3726	+ //group.editWindow = this;
	3727	+ group.manipWindow = this;
3132	3728
3133	3729	/*
3134	3730	currentLayout = radio.layout;
..	..	@@ -3136,18 +3732,27 @@
3136	3732	currentLayout = sevenButton;
3137	3733	*/
3138	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);
3139	3742	keepparent = group.parent;
3140	3743	// PARENT = NULL or not???
3141	3744	//group.parent = null; // ROOT
3142	3745	//group.attributes = -1;
3143	3746	ResetModel();
	3747	+
	3748	+ cameraView.requestFocusInWindow();
3144	3749	refreshContents(true);
3145	3750	} else if (event.getSource() == editCameraItem)
3146	3751	{
3147	3752	cameraView.ProtectCamera();
3148	3753	cameraView.repaint();
3149	3754	return;
3150		- } else if (event.getSource() == revertCameraItem)
	3755	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3151	3756	{
3152	3757	cameraView.RevertCamera();
3153	3758	cameraView.repaint();
..	..	@@ -3164,7 +3769,6 @@
3164	3769	}
3165	3770
3166	3771	boolean useclient = false;
3167		- cRadio radio;
3168	3772
3169	3773	void ToggleRoot()
3170	3774	{
..	..	@@ -3403,7 +4007,8 @@
3403	4007
3404	4008	int size = obj.MemorySize();
3405	4009
3406		- System.err.println((size/1024) + " KB is the size of " + obj);
	4010	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	4011	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3407	4012	}
3408	4013	}
3409	4014	catch (Exception e)
..	..	@@ -3484,6 +4089,13 @@
3484	4089	void GenNormals(boolean crease)
3485	4090	{
3486	4091	group.GenNormalsS(crease);
	4092	+
	4093	+ refreshContents();
	4094	+ }
	4095	+
	4096	+ void GenNormalsMESH()
	4097	+ {
	4098	+ group.GenNormalsMeshS();
3487	4099
3488	4100	refreshContents();
3489	4101	}
..	..	@@ -3719,7 +4331,7 @@
3719	4331
3720	4332	try
3721	4333	{
3722		- texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4334	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
3723	4335	}
3724	4336	catch (Exception e)
3725	4337	{
..	..	@@ -4111,6 +4723,18 @@
4111	4723	refreshContents();
4112	4724	}
4113	4725
	4726	+ void RewindLeaves(boolean hide)
	4727	+ {
	4728	+ group.selection.RewindLeaves(hide);
	4729	+ refreshContents();
	4730	+ }
	4731	+
	4732	+ void RandomLeaves(boolean hide)
	4733	+ {
	4734	+ group.selection.RandomLeaves(hide);
	4735	+ refreshContents();
	4736	+ }
	4737	+
4114	4738	void SetTexRes(int tr)
4115	4739	{
4116	4740	group.selection.SetTexRes(tr);
..	..	@@ -4182,28 +4806,25 @@
4182	4806	// }
4183	4807	// }
4184	4808
4185		- static boolean allparams = true;
4186		-
4187		- static Vector<Object3D> listUI = new Vector<Object3D>();
4188		-
4189	4809	void EditSelection(boolean newWindow)
4190	4810	{
	4811	+ if (group.selection == null)
	4812	+ {
	4813	+ EditElement(group, newWindow); // ? new
	4814	+ return;
	4815	+ }
	4816	+
4191	4817	// aConstraints.gridy = 0;
4192	4818	for (int i=0; i<group.selection.size(); i++)
4193	4819	{
4194	4820	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4195	4821	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4196		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4822	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4197	4823
4198	4824	Object3D elem = (Object3D)group.selection.elementAt(i);
4199	4825	if(elem != group \|\| !newWindow)
4200	4826	{
4201		- // if (!(elem instanceof Composite))
4202		- // newWindow = false;
4203		- listUI.add(elem);
4204		- elem.openEditWindow(this, newWindow); //, false);
4205		- System.out.println("edit : " + elem);
4206		- elem.editWindow.refreshContents(true); // ? new
	4827	+ EditElement(elem, newWindow); // ? new
4207	4828	}
4208	4829	}
4209	4830	}
..	..	@@ -4278,7 +4899,8 @@
4278	4899	//new Exception().printStackTrace();
4279	4900
4280	4901	freezemodel = true;
4281		-
	4902	+ ClearUnpinned();
	4903	+
4282	4904	/**/
4283	4905	//switch (event.id)
4284	4906	{
..	..	@@ -4286,7 +4908,6 @@
4286	4908	//case 702: // Event.LIST_DESELECT
4287	4909	group.deselectAll();
4288	4910	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4289		- objEditor.ClearInfo(); // .GetMaterial());
4290	4911	if (tps != null)
4291	4912	{
4292	4913	for (int i=0; i < tps.length; i++)
..	..	@@ -4295,10 +4916,8 @@
4295	4916
4296	4917	//if (child.parent != null)
4297	4918	//child.parent.addSelectee(child);
	4919	+ objEditor.SetMaterial(child);
4298	4920	group.addSelectee(child);
4299		- objEditor.SetMaterial(child); // .GetMaterial());
4300		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4301		- System.err.println("info : " + child.GetPath());
4302	4921	}
4303	4922	}
4304	4923	// else
..	..	@@ -4308,17 +4927,13 @@
4308	4927	// System.err.println("info : " + group.GetPath());
4309	4928	// }
4310	4929
4311		- objEditor.SetText(); // jan 2014
4312		-
4313		- Object3D object = (Object3D) tps[0].getLastPathComponent();
4314		-
4315		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(object instanceof Camera))
	4930	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4316	4931	CameraPane.flash = true;
4317	4932
4318		- if (tps != null && tps.length > 0 && object instanceof Camera)
	4933	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4319	4934	// a camera
4320	4935	{
4321		- if (object != Globals.theRenderer.LightCamera())
	4936	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
4322	4937	{
4323	4938	CameraPane.camerachangeframe = 0; // don't refuse it
4324	4939	Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
..	..	@@ -4327,6 +4942,13 @@
4327	4942	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4328	4943	}
4329	4944
	4945	+ if (tps != null && tps.length == 1)
	4946	+ {
	4947	+ EditSelection(false);
	4948	+ }
	4949	+
	4950	+ SetPinStates(tps != null && tps.length > 0);
	4951	+
4330	4952	refreshContents();
4331	4953	//return true;
4332	4954	}
..	..	@@ -4335,6 +4957,35 @@
4335	4957
4336	4958	freezemodel = false;
4337	4959	}
	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	+
	4969	+ void refreshContents(boolean cp)
	4970	+ {
	4971	+ if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	4972	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
	4973	+ {
	4974	+ objEditor.ClearInfo(); // .GetMaterial());
	4975	+
	4976	+ for (int i=0; i < group.selection.Size(); i++)
	4977	+ {
	4978	+ Object3D child = (Object3D) group.selection.get(i);
	4979	+
	4980	+ objEditor.AddInfo(child, this, true);
	4981	+ System.err.println("info : " + child.GetPath());
	4982	+ }
	4983	+
	4984	+ objEditor.SetText(); // jan 2014
	4985	+ }
	4986	+
	4987	+ super.refreshContents(cp);
	4988	+ }
4338	4989
4339	4990	void linkSomething(Object3D thing)
4340	4991	{
..	..	@@ -4406,6 +5057,7 @@
4406	5057	{
4407	5058	if (group.selection.isEmpty())
4408	5059	return;
	5060	+
4409	5061	Grafreed.clipboardIsTempGroup = false;
4410	5062	Composite tGroup = null;
4411	5063	if (group.selection.size() > 0) // 1)
..	..	@@ -4416,6 +5068,8 @@
4416	5068
4417	5069	if (cut)
4418	5070	{
	5071	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5072	+// Save();
4419	5073	//int indices[] = jList.getSelectedIndices();
4420	5074	//for (int i = indices.length - 1; i >= 0; i--)
4421	5075	//jList.remove(indices[i]);
..	..	@@ -4505,8 +5159,10 @@
4505	5159	}
4506	5160
4507	5161	}
	5162	+
4508	5163	if (Grafreed.clipboardIsTempGroup)
4509	5164	Grafreed.clipboard = tGroup;
	5165	+
4510	5166	if (cut)
4511	5167	{
4512	5168	ResetModel();
..	..	@@ -4516,6 +5172,10 @@
4516	5172
4517	5173	void paste(boolean expand)
4518	5174	{
	5175	+ if (Globals.REPLACEONMAKE)
	5176	+ Save();
	5177	+ boolean keep = Globals.REPLACEONMAKE;
	5178	+ Globals.REPLACEONMAKE = false;
4519	5179	// if (GrafreeD.clipboard == null)
4520	5180	// return;
4521	5181	boolean first = true;
..	..	@@ -4575,6 +5235,7 @@
4575	5235	Grafreed.clipboard.get(0).parent = keepparent;
4576	5236	}
4577	5237
	5238	+ Globals.REPLACEONMAKE = keep;
4578	5239	ResetModel();
4579	5240	refreshContents();
4580	5241	}
..	..	@@ -4710,6 +5371,10 @@
4710	5371
4711	5372	void group(Object3D csg, boolean grab)
4712	5373	{
	5374	+ if (Globals.REPLACEONMAKE)
	5375	+ Save();
	5376	+ boolean keep = Globals.REPLACEONMAKE;
	5377	+ Globals.REPLACEONMAKE = false;
4713	5378	if (//false) // why??
4714	5379	!group.selection.isEmpty())
4715	5380	{
..	..	@@ -4823,10 +5488,15 @@
4823	5488	//node.add(csg);
4824	5489	//makeSomething(node);
4825	5490	makeSomething(csg);
	5491	+ Globals.REPLACEONMAKE = keep;
4826	5492	}
4827	5493
4828	5494	void Ungroup(Object3D g)
4829	5495	{
	5496	+ if (Globals.REPLACEONMAKE)
	5497	+ Save();
	5498	+ boolean keep = Globals.REPLACEONMAKE;
	5499	+ Globals.REPLACEONMAKE = false;
4830	5500	if (g instanceof HiddenObject)
4831	5501	{
4832	5502	HiddenObject h = (HiddenObject) g;
..	..	@@ -4843,6 +5513,7 @@
4843	5513	objEditor.makeSomething(g.get(i), false);
4844	5514	}
4845	5515	}
	5516	+ Globals.REPLACEONMAKE = keep;
4846	5517	}
4847	5518
4848	5519	void ungroup()
..	..	@@ -5131,7 +5802,44 @@
5131	5802	cButton clearpanelButton;
5132	5803	cButton unselectButton;
5133	5804
	5805	+ cButton restoreCameraButton;
	5806	+
	5807	+ cButton saveButton;
5134	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;
5135	5843
5136	5844	cButton screenfitButton;
5137	5845	cButton screenfitpointButton;
..	..	@@ -5144,14 +5852,6 @@
5144	5852
5145	5853	cButton setsupportButton;
5146	5854
5147		- cButton twoButton;
5148		- cButton sixButton;
5149		- cButton threeButton;
5150		- cButton sevenButton;
5151		- cButton fourButton; // full panel
5152		- cButton oneButton; // full XYZ
5153		- //cButton currentLayout;
5154		-
5155	5855	//
5156	5856	//Composite
5157	5857	Object3D // to do !!
..	..	@@ -5161,11 +5861,11 @@
5161	5861	//JTree jTree;
5162	5862	private MenuItem lookAtItem;
5163	5863	private MenuItem lookFromItem;
5164		- private MenuItem switchItem;
	5864	+ private MenuItem switchViewItem;
5165	5865	private MenuItem cutItem;
5166	5866	private MenuItem undoItem;
5167	5867	private MenuItem redoItem;
5168		- private MenuItem duplicateItem;
	5868	+ private JMenuItem duplicateItem;
5169	5869	private MenuItem cloneItem;
5170	5870	private MenuItem cloneSupportItem;
5171	5871	private MenuItem overwriteGeoItem;
..	..	@@ -5193,7 +5893,7 @@
5193	5893	private MenuItem pasteLinkItem;
5194	5894	private MenuItem pasteCloneItem;
5195	5895	private MenuItem pasteExpandItem;
5196		- private MenuItem clearItem;
	5896	+ private MenuItem deleteItem;
5197	5897	private MenuItem clearAllItem;
5198	5898	private MenuItem genUVItem;
5199	5899	private MenuItem genNormalsMESHItem;
..	..	@@ -5228,6 +5928,10 @@
5228	5928	private MenuItem showleavesItem;
5229	5929	private MenuItem markleavesItem;
5230	5930	private MenuItem unmarkleavesItem;
	5931	+ private MenuItem rewindleavesItem;
	5932	+ private MenuItem unrewindleavesItem;
	5933	+ private MenuItem randomleavesItem;
	5934	+ private MenuItem unrandomleavesItem;
5231	5935
5232	5936	private MenuItem flipVItem;
5233	5937	private MenuItem unflipVItem;
..	..	@@ -5249,7 +5953,7 @@
5249	5953	private MenuItem frontItem;
5250	5954	private MenuItem cameraItem;
5251	5955	private MenuItem compositeItem;
5252		- private MenuItem randomItem;
	5956	+ private MenuItem switchItem;
5253	5957	private MenuItem physicsItem;
5254	5958	private MenuItem frameselectorItem;
5255	5959	private MenuItem scriptNodeItem;
..	..	@@ -5273,6 +5977,8 @@
5273	5977	private MenuItem attachBumpItem;
5274	5978	private MenuItem detachBumpItem;
5275	5979	private MenuItem pigmentBumpItem;
	5980	+ private MenuItem embedTexturesItem;
	5981	+ private MenuItem deEmbedTexturesItem;
5276	5982
5277	5983	private MenuItem particleItem;
5278	5984	private MenuItem ragdollItem;
..	..	@@ -5323,5 +6029,5 @@
5323	6029
5324	6030	Menu cameraMenu;
5325	6031	MenuItem editCameraItem;
5326		- MenuItem revertCameraItem;
	6032	+ MenuItem restoreCameraItem;
5327	6033	}