~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"));
..	..	@@ -206,7 +197,94 @@
206	197	clearAllItem = menu.add(new MenuItem("Clear All"));
207	198	clearAllItem.addActionListener(this);
208	199	}
	200	+
	201	+ menuBar.add(cameraMenu = new Menu("View"));
	202	+ //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
	203	+ //zBufferItem.addActionListener(this);
	204	+ //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
	205	+ //normalLensItem.addActionListener(this);
	206	+ cameraMenu.add(revertCameraItem = new MenuItem("Restore Viewpoint"));
	207	+ revertCameraItem.addActionListener(this);
	208	+
	209	+ cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	210	+ toggleFullScreenItem.addItemListener(this);
	211	+ toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	212	+ cameraMenu.add("-");
	213	+
	214	+ cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	215	+ toggleTextureItem.addItemListener(this);
	216	+ toggleTextureItem.setState(CameraPane.textureon);
	217	+
	218	+ cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	219	+ toggleSwitchItem.addItemListener(this);
	220	+ toggleSwitchItem.setState(CameraPane.SWITCH);
	221	+
	222	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
	223	+ toggleHandleItem.addItemListener(this);
	224	+ toggleHandleItem.setState(CameraPane.HANDLES);
	225	+
	226	+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
	227	+ togglePaintItem.addItemListener(this);
	228	+ togglePaintItem.setState(CameraPane.PAINTMODE);
	229	+
	230	+ if (Globals.ADVANCED)
	231	+ {
	232	+ cameraMenu.add("-");
	233	+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
	234	+ toggleLiveItem.addItemListener(this);
	235	+ toggleLiveItem.setState(Globals.isLIVE());
209	236
	237	+ cameraMenu.add(stepItem = new MenuItem("Step"));
	238	+ stepItem.addActionListener(this);
	239	+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
	240	+ // toggleDLItem.addItemListener(this);
	241	+ // toggleDLItem.setState(false);
	242	+
	243	+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
	244	+ toggleRenderItem.addItemListener(this);
	245	+ toggleRenderItem.setState(!CameraPane.frozen);
	246	+
	247	+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
	248	+ toggleDebugItem.addItemListener(this);
	249	+ toggleDebugItem.setState(Globals.DEBUG);
	250	+
	251	+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
	252	+ toggleFrustumItem.addItemListener(this);
	253	+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
	254	+
	255	+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
	256	+ toggleFootContactItem.addItemListener(this);
	257	+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
	258	+
	259	+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
	260	+ toggleTimelineItem.addItemListener(this);
	261	+ }
	262	+
	263	+// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
	264	+// toggleRootItem.addItemListener(this);
	265	+// toggleRootItem.setState(false);
	266	+// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
	267	+// animationItem.addItemListener(this);
	268	+// animationItem.setState(CameraPane.ANIMATION);
	269	+ cameraMenu.add("-");
	270	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
	271	+ editCameraItem.addActionListener(this);
	272	+
	273	+ if (Globals.ADVANCED)
	274	+ {
	275	+ oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
	276	+ //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
	277	+ //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
	278	+ editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
	279	+ oe.cameraMenu.add("-");
	280	+ openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
	281	+ openWindowItem.addActionListener(this);
	282	+ editLeafItem.addActionListener(this);
	283	+ lookAtItem.addActionListener(this);
	284	+ //lookFromItem.addActinoListener(this);
	285	+ //switchItem.addActionListener(this);
	286	+ }
	287	+
