~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,11 +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		- 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"));
158	210	duplicateItem.addActionListener(this);
159	211	cloneItem = menu.add(new MenuItem("Clone"));
160	212	cloneItem.addActionListener(this);
..	..	@@ -170,7 +222,6 @@
170	222	copyItem.addActionListener(this);
171	223	pasteItem = menu.add(new MenuItem("Paste"));
172	224	pasteItem.addActionListener(this);
173		- menu.add("-");
174	225
175	226	menu.add("-");
176	227	pasteIntoItem = menu.add(new MenuItem("Paste into"));
..	..	@@ -182,8 +233,8 @@
182	233	// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
183	234	// pasteExpandItem.addActionListener(this);
184	235	menu.add("-");
185		- clearItem = menu.add(new MenuItem("Clear"));
186		- clearItem.addActionListener(this);
	236	+ deleteItem = menu.add(new MenuItem("Delete"));
	237	+ deleteItem.addActionListener(this);
187	238
188	239	if (Globals.ADVANCED)
189	240	{
..	..	@@ -197,23 +248,23 @@
197	248	//zBufferItem.addActionListener(this);
198	249	//cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
199	250	//normalLensItem.addActionListener(this);
200		- cameraMenu.add(revertCameraItem = new MenuItem("Revert Camera"));
201		- revertCameraItem.addActionListener(this);
	251	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	252	+ restoreCameraItem.addActionListener(this);
202	253
203		- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
204		- toggleFullScreenItem.addItemListener(this);
205		- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
206		- 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);
207	266
208		- cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
209		- toggleTextureItem.addItemListener(this);
210		- toggleTextureItem.setState(CameraPane.textureon);
211		-
212		- cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
213		- toggleSwitchItem.addItemListener(this);
214		- toggleSwitchItem.setState(CameraPane.SWITCH);
215		-
216		- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
	267	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
217	268	toggleHandleItem.addItemListener(this);
218	269	toggleHandleItem.setState(CameraPane.HANDLES);
219	270
..	..	@@ -240,7 +291,7 @@
240	291
241	292	cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
242	293	toggleDebugItem.addItemListener(this);
243		- toggleDebugItem.setState(CameraPane.DEBUG);
	294	+ toggleDebugItem.setState(Globals.DEBUG);
244	295
245	296	cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
246	297	toggleFrustumItem.addItemListener(this);
..	..	@@ -261,14 +312,14 @@
261	312	// animationItem.addItemListener(this);
262	313	// animationItem.setState(CameraPane.ANIMATION);
263	314	cameraMenu.add("-");
264		- cameraMenu.add(editCameraItem = new MenuItem("Freeze Camera"));
	315	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
265	316	editCameraItem.addActionListener(this);
266	317
267	318	if (Globals.ADVANCED)
268	319	{
269	320	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
270	321	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
271		- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
	322	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
272	323	editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
273	324	oe.cameraMenu.add("-");
274	325	openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
..	..	@@ -276,7 +327,7 @@
276	327	editLeafItem.addActionListener(this);
277	328	lookAtItem.addActionListener(this);
278	329	//lookFromItem.addActinoListener(this);
279		- //switchItem.addActionListener(this);
	330	+ //switchViewItem.addActionListener(this);
280	331	}
281	332
282	333	oe.menuBar.add(menu = new Menu("Setting"));
..	..	@@ -321,21 +372,29 @@
321	372	}
322	373
323	374	oe.menuBar.add(menu = new Menu("Group"));
324		- grabItem = menu.add(new MenuItem("Grab"));
325		- grabItem.addActionListener(this);
	375	+// grabItem = menu.add(new MenuItem("Grab"));
	376	+// grabItem.addActionListener(this);
326	377	backItem = menu.add(new MenuItem("Back"));
327	378	backItem.addActionListener(this);
328	379	frontItem = menu.add(new MenuItem("Front"));
329	380	frontItem.addActionListener(this);
330		- compositeItem = menu.add(new MenuItem("Composite"));
331		- compositeItem.addActionListener(this);
	381	+// compositeItem = menu.add(new MenuItem("Composite"));
	382	+// compositeItem.addActionListener(this);
	383	+
	384	+ if (Globals.ADVANCED)
	385	+ {
332	386	hideItem = menu.add(new MenuItem("Hidden Group"));
333	387	hideItem.addActionListener(this);
	388	+ }
334	389	ungroupItem = menu.add(new MenuItem("Ungroup"));
335	390	ungroupItem.addActionListener(this);
336		- menu.add("-");
337		- randomItem = menu.add(new MenuItem("Switch node"));
338		- 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	+ {
339	398	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
340	399	switchGeoItem.addActionListener(this);
341	400	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
..	..	@@ -343,8 +402,6 @@
343	402	morphItem = menu.add(new MenuItem("Morph Group"));
344	403	morphItem.addActionListener(this);
345	404
346		- if (Globals.ADVANCED)
347		- {
348	405	menu.add("-");
349	406	physicsItem = menu.add(new MenuItem("Physics"));
350	407	physicsItem.addActionListener(this);
..	..	@@ -352,30 +409,29 @@
352	409	frameselectorItem.addActionListener(this);
353	410	scriptNodeItem = menu.add(new MenuItem("Script Node"));
354	411	scriptNodeItem.addActionListener(this);
355		- cameraItem = menu.add(new MenuItem("Camera"));
356		- cameraItem.addActionListener(this);
357	412	}
358	413
359	414	oe.menuBar.add(menu = new Menu("Object"));
360		- textureItem = menu.add(new MenuItem("Texture"));
361		- textureItem.addActionListener(this);
	415	+// textureItem = menu.add(new MenuItem("Texture"));
	416	+// textureItem.addActionListener(this);
362	417	billboardItem = menu.add(new MenuItem("Billboard"));
363	418	billboardItem.addActionListener(this);
364	419	csgItem = menu.add(new MenuItem("CSG"));
365	420	csgItem.addActionListener(this);
366		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	421	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
367	422	shadowXItem.addActionListener(this);
368		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	423	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
369	424	shadowYItem.addActionListener(this);
370		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	425	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
371	426	shadowZItem.addActionListener(this);
	427	+ attributeItem = menu.add(new MenuItem("Attribute"));
	428	+ attributeItem.addActionListener(this);
	429	+
372	430	if (Globals.ADVANCED)
373	431	{
374	432	menu.add("-");
375	433	linkerItem = menu.add(new MenuItem("Linker"));
376	434	linkerItem.addActionListener(this);
377		- attributeItem = menu.add(new MenuItem("Attribute"));
378		- attributeItem.addActionListener(this);
379	435	templateItem = menu.add(new MenuItem("Template"));
380	436	templateItem.addActionListener(this);
381	437	pointflowItem = menu.add(new MenuItem("Point Flow"));
..	..	@@ -404,7 +460,7 @@
404	460	genNormalsMESHItem.addActionListener(this);
405	461	if (Globals.ADVANCED)
406	462	{
407		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	463	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
408	464	genNormalsMINEItem.addActionListener(this);
409	465	}
410	466	stripifyItem = menu.add(new MenuItem("Stripify"));
..	..	@@ -464,6 +520,14 @@
464	520	markleavesItem.addActionListener(this);
465	521	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
466	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);
467	531	menu.add("-");
468	532	flipVItem = menu.add(new MenuItem("Flip V"));
469	533	flipVItem.addActionListener(this);
..	..	@@ -489,10 +553,15 @@
489	553	attachBumpItem.addActionListener(this);
490	554	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
491	555	pigmentBumpItem.addActionListener(this);
	556	+ //embedTexturesItem
492	557	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
493	558	detachPigmentItem.addActionListener(this);
494	559	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
495	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);
496	565	menu.add("-");
497	566	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
498	567	sortbysizeItem.addActionListener(this);
..	..	@@ -519,8 +588,21 @@
519	588	buildToolsMenu(menu);
520	589	}
521	590
	591	+
