~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -60,6 +60,12 @@
60	60	this.copy = this.group = group;
61	61	//selectees = this.group.selectees;
62	62
	63	+ if (copy.versions == null)
	64	+ {
	65	+ copy.versions = new byte[100][];
	66	+ copy.versionindex = -1;
	67	+ }
	68	+
63	69	if(ui)
64	70	SetupUI(objEditor);
65	71	}
..	..	@@ -74,16 +80,28 @@
74	80	this.copy = this.group = copy;
75	81	//selectees = this.group.selectees;
76	82
77		- SetupMenu2(objEditor);
	83	+ SetupMenu2(this); //objEditor);
78	84	SetupUI2(objEditor);
79	85	objEditor.SetupUI(true);
80	86	SetupViews(objEditor);
81	87
82	88	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
	89	+
	90	+ if (copy.versions == null)
	91	+ {
	92	+ copy.versions = new byte[100][];
	93	+ copy.versionindex = -1;
	94	+
	95	+ Save(true);
	96	+ }
83	97	}
84	98
85	99	void CloneSelection(boolean supports)
86	100	{
	101	+ if (Globals.REPLACEONMAKE)
	102	+ Save();
	103	+ boolean keep = Globals.REPLACEONMAKE;
	104	+ Globals.REPLACEONMAKE = false;
87	105	// Object3D keep = GrafreeD.clipboard;
88	106	//Object3D obj;
89	107	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -94,6 +112,7 @@
94	112
95	113	makeSomething(clone, i==group.selection.size()-1);
96	114	}
	115	+ Globals.REPLACEONMAKE = keep;
97	116	}
98	117
99	118	void CloneClipboard(boolean supports)
..	..	@@ -148,28 +167,21 @@
148	167
149	168	//JTextField nameField;
150	169
151		- void SetupMenu2(ObjEditor oe)
	170	+ void SetupMenu2(GroupEditor oe)
