~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,42 +954,85 @@
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);
729	1028	buttonGroup.add(radioButton);
730	1029	radioButton.doClick();
731	1030	}
	1031	+
732	1032	void SetupViews(ObjEditor oe)
733	1033	{
	1034	+ theFrame = this;
	1035	+
734	1036	oe.SetupViews();
735	1037
736	1038	System.out.println("SetupViews");
..	..	@@ -739,23 +1041,28 @@
739	1041	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
740	1042	}
741	1043
742		- JCheckBox liveCB;
743		- JCheckBox supportCB;
744		- JCheckBox localCB;
745		- JCheckBox crowdCB;
746		- JCheckBox smoothCB;
747		- JCheckBox fastCB;
748		- JCheckBox slowCB;
749		- JCheckBox boxCB;
750		- JCheckBox zoomBoxCB;
751		- JCheckBox trackCB;
752		- 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;
753	1057	// JCheckBox speakerMocapCB;
754		- JCheckBox speakerCameraCB;
755		- JCheckBox speakerFocusCB;
756		- JCheckBox debugCB;
757		- JCheckBox oeilCB;
758		- JCheckBox lookAtCB;
	1058	+ cCheckBox speakerCameraCB;
	1059	+ cCheckBox speakerFocusCB;
	1060	+ cCheckBox debugCB;
	1061	+
	1062	+ cCheckBox oeilCB;
	1063	+ cCheckBox shadowCB;
	1064	+ cCheckBox autokeepCB;
	1065	+ cCheckBox lookAtCB;
759	1066
760	1067	// static int COLOR = 1;
761	1068	// static int MATERIAL = 2;
..	..	@@ -763,9 +1070,9 @@
763	1070
764	1071	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
765	1072
766		- JCheckBox colorCB;
767		- JCheckBox materialCB;
768		- JCheckBox textureCB;
	1073	+ cCheckBox colorCB;
	1074	+ cCheckBox materialCB;
	1075	+ cCheckBox textureCB;
769	1076
770	1077	public void itemStateChanged(ItemEvent e)
771	1078	{
..	..	@@ -793,6 +1100,7 @@
793	1100	} else if(e.getSource() == liveCB)
794	1101	{
795	1102	cameraView.ToggleLive();
	1103	+ refreshContents(false);
796	1104	}
797	1105	else if(e.getSource() == supportCB)
798	1106	{
..	..	@@ -857,6 +1165,18 @@
857	1165	{
858	1166	cameraView.ToggleOeil();
859	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	+ }
860	1180	else if(e.getSource() == lookAtCB)
861	1181	{
862	1182	cameraView.ToggleLookAt();
..	..	@@ -873,7 +1193,8 @@
873	1193
874	1194	/**/
875	1195	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
876		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1196	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1197	+ TreePath path = objEditor.jTree.getSelectionPath();
877	1198	if ((path == null) \|\| (path.getPathCount() <= 1)) {
878	1199	// We can't move the root node or an empty selection
879	1200	return;
..	..	@@ -936,8 +1257,6 @@
936	1257	}
937	1258	}
938	1259
939		- String string = (String) object;
940		-
941	1260	System.out.println("Transfer = " + object + "; drop : " + target);
942	1261	// if( object instanceof java.io.File[])
943	1262	// {
..	..	@@ -945,6 +1264,8 @@
945	1264	// objEditor.DropFile((java.io.File[]) object, true);
946	1265	// return;
947	1266	// }
	1267	+
	1268	+ String string = object.toString();
948	1269
949	1270	// File path for Mac and Windows
950	1271	if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
..	..	@@ -990,23 +1311,33 @@
990	1311
991	1312	assert target == objEditor.jTree;
992	1313	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1314	+ Object3D destinationLeaf;
993	1315	try {
994		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1316	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
995	1317	} catch (Exception e) {
996	1318	System.out.println("destinationPath : " + destinationPath);
997	1319	return;
998	1320	}
999	1321
1000		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1322	+ for (int i=group.selection.size(); --i>=0;)
1001	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	+// {
1002	1333	loadClipboard(true);
1003	1334	objEditor.jTree.setSelectionPath(destinationPath);
1004	1335	pasteInto(false, false);
1005		- } else {
1006		- loadClipboard(false);
1007		- objEditor.jTree.setSelectionPath(destinationPath);
1008		- pasteInto(false, false); // true); // ???
1009		- }
	1336	+// } else {
	1337	+// loadClipboard(false);
	1338	+// objEditor.jTree.setSelectionPath(destinationPath);
	1339	+// pasteInto(false, false); // true); // ???
	1340	+// }