522	592	void SetupUI2(ObjEditor oe)
523	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	+
524	606	//new Exception().printStackTrace();
525	607
526	608	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -549,27 +631,79 @@
549	631	oe.radioPanel.add(dummyButton);
550	632	oe.buttonGroup.add(dummyButton);
551	633	*/
	634	+ cGridBag copyOptionsPanel = new cGridBag();
	635	+
	636	+ copyOptionsPanel.preferredHeight = 2;
	637	+
552	638	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
553	639
554		- 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);
555	691	liveCB.setToolTipText("Enable animation");
556	692	liveCB.addItemListener(this);
557	693
558		- oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	694	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
559	695	oneStepButton.setToolTipText("Animate one step forward");
560	696	oneStepButton.addActionListener(this);
561	697
562		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	698	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
563	699	fastCB.setToolTipText("Fast mode");
564	700	fastCB.addItemListener(this);
565	701
566		- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
567		- trackCB.setToolTipText("Enable tracking");
568		- trackCB.addItemListener(this);
569		-
570		- oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
571		- screenfitButton.setToolTipText("Screen fit");
572		- 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);
573	707
574	708	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
575	709	// screenfitpointButton.addActionListener(this);
..	..	@@ -579,67 +713,244 @@
579	713	oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
580	714	snapobjectButton.addActionListener(this);
581	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");
582	720	}
583	721
584		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
585		- flashSelectionButton.setToolTipText("Show selection");
586		- flashSelectionButton.addActionListener(this);
	722	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
587	723
588		- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
589		-
590		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
591		- 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");
592	726	twoButton.addActionListener(this);
593		- oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
594		- fourButton.addActionListener(this);
595		- fourButton.setToolTipText("Show left panel only");
596		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
597		- sixButton.setToolTipText("2-column layout left");
598		- sixButton.addActionListener(this);
599		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
600		- 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");
601	731	threeButton.addActionListener(this);
602		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
603		- sevenButton.setToolTipText("3-column layout");
604		- 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);
605	738	//
606	739
607		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
608		- 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");
609	742	rootButton.addActionListener(this);
610	743
611		- 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);
612	745	closeButton.setToolTipText("Close tab");
613	746	closeButton.addActionListener(this);
614	747	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
615	748	//clearButton.addActionListener(this);
616		-
617		- cGridBag commandsPanel = new cGridBag();
	749	+
	750	+ cGridBag row1 = new cGridBag();
618	751
619		- commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
620		- 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");
621	927	editButton.addActionListener(this);
622	928
623		- commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
624		- uneditButton.setToolTipText("Unedit selection");
	929	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	930	+ uneditButton.setToolTipText("Remove selection controls");
625	931	uneditButton.addActionListener(this);
626	932
627		- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
628		- allParamsButton.setToolTipText("Edit all params");
	933	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	934	+ allParamsButton.setToolTipText("Show all controle");
629	935	allParamsButton.addActionListener(this);
630	936
631		- commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	937	+ editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
632	938	clearPanelButton.setToolTipText("Clear edit panel");
633	939	clearPanelButton.addActionListener(this);
634	940
635		- commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	941	+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
636	942	unselectButton.setToolTipText("Unselect");
637	943	unselectButton.addActionListener(this);
638	944
639		- 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);
640	948
641		- oe.treePanel.add(commandsPanel);
642		- oe.treePanel.Return();
	949	+ editCommandsPanel.preferredHeight = 1;
	950	+
	951	+ SetPinStates(false);
	952	+// oe.treePanel.add(commandsPanel);
	953	+// oe.treePanel.Return();
643	954
644	955	// oe.aConstraints.gridx += 1;
645	956	// oe.aConstraints.weighty = 0;
..	..	@@ -656,32 +967,20 @@
656	967
657	968	JScrollPane jSP;
658	969	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
659		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	970	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
660	971	ResetModel();
661	972
662	973	oe.treePanel.add(jSPPanel);
663	974	oe.treePanel.Return();
664	975
665		- cGridBag copyOptionsPanel = new cGridBag();
666		-
667		- copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
668		- colorCB.setToolTipText("Copy color when dropped");
669		- colorCB.addItemListener(this);
670		-
671		- copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
672		- materialCB.setToolTipText("Copy material when dropped");
673		- materialCB.addItemListener(this);
674		-
675		- copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
676		- textureCB.setToolTipText("Copy texture when dropped");
677		- textureCB.addItemListener(this);
678		-
679		- copyOptionsPanel.preferredHeight = 1;
680	976	oe.treePanel.add(copyOptionsPanel);
681	977	oe.treePanel.Return();
	978	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	979	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	980	+ sliderPane.preferredHeight = 1;
682	981
683		-// mainPanel.setDividerLocation(0.5); //1.0);
684		-// mainPanel.setResizeWeight(0.5);
	982	+// mainPanel.setDividerLocation(0.1); //1.0);
	983	+ mainPanel.setResizeWeight(0.4);
685	984
686	985	//jList.addListSelectionListener(this);
687	986	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -689,7 +988,7 @@
689	988	//jTree.setEditable(true);
690	989	oe.jTree.setDragEnabled(true);
691	990	//jTree.setPreferredSize(new Dimension(10,10));
692		- jSP.setPreferredSize(new Dimension(100,200));
	991	+ //jSP.setPreferredSize(new Dimension(100,200));
693	992
694	993	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
695	994
..	..	@@ -701,29 +1000,49 @@
701	1000	dgr.addDragGestureListener(this);
702	1001	}catch(Exception e) {}
703	1002	*/
704		- radio.layout = sevenButton;
	1003	+ radio.layout = sixButton; // sevenButton;