152	171	{
153		- if (Globals.ADVANCED)
154		- {
155		- oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
156		- //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
157		- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
158		- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
159		- oe.cameraMenu.add("-");
160		- openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
161		- openWindowItem.addActionListener(this);
162		- editLeafItem.addActionListener(this);
163		- lookAtItem.addActionListener(this);
164		- //lookFromItem.addActinoListener(this);
165		- //switchItem.addActionListener(this);
166		- }
167		-
	172	+ oe.jTree = new cTree();
	173	+
168	174	Menu menu;
169	175	oe.menuBar.add(menu = new Menu("Edit"));
170	176	//editItem = menu.add(new MenuItem("Edit"));
171	177	//editItem.addActionListener(this);
172		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	178	+
	179	+// undoItem = menu.add(new MenuItem("Undo"));
	180	+// undoItem.addActionListener(this);
	181	+// redoItem = menu.add(new MenuItem("Redo"));
	182	+// redoItem.addActionListener(this);
	183	+// menu.add("-");
	184	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
173	185	duplicateItem.addActionListener(this);
174	186	cloneItem = menu.add(new MenuItem("Clone"));
175	187	cloneItem.addActionListener(this);
..	..	@@ -185,7 +197,6 @@
185	197	copyItem.addActionListener(this);
186	198	pasteItem = menu.add(new MenuItem("Paste"));
187	199	pasteItem.addActionListener(this);
188		- menu.add("-");
189	200
190	201	menu.add("-");
191	202	pasteIntoItem = menu.add(new MenuItem("Paste into"));
..	..	@@ -197,8 +208,8 @@
197	208	// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
198	209	// pasteExpandItem.addActionListener(this);
199	210	menu.add("-");
200		- clearItem = menu.add(new MenuItem("Clear"));
201		- clearItem.addActionListener(this);
	211	+ deleteItem = menu.add(new MenuItem("Delete"));
	212	+ deleteItem.addActionListener(this);
202	213
203	214	if (Globals.ADVANCED)
204	215	{
..	..	@@ -206,7 +217,94 @@
206	217	clearAllItem = menu.add(new MenuItem("Clear All"));
207	218	clearAllItem.addActionListener(this);
208	219	}
	220	+
	221	+ menuBar.add(cameraMenu = new Menu("View"));
	222	+ //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
	223	+ //zBufferItem.addActionListener(this);
	224	+ //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
	225	+ //normalLensItem.addActionListener(this);
	226	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	227	+ restoreCameraItem.addActionListener(this);
	228	+
	229	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	230	+// toggleFullScreenItem.addItemListener(this);
	231	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	232	+// cameraMenu.add("-");
	233	+//
	234	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	235	+// toggleTextureItem.addItemListener(this);
	236	+// toggleTextureItem.setState(CameraPane.textureon);
	237	+//
	238	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	239	+// toggleSwitchItem.addItemListener(this);
	240	+// toggleSwitchItem.setState(CameraPane.SWITCH);
	241	+
	242	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
	243	+ toggleHandleItem.addItemListener(this);
	244	+ toggleHandleItem.setState(CameraPane.HANDLES);
	245	+
	246	+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
	247	+ togglePaintItem.addItemListener(this);
	248	+ togglePaintItem.setState(CameraPane.PAINTMODE);
	249	+
	250	+ if (Globals.ADVANCED)
	251	+ {
	252	+ cameraMenu.add("-");
	253	+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
	254	+ toggleLiveItem.addItemListener(this);
	255	+ toggleLiveItem.setState(Globals.isLIVE());
209	256
	257	+ cameraMenu.add(stepItem = new MenuItem("Step"));
	258	+ stepItem.addActionListener(this);
	259	+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
	260	+ // toggleDLItem.addItemListener(this);
	261	+ // toggleDLItem.setState(false);
	262	+
	263	+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
	264	+ toggleRenderItem.addItemListener(this);
	265	+ toggleRenderItem.setState(!CameraPane.frozen);
	266	+
	267	+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
	268	+ toggleDebugItem.addItemListener(this);
	269	+ toggleDebugItem.setState(Globals.DEBUG);
	270	+
	271	+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
	272	+ toggleFrustumItem.addItemListener(this);
	273	+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
	274	+
	275	+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
	276	+ toggleFootContactItem.addItemListener(this);
	277	+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
	278	+
	279	+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
	280	+ toggleTimelineItem.addItemListener(this);
	281	+ }
	282	+
	283	+// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
	284	+// toggleRootItem.addItemListener(this);
	285	+// toggleRootItem.setState(false);
	286	+// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
	287	+// animationItem.addItemListener(this);
	288	+// animationItem.setState(CameraPane.ANIMATION);
	289	+ cameraMenu.add("-");
	290	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
	291	+ editCameraItem.addActionListener(this);
	292	+
	293	+ if (Globals.ADVANCED)
	294	+ {
	295	+ oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
	296	+ //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
	297	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
	298	+ editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
	299	+ oe.cameraMenu.add("-");
	300	+ openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
	301	+ openWindowItem.addActionListener(this);
	302	+ editLeafItem.addActionListener(this);
	303	+ lookAtItem.addActionListener(this);
	304	+ //lookFromItem.addActinoListener(this);
	305	+ //switchViewItem.addActionListener(this);
	306	+ }
	307	+
210	308	oe.menuBar.add(menu = new Menu("Setting"));
211	309	if (Globals.ADVANCED)
212	310	{
..	..	@@ -249,21 +347,29 @@
249	347	}
250	348
251	349	oe.menuBar.add(menu = new Menu("Group"));
252		- grabItem = menu.add(new MenuItem("Grab"));
253		- grabItem.addActionListener(this);
	350	+// grabItem = menu.add(new MenuItem("Grab"));
	351	+// grabItem.addActionListener(this);
254	352	backItem = menu.add(new MenuItem("Back"));
255	353	backItem.addActionListener(this);
256	354	frontItem = menu.add(new MenuItem("Front"));
257	355	frontItem.addActionListener(this);
258		- compositeItem = menu.add(new MenuItem("Composite"));
259		- compositeItem.addActionListener(this);
	356	+// compositeItem = menu.add(new MenuItem("Composite"));
	357	+// compositeItem.addActionListener(this);
	358	+
	359	+ if (Globals.ADVANCED)
	360	+ {
260	361	hideItem = menu.add(new MenuItem("Hidden Group"));
261	362	hideItem.addActionListener(this);
	363	+ }
262	364	ungroupItem = menu.add(new MenuItem("Ungroup"));
263	365	ungroupItem.addActionListener(this);
264		- menu.add("-");
265		- randomItem = menu.add(new MenuItem("Switch node"));
266		- randomItem.addActionListener(this);
	366	+
	367	+// menu.add("-");
	368	+//
	369	+// switchItem = menu.add(new MenuItem("Switch node"));
	370	+// switchItem.addActionListener(this);
	371	+ if (Globals.ADVANCED)
	372	+ {
267	373	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
268	374	switchGeoItem.addActionListener(this);
269	375	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
..	..	@@ -271,8 +377,6 @@
271	377	morphItem = menu.add(new MenuItem("Morph Group"));
272	378	morphItem.addActionListener(this);
273	379
274		- if (Globals.ADVANCED)
275		- {
276	380	menu.add("-");
277	381	physicsItem = menu.add(new MenuItem("Physics"));
278	382	physicsItem.addActionListener(this);
..	..	@@ -280,30 +384,29 @@
280	384	frameselectorItem.addActionListener(this);
281	385	scriptNodeItem = menu.add(new MenuItem("Script Node"));
282	386	scriptNodeItem.addActionListener(this);
283		- cameraItem = menu.add(new MenuItem("Camera"));
284		- cameraItem.addActionListener(this);
285	387	}
286	388
287	389	oe.menuBar.add(menu = new Menu("Object"));
288		- textureItem = menu.add(new MenuItem("Texture"));
289		- textureItem.addActionListener(this);
	390	+// textureItem = menu.add(new MenuItem("Texture"));
	391	+// textureItem.addActionListener(this);
290	392	billboardItem = menu.add(new MenuItem("Billboard"));
291	393	billboardItem.addActionListener(this);
292	394	csgItem = menu.add(new MenuItem("CSG"));
293	395	csgItem.addActionListener(this);
294		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	396	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
295	397	shadowXItem.addActionListener(this);
296		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	398	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
297	399	shadowYItem.addActionListener(this);
298		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	400	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
299	401	shadowZItem.addActionListener(this);
	402	+ attributeItem = menu.add(new MenuItem("Attribute"));
	403	+ attributeItem.addActionListener(this);
	404	+
300	405	if (Globals.ADVANCED)
301	406	{
302	407	menu.add("-");
303	408	linkerItem = menu.add(new MenuItem("Linker"));
304	409	linkerItem.addActionListener(this);
305		- attributeItem = menu.add(new MenuItem("Attribute"));
306		- attributeItem.addActionListener(this);
307	410	templateItem = menu.add(new MenuItem("Template"));
308	411	templateItem.addActionListener(this);
309	412	pointflowItem = menu.add(new MenuItem("Point Flow"));
..	..	@@ -332,7 +435,7 @@
332	435	genNormalsMESHItem.addActionListener(this);
333	436	if (Globals.ADVANCED)
334	437	{
335		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	438	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
336	439	genNormalsMINEItem.addActionListener(this);
337	440	}
338	441	stripifyItem = menu.add(new MenuItem("Stripify"));
..	..	@@ -392,6 +495,14 @@
392	495	markleavesItem.addActionListener(this);
393	496	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
394	497	unmarkleavesItem.addActionListener(this);
	498	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	499	+ rewindleavesItem.addActionListener(this);
	500	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	501	+ unrewindleavesItem.addActionListener(this);
	502	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	503	+ randomleavesItem.addActionListener(this);
	504	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	505	+ unrandomleavesItem.addActionListener(this);
395	506	menu.add("-");
396	507	flipVItem = menu.add(new MenuItem("Flip V"));
397	508	flipVItem.addActionListener(this);
..	..	@@ -417,10 +528,15 @@
417	528	attachBumpItem.addActionListener(this);
418	529	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
419	530	pigmentBumpItem.addActionListener(this);
	531	+ //embedTexturesItem
420	532	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
421	533	detachPigmentItem.addActionListener(this);
422	534	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
423	535	detachBumpItem.addActionListener(this);
	536	+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
	537	+ embedTexturesItem.addActionListener(this);
	538	+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
	539	+ deEmbedTexturesItem.addActionListener(this);
424	540	menu.add("-");
425	541	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
426	542	sortbysizeItem.addActionListener(this);
..	..	@@ -443,25 +559,25 @@
443	559	oe.menuBar.add(menu = new Menu("Insert"));
444	560	buildCreateMenu(menu);
445	561
446		- oe.menuBar.add(menu = new Menu("Include"));
447		- importOBJItem = menu.add(new MenuItem("OBJ file..."));
448		- importOBJItem.addActionListener(this);
449		- menu.add("-");
450		- import3DSItem = menu.add(new MenuItem("3DS file..."));
451		- import3DSItem.addActionListener(this);
452		- menu.add("-");
453		- importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
454		- importVRMLX3DItem.addActionListener(this);
455		- menu.add("-");
456		- importGFDItem = menu.add(new MenuItem("GrafreeD file..."));
457		- importGFDItem.addActionListener(this);
458		-
459	562	oe.menuBar.add(menu = new Menu("Tools"));
460	563	buildToolsMenu(menu);
461	564	}
462	565
	566	+
463	567	void SetupUI2(ObjEditor oe)
464	568	{
	569	+ // June 2019
	570	+ if (oe == null)
	571	+ {
	572	+ //super.SetupUI2(this);
	573	+ //return;
	574	+ }
	575	+
	576	+ if (copy != group)
	577	+ {
	578	+ //super.SetupUI2(this);
	579	+ }
	580	+
465	581	//new Exception().printStackTrace();
466	582
467	583	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -490,27 +606,79 @@
490	606	oe.radioPanel.add(dummyButton);
491	607	oe.buttonGroup.add(dummyButton);
492	608	*/
	609	+ cGridBag copyOptionsPanel = new cGridBag();
	610	+
	611	+ copyOptionsPanel.preferredHeight = 1;
	612	+
493	613	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
494	614
495		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
	615	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	616	+ //minButton.setToolTipText("Minimize window");
	617	+ //minButton.addActionListener(this);
	618	+
	619	+ if (Globals.ADVANCED)
	620	+ {
	621	+ oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	622	+ maxButton.setToolTipText("Maximize window");
	623	+ maxButton.addActionListener(this);
	624	+ }
	625	+
	626	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	627	+ fullButton.setToolTipText("Full-screen window");
	628	+ fullButton.addActionListener(this);
	629	+
	630	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	631	+ screenfitButton.setToolTipText("Screen fit");
	632	+ screenfitButton.addActionListener(this);
	633	+
	634	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	635	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	636	+ restoreCameraButton.addActionListener(this);
	637	+
	638	+ copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	639	+ saveButton.setToolTipText("New version");
	640	+ saveButton.addActionListener(this);
	641	+
	642	+ copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	643	+ undoButton.setToolTipText("Previous version");
	644	+ undoButton.addActionListener(this);
	645	+ undoButton.setEnabled(false);
	646	+
	647	+ cGridBag updown = new cGridBag().setVertical(true);
	648	+ updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	649	+ restoreButton.setToolTipText("Restore current");
	650	+ restoreButton.addActionListener(this);
	651	+ restoreButton.setEnabled(false);
	652	+
	653	+ updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	654	+ replaceButton.setToolTipText("Replace current");
	655	+ replaceButton.addActionListener(this);
	656	+ replaceButton.setEnabled(false);
	657	+
	658	+ copyOptionsPanel.add(updown);
	659	+
	660	+ copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	661	+ redoButton.setToolTipText("Next version");
	662	+ redoButton.addActionListener(this);
	663	+ redoButton.setEnabled(false);
	664	+
	665	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
496	666	liveCB.setToolTipText("Enable animation");
497	667	liveCB.addItemListener(this);
498	668
499		- oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	669	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
500	670	oneStepButton.setToolTipText("Animate one step forward");
501	671	oneStepButton.addActionListener(this);
502	672
503		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	673	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
504	674	fastCB.setToolTipText("Fast mode");
505	675	fastCB.addItemListener(this);
506	676
507		- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
508		- trackCB.setToolTipText("Enable tracking");
509		- trackCB.addItemListener(this);
510		-
511		- oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
512		- screenfitButton.setToolTipText("Screen fit");
513		- screenfitButton.addActionListener(this);
	677	+ //oe.toolboxPanel.Return();
	678	+
	679	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	680	+// trackCB.setToolTipText("Enable tracking");
	681	+// trackCB.addItemListener(this);
514	682
515	683	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
516	684	// screenfitpointButton.addActionListener(this);
..	..	@@ -522,65 +690,146 @@
522	690	snapobjectButton.setToolTipText("Snap Object");
523	691	}
524	692
525		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
526		- flashSelectionButton.setToolTipText("Show selection");
527		- flashSelectionButton.addActionListener(this);
	693	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
528	694
529		- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
530		-
531		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
532		- twoButton.setToolTipText("Show center view only");
533		- twoButton.addActionListener(this);
534		- oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	695	+ oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
535	696	fourButton.addActionListener(this);
536	697	fourButton.setToolTipText("Show left panel only");
537		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
538		- sixButton.setToolTipText("2-column layout left");
	698	+
	699	+ oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	700	+ twoButton.setToolTipText("Show right view only");
	701	+ twoButton.addActionListener(this);
	702	+ this.fullscreenLayout = twoButton;
	703	+
	704	+ oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	705	+ sixButton.setToolTipText("Show left and right");
539	706	sixButton.addActionListener(this);
540		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
541		- threeButton.setToolTipText("2-column layout right");
542		- threeButton.addActionListener(this);
543		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
544		- sevenButton.setToolTipText("3-column layout");
545		- sevenButton.addActionListener(this);
	707	+// oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	708	+// threeButton.setToolTipText("2-column layout right");
	709	+// threeButton.addActionListener(this);
	710	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	711	+// sevenButton.setToolTipText("3-column layout");
	712	+// sevenButton.addActionListener(this);
546	713	//
547	714
548		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
549		- rootButton.setToolTipText("Edit selection in new tab");
	715	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	716	+ rootButton.setToolTipText("Open selection in new tab");
550	717	rootButton.addActionListener(this);
551	718
552		- oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	719	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
553	720	closeButton.setToolTipText("Close tab");
554	721	closeButton.addActionListener(this);
555	722	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
556	723	//clearButton.addActionListener(this);
557		-
558		- cGridBag commandsPanel = new cGridBag();
	724	+
	725	+ // INSERT
	726	+ oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	727	+ gridButton.setToolTipText("Create grid");
	728	+ gridButton.addActionListener(this);
	729	+
	730	+ oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	731	+ boxButton.setToolTipText("Create box");
	732	+ boxButton.addActionListener(this);
	733	+
	734	+ oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	735	+ sphereButton.setToolTipText("Create sphere");
	736	+ sphereButton.addActionListener(this);
	737	+
	738	+ oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	739	+ coneButton.setToolTipText("Create cone");
	740	+ coneButton.addActionListener(this);
	741	+
	742	+ oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	743	+ torusButton.setToolTipText("Create torus");
	744	+ torusButton.addActionListener(this);
	745	+
	746	+ oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	747	+ superButton.setToolTipText("Create superellipsoid");
	748	+ superButton.addActionListener(this);
	749	+
	750	+ if (Globals.ADVANCED)
	751	+ {
	752	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	753	+ kleinButton.setToolTipText("Create Klein bottle");
	754	+ kleinButton.addActionListener(this);
	755	+ }
559	756
560		- commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
561		- editButton.setToolTipText("Edit selection");
	757	+ oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	758	+ particlesButton.setToolTipText("Create particle system");
	759	+ particlesButton.addActionListener(this);
	760	+
	761	+ oe.toolboxPanel.Return();
	762	+
	763	+ oe.toolboxPanel.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	764	+ groupButton.setToolTipText("Create group");
	765	+ groupButton.addActionListener(this);
	766	+
	767	+ oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	768	+ compositeButton.setToolTipText("Create composite");
	769	+ compositeButton.addActionListener(this);
	770	+
	771	+ oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	772	+ switchButton.setToolTipText("Create item switcher");
	773	+ switchButton.addActionListener(this);
	774	+
	775	+ oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	776	+ loopButton.setToolTipText("Create loop");
	777	+ loopButton.addActionListener(this);
	778	+
	779	+ oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	780	+ textureButton.setToolTipText("Create texture");
	781	+ textureButton.addActionListener(this);
	782	+
	783	+ oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	784	+ overlayButton.setToolTipText("Create overlay");
	785	+ overlayButton.addActionListener(this);
	786	+
	787	+ oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	788	+ lightButton.setToolTipText("Create light");
	789	+ lightButton.addActionListener(this);
	790	+
	791	+ for (int i=6; --i>=0;)
	792	+ {
	793	+ oe.toolboxPanel.Return();
	794	+ oe.toolboxPanel.add(new cGridBag());
	795	+ oe.toolboxPanel.add(new cGridBag());
	796	+ oe.toolboxPanel.add(new cGridBag());
	797	+ oe.toolboxPanel.add(new cGridBag());
	798	+ oe.toolboxPanel.add(new cGridBag());
	799	+ oe.toolboxPanel.add(new cGridBag());
	800	+ oe.toolboxPanel.add(new cGridBag());
	801	+ }
	802	+
	803	+ // EDIT panel
	804	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	805	+ editButton.setToolTipText("Pin selection controls");
562	806	editButton.addActionListener(this);
563	807
564		- commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
565		- uneditButton.setToolTipText("Unedit selection");
	808	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	809	+ uneditButton.setToolTipText("Remove selection controls");
566	810	uneditButton.addActionListener(this);
567	811
568		- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
569		- allParamsButton.setToolTipText("Edit all params");
	812	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	813	+ allParamsButton.setToolTipText("Show all controle");
570	814	allParamsButton.addActionListener(this);
571	815
572		- commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	816	+ editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
573	817	clearPanelButton.setToolTipText("Clear edit panel");
574	818	clearPanelButton.addActionListener(this);
575	819
576		- commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	820	+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
577	821	unselectButton.setToolTipText("Unselect");
578	822	unselectButton.addActionListener(this);
579	823
580		- commandsPanel.preferredHeight = 1;
	824	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	825	+ flashSelectionButton.setToolTipText("Highlight selection");
	826	+ flashSelectionButton.addActionListener(this);
581	827
582		- oe.treePanel.add(commandsPanel);
583		- oe.treePanel.Return();
	828	+ editCommandsPanel.preferredHeight = 1;
	829	+
	830	+ SetPinStates(false);
	831	+// oe.treePanel.add(commandsPanel);
	832	+// oe.treePanel.Return();
584	833
585	834	// oe.aConstraints.gridx += 1;
586	835	// oe.aConstraints.weighty = 0;
..	..	@@ -597,29 +846,17 @@
597	846
598	847	JScrollPane jSP;
599	848	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
600		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	849	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
601	850	ResetModel();
602	851
603	852	oe.treePanel.add(jSPPanel);
604	853	oe.treePanel.Return();
605	854
606		- cGridBag copyOptionsPanel = new cGridBag();
607		-
608		- copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
609		- colorCB.setToolTipText("Copy color when dropped");
610		- colorCB.addItemListener(this);
611		-
612		- copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
613		- materialCB.setToolTipText("Copy material when dropped");
614		- materialCB.addItemListener(this);
615		-
616		- copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
617		- textureCB.setToolTipText("Copy texture when dropped");
618		- textureCB.addItemListener(this);
619		-
620		- copyOptionsPanel.preferredHeight = 1;
621	855	oe.treePanel.add(copyOptionsPanel);
622	856	oe.treePanel.Return();
	857	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	858	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	859	+ sliderPane.preferredHeight = 1;
623	860
624	861	// mainPanel.setDividerLocation(0.5); //1.0);
625	862	// mainPanel.setResizeWeight(0.5);
..	..	@@ -642,29 +879,49 @@
642	879	dgr.addDragGestureListener(this);
643	880	}catch(Exception e) {}
644	881	*/
645		- radio.layout = sevenButton;
	882	+ radio.layout = sixButton; // sevenButton;
646	883	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
647	884	}
648	885
649	886	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
650	887	{
	888	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	889	+ colorCB.setToolTipText("Copy color when dropped");
	890	+ colorCB.addItemListener(this);
	891	+
	892	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	893	+ materialCB.setToolTipText("Copy material when dropped");
	894	+ materialCB.addItemListener(this);
	895	+
	896	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	897	+ textureCB.setToolTipText("Copy texture when dropped");
	898	+ textureCB.addItemListener(this);
	899	+
	900	+ panel.Return();
	901	+
651	902	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
652	903	boxCB.setToolTipText("Display bounding boxes");
653	904	boxCB.addItemListener(this);
654	905
655	906	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
656		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	907	+ zoomBoxCB.setToolTipText("Display only for wheel");
657	908	zoomBoxCB.addItemListener(this);
658	909
659	910	if (true) // Globals.ADVANCED)
660	911	{
661		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
662		- supportCB.setToolTipText("Enable rigging");
663		- supportCB.addItemListener(this);
	912	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	913	+// supportCB.setToolTipText("Enable rigging");
	914	+// supportCB.addItemListener(this);
	915	+
	916	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	917	+ freezeCB.setToolTipText("Fast moving camera");
	918	+ freezeCB.addItemListener(this);
664	919
665	920	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
666	921	// localCB.addItemListener(this);
667	922
	923	+ panel.Return();
	924	+
668	925	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
669	926	crowdCB.setToolTipText("Used for crowds");
670	927	crowdCB.addItemListener(this);
..	..	@@ -681,6 +938,8 @@
681	938	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
682	939	// speakerMocapCB.addItemListener(this);
683	940
	941	+ panel.Return();
	942	+
684	943	if (false)
685	944	{
686	945	// handled in scripts
..	..	@@ -695,34 +954,74 @@
695	954	//constraints.gridy += 1;
696	955	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
697	956	smoothfocusCB.addItemListener(this);
	957	+ panel.Return();
698	958	}
699	959
700	960	//constraints.gridx += 1;
701	961	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
702	962	// debugCB.addItemListener(this);
703	963
	964	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	965	+ trackCB.setToolTipText("Enable tracking target");
	966	+ trackCB.addItemListener(this);
	967	+
704	968	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	969	+ oeilCB.setToolTipText("Move camera when tracking");
705	970	oeilCB.addItemListener(this);
706	971
	972	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	973	+ shadowCB.setToolTipText("When live compute shadows");
	974	+ shadowCB.addItemListener(this);
	975	+
	976	+ panel.Return();
	977	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	978	+ toggleTextureCB.setToolTipText("Load textures");
	979	+ toggleTextureCB.addItemListener(this);
	980	+
	981	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	982	+ toggleSwitchCB.setToolTipText("Choose a single item");
	983	+ toggleSwitchCB.addItemListener(this);
	984	+
	985	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	986	+ autokeepCB.setToolTipText("On structure change");
	987	+ autokeepCB.addItemListener(this);
	988	+
	989	+ panel.Return();
	990	+ if (Globals.ADVANCED)
	991	+ {
707	992	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
708	993	lookAtCB.setToolTipText("Look-at target");
709	994	lookAtCB.addItemListener(this);
	995	+ }
710	996
711	997	}
712	998
713	999	cGridBag fill = new cGridBag();
714		-
715	1000	fill.preferredHeight = 200;
	1001	+ cGridBag fill2 = new cGridBag();
	1002	+ fill2.preferredHeight = 200;
	1003	+ cGridBag fill3 = new cGridBag();
	1004	+ fill3.preferredHeight = 200;
716	1005
717	1006	panel.add(fill);
	1007	+ panel.add(fill2);
	1008	+ panel.add(fill3);
718	1009
719	1010	}
720	1011
721	1012	void EditObject(Object3D obj)
722	1013	{
723	1014	cRadio radioButton = new cRadio(obj.name);
	1015	+
	1016	+ // June 2019. Patch to avoid bug with transparency.
	1017	+ radioButton.hadMaterial = obj.material != null;
	1018	+ if (!radioButton.hadMaterial)
	1019	+ {
	1020	+ obj.material = new cMaterial();
	1021	+ }
	1022	+
724	1023	radioButton.SetObject(obj);
725		- radioButton.layout = sevenButton;
	1024	+ radioButton.layout = sixButton; // sevenButton;
726	1025	radioButton.SetCamera(cameraView.renderCamera, false);
727	1026	radioButton.addActionListener(this);
728	1027	radioPanel.add(radioButton);
..	..	@@ -732,6 +1031,8 @@
732	1031
733	1032	void SetupViews(ObjEditor oe)
734	1033	{
	1034	+ theFrame = this;
	1035	+
735	1036	oe.SetupViews();
736	1037
737	1038	System.out.println("SetupViews");
..	..	@@ -740,23 +1041,28 @@
740	1041	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
741	1042	}
742	1043
743		- JCheckBox liveCB;
744		- JCheckBox supportCB;
745		- JCheckBox localCB;
746		- JCheckBox crowdCB;
747		- JCheckBox smoothCB;
748		- JCheckBox fastCB;
749		- JCheckBox slowCB;
750		- JCheckBox boxCB;
751		- JCheckBox zoomBoxCB;
752		- JCheckBox trackCB;
753		- JCheckBox smoothfocusCB;
	1044	+ cToggleButton liveCB;
	1045	+ cCheckBox supportCB;
	1046	+ cCheckBox localCB;
	1047	+ cCheckBox crowdCB;
	1048	+ cCheckBox smoothCB;
	1049	+ cToggleButton fastCB;
	1050	+ cCheckBox slowCB;
	1051	+ cCheckBox boxCB;
	1052	+ cCheckBox zoomBoxCB;
	1053	+ cCheckBox freezeCB;
	1054	+ //cToggleButton trackCB;
	1055	+ cCheckBox trackCB;
	1056	+ cCheckBox smoothfocusCB;
754	1057	// JCheckBox speakerMocapCB;
755		- JCheckBox speakerCameraCB;
756		- JCheckBox speakerFocusCB;
757		- JCheckBox debugCB;
758		- JCheckBox oeilCB;
759		- JCheckBox lookAtCB;
	1058	+ cCheckBox speakerCameraCB;
	1059	+ cCheckBox speakerFocusCB;
	1060	+ cCheckBox debugCB;
	1061	+
	1062	+ cCheckBox oeilCB;
	1063	+ cCheckBox shadowCB;
	1064	+ cCheckBox autokeepCB;
	1065	+ cCheckBox lookAtCB;
760	1066
761	1067	// static int COLOR = 1;
762	1068	// static int MATERIAL = 2;
..	..	@@ -764,9 +1070,9 @@
764	1070
765	1071	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
766	1072
767		- JCheckBox colorCB;
768		- JCheckBox materialCB;
769		- JCheckBox textureCB;
	1073	+ cCheckBox colorCB;
	1074	+ cCheckBox materialCB;
	1075	+ cCheckBox textureCB;
770	1076
771	1077	public void itemStateChanged(ItemEvent e)
772	1078	{
..	..	@@ -794,6 +1100,7 @@
794	1100	} else if(e.getSource() == liveCB)
795	1101	{
796	1102	cameraView.ToggleLive();
	1103	+ refreshContents(false);
797	1104	}
798	1105	else if(e.getSource() == supportCB)
799	1106	{
..	..	@@ -858,6 +1165,18 @@
858	1165	{
859	1166	cameraView.ToggleOeil();
860	1167	}
	1168	+ else if(e.getSource() == shadowCB)
	1169	+ {
	1170	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1171	+ }
	1172	+ else if(e.getSource() == freezeCB)
	1173	+ {
	1174	+ Globals.FREEZEONMOVE ^= true;
	1175	+ }
	1176	+ else if(e.getSource() == autokeepCB)
	1177	+ {
	1178	+ Globals.REPLACEONMAKE ^= true;
	1179	+ }
861	1180	else if(e.getSource() == lookAtCB)
862	1181	{
863	1182	cameraView.ToggleLookAt();
..	..	@@ -874,7 +1193,8 @@
874	1193
875	1194	/**/
876	1195	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
877		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1196	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1197	+ TreePath path = objEditor.jTree.getSelectionPath();
878	1198	if ((path == null) \|\| (path.getPathCount() <= 1)) {
879	1199	// We can't move the root node or an empty selection
880	1200	return;
..	..	@@ -937,8 +1257,6 @@
937	1257	}
938	1258	}
939	1259
940		- String string = (String) object;
941		-
942	1260	System.out.println("Transfer = " + object + "; drop : " + target);
943	1261	// if( object instanceof java.io.File[])
944	1262	// {
..	..	@@ -946,6 +1264,8 @@
946	1264	// objEditor.DropFile((java.io.File[]) object, true);
947	1265	// return;
948	1266	// }
	1267	+
	1268	+ String string = object.toString();
949	1269
950	1270	// File path for Mac and Windows
951	1271	if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
..	..	@@ -991,23 +1311,33 @@
991	1311
992	1312	assert target == objEditor.jTree;
993	1313	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1314	+ Object3D destinationLeaf;
994	1315	try {
995		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1316	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
996	1317	} catch (Exception e) {
997	1318	System.out.println("destinationPath : " + destinationPath);
998	1319	return;
999	1320	}
1000	1321
1001		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1322	+ for (int i=group.selection.size(); --i>=0;)
1002	1323	{
	1324	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1325	+
	1326	+ // Cannot move into itself
	1327	+ if (child == destinationLeaf)
	1328	+ return;
	1329	+ }
	1330	+
	1331	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1332	+// {
1003	1333	loadClipboard(true);
1004	1334	objEditor.jTree.setSelectionPath(destinationPath);
1005	1335	pasteInto(false, false);
1006		- } else {
1007		- loadClipboard(false);
1008		- objEditor.jTree.setSelectionPath(destinationPath);
1009		- pasteInto(false, false); // true); // ???
1010		- }
	1336	+// } else {
	1337	+// loadClipboard(false);
	1338	+// objEditor.jTree.setSelectionPath(destinationPath);
	1339	+// pasteInto(false, false); // true); // ???
	1340	+// }
1011	1341	}
1012	1342	public void dropActionChanged(DropTargetDragEvent dtde)
1013	1343	// Called if the user has modified the current drop gesture
..	..	@@ -1112,22 +1442,30 @@
1112	1442	{
1113	1443	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1114	1444	//heightFieldItem.addActionListener(this);
1115		- gridItem = menu.add(new MenuItem("Grid"));
1116		- gridItem.addActionListener(this);
1117		- rectoidItem = menu.add(new MenuItem("Box"));
1118		- rectoidItem.addActionListener(this);
1119		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1120		- ellipsoidItem.addActionListener(this);
1121		- coneItem = menu.add(new MenuItem("Cone"));
1122		- coneItem.addActionListener(this);
1123		- torusItem = menu.add(new MenuItem("Torus"));
1124		- torusItem.addActionListener(this);
1125		- superItem = menu.add(new MenuItem("Superellipsoid"));
1126		- superItem.addActionListener(this);
	1445	+// gridItem = menu.add(new MenuItem("Grid"));
	1446	+// gridItem.addActionListener(this);
	1447	+// rectoidItem = menu.add(new MenuItem("Box"));
	1448	+// rectoidItem.addActionListener(this);
	1449	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1450	+// ellipsoidItem.addActionListener(this);
	1451	+// coneItem = menu.add(new MenuItem("Cone"));
	1452	+// coneItem.addActionListener(this);
	1453	+// torusItem = menu.add(new MenuItem("Torus"));
	1454	+// torusItem.addActionListener(this);
	1455	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1456	+// superItem.addActionListener(this);
	1457	+
	1458	+ cameraItem = menu.add(new MenuItem("Camera"));
	1459	+ cameraItem.addActionListener(this);
	1460	+
	1461	+ if (!Globals.ADVANCED)
	1462	+ {
1127	1463	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1128	1464	kleinItem.addActionListener(this);
1129		- particleItem = menu.add(new MenuItem("Particle system"));
1130		- particleItem.addActionListener(this);
	1465	+ }
	1466	+
	1467	+// particleItem = menu.add(new MenuItem("Particle system"));
	1468	+// particleItem.addActionListener(this);
1131	1469	if (Globals.ADVANCED)
1132	1470	{
1133	1471	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1153,15 +1491,15 @@
1153	1491	}
1154	1492	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1155	1493	bezierItem.addActionListener(this);
1156		- overlayItem = menu.add(new MenuItem("Overlay"));
1157		- overlayItem.addActionListener(this);
1158		- lightItem = menu.add(new MenuItem("Light"));
1159		- lightItem.addActionListener(this);
	1494	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1495	+// overlayItem.addActionListener(this);
	1496	+// lightItem = menu.add(new MenuItem("Light"));
	1497	+// lightItem.addActionListener(this);
1160	1498	menu.add("-");
1161	1499	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1162	1500	//superLoopItem.addActionListener(this);
1163		- loopItem = menu.add(new MenuItem("Loop"));
1164		- loopItem.addActionListener(this);
	1501	+// loopItem = menu.add(new MenuItem("Loop"));
	1502	+// loopItem.addActionListener(this);
1165	1503	doubleItem = menu.add(new MenuItem("Fork"));
1166	1504	doubleItem.addActionListener(this);
1167	1505	if (Globals.ADVANCED)
..	..	@@ -1177,6 +1515,9 @@
1177	1515	animationItem.addItemListener(this);
1178	1516	animationItem.setState(Globals.ANIMATION);
1179	1517
	1518	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1519	+ archiveItem.addActionListener(this);
	1520	+
1180	1521	menu.add("-");
1181	1522	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1182	1523	parseverticesItem.addActionListener(this);
..	..	@@ -1189,6 +1530,8 @@
1189	1530	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1190	1531	reduce34MorphItem.addActionListener(this);
1191	1532	menu.add("-");
	1533	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	1534	+ memoryItem.addActionListener(this);
1192	1535	menu.add(computeAOItem = new MenuItem("Compute AO"));
1193	1536	computeAOItem.addActionListener(this);
1194	1537
..	..	@@ -1197,11 +1540,9 @@
1197	1540	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1198	1541	mirrorItem.addActionListener(this);
1199	1542	menu.add("-");
1200		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1201		- memoryItem.addActionListener(this);
1202	1543	menu.add(analyzeItem = new MenuItem("Analyze"));
1203	1544	analyzeItem.addActionListener(this);
1204		- menu.add(dumpItem = new MenuItem("Dump"));
	1545	+ menu.add(dumpItem = new MenuItem("Print"));
1205	1546	dumpItem.addActionListener(this);
1206	1547	// menu.add(pathItem = new MenuItem("From-to path"));
1207	1548	// pathItem.addActionListener(this);
..	..	@@ -1342,9 +1683,34 @@
1342	1683	shadow.material = new cMaterial(obj.material);
1343	1684	shadow.material.diffuse = 0.0001f;
1344	1685	shadow.material.specular = 0.0001f;
	1686	+ //shadow.projectedVertices[1].x = 300;
1345	1687
1346	1688	makeSomething(shadow);
1347	1689	}
	1690	+
	1691	+ private void ClearUnpinned()
	1692	+ {
	1693	+ //for (Object3D obj : listUI)
	1694	+ for (int i=listUI.size(); --i>=0;)
	1695	+ {
	1696	+ Object3D obj = listUI.elementAt(i);
	1697	+ if (!obj.pinned)
	1698	+ {
	1699	+ obj.CloseUI();
	1700	+ listUI.remove(i);
	1701	+ }
	1702	+ }
	1703	+ }
	1704	+
	1705	+ private void EditElement(Object3D elem, boolean newWindow)
	1706	+ {
	1707	+ // if (!(elem instanceof Composite))
	1708	+ // newWindow = false;
	1709	+ listUI.add(elem);
	1710	+ elem.openEditWindow(this, newWindow); //, false);
	1711	+ System.out.println("edit : " + elem);
	1712	+ elem.editWindow.refreshContents(true); // ? new
	1713	+ }
