~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,27 +148,18 @@
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		-
168	153	Menu menu;
169	154	oe.menuBar.add(menu = new Menu("Edit"));
170	155	//editItem = menu.add(new MenuItem("Edit"));
171	156	//editItem.addActionListener(this);
	157	+
	158	+// undoItem = menu.add(new MenuItem("Undo"));
	159	+// undoItem.addActionListener(this);
	160	+// redoItem = menu.add(new MenuItem("Redo"));
	161	+// redoItem.addActionListener(this);
	162	+// menu.add("-");
172	163	duplicateItem = menu.add(new MenuItem("Duplicate"));
173	164	duplicateItem.addActionListener(this);
174	165	cloneItem = menu.add(new MenuItem("Clone"));
..	..	@@ -185,7 +176,6 @@
185	176	copyItem.addActionListener(this);
186	177	pasteItem = menu.add(new MenuItem("Paste"));
187	178	pasteItem.addActionListener(this);
188		- menu.add("-");
189	179
190	180	menu.add("-");
191	181	pasteIntoItem = menu.add(new MenuItem("Paste into"));
..	..	@@ -206,7 +196,94 @@
206	196	clearAllItem = menu.add(new MenuItem("Clear All"));
207	197	clearAllItem.addActionListener(this);
208	198	}
	199	+
	200	+ menuBar.add(cameraMenu = new Menu("View"));
	201	+ //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
	202	+ //zBufferItem.addActionListener(this);
	203	+ //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
	204	+ //normalLensItem.addActionListener(this);
	205	+ cameraMenu.add(revertCameraItem = new MenuItem("Restore Viewpoint"));
	206	+ revertCameraItem.addActionListener(this);
	207	+
	208	+ cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	209	+ toggleFullScreenItem.addItemListener(this);
	210	+ toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	211	+ cameraMenu.add("-");
	212	+
	213	+ cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	214	+ toggleTextureItem.addItemListener(this);
	215	+ toggleTextureItem.setState(CameraPane.textureon);
	216	+
	217	+ cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	218	+ toggleSwitchItem.addItemListener(this);
	219	+ toggleSwitchItem.setState(CameraPane.SWITCH);
	220	+
	221	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
	222	+ toggleHandleItem.addItemListener(this);
	223	+ toggleHandleItem.setState(CameraPane.HANDLES);
	224	+
	225	+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
	226	+ togglePaintItem.addItemListener(this);
	227	+ togglePaintItem.setState(CameraPane.PAINTMODE);
	228	+
	229	+ if (Globals.ADVANCED)
	230	+ {
	231	+ cameraMenu.add("-");
	232	+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
	233	+ toggleLiveItem.addItemListener(this);
	234	+ toggleLiveItem.setState(Globals.isLIVE());
209	235
	236	+ cameraMenu.add(stepItem = new MenuItem("Step"));
	237	+ stepItem.addActionListener(this);
	238	+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
	239	+ // toggleDLItem.addItemListener(this);
	240	+ // toggleDLItem.setState(false);
	241	+
	242	+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
	243	+ toggleRenderItem.addItemListener(this);
	244	+ toggleRenderItem.setState(!CameraPane.frozen);
	245	+
	246	+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
	247	+ toggleDebugItem.addItemListener(this);
	248	+ toggleDebugItem.setState(Globals.DEBUG);
	249	+
	250	+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
	251	+ toggleFrustumItem.addItemListener(this);
	252	+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
	253	+
	254	+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
	255	+ toggleFootContactItem.addItemListener(this);
	256	+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
	257	+
	258	+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
	259	+ toggleTimelineItem.addItemListener(this);
	260	+ }
	261	+
	262	+// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
	263	+// toggleRootItem.addItemListener(this);
	264	+// toggleRootItem.setState(false);
	265	+// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
	266	+// animationItem.addItemListener(this);
	267	+// animationItem.setState(CameraPane.ANIMATION);
	268	+ cameraMenu.add("-");
	269	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
	270	+ editCameraItem.addActionListener(this);
	271	+
	272	+ if (Globals.ADVANCED)
	273	+ {
	274	+ oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
	275	+ //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
	276	+ //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
	277	+ editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
	278	+ oe.cameraMenu.add("-");
	279	+ openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
	280	+ openWindowItem.addActionListener(this);
	281	+ editLeafItem.addActionListener(this);
	282	+ lookAtItem.addActionListener(this);
	283	+ //lookFromItem.addActinoListener(this);
	284	+ //switchItem.addActionListener(this);
	285	+ }
	286	+