705	1004	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
706	1005	}
707	1006
708	1007	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
709	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	+
710	1023	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
711	1024	boxCB.setToolTipText("Display bounding boxes");
712	1025	boxCB.addItemListener(this);
713	1026
714	1027	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
715		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	1028	+ zoomBoxCB.setToolTipText("Display only for wheel");
716	1029	zoomBoxCB.addItemListener(this);
717	1030
718	1031	if (true) // Globals.ADVANCED)
719	1032	{
720		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
721		- supportCB.setToolTipText("Enable rigging");
722		- 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);
723	1040
724	1041	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
725	1042	// localCB.addItemListener(this);
726	1043
	1044	+ panel.Return();
	1045	+
727	1046	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
728	1047	crowdCB.setToolTipText("Used for crowds");
729	1048	crowdCB.addItemListener(this);
..	..	@@ -740,6 +1059,8 @@
740	1059	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
741	1060	// speakerMocapCB.addItemListener(this);
742	1061
	1062	+ panel.Return();
	1063	+
743	1064	if (false)
744	1065	{
745	1066	// handled in scripts
..	..	@@ -754,34 +1075,74 @@
754	1075	//constraints.gridy += 1;
755	1076	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
756	1077	smoothfocusCB.addItemListener(this);
	1078	+ panel.Return();
757	1079	}
758	1080
759	1081	//constraints.gridx += 1;
760	1082	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
761	1083	// debugCB.addItemListener(this);
762	1084
	1085	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	1086	+ trackCB.setToolTipText("Enable tracking target");
	1087	+ trackCB.addItemListener(this);
	1088	+
763	1089	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	1090	+ oeilCB.setToolTipText("Move camera when tracking");
764	1091	oeilCB.addItemListener(this);
765	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	+ {
766	1113	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
767	1114	lookAtCB.setToolTipText("Look-at target");
768	1115	lookAtCB.addItemListener(this);
	1116	+ }
769	1117
770	1118	}
771	1119
772	1120	cGridBag fill = new cGridBag();
773		-
774	1121	fill.preferredHeight = 200;
	1122	+ cGridBag fill2 = new cGridBag();
	1123	+ fill2.preferredHeight = 200;
	1124	+ cGridBag fill3 = new cGridBag();
	1125	+ fill3.preferredHeight = 200;
775	1126
776	1127	panel.add(fill);
	1128	+ panel.add(fill2);
	1129	+ panel.add(fill3);
777	1130
778	1131	}
779	1132
780	1133	void EditObject(Object3D obj)
781	1134	{
782	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	+
783	1144	radioButton.SetObject(obj);
784		- radioButton.layout = sevenButton;
	1145	+ radioButton.layout = sixButton; // sevenButton;
785	1146	radioButton.SetCamera(cameraView.renderCamera, false);
786	1147	radioButton.addActionListener(this);
787	1148	radioPanel.add(radioButton);
..	..	@@ -791,6 +1152,8 @@
791	1152
792	1153	void SetupViews(ObjEditor oe)
793	1154	{
	1155	+ theFrame = this;
	1156	+
794	1157	oe.SetupViews();
795	1158
796	1159	System.out.println("SetupViews");
..	..	@@ -799,23 +1162,28 @@
799	1162	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
800	1163	}
801	1164
802		- JCheckBox liveCB;
803		- JCheckBox supportCB;
804		- JCheckBox localCB;
805		- JCheckBox crowdCB;
806		- JCheckBox smoothCB;
807		- JCheckBox fastCB;
808		- JCheckBox slowCB;
809		- JCheckBox boxCB;
810		- JCheckBox zoomBoxCB;
811		- JCheckBox trackCB;
812		- 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;
813	1178	// JCheckBox speakerMocapCB;
814		- JCheckBox speakerCameraCB;
815		- JCheckBox speakerFocusCB;
816		- JCheckBox debugCB;
817		- JCheckBox oeilCB;
818		- JCheckBox lookAtCB;
	1179	+ cCheckBox speakerCameraCB;
	1180	+ cCheckBox speakerFocusCB;
	1181	+ cCheckBox debugCB;
	1182	+
	1183	+ cCheckBox oeilCB;
	1184	+ cCheckBox shadowCB;
	1185	+ cCheckBox autokeepCB;
	1186	+ cCheckBox lookAtCB;
819	1187
820	1188	// static int COLOR = 1;
821	1189	// static int MATERIAL = 2;
..	..	@@ -823,9 +1191,9 @@
823	1191
824	1192	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
825	1193
826		- JCheckBox colorCB;
827		- JCheckBox materialCB;
828		- JCheckBox textureCB;
	1194	+ cCheckBox colorCB;
	1195	+ cCheckBox materialCB;
	1196	+ cCheckBox textureCB;
829	1197
830	1198	public void itemStateChanged(ItemEvent e)
831	1199	{
..	..	@@ -853,6 +1221,7 @@
853	1221	} else if(e.getSource() == liveCB)
854	1222	{
855	1223	cameraView.ToggleLive();
	1224	+ refreshContents(false);
856	1225	}
857	1226	else if(e.getSource() == supportCB)
858	1227	{
..	..	@@ -917,6 +1286,18 @@
917	1286	{
918	1287	cameraView.ToggleOeil();
919	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	+ }
920	1301	else if(e.getSource() == lookAtCB)
921	1302	{
922	1303	cameraView.ToggleLookAt();
..	..	@@ -933,7 +1314,8 @@
933	1314
934	1315	/**/
935	1316	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
936		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1317	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1318	+ TreePath path = objEditor.jTree.getSelectionPath();
937	1319	if ((path == null) \|\| (path.getPathCount() <= 1)) {
938	1320	// We can't move the root node or an empty selection
939	1321	return;
..	..	@@ -996,8 +1378,6 @@
996	1378	}
997	1379	}
998	1380
999		- String string = (String) object;
1000		-
1001	1381	System.out.println("Transfer = " + object + "; drop : " + target);
1002	1382	// if( object instanceof java.io.File[])
1003	1383	// {
..	..	@@ -1005,6 +1385,8 @@
1005	1385	// objEditor.DropFile((java.io.File[]) object, true);
1006	1386	// return;
1007	1387	// }
	1388	+
	1389	+ String string = object.toString();
1008	1390
1009	1391	// File path for Mac and Windows
1010	1392	if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
..	..	@@ -1050,23 +1432,33 @@
1050	1432
1051	1433	assert target == objEditor.jTree;
1052	1434	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1435	+ Object3D destinationLeaf;
1053	1436	try {
1054		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1437	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
1055	1438	} catch (Exception e) {
1056	1439	System.out.println("destinationPath : " + destinationPath);
1057	1440	return;
1058	1441	}
1059	1442
1060		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1443	+ for (int i=group.selection.size(); --i>=0;)
1061	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	+// {
1062	1454	loadClipboard(true);
1063	1455	objEditor.jTree.setSelectionPath(destinationPath);
1064	1456	pasteInto(false, false);
1065		- } else {
1066		- loadClipboard(false);
1067		- objEditor.jTree.setSelectionPath(destinationPath);
1068		- pasteInto(false, false); // true); // ???
1069		- }
	1457	+// } else {
	1458	+// loadClipboard(false);
	1459	+// objEditor.jTree.setSelectionPath(destinationPath);
	1460	+// pasteInto(false, false); // true); // ???
	1461	+// }
1070	1462	}
1071	1463	public void dropActionChanged(DropTargetDragEvent dtde)
1072	1464	// Called if the user has modified the current drop gesture
..	..	@@ -1171,22 +1563,30 @@
1171	1563	{
1172	1564	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1173	1565	//heightFieldItem.addActionListener(this);
1174		- gridItem = menu.add(new MenuItem("Grid"));
1175		- gridItem.addActionListener(this);
1176		- rectoidItem = menu.add(new MenuItem("Box"));
1177		- rectoidItem.addActionListener(this);
1178		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1179		- ellipsoidItem.addActionListener(this);
1180		- coneItem = menu.add(new MenuItem("Cone"));
1181		- coneItem.addActionListener(this);
1182		- torusItem = menu.add(new MenuItem("Torus"));
1183		- torusItem.addActionListener(this);
1184		- superItem = menu.add(new MenuItem("Superellipsoid"));
1185		- 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	+ {
1186	1584	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1187	1585	kleinItem.addActionListener(this);
1188		- particleItem = menu.add(new MenuItem("Particle system"));
1189		- particleItem.addActionListener(this);
	1586	+ }
	1587	+
	1588	+// particleItem = menu.add(new MenuItem("Particle system"));
	1589	+// particleItem.addActionListener(this);
1190	1590	if (Globals.ADVANCED)
1191	1591	{
1192	1592	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1212,15 +1612,15 @@
1212	1612	}
1213	1613	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1214	1614	bezierItem.addActionListener(this);
1215		- overlayItem = menu.add(new MenuItem("Overlay"));
1216		- overlayItem.addActionListener(this);
1217		- lightItem = menu.add(new MenuItem("Light"));
1218		- 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);
1219	1619	menu.add("-");
1220	1620	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1221	1621	//superLoopItem.addActionListener(this);
1222		- loopItem = menu.add(new MenuItem("Loop"));
1223		- loopItem.addActionListener(this);
	1622	+// loopItem = menu.add(new MenuItem("Loop"));
	1623	+// loopItem.addActionListener(this);