1348	1714
1349	1715	/**
1350	1716	* applyExample
..	..	@@ -1589,7 +1955,7 @@
1589	1955	{
1590	1956	ScreenFit();
1591	1957	} else
1592		- if (source == switchItem)
	1958	+ if (source == switchViewItem)
1593	1959	{
1594	1960	cVector v1 = new cVector();
1595	1961	cVector v2 = new cVector();
..	..	@@ -1598,11 +1964,11 @@
1598	1964	objEditor.cameraView.renderCamera.setAim(v2, v1);
1599	1965	objEditor.cameraView.repaint();
1600	1966	} else
1601		- if (source == rectoidItem)
	1967	+ if (source == rectoidItem \|\| source == boxButton)
1602	1968	{
1603	1969	makeSomething(new Box());
1604	1970	} else
1605		- if (source == particleItem)
	1971	+ if (source == particleItem \|\| source == particlesButton)
1606	1972	{
1607	1973	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1608	1974	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1681,27 +2047,27 @@
1681	2047
1682	2048	makeSomething(obj);
1683	2049	} else
1684		- if (source == gridItem)
	2050	+ if (source == gridItem \|\| source == gridButton)
1685	2051	{
1686	2052	makeSomething(new Grid());
1687	2053	} else
1688		- if (source == ellipsoidItem)
	2054	+ if (source == ellipsoidItem \|\| source == sphereButton)
1689	2055	{
1690	2056	makeSomething(new Sphere());
1691	2057	} else
1692		- if (source == coneItem)
	2058	+ if (source == coneItem \|\| source == coneButton)
1693	2059	{
1694	2060	makeSomething(new Cone());
1695	2061	} else
1696		- if (source == torusItem)
	2062	+ if (source == torusItem \|\| source == torusButton)
1697	2063	{
1698	2064	makeSomething(new Torus());
1699	2065	} else
1700		- if (source == superItem)
	2066	+ if (source == superItem \|\| source == superButton)
1701	2067	{
1702	2068	makeSomething(new Superellipsoid());
1703	2069	} else
1704		- if (source == kleinItem)
	2070	+ if (source == kleinItem \|\| source == kleinButton)
1705	2071	{
1706	2072	makeSomething(new Klein());
1707	2073	} else
..	..	@@ -1721,7 +2087,7 @@
1721	2087	{
1722	2088	makeSomething(new BezierSurface());
1723	2089	} else
1724		- if (source == overlayItem)
	2090	+ if (source == overlayItem \|\| source == overlayButton)
1725	2091	{
1726	2092	/*
1727	2093	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1769,7 +2135,7 @@
1769	2135	s.setup();
1770	2136	makeSomething(s);
1771	2137	} else
1772		- if (source == lightItem)
	2138	+ if (source == lightItem \|\| source == lightButton)
1773	2139	{
1774	2140	makeSomething(new Light());
1775	2141	} else
..	..	@@ -1819,30 +2185,30 @@
1819	2185
1820	2186	group(g);
1821	2187	} else
1822		- if (source == loopItem)
	2188	+ if (source == loopItem \|\| source == loopButton)
1823	2189	{
1824	2190	Composite csg = new GroupLeaf();
1825	2191	csg.count = 5;
1826	2192	group(csg);
1827		- Composite child = new cGroup();
	2193	+ Composite child = new cGroup("Branch");
1828	2194	csg.addChild(child);
1829	2195	child.addChild(csg);
1830	2196	} else
1831	2197	if (source == doubleItem)
1832	2198	{
1833		- Composite csg = new GroupLeaf();
	2199	+ Composite csg = new GroupLeaf("Fork");
1834	2200	csg.count = 5;
1835	2201	group(csg);
1836		- Composite child = new cGroup();
	2202	+ Composite child = new cGroup("Branch A");
1837	2203	csg.addChild(child);
1838	2204	child.addChild(csg);
1839		- child = new cGroup();
	2205	+ child = new cGroup("Branch B");
1840	2206	csg.addChild(child);
1841	2207	child.addChild(csg);
1842	2208	} else
1843	2209	if (source == tripleItem)
1844	2210	{
1845		- Composite csg = new GroupLeaf();
	2211	+ Composite csg = new GroupLeaf("Trident");
1846	2212	csg.count = 4;
1847	2213	group(csg);
1848	2214	Composite child = new cGroup();
..	..	@@ -1854,31 +2220,6 @@
1854	2220	child = new cGroup();
1855	2221	csg.addChild(child);
1856	2222	child.addChild(csg);
1857		- } else
1858		-
1859		- if (source == importGFDItem)
1860		- {
1861		- ImportGFD();
1862		- } else
1863		- if (source == importVRMLX3DItem)
1864		- {
1865		- ImportVRMLX3D();
1866		- } else
1867		- if (source == import3DSItem)
1868		- {
1869		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1870		- } else
1871		- if (source == importOBJItem)
1872		- {
1873		- //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1874		- FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
1875		- browser.setVisible(true);
1876		- String filename = browser.getFile();
1877		- if (filename != null && filename.length() > 0)
1878		- {
1879		- String fullname = browser.getDirectory() + filename;
1880		- makeSomething(ReadOBJ(fullname), true);
1881		- }
1882	2223	} else
1883	2224	if (source == computeAOItem)
1884	2225	{
..	..	@@ -1917,6 +2258,46 @@
1917	2258	{
1918	2259	DumpObject();
1919	2260	} else
	2261	+ if (source == minButton)
	2262	+ {
	2263	+ Minimize();
	2264	+ } else
	2265	+ if (source == maxButton)
	2266	+ {
	2267	+ Maximize();
	2268	+ } else
	2269	+ if (source == fullButton)
	2270	+ {
	2271	+ ToggleFullScreen();
	2272	+ } else
	2273	+ if (source == undoButton)
	2274	+ {
	2275	+ // Go to previous version
	2276	+ //if (!Undo())
	2277	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2278	+ Undo();
	2279	+ } else
	2280	+ if (source == restoreButton)
	2281	+ {
	2282	+ // Restore current version
	2283	+ Restore();
	2284	+ } else
	2285	+ if (source == replaceButton)
	2286	+ {
	2287	+ // Overwrite current version
	2288	+ Replace();
	2289	+ } else
	2290	+ if (source == redoButton)
	2291	+ {
	2292	+ // Go to next version
	2293	+ Redo();
	2294	+ } else
	2295	+ if (source == saveButton)
	2296	+ {
	2297	+ // Save a new version
	2298	+ if (!Save(true))
	2299	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2300	+ } else
1920	2301	if (source == oneStepButton)
1921	2302	{
1922	2303	Globals.ONESTEP = true;
..	..	@@ -1924,17 +2305,14 @@
1924	2305	} else
1925	2306	if (source == screenfitButton)
1926	2307	{
1927		- //Reload(lastConverter, lastFilename, true);
1928	2308	ScreenFit();
1929	2309	} else
1930	2310	if (source == screenfitpointButton)
1931	2311	{
1932		- //Reload(lastConverter, lastFilename, true);
1933	2312	ScreenFitPoint();
1934	2313	} else
1935	2314	if (source == snapobjectButton)
1936	2315	{
1937		- //Reload(lastConverter, lastFilename, true);
1938	2316	SnapObject();
1939	2317	} else
1940	2318	// if (event.getSource() == recompileButton)
..	..	@@ -1970,6 +2348,14 @@
1970	2348	if (source == cutItem \|\| source == clearButton)
1971	2349	{
1972	2350	loadClipboard(true);
	2351	+ } else
	2352	+ if (source == undoItem)
	2353	+ {
	2354	+ Undo();
	2355	+ } else
	2356	+ if (source == redoItem)
	2357	+ {
	2358	+ Redo();
1973	2359	} else
1974	2360	if (source == duplicateItem)
1975	2361	{
..	..	@@ -2290,7 +2676,7 @@
2290	2676	{
2291	2677	StepAll();
2292	2678	} else
2293		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	2679	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2294	2680	{
2295	2681	//int indices[] = jList.getSelectedIndices();
2296	2682	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2302,9 +2688,9 @@
2302	2688	{
2303	2689	ClearSelection(true);
2304	2690	} else
2305		- if (source == grabItem)
	2691	+ if (source == grabItem \|\| source == groupButton)
2306	2692	{
2307		- group(new cGroup(), true);
	2693	+ group(new cGroup(), false); // true);
2308	2694	} else
2309	2695	if (source == hideItem)
2310	2696	{
..	..	@@ -2322,11 +2708,11 @@
2322	2708	{
2323	2709	makeSomething(new Camera());
2324	2710	} else
2325		- if (source == compositeItem)
	2711	+ if (source == compositeItem \|\| source == compositeButton)
2326	2712	{
2327	2713	group(new Composite());
2328	2714	} else
2329		- if (source == randomItem)
	2715	+ if (source == switchItem \|\| source == switchButton)
2330	2716	{
2331	2717	RandomNode random = new RandomNode();
2332	2718	group(random);
..	..	@@ -2428,7 +2814,7 @@
2428	2814	{
2429	2815	group(new cLinker());
2430	2816	} else
2431		- if (source == textureItem)
	2817	+ if (source == textureItem \|\| source == textureButton)
2432	2818	{
2433	2819	group(new TextureNode());
2434	2820	} else
..	..	@@ -2448,17 +2834,30 @@
2448	2834	{
2449	2835	CastShadow(2);
2450	2836	} else
2451		- if (source == ungroupItem)
	2837	+ if (source == ungroupItem \|\| source == ungroupButton)
2452	2838	{
2453		- //ungroup();
	2839	+ boolean hasRoot = false;
	2840	+
2454	2841	for (int i=0; i<group.selection.size(); i++)
2455	2842	{
2456		- Ungroup(group.selection.get(i));
	2843	+ if (group.selection.get(i) == group)
	2844	+ {
	2845	+ hasRoot = true;
	2846	+ break;
	2847	+ }
2457	2848	}
2458	2849
2459		- ClearSelection(false);
2460		-
2461		- refreshContents();
	2850	+ if (!hasRoot)
	2851	+ {
	2852	+ for (int i=0; i<group.selection.size(); i++)
	2853	+ {
	2854	+ Ungroup(group.selection.get(i));
	2855	+ }
	2856	+
	2857	+ ClearSelection(false);
	2858	+
	2859	+ refreshContents();
	2860	+ }
2462	2861	} else
2463	2862	if (source == genUVItem)
2464	2863	{
..	..	@@ -2470,7 +2869,7 @@
2470	2869	} else
2471	2870	if (source == genNormalsMESHItem)
2472	2871	{
2473		- GenNormals(true); // TODO
	2872	+ GenNormalsMESH();
2474	2873	} else
2475	2874	if (source == genNormalsORGANItem)
2476	2875	{
..	..	@@ -2535,6 +2934,22 @@
2535	2934	if (source == unmarkleavesItem)
2536	2935	{
2537	2936	MarkLeaves(false);
	2937	+ } else
	2938	+ if (source == rewindleavesItem)
	2939	+ {
	2940	+ RewindLeaves(true);
	2941	+ } else
	2942	+ if (source == unrewindleavesItem)
	2943	+ {
	2944	+ RewindLeaves(false);
	2945	+ } else
	2946	+ if (source == randomleavesItem)
	2947	+ {
	2948	+ RandomLeaves(true);
	2949	+ } else
	2950	+ if (source == unrandomleavesItem)
	2951	+ {
	2952	+ RandomLeaves(false);
2538	2953	} else
2539	2954	if (source == flipVItem)
2540	2955	{
..	..	@@ -2743,7 +3158,7 @@
2743	3158	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2744	3159	{
2745	3160	obj = (Object3D)e.nextElement();
2746		- obj.SetBumpTexture(null);
	3161	+ obj.ResetBumpTexture();
2747	3162	}
2748	3163
2749	3164	refreshContents();
..	..	@@ -2759,6 +3174,31 @@
2759	3174
2760	3175	refreshContents();
2761	3176	} else
	3177	+ if (source == embedTexturesItem)
	3178	+ {
	3179	+ Object3D obj;
	3180	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3181	+ {
	3182	+ obj = (Object3D)e.nextElement();
	3183	+ obj.EmbedTextures(true);
	3184	+ }
	3185	+
	3186	+ refreshContents();
	3187	+ } else
	3188	+ if (source == deEmbedTexturesItem)
	3189	+ {
	3190	+ Object3D obj;
	3191	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3192	+ {
	3193	+ obj = (Object3D)e.nextElement();
	3194	+ obj.EmbedTextures(false);
	3195	+ }
	3196	+
	3197	+ CameraPane.texturepigment.clear();
	3198	+ CameraPane.texturebump.clear();
	3199	+
	3200	+ refreshContents();
	3201	+ } else
2762	3202	if (source == flashSelectionButton)
2763	3203	{
2764	3204	CameraPane.flash = true;
..	..	@@ -2770,6 +3210,10 @@
2770	3210	if (source == twoButton)
2771	3211	{
2772	3212	radio.layout = twoButton;
	3213	+
	3214	+ if (CameraPane.FULLSCREEN)
	3215	+ fullscreenLayout = radio.layout;
	3216	+
2773	3217	// bug
2774	3218	//gridPanel.setDividerLocation(1.0);
2775	3219	//bigPanel.setDividerLocation(0.0);
..	..	@@ -2802,10 +3246,31 @@
2802	3246	bigThree.ClearUI();
2803	3247	bigThree.add(centralPanel);
2804	3248	bigThree.FlushUI();
	3249	+
	3250	+ cameraView.requestFocusInWindow();
	3251	+
	3252	+// refreshContents(true);
	3253	+//
	3254	+// try
	3255	+// {
	3256	+// java.awt.Robot bot = new java.awt.Robot();
	3257	+// int mask = InputEvent.BUTTON1_MASK;
	3258	+// bot.mouseMove(100, 100);
	3259	+// bot.mousePress(mask);
	3260	+// bot.mouseRelease(mask);
	3261	+// }
	3262	+// catch (Exception e)
	3263	+// {
	3264	+//
	3265	+// }
	3266	+
2805	3267	} else
2806	3268	if (source == threeButton)
2807	3269	{
2808	3270	radio.layout = threeButton;
	3271	+
	3272	+ if (CameraPane.FULLSCREEN)
	3273	+ fullscreenLayout = radio.layout;
2809	3274
2810	3275	// bigThree.remove(scenePanel);
2811	3276	// bigThree.remove(centralPanel);
..	..	@@ -2838,10 +3303,15 @@
2838	3303	bigThree.add(centralPanel);
2839	3304	bigThree.add(XYZPanel);
2840	3305	bigThree.FlushUI();
	3306	+
	3307	+ cameraView.requestFocusInWindow();
2841	3308	} else
2842	3309	if (source == fourButton)
2843	3310	{
2844	3311	radio.layout = fourButton;
	3312	+
	3313	+ if (CameraPane.FULLSCREEN)
	3314	+ fullscreenLayout = radio.layout;
2845	3315
2846	3316	// bigThree.remove(scenePanel);
2847	3317	// bigThree.remove(centralPanel);
..	..	@@ -2873,10 +3343,15 @@
2873	3343	bigThree.ClearUI();
2874	3344	bigThree.add(scenePanel);
2875	3345	bigThree.FlushUI();
	3346	+
	3347	+ cameraView.requestFocusInWindow();
2876	3348	} else
2877	3349	if (source == sixButton)
2878	3350	{
2879	3351	radio.layout = sixButton;
	3352	+
	3353	+ if (CameraPane.FULLSCREEN)
	3354	+ fullscreenLayout = radio.layout;
2880	3355
2881	3356	// bigThree.remove(scenePanel);
2882	3357	// bigThree.remove(centralPanel);
..	..	@@ -2909,10 +3384,15 @@
2909	3384	bigThree.add(scenePanel);
2910	3385	bigThree.add(centralPanel);
2911	3386	bigThree.FlushUI();
	3387	+
	3388	+ cameraView.requestFocusInWindow();
2912	3389	} else
2913	3390	if (source == sevenButton)
2914	3391	{
2915	3392	radio.layout = sevenButton;
	3393	+
	3394	+ if (CameraPane.FULLSCREEN)
	3395	+ fullscreenLayout = radio.layout;
2916	3396
2917	3397	// bigThree.remove(scenePanel);
2918	3398	// bigThree.remove(centralPanel);
..	..	@@ -2946,6 +3426,8 @@
2946	3426	bigThree.add(centralPanel);
2947	3427	bigThree.add(XYZPanel);
2948	3428	bigThree.FlushUI();
	3429	+
	3430	+ cameraView.requestFocusInWindow();
2949	3431	} else
2950	3432	if (source == rootButton)
2951	3433	{
..	..	@@ -2957,6 +3439,7 @@
2957	3439	EditObject(obj);
2958	3440	}
2959	3441
	3442	+ cameraView.requestFocusInWindow();
2960	3443	refreshContents(true);
2961	3444	} else
2962	3445	if (source == closeButton)
..	..	@@ -2966,22 +3449,37 @@
2966	3449	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2967	3450	{
2968	3451	ab = (cRadio)e.nextElement();
2969		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3452	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2970	3453	{
	3454	+ // Patch to avoid bug with transparency.
	3455	+ if (!ab.hadMaterial)
	3456	+ {
	3457	+ ab.object.material = null;
	3458	+ }
	3459	+
2971	3460	buttonGroup.remove(ab);
2972	3461	radioPanel.remove(ab);
2973	3462
2974		- ab.GetObject().editWindow = null;
	3463	+ //ab.GetObject().editWindow = null;
	3464	+ ab.GetObject().manipWindow = null;
2975	3465	// ab.GetObject().objectUI = null; // ?????????
2976	3466
2977	3467	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2978	3468	break;
2979	3469	}
2980	3470	}
	3471	+
	3472	+ cameraView.requestFocusInWindow();
2981	3473	refreshContents(true);
2982	3474	} else
2983	3475	if (source == editItem \|\| source == editButton)
2984	3476	{
	3477	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3478	+ {
	3479	+ Object3D child = (Object3D)e.nextElement();
	3480	+ child.pinned = true;
	3481	+ }
	3482	+
2985	3483	EditSelection(false);
2986	3484	} else
2987	3485	if (source == uneditButton)
..	..	@@ -2991,10 +3489,11 @@
2991	3489	Object3D child = (Object3D)e.nextElement();
2992	3490	if(child.editWindow != null)
2993	3491	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3492	+ child.pinned = false;
2994	3493	child.CloseUI();
2995	3494	listUI.remove(child);
2996	3495
2997		- child.editWindow = null; // ???????????
	3496	+ //child.editWindow = null; // ???????????
2998	3497	}
2999	3498	objEditor.ctrlPanel.FlushUI();
3000	3499	//objEditor.jTree.clearSelection();
..	..	@@ -3007,6 +3506,7 @@
3007	3506	//copy.ClearUI();
3008	3507	for (Object3D obj : listUI)
3009	3508	{
	3509	+ obj.pinned = false;
3010	3510	obj.CloseUI();
3011	3511	}
3012	3512	listUI.clear();
..	..	@@ -3016,7 +3516,7 @@
3016	3516	{
3017	3517	assert(copy == group);
3018	3518
3019		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3519	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3020	3520
3021	3521	for (Object3D obj : listUI)
3022	3522	{
..	..	@@ -3065,6 +3565,9 @@
3065	3565	}
3066	3566
3067	3567	copy = group;
	3568	+
	3569	+ SetUndoStates();
	3570	+
3068	3571	//Globals.theRenderer.object = group;
3069	3572	if(!useclient)
3070	3573	{
..	..	@@ -3081,7 +3584,9 @@
3081	3584	sideView.object = group;
3082	3585	}
3083	3586
3084		-// fix "+" issue group.editWindow = this;
	3587	+// fix "+" issue
	3588	+ //group.editWindow = this;
	3589	+ group.manipWindow = this;
3085	3590
3086	3591	/*
3087	3592	currentLayout = radio.layout;
..	..	@@ -3089,13 +3594,35 @@
3089	3594	currentLayout = sevenButton;
3090	3595	*/
3091	3596	radio.layout.doClick();
	3597	+
	3598	+ ClearUnpinned();
	3599	+ //Grafreed.Assert(group != null);
	3600	+ //Grafreed.Assert(group.selection != null);
	3601	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	3602	+ if (group.selection == null \|\| group.selection.size() == 1)
	3603	+ EditSelection(false);
