~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -74,7 +74,7 @@
74	74	this.copy = this.group = copy;
75	75	//selectees = this.group.selectees;
76	76
77		- SetupMenu2(objEditor);
	77	+ SetupMenu2(this); //objEditor);
78	78	SetupUI2(objEditor);
79	79	objEditor.SetupUI(true);
80	80	SetupViews(objEditor);
..	..	@@ -148,28 +148,21 @@
148	148
149	149	//JTextField nameField;
150	150
151		- void SetupMenu2(ObjEditor oe)
	151	+ void SetupMenu2(GroupEditor oe)
152	152	{
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		-
	153	+ oe.jTree = new cTree();
	154	+
168	155	Menu menu;
169	156	oe.menuBar.add(menu = new Menu("Edit"));
170	157	//editItem = menu.add(new MenuItem("Edit"));
171	158	//editItem.addActionListener(this);
172		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	159	+
	160	+// undoItem = menu.add(new MenuItem("Undo"));
	161	+// undoItem.addActionListener(this);
	162	+// redoItem = menu.add(new MenuItem("Redo"));
	163	+// redoItem.addActionListener(this);
	164	+// menu.add("-");
	165	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
173	166	duplicateItem.addActionListener(this);
174	167	cloneItem = menu.add(new MenuItem("Clone"));
175	168	cloneItem.addActionListener(this);
..	..	@@ -185,7 +178,6 @@
185	178	copyItem.addActionListener(this);
186	179	pasteItem = menu.add(new MenuItem("Paste"));
187	180	pasteItem.addActionListener(this);
188		- menu.add("-");
189	181
190	182	menu.add("-");
191	183	pasteIntoItem = menu.add(new MenuItem("Paste into"));
..	..	@@ -206,14 +198,97 @@
206	198	clearAllItem = menu.add(new MenuItem("Clear All"));
207	199	clearAllItem.addActionListener(this);
208	200	}
	201	+
	202	+ menuBar.add(cameraMenu = new Menu("View"));
	203	+ //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
	204	+ //zBufferItem.addActionListener(this);
	205	+ //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
	206	+ //normalLensItem.addActionListener(this);
	207	+ cameraMenu.add(revertCameraItem = new MenuItem("Restore Viewpoint"));
	208	+ revertCameraItem.addActionListener(this);
	209	+
	210	+ cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	211	+ toggleFullScreenItem.addItemListener(this);
	212	+ toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	213	+ cameraMenu.add("-");
	214	+
	215	+ cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	216	+ toggleTextureItem.addItemListener(this);
	217	+ toggleTextureItem.setState(CameraPane.textureon);
	218	+
	219	+ cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	220	+ toggleSwitchItem.addItemListener(this);
	221	+ toggleSwitchItem.setState(CameraPane.SWITCH);
	222	+
	223	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
	224	+ toggleHandleItem.addItemListener(this);
	225	+ toggleHandleItem.setState(CameraPane.HANDLES);
	226	+
	227	+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
	228	+ togglePaintItem.addItemListener(this);
	229	+ togglePaintItem.setState(CameraPane.PAINTMODE);
	230	+
	231	+ if (Globals.ADVANCED)
	232	+ {
	233	+ cameraMenu.add("-");
	234	+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
	235	+ toggleLiveItem.addItemListener(this);
	236	+ toggleLiveItem.setState(Globals.isLIVE());
209	237
	238	+ cameraMenu.add(stepItem = new MenuItem("Step"));
	239	+ stepItem.addActionListener(this);
	240	+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
	241	+ // toggleDLItem.addItemListener(this);
	242	+ // toggleDLItem.setState(false);
	243	+
	244	+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
	245	+ toggleRenderItem.addItemListener(this);
	246	+ toggleRenderItem.setState(!CameraPane.frozen);
	247	+
	248	+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
	249	+ toggleDebugItem.addItemListener(this);
	250	+ toggleDebugItem.setState(Globals.DEBUG);
	251	+
	252	+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
	253	+ toggleFrustumItem.addItemListener(this);
	254	+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
	255	+
	256	+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
	257	+ toggleFootContactItem.addItemListener(this);
	258	+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
	259	+
	260	+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
	261	+ toggleTimelineItem.addItemListener(this);
	262	+ }
	263	+
	264	+// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
	265	+// toggleRootItem.addItemListener(this);
	266	+// toggleRootItem.setState(false);
	267	+// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
	268	+// animationItem.addItemListener(this);
	269	+// animationItem.setState(CameraPane.ANIMATION);
	270	+ cameraMenu.add("-");
	271	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
	272	+ editCameraItem.addActionListener(this);
	273	+
	274	+ if (Globals.ADVANCED)
	275	+ {
	276	+ oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
	277	+ //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
	278	+ //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
	279	+ editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
	280	+ oe.cameraMenu.add("-");
	281	+ openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
	282	+ openWindowItem.addActionListener(this);
	283	+ editLeafItem.addActionListener(this);
	284	+ lookAtItem.addActionListener(this);
	285	+ //lookFromItem.addActinoListener(this);
	286	+ //switchItem.addActionListener(this);
	287	+ }
	288	+
