~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;
..	..	@@ -702,11 +808,19 @@
702	808	// debugCB.addItemListener(this);
703	809
704	810	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	811	+ oeilCB.setToolTipText("Move camera when tracking target");
705	812	oeilCB.addItemListener(this);
706	813
	814	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	815	+ shadowCB.setToolTipText("Compute shadows when live");
	816	+ shadowCB.addItemListener(this);
	817	+
	818	+ if (Globals.ADVANCED)
	819	+ {
707	820	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
708	821	lookAtCB.setToolTipText("Look-at target");
709	822	lookAtCB.addItemListener(this);
	823	+ }
710	824
711	825	}
712	826
..	..	@@ -721,6 +835,14 @@
721	835	void EditObject(Object3D obj)
722	836	{
723	837	cRadio radioButton = new cRadio(obj.name);
	838	+
	839	+ // Patch to avoid bug with transparency.
	840	+ radioButton.hadMaterial = obj.material != null;
	841	+ if (!radioButton.hadMaterial)
	842	+ {
	843	+ obj.material = new cMaterial();
	844	+ }
	845	+
724	846	radioButton.SetObject(obj);
725	847	radioButton.layout = sevenButton;
726	848	radioButton.SetCamera(cameraView.renderCamera, false);
..	..	@@ -729,8 +851,11 @@
729	851	buttonGroup.add(radioButton);
730	852	radioButton.doClick();
731	853	}
	854	+