3092	3604	keepparent = group.parent;
3093	3605	// PARENT = NULL or not???
3094	3606	//group.parent = null; // ROOT
3095	3607	//group.attributes = -1;
3096	3608	ResetModel();
	3609	+
	3610	+ cameraView.requestFocusInWindow();
3097	3611	refreshContents(true);
3098		- }
	3612	+ } else if (event.getSource() == editCameraItem)
	3613	+ {
	3614	+ cameraView.ProtectCamera();
	3615	+ cameraView.repaint();
	3616	+ return;
	3617	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
	3618	+ {
	3619	+ cameraView.RevertCamera();
	3620	+ cameraView.repaint();
	3621	+ return;
	3622	+ // } else if (event.getSource() == textureButton)
	3623	+ // {
	3624	+ // return; // true;
	3625	+ }
3099	3626	else
3100	3627	{
3101	3628	//return super.action(event, arg);
..	..	@@ -3104,7 +3631,6 @@
3104	3631	}
3105	3632
3106	3633	boolean useclient = false;
3107		- cRadio radio;
3108	3634
3109	3635	void ToggleRoot()
3110	3636	{
..	..	@@ -3343,7 +3869,8 @@
3343	3869
3344	3870	int size = obj.MemorySize();
3345	3871
3346		- System.err.println((size/1024) + " KB is the size of " + obj);
	3872	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	3873	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3347	3874	}
3348	3875	}
3349	3876	catch (Exception e)
..	..	@@ -3424,6 +3951,13 @@
3424	3951	void GenNormals(boolean crease)
3425	3952	{
3426	3953	group.GenNormalsS(crease);
	3954	+
	3955	+ refreshContents();
	3956	+ }
	3957	+
	3958	+ void GenNormalsMESH()
	3959	+ {
	3960	+ group.GenNormalsMeshS();
3427	3961
3428	3962	refreshContents();
3429	3963	}
..	..	@@ -3659,7 +4193,7 @@
3659	4193
3660	4194	try
3661	4195	{
3662		- texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4196	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
3663	4197	}
3664	4198	catch (Exception e)
3665	4199	{
..	..	@@ -4051,6 +4585,18 @@
4051	4585	refreshContents();
4052	4586	}
4053	4587
	4588	+ void RewindLeaves(boolean hide)
	4589	+ {
	4590	+ group.selection.RewindLeaves(hide);
	4591	+ refreshContents();
	4592	+ }
	4593	+
	4594	+ void RandomLeaves(boolean hide)
	4595	+ {
	4596	+ group.selection.RandomLeaves(hide);
	4597	+ refreshContents();
	4598	+ }
	4599	+