210	288	oe.menuBar.add(menu = new Menu("Setting"));
211	289	if (Globals.ADVANCED)
212	290	{
..	..	@@ -392,6 +470,14 @@
392	470	markleavesItem.addActionListener(this);
393	471	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
394	472	unmarkleavesItem.addActionListener(this);
	473	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	474	+ rewindleavesItem.addActionListener(this);
	475	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	476	+ unrewindleavesItem.addActionListener(this);
	477	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	478	+ randomleavesItem.addActionListener(this);
	479	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	480	+ unrandomleavesItem.addActionListener(this);
395	481	menu.add("-");
396	482	flipVItem = menu.add(new MenuItem("Flip V"));
397	483	flipVItem.addActionListener(this);
..	..	@@ -443,25 +529,24 @@
443	529	oe.menuBar.add(menu = new Menu("Insert"));
444	530	buildCreateMenu(menu);
445	531
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	532	oe.menuBar.add(menu = new Menu("Tools"));
460	533	buildToolsMenu(menu);
461	534	}
462	535
463	536	void SetupUI2(ObjEditor oe)
464	537	{
	538	+ // June 2019
	539	+ if (oe == null)
	540	+ {
	541	+ //super.SetupUI2(this);
	542	+ //return;
	543	+ }
	544	+
	545	+ if (copy != group)
	546	+ {
	547	+ //super.SetupUI2(this);
	548	+ }
	549	+
465	550	//new Exception().printStackTrace();
466	551
467	552	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -492,11 +577,35 @@
492	577	*/
493	578	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
494	579
	580	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	581	+ //minButton.setToolTipText("Minimize window");
	582	+ //minButton.addActionListener(this);
	583	+
	584	+ oe.toolbarPanel.add(maxButton = new cButton("\u271A", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	585	+ maxButton.setToolTipText("Maximize window");
	586	+ maxButton.addActionListener(this);
	587	+
	588	+ oe.toolbarPanel.add(fullButton = new cButton("\u2b1c", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	589	+ fullButton.setToolTipText("Full-screen window");
	590	+ fullButton.addActionListener(this);
	591	+
	592	+ oe.toolbarPanel.add(undoButton = new cButton("\u21a9", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	593	+ undoButton.setToolTipText("Undo changes");
	594	+ undoButton.addActionListener(this);
	595	+
	596	+ oe.toolbarPanel.add(redoButton = new cButton("\u21aa", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	597	+ redoButton.setToolTipText("Redo changes");
	598	+ redoButton.addActionListener(this);
	599	+
	600	+ oe.toolbarPanel.add(saveButton = new cButton("\u21e3", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	601	+ saveButton.setToolTipText("Save changes");
	602	+ saveButton.addActionListener(this);
	603	+
495	604	oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
496	605	liveCB.setToolTipText("Enable animation");
497	606	liveCB.addItemListener(this);
498	607
499		- oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	608	+ oe.toolbarPanel.add(oneStepButton = new cButton("\u29f4", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
500	609	oneStepButton.setToolTipText("Animate one step forward");
501	610	oneStepButton.addActionListener(this);
502	611
..	..	@@ -504,7 +613,7 @@
504	613	fastCB.setToolTipText("Fast mode");
505	614	fastCB.addItemListener(this);
506	615
507		- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	616	+ oe.toolbarPanel.add(trackCB = new cCheckBox(":", CameraPane.TRACK)); //, oe.aConstraints);
508	617	trackCB.setToolTipText("Enable tracking");
509	618	trackCB.addItemListener(this);
510	619
..	..	@@ -729,8 +838,11 @@
729	838	buttonGroup.add(radioButton);
730	839	radioButton.doClick();
731	840	}
	841	+
732	842	void SetupViews(ObjEditor oe)
733	843	{
	844	+ theFrame = this;
	845	+
734	846	oe.SetupViews();
735	847
736	848	System.out.println("SetupViews");
..	..	@@ -793,6 +905,7 @@
793	905	} else if(e.getSource() == liveCB)
794	906	{
795	907	cameraView.ToggleLive();
	908	+ refreshContents(false);
796	909	}
797	910	else if(e.getSource() == supportCB)
798	911	{
..	..	@@ -1200,7 +1313,7 @@
1200	1313	memoryItem.addActionListener(this);
1201	1314	menu.add(analyzeItem = new MenuItem("Analyze"));
1202	1315	analyzeItem.addActionListener(this);
1203		- menu.add(dumpItem = new MenuItem("Dump"));
	1316	+ menu.add(dumpItem = new MenuItem("Print"));
1204	1317	dumpItem.addActionListener(this);
1205	1318	// menu.add(pathItem = new MenuItem("From-to path"));
1206	1319	// pathItem.addActionListener(this);
..	..	@@ -1854,31 +1967,6 @@
1854	1967	csg.addChild(child);
1855	1968	child.addChild(csg);
1856	1969	} 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	1970	if (source == computeAOItem)
1883	1971	{
1884	1972	Globals.drawMode = CameraPane.OCCLUSION;
..	..	@@ -1915,6 +2003,30 @@
1915	2003	if (source == dumpItem)
1916	2004	{
1917	2005	DumpObject();
	2006	+ } else
	2007	+ if (source == minButton)
	2008	+ {
	2009	+ Minimize();
	2010	+ } else
	2011	+ if (source == maxButton)
	2012	+ {
	2013	+ Maximize();
	2014	+ } else
	2015	+ if (source == fullButton)
	2016	+ {
	2017	+ ToggleFullScreen();
	2018	+ } else
	2019	+ if (source == undoButton)
	2020	+ {
	2021	+ Undo();
	2022	+ } else
	2023	+ if (source == redoButton)
	2024	+ {
	2025	+ Redo();
	2026	+ } else
	2027	+ if (source == saveButton)
	2028	+ {
	2029	+ Save();
1918	2030	} else
1919	2031	if (source == oneStepButton)
1920	2032	{
..	..	@@ -1969,6 +2081,14 @@
1969	2081	if (source == cutItem \|\| source == clearButton)
1970	2082	{
1971	2083	loadClipboard(true);
	2084	+ } else
	2085	+ if (source == undoItem)
	2086	+ {
	2087	+ Undo();
	2088	+ } else
	2089	+ if (source == redoItem)
	2090	+ {
	2091	+ Redo();
1972	2092	} else
1973	2093	if (source == duplicateItem)
1974	2094	{
..	..	@@ -2469,7 +2589,7 @@
2469	2589	} else
2470	2590	if (source == genNormalsMESHItem)
2471	2591	{
2472		- GenNormals(true); // TODO
	2592	+ GenNormalsMESH();
2473	2593	} else
2474	2594	if (source == genNormalsORGANItem)
2475	2595	{
..	..	@@ -2534,6 +2654,22 @@
2534	2654	if (source == unmarkleavesItem)
2535	2655	{
2536	2656	MarkLeaves(false);
	2657	+ } else
	2658	+ if (source == rewindleavesItem)
	2659	+ {
	2660	+ RewindLeaves(true);
	2661	+ } else
	2662	+ if (source == unrewindleavesItem)
	2663	+ {
	2664	+ RewindLeaves(false);
	2665	+ } else
	2666	+ if (source == randomleavesItem)
	2667	+ {
	2668	+ RandomLeaves(true);
	2669	+ } else
	2670	+ if (source == unrandomleavesItem)
	2671	+ {
	2672	+ RandomLeaves(false);
2537	2673	} else
2538	2674	if (source == flipVItem)
2539	2675	{
..	..	@@ -2801,6 +2937,24 @@
2801	2937	bigThree.ClearUI();
2802	2938	bigThree.add(centralPanel);
2803	2939	bigThree.FlushUI();
	2940	+
	2941	+ cameraView.requestFocusInWindow();
	2942	+
	2943	+// refreshContents(true);
	2944	+//
	2945	+// try
	2946	+// {
	2947	+// java.awt.Robot bot = new java.awt.Robot();
	2948	+// int mask = InputEvent.BUTTON1_MASK;
	2949	+// bot.mouseMove(100, 100);
	2950	+// bot.mousePress(mask);
	2951	+// bot.mouseRelease(mask);
	2952	+// }
	2953	+// catch (Exception e)
	2954	+// {
	2955	+//
	2956	+// }
	2957	+
2804	2958	} else
2805	2959	if (source == threeButton)
2806	2960	{
..	..	@@ -2837,6 +2991,8 @@
2837	2991	bigThree.add(centralPanel);
2838	2992	bigThree.add(XYZPanel);
2839	2993	bigThree.FlushUI();
	2994	+
	2995	+ cameraView.requestFocusInWindow();
2840	2996	} else
2841	2997	if (source == fourButton)
2842	2998	{
..	..	@@ -2872,6 +3028,8 @@
2872	3028	bigThree.ClearUI();
2873	3029	bigThree.add(scenePanel);
2874	3030	bigThree.FlushUI();
	3031	+
	3032	+ cameraView.requestFocusInWindow();
2875	3033	} else
2876	3034	if (source == sixButton)
2877	3035	{
..	..	@@ -2908,6 +3066,8 @@
2908	3066	bigThree.add(scenePanel);
2909	3067	bigThree.add(centralPanel);
2910	3068	bigThree.FlushUI();
	3069	+
	3070	+ cameraView.requestFocusInWindow();
2911	3071	} else
2912	3072	if (source == sevenButton)
2913	3073	{
..	..	@@ -2945,6 +3105,8 @@
2945	3105	bigThree.add(centralPanel);
2946	3106	bigThree.add(XYZPanel);
2947	3107	bigThree.FlushUI();
	3108	+
	3109	+ cameraView.requestFocusInWindow();
2948	3110	} else
2949	3111	if (source == rootButton)
2950	3112	{
..	..	@@ -2956,6 +3118,7 @@
2956	3118	EditObject(obj);
2957	3119	}
2958	3120
	3121	+ cameraView.requestFocusInWindow();
2959	3122	refreshContents(true);
2960	3123	} else
2961	3124	if (source == closeButton)
..	..	@@ -2977,6 +3140,8 @@
2977	3140	break;
2978	3141	}
2979	3142	}
	3143	+
	3144	+ cameraView.requestFocusInWindow();
2980	3145	refreshContents(true);
2981	3146	} else
2982	3147	if (source == editItem \|\| source == editButton)
..	..	@@ -2993,7 +3158,7 @@
2993	3158	child.CloseUI();
2994	3159	listUI.remove(child);
2995	3160
2996		- child.editWindow = null; // ???????????
	3161	+ //child.editWindow = null; // ???????????
2997	3162	}
2998	3163	objEditor.ctrlPanel.FlushUI();
2999	3164	//objEditor.jTree.clearSelection();
..	..	@@ -3079,7 +3244,10 @@
3079	3244	frontView.object = group;
3080	3245	sideView.object = group;
3081	3246	}
3082		- group.editWindow = this;
	3247	+
	3248	+// fix "+" issue
	3249	+ //group.editWindow = this;
	3250	+
3083	3251	/*
3084	3252	currentLayout = radio.layout;
3085	3253	if (currentLayout == null)
..	..	@@ -3091,8 +3259,23 @@
3091	3259	//group.parent = null; // ROOT
3092	3260	//group.attributes = -1;
3093	3261	ResetModel();
	3262	+
	3263	+ cameraView.requestFocusInWindow();
3094	3264	refreshContents(true);
3095		- }
	3265	+ } else if (event.getSource() == editCameraItem)
	3266	+ {
	3267	+ cameraView.ProtectCamera();
	3268	+ cameraView.repaint();
	3269	+ return;
	3270	+ } else if (event.getSource() == revertCameraItem)
	3271	+ {
	3272	+ cameraView.RevertCamera();
	3273	+ cameraView.repaint();
	3274	+ return;
	3275	+ // } else if (event.getSource() == textureButton)
	3276	+ // {
	3277	+ // return; // true;
	3278	+ }
3096	3279	else
3097	3280	{
3098	3281	//return super.action(event, arg);
..	..	@@ -3101,7 +3284,6 @@
3101	3284	}
3102	3285
3103	3286	boolean useclient = false;
3104		- cRadio radio;
3105	3287
3106	3288	void ToggleRoot()
3107	3289	{
..	..	@@ -3340,7 +3522,8 @@
3340	3522
3341	3523	int size = obj.MemorySize();
3342	3524
3343		- System.err.println((size/1024) + " KB is the size of " + obj);
	3525	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	3526	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3344	3527	}
3345	3528	}
3346	3529	catch (Exception e)
..	..	@@ -3421,6 +3604,13 @@
3421	3604	void GenNormals(boolean crease)
3422	3605	{
3423	3606	group.GenNormalsS(crease);
	3607	+
	3608	+ refreshContents();
	3609	+ }
	3610	+
	3611	+ void GenNormalsMESH()
	3612	+ {
	3613	+ group.GenNormalsMeshS();
3424	3614
3425	3615	refreshContents();
3426	3616	}
..	..	@@ -4048,6 +4238,18 @@
4048	4238	refreshContents();
4049	4239	}
4050	4240
	4241	+ void RewindLeaves(boolean hide)
	4242	+ {
	4243	+ group.selection.RewindLeaves(hide);
	4244	+ refreshContents();
	4245	+ }
	4246	+
	4247	+ void RandomLeaves(boolean hide)
	4248	+ {
	4249	+ group.selection.RandomLeaves(hide);
	4250	+ refreshContents();
	4251	+ }
	4252	+
4051	4253	void SetTexRes(int tr)
4052	4254	{
4053	4255	group.selection.SetTexRes(tr);
..	..	@@ -4133,7 +4335,7 @@
4133	4335	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4134	4336
4135	4337	Object3D elem = (Object3D)group.selection.elementAt(i);
4136		- if(elem != group)
	4338	+ if(elem != group \|\| !newWindow)
4137	4339	{
4138	4340	// if (!(elem instanceof Composite))
4139	4341	// newWindow = false;
..	..	@@ -4223,7 +4425,6 @@
4223	4425	//case 702: // Event.LIST_DESELECT
4224	4426	group.deselectAll();
4225	4427	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4226		- objEditor.ClearInfo(); // .GetMaterial());
4227	4428	if (tps != null)
4228	4429	{
4229	4430	for (int i=0; i < tps.length; i++)
..	..	@@ -4232,10 +4433,8 @@
4232	4433
4233	4434	//if (child.parent != null)
4234	4435	//child.parent.addSelectee(child);
	4436	+ objEditor.SetMaterial(child);
4235	4437	group.addSelectee(child);
4236		- objEditor.SetMaterial(child); // .GetMaterial());
4237		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4238		- System.err.println("info : " + child.GetPath());
4239	4438	}
4240	4439	}
4241	4440	// else
..	..	@@ -4245,16 +4444,17 @@
4245	4444	// System.err.println("info : " + group.GetPath());
4246	4445	// }
4247	4446
4248		- objEditor.SetText(); // jan 2014
4249		-
4250		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4447	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4251	4448	CameraPane.flash = true;
4252	4449
4253		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4450	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4254	4451	// a camera
4255	4452	{
4256		- CameraPane.camerachangeframe = 0; // don't refuse it
4257		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4453	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	4454	+ {
	4455	+ CameraPane.camerachangeframe = 0; // don't refuse it
	4456	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4457	+ }
4258	4458	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4259	4459	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4260	4460	}
..	..	@@ -4267,6 +4467,26 @@
4267	4467
4268	4468	freezemodel = false;
4269	4469	}
	4470	+
	4471	+ void refreshContents(boolean cp)
	4472	+ {
	4473	+ if (!Globals.MOUSEDRAGGED)
	4474	+ {
	4475	+ objEditor.ClearInfo(); // .GetMaterial());
	4476	+
	4477	+ for (int i=0; i < group.selection.Size(); i++)
	4478	+ {
	4479	+ Object3D child = (Object3D) group.selection.get(i);
	4480	+
	4481	+ objEditor.AddInfo(child, this, true);
	4482	+ System.err.println("info : " + child.GetPath());
	4483	+ }
	4484	+
	4485	+ objEditor.SetText(); // jan 2014
	4486	+ }
	4487	+
	4488	+ super.refreshContents(cp);
	4489	+ }
4270	4490
4271	4491	void linkSomething(Object3D thing)
4272	4492	{
..	..	@@ -4338,6 +4558,7 @@
4338	4558	{
4339	4559	if (group.selection.isEmpty())
4340	4560	return;
	4561	+
4341	4562	Grafreed.clipboardIsTempGroup = false;
4342	4563	Composite tGroup = null;
4343	4564	if (group.selection.size() > 0) // 1)
..	..	@@ -4348,6 +4569,7 @@
4348	4569
4349	4570	if (cut)
4350	4571	{
	4572	+ Save();
4351	4573	//int indices[] = jList.getSelectedIndices();
4352	4574	//for (int i = indices.length - 1; i >= 0; i--)
4353	4575	//jList.remove(indices[i]);
..	..	@@ -4437,8 +4659,10 @@
4437	4659	}
4438	4660
4439	4661	}
	4662	+
4440	4663	if (Grafreed.clipboardIsTempGroup)
4441	4664	Grafreed.clipboard = tGroup;
	4665	+
4442	4666	if (cut)
4443	4667	{
4444	4668	ResetModel();
..	..	@@ -4970,21 +5194,6 @@
4970	5194	}
4971	5195	*/
4972	5196
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	5197	/*
4989	5198	public void Callback(Object obj)
4990	5199	{
..	..	@@ -5008,23 +5217,6 @@
5008	5217	}
5009	5218	*/
5010	5219
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	5220	String GetFile(String dialogName)
5029	5221	{
5030	5222	if (Grafreed.standAlone)
..	..	@@ -5095,6 +5287,12 @@
5095	5287	cButton clearpanelButton;
5096	5288	cButton unselectButton;
5097	5289
	5290	+ cButton minButton;
	5291	+ cButton maxButton;
	5292	+ cButton fullButton;
	5293	+ cButton undoButton;
	5294	+ cButton redoButton;
	5295	+ cButton saveButton;
5098	5296	cButton oneStepButton;
5099	5297
5100	5298	cButton screenfitButton;
..	..	@@ -5108,14 +5306,6 @@
5108	5306
5109	5307	cButton setsupportButton;
5110	5308
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	5309	//
5120	5310	//Composite
5121	5311	Object3D // to do !!
..	..	@@ -5127,6 +5317,8 @@
5127	5317	private MenuItem lookFromItem;
5128	5318	private MenuItem switchItem;
5129	5319	private MenuItem cutItem;
	5320	+ private MenuItem undoItem;
	5321	+ private MenuItem redoItem;
5130	5322	private MenuItem duplicateItem;
5131	5323	private MenuItem cloneItem;
5132	5324	private MenuItem cloneSupportItem;
..	..	@@ -5190,6 +5382,10 @@
5190	5382	private MenuItem showleavesItem;
5191	5383	private MenuItem markleavesItem;
5192	5384	private MenuItem unmarkleavesItem;
	5385	+ private MenuItem rewindleavesItem;
	5386	+ private MenuItem unrewindleavesItem;
	5387	+ private MenuItem randomleavesItem;
	5388	+ private MenuItem unrandomleavesItem;
5193	5389
5194	5390	private MenuItem flipVItem;
5195	5391	private MenuItem unflipVItem;
..	..	@@ -5273,11 +5469,6 @@
5273	5469	private MenuItem doubleItem;
5274	5470	private MenuItem tripleItem;
5275	5471
5276		- private MenuItem importGFDItem;
5277		- private MenuItem importVRMLX3DItem;
5278		- private MenuItem import3DSItem;
5279		- private MenuItem importOBJItem;
5280		-
5281	5472	private MenuItem computeAOItem;
5282	5473	private MenuItem recompileItem;
5283	5474	private MenuItem editScriptItem;
..	..	@@ -5287,4 +5478,8 @@
5287	5478	private MenuItem analyzeItem;
5288	5479	private MenuItem dumpItem;
5289	5480	//boolean freezemodel = false;
	5481	+
	5482	+ Menu cameraMenu;
	5483	+ MenuItem editCameraItem;
	5484	+ MenuItem revertCameraItem;
5290	5485	}