732	855	void SetupViews(ObjEditor oe)
733	856	{
	857	+ theFrame = this;
	858	+
734	859	oe.SetupViews();
735	860
736	861	System.out.println("SetupViews");
..	..	@@ -754,7 +879,9 @@
754	879	JCheckBox speakerCameraCB;
755	880	JCheckBox speakerFocusCB;
756	881	JCheckBox debugCB;
	882	+
757	883	JCheckBox oeilCB;
	884	+ JCheckBox shadowCB;
758	885	JCheckBox lookAtCB;
759	886
760	887	// static int COLOR = 1;
..	..	@@ -793,6 +920,7 @@
793	920	} else if(e.getSource() == liveCB)
794	921	{
795	922	cameraView.ToggleLive();
	923	+ refreshContents(false);
796	924	}
797	925	else if(e.getSource() == supportCB)
798	926	{
..	..	@@ -856,6 +984,10 @@
856	984	else if(e.getSource() == oeilCB)
857	985	{
858	986	cameraView.ToggleOeil();
	987	+ }
	988	+ else if(e.getSource() == shadowCB)
	989	+ {
	990	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
859	991	}
860	992	else if(e.getSource() == lookAtCB)
861	993	{
..	..	@@ -1200,7 +1332,7 @@
1200	1332	memoryItem.addActionListener(this);
1201	1333	menu.add(analyzeItem = new MenuItem("Analyze"));
1202	1334	analyzeItem.addActionListener(this);
1203		- menu.add(dumpItem = new MenuItem("Dump"));
	1335	+ menu.add(dumpItem = new MenuItem("Print"));
1204	1336	dumpItem.addActionListener(this);
1205	1337	// menu.add(pathItem = new MenuItem("From-to path"));
1206	1338	// pathItem.addActionListener(this);
..	..	@@ -1341,6 +1473,7 @@
1341	1473	shadow.material = new cMaterial(obj.material);
1342	1474	shadow.material.diffuse = 0.0001f;
1343	1475	shadow.material.specular = 0.0001f;
	1476	+ //shadow.projectedVertices[1].x = 300;
1344	1477
1345	1478	makeSomething(shadow);
1346	1479	}
..	..	@@ -1854,31 +1987,6 @@
1854	1987	csg.addChild(child);
1855	1988	child.addChild(csg);
1856	1989	} 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	1990	if (source == computeAOItem)
1883	1991	{
1884	1992	Globals.drawMode = CameraPane.OCCLUSION;
..	..	@@ -1915,6 +2023,30 @@
1915	2023	if (source == dumpItem)
1916	2024	{
1917	2025	DumpObject();
	2026	+ } else
	2027	+ if (source == minButton)
	2028	+ {
	2029	+ Minimize();
	2030	+ } else
	2031	+ if (source == maxButton)
	2032	+ {
	2033	+ Maximize();
	2034	+ } else
	2035	+ if (source == fullButton)
	2036	+ {
	2037	+ ToggleFullScreen();
	2038	+ } else
	2039	+ if (source == undoButton)
	2040	+ {
	2041	+ Undo();
	2042	+ } else
	2043	+ if (source == redoButton)
	2044	+ {
	2045	+ Redo();
	2046	+ } else
	2047	+ if (source == saveButton)
	2048	+ {
	2049	+ Save();
1918	2050	} else
1919	2051	if (source == oneStepButton)
1920	2052	{
..	..	@@ -1969,6 +2101,14 @@
1969	2101	if (source == cutItem \|\| source == clearButton)
1970	2102	{
1971	2103	loadClipboard(true);
	2104	+ } else
	2105	+ if (source == undoItem)
	2106	+ {
	2107	+ Undo();
	2108	+ } else
	2109	+ if (source == redoItem)
	2110	+ {
	2111	+ Redo();
1972	2112	} else
1973	2113	if (source == duplicateItem)
1974	2114	{
..	..	@@ -2469,7 +2609,7 @@
2469	2609	} else
2470	2610	if (source == genNormalsMESHItem)
2471	2611	{
2472		- GenNormals(true); // TODO
	2612	+ GenNormalsMESH();
2473	2613	} else
2474	2614	if (source == genNormalsORGANItem)
2475	2615	{
..	..	@@ -2534,6 +2674,22 @@
2534	2674	if (source == unmarkleavesItem)
2535	2675	{
2536	2676	MarkLeaves(false);
	2677	+ } else
	2678	+ if (source == rewindleavesItem)
	2679	+ {
	2680	+ RewindLeaves(true);
	2681	+ } else
	2682	+ if (source == unrewindleavesItem)
	2683	+ {
	2684	+ RewindLeaves(false);
	2685	+ } else
	2686	+ if (source == randomleavesItem)
	2687	+ {
	2688	+ RandomLeaves(true);
	2689	+ } else
	2690	+ if (source == unrandomleavesItem)
	2691	+ {
	2692	+ RandomLeaves(false);
2537	2693	} else
2538	2694	if (source == flipVItem)
2539	2695	{
..	..	@@ -2801,6 +2957,24 @@
2801	2957	bigThree.ClearUI();
2802	2958	bigThree.add(centralPanel);
2803	2959	bigThree.FlushUI();
	2960	+
	2961	+ cameraView.requestFocusInWindow();
	2962	+
	2963	+// refreshContents(true);
	2964	+//
	2965	+// try
	2966	+// {
	2967	+// java.awt.Robot bot = new java.awt.Robot();
	2968	+// int mask = InputEvent.BUTTON1_MASK;
	2969	+// bot.mouseMove(100, 100);
	2970	+// bot.mousePress(mask);
	2971	+// bot.mouseRelease(mask);
	2972	+// }
	2973	+// catch (Exception e)
	2974	+// {
	2975	+//
	2976	+// }
	2977	+
2804	2978	} else
2805	2979	if (source == threeButton)
2806	2980	{
..	..	@@ -2837,6 +3011,8 @@
2837	3011	bigThree.add(centralPanel);
2838	3012	bigThree.add(XYZPanel);
2839	3013	bigThree.FlushUI();
	3014	+
	3015	+ cameraView.requestFocusInWindow();
2840	3016	} else
2841	3017	if (source == fourButton)
2842	3018	{
..	..	@@ -2872,6 +3048,8 @@
2872	3048	bigThree.ClearUI();
2873	3049	bigThree.add(scenePanel);
2874	3050	bigThree.FlushUI();
	3051	+
	3052	+ cameraView.requestFocusInWindow();
2875	3053	} else
2876	3054	if (source == sixButton)
2877	3055	{
..	..	@@ -2908,6 +3086,8 @@
2908	3086	bigThree.add(scenePanel);
2909	3087	bigThree.add(centralPanel);
2910	3088	bigThree.FlushUI();
	3089	+
	3090	+ cameraView.requestFocusInWindow();
2911	3091	} else
2912	3092	if (source == sevenButton)
2913	3093	{
..	..	@@ -2945,6 +3125,8 @@
2945	3125	bigThree.add(centralPanel);
2946	3126	bigThree.add(XYZPanel);
2947	3127	bigThree.FlushUI();
	3128	+
	3129	+ cameraView.requestFocusInWindow();
2948	3130	} else
2949	3131	if (source == rootButton)
2950	3132	{
..	..	@@ -2956,6 +3138,7 @@
2956	3138	EditObject(obj);
2957	3139	}
2958	3140
	3141	+ cameraView.requestFocusInWindow();
2959	3142	refreshContents(true);
2960	3143	} else
2961	3144	if (source == closeButton)
..	..	@@ -2965,8 +3148,14 @@
2965	3148	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2966	3149	{
2967	3150	ab = (cRadio)e.nextElement();
2968		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3151	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2969	3152	{
	3153	+ // Patch to avoid bug with transparency.
	3154	+ if (!ab.hadMaterial)
	3155	+ {
	3156	+ ab.object.material = null;
	3157	+ }
	3158	+
2970	3159	buttonGroup.remove(ab);
2971	3160	radioPanel.remove(ab);
2972	3161
..	..	@@ -2977,6 +3166,8 @@
2977	3166	break;
2978	3167	}
2979	3168	}
	3169	+
	3170	+ cameraView.requestFocusInWindow();
2980	3171	refreshContents(true);
2981	3172	} else
2982	3173	if (source == editItem \|\| source == editButton)
..	..	@@ -2993,7 +3184,7 @@
2993	3184	child.CloseUI();
2994	3185	listUI.remove(child);
2995	3186
2996		- child.editWindow = null; // ???????????
	3187	+ //child.editWindow = null; // ???????????
2997	3188	}
2998	3189	objEditor.ctrlPanel.FlushUI();
2999	3190	//objEditor.jTree.clearSelection();
..	..	@@ -3079,7 +3270,10 @@
3079	3270	frontView.object = group;
3080	3271	sideView.object = group;
3081	3272	}
3082		- group.editWindow = this;
	3273	+
	3274	+// fix "+" issue
	3275	+ //group.editWindow = this;
	3276	+