4054	4600	void SetTexRes(int tr)
4055	4601	{
4056	4602	group.selection.SetTexRes(tr);
..	..	@@ -4122,28 +4668,25 @@
4122	4668	// }
4123	4669	// }
4124	4670
4125		- static boolean allparams = true;
4126		-
4127		- static Vector<Object3D> listUI = new Vector<Object3D>();
4128		-
4129	4671	void EditSelection(boolean newWindow)
4130	4672	{
	4673	+ if (group.selection == null)
	4674	+ {
	4675	+ EditElement(group, newWindow); // ? new
	4676	+ return;
	4677	+ }
	4678	+
4131	4679	// aConstraints.gridy = 0;
4132	4680	for (int i=0; i<group.selection.size(); i++)
4133	4681	{
4134	4682	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4135	4683	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4136		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4684	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4137	4685
4138	4686	Object3D elem = (Object3D)group.selection.elementAt(i);
4139	4687	if(elem != group \|\| !newWindow)
4140	4688	{
4141		- // if (!(elem instanceof Composite))
4142		- // newWindow = false;
4143		- listUI.add(elem);
4144		- elem.openEditWindow(this, newWindow); //, false);
4145		- System.out.println("edit : " + elem);
4146		- elem.editWindow.refreshContents(true); // ? new
	4689	+ EditElement(elem, newWindow); // ? new
4147	4690	}
4148	4691	}
4149	4692	}
..	..	@@ -4218,7 +4761,8 @@
4218	4761	//new Exception().printStackTrace();
4219	4762
4220	4763	freezemodel = true;
4221		-
	4764	+ ClearUnpinned();
	4765	+
4222	4766	/**/
4223	4767	//switch (event.id)
4224	4768	{
..	..	@@ -4226,7 +4770,6 @@
4226	4770	//case 702: // Event.LIST_DESELECT
4227	4771	group.deselectAll();
4228	4772	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4229		- objEditor.ClearInfo(); // .GetMaterial());
4230	4773	if (tps != null)
4231	4774	{
4232	4775	for (int i=0; i < tps.length; i++)
..	..	@@ -4235,10 +4778,8 @@
4235	4778
4236	4779	//if (child.parent != null)
4237	4780	//child.parent.addSelectee(child);
	4781	+ objEditor.SetMaterial(child);
4238	4782	group.addSelectee(child);
4239		- objEditor.SetMaterial(child); // .GetMaterial());
4240		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4241		- System.err.println("info : " + child.GetPath());
4242	4783	}
4243	4784	}
4244	4785	// else
..	..	@@ -4248,20 +4789,28 @@
4248	4789	// System.err.println("info : " + group.GetPath());
4249	4790	// }
4250	4791
4251		- objEditor.SetText(); // jan 2014
4252		-
4253		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4792	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4254	4793	CameraPane.flash = true;
4255	4794
4256		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4795	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4257	4796	// a camera
4258	4797	{
4259		- CameraPane.camerachangeframe = 0; // don't refuse it
4260		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4798	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
	4799	+ {
	4800	+ CameraPane.camerachangeframe = 0; // don't refuse it
	4801	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4802	+ }
4261	4803	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4262	4804	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4263	4805	}
4264	4806
	4807	+ if (tps != null && tps.length == 1)
	4808	+ {
	4809	+ EditSelection(false);
	4810	+ }
	4811	+
	4812	+ SetPinStates(tps != null && tps.length > 0);
	4813	+
4265	4814	refreshContents();
4266	4815	//return true;
4267	4816	}
..	..	@@ -4270,6 +4819,35 @@
4270	4819
4271	4820	freezemodel = false;
4272	4821	}
	4822	+
	4823	+ void SetPinStates(boolean enabled)
	4824	+ {
	4825	+ editButton.setEnabled(enabled);
	4826	+ uneditButton.setEnabled(enabled);
	4827	+ unselectButton.setEnabled(enabled);
	4828	+ flashSelectionButton.setEnabled(enabled);
	4829	+ }
	4830	+
	4831	+ void refreshContents(boolean cp)
	4832	+ {
	4833	+ if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	4834	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
	4835	+ {
	4836	+ objEditor.ClearInfo(); // .GetMaterial());
	4837	+
	4838	+ for (int i=0; i < group.selection.Size(); i++)
	4839	+ {
	4840	+ Object3D child = (Object3D) group.selection.get(i);
	4841	+
	4842	+ objEditor.AddInfo(child, this, true);
	4843	+ System.err.println("info : " + child.GetPath());
	4844	+ }
	4845	+
	4846	+ objEditor.SetText(); // jan 2014
	4847	+ }
	4848	+
	4849	+ super.refreshContents(cp);
	4850	+ }