1010	1341	}
1011	1342	public void dropActionChanged(DropTargetDragEvent dtde)
1012	1343	// Called if the user has modified the current drop gesture
..	..	@@ -1111,22 +1442,30 @@
1111	1442	{
1112	1443	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1113	1444	//heightFieldItem.addActionListener(this);
1114		- gridItem = menu.add(new MenuItem("Grid"));
1115		- gridItem.addActionListener(this);
1116		- rectoidItem = menu.add(new MenuItem("Box"));
1117		- rectoidItem.addActionListener(this);
1118		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1119		- ellipsoidItem.addActionListener(this);
1120		- coneItem = menu.add(new MenuItem("Cone"));
1121		- coneItem.addActionListener(this);
1122		- torusItem = menu.add(new MenuItem("Torus"));
1123		- torusItem.addActionListener(this);
1124		- superItem = menu.add(new MenuItem("Superellipsoid"));
1125		- 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	+ {
1126	1463	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1127	1464	kleinItem.addActionListener(this);
1128		- particleItem = menu.add(new MenuItem("Particle system"));
1129		- particleItem.addActionListener(this);
	1465	+ }
	1466	+
	1467	+// particleItem = menu.add(new MenuItem("Particle system"));
	1468	+// particleItem.addActionListener(this);
1130	1469	if (Globals.ADVANCED)
1131	1470	{
1132	1471	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1152,15 +1491,15 @@
1152	1491	}
1153	1492	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1154	1493	bezierItem.addActionListener(this);
1155		- overlayItem = menu.add(new MenuItem("Overlay"));
1156		- overlayItem.addActionListener(this);
1157		- lightItem = menu.add(new MenuItem("Light"));
1158		- 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);
1159	1498	menu.add("-");
1160	1499	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1161	1500	//superLoopItem.addActionListener(this);
1162		- loopItem = menu.add(new MenuItem("Loop"));
1163		- loopItem.addActionListener(this);
	1501	+// loopItem = menu.add(new MenuItem("Loop"));
	1502	+// loopItem.addActionListener(this);
1164	1503	doubleItem = menu.add(new MenuItem("Fork"));
1165	1504	doubleItem.addActionListener(this);
1166	1505	if (Globals.ADVANCED)
..	..	@@ -1176,6 +1515,9 @@
1176	1515	animationItem.addItemListener(this);
1177	1516	animationItem.setState(Globals.ANIMATION);
1178	1517
	1518	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1519	+ archiveItem.addActionListener(this);
	1520	+
1179	1521	menu.add("-");
1180	1522	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1181	1523	parseverticesItem.addActionListener(this);
..	..	@@ -1188,6 +1530,8 @@
1188	1530	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1189	1531	reduce34MorphItem.addActionListener(this);
1190	1532	menu.add("-");
	1533	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	1534	+ memoryItem.addActionListener(this);
1191	1535	menu.add(computeAOItem = new MenuItem("Compute AO"));
1192	1536	computeAOItem.addActionListener(this);
1193	1537
..	..	@@ -1196,11 +1540,9 @@
1196	1540	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1197	1541	mirrorItem.addActionListener(this);
1198	1542	menu.add("-");
1199		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1200		- memoryItem.addActionListener(this);
1201	1543	menu.add(analyzeItem = new MenuItem("Analyze"));
1202	1544	analyzeItem.addActionListener(this);
1203		- menu.add(dumpItem = new MenuItem("Dump"));
	1545	+ menu.add(dumpItem = new MenuItem("Print"));
1204	1546	dumpItem.addActionListener(this);
1205	1547	// menu.add(pathItem = new MenuItem("From-to path"));
1206	1548	// pathItem.addActionListener(this);
..	..	@@ -1341,9 +1683,34 @@
1341	1683	shadow.material = new cMaterial(obj.material);
1342	1684	shadow.material.diffuse = 0.0001f;
1343	1685	shadow.material.specular = 0.0001f;
	1686	+ //shadow.projectedVertices[1].x = 300;