3083	3277	/*
3084	3278	currentLayout = radio.layout;
3085	3279	if (currentLayout == null)
..	..	@@ -3091,8 +3285,23 @@
3091	3285	//group.parent = null; // ROOT
3092	3286	//group.attributes = -1;
3093	3287	ResetModel();
	3288	+
	3289	+ cameraView.requestFocusInWindow();
3094	3290	refreshContents(true);
3095		- }
	3291	+ } else if (event.getSource() == editCameraItem)
	3292	+ {
	3293	+ cameraView.ProtectCamera();
	3294	+ cameraView.repaint();
	3295	+ return;
	3296	+ } else if (event.getSource() == revertCameraItem)
	3297	+ {
	3298	+ cameraView.RevertCamera();
	3299	+ cameraView.repaint();
	3300	+ return;
	3301	+ // } else if (event.getSource() == textureButton)
	3302	+ // {
	3303	+ // return; // true;
	3304	+ }
3096	3305	else
3097	3306	{
3098	3307	//return super.action(event, arg);
..	..	@@ -3101,7 +3310,6 @@
3101	3310	}
3102	3311
3103	3312	boolean useclient = false;
3104		- cRadio radio;
3105	3313
3106	3314	void ToggleRoot()
3107	3315	{
..	..	@@ -3340,7 +3548,8 @@
3340	3548
3341	3549	int size = obj.MemorySize();
3342	3550
3343		- System.err.println((size/1024) + " KB is the size of " + obj);
	3551	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	3552	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3344	3553	}
3345	3554	}
3346	3555	catch (Exception e)
..	..	@@ -3421,6 +3630,13 @@
3421	3630	void GenNormals(boolean crease)
3422	3631	{
3423	3632	group.GenNormalsS(crease);
	3633	+
	3634	+ refreshContents();
	3635	+ }
	3636	+
	3637	+ void GenNormalsMESH()
	3638	+ {
	3639	+ group.GenNormalsMeshS();
3424	3640
3425	3641	refreshContents();
3426	3642	}
..	..	@@ -4048,6 +4264,18 @@
4048	4264	refreshContents();
4049	4265	}
4050	4266
	4267	+ void RewindLeaves(boolean hide)
	4268	+ {
	4269	+ group.selection.RewindLeaves(hide);
	4270	+ refreshContents();
	4271	+ }
	4272	+
	4273	+ void RandomLeaves(boolean hide)
	4274	+ {
	4275	+ group.selection.RandomLeaves(hide);
	4276	+ refreshContents();
	4277	+ }
	4278	+
4051	4279	void SetTexRes(int tr)
4052	4280	{
4053	4281	group.selection.SetTexRes(tr);
..	..	@@ -4133,7 +4361,7 @@
4133	4361	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4134	4362
4135	4363	Object3D elem = (Object3D)group.selection.elementAt(i);
4136		- if(elem != group)
	4364	+ if(elem != group \|\| !newWindow)
4137	4365	{
4138	4366	// if (!(elem instanceof Composite))
4139	4367	// newWindow = false;
..	..	@@ -4223,7 +4451,6 @@
4223	4451	//case 702: // Event.LIST_DESELECT
4224	4452	group.deselectAll();
4225	4453	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4226		- objEditor.ClearInfo(); // .GetMaterial());
4227	4454	if (tps != null)
4228	4455	{
4229	4456	for (int i=0; i < tps.length; i++)
..	..	@@ -4232,10 +4459,8 @@
4232	4459
4233	4460	//if (child.parent != null)
4234	4461	//child.parent.addSelectee(child);
	4462	+ objEditor.SetMaterial(child);
4235	4463	group.addSelectee(child);
4236		- objEditor.SetMaterial(child); // .GetMaterial());
4237		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4238		- System.err.println("info : " + child.GetPath());
4239	4464	}
4240	4465	}
4241	4466	// else
..	..	@@ -4245,16 +4470,17 @@
4245	4470	// System.err.println("info : " + group.GetPath());
4246	4471	// }
4247	4472
4248		- objEditor.SetText(); // jan 2014
4249		-
4250		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4473	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4251	4474	CameraPane.flash = true;
4252	4475
4253		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4476	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4254	4477	// a camera
4255	4478	{
4256		- CameraPane.camerachangeframe = 0; // don't refuse it
4257		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4479	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	4480	+ {
	4481	+ CameraPane.camerachangeframe = 0; // don't refuse it
	4482	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4483	+ }
4258	4484	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4259	4485	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4260	4486	}
..	..	@@ -4267,6 +4493,26 @@
4267	4493
4268	4494	freezemodel = false;
4269	4495	}
	4496	+
	4497	+ void refreshContents(boolean cp)
	4498	+ {
	4499	+ if (!Globals.MOUSEDRAGGED)
	4500	+ {
	4501	+ objEditor.ClearInfo(); // .GetMaterial());
	4502	+
	4503	+ for (int i=0; i < group.selection.Size(); i++)
	4504	+ {
	4505	+ Object3D child = (Object3D) group.selection.get(i);
	4506	+
	4507	+ objEditor.AddInfo(child, this, true);
	4508	+ System.err.println("info : " + child.GetPath());
	4509	+ }
	4510	+
	4511	+ objEditor.SetText(); // jan 2014
	4512	+ }
	4513	+
	4514	+ super.refreshContents(cp);
	4515	+ }
4270	4516
4271	4517	void linkSomething(Object3D thing)
4272	4518	{
..	..	@@ -4338,6 +4584,7 @@
4338	4584	{
4339	4585	if (group.selection.isEmpty())
4340	4586	return;
	4587	+
4341	4588	Grafreed.clipboardIsTempGroup = false;
4342	4589	Composite tGroup = null;
4343	4590	if (group.selection.size() > 0) // 1)
..	..	@@ -4348,6 +4595,7 @@
4348	4595
4349	4596	if (cut)
4350	4597	{
	4598	+ Save();
4351	4599	//int indices[] = jList.getSelectedIndices();
4352	4600	//for (int i = indices.length - 1; i >= 0; i--)
4353	4601	//jList.remove(indices[i]);
..	..	@@ -4437,8 +4685,10 @@
4437	4685	}
4438	4686
4439	4687	}
	4688	+
4440	4689	if (Grafreed.clipboardIsTempGroup)
4441	4690	Grafreed.clipboard = tGroup;
	4691	+
4442	4692	if (cut)
4443	4693	{
4444	4694	ResetModel();
..	..	@@ -4970,21 +5220,6 @@
4970	5220	}
4971	5221	*/
4972	5222
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	5223	/*
4989	5224	public void Callback(Object obj)
4990	5225	{
..	..	@@ -5008,23 +5243,6 @@
5008	5243	}
5009	5244	*/
5010	5245
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	5246	String GetFile(String dialogName)
5029	5247	{
5030	5248	if (Grafreed.standAlone)
..	..	@@ -5095,6 +5313,12 @@
5095	5313	cButton clearpanelButton;
5096	5314	cButton unselectButton;
5097	5315
	5316	+ cButton minButton;
	5317	+ cButton maxButton;
	5318	+ cButton fullButton;
	5319	+ cButton undoButton;
	5320	+ cButton redoButton;
	5321	+ cButton saveButton;
5098	5322	cButton oneStepButton;
5099	5323
5100	5324	cButton screenfitButton;
..	..	@@ -5108,14 +5332,6 @@
5108	5332
5109	5333	cButton setsupportButton;
5110	5334
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	5335	//
5120	5336	//Composite
5121	5337	Object3D // to do !!
..	..	@@ -5127,6 +5343,8 @@
5127	5343	private MenuItem lookFromItem;
5128	5344	private MenuItem switchItem;
5129	5345	private MenuItem cutItem;
	5346	+ private MenuItem undoItem;
	5347	+ private MenuItem redoItem;
5130	5348	private MenuItem duplicateItem;
5131	5349	private MenuItem cloneItem;
5132	5350	private MenuItem cloneSupportItem;
..	..	@@ -5190,6 +5408,10 @@
5190	5408	private MenuItem showleavesItem;
5191	5409	private MenuItem markleavesItem;
5192	5410	private MenuItem unmarkleavesItem;
	5411	+ private MenuItem rewindleavesItem;
	5412	+ private MenuItem unrewindleavesItem;
	5413	+ private MenuItem randomleavesItem;
	5414	+ private MenuItem unrandomleavesItem;
5193	5415
5194	5416	private MenuItem flipVItem;
5195	5417	private MenuItem unflipVItem;
..	..	@@ -5273,11 +5495,6 @@
5273	5495	private MenuItem doubleItem;
5274	5496	private MenuItem tripleItem;
5275	5497
5276		- private MenuItem importGFDItem;
5277		- private MenuItem importVRMLX3DItem;
5278		- private MenuItem import3DSItem;
5279		- private MenuItem importOBJItem;
5280		-
5281	5498	private MenuItem computeAOItem;
5282	5499	private MenuItem recompileItem;
5283	5500	private MenuItem editScriptItem;
..	..	@@ -5287,4 +5504,8 @@
5287	5504	private MenuItem analyzeItem;
5288	5505	private MenuItem dumpItem;
5289	5506	//boolean freezemodel = false;
	5507	+
	5508	+ Menu cameraMenu;
	5509	+ MenuItem editCameraItem;
	5510	+ MenuItem revertCameraItem;
5290	5511	}