4273	4851
4274	4852	void linkSomething(Object3D thing)
4275	4853	{
..	..	@@ -4341,6 +4919,7 @@
4341	4919	{
4342	4920	if (group.selection.isEmpty())
4343	4921	return;
	4922	+
4344	4923	Grafreed.clipboardIsTempGroup = false;
4345	4924	Composite tGroup = null;
4346	4925	if (group.selection.size() > 0) // 1)
..	..	@@ -4351,6 +4930,8 @@
4351	4930
4352	4931	if (cut)
4353	4932	{
	4933	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	4934	+// Save();
4354	4935	//int indices[] = jList.getSelectedIndices();
4355	4936	//for (int i = indices.length - 1; i >= 0; i--)
4356	4937	//jList.remove(indices[i]);
..	..	@@ -4440,8 +5021,10 @@
4440	5021	}
4441	5022
4442	5023	}
	5024	+
4443	5025	if (Grafreed.clipboardIsTempGroup)
4444	5026	Grafreed.clipboard = tGroup;
	5027	+
4445	5028	if (cut)
4446	5029	{
4447	5030	ResetModel();
..	..	@@ -4451,6 +5034,10 @@
4451	5034
4452	5035	void paste(boolean expand)
4453	5036	{
	5037	+ if (Globals.REPLACEONMAKE)
	5038	+ Save();
	5039	+ boolean keep = Globals.REPLACEONMAKE;
	5040	+ Globals.REPLACEONMAKE = false;
4454	5041	// if (GrafreeD.clipboard == null)
4455	5042	// return;
4456	5043	boolean first = true;
..	..	@@ -4510,6 +5097,7 @@
4510	5097	Grafreed.clipboard.get(0).parent = keepparent;
4511	5098	}
4512	5099
	5100	+ Globals.REPLACEONMAKE = keep;
4513	5101	ResetModel();
4514	5102	refreshContents();
4515	5103	}
..	..	@@ -4645,6 +5233,10 @@
4645	5233
4646	5234	void group(Object3D csg, boolean grab)
4647	5235	{
	5236	+ if (Globals.REPLACEONMAKE)
	5237	+ Save();
	5238	+ boolean keep = Globals.REPLACEONMAKE;
	5239	+ Globals.REPLACEONMAKE = false;
4648	5240	if (//false) // why??
4649	5241	!group.selection.isEmpty())
4650	5242	{
..	..	@@ -4758,10 +5350,15 @@
4758	5350	//node.add(csg);
4759	5351	//makeSomething(node);
4760	5352	makeSomething(csg);
	5353	+ Globals.REPLACEONMAKE = keep;
4761	5354	}
4762	5355
4763	5356	void Ungroup(Object3D g)
4764	5357	{
	5358	+ if (Globals.REPLACEONMAKE)
	5359	+ Save();
	5360	+ boolean keep = Globals.REPLACEONMAKE;
	5361	+ Globals.REPLACEONMAKE = false;
4765	5362	if (g instanceof HiddenObject)
4766	5363	{
4767	5364	HiddenObject h = (HiddenObject) g;
..	..	@@ -4778,6 +5375,7 @@
4778	5375	objEditor.makeSomething(g.get(i), false);
4779	5376	}
4780	5377	}
	5378	+ Globals.REPLACEONMAKE = keep;
4781	5379	}
4782	5380
4783	5381	void ungroup()
..	..	@@ -4973,21 +5571,6 @@
4973	5571	}
4974	5572	*/
4975	5573
4976		- void ImportGFD()
4977		- {
4978		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4979		- browser.show();
4980		- String filename = browser.getFile();
4981		- if (filename != null && filename.length() > 0)
4982		- {
4983		- String fullname = browser.getDirectory() + filename;
4984		-
4985		- //Object3D readobj =
4986		- objEditor.ReadGFD(fullname, objEditor);
4987		- //makeSomething(readobj);
4988		- }
4989		- }
4990		-
4991	5574	/*
4992	5575	public void Callback(Object obj)
4993	5576	{
..	..	@@ -5011,23 +5594,6 @@
5011	5594	}
5012	5595	*/
5013	5596
5014		- void ImportVRMLX3D()
5015		- {
5016		- if (Grafreed.standAlone)
5017		- {
5018		- /**/
5019		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
5020		- browser.show();
5021		- String filename = browser.getFile();
5022		- if (filename != null && filename.length() > 0)
5023		- {
5024		- String fullname = browser.getDirectory() + filename;
5025		- LoadVRMLX3D(fullname);
5026		- }
5027		- /**/
5028		- }
5029		- }
5030		-
5031	5597	String GetFile(String dialogName)
5032	5598	{
5033	5599	if (Grafreed.standAlone)
..	..	@@ -5098,7 +5664,28 @@
5098	5664	cButton clearpanelButton;
5099	5665	cButton unselectButton;
5100	5666
	5667	+ cButton restoreCameraButton;
	5668	+
	5669	+ cButton saveButton;
5101	5670	cButton oneStepButton;
	5671	+
	5672	+ cButton groupButton;
	5673	+ cButton ungroupButton;
	5674	+ cButton compositeButton;
	5675	+ cButton switchButton;
	5676	+ cButton loopButton;
	5677	+ cButton textureButton;
	5678	+
	5679	+ cButton gridButton;
	5680	+ cButton boxButton;
	5681	+ cButton sphereButton;
	5682	+ cButton coneButton;
	5683	+ cButton torusButton;
	5684	+ cButton superButton;
	5685	+ cButton kleinButton;
	5686	+ cButton particlesButton;
	5687	+ cButton overlayButton;
	5688	+ cButton lightButton;
5102	5689
5103	5690	cButton screenfitButton;
5104	5691	cButton screenfitpointButton;
..	..	@@ -5111,14 +5698,6 @@
5111	5698
5112	5699	cButton setsupportButton;
5113	5700
5114		- cButton twoButton;
5115		- cButton sixButton;
5116		- cButton threeButton;
5117		- cButton sevenButton;
5118		- cButton fourButton; // full panel
5119		- cButton oneButton; // full XYZ
5120		- //cButton currentLayout;
5121		-
5122	5701	//
5123	5702	//Composite
5124	5703	Object3D // to do !!
..	..	@@ -5128,9 +5707,11 @@
5128	5707	//JTree jTree;
5129	5708	private MenuItem lookAtItem;
5130	5709	private MenuItem lookFromItem;
5131		- private MenuItem switchItem;
	5710	+ private MenuItem switchViewItem;
5132	5711	private MenuItem cutItem;
5133		- private MenuItem duplicateItem;
	5712	+ private MenuItem undoItem;
	5713	+ private MenuItem redoItem;
	5714	+ private JMenuItem duplicateItem;
5134	5715	private MenuItem cloneItem;
5135	5716	private MenuItem cloneSupportItem;
5136	5717	private MenuItem overwriteGeoItem;
..	..	@@ -5158,7 +5739,7 @@
5158	5739	private MenuItem pasteLinkItem;
5159	5740	private MenuItem pasteCloneItem;
5160	5741	private MenuItem pasteExpandItem;
5161		- private MenuItem clearItem;
	5742	+ private MenuItem deleteItem;
5162	5743	private MenuItem clearAllItem;
5163	5744	private MenuItem genUVItem;
5164	5745	private MenuItem genNormalsMESHItem;
..	..	@@ -5193,6 +5774,10 @@
5193	5774	private MenuItem showleavesItem;
5194	5775	private MenuItem markleavesItem;
5195	5776	private MenuItem unmarkleavesItem;
	5777	+ private MenuItem rewindleavesItem;
	5778	+ private MenuItem unrewindleavesItem;
	5779	+ private MenuItem randomleavesItem;
	5780	+ private MenuItem unrandomleavesItem;
5196	5781
5197	5782	private MenuItem flipVItem;
5198	5783	private MenuItem unflipVItem;
..	..	@@ -5214,7 +5799,7 @@
5214	5799	private MenuItem frontItem;
5215	5800	private MenuItem cameraItem;
5216	5801	private MenuItem compositeItem;
5217		- private MenuItem randomItem;
	5802	+ private MenuItem switchItem;
5218	5803	private MenuItem physicsItem;
5219	5804	private MenuItem frameselectorItem;
5220	5805	private MenuItem scriptNodeItem;
..	..	@@ -5238,6 +5823,8 @@
5238	5823	private MenuItem attachBumpItem;
5239	5824	private MenuItem detachBumpItem;
5240	5825	private MenuItem pigmentBumpItem;
	5826	+ private MenuItem embedTexturesItem;
	5827	+ private MenuItem deEmbedTexturesItem;
5241	5828
5242	5829	private MenuItem particleItem;
5243	5830	private MenuItem ragdollItem;
..	..	@@ -5276,11 +5863,6 @@
5276	5863	private MenuItem doubleItem;
5277	5864	private MenuItem tripleItem;
5278	5865
5279		- private MenuItem importGFDItem;
5280		- private MenuItem importVRMLX3DItem;
5281		- private MenuItem import3DSItem;
5282		- private MenuItem importOBJItem;
5283		-
5284	5866	private MenuItem computeAOItem;
5285	5867	private MenuItem recompileItem;
5286	5868	private MenuItem editScriptItem;
..	..	@@ -5290,4 +5872,8 @@
5290	5872	private MenuItem analyzeItem;
5291	5873	private MenuItem dumpItem;
5292	5874	//boolean freezemodel = false;
	5875	+
	5876	+ Menu cameraMenu;
	5877	+ MenuItem editCameraItem;
	5878	+ MenuItem restoreCameraItem;
5293	5879	}