1344	1687
1345	1688	makeSomething(shadow);
1346	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	+ }
1347	1714
1348	1715	/**
1349	1716	* applyExample
..	..	@@ -1588,7 +1955,7 @@
1588	1955	{
1589	1956	ScreenFit();
1590	1957	} else
1591		- if (source == switchItem)
	1958	+ if (source == switchViewItem)
1592	1959	{
1593	1960	cVector v1 = new cVector();
1594	1961	cVector v2 = new cVector();
..	..	@@ -1597,11 +1964,11 @@
1597	1964	objEditor.cameraView.renderCamera.setAim(v2, v1);
1598	1965	objEditor.cameraView.repaint();
1599	1966	} else
1600		- if (source == rectoidItem)
	1967	+ if (source == rectoidItem \|\| source == boxButton)
1601	1968	{
1602	1969	makeSomething(new Box());
1603	1970	} else
1604		- if (source == particleItem)
	1971	+ if (source == particleItem \|\| source == particlesButton)
1605	1972	{
1606	1973	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1607	1974	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1680,27 +2047,27 @@
1680	2047
1681	2048	makeSomething(obj);
1682	2049	} else
1683		- if (source == gridItem)
	2050	+ if (source == gridItem \|\| source == gridButton)
1684	2051	{
1685	2052	makeSomething(new Grid());
1686	2053	} else
1687		- if (source == ellipsoidItem)
	2054	+ if (source == ellipsoidItem \|\| source == sphereButton)
1688	2055	{
1689	2056	makeSomething(new Sphere());
1690	2057	} else
1691		- if (source == coneItem)
	2058	+ if (source == coneItem \|\| source == coneButton)
1692	2059	{
1693	2060	makeSomething(new Cone());
1694	2061	} else
1695		- if (source == torusItem)
	2062	+ if (source == torusItem \|\| source == torusButton)
1696	2063	{
1697	2064	makeSomething(new Torus());
1698	2065	} else
1699		- if (source == superItem)
	2066	+ if (source == superItem \|\| source == superButton)
1700	2067	{
1701	2068	makeSomething(new Superellipsoid());
1702	2069	} else
1703		- if (source == kleinItem)
	2070	+ if (source == kleinItem \|\| source == kleinButton)
1704	2071	{
1705	2072	makeSomething(new Klein());
1706	2073	} else
..	..	@@ -1720,7 +2087,7 @@
1720	2087	{
1721	2088	makeSomething(new BezierSurface());
1722	2089	} else
1723		- if (source == overlayItem)
	2090	+ if (source == overlayItem \|\| source == overlayButton)
1724	2091	{
1725	2092	/*
1726	2093	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1768,7 +2135,7 @@
1768	2135	s.setup();
1769	2136	makeSomething(s);
1770	2137	} else
1771		- if (source == lightItem)
	2138	+ if (source == lightItem \|\| source == lightButton)
1772	2139	{
1773	2140	makeSomething(new Light());
1774	2141	} else
..	..	@@ -1818,30 +2185,30 @@
1818	2185
1819	2186	group(g);
1820	2187	} else
1821		- if (source == loopItem)
	2188	+ if (source == loopItem \|\| source == loopButton)
1822	2189	{
1823	2190	Composite csg = new GroupLeaf();
1824	2191	csg.count = 5;
1825	2192	group(csg);
1826		- Composite child = new cGroup();
	2193	+ Composite child = new cGroup("Branch");
1827	2194	csg.addChild(child);
1828	2195	child.addChild(csg);
1829	2196	} else
1830	2197	if (source == doubleItem)
1831	2198	{
1832		- Composite csg = new GroupLeaf();
	2199	+ Composite csg = new GroupLeaf("Fork");
1833	2200	csg.count = 5;
1834	2201	group(csg);
1835		- Composite child = new cGroup();
	2202	+ Composite child = new cGroup("Branch A");
1836	2203	csg.addChild(child);
1837	2204	child.addChild(csg);
1838		- child = new cGroup();
	2205	+ child = new cGroup("Branch B");
1839	2206	csg.addChild(child);
1840	2207	child.addChild(csg);
1841	2208	} else
1842	2209	if (source == tripleItem)
1843	2210	{
1844		- Composite csg = new GroupLeaf();
	2211	+ Composite csg = new GroupLeaf("Trident");
1845	2212	csg.count = 4;
1846	2213	group(csg);
1847	2214	Composite child = new cGroup();
..	..	@@ -1853,31 +2220,6 @@
1853	2220	child = new cGroup();
1854	2221	csg.addChild(child);
1855	2222	child.addChild(csg);
1856		- } else
1857		-
1858		- if (source == importGFDItem)
1859		- {
1860		- ImportGFD();
1861		- } else
1862		- if (source == importVRMLX3DItem)
1863		- {
1864		- ImportVRMLX3D();
1865		- } else
1866		- if (source == import3DSItem)
1867		- {
1868		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1869		- } else
1870		- if (source == importOBJItem)
1871		- {
1872		- //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1873		- FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
1874		- browser.setVisible(true);
1875		- String filename = browser.getFile();
1876		- if (filename != null && filename.length() > 0)
1877		- {
1878		- String fullname = browser.getDirectory() + filename;
1879		- makeSomething(ReadOBJ(fullname), true);
1880		- }
1881	2223	} else
1882	2224	if (source == computeAOItem)
1883	2225	{
..	..	@@ -1916,6 +2258,46 @@
1916	2258	{
1917	2259	DumpObject();
1918	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
1919	2301	if (source == oneStepButton)
1920	2302	{
1921	2303	Globals.ONESTEP = true;
..	..	@@ -1923,17 +2305,14 @@
1923	2305	} else
1924	2306	if (source == screenfitButton)
1925	2307	{
1926		- //Reload(lastConverter, lastFilename, true);
1927	2308	ScreenFit();
1928	2309	} else
1929	2310	if (source == screenfitpointButton)
1930	2311	{
1931		- //Reload(lastConverter, lastFilename, true);
1932	2312	ScreenFitPoint();
1933	2313	} else
1934	2314	if (source == snapobjectButton)
1935	2315	{
1936		- //Reload(lastConverter, lastFilename, true);
1937	2316	SnapObject();
1938	2317	} else
1939	2318	// if (event.getSource() == recompileButton)
..	..	@@ -1969,6 +2348,14 @@
1969	2348	if (source == cutItem \|\| source == clearButton)
1970	2349	{
1971	2350	loadClipboard(true);
	2351	+ } else
	2352	+ if (source == undoItem)
	2353	+ {
	2354	+ Undo();
	2355	+ } else
	2356	+ if (source == redoItem)
	2357	+ {
	2358	+ Redo();
1972	2359	} else
1973	2360	if (source == duplicateItem)
1974	2361	{
..	..	@@ -2289,7 +2676,7 @@
2289	2676	{
2290	2677	StepAll();
2291	2678	} else
2292		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	2679	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2293	2680	{
2294	2681	//int indices[] = jList.getSelectedIndices();
2295	2682	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2301,9 +2688,9 @@
2301	2688	{
2302	2689	ClearSelection(true);
2303	2690	} else
2304		- if (source == grabItem)
	2691	+ if (source == grabItem \|\| source == groupButton)
2305	2692	{
2306		- group(new cGroup(), true);
	2693	+ group(new cGroup(), false); // true);
2307	2694	} else
2308	2695	if (source == hideItem)
2309	2696	{
..	..	@@ -2321,11 +2708,11 @@
2321	2708	{
2322	2709	makeSomething(new Camera());
2323	2710	} else
2324		- if (source == compositeItem)
	2711	+ if (source == compositeItem \|\| source == compositeButton)
2325	2712	{
2326	2713	group(new Composite());
2327	2714	} else
2328		- if (source == randomItem)
	2715	+ if (source == switchItem \|\| source == switchButton)
2329	2716	{
2330	2717	RandomNode random = new RandomNode();
2331	2718	group(random);
..	..	@@ -2427,7 +2814,7 @@
2427	2814	{
2428	2815	group(new cLinker());
2429	2816	} else
2430		- if (source == textureItem)
	2817	+ if (source == textureItem \|\| source == textureButton)
2431	2818	{
2432	2819	group(new TextureNode());
2433	2820	} else
..	..	@@ -2447,17 +2834,30 @@
2447	2834	{
2448	2835	CastShadow(2);
2449	2836	} else
2450		- if (source == ungroupItem)
	2837	+ if (source == ungroupItem \|\| source == ungroupButton)
2451	2838	{
2452		- //ungroup();
	2839	+ boolean hasRoot = false;
	2840	+
2453	2841	for (int i=0; i<group.selection.size(); i++)
2454	2842	{
2455		- Ungroup(group.selection.get(i));
	2843	+ if (group.selection.get(i) == group)
	2844	+ {
	2845	+ hasRoot = true;
	2846	+ break;
	2847	+ }
2456	2848	}
2457	2849
2458		- ClearSelection(false);
2459		-
2460		- 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	+ }
2461	2861	} else
2462	2862	if (source == genUVItem)
2463	2863	{
..	..	@@ -2469,7 +2869,7 @@
2469	2869	} else
2470	2870	if (source == genNormalsMESHItem)
2471	2871	{
2472		- GenNormals(true); // TODO
	2872	+ GenNormalsMESH();
2473	2873	} else
2474	2874	if (source == genNormalsORGANItem)
2475	2875	{
..	..	@@ -2534,6 +2934,22 @@
2534	2934	if (source == unmarkleavesItem)
2535	2935	{
2536	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);
2537	2953	} else
2538	2954	if (source == flipVItem)
2539	2955	{
..	..	@@ -2742,7 +3158,7 @@
2742	3158	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2743	3159	{
2744	3160	obj = (Object3D)e.nextElement();
2745		- obj.SetBumpTexture(null);
	3161	+ obj.ResetBumpTexture();
2746	3162	}
2747	3163
2748	3164	refreshContents();
..	..	@@ -2758,6 +3174,31 @@
2758	3174
2759	3175	refreshContents();
2760	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
2761	3202	if (source == flashSelectionButton)
2762	3203	{
2763	3204	CameraPane.flash = true;
..	..	@@ -2769,6 +3210,10 @@
2769	3210	if (source == twoButton)
2770	3211	{
2771	3212	radio.layout = twoButton;
	3213	+
	3214	+ if (CameraPane.FULLSCREEN)
	3215	+ fullscreenLayout = radio.layout;
	3216	+
2772	3217	// bug
2773	3218	//gridPanel.setDividerLocation(1.0);
2774	3219	//bigPanel.setDividerLocation(0.0);
..	..	@@ -2801,10 +3246,31 @@
2801	3246	bigThree.ClearUI();
2802	3247	bigThree.add(centralPanel);
2803	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	+
2804	3267	} else
2805	3268	if (source == threeButton)
2806	3269	{
2807	3270	radio.layout = threeButton;
	3271	+
	3272	+ if (CameraPane.FULLSCREEN)
	3273	+ fullscreenLayout = radio.layout;
2808	3274
2809	3275	// bigThree.remove(scenePanel);
2810	3276	// bigThree.remove(centralPanel);
..	..	@@ -2837,10 +3303,15 @@
2837	3303	bigThree.add(centralPanel);
2838	3304	bigThree.add(XYZPanel);
2839	3305	bigThree.FlushUI();
	3306	+
	3307	+ cameraView.requestFocusInWindow();
2840	3308	} else
2841	3309	if (source == fourButton)
2842	3310	{
2843	3311	radio.layout = fourButton;
	3312	+
	3313	+ if (CameraPane.FULLSCREEN)
	3314	+ fullscreenLayout = radio.layout;
2844	3315
2845	3316	// bigThree.remove(scenePanel);
2846	3317	// bigThree.remove(centralPanel);
..	..	@@ -2872,10 +3343,15 @@
2872	3343	bigThree.ClearUI();
2873	3344	bigThree.add(scenePanel);
2874	3345	bigThree.FlushUI();
	3346	+
	3347	+ cameraView.requestFocusInWindow();
2875	3348	} else
2876	3349	if (source == sixButton)
2877	3350	{
2878	3351	radio.layout = sixButton;
	3352	+
	3353	+ if (CameraPane.FULLSCREEN)
	3354	+ fullscreenLayout = radio.layout;
2879	3355
2880	3356	// bigThree.remove(scenePanel);
2881	3357	// bigThree.remove(centralPanel);
..	..	@@ -2908,10 +3384,15 @@
2908	3384	bigThree.add(scenePanel);
2909	3385	bigThree.add(centralPanel);
2910	3386	bigThree.FlushUI();
	3387	+
	3388	+ cameraView.requestFocusInWindow();
2911	3389	} else
2912	3390	if (source == sevenButton)
2913	3391	{
2914	3392	radio.layout = sevenButton;
	3393	+
	3394	+ if (CameraPane.FULLSCREEN)
	3395	+ fullscreenLayout = radio.layout;
2915	3396
2916	3397	// bigThree.remove(scenePanel);
2917	3398	// bigThree.remove(centralPanel);
..	..	@@ -2945,6 +3426,8 @@
2945	3426	bigThree.add(centralPanel);
2946	3427	bigThree.add(XYZPanel);
2947	3428	bigThree.FlushUI();
	3429	+
	3430	+ cameraView.requestFocusInWindow();
2948	3431	} else
2949	3432	if (source == rootButton)
2950	3433	{
..	..	@@ -2956,6 +3439,7 @@
2956	3439	EditObject(obj);
2957	3440	}
2958	3441
	3442	+ cameraView.requestFocusInWindow();
2959	3443	refreshContents(true);
2960	3444	} else
2961	3445	if (source == closeButton)
..	..	@@ -2965,22 +3449,37 @@
2965	3449	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2966	3450	{
2967	3451	ab = (cRadio)e.nextElement();
2968		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3452	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2969	3453	{
	3454	+ // Patch to avoid bug with transparency.
	3455	+ if (!ab.hadMaterial)
	3456	+ {
	3457	+ ab.object.material = null;
	3458	+ }
	3459	+
2970	3460	buttonGroup.remove(ab);
2971	3461	radioPanel.remove(ab);
2972	3462
2973		- ab.GetObject().editWindow = null;
	3463	+ //ab.GetObject().editWindow = null;
	3464	+ ab.GetObject().manipWindow = null;
2974	3465	// ab.GetObject().objectUI = null; // ?????????
2975	3466
2976	3467	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2977	3468	break;
2978	3469	}
2979	3470	}
	3471	+
	3472	+ cameraView.requestFocusInWindow();
2980	3473	refreshContents(true);
2981	3474	} else
2982	3475	if (source == editItem \|\| source == editButton)
2983	3476	{
	3477	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3478	+ {
	3479	+ Object3D child = (Object3D)e.nextElement();
	3480	+ child.pinned = true;
	3481	+ }
	3482	+
2984	3483	EditSelection(false);
2985	3484	} else
2986	3485	if (source == uneditButton)
..	..	@@ -2990,10 +3489,11 @@
2990	3489	Object3D child = (Object3D)e.nextElement();
2991	3490	if(child.editWindow != null)
2992	3491	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3492	+ child.pinned = false;
2993	3493	child.CloseUI();
2994	3494	listUI.remove(child);
2995	3495
2996		- child.editWindow = null; // ???????????
	3496	+ //child.editWindow = null; // ???????????
2997	3497	}
2998	3498	objEditor.ctrlPanel.FlushUI();
2999	3499	//objEditor.jTree.clearSelection();
..	..	@@ -3006,6 +3506,7 @@
3006	3506	//copy.ClearUI();
3007	3507	for (Object3D obj : listUI)
3008	3508	{
	3509	+ obj.pinned = false;
3009	3510	obj.CloseUI();
3010	3511	}
3011	3512	listUI.clear();
..	..	@@ -3015,7 +3516,7 @@
3015	3516	{
3016	3517	assert(copy == group);
3017	3518
3018		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3519	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3019	3520
3020	3521	for (Object3D obj : listUI)
3021	3522	{
..	..	@@ -3064,6 +3565,9 @@
3064	3565	}
3065	3566
3066	3567	copy = group;
	3568	+
	3569	+ SetUndoStates();
	3570	+
3067	3571	//Globals.theRenderer.object = group;
3068	3572	if(!useclient)
3069	3573	{
..	..	@@ -3079,20 +3583,46 @@
3079	3583	frontView.object = group;
3080	3584	sideView.object = group;
3081	3585	}
3082		- group.editWindow = this;
	3586	+
	3587	+// fix "+" issue
	3588	+ //group.editWindow = this;
	3589	+ group.manipWindow = this;
	3590	+
3083	3591	/*
3084	3592	currentLayout = radio.layout;
3085	3593	if (currentLayout == null)
3086	3594	currentLayout = sevenButton;
3087	3595	*/
3088	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);
3089	3604	keepparent = group.parent;
3090	3605	// PARENT = NULL or not???
3091	3606	//group.parent = null; // ROOT
3092	3607	//group.attributes = -1;
3093	3608	ResetModel();
	3609	+
	3610	+ cameraView.requestFocusInWindow();