1224	1624	doubleItem = menu.add(new MenuItem("Fork"));
1225	1625	doubleItem.addActionListener(this);
1226	1626	if (Globals.ADVANCED)
..	..	@@ -1236,6 +1636,9 @@
1236	1636	animationItem.addItemListener(this);
1237	1637	animationItem.setState(Globals.ANIMATION);
1238	1638
	1639	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1640	+ archiveItem.addActionListener(this);
	1641	+
1239	1642	menu.add("-");
1240	1643	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1241	1644	parseverticesItem.addActionListener(this);
..	..	@@ -1248,6 +1651,8 @@
1248	1651	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1249	1652	reduce34MorphItem.addActionListener(this);
1250	1653	menu.add("-");
	1654	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	1655	+ memoryItem.addActionListener(this);
1251	1656	menu.add(computeAOItem = new MenuItem("Compute AO"));
1252	1657	computeAOItem.addActionListener(this);
1253	1658
..	..	@@ -1256,11 +1661,9 @@
1256	1661	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1257	1662	mirrorItem.addActionListener(this);
1258	1663	menu.add("-");
1259		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1260		- memoryItem.addActionListener(this);
1261	1664	menu.add(analyzeItem = new MenuItem("Analyze"));
1262	1665	analyzeItem.addActionListener(this);
1263		- menu.add(dumpItem = new MenuItem("Dump"));
	1666	+ menu.add(dumpItem = new MenuItem("Print"));
1264	1667	dumpItem.addActionListener(this);
1265	1668	// menu.add(pathItem = new MenuItem("From-to path"));
1266	1669	// pathItem.addActionListener(this);
..	..	@@ -1401,9 +1804,34 @@
1401	1804	shadow.material = new cMaterial(obj.material);
1402	1805	shadow.material.diffuse = 0.0001f;
1403	1806	shadow.material.specular = 0.0001f;
	1807	+ //shadow.projectedVertices[1].x = 300;