210	287	oe.menuBar.add(menu = new Menu("Setting"));
211	288	if (Globals.ADVANCED)
212	289	{
..	..	@@ -291,11 +368,11 @@
291	368	billboardItem.addActionListener(this);
292	369	csgItem = menu.add(new MenuItem("CSG"));
293	370	csgItem.addActionListener(this);
294		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	371	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
295	372	shadowXItem.addActionListener(this);
296		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	373	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
297	374	shadowYItem.addActionListener(this);
298		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	375	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
299	376	shadowZItem.addActionListener(this);
300	377	if (Globals.ADVANCED)
301	378	{
..	..	@@ -392,6 +469,14 @@
392	469	markleavesItem.addActionListener(this);
393	470	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
394	471	unmarkleavesItem.addActionListener(this);
	472	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	473	+ rewindleavesItem.addActionListener(this);
	474	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	475	+ unrewindleavesItem.addActionListener(this);
	476	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	477	+ randomleavesItem.addActionListener(this);
	478	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	479	+ unrandomleavesItem.addActionListener(this);
395	480	menu.add("-");
396	481	flipVItem = menu.add(new MenuItem("Flip V"));
397	482	flipVItem.addActionListener(this);
..	..	@@ -443,25 +528,24 @@
443	528	oe.menuBar.add(menu = new Menu("Insert"));
444	529	buildCreateMenu(menu);
445	530
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	531	oe.menuBar.add(menu = new Menu("Tools"));
460	532	buildToolsMenu(menu);
461	533	}
462	534
463	535	void SetupUI2(ObjEditor oe)
464	536	{
	537	+ // June 2019
	538	+ if (oe == null)
	539	+ {
	540	+ //super.SetupUI2(this);
	541	+ //return;
	542	+ }
	543	+
	544	+ if (copy != group)
	545	+ {
	546	+ //super.SetupUI2(this);
	547	+ }
	548	+
465	549	//new Exception().printStackTrace();
466	550
467	551	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -492,11 +576,35 @@
492	576	*/
493	577	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
494	578
	579	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	580	+ //minButton.setToolTipText("Minimize window");
	581	+ //minButton.addActionListener(this);
	582	+
	583	+ oe.toolbarPanel.add(maxButton = new cButton("\u271A", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	584	+ maxButton.setToolTipText("Maximize window");
	585	+ maxButton.addActionListener(this);
	586	+
	587	+ oe.toolbarPanel.add(fullButton = new cButton("\u2b1c", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	588	+ fullButton.setToolTipText("Full-screen window");
	589	+ fullButton.addActionListener(this);
	590	+
	591	+ oe.toolbarPanel.add(undoButton = new cButton("\u21a9", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	592	+ undoButton.setToolTipText("Undo changes");
	593	+ undoButton.addActionListener(this);
	594	+
	595	+ oe.toolbarPanel.add(redoButton = new cButton("\u21aa", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	596	+ redoButton.setToolTipText("Redo changes");
	597	+ redoButton.addActionListener(this);
	598	+
	599	+ oe.toolbarPanel.add(saveButton = new cButton("\u21e3", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	600	+ saveButton.setToolTipText("Save changes");
	601	+ saveButton.addActionListener(this);
	602	+
495	603	oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
496	604	liveCB.setToolTipText("Enable animation");
497	605	liveCB.addItemListener(this);
498	606
499		- oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	607	+ oe.toolbarPanel.add(oneStepButton = new cButton("\u29f4", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
500	608	oneStepButton.setToolTipText("Animate one step forward");
501	609	oneStepButton.addActionListener(this);
502	610
..	..	@@ -504,7 +612,7 @@
504	612	fastCB.setToolTipText("Fast mode");
505	613	fastCB.addItemListener(this);
506	614
507		- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	615	+ oe.toolbarPanel.add(trackCB = new cCheckBox(":", CameraPane.TRACK)); //, oe.aConstraints);
508	616	trackCB.setToolTipText("Enable tracking");
509	617	trackCB.addItemListener(this);
510	618
..	..	@@ -528,19 +636,19 @@
528	636
529	637	oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
530	638
531		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	639	+ oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
532	640	twoButton.setToolTipText("Show center view only");
533	641	twoButton.addActionListener(this);
534		- oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	642	+ oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
535	643	fourButton.addActionListener(this);
536	644	fourButton.setToolTipText("Show left panel only");
537		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	645	+ oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
538	646	sixButton.setToolTipText("2-column layout left");
539	647	sixButton.addActionListener(this);
540		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	648	+ oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
541	649	threeButton.setToolTipText("2-column layout right");
542	650	threeButton.addActionListener(this);
543		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	651	+ oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
544	652	sevenButton.setToolTipText("3-column layout");
545	653	sevenButton.addActionListener(this);
546	654	//
..	..	@@ -555,32 +663,30 @@
555	663	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
556	664	//clearButton.addActionListener(this);
557	665
558		- cGridBag commandsPanel = new cGridBag();
559		-
560		- commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	666	+ editCommandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
561	667	editButton.setToolTipText("Edit selection");
562	668	editButton.addActionListener(this);
563	669
564		- commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	670	+ editCommandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
565	671	uneditButton.setToolTipText("Unedit selection");
566	672	uneditButton.addActionListener(this);
567	673
568		- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	674	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
569	675	allParamsButton.setToolTipText("Edit all params");
570	676	allParamsButton.addActionListener(this);
571	677
572		- commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	678	+ editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
573	679	clearPanelButton.setToolTipText("Clear edit panel");
574	680	clearPanelButton.addActionListener(this);
575	681
576		- commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	682	+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
577	683	unselectButton.setToolTipText("Unselect");
578	684	unselectButton.addActionListener(this);
579	685
580		- commandsPanel.preferredHeight = 1;
	686	+ editCommandsPanel.preferredHeight = 1;
581	687
582		- oe.treePanel.add(commandsPanel);
583		- oe.treePanel.Return();
	688	+// oe.treePanel.add(commandsPanel);
	689	+// oe.treePanel.Return();
584	690
585	691	// oe.aConstraints.gridx += 1;
586	692	// oe.aConstraints.weighty = 0;
..	..	@@ -729,8 +835,11 @@
729	835	buttonGroup.add(radioButton);
730	836	radioButton.doClick();
731	837	}
	838	+
732	839	void SetupViews(ObjEditor oe)
733	840	{
	841	+ theFrame = this;
	842	+
734	843	oe.SetupViews();
735	844
736	845	System.out.println("SetupViews");
..	..	@@ -793,6 +902,7 @@
793	902	} else if(e.getSource() == liveCB)
794	903	{
795	904	cameraView.ToggleLive();
	905	+ refreshContents(false);
796	906	}
797	907	else if(e.getSource() == supportCB)
798	908	{
..	..	@@ -1200,7 +1310,7 @@
1200	1310	memoryItem.addActionListener(this);
1201	1311	menu.add(analyzeItem = new MenuItem("Analyze"));
1202	1312	analyzeItem.addActionListener(this);
1203		- menu.add(dumpItem = new MenuItem("Dump"));
	1313	+ menu.add(dumpItem = new MenuItem("Print"));
1204	1314	dumpItem.addActionListener(this);
1205	1315	// menu.add(pathItem = new MenuItem("From-to path"));
1206	1316	// pathItem.addActionListener(this);
..	..	@@ -1341,6 +1451,7 @@
1341	1451	shadow.material = new cMaterial(obj.material);
1342	1452	shadow.material.diffuse = 0.0001f;
1343	1453	shadow.material.specular = 0.0001f;
	1454	+ //shadow.projectedVertices[1].x = 300;
1344	1455
1345	1456	makeSomething(shadow);
1346	1457	}
..	..	@@ -1854,31 +1965,6 @@
1854	1965	csg.addChild(child);
1855	1966	child.addChild(csg);
1856	1967	} 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	1968	if (source == computeAOItem)
1883	1969	{
1884	1970	Globals.drawMode = CameraPane.OCCLUSION;
..	..	@@ -1915,6 +2001,30 @@
1915	2001	if (source == dumpItem)
1916	2002	{
1917	2003	DumpObject();
	2004	+ } else
	2005	+ if (source == minButton)
	2006	+ {
	2007	+ Minimize();
	2008	+ } else
	2009	+ if (source == maxButton)
	2010	+ {
	2011	+ Maximize();
	2012	+ } else
	2013	+ if (source == fullButton)
	2014	+ {
	2015	+ ToggleFullScreen();
	2016	+ } else
	2017	+ if (source == undoButton)
	2018	+ {
	2019	+ Undo();
	2020	+ } else
	2021	+ if (source == redoButton)
	2022	+ {
	2023	+ Redo();
	2024	+ } else
	2025	+ if (source == saveButton)
	2026	+ {
	2027	+ Save();
1918	2028	} else
1919	2029	if (source == oneStepButton)
1920	2030	{
..	..	@@ -1969,6 +2079,14 @@
1969	2079	if (source == cutItem \|\| source == clearButton)
1970	2080	{
1971	2081	loadClipboard(true);
	2082	+ } else
	2083	+ if (source == undoItem)
	2084	+ {
	2085	+ Undo();
	2086	+ } else
	2087	+ if (source == redoItem)
	2088	+ {
	2089	+ Redo();
1972	2090	} else
1973	2091	if (source == duplicateItem)
1974	2092	{
..	..	@@ -2469,7 +2587,7 @@
2469	2587	} else
2470	2588	if (source == genNormalsMESHItem)
2471	2589	{
2472		- GenNormals(true); // TODO
	2590	+ GenNormalsMESH();
2473	2591	} else
2474	2592	if (source == genNormalsORGANItem)
2475	2593	{
..	..	@@ -2534,6 +2652,22 @@
2534	2652	if (source == unmarkleavesItem)
2535	2653	{
2536	2654	MarkLeaves(false);
	2655	+ } else
	2656	+ if (source == rewindleavesItem)
	2657	+ {
	2658	+ RewindLeaves(true);
	2659	+ } else
	2660	+ if (source == unrewindleavesItem)
	2661	+ {
	2662	+ RewindLeaves(false);
	2663	+ } else
	2664	+ if (source == randomleavesItem)
	2665	+ {
	2666	+ RandomLeaves(true);
	2667	+ } else
	2668	+ if (source == unrandomleavesItem)
	2669	+ {
	2670	+ RandomLeaves(false);
2537	2671	} else
2538	2672	if (source == flipVItem)
2539	2673	{
..	..	@@ -2801,6 +2935,24 @@
2801	2935	bigThree.ClearUI();
2802	2936	bigThree.add(centralPanel);
2803	2937	bigThree.FlushUI();
	2938	+
	2939	+ cameraView.requestFocusInWindow();
	2940	+
	2941	+// refreshContents(true);
	2942	+//
	2943	+// try
	2944	+// {
	2945	+// java.awt.Robot bot = new java.awt.Robot();
	2946	+// int mask = InputEvent.BUTTON1_MASK;
	2947	+// bot.mouseMove(100, 100);
	2948	+// bot.mousePress(mask);
	2949	+// bot.mouseRelease(mask);
	2950	+// }
	2951	+// catch (Exception e)
	2952	+// {
	2953	+//
	2954	+// }
	2955	+
2804	2956	} else
2805	2957	if (source == threeButton)
2806	2958	{
..	..	@@ -2837,6 +2989,8 @@
2837	2989	bigThree.add(centralPanel);
2838	2990	bigThree.add(XYZPanel);
2839	2991	bigThree.FlushUI();
	2992	+
	2993	+ cameraView.requestFocusInWindow();
2840	2994	} else
2841	2995	if (source == fourButton)
2842	2996	{
..	..	@@ -2872,6 +3026,8 @@
2872	3026	bigThree.ClearUI();
2873	3027	bigThree.add(scenePanel);
2874	3028	bigThree.FlushUI();
	3029	+
	3030	+ cameraView.requestFocusInWindow();
2875	3031	} else
2876	3032	if (source == sixButton)
2877	3033	{
..	..	@@ -2908,6 +3064,8 @@
2908	3064	bigThree.add(scenePanel);
2909	3065	bigThree.add(centralPanel);
2910	3066	bigThree.FlushUI();
	3067	+
	3068	+ cameraView.requestFocusInWindow();
2911	3069	} else
2912	3070	if (source == sevenButton)
2913	3071	{
..	..	@@ -2945,6 +3103,8 @@
2945	3103	bigThree.add(centralPanel);
2946	3104	bigThree.add(XYZPanel);
2947	3105	bigThree.FlushUI();
	3106	+
	3107	+ cameraView.requestFocusInWindow();
2948	3108	} else
2949	3109	if (source == rootButton)
2950	3110	{
..	..	@@ -2956,6 +3116,7 @@
2956	3116	EditObject(obj);
2957	3117	}
2958	3118
	3119	+ cameraView.requestFocusInWindow();
2959	3120	refreshContents(true);
2960	3121	} else
2961	3122	if (source == closeButton)
..	..	@@ -2977,6 +3138,8 @@
2977	3138	break;
2978	3139	}
2979	3140	}
	3141	+
	3142	+ cameraView.requestFocusInWindow();
2980	3143	refreshContents(true);
2981	3144	} else
2982	3145	if (source == editItem \|\| source == editButton)
..	..	@@ -2993,7 +3156,7 @@
2993	3156	child.CloseUI();
2994	3157	listUI.remove(child);
2995	3158
2996		- child.editWindow = null; // ???????????
	3159	+ //child.editWindow = null; // ???????????
2997	3160	}
2998	3161	objEditor.ctrlPanel.FlushUI();
2999	3162	//objEditor.jTree.clearSelection();
..	..	@@ -3079,7 +3242,10 @@
3079	3242	frontView.object = group;
3080	3243	sideView.object = group;
3081	3244	}
3082		- group.editWindow = this;
	3245	+
	3246	+// fix "+" issue
	3247	+ //group.editWindow = this;
	3248	+
3083	3249	/*
3084	3250	currentLayout = radio.layout;
3085	3251	if (currentLayout == null)
..	..	@@ -3091,8 +3257,23 @@
3091	3257	//group.parent = null; // ROOT
3092	3258	//group.attributes = -1;
3093	3259	ResetModel();
	3260	+
	3261	+ cameraView.requestFocusInWindow();
3094	3262	refreshContents(true);
3095		- }
	3263	+ } else if (event.getSource() == editCameraItem)
	3264	+ {
	3265	+ cameraView.ProtectCamera();
	3266	+ cameraView.repaint();
	3267	+ return;
	3268	+ } else if (event.getSource() == revertCameraItem)
	3269	+ {
	3270	+ cameraView.RevertCamera();
	3271	+ cameraView.repaint();
	3272	+ return;
	3273	+ // } else if (event.getSource() == textureButton)
	3274	+ // {
	3275	+ // return; // true;
	3276	+ }
3096	3277	else
3097	3278	{
3098	3279	//return super.action(event, arg);
..	..	@@ -3101,7 +3282,6 @@
3101	3282	}
3102	3283
3103	3284	boolean useclient = false;
3104		- cRadio radio;
3105	3285
3106	3286	void ToggleRoot()
3107	3287	{
..	..	@@ -3340,7 +3520,8 @@
3340	3520
3341	3521	int size = obj.MemorySize();
3342	3522
3343		- System.err.println((size/1024) + " KB is the size of " + obj);
	3523	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	3524	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3344	3525	}
3345	3526	}
3346	3527	catch (Exception e)
..	..	@@ -3421,6 +3602,13 @@
3421	3602	void GenNormals(boolean crease)
3422	3603	{
3423	3604	group.GenNormalsS(crease);
	3605	+
	3606	+ refreshContents();
	3607	+ }
	3608	+
	3609	+ void GenNormalsMESH()
	3610	+ {
	3611	+ group.GenNormalsMeshS();
3424	3612
3425	3613	refreshContents();
3426	3614	}
..	..	@@ -4048,6 +4236,18 @@
4048	4236	refreshContents();
4049	4237	}
4050	4238
	4239	+ void RewindLeaves(boolean hide)
	4240	+ {
	4241	+ group.selection.RewindLeaves(hide);
	4242	+ refreshContents();
	4243	+ }
	4244	+
	4245	+ void RandomLeaves(boolean hide)
	4246	+ {
	4247	+ group.selection.RandomLeaves(hide);
	4248	+ refreshContents();
	4249	+ }
	4250	+
4051	4251	void SetTexRes(int tr)
4052	4252	{
4053	4253	group.selection.SetTexRes(tr);
..	..	@@ -4133,7 +4333,7 @@
4133	4333	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4134	4334
4135	4335	Object3D elem = (Object3D)group.selection.elementAt(i);
4136		- if(elem != group)
	4336	+ if(elem != group \|\| !newWindow)
4137	4337	{
4138	4338	// if (!(elem instanceof Composite))
4139	4339	// newWindow = false;
..	..	@@ -4223,7 +4423,6 @@
4223	4423	//case 702: // Event.LIST_DESELECT
4224	4424	group.deselectAll();
4225	4425	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4226		- objEditor.ClearInfo(); // .GetMaterial());
4227	4426	if (tps != null)
4228	4427	{
4229	4428	for (int i=0; i < tps.length; i++)
..	..	@@ -4232,10 +4431,8 @@
4232	4431
4233	4432	//if (child.parent != null)
4234	4433	//child.parent.addSelectee(child);
	4434	+ objEditor.SetMaterial(child);
4235	4435	group.addSelectee(child);
4236		- objEditor.SetMaterial(child); // .GetMaterial());
4237		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4238		- System.err.println("info : " + child.GetPath());
4239	4436	}
4240	4437	}
4241	4438	// else
..	..	@@ -4245,16 +4442,17 @@
4245	4442	// System.err.println("info : " + group.GetPath());
4246	4443	// }
4247	4444
4248		- objEditor.SetText(); // jan 2014
4249		-
4250		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4445	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4251	4446	CameraPane.flash = true;
4252	4447
4253		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4448	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4254	4449	// a camera
4255	4450	{
4256		- CameraPane.camerachangeframe = 0; // don't refuse it
4257		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4451	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	4452	+ {
	4453	+ CameraPane.camerachangeframe = 0; // don't refuse it
	4454	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4455	+ }
4258	4456	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4259	4457	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4260	4458	}
..	..	@@ -4267,6 +4465,26 @@
4267	4465
4268	4466	freezemodel = false;
4269	4467	}
	4468	+
	4469	+ void refreshContents(boolean cp)
	4470	+ {
	4471	+ if (!Globals.MOUSEDRAGGED)
	4472	+ {
	4473	+ objEditor.ClearInfo(); // .GetMaterial());
	4474	+
	4475	+ for (int i=0; i < group.selection.Size(); i++)
	4476	+ {
	4477	+ Object3D child = (Object3D) group.selection.get(i);
	4478	+
	4479	+ objEditor.AddInfo(child, this, true);
	4480	+ System.err.println("info : " + child.GetPath());
	4481	+ }
	4482	+
	4483	+ objEditor.SetText(); // jan 2014
	4484	+ }
	4485	+
	4486	+ super.refreshContents(cp);
	4487	+ }
4270	4488
4271	4489	void linkSomething(Object3D thing)
4272	4490	{
..	..	@@ -4338,6 +4556,7 @@
4338	4556	{
4339	4557	if (group.selection.isEmpty())
4340	4558	return;
	4559	+
4341	4560	Grafreed.clipboardIsTempGroup = false;
4342	4561	Composite tGroup = null;
4343	4562	if (group.selection.size() > 0) // 1)
..	..	@@ -4348,6 +4567,7 @@
4348	4567
4349	4568	if (cut)
4350	4569	{
	4570	+ Save();
4351	4571	//int indices[] = jList.getSelectedIndices();
4352	4572	//for (int i = indices.length - 1; i >= 0; i--)
4353	4573	//jList.remove(indices[i]);
..	..	@@ -4437,8 +4657,10 @@
4437	4657	}
4438	4658
4439	4659	}
	4660	+
4440	4661	if (Grafreed.clipboardIsTempGroup)
4441	4662	Grafreed.clipboard = tGroup;
	4663	+
4442	4664	if (cut)
4443	4665	{
4444	4666	ResetModel();
..	..	@@ -4970,21 +5192,6 @@
4970	5192	}
4971	5193	*/
4972	5194
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	5195	/*
4989	5196	public void Callback(Object obj)
4990	5197	{
..	..	@@ -5008,23 +5215,6 @@
5008	5215	}
5009	5216	*/
5010	5217
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	5218	String GetFile(String dialogName)
5029	5219	{
5030	5220	if (Grafreed.standAlone)
..	..	@@ -5095,6 +5285,12 @@
5095	5285	cButton clearpanelButton;
5096	5286	cButton unselectButton;
5097	5287
	5288	+ cButton minButton;
	5289	+ cButton maxButton;
	5290	+ cButton fullButton;
	5291	+ cButton undoButton;
	5292	+ cButton redoButton;
	5293	+ cButton saveButton;
5098	5294	cButton oneStepButton;
5099	5295
5100	5296	cButton screenfitButton;
..	..	@@ -5108,14 +5304,6 @@
5108	5304
5109	5305	cButton setsupportButton;
5110	5306
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	5307	//
5120	5308	//Composite
5121	5309	Object3D // to do !!
..	..	@@ -5127,6 +5315,8 @@
5127	5315	private MenuItem lookFromItem;
5128	5316	private MenuItem switchItem;
5129	5317	private MenuItem cutItem;
	5318	+ private MenuItem undoItem;
	5319	+ private MenuItem redoItem;
5130	5320	private MenuItem duplicateItem;
5131	5321	private MenuItem cloneItem;
5132	5322	private MenuItem cloneSupportItem;
..	..	@@ -5190,6 +5380,10 @@
5190	5380	private MenuItem showleavesItem;
5191	5381	private MenuItem markleavesItem;
5192	5382	private MenuItem unmarkleavesItem;
	5383	+ private MenuItem rewindleavesItem;
	5384	+ private MenuItem unrewindleavesItem;
	5385	+ private MenuItem randomleavesItem;
	5386	+ private MenuItem unrandomleavesItem;
5193	5387
5194	5388	private MenuItem flipVItem;
5195	5389	private MenuItem unflipVItem;
..	..	@@ -5273,11 +5467,6 @@
5273	5467	private MenuItem doubleItem;
5274	5468	private MenuItem tripleItem;
5275	5469
5276		- private MenuItem importGFDItem;
5277		- private MenuItem importVRMLX3DItem;
5278		- private MenuItem import3DSItem;
5279		- private MenuItem importOBJItem;
5280		-
5281	5470	private MenuItem computeAOItem;
5282	5471	private MenuItem recompileItem;
5283	5472	private MenuItem editScriptItem;
..	..	@@ -5287,4 +5476,8 @@
5287	5476	private MenuItem analyzeItem;
5288	5477	private MenuItem dumpItem;
5289	5478	//boolean freezemodel = false;
	5479	+
	5480	+ Menu cameraMenu;
	5481	+ MenuItem editCameraItem;
	5482	+ MenuItem revertCameraItem;
5290	5483	}