3094	3611	refreshContents(true);
3095		- }
	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	+ }
3096	3626	else
3097	3627	{
3098	3628	//return super.action(event, arg);
..	..	@@ -3101,7 +3631,6 @@
3101	3631	}
3102	3632
3103	3633	boolean useclient = false;
3104		- cRadio radio;
3105	3634
3106	3635	void ToggleRoot()
3107	3636	{
..	..	@@ -3340,7 +3869,8 @@
3340	3869
3341	3870	int size = obj.MemorySize();
3342	3871
3343		- 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)");
3344	3874	}
3345	3875	}
3346	3876	catch (Exception e)
..	..	@@ -3421,6 +3951,13 @@
3421	3951	void GenNormals(boolean crease)
3422	3952	{
3423	3953	group.GenNormalsS(crease);
	3954	+
	3955	+ refreshContents();
	3956	+ }
	3957	+
	3958	+ void GenNormalsMESH()
	3959	+ {
	3960	+ group.GenNormalsMeshS();
3424	3961
3425	3962	refreshContents();
3426	3963	}
..	..	@@ -3656,7 +4193,7 @@
3656	4193
3657	4194	try
3658	4195	{
3659		- texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4196	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
3660	4197	}
3661	4198	catch (Exception e)
3662	4199	{
..	..	@@ -4048,6 +4585,18 @@
4048	4585	refreshContents();
4049	4586	}
4050	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	+
4051	4600	void SetTexRes(int tr)
4052	4601	{
4053	4602	group.selection.SetTexRes(tr);
..	..	@@ -4119,28 +4668,25 @@
4119	4668	// }
4120	4669	// }
4121	4670
4122		- static boolean allparams = true;
4123		-
4124		- static Vector<Object3D> listUI = new Vector<Object3D>();
4125		-
4126	4671	void EditSelection(boolean newWindow)
4127	4672	{
	4673	+ if (group.selection == null)
	4674	+ {
	4675	+ EditElement(group, newWindow); // ? new
	4676	+ return;
	4677	+ }
	4678	+
4128	4679	// aConstraints.gridy = 0;
4129	4680	for (int i=0; i<group.selection.size(); i++)
4130	4681	{
4131	4682	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4132	4683	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4133		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4684	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4134	4685
4135	4686	Object3D elem = (Object3D)group.selection.elementAt(i);
4136		- if(elem != group)
	4687	+ if(elem != group \|\| !newWindow)
4137	4688	{
4138		- // if (!(elem instanceof Composite))
4139		- // newWindow = false;
4140		- listUI.add(elem);
4141		- elem.openEditWindow(this, newWindow); //, false);
4142		- System.out.println("edit : " + elem);
4143		- elem.editWindow.refreshContents(true); // ? new
	4689	+ EditElement(elem, newWindow); // ? new
4144	4690	}
4145	4691	}
4146	4692	}
..	..	@@ -4215,7 +4761,8 @@
4215	4761	//new Exception().printStackTrace();
4216	4762
4217	4763	freezemodel = true;
4218		-
	4764	+ ClearUnpinned();
	4765	+
4219	4766	/**/
4220	4767	//switch (event.id)
4221	4768	{
..	..	@@ -4223,7 +4770,6 @@
4223	4770	//case 702: // Event.LIST_DESELECT
4224	4771	group.deselectAll();
4225	4772	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4226		- objEditor.ClearInfo(); // .GetMaterial());
4227	4773	if (tps != null)
4228	4774	{
4229	4775	for (int i=0; i < tps.length; i++)
..	..	@@ -4232,10 +4778,8 @@
4232	4778
4233	4779	//if (child.parent != null)
4234	4780	//child.parent.addSelectee(child);
	4781	+ objEditor.SetMaterial(child);
4235	4782	group.addSelectee(child);
4236		- objEditor.SetMaterial(child); // .GetMaterial());
4237		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4238		- System.err.println("info : " + child.GetPath());
4239	4783	}
4240	4784	}
4241	4785	// else
..	..	@@ -4245,20 +4789,28 @@
4245	4789	// System.err.println("info : " + group.GetPath());
4246	4790	// }
4247	4791
4248		- objEditor.SetText(); // jan 2014
4249		-
4250		- 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))
4251	4793	CameraPane.flash = true;
4252	4794
4253		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4795	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4254	4796	// a camera
4255	4797	{
4256		- CameraPane.camerachangeframe = 0; // don't refuse it
4257		- 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	+ }
4258	4803	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4259	4804	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4260	4805	}
4261	4806
	4807	+ if (tps != null && tps.length == 1)
	4808	+ {
	4809	+ EditSelection(false);
	4810	+ }
	4811	+
	4812	+ SetPinStates(tps != null && tps.length > 0);
	4813	+