210	289	oe.menuBar.add(menu = new Menu("Setting"));
211	290	if (Globals.ADVANCED)
212	291	{
213		- resetMeshItem = menu.add(new MenuItem("Reset All"));
214		- resetMeshItem.addActionListener(this);
215		- stepAllItem = menu.add(new MenuItem("Step All"));
216		- stepAllItem.addActionListener(this);
217	292	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
218	293	revertMeshItem.addActionListener(this);
219	294	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
..	..	@@ -261,13 +336,21 @@
261	336	frontItem.addActionListener(this);
262	337	compositeItem = menu.add(new MenuItem("Composite"));
263	338	compositeItem.addActionListener(this);
	339	+
	340	+ if (Globals.ADVANCED)
	341	+ {
264	342	hideItem = menu.add(new MenuItem("Hidden Group"));
265	343	hideItem.addActionListener(this);
	344	+ }
266	345	ungroupItem = menu.add(new MenuItem("Ungroup"));
267	346	ungroupItem.addActionListener(this);
	347	+
268	348	menu.add("-");
	349	+
269	350	randomItem = menu.add(new MenuItem("Switch node"));
270	351	randomItem.addActionListener(this);
	352	+ if (Globals.ADVANCED)
	353	+ {
271	354	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
272	355	switchGeoItem.addActionListener(this);
273	356	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
..	..	@@ -275,8 +358,6 @@
275	358	morphItem = menu.add(new MenuItem("Morph Group"));
276	359	morphItem.addActionListener(this);
277	360
278		- if (Globals.ADVANCED)
279		- {
280	361	menu.add("-");
281	362	physicsItem = menu.add(new MenuItem("Physics"));
282	363	physicsItem.addActionListener(this);
..	..	@@ -295,11 +376,11 @@
295	376	billboardItem.addActionListener(this);
296	377	csgItem = menu.add(new MenuItem("CSG"));
297	378	csgItem.addActionListener(this);
298		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	379	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
299	380	shadowXItem.addActionListener(this);
300		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	381	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
301	382	shadowYItem.addActionListener(this);
302		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	383	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
303	384	shadowZItem.addActionListener(this);
304	385	if (Globals.ADVANCED)
305	386	{
..	..	@@ -372,6 +453,10 @@
372	453	oe.menuBar.add(menu = new Menu("Attributes"));
373	454	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
374	455	clearMaterialsItem.addActionListener(this);
	456	+ resetAllItem = menu.add(new MenuItem("Reset All"));
	457	+ resetAllItem.addActionListener(this);
	458	+ stepAllItem = menu.add(new MenuItem("Step All"));
	459	+ stepAllItem.addActionListener(this);
375	460	menu.add("-");
376	461	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
377	462	liveleavesItem.addActionListener(this);
..	..	@@ -392,6 +477,14 @@
392	477	markleavesItem.addActionListener(this);
393	478	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
394	479	unmarkleavesItem.addActionListener(this);
	480	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	481	+ rewindleavesItem.addActionListener(this);
	482	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	483	+ unrewindleavesItem.addActionListener(this);
	484	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	485	+ randomleavesItem.addActionListener(this);
	486	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	487	+ unrandomleavesItem.addActionListener(this);
395	488	menu.add("-");
396	489	flipVItem = menu.add(new MenuItem("Flip V"));
397	490	flipVItem.addActionListener(this);
..	..	@@ -443,25 +536,24 @@
443	536	oe.menuBar.add(menu = new Menu("Insert"));
444	537	buildCreateMenu(menu);
445	538
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	539	oe.menuBar.add(menu = new Menu("Tools"));
460	540	buildToolsMenu(menu);
461	541	}
462	542
463	543	void SetupUI2(ObjEditor oe)
464	544	{
	545	+ // June 2019
	546	+ if (oe == null)
	547	+ {
	548	+ //super.SetupUI2(this);
	549	+ //return;
	550	+ }
	551	+
	552	+ if (copy != group)
	553	+ {
	554	+ //super.SetupUI2(this);
	555	+ }
	556	+
465	557	//new Exception().printStackTrace();
466	558
467	559	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -492,23 +584,49 @@
492	584	*/
493	585	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
494	586
495		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
496		- liveCB.setToolTipText("Enabled animation");
	587	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	588	+ //minButton.setToolTipText("Minimize window");
	589	+ //minButton.addActionListener(this);
	590	+
	591	+ oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	592	+ maxButton.setToolTipText("Maximize window");
	593	+ maxButton.addActionListener(this);
	594	+
	595	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	596	+ fullButton.setToolTipText("Full-screen window");
	597	+ fullButton.addActionListener(this);
	598	+
	599	+ oe.toolboxPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	600	+ undoButton.setToolTipText("Undo changes");
	601	+ undoButton.addActionListener(this);
	602	+
	603	+ oe.toolboxPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	604	+ redoButton.setToolTipText("Redo changes");
	605	+ redoButton.addActionListener(this);
	606	+
	607	+ oe.toolboxPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	608	+ saveButton.setToolTipText("Save changes");
	609	+ saveButton.addActionListener(this);
	610	+
	611	+ oe.toolboxPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	612	+ liveCB.setToolTipText("Enable animation");
497	613	liveCB.addItemListener(this);
498	614
499		- oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	615	+ oe.toolboxPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
500	616	oneStepButton.setToolTipText("Animate one step forward");
501	617	oneStepButton.addActionListener(this);
502	618
503		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	619	+ oe.toolboxPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
504	620	fastCB.setToolTipText("Fast mode");
505	621	fastCB.addItemListener(this);
506	622
507		- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	623	+ oe.toolboxPanel.Return();
	624	+
	625	+ oe.toolboxPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
508	626	trackCB.setToolTipText("Enable tracking");
509	627	trackCB.addItemListener(this);
510	628
511		- oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	629	+ oe.toolboxPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
512	630	screenfitButton.setToolTipText("Screen fit");
513	631	screenfitButton.addActionListener(this);
514	632
..	..	@@ -522,65 +640,112 @@
522	640	snapobjectButton.setToolTipText("Snap Object");
523	641	}
524	642
525		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
526		- flashSelectionButton.setToolTipText("Show selection");
	643	+ oe.toolboxPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	644	+ flashSelectionButton.setToolTipText("Highlight selection");
527	645	flashSelectionButton.addActionListener(this);
528	646
529		- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
	647	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
530	648
531		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	649	+ oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
532	650	twoButton.setToolTipText("Show center view only");
533	651	twoButton.addActionListener(this);
534		- oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	652	+ this.fullscreenLayout = twoButton;
	653	+
	654	+ oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
535	655	fourButton.addActionListener(this);
536	656	fourButton.setToolTipText("Show left panel only");
537		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	657	+ oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
538	658	sixButton.setToolTipText("2-column layout left");
539	659	sixButton.addActionListener(this);
540		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	660	+ oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
541	661	threeButton.setToolTipText("2-column layout right");
542	662	threeButton.addActionListener(this);
543		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	663	+ oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
544	664	sevenButton.setToolTipText("3-column layout");
545	665	sevenButton.addActionListener(this);
546	666	//
547	667
548		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	668	+ oe.toolbarPanel.add(rootButton = GetButton("icons/write.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
549	669	rootButton.setToolTipText("Edit selection in new tab");
550	670	rootButton.addActionListener(this);
551	671
552		- oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	672	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
553	673	closeButton.setToolTipText("Close tab");
554	674	closeButton.addActionListener(this);
555	675	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
556	676	//clearButton.addActionListener(this);
557		-
558		- cGridBag commandsPanel = new cGridBag();
	677	+
	678	+ // INSERT
	679	+ oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	680	+ gridButton.setToolTipText("Create grid");
	681	+ gridButton.addActionListener(this);
	682	+
	683	+ oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	684	+ boxButton.setToolTipText("Create box");
	685	+ boxButton.addActionListener(this);
	686	+
	687	+ oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	688	+ sphereButton.setToolTipText("Create sphere");
	689	+ sphereButton.addActionListener(this);
	690	+
	691	+ oe.toolboxPanel.Return();
559	692
560		- commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	693	+ oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	694	+ coneButton.setToolTipText("Create cone");
	695	+ coneButton.addActionListener(this);
	696	+
	697	+ oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	698	+ torusButton.setToolTipText("Create torus");
	699	+ torusButton.addActionListener(this);
	700	+
	701	+ oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	702	+ superButton.setToolTipText("Create superellipsoid");
	703	+ superButton.addActionListener(this);
	704	+
	705	+ if (Globals.ADVANCED)
	706	+ {
	707	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	708	+ kleinButton.setToolTipText("Create Klein bottle");
	709	+ kleinButton.addActionListener(this);
	710	+ }
	711	+
	712	+ oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	713	+ particlesButton.setToolTipText("Create particle system");
	714	+ particlesButton.addActionListener(this);
	715	+
	716	+ oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	717	+ overlayButton.setToolTipText("Create overlay");
	718	+ overlayButton.addActionListener(this);
	719	+
	720	+ oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	721	+ lightButton.setToolTipText("Create light");
	722	+ lightButton.addActionListener(this);
	723	+
	724	+ // EDIT panel
	725	+ editCommandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
561	726	editButton.setToolTipText("Edit selection");
562	727	editButton.addActionListener(this);
563	728
564		- commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	729	+ editCommandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
565	730	uneditButton.setToolTipText("Unedit selection");
566	731	uneditButton.addActionListener(this);
567	732
568		- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	733	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
569	734	allParamsButton.setToolTipText("Edit all params");
570	735	allParamsButton.addActionListener(this);
571	736
572		- commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	737	+ editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
573	738	clearPanelButton.setToolTipText("Clear edit panel");
574	739	clearPanelButton.addActionListener(this);
575	740
576		- commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	741	+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
577	742	unselectButton.setToolTipText("Unselect");
578	743	unselectButton.addActionListener(this);
579	744
580		- commandsPanel.preferredHeight = 1;
	745	+ editCommandsPanel.preferredHeight = 1;
581	746
582		- oe.treePanel.add(commandsPanel);
583		- oe.treePanel.Return();
	747	+// oe.treePanel.add(commandsPanel);
	748	+// oe.treePanel.Return();
584	749
585	750	// oe.aConstraints.gridx += 1;
586	751	// oe.aConstraints.weighty = 0;
..	..	@@ -597,7 +762,7 @@
597	762
598	763	JScrollPane jSP;
599	764	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
600		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	765	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
601	766	ResetModel();
602	767
603	768	oe.treePanel.add(jSPPanel);
..	..	@@ -702,11 +867,23 @@
702	867	// debugCB.addItemListener(this);
703	868
704	869	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	870	+ oeilCB.setToolTipText("Move camera when tracking target");
705	871	oeilCB.addItemListener(this);
706	872
	873	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	874	+ shadowCB.setToolTipText("Compute shadows when live");
	875	+ shadowCB.addItemListener(this);
	876	+
	877	+ panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
	878	+ autosaveCB.setToolTipText("Auto-save on structure change");
	879	+ autosaveCB.addItemListener(this);
	880	+
	881	+ if (Globals.ADVANCED)
	882	+ {
707	883	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
708	884	lookAtCB.setToolTipText("Look-at target");
709	885	lookAtCB.addItemListener(this);
	886	+ }
710	887
711	888	}
712	889
..	..	@@ -721,6 +898,14 @@
721	898	void EditObject(Object3D obj)
722	899	{
723	900	cRadio radioButton = new cRadio(obj.name);
	901	+
	902	+ // Patch to avoid bug with transparency.
	903	+ radioButton.hadMaterial = obj.material != null;
	904	+ if (!radioButton.hadMaterial)
	905	+ {
	906	+ obj.material = new cMaterial();
	907	+ }
	908	+
724	909	radioButton.SetObject(obj);
725	910	radioButton.layout = sevenButton;
726	911	radioButton.SetCamera(cameraView.renderCamera, false);
..	..	@@ -729,8 +914,11 @@
729	914	buttonGroup.add(radioButton);
730	915	radioButton.doClick();
731	916	}
	917	+
732	918	void SetupViews(ObjEditor oe)
733	919	{
	920	+ theFrame = this;
	921	+
734	922	oe.SetupViews();
735	923
736	924	System.out.println("SetupViews");
..	..	@@ -739,23 +927,26 @@
739	927	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
740	928	}
741	929
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;
	930	+ cToggleButton liveCB;
	931	+ cCheckBox supportCB;
	932	+ cCheckBox localCB;
	933	+ cCheckBox crowdCB;
	934	+ cCheckBox smoothCB;
	935	+ cToggleButton fastCB;
	936	+ cCheckBox slowCB;
	937	+ cCheckBox boxCB;
	938	+ cCheckBox zoomBoxCB;
	939	+ cToggleButton trackCB;
	940	+ cCheckBox smoothfocusCB;
753	941	// JCheckBox speakerMocapCB;
754		- JCheckBox speakerCameraCB;
755		- JCheckBox speakerFocusCB;
756		- JCheckBox debugCB;
757		- JCheckBox oeilCB;
758		- JCheckBox lookAtCB;
	942	+ cCheckBox speakerCameraCB;
	943	+ cCheckBox speakerFocusCB;
	944	+ cCheckBox debugCB;
	945	+
	946	+ cCheckBox oeilCB;
	947	+ cCheckBox shadowCB;
	948	+ cCheckBox autosaveCB;
	949	+ cCheckBox lookAtCB;
759	950
760	951	// static int COLOR = 1;
761	952	// static int MATERIAL = 2;
..	..	@@ -763,9 +954,9 @@
763	954
764	955	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
765	956
766		- JCheckBox colorCB;
767		- JCheckBox materialCB;
768		- JCheckBox textureCB;
	957	+ cCheckBox colorCB;
	958	+ cCheckBox materialCB;
	959	+ cCheckBox textureCB;
769	960
770	961	public void itemStateChanged(ItemEvent e)
771	962	{
..	..	@@ -793,6 +984,7 @@
793	984	} else if(e.getSource() == liveCB)
794	985	{
795	986	cameraView.ToggleLive();
	987	+ refreshContents(false);
796	988	}
797	989	else if(e.getSource() == supportCB)
798	990	{
..	..	@@ -857,6 +1049,14 @@
857	1049	{
858	1050	cameraView.ToggleOeil();
859	1051	}
	1052	+ else if(e.getSource() == shadowCB)
	1053	+ {
	1054	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1055	+ }
	1056	+ else if(e.getSource() == autosaveCB)
	1057	+ {
	1058	+ Globals.SAVEONMAKE ^= true;
	1059	+ }
860	1060	else if(e.getSource() == lookAtCB)
861	1061	{
862	1062	cameraView.ToggleLookAt();
..	..	@@ -873,7 +1073,8 @@
873	1073
874	1074	/**/
875	1075	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
876		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1076	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1077	+ TreePath path = objEditor.jTree.getSelectionPath();
877	1078	if ((path == null) \|\| (path.getPathCount() <= 1)) {
878	1079	// We can't move the root node or an empty selection
879	1080	return;
..	..	@@ -997,16 +1198,16 @@
997	1198	return;
998	1199	}
999	1200
1000		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
1001		- {
	1201	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1202	+// {
1002	1203	loadClipboard(true);
1003	1204	objEditor.jTree.setSelectionPath(destinationPath);
1004	1205	pasteInto(false, false);
1005		- } else {
1006		- loadClipboard(false);
1007		- objEditor.jTree.setSelectionPath(destinationPath);
1008		- pasteInto(false, false); // true); // ???
1009		- }
	1206	+// } else {
	1207	+// loadClipboard(false);
	1208	+// objEditor.jTree.setSelectionPath(destinationPath);
	1209	+// pasteInto(false, false); // true); // ???
	1210	+// }
1010	1211	}
1011	1212	public void dropActionChanged(DropTargetDragEvent dtde)
1012	1213	// Called if the user has modified the current drop gesture
..	..	@@ -1200,7 +1401,7 @@
1200	1401	memoryItem.addActionListener(this);
1201	1402	menu.add(analyzeItem = new MenuItem("Analyze"));
1202	1403	analyzeItem.addActionListener(this);
1203		- menu.add(dumpItem = new MenuItem("Dump"));
	1404	+ menu.add(dumpItem = new MenuItem("Print"));
1204	1405	dumpItem.addActionListener(this);
1205	1406	// menu.add(pathItem = new MenuItem("From-to path"));
1206	1407	// pathItem.addActionListener(this);
..	..	@@ -1341,6 +1542,7 @@
1341	1542	shadow.material = new cMaterial(obj.material);
1342	1543	shadow.material.diffuse = 0.0001f;
1343	1544	shadow.material.specular = 0.0001f;
	1545	+ //shadow.projectedVertices[1].x = 300;
1344	1546
1345	1547	makeSomething(shadow);
1346	1548	}
..	..	@@ -1597,11 +1799,11 @@
1597	1799	objEditor.cameraView.renderCamera.setAim(v2, v1);
1598	1800	objEditor.cameraView.repaint();
1599	1801	} else
1600		- if (source == rectoidItem)
	1802	+ if (source == rectoidItem \|\| source == boxButton)
1601	1803	{
1602	1804	makeSomething(new Box());
1603	1805	} else
1604		- if (source == particleItem)
	1806	+ if (source == particleItem \|\| source == particlesButton)
1605	1807	{
1606	1808	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1607	1809	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1680,27 +1882,27 @@
1680	1882
1681	1883	makeSomething(obj);
1682	1884	} else
1683		- if (source == gridItem)
	1885	+ if (source == gridItem \|\| source == gridButton)
1684	1886	{
1685	1887	makeSomething(new Grid());
1686	1888	} else
1687		- if (source == ellipsoidItem)
	1889	+ if (source == ellipsoidItem \|\| source == sphereButton)
1688	1890	{
1689	1891	makeSomething(new Sphere());
1690	1892	} else
1691		- if (source == coneItem)
	1893	+ if (source == coneItem \|\| source == coneButton)
1692	1894	{
1693	1895	makeSomething(new Cone());
1694	1896	} else
1695		- if (source == torusItem)
	1897	+ if (source == torusItem \|\| source == torusButton)
1696	1898	{
1697	1899	makeSomething(new Torus());
1698	1900	} else
1699		- if (source == superItem)
	1901	+ if (source == superItem \|\| source == superButton)
1700	1902	{
1701	1903	makeSomething(new Superellipsoid());
1702	1904	} else
1703		- if (source == kleinItem)
	1905	+ if (source == kleinItem \|\| source == kleinButton)
1704	1906	{
1705	1907	makeSomething(new Klein());
1706	1908	} else
..	..	@@ -1720,7 +1922,7 @@
1720	1922	{
1721	1923	makeSomething(new BezierSurface());
1722	1924	} else
1723		- if (source == overlayItem)
	1925	+ if (source == overlayItem \|\| source == overlayButton)
1724	1926	{
1725	1927	/*
1726	1928	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1768,7 +1970,7 @@
1768	1970	s.setup();
1769	1971	makeSomething(s);
1770	1972	} else
1771		- if (source == lightItem)
	1973	+ if (source == lightItem \|\| source == lightButton)
1772	1974	{
1773	1975	makeSomething(new Light());
1774	1976	} else
..	..	@@ -1854,31 +2056,6 @@
1854	2056	csg.addChild(child);
1855	2057	child.addChild(csg);
1856	2058	} 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		- } else
1882	2059	if (source == computeAOItem)
1883	2060	{
1884	2061	Globals.drawMode = CameraPane.OCCLUSION;
..	..	@@ -1915,6 +2092,30 @@
1915	2092	if (source == dumpItem)
1916	2093	{
1917	2094	DumpObject();
	2095	+ } else
	2096	+ if (source == minButton)
	2097	+ {
	2098	+ Minimize();
	2099	+ } else
	2100	+ if (source == maxButton)
	2101	+ {
	2102	+ Maximize();
	2103	+ } else
	2104	+ if (source == fullButton)
	2105	+ {
	2106	+ ToggleFullScreen();
	2107	+ } else
	2108	+ if (source == undoButton)
	2109	+ {
	2110	+ Undo();
	2111	+ } else
	2112	+ if (source == redoButton)
	2113	+ {
	2114	+ Redo();
	2115	+ } else
	2116	+ if (source == saveButton)
	2117	+ {
	2118	+ Save();
1918	2119	} else
1919	2120	if (source == oneStepButton)
1920	2121	{
..	..	@@ -1969,6 +2170,14 @@
1969	2170	if (source == cutItem \|\| source == clearButton)
1970	2171	{
1971	2172	loadClipboard(true);
	2173	+ } else
	2174	+ if (source == undoItem)
	2175	+ {
	2176	+ Undo();
	2177	+ } else
	2178	+ if (source == redoItem)
	2179	+ {
	2180	+ Redo();
1972	2181	} else
1973	2182	if (source == duplicateItem)
1974	2183	{
..	..	@@ -2281,7 +2490,7 @@
2281	2490	{
2282	2491	RevertMeshes();
2283	2492	} else
2284		- if (source == resetMeshItem)
	2493	+ if (source == resetAllItem)
2285	2494	{
2286	2495	ResetAll();
2287	2496	} else
..	..	@@ -2447,7 +2656,7 @@
2447	2656	{
2448	2657	CastShadow(2);
2449	2658	} else
2450		- if (source == ungroupItem)
	2659	+ if (source == ungroupItem \|\| source == ungroupButton)
2451	2660	{
2452	2661	//ungroup();
2453	2662	for (int i=0; i<group.selection.size(); i++)
..	..	@@ -2469,7 +2678,7 @@
2469	2678	} else
2470	2679	if (source == genNormalsMESHItem)
2471	2680	{
2472		- GenNormals(true); // TODO
	2681	+ GenNormalsMESH();
2473	2682	} else
2474	2683	if (source == genNormalsORGANItem)
2475	2684	{
..	..	@@ -2534,6 +2743,22 @@
2534	2743	if (source == unmarkleavesItem)
2535	2744	{
2536	2745	MarkLeaves(false);
	2746	+ } else
	2747	+ if (source == rewindleavesItem)
	2748	+ {
	2749	+ RewindLeaves(true);
	2750	+ } else
	2751	+ if (source == unrewindleavesItem)
	2752	+ {
	2753	+ RewindLeaves(false);
	2754	+ } else
	2755	+ if (source == randomleavesItem)
	2756	+ {
	2757	+ RandomLeaves(true);
	2758	+ } else
	2759	+ if (source == unrandomleavesItem)
	2760	+ {
	2761	+ RandomLeaves(false);
2537	2762	} else
2538	2763	if (source == flipVItem)
2539	2764	{
..	..	@@ -2769,6 +2994,10 @@
2769	2994	if (source == twoButton)
2770	2995	{
2771	2996	radio.layout = twoButton;
	2997	+
	2998	+ if (CameraPane.FULLSCREEN)
	2999	+ fullscreenLayout = radio.layout;
	3000	+
2772	3001	// bug
2773	3002	//gridPanel.setDividerLocation(1.0);
2774	3003	//bigPanel.setDividerLocation(0.0);
..	..	@@ -2801,10 +3030,31 @@
2801	3030	bigThree.ClearUI();
2802	3031	bigThree.add(centralPanel);
2803	3032	bigThree.FlushUI();
	3033	+
	3034	+ cameraView.requestFocusInWindow();
	3035	+
	3036	+// refreshContents(true);
	3037	+//
	3038	+// try
	3039	+// {
	3040	+// java.awt.Robot bot = new java.awt.Robot();
	3041	+// int mask = InputEvent.BUTTON1_MASK;
	3042	+// bot.mouseMove(100, 100);
	3043	+// bot.mousePress(mask);
	3044	+// bot.mouseRelease(mask);
	3045	+// }
	3046	+// catch (Exception e)
	3047	+// {
	3048	+//
	3049	+// }
	3050	+
2804	3051	} else
2805	3052	if (source == threeButton)
2806	3053	{
2807	3054	radio.layout = threeButton;
	3055	+
	3056	+ if (CameraPane.FULLSCREEN)
	3057	+ fullscreenLayout = radio.layout;
2808	3058
2809	3059	// bigThree.remove(scenePanel);
2810	3060	// bigThree.remove(centralPanel);
..	..	@@ -2837,10 +3087,15 @@
2837	3087	bigThree.add(centralPanel);
2838	3088	bigThree.add(XYZPanel);
2839	3089	bigThree.FlushUI();
	3090	+
	3091	+ cameraView.requestFocusInWindow();
2840	3092	} else
2841	3093	if (source == fourButton)
2842	3094	{
2843	3095	radio.layout = fourButton;
	3096	+
	3097	+ if (CameraPane.FULLSCREEN)
	3098	+ fullscreenLayout = radio.layout;
2844	3099
2845	3100	// bigThree.remove(scenePanel);
2846	3101	// bigThree.remove(centralPanel);
..	..	@@ -2872,10 +3127,15 @@
2872	3127	bigThree.ClearUI();
2873	3128	bigThree.add(scenePanel);
2874	3129	bigThree.FlushUI();
	3130	+
	3131	+ cameraView.requestFocusInWindow();
2875	3132	} else
2876	3133	if (source == sixButton)
2877	3134	{
2878	3135	radio.layout = sixButton;
	3136	+
	3137	+ if (CameraPane.FULLSCREEN)
	3138	+ fullscreenLayout = radio.layout;
2879	3139
2880	3140	// bigThree.remove(scenePanel);
2881	3141	// bigThree.remove(centralPanel);
..	..	@@ -2908,10 +3168,15 @@
2908	3168	bigThree.add(scenePanel);
2909	3169	bigThree.add(centralPanel);
2910	3170	bigThree.FlushUI();
	3171	+
	3172	+ cameraView.requestFocusInWindow();
2911	3173	} else
2912	3174	if (source == sevenButton)
2913	3175	{
2914	3176	radio.layout = sevenButton;
	3177	+
	3178	+ if (CameraPane.FULLSCREEN)
	3179	+ fullscreenLayout = radio.layout;
2915	3180
2916	3181	// bigThree.remove(scenePanel);
2917	3182	// bigThree.remove(centralPanel);
..	..	@@ -2945,6 +3210,8 @@
2945	3210	bigThree.add(centralPanel);
2946	3211	bigThree.add(XYZPanel);
2947	3212	bigThree.FlushUI();
	3213	+
	3214	+ cameraView.requestFocusInWindow();
2948	3215	} else
2949	3216	if (source == rootButton)
2950	3217	{
..	..	@@ -2956,6 +3223,7 @@
2956	3223	EditObject(obj);
2957	3224	}
2958	3225
	3226	+ cameraView.requestFocusInWindow();
2959	3227	refreshContents(true);
2960	3228	} else
2961	3229	if (source == closeButton)
..	..	@@ -2965,18 +3233,27 @@
2965	3233	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2966	3234	{
2967	3235	ab = (cRadio)e.nextElement();
2968		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3236	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2969	3237	{
	3238	+ // Patch to avoid bug with transparency.
	3239	+ if (!ab.hadMaterial)
	3240	+ {
	3241	+ ab.object.material = null;
	3242	+ }
	3243	+
2970	3244	buttonGroup.remove(ab);
2971	3245	radioPanel.remove(ab);
2972	3246
2973		- ab.GetObject().editWindow = null;
	3247	+ //ab.GetObject().editWindow = null;
	3248	+ ab.GetObject().manipWindow = null;
2974	3249	// ab.GetObject().objectUI = null; // ?????????
2975	3250
2976	3251	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2977	3252	break;
2978	3253	}
2979	3254	}
	3255	+
	3256	+ cameraView.requestFocusInWindow();
2980	3257	refreshContents(true);
2981	3258	} else
2982	3259	if (source == editItem \|\| source == editButton)
..	..	@@ -2993,7 +3270,7 @@
2993	3270	child.CloseUI();
2994	3271	listUI.remove(child);
2995	3272
2996		- child.editWindow = null; // ???????????
	3273	+ //child.editWindow = null; // ???????????
2997	3274	}
2998	3275	objEditor.ctrlPanel.FlushUI();
2999	3276	//objEditor.jTree.clearSelection();
..	..	@@ -3079,7 +3356,11 @@
3079	3356	frontView.object = group;
3080	3357	sideView.object = group;
3081	3358	}
3082		- group.editWindow = this;
	3359	+
	3360	+// fix "+" issue
	3361	+ //group.editWindow = this;
	3362	+ group.manipWindow = this;
	3363	+
3083	3364	/*
3084	3365	currentLayout = radio.layout;
3085	3366	if (currentLayout == null)
..	..	@@ -3091,8 +3372,23 @@
3091	3372	//group.parent = null; // ROOT
3092	3373	//group.attributes = -1;
3093	3374	ResetModel();
	3375	+
	3376	+ cameraView.requestFocusInWindow();
3094	3377	refreshContents(true);
3095		- }
	3378	+ } else if (event.getSource() == editCameraItem)
	3379	+ {
	3380	+ cameraView.ProtectCamera();
	3381	+ cameraView.repaint();
	3382	+ return;
	3383	+ } else if (event.getSource() == revertCameraItem)
	3384	+ {
	3385	+ cameraView.RevertCamera();
	3386	+ cameraView.repaint();
	3387	+ return;
	3388	+ // } else if (event.getSource() == textureButton)
	3389	+ // {
	3390	+ // return; // true;
	3391	+ }
3096	3392	else
3097	3393	{
3098	3394	//return super.action(event, arg);
..	..	@@ -3101,7 +3397,6 @@
3101	3397	}
3102	3398
3103	3399	boolean useclient = false;
3104		- cRadio radio;
3105	3400
3106	3401	void ToggleRoot()
3107	3402	{
..	..	@@ -3340,7 +3635,8 @@
3340	3635
3341	3636	int size = obj.MemorySize();
3342	3637
3343		- System.err.println((size/1024) + " KB is the size of " + obj);
	3638	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	3639	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3344	3640	}
3345	3641	}
3346	3642	catch (Exception e)
..	..	@@ -3421,6 +3717,13 @@
3421	3717	void GenNormals(boolean crease)
3422	3718	{
3423	3719	group.GenNormalsS(crease);
	3720	+
	3721	+ refreshContents();
	3722	+ }
	3723	+
	3724	+ void GenNormalsMESH()
	3725	+ {
	3726	+ group.GenNormalsMeshS();
3424	3727
3425	3728	refreshContents();
3426	3729	}
..	..	@@ -3652,7 +3955,16 @@
3652	3955	String pigment = Object3D.GetPigment(tex);
3653	3956	//String bump = Object3D.GetBump(tex);
3654	3957
3655		- com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	3958	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	3959	+
	3960	+ try
	3961	+ {
	3962	+ texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	3963	+ }
	3964	+ catch (Exception e)
	3965	+ {
	3966	+ System.err.println("FAIL: " + node);
	3967	+ }
3656	3968
3657	3969	double s = v.s;
3658	3970
..	..	@@ -4039,6 +4351,18 @@
4039	4351	refreshContents();
4040	4352	}
4041	4353
	4354	+ void RewindLeaves(boolean hide)
	4355	+ {
	4356	+ group.selection.RewindLeaves(hide);
	4357	+ refreshContents();
	4358	+ }
	4359	+
	4360	+ void RandomLeaves(boolean hide)
	4361	+ {
	4362	+ group.selection.RandomLeaves(hide);
	4363	+ refreshContents();
	4364	+ }
	4365	+
4042	4366	void SetTexRes(int tr)
4043	4367	{
4044	4368	group.selection.SetTexRes(tr);
..	..	@@ -4121,10 +4445,10 @@
4121	4445	{
4122	4446	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4123	4447	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4124		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4448	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4125	4449
4126	4450	Object3D elem = (Object3D)group.selection.elementAt(i);
4127		- if(elem != group)
	4451	+ if(elem != group \|\| !newWindow)
4128	4452	{
4129	4453	// if (!(elem instanceof Composite))
4130	4454	// newWindow = false;
..	..	@@ -4214,7 +4538,6 @@
4214	4538	//case 702: // Event.LIST_DESELECT
4215	4539	group.deselectAll();
4216	4540	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4217		- objEditor.ClearInfo(); // .GetMaterial());
4218	4541	if (tps != null)
4219	4542	{
4220	4543	for (int i=0; i < tps.length; i++)
..	..	@@ -4223,10 +4546,8 @@
4223	4546
4224	4547	//if (child.parent != null)
4225	4548	//child.parent.addSelectee(child);
	4549	+ objEditor.SetMaterial(child);
4226	4550	group.addSelectee(child);
4227		- objEditor.SetMaterial(child); // .GetMaterial());
4228		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4229		- System.err.println("info : " + child.GetPath());
4230	4551	}
4231	4552	}
4232	4553	// else
..	..	@@ -4236,16 +4557,17 @@
4236	4557	// System.err.println("info : " + group.GetPath());
4237	4558	// }
4238	4559
4239		- objEditor.SetText(); // jan 2014
4240		-
4241		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4560	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4242	4561	CameraPane.flash = true;
4243	4562
4244		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4563	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4245	4564	// a camera
4246	4565	{
4247		- CameraPane.camerachangeframe = 0; // don't refuse it
4248		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4566	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	4567	+ {
	4568	+ CameraPane.camerachangeframe = 0; // don't refuse it
	4569	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4570	+ }
4249	4571	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4250	4572	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4251	4573	}
..	..	@@ -4258,6 +4580,26 @@
4258	4580
4259	4581	freezemodel = false;
4260	4582	}
	4583	+
	4584	+ void refreshContents(boolean cp)
	4585	+ {
	4586	+ if (!Globals.MOUSEDRAGGED)
	4587	+ {
	4588	+ objEditor.ClearInfo(); // .GetMaterial());
	4589	+
	4590	+ for (int i=0; i < group.selection.Size(); i++)
	4591	+ {
	4592	+ Object3D child = (Object3D) group.selection.get(i);
	4593	+
	4594	+ objEditor.AddInfo(child, this, true);
	4595	+ System.err.println("info : " + child.GetPath());
	4596	+ }
	4597	+
	4598	+ objEditor.SetText(); // jan 2014
	4599	+ }
	4600	+
	4601	+ super.refreshContents(cp);
	4602	+ }
4261	4603
4262	4604	void linkSomething(Object3D thing)
4263	4605	{
..	..	@@ -4329,6 +4671,7 @@
4329	4671	{
4330	4672	if (group.selection.isEmpty())
4331	4673	return;
	4674	+
4332	4675	Grafreed.clipboardIsTempGroup = false;
4333	4676	Composite tGroup = null;
4334	4677	if (group.selection.size() > 0) // 1)
..	..	@@ -4339,6 +4682,8 @@
4339	4682
4340	4683	if (cut)
4341	4684	{
	4685	+ if (Globals.SAVEONMAKE)
	4686	+ Save();
4342	4687	//int indices[] = jList.getSelectedIndices();
4343	4688	//for (int i = indices.length - 1; i >= 0; i--)
4344	4689	//jList.remove(indices[i]);
..	..	@@ -4428,8 +4773,10 @@
4428	4773	}
4429	4774
4430	4775	}
	4776	+
4431	4777	if (Grafreed.clipboardIsTempGroup)
4432	4778	Grafreed.clipboard = tGroup;
	4779	+
4433	4780	if (cut)
4434	4781	{
4435	4782	ResetModel();
..	..	@@ -4961,21 +5308,6 @@
4961	5308	}
4962	5309	*/
4963	5310
4964		- void ImportGFD()
4965		- {
4966		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4967		- browser.show();
4968		- String filename = browser.getFile();
4969		- if (filename != null && filename.length() > 0)
4970		- {
4971		- String fullname = browser.getDirectory() + filename;
4972		-
4973		- //Object3D readobj =
4974		- objEditor.ReadGFD(fullname, objEditor);
4975		- //makeSomething(readobj);
4976		- }
4977		- }
4978		-
4979	5311	/*
4980	5312	public void Callback(Object obj)
4981	5313	{
..	..	@@ -4999,23 +5331,6 @@
4999	5331	}
5000	5332	*/
5001	5333
5002		- void ImportVRMLX3D()
5003		- {
5004		- if (Grafreed.standAlone)
5005		- {
5006		- /**/
5007		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
5008		- browser.show();
5009		- String filename = browser.getFile();
5010		- if (filename != null && filename.length() > 0)
5011		- {
5012		- String fullname = browser.getDirectory() + filename;
5013		- LoadVRMLX3D(fullname);
5014		- }
5015		- /**/
5016		- }
5017		- }
5018		-
5019	5334	String GetFile(String dialogName)
5020	5335	{
5021	5336	if (Grafreed.standAlone)
..	..	@@ -5086,7 +5401,28 @@
5086	5401	cButton clearpanelButton;
5087	5402	cButton unselectButton;
5088	5403
	5404	+ cButton minButton;
	5405	+ cButton maxButton;
	5406	+ cButton fullButton;
	5407	+ cButton undoButton;
	5408	+ cButton redoButton;
	5409	+ cButton saveButton;
5089	5410	cButton oneStepButton;
	5411	+
	5412	+ cButton groupButton;
	5413	+ cButton ungroupButton;
	5414	+ cButton compositeButton;
	5415	+
	5416	+ cButton gridButton;
	5417	+ cButton boxButton;
	5418	+ cButton sphereButton;
	5419	+ cButton coneButton;
	5420	+ cButton torusButton;
	5421	+ cButton superButton;
	5422	+ cButton kleinButton;
	5423	+ cButton particlesButton;
	5424	+ cButton overlayButton;
	5425	+ cButton lightButton;
5090	5426
5091	5427	cButton screenfitButton;
5092	5428	cButton screenfitpointButton;
..	..	@@ -5099,14 +5435,6 @@
5099	5435
5100	5436	cButton setsupportButton;
5101	5437
5102		- cButton twoButton;
5103		- cButton sixButton;
5104		- cButton threeButton;
5105		- cButton sevenButton;
5106		- cButton fourButton; // full panel
5107		- cButton oneButton; // full XYZ
5108		- //cButton currentLayout;
5109		-
5110	5438	//
5111	5439	//Composite
5112	5440	Object3D // to do !!
..	..	@@ -5118,7 +5446,9 @@
5118	5446	private MenuItem lookFromItem;
5119	5447	private MenuItem switchItem;
5120	5448	private MenuItem cutItem;
5121		- private MenuItem duplicateItem;
	5449	+ private MenuItem undoItem;
	5450	+ private MenuItem redoItem;
	5451	+ private JMenuItem duplicateItem;
5122	5452	private MenuItem cloneItem;
5123	5453	private MenuItem cloneSupportItem;
5124	5454	private MenuItem overwriteGeoItem;
..	..	@@ -5131,7 +5461,7 @@
5131	5461	private MenuItem linkverticesItem;
5132	5462	private MenuItem relinkverticesItem;
5133	5463	private MenuItem setMasterItem;
5134		- private MenuItem resetMeshItem;
	5464	+ private MenuItem resetAllItem;
5135	5465	private MenuItem stepAllItem;
5136	5466	private MenuItem revertMeshItem;
5137	5467	private MenuItem poseMeshItem;
..	..	@@ -5181,6 +5511,10 @@
5181	5511	private MenuItem showleavesItem;
5182	5512	private MenuItem markleavesItem;
5183	5513	private MenuItem unmarkleavesItem;
	5514	+ private MenuItem rewindleavesItem;
	5515	+ private MenuItem unrewindleavesItem;
	5516	+ private MenuItem randomleavesItem;
	5517	+ private MenuItem unrandomleavesItem;
5184	5518
5185	5519	private MenuItem flipVItem;
5186	5520	private MenuItem unflipVItem;
..	..	@@ -5264,11 +5598,6 @@
5264	5598	private MenuItem doubleItem;
5265	5599	private MenuItem tripleItem;
5266	5600
5267		- private MenuItem importGFDItem;
5268		- private MenuItem importVRMLX3DItem;
5269		- private MenuItem import3DSItem;
5270		- private MenuItem importOBJItem;
5271		-
5272	5601	private MenuItem computeAOItem;
5273	5602	private MenuItem recompileItem;
5274	5603	private MenuItem editScriptItem;
..	..	@@ -5278,4 +5607,8 @@
5278	5607	private MenuItem analyzeItem;
5279	5608	private MenuItem dumpItem;
5280	5609	//boolean freezemodel = false;
	5610	+
	5611	+ Menu cameraMenu;
	5612	+ MenuItem editCameraItem;
	5613	+ MenuItem revertCameraItem;
5281	5614	}