1404	1808
1405	1809	makeSomething(shadow);
1406	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	+ }
1407	1835
1408	1836	/**
1409	1837	* applyExample
..	..	@@ -1648,7 +2076,7 @@
1648	2076	{
1649	2077	ScreenFit();
1650	2078	} else
1651		- if (source == switchItem)
	2079	+ if (source == switchViewItem)
1652	2080	{
1653	2081	cVector v1 = new cVector();
1654	2082	cVector v2 = new cVector();
..	..	@@ -1657,11 +2085,11 @@
1657	2085	objEditor.cameraView.renderCamera.setAim(v2, v1);
1658	2086	objEditor.cameraView.repaint();
1659	2087	} else
1660		- if (source == rectoidItem)
	2088	+ if (source == rectoidItem \|\| source == boxButton)
1661	2089	{
1662	2090	makeSomething(new Box());
1663	2091	} else
1664		- if (source == particleItem)
	2092	+ if (source == particleItem \|\| source == particlesButton)
1665	2093	{
1666	2094	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1667	2095	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1740,27 +2168,27 @@
1740	2168
1741	2169	makeSomething(obj);
1742	2170	} else
1743		- if (source == gridItem)
	2171	+ if (source == gridItem \|\| source == gridButton)
1744	2172	{
1745	2173	makeSomething(new Grid());
1746	2174	} else
1747		- if (source == ellipsoidItem)
	2175	+ if (source == ellipsoidItem \|\| source == sphereButton)
1748	2176	{
1749	2177	makeSomething(new Sphere());
1750	2178	} else
1751		- if (source == coneItem)
	2179	+ if (source == coneItem \|\| source == coneButton)
1752	2180	{
1753	2181	makeSomething(new Cone());
1754	2182	} else
1755		- if (source == torusItem)
	2183	+ if (source == torusItem \|\| source == torusButton)
1756	2184	{
1757	2185	makeSomething(new Torus());
1758	2186	} else
1759		- if (source == superItem)
	2187	+ if (source == superItem \|\| source == superButton)
1760	2188	{
1761	2189	makeSomething(new Superellipsoid());
1762	2190	} else
1763		- if (source == kleinItem)
	2191	+ if (source == kleinItem \|\| source == kleinButton)
1764	2192	{
1765	2193	makeSomething(new Klein());
1766	2194	} else
..	..	@@ -1780,7 +2208,7 @@
1780	2208	{
1781	2209	makeSomething(new BezierSurface());
1782	2210	} else
1783		- if (source == overlayItem)
	2211	+ if (source == overlayItem \|\| source == overlayButton)
1784	2212	{
1785	2213	/*
1786	2214	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1828,10 +2256,27 @@
1828	2256	s.setup();
1829	2257	makeSomething(s);
1830	2258	} else
1831		- if (source == lightItem)
	2259	+ if (source == lightItem \|\| source == lightButton)
1832	2260	{
1833	2261	makeSomething(new Light());
1834	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
1835	2280	if (source == csgItem)
1836	2281	{
1837	2282	group(new CSG());
..	..	@@ -1878,30 +2323,30 @@
1878	2323
1879	2324	group(g);
1880	2325	} else
1881		- if (source == loopItem)
	2326	+ if (source == loopItem \|\| source == loopButton)
1882	2327	{
1883	2328	Composite csg = new GroupLeaf();
1884	2329	csg.count = 5;
1885	2330	group(csg);
1886		- Composite child = new cGroup();
	2331	+ Composite child = new cGroup("Branch");
1887	2332	csg.addChild(child);
1888	2333	child.addChild(csg);
1889	2334	} else
1890	2335	if (source == doubleItem)
1891	2336	{
1892		- Composite csg = new GroupLeaf();
	2337	+ Composite csg = new GroupLeaf("Fork");
1893	2338	csg.count = 5;
1894	2339	group(csg);
1895		- Composite child = new cGroup();
	2340	+ Composite child = new cGroup("Branch A");
1896	2341	csg.addChild(child);
1897	2342	child.addChild(csg);
1898		- child = new cGroup();
	2343	+ child = new cGroup("Branch B");
1899	2344	csg.addChild(child);
1900	2345	child.addChild(csg);
1901	2346	} else
1902	2347	if (source == tripleItem)
1903	2348	{
1904		- Composite csg = new GroupLeaf();
	2349	+ Composite csg = new GroupLeaf("Trident");
1905	2350	csg.count = 4;
1906	2351	group(csg);
1907	2352	Composite child = new cGroup();
..	..	@@ -1917,7 +2362,7 @@
1917	2362	if (source == computeAOItem)
1918	2363	{
1919	2364	Globals.drawMode = CameraPane.OCCLUSION;
1920		- Globals.theRenderer.repaint();
	2365	+ cameraView.repaint();
1921	2366	} else
1922	2367	if (source == recompileItem)
1923	2368	{
..	..	@@ -1951,6 +2396,46 @@
1951	2396	{
1952	2397	DumpObject();
1953	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
1954	2439	if (source == oneStepButton)
1955	2440	{
1956	2441	Globals.ONESTEP = true;
..	..	@@ -1958,17 +2443,14 @@
1958	2443	} else
1959	2444	if (source == screenfitButton)
1960	2445	{
1961		- //Reload(lastConverter, lastFilename, true);
1962	2446	ScreenFit();
1963	2447	} else
1964	2448	if (source == screenfitpointButton)
1965	2449	{
1966		- //Reload(lastConverter, lastFilename, true);
1967	2450	ScreenFitPoint();
1968	2451	} else
1969	2452	if (source == snapobjectButton)
1970	2453	{
1971		- //Reload(lastConverter, lastFilename, true);
1972	2454	SnapObject();
1973	2455	} else
1974	2456	// if (event.getSource() == recompileButton)
..	..	@@ -2004,6 +2486,14 @@
2004	2486	if (source == cutItem \|\| source == clearButton)
2005	2487	{
2006	2488	loadClipboard(true);
	2489	+ } else
	2490	+ if (source == undoItem)
	2491	+ {
	2492	+ Undo();
	2493	+ } else
	2494	+ if (source == redoItem)
	2495	+ {
	2496	+ Redo();
2007	2497	} else
2008	2498	if (source == duplicateItem)
2009	2499	{
..	..	@@ -2324,7 +2814,7 @@
2324	2814	{
2325	2815	StepAll();
2326	2816	} else
2327		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	2817	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2328	2818	{
2329	2819	//int indices[] = jList.getSelectedIndices();
2330	2820	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2336,9 +2826,9 @@
2336	2826	{
2337	2827	ClearSelection(true);
2338	2828	} else
2339		- if (source == grabItem)
	2829	+ if (source == grabItem \|\| source == groupButton)
2340	2830	{
2341		- group(new cGroup(), true);
	2831	+ group(new cGroup(), false); // true);
2342	2832	} else
2343	2833	if (source == hideItem)
2344	2834	{
..	..	@@ -2356,11 +2846,11 @@
2356	2846	{
2357	2847	makeSomething(new Camera());
2358	2848	} else
2359		- if (source == compositeItem)
	2849	+ if (source == compositeItem \|\| source == compositeButton)
2360	2850	{
2361	2851	group(new Composite());
2362	2852	} else
2363		- if (source == randomItem)
	2853	+ if (source == switchItem \|\| source == switchButton)
2364	2854	{
2365	2855	RandomNode random = new RandomNode();
2366	2856	group(random);
..	..	@@ -2462,7 +2952,7 @@
2462	2952	{
2463	2953	group(new cLinker());
2464	2954	} else
2465		- if (source == textureItem)
	2955	+ if (source == textureItem \|\| source == textureButton)
2466	2956	{
2467	2957	group(new TextureNode());
2468	2958	} else
..	..	@@ -2482,17 +2972,30 @@
2482	2972	{
2483	2973	CastShadow(2);
2484	2974	} else
2485		- if (source == ungroupItem)
	2975	+ if (source == ungroupItem \|\| source == ungroupButton)
2486	2976	{
2487		- //ungroup();
	2977	+ boolean hasRoot = false;
	2978	+
2488	2979	for (int i=0; i<group.selection.size(); i++)
2489	2980	{
2490		- Ungroup(group.selection.get(i));
	2981	+ if (group.selection.get(i) == group)
	2982	+ {
	2983	+ hasRoot = true;
	2984	+ break;
	2985	+ }
2491	2986	}
2492	2987
2493		- ClearSelection(false);
2494		-
2495		- 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	+ }
2496	2999	} else
2497	3000	if (source == genUVItem)
2498	3001	{
..	..	@@ -2504,7 +3007,7 @@
2504	3007	} else
2505	3008	if (source == genNormalsMESHItem)
2506	3009	{
2507		- GenNormals(true); // TODO
	3010	+ GenNormalsMESH();
2508	3011	} else
2509	3012	if (source == genNormalsORGANItem)
2510	3013	{
..	..	@@ -2569,6 +3072,22 @@
2569	3072	if (source == unmarkleavesItem)
2570	3073	{
2571	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);
2572	3091	} else
2573	3092	if (source == flipVItem)
2574	3093	{
..	..	@@ -2777,7 +3296,7 @@
2777	3296	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2778	3297	{
2779	3298	obj = (Object3D)e.nextElement();
2780		- obj.SetBumpTexture(null);
	3299	+ obj.ResetBumpTexture();
2781	3300	}
2782	3301
2783	3302	refreshContents();
..	..	@@ -2793,6 +3312,31 @@
2793	3312
2794	3313	refreshContents();
2795	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
2796	3340	if (source == flashSelectionButton)
2797	3341	{
2798	3342	CameraPane.flash = true;
..	..	@@ -2804,6 +3348,10 @@
2804	3348	if (source == twoButton)
2805	3349	{
2806	3350	radio.layout = twoButton;
	3351	+
	3352	+ if (CameraPane.FULLSCREEN)
	3353	+ fullscreenLayout = radio.layout;
	3354	+
2807	3355	// bug
2808	3356	//gridPanel.setDividerLocation(1.0);
2809	3357	//bigPanel.setDividerLocation(0.0);
..	..	@@ -2836,10 +3384,31 @@
2836	3384	bigThree.ClearUI();
2837	3385	bigThree.add(centralPanel);
2838	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	+
2839	3405	} else
2840	3406	if (source == threeButton)
2841	3407	{
2842	3408	radio.layout = threeButton;
	3409	+
	3410	+ if (CameraPane.FULLSCREEN)
	3411	+ fullscreenLayout = radio.layout;
2843	3412
2844	3413	// bigThree.remove(scenePanel);
2845	3414	// bigThree.remove(centralPanel);
..	..	@@ -2869,13 +3438,18 @@
2869	3438	// centralPanel.setVisible(true);
2870	3439	// XYZPanel.setVisible(true);
2871	3440	bigThree.ClearUI();
	3441	+ bigThree.add(scenePanel);
2872	3442	bigThree.add(centralPanel);
2873		- bigThree.add(XYZPanel);
2874	3443	bigThree.FlushUI();
	3444	+
	3445	+ cameraView.requestFocusInWindow();
2875	3446	} else
2876	3447	if (source == fourButton)
2877	3448	{
2878	3449	radio.layout = fourButton;
	3450	+
	3451	+ if (CameraPane.FULLSCREEN)
	3452	+ fullscreenLayout = radio.layout;
2879	3453
2880	3454	// bigThree.remove(scenePanel);
2881	3455	// bigThree.remove(centralPanel);
..	..	@@ -2907,10 +3481,15 @@
2907	3481	bigThree.ClearUI();
2908	3482	bigThree.add(scenePanel);
2909	3483	bigThree.FlushUI();
	3484	+
	3485	+ cameraView.requestFocusInWindow();
2910	3486	} else
2911	3487	if (source == sixButton)
2912	3488	{
2913	3489	radio.layout = sixButton;
	3490	+
	3491	+ if (CameraPane.FULLSCREEN)
	3492	+ fullscreenLayout = radio.layout;
2914	3493
2915	3494	// bigThree.remove(scenePanel);
2916	3495	// bigThree.remove(centralPanel);
..	..	@@ -2940,13 +3519,18 @@
2940	3519	// centralPanel.setVisible(true);
2941	3520	// XYZPanel.setVisible(false);
2942	3521	bigThree.ClearUI();
2943		- bigThree.add(scenePanel);
2944	3522	bigThree.add(centralPanel);
	3523	+ bigThree.add(scenePanel);
2945	3524	bigThree.FlushUI();
	3525	+
	3526	+ cameraView.requestFocusInWindow();
2946	3527	} else
2947	3528	if (source == sevenButton)
2948	3529	{
2949	3530	radio.layout = sevenButton;
	3531	+
	3532	+ if (CameraPane.FULLSCREEN)
	3533	+ fullscreenLayout = radio.layout;
2950	3534
2951	3535	// bigThree.remove(scenePanel);
2952	3536	// bigThree.remove(centralPanel);
..	..	@@ -2980,6 +3564,8 @@
2980	3564	bigThree.add(centralPanel);
2981	3565	bigThree.add(XYZPanel);
2982	3566	bigThree.FlushUI();
	3567	+
	3568	+ cameraView.requestFocusInWindow();
2983	3569	} else
2984	3570	if (source == rootButton)
2985	3571	{
..	..	@@ -2991,6 +3577,7 @@
2991	3577	EditObject(obj);
2992	3578	}
2993	3579
	3580	+ cameraView.requestFocusInWindow();
2994	3581	refreshContents(true);
2995	3582	} else
2996	3583	if (source == closeButton)
..	..	@@ -3000,22 +3587,37 @@
3000	3587	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3001	3588	{
3002	3589	ab = (cRadio)e.nextElement();
3003		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3590	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
3004	3591	{
	3592	+ // Patch to avoid bug with transparency.
	3593	+ if (!ab.hadMaterial)
	3594	+ {
	3595	+ ab.object.material = null;
	3596	+ }
	3597	+
3005	3598	buttonGroup.remove(ab);
3006	3599	radioPanel.remove(ab);
3007	3600
3008		- ab.GetObject().editWindow = null;
	3601	+ //ab.GetObject().editWindow = null;
	3602	+ ab.GetObject().manipWindow = null;
3009	3603	// ab.GetObject().objectUI = null; // ?????????
3010	3604
3011	3605	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
3012	3606	break;
3013	3607	}
3014	3608	}
	3609	+
	3610	+ cameraView.requestFocusInWindow();
3015	3611	refreshContents(true);
3016	3612	} else
3017	3613	if (source == editItem \|\| source == editButton)
3018	3614	{
	3615	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3616	+ {
	3617	+ Object3D child = (Object3D)e.nextElement();
	3618	+ child.pinned = true;
	3619	+ }
	3620	+
3019	3621	EditSelection(false);
3020	3622	} else
3021	3623	if (source == uneditButton)
..	..	@@ -3025,10 +3627,11 @@
3025	3627	Object3D child = (Object3D)e.nextElement();
3026	3628	if(child.editWindow != null)
3027	3629	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3630	+ child.pinned = false;
3028	3631	child.CloseUI();
3029	3632	listUI.remove(child);
3030	3633
3031		- child.editWindow = null; // ???????????
	3634	+ //child.editWindow = null; // ???????????
3032	3635	}
3033	3636	objEditor.ctrlPanel.FlushUI();
3034	3637	//objEditor.jTree.clearSelection();
..	..	@@ -3041,6 +3644,7 @@
3041	3644	//copy.ClearUI();
3042	3645	for (Object3D obj : listUI)
3043	3646	{
	3647	+ obj.pinned = false;
3044	3648	obj.CloseUI();
3045	3649	}
3046	3650	listUI.clear();
..	..	@@ -3050,7 +3654,7 @@
3050	3654	{
3051	3655	assert(copy == group);
3052	3656
3053		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3657	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3054	3658
3055	3659	for (Object3D obj : listUI)
3056	3660	{
..	..	@@ -3099,6 +3703,9 @@
3099	3703	}
3100	3704
3101	3705	copy = group;
	3706	+
	3707	+ SetUndoStates();
	3708	+
3102	3709	//Globals.theRenderer.object = group;
3103	3710	if(!useclient)
3104	3711	{
..	..	@@ -3115,7 +3722,9 @@
3115	3722	sideView.object = group;
3116	3723	}
3117	3724
3118		-// fix "+" issue group.editWindow = this;
	3725	+// fix "+" issue
	3726	+ //group.editWindow = this;
	3727	+ group.manipWindow = this;
3119	3728
3120	3729	/*
3121	3730	currentLayout = radio.layout;
..	..	@@ -3123,18 +3732,27 @@
3123	3732	currentLayout = sevenButton;
3124	3733	*/
3125	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);
3126	3742	keepparent = group.parent;
3127	3743	// PARENT = NULL or not???
3128	3744	//group.parent = null; // ROOT
3129	3745	//group.attributes = -1;
3130	3746	ResetModel();
	3747	+
	3748	+ cameraView.requestFocusInWindow();