4262	4814	refreshContents();
4263	4815	//return true;
4264	4816	}
..	..	@@ -4267,6 +4819,35 @@
4267	4819
4268	4820	freezemodel = false;
4269	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	+ }
4270	4851
4271	4852	void linkSomething(Object3D thing)
4272	4853	{
..	..	@@ -4338,6 +4919,7 @@
4338	4919	{
4339	4920	if (group.selection.isEmpty())
4340	4921	return;
	4922	+
4341	4923	Grafreed.clipboardIsTempGroup = false;
4342	4924	Composite tGroup = null;
4343	4925	if (group.selection.size() > 0) // 1)
..	..	@@ -4348,6 +4930,8 @@
4348	4930
4349	4931	if (cut)
4350	4932	{
	4933	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	4934	+// Save();
4351	4935	//int indices[] = jList.getSelectedIndices();
4352	4936	//for (int i = indices.length - 1; i >= 0; i--)
4353	4937	//jList.remove(indices[i]);
..	..	@@ -4437,8 +5021,10 @@
4437	5021	}
4438	5022
4439	5023	}
	5024	+
4440	5025	if (Grafreed.clipboardIsTempGroup)
4441	5026	Grafreed.clipboard = tGroup;
	5027	+
4442	5028	if (cut)
4443	5029	{
4444	5030	ResetModel();
..	..	@@ -4448,6 +5034,10 @@
4448	5034
4449	5035	void paste(boolean expand)
4450	5036	{
	5037	+ if (Globals.REPLACEONMAKE)
	5038	+ Save();
	5039	+ boolean keep = Globals.REPLACEONMAKE;
	5040	+ Globals.REPLACEONMAKE = false;
4451	5041	// if (GrafreeD.clipboard == null)
4452	5042	// return;
4453	5043	boolean first = true;
..	..	@@ -4507,6 +5097,7 @@
4507	5097	Grafreed.clipboard.get(0).parent = keepparent;
4508	5098	}
4509	5099
	5100	+ Globals.REPLACEONMAKE = keep;
4510	5101	ResetModel();
4511	5102	refreshContents();
4512	5103	}
..	..	@@ -4642,6 +5233,10 @@
4642	5233
4643	5234	void group(Object3D csg, boolean grab)
4644	5235	{
	5236	+ if (Globals.REPLACEONMAKE)
	5237	+ Save();
	5238	+ boolean keep = Globals.REPLACEONMAKE;
	5239	+ Globals.REPLACEONMAKE = false;
4645	5240	if (//false) // why??
4646	5241	!group.selection.isEmpty())
4647	5242	{
..	..	@@ -4755,10 +5350,15 @@
4755	5350	//node.add(csg);
4756	5351	//makeSomething(node);
4757	5352	makeSomething(csg);
	5353	+ Globals.REPLACEONMAKE = keep;
4758	5354	}
4759	5355
4760	5356	void Ungroup(Object3D g)
4761	5357	{
	5358	+ if (Globals.REPLACEONMAKE)
	5359	+ Save();
	5360	+ boolean keep = Globals.REPLACEONMAKE;
	5361	+ Globals.REPLACEONMAKE = false;
4762	5362	if (g instanceof HiddenObject)
4763	5363	{
4764	5364	HiddenObject h = (HiddenObject) g;
..	..	@@ -4775,6 +5375,7 @@
4775	5375	objEditor.makeSomething(g.get(i), false);
4776	5376	}
4777	5377	}
	5378	+ Globals.REPLACEONMAKE = keep;
4778	5379	}
4779	5380
4780	5381	void ungroup()
..	..	@@ -4970,21 +5571,6 @@
4970	5571	}
4971	5572	*/
4972	5573
4973		- void ImportGFD()
4974		- {
4975		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4976		- browser.show();
4977		- String filename = browser.getFile();
4978		- if (filename != null && filename.length() > 0)
4979		- {
4980		- String fullname = browser.getDirectory() + filename;
4981		-
4982		- //Object3D readobj =
4983		- objEditor.ReadGFD(fullname, objEditor);
4984		- //makeSomething(readobj);
4985		- }
4986		- }
4987		-
4988	5574	/*
4989	5575	public void Callback(Object obj)
4990	5576	{
..	..	@@ -5008,23 +5594,6 @@
5008	5594	}
5009	5595	*/
5010	5596
5011		- void ImportVRMLX3D()
5012		- {
5013		- if (Grafreed.standAlone)
5014		- {
5015		- /**/
5016		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
5017		- browser.show();
5018		- String filename = browser.getFile();
5019		- if (filename != null && filename.length() > 0)
5020		- {
5021		- String fullname = browser.getDirectory() + filename;
5022		- LoadVRMLX3D(fullname);
5023		- }
5024		- /**/
5025		- }
5026		- }
5027		-
5028	5597	String GetFile(String dialogName)
5029	5598	{
5030	5599	if (Grafreed.standAlone)
..	..	@@ -5095,7 +5664,28 @@
5095	5664	cButton clearpanelButton;
5096	5665	cButton unselectButton;
5097	5666
	5667	+ cButton restoreCameraButton;
	5668	+
	5669	+ cButton saveButton;
5098	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;
5099	5689
5100	5690	cButton screenfitButton;
5101	5691	cButton screenfitpointButton;
..	..	@@ -5108,14 +5698,6 @@
5108	5698
5109	5699	cButton setsupportButton;
5110	5700
5111		- cButton twoButton;
5112		- cButton sixButton;
5113		- cButton threeButton;
5114		- cButton sevenButton;
5115		- cButton fourButton; // full panel
5116		- cButton oneButton; // full XYZ
5117		- //cButton currentLayout;
5118		-
5119	5701	//
5120	5702	//Composite
5121	5703	Object3D // to do !!
..	..	@@ -5125,9 +5707,11 @@
5125	5707	//JTree jTree;
5126	5708	private MenuItem lookAtItem;
5127	5709	private MenuItem lookFromItem;
5128		- private MenuItem switchItem;
	5710	+ private MenuItem switchViewItem;
5129	5711	private MenuItem cutItem;
5130		- private MenuItem duplicateItem;
	5712	+ private MenuItem undoItem;
	5713	+ private MenuItem redoItem;
	5714	+ private JMenuItem duplicateItem;
5131	5715	private MenuItem cloneItem;
5132	5716	private MenuItem cloneSupportItem;
5133	5717	private MenuItem overwriteGeoItem;
..	..	@@ -5155,7 +5739,7 @@
5155	5739	private MenuItem pasteLinkItem;
5156	5740	private MenuItem pasteCloneItem;
5157	5741	private MenuItem pasteExpandItem;
5158		- private MenuItem clearItem;
	5742	+ private MenuItem deleteItem;
5159	5743	private MenuItem clearAllItem;
5160	5744	private MenuItem genUVItem;
5161	5745	private MenuItem genNormalsMESHItem;
..	..	@@ -5190,6 +5774,10 @@
5190	5774	private MenuItem showleavesItem;
5191	5775	private MenuItem markleavesItem;
5192	5776	private MenuItem unmarkleavesItem;
	5777	+ private MenuItem rewindleavesItem;
	5778	+ private MenuItem unrewindleavesItem;
	5779	+ private MenuItem randomleavesItem;
	5780	+ private MenuItem unrandomleavesItem;
5193	5781
5194	5782	private MenuItem flipVItem;
5195	5783	private MenuItem unflipVItem;
..	..	@@ -5211,7 +5799,7 @@
5211	5799	private MenuItem frontItem;
5212	5800	private MenuItem cameraItem;
5213	5801	private MenuItem compositeItem;
5214		- private MenuItem randomItem;
	5802	+ private MenuItem switchItem;
5215	5803	private MenuItem physicsItem;
5216	5804	private MenuItem frameselectorItem;
5217	5805	private MenuItem scriptNodeItem;
..	..	@@ -5235,6 +5823,8 @@
5235	5823	private MenuItem attachBumpItem;
5236	5824	private MenuItem detachBumpItem;
5237	5825	private MenuItem pigmentBumpItem;
	5826	+ private MenuItem embedTexturesItem;
	5827	+ private MenuItem deEmbedTexturesItem;
5238	5828
5239	5829	private MenuItem particleItem;
5240	5830	private MenuItem ragdollItem;
..	..	@@ -5273,11 +5863,6 @@
5273	5863	private MenuItem doubleItem;
5274	5864	private MenuItem tripleItem;
5275	5865
5276		- private MenuItem importGFDItem;
5277		- private MenuItem importVRMLX3DItem;
5278		- private MenuItem import3DSItem;
5279		- private MenuItem importOBJItem;
5280		-
5281	5866	private MenuItem computeAOItem;
5282	5867	private MenuItem recompileItem;
5283	5868	private MenuItem editScriptItem;
..	..	@@ -5287,4 +5872,8 @@
5287	5872	private MenuItem analyzeItem;
5288	5873	private MenuItem dumpItem;
5289	5874	//boolean freezemodel = false;
	5875	+
	5876	+ Menu cameraMenu;
	5877	+ MenuItem editCameraItem;
	5878	+ MenuItem restoreCameraItem;
5290	5879	}