3131	3749	refreshContents(true);
3132	3750	} else if (event.getSource() == editCameraItem)
3133	3751	{
3134	3752	cameraView.ProtectCamera();
3135	3753	cameraView.repaint();
3136	3754	return;
3137		- } else if (event.getSource() == revertCameraItem)
	3755	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3138	3756	{
3139	3757	cameraView.RevertCamera();
3140	3758	cameraView.repaint();
..	..	@@ -3151,7 +3769,6 @@
3151	3769	}
3152	3770
3153	3771	boolean useclient = false;
3154		- cRadio radio;
3155	3772
3156	3773	void ToggleRoot()
3157	3774	{
..	..	@@ -3390,7 +4007,8 @@
3390	4007
3391	4008	int size = obj.MemorySize();
3392	4009
3393		- 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)");
3394	4012	}
3395	4013	}
3396	4014	catch (Exception e)
..	..	@@ -3471,6 +4089,13 @@
3471	4089	void GenNormals(boolean crease)
3472	4090	{
3473	4091	group.GenNormalsS(crease);
	4092	+
	4093	+ refreshContents();
	4094	+ }
	4095	+
	4096	+ void GenNormalsMESH()
	4097	+ {
	4098	+ group.GenNormalsMeshS();
3474	4099
3475	4100	refreshContents();
3476	4101	}
..	..	@@ -3706,7 +4331,7 @@
3706	4331
3707	4332	try
3708	4333	{
3709		- texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4334	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
3710	4335	}
3711	4336	catch (Exception e)
3712	4337	{
..	..	@@ -4098,6 +4723,18 @@
4098	4723	refreshContents();
4099	4724	}
4100	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	+
4101	4738	void SetTexRes(int tr)
4102	4739	{
4103	4740	group.selection.SetTexRes(tr);
..	..	@@ -4169,28 +4806,25 @@
4169	4806	// }
4170	4807	// }
4171	4808
4172		- static boolean allparams = true;
4173		-
4174		- static Vector<Object3D> listUI = new Vector<Object3D>();
4175		-
4176	4809	void EditSelection(boolean newWindow)
4177	4810	{
	4811	+ if (group.selection == null)
	4812	+ {
	4813	+ EditElement(group, newWindow); // ? new
	4814	+ return;
	4815	+ }
	4816	+
4178	4817	// aConstraints.gridy = 0;
4179	4818	for (int i=0; i<group.selection.size(); i++)
4180	4819	{
4181	4820	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4182	4821	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4183		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4822	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4184	4823
4185	4824	Object3D elem = (Object3D)group.selection.elementAt(i);
4186	4825	if(elem != group \|\| !newWindow)
4187	4826	{
4188		- // if (!(elem instanceof Composite))
4189		- // newWindow = false;
4190		- listUI.add(elem);
4191		- elem.openEditWindow(this, newWindow); //, false);
4192		- System.out.println("edit : " + elem);
4193		- elem.editWindow.refreshContents(true); // ? new
	4827	+ EditElement(elem, newWindow); // ? new
4194	4828	}
4195	4829	}
4196	4830	}
..	..	@@ -4265,7 +4899,8 @@
4265	4899	//new Exception().printStackTrace();
4266	4900
4267	4901	freezemodel = true;
4268		-
	4902	+ ClearUnpinned();
	4903	+
4269	4904	/**/
4270	4905	//switch (event.id)
4271	4906	{
..	..	@@ -4273,7 +4908,6 @@
4273	4908	//case 702: // Event.LIST_DESELECT
4274	4909	group.deselectAll();
4275	4910	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4276		- objEditor.ClearInfo(); // .GetMaterial());
4277	4911	if (tps != null)
4278	4912	{
4279	4913	for (int i=0; i < tps.length; i++)
..	..	@@ -4282,10 +4916,8 @@
4282	4916
4283	4917	//if (child.parent != null)
4284	4918	//child.parent.addSelectee(child);
	4919	+ objEditor.SetMaterial(child);
4285	4920	group.addSelectee(child);
4286		- objEditor.SetMaterial(child); // .GetMaterial());
4287		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4288		- System.err.println("info : " + child.GetPath());
4289	4921	}
4290	4922	}
4291	4923	// else
..	..	@@ -4295,20 +4927,28 @@
4295	4927	// System.err.println("info : " + group.GetPath());
4296	4928	// }
4297	4929
4298		- objEditor.SetText(); // jan 2014
4299		-
4300		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4930	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4301	4931	CameraPane.flash = true;
4302	4932
4303		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4933	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4304	4934	// a camera
4305	4935	{
4306		- CameraPane.camerachangeframe = 0; // don't refuse it
4307		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4936	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
	4937	+ {
	4938	+ CameraPane.camerachangeframe = 0; // don't refuse it
	4939	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4940	+ }
4308	4941	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4309	4942	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4310	4943	}
4311	4944
	4945	+ if (tps != null && tps.length == 1)
	4946	+ {
	4947	+ EditSelection(false);
	4948	+ }
	4949	+
	4950	+ SetPinStates(tps != null && tps.length > 0);
	4951	+
4312	4952	refreshContents();
4313	4953	//return true;
4314	4954	}
..	..	@@ -4317,6 +4957,35 @@
4317	4957
4318	4958	freezemodel = false;
4319	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	+ }
4320	4989
4321	4990	void linkSomething(Object3D thing)
4322	4991	{
..	..	@@ -4388,6 +5057,7 @@
4388	5057	{
4389	5058	if (group.selection.isEmpty())
4390	5059	return;
	5060	+
4391	5061	Grafreed.clipboardIsTempGroup = false;
4392	5062	Composite tGroup = null;
4393	5063	if (group.selection.size() > 0) // 1)
..	..	@@ -4398,6 +5068,8 @@
4398	5068
4399	5069	if (cut)
4400	5070	{
	5071	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5072	+// Save();
4401	5073	//int indices[] = jList.getSelectedIndices();
4402	5074	//for (int i = indices.length - 1; i >= 0; i--)
4403	5075	//jList.remove(indices[i]);
..	..	@@ -4487,8 +5159,10 @@
4487	5159	}
4488	5160
4489	5161	}
	5162	+
4490	5163	if (Grafreed.clipboardIsTempGroup)
4491	5164	Grafreed.clipboard = tGroup;
	5165	+
4492	5166	if (cut)
4493	5167	{
4494	5168	ResetModel();
..	..	@@ -4498,6 +5172,10 @@
4498	5172
4499	5173	void paste(boolean expand)
4500	5174	{
	5175	+ if (Globals.REPLACEONMAKE)
	5176	+ Save();
	5177	+ boolean keep = Globals.REPLACEONMAKE;
	5178	+ Globals.REPLACEONMAKE = false;
4501	5179	// if (GrafreeD.clipboard == null)
4502	5180	// return;
4503	5181	boolean first = true;
..	..	@@ -4557,6 +5235,7 @@
4557	5235	Grafreed.clipboard.get(0).parent = keepparent;
4558	5236	}
4559	5237
	5238	+ Globals.REPLACEONMAKE = keep;
4560	5239	ResetModel();
4561	5240	refreshContents();
4562	5241	}
..	..	@@ -4692,6 +5371,10 @@
4692	5371
4693	5372	void group(Object3D csg, boolean grab)
4694	5373	{
	5374	+ if (Globals.REPLACEONMAKE)
	5375	+ Save();
	5376	+ boolean keep = Globals.REPLACEONMAKE;
	5377	+ Globals.REPLACEONMAKE = false;
4695	5378	if (//false) // why??
4696	5379	!group.selection.isEmpty())
4697	5380	{
..	..	@@ -4805,10 +5488,15 @@
4805	5488	//node.add(csg);
4806	5489	//makeSomething(node);
4807	5490	makeSomething(csg);
	5491	+ Globals.REPLACEONMAKE = keep;
4808	5492	}
4809	5493
4810	5494	void Ungroup(Object3D g)
4811	5495	{
	5496	+ if (Globals.REPLACEONMAKE)
	5497	+ Save();
	5498	+ boolean keep = Globals.REPLACEONMAKE;
	5499	+ Globals.REPLACEONMAKE = false;
4812	5500	if (g instanceof HiddenObject)
4813	5501	{
4814	5502	HiddenObject h = (HiddenObject) g;
..	..	@@ -4825,6 +5513,7 @@
4825	5513	objEditor.makeSomething(g.get(i), false);
4826	5514	}
4827	5515	}
	5516	+ Globals.REPLACEONMAKE = keep;
4828	5517	}
4829	5518
4830	5519	void ungroup()
..	..	@@ -5113,7 +5802,44 @@
5113	5802	cButton clearpanelButton;
5114	5803	cButton unselectButton;
5115	5804
	5805	+ cButton restoreCameraButton;
	5806	+
	5807	+ cButton saveButton;
5116	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;
5117	5843
5118	5844	cButton screenfitButton;
5119	5845	cButton screenfitpointButton;
..	..	@@ -5126,14 +5852,6 @@
5126	5852
5127	5853	cButton setsupportButton;
5128	5854
5129		- cButton twoButton;
5130		- cButton sixButton;
5131		- cButton threeButton;
5132		- cButton sevenButton;
5133		- cButton fourButton; // full panel
5134		- cButton oneButton; // full XYZ
5135		- //cButton currentLayout;
5136		-
5137	5855	//
5138	5856	//Composite
5139	5857	Object3D // to do !!
..	..	@@ -5143,9 +5861,11 @@
5143	5861	//JTree jTree;
5144	5862	private MenuItem lookAtItem;
5145	5863	private MenuItem lookFromItem;
5146		- private MenuItem switchItem;
	5864	+ private MenuItem switchViewItem;
5147	5865	private MenuItem cutItem;
5148		- private MenuItem duplicateItem;
	5866	+ private MenuItem undoItem;
	5867	+ private MenuItem redoItem;
	5868	+ private JMenuItem duplicateItem;
5149	5869	private MenuItem cloneItem;
5150	5870	private MenuItem cloneSupportItem;
5151	5871	private MenuItem overwriteGeoItem;
..	..	@@ -5173,7 +5893,7 @@
5173	5893	private MenuItem pasteLinkItem;
5174	5894	private MenuItem pasteCloneItem;
5175	5895	private MenuItem pasteExpandItem;
5176		- private MenuItem clearItem;
	5896	+ private MenuItem deleteItem;
5177	5897	private MenuItem clearAllItem;
5178	5898	private MenuItem genUVItem;
5179	5899	private MenuItem genNormalsMESHItem;
..	..	@@ -5208,6 +5928,10 @@
5208	5928	private MenuItem showleavesItem;
5209	5929	private MenuItem markleavesItem;
5210	5930	private MenuItem unmarkleavesItem;
	5931	+ private MenuItem rewindleavesItem;
	5932	+ private MenuItem unrewindleavesItem;
	5933	+ private MenuItem randomleavesItem;
	5934	+ private MenuItem unrandomleavesItem;
5211	5935
5212	5936	private MenuItem flipVItem;
5213	5937	private MenuItem unflipVItem;
..	..	@@ -5229,7 +5953,7 @@
5229	5953	private MenuItem frontItem;
5230	5954	private MenuItem cameraItem;
5231	5955	private MenuItem compositeItem;
5232		- private MenuItem randomItem;
	5956	+ private MenuItem switchItem;
5233	5957	private MenuItem physicsItem;
5234	5958	private MenuItem frameselectorItem;
5235	5959	private MenuItem scriptNodeItem;
..	..	@@ -5253,6 +5977,8 @@
5253	5977	private MenuItem attachBumpItem;
5254	5978	private MenuItem detachBumpItem;
5255	5979	private MenuItem pigmentBumpItem;
	5980	+ private MenuItem embedTexturesItem;
	5981	+ private MenuItem deEmbedTexturesItem;
5256	5982
5257	5983	private MenuItem particleItem;
5258	5984	private MenuItem ragdollItem;
..	..	@@ -5303,5 +6029,5 @@
5303	6029
5304	6030	Menu cameraMenu;
5305	6031	MenuItem editCameraItem;
5306		- MenuItem revertCameraItem;
	6032	+ MenuItem restoreCameraItem;
5307	6033	}