~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,14 +197,97 @@
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(CameraPane.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	{
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	291	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
218	292	revertMeshItem.addActionListener(this);
219	293	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
..	..	@@ -318,8 +392,12 @@
318	392	resetTransformItem.addActionListener(this);
319	393	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
320	394	resetCentroidItem.addActionListener(this);
321		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
322		- transformgeometryItem.addActionListener(this);
	395	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	396	+ resetCentroidXZItem.addActionListener(this);
	397	+ transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
	398	+ transformGeometryItem.addActionListener(this);
	399	+ transformChildrenItem = menu.add(new MenuItem("Transform Children"));
	400	+ transformChildrenItem.addActionListener(this);
323	401
324	402	oe.menuBar.add(menu = new Menu("Geometry"));
325	403	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -368,6 +446,10 @@
368	446	oe.menuBar.add(menu = new Menu("Attributes"));
369	447	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
370	448	clearMaterialsItem.addActionListener(this);
	449	+ resetAllItem = menu.add(new MenuItem("Reset All"));
	450	+ resetAllItem.addActionListener(this);
	451	+ stepAllItem = menu.add(new MenuItem("Step All"));
	452	+ stepAllItem.addActionListener(this);
371	453	menu.add("-");
372	454	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
373	455	liveleavesItem.addActionListener(this);
..	..	@@ -388,6 +470,14 @@
388	470	markleavesItem.addActionListener(this);
389	471	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
390	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);
391	481	menu.add("-");
392	482	flipVItem = menu.add(new MenuItem("Flip V"));
393	483	flipVItem.addActionListener(this);
..	..	@@ -422,35 +512,23 @@
422	512	sortbysizeItem.addActionListener(this);
423	513	sortbynameItem = menu.add(new MenuItem("Sort by name"));
424	514	sortbynameItem.addActionListener(this);
	515	+ menu.add("-");
	516	+ shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
	517	+ shareGeometriesItem.addActionListener(this);
	518	+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
	519	+ mergeGeometriesItem.addActionListener(this);
425	520	if (Globals.ADVANCED)
426	521	{
427		- menu.add("-");
	522	+ // Pretty much the same as duplicate and clone.
428	523	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
429	524	extractGeometriesItem.addActionListener(this);
430	525	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
431	526	cloneGeometriesItem.addActionListener(this);
432		- shareGeometriesItem = menu.add(new MenuItem("Share Geometry"));
433		- shareGeometriesItem.addActionListener(this);
434		- mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
435		- mergeGeometriesItem.addActionListener(this);
436	527	}
437	528
438	529	oe.menuBar.add(menu = new Menu("Insert"));
439	530	buildCreateMenu(menu);
440	531
441		- oe.menuBar.add(menu = new Menu("Include"));
442		- importOBJItem = menu.add(new MenuItem("OBJ file..."));
443		- importOBJItem.addActionListener(this);
444		- menu.add("-");
445		- import3DSItem = menu.add(new MenuItem("3DS file..."));
446		- import3DSItem.addActionListener(this);
447		- menu.add("-");
448		- importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
449		- importVRMLX3DItem.addActionListener(this);
450		- menu.add("-");
451		- importGFDItem = menu.add(new MenuItem("GrafreeD file..."));
452		- importGFDItem.addActionListener(this);
453		-
454	532	oe.menuBar.add(menu = new Menu("Tools"));
455	533	buildToolsMenu(menu);
456	534	}
..	..	@@ -487,8 +565,20 @@
487	565	*/
488	566	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
489	567
	568	+ oe.toolbarPanel.add(undoButton = new cButton("Undo", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	569	+ undoButton.setToolTipText("Undo changes");
	570	+ undoButton.addActionListener(this);
	571	+
	572	+ oe.toolbarPanel.add(redoButton = new cButton("Redo", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	573	+ redoButton.setToolTipText("Redo changes");
	574	+ redoButton.addActionListener(this);
	575	+
	576	+ oe.toolbarPanel.add(saveButton = new cButton("Save", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	577	+ saveButton.setToolTipText("Save changes");
	578	+ saveButton.addActionListener(this);
	579	+
490	580	oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
491		- liveCB.setToolTipText("Enabled animation");
	581	+ liveCB.setToolTipText("Enable animation");
492	582	liveCB.addItemListener(this);
493	583
494	584	oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..	..	@@ -651,7 +741,7 @@
651	741	zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
652	742	zoomBoxCB.addItemListener(this);
653	743
654		- if (Globals.ADVANCED)
	744	+ if (true) // Globals.ADVANCED)
655	745	{
656	746	panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
657	747	supportCB.setToolTipText("Enable rigging");
..	..	@@ -724,6 +814,7 @@
724	814	buttonGroup.add(radioButton);
725	815	radioButton.doClick();
726	816	}
	817	+
727	818	void SetupViews(ObjEditor oe)
728	819	{
729	820	oe.SetupViews();
..	..	@@ -788,6 +879,7 @@
788	879	} else if(e.getSource() == liveCB)
789	880	{
790	881	cameraView.ToggleLive();
	882	+ refreshContents(false);
791	883	}
792	884	else if(e.getSource() == supportCB)
793	885	{
..	..	@@ -1195,7 +1287,7 @@
1195	1287	memoryItem.addActionListener(this);
1196	1288	menu.add(analyzeItem = new MenuItem("Analyze"));
1197	1289	analyzeItem.addActionListener(this);
1198		- menu.add(dumpItem = new MenuItem("Dump"));
	1290	+ menu.add(dumpItem = new MenuItem("Print"));
1199	1291	dumpItem.addActionListener(this);
1200	1292	// menu.add(pathItem = new MenuItem("From-to path"));
1201	1293	// pathItem.addActionListener(this);
..	..	@@ -1849,31 +1941,6 @@
1849	1941	csg.addChild(child);
1850	1942	child.addChild(csg);
1851	1943	} else
1852		-
1853		- if (source == importGFDItem)
1854		- {
1855		- ImportGFD();
1856		- } else
1857		- if (source == importVRMLX3DItem)
1858		- {
1859		- ImportVRMLX3D();
1860		- } else
1861		- if (source == import3DSItem)
1862		- {
1863		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1864		- } else
1865		- if (source == importOBJItem)
1866		- {
1867		- //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1868		- FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
1869		- browser.setVisible(true);
1870		- String filename = browser.getFile();
1871		- if (filename != null && filename.length() > 0)
1872		- {
1873		- String fullname = browser.getDirectory() + filename;
1874		- makeSomething(ReadOBJ(fullname), true);
1875		- }
1876		- } else
1877	1944	if (source == computeAOItem)
1878	1945	{
1879	1946	Globals.drawMode = CameraPane.OCCLUSION;
..	..	@@ -1910,6 +1977,18 @@
1910	1977	if (source == dumpItem)
1911	1978	{
1912	1979	DumpObject();
	1980	+ } else
	1981	+ if (source == undoButton)
	1982	+ {
	1983	+ Undo();
	1984	+ } else
	1985	+ if (source == redoButton)
	1986	+ {
	1987	+ Redo();
	1988	+ } else
	1989	+ if (source == saveButton)
	1990	+ {
	1991	+ Save();
1913	1992	} else
1914	1993	if (source == oneStepButton)
1915	1994	{
..	..	@@ -1964,6 +2043,14 @@
1964	2043	if (source == cutItem \|\| source == clearButton)
1965	2044	{
1966	2045	loadClipboard(true);
	2046	+ } else
	2047	+ if (source == undoItem)
	2048	+ {
	2049	+ Undo();
	2050	+ } else
	2051	+ if (source == redoItem)
	2052	+ {
	2053	+ Redo();
1967	2054	} else
1968	2055	if (source == duplicateItem)
1969	2056	{
..	..	@@ -2276,7 +2363,7 @@
2276	2363	{
2277	2364	RevertMeshes();
2278	2365	} else
2279		- if (source == resetMeshItem)
	2366	+ if (source == resetAllItem)
2280	2367	{
2281	2368	ResetAll();
2282	2369	} else
..	..	@@ -2464,7 +2551,7 @@
2464	2551	} else
2465	2552	if (source == genNormalsMESHItem)
2466	2553	{
2467		- GenNormals(true); // TODO
	2554	+ GenNormalsMESH();
2468	2555	} else
2469	2556	if (source == genNormalsORGANItem)
2470	2557	{
..	..	@@ -2529,6 +2616,22 @@
2529	2616	if (source == unmarkleavesItem)
2530	2617	{
2531	2618	MarkLeaves(false);
	2619	+ } else
	2620	+ if (source == rewindleavesItem)
	2621	+ {
	2622	+ RewindLeaves(true);
	2623	+ } else
	2624	+ if (source == unrewindleavesItem)
	2625	+ {
	2626	+ RewindLeaves(false);
	2627	+ } else
	2628	+ if (source == randomleavesItem)
	2629	+ {
	2630	+ RandomLeaves(true);
	2631	+ } else
	2632	+ if (source == unrandomleavesItem)
	2633	+ {
	2634	+ RandomLeaves(false);
2532	2635	} else
2533	2636	if (source == flipVItem)
2534	2637	{
..	..	@@ -2614,9 +2717,13 @@
2614	2717	{
2615	2718	SmoothMesh();
2616	2719	} else
2617		- if (source == transformgeometryItem)
	2720	+ if (source == transformGeometryItem)
2618	2721	{
2619	2722	TransformGeometry();
	2723	+ } else
	2724	+ if (source == transformChildrenItem)
	2725	+ {
	2726	+ TransformChildren();
2620	2727	} else
2621	2728	if (source == resetTransformItem)
2622	2729	{
..	..	@@ -2624,7 +2731,11 @@
2624	2731	} else
2625	2732	if (source == resetCentroidItem)
2626	2733	{
2627		- ResetCentroid();
	2734	+ ResetCentroid(true);
	2735	+ } else
	2736	+ if (source == resetCentroidXZItem)
	2737	+ {
	2738	+ ResetCentroid(false);
2628	2739	} else
2629	2740	if (source == resetParentItem)
2630	2741	{
..	..	@@ -2980,7 +3091,7 @@
2980	3091	child.CloseUI();
2981	3092	listUI.remove(child);
2982	3093
2983		- child.editWindow = null; // ???????????
	3094	+ //child.editWindow = null; // ???????????
2984	3095	}
2985	3096	objEditor.ctrlPanel.FlushUI();
2986	3097	//objEditor.jTree.clearSelection();
..	..	@@ -3066,7 +3177,10 @@
3066	3177	frontView.object = group;
3067	3178	sideView.object = group;
3068	3179	}
	3180	+
	3181	+// fix "+" issue
3069	3182	group.editWindow = this;
	3183	+
3070	3184	/*
3071	3185	currentLayout = radio.layout;
3072	3186	if (currentLayout == null)
..	..	@@ -3079,7 +3193,20 @@
3079	3193	//group.attributes = -1;
3080	3194	ResetModel();
3081	3195	refreshContents(true);
3082		- }
	3196	+ } else if (event.getSource() == editCameraItem)
	3197	+ {
	3198	+ cameraView.ProtectCamera();
	3199	+ cameraView.repaint();
	3200	+ return;
	3201	+ } else if (event.getSource() == revertCameraItem)
	3202	+ {
	3203	+ cameraView.RevertCamera();
	3204	+ cameraView.repaint();
	3205	+ return;
	3206	+ // } else if (event.getSource() == textureButton)
	3207	+ // {
	3208	+ // return; // true;
	3209	+ }
3083	3210	else
3084	3211	{
3085	3212	//return super.action(event, arg);
..	..	@@ -3140,6 +3267,28 @@
3140	3267	refreshContents();
3141	3268	}
3142	3269
	3270	+ void TransformChildren()
	3271	+ {
	3272	+ Object3D obj;
	3273	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3274	+ {
	3275	+ obj = (Object3D)e.nextElement();
	3276	+ obj.KeepTextureMatrices();
	3277	+ obj.TransformChildren();
	3278	+ obj.RestoreTextureMatrices();
	3279	+
	3280	+// if (obj.parent == null)
	3281	+// {
	3282	+// System.out.println("NULL PARENT!");
	3283	+// new Exception().printStackTrace();
	3284	+// }
	3285	+// else
	3286	+// TouchTransform(obj);
	3287	+// //obj.parent.Touch();
	3288	+ }
	3289	+
	3290	+ refreshContents();
	3291	+ }
3143	3292
3144	3293	void ResetTransform()
3145	3294	{
..	..	@@ -3252,7 +3401,7 @@
3252	3401	refreshContents();
3253	3402	}
3254	3403
3255		- void ResetCentroid()
	3404	+ void ResetCentroid(boolean full)
3256	3405	{
3257	3406	Object3D obj;
3258	3407	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3267,12 +3416,16 @@
3267	3416	LA.matIdentity(Object3D.mat);
3268	3417	obj.getBounds(minima, maxima, false);
3269	3418	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3270		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	3419	+ if (full)
	3420	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3271	3421	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3272	3422	obj.TransformMesh(Object3D.mat);
	3423	+
3273	3424	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3274		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	3425	+ if (full)
	3426	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3275	3427	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	3428	+
3276	3429	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3277	3430	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3278	3431	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3301,7 +3454,8 @@
3301	3454
3302	3455	int size = obj.MemorySize();
3303	3456
3304		- System.err.println((size/1024) + " KB is the size of " + obj);
	3457	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	3458	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3305	3459	}
3306	3460	}
3307	3461	catch (Exception e)
..	..	@@ -3382,6 +3536,13 @@
3382	3536	void GenNormals(boolean crease)
3383	3537	{
3384	3538	group.GenNormalsS(crease);
	3539	+
	3540	+ refreshContents();
	3541	+ }
	3542	+
	3543	+ void GenNormalsMESH()
	3544	+ {
	3545	+ group.GenNormalsMeshS();
3385	3546
3386	3547	refreshContents();
3387	3548	}
..	..	@@ -3613,7 +3774,16 @@
3613	3774	String pigment = Object3D.GetPigment(tex);
3614	3775	//String bump = Object3D.GetBump(tex);
3615	3776
3616		- com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	3777	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	3778	+
	3779	+ try
	3780	+ {
	3781	+ texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	3782	+ }
	3783	+ catch (Exception e)
	3784	+ {
	3785	+ System.err.println("FAIL: " + node);
	3786	+ }
3617	3787
3618	3788	double s = v.s;
3619	3789
..	..	@@ -4000,6 +4170,18 @@
4000	4170	refreshContents();
4001	4171	}
4002	4172
	4173	+ void RewindLeaves(boolean hide)
	4174	+ {
	4175	+ group.selection.RewindLeaves(hide);
	4176	+ refreshContents();
	4177	+ }
	4178	+
	4179	+ void RandomLeaves(boolean hide)
	4180	+ {
	4181	+ group.selection.RandomLeaves(hide);
	4182	+ refreshContents();
	4183	+ }
	4184	+
4003	4185	void SetTexRes(int tr)
4004	4186	{
4005	4187	group.selection.SetTexRes(tr);
..	..	@@ -4085,7 +4267,7 @@
4085	4267	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4086	4268
4087	4269	Object3D elem = (Object3D)group.selection.elementAt(i);
4088		- if(elem != group)
	4270	+ if(elem != group \|\| !newWindow)
4089	4271	{
4090	4272	// if (!(elem instanceof Composite))
4091	4273	// newWindow = false;
..	..	@@ -4175,7 +4357,6 @@
4175	4357	//case 702: // Event.LIST_DESELECT
4176	4358	group.deselectAll();
4177	4359	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4178		- objEditor.ClearInfo(); // .GetMaterial());
4179	4360	if (tps != null)
4180	4361	{
4181	4362	for (int i=0; i < tps.length; i++)
..	..	@@ -4184,10 +4365,8 @@
4184	4365
4185	4366	//if (child.parent != null)
4186	4367	//child.parent.addSelectee(child);
	4368	+ objEditor.SetMaterial(child);
4187	4369	group.addSelectee(child);
4188		- objEditor.SetMaterial(child); // .GetMaterial());
4189		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4190		- System.err.println("info : " + child.GetPath());
4191	4370	}
4192	4371	}
4193	4372	// else
..	..	@@ -4197,16 +4376,17 @@
4197	4376	// System.err.println("info : " + group.GetPath());
4198	4377	// }
4199	4378
4200		- objEditor.SetText(); // jan 2014
4201		-
4202		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4379	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4203	4380	CameraPane.flash = true;
4204	4381
4205		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4382	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4206	4383	// a camera
4207	4384	{
4208		- CameraPane.camerachangeframe = 0; // don't refuse it
4209		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4385	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	4386	+ {
	4387	+ CameraPane.camerachangeframe = 0; // don't refuse it
	4388	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4389	+ }
4210	4390	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4211	4391	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4212	4392	}
..	..	@@ -4219,6 +4399,26 @@
4219	4399
4220	4400	freezemodel = false;
4221	4401	}
	4402	+
	4403	+ void refreshContents(boolean cp)
	4404	+ {
	4405	+ if (!Globals.MOUSEDRAGGED)
	4406	+ {
	4407	+ objEditor.ClearInfo(); // .GetMaterial());
	4408	+
	4409	+ for (int i=0; i < group.selection.Size(); i++)
	4410	+ {
	4411	+ Object3D child = (Object3D) group.selection.get(i);
	4412	+
	4413	+ objEditor.AddInfo(child, this, true);
	4414	+ System.err.println("info : " + child.GetPath());
	4415	+ }
	4416	+
	4417	+ objEditor.SetText(); // jan 2014
	4418	+ }
	4419	+
	4420	+ super.refreshContents(cp);
	4421	+ }
4222	4422
4223	4423	void linkSomething(Object3D thing)
4224	4424	{
..	..	@@ -4290,6 +4490,7 @@
4290	4490	{
4291	4491	if (group.selection.isEmpty())
4292	4492	return;
	4493	+
4293	4494	Grafreed.clipboardIsTempGroup = false;
4294	4495	Composite tGroup = null;
4295	4496	if (group.selection.size() > 0) // 1)
..	..	@@ -4300,6 +4501,7 @@
4300	4501
4301	4502	if (cut)
4302	4503	{
	4504	+ Save();
4303	4505	//int indices[] = jList.getSelectedIndices();
4304	4506	//for (int i = indices.length - 1; i >= 0; i--)
4305	4507	//jList.remove(indices[i]);
..	..	@@ -4389,8 +4591,10 @@
4389	4591	}
4390	4592
4391	4593	}
	4594	+
4392	4595	if (Grafreed.clipboardIsTempGroup)
4393	4596	Grafreed.clipboard = tGroup;
	4597	+
4394	4598	if (cut)
4395	4599	{
4396	4600	ResetModel();
..	..	@@ -4922,21 +5126,6 @@
4922	5126	}
4923	5127	*/
4924	5128
4925		- void ImportGFD()
4926		- {
4927		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4928		- browser.show();
4929		- String filename = browser.getFile();
4930		- if (filename != null && filename.length() > 0)
4931		- {
4932		- String fullname = browser.getDirectory() + filename;
4933		-
4934		- //Object3D readobj =
4935		- objEditor.ReadGFD(fullname, objEditor);
4936		- //makeSomething(readobj);
4937		- }
4938		- }
4939		-
4940	5129	/*
4941	5130	public void Callback(Object obj)
4942	5131	{
..	..	@@ -4960,23 +5149,6 @@
4960	5149	}
4961	5150	*/
4962	5151
4963		- void ImportVRMLX3D()
4964		- {
4965		- if (Grafreed.standAlone)
4966		- {
4967		- /**/
4968		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4969		- browser.show();
4970		- String filename = browser.getFile();
4971		- if (filename != null && filename.length() > 0)
4972		- {
4973		- String fullname = browser.getDirectory() + filename;
4974		- LoadVRMLX3D(fullname);
4975		- }
4976		- /**/
4977		- }
4978		- }
4979		-
4980	5152	String GetFile(String dialogName)
4981	5153	{
4982	5154	if (Grafreed.standAlone)
..	..	@@ -5047,6 +5219,9 @@
5047	5219	cButton clearpanelButton;
5048	5220	cButton unselectButton;
5049	5221
	5222	+ cButton saveButton;
	5223	+ cButton undoButton;
	5224	+ cButton redoButton;
5050	5225	cButton oneStepButton;
5051	5226
5052	5227	cButton screenfitButton;
..	..	@@ -5079,6 +5254,8 @@
5079	5254	private MenuItem lookFromItem;
5080	5255	private MenuItem switchItem;
5081	5256	private MenuItem cutItem;
	5257	+ private MenuItem undoItem;
	5258	+ private MenuItem redoItem;
5082	5259	private MenuItem duplicateItem;
5083	5260	private MenuItem cloneItem;
5084	5261	private MenuItem cloneSupportItem;
..	..	@@ -5092,7 +5269,7 @@
5092	5269	private MenuItem linkverticesItem;
5093	5270	private MenuItem relinkverticesItem;
5094	5271	private MenuItem setMasterItem;
5095		- private MenuItem resetMeshItem;
	5272	+ private MenuItem resetAllItem;
5096	5273	private MenuItem stepAllItem;
5097	5274	private MenuItem revertMeshItem;
5098	5275	private MenuItem poseMeshItem;
..	..	@@ -5142,6 +5319,10 @@
5142	5319	private MenuItem showleavesItem;
5143	5320	private MenuItem markleavesItem;
5144	5321	private MenuItem unmarkleavesItem;
	5322	+ private MenuItem rewindleavesItem;
	5323	+ private MenuItem unrewindleavesItem;
	5324	+ private MenuItem randomleavesItem;
	5325	+ private MenuItem unrandomleavesItem;
5145	5326
5146	5327	private MenuItem flipVItem;
5147	5328	private MenuItem unflipVItem;
..	..	@@ -5153,8 +5334,10 @@
5153	5334	private MenuItem panoTexturesItem;
5154	5335
5155	5336	private MenuItem resetCentroidItem;
5156		- private MenuItem transformgeometryItem;
	5337	+ private MenuItem resetCentroidXZItem;
5157	5338	private MenuItem resetTransformItem;
	5339	+ private MenuItem transformGeometryItem;
	5340	+ private MenuItem transformChildrenItem;
5158	5341	private MenuItem hideItem;
5159	5342	private MenuItem grabItem;
5160	5343	private MenuItem backItem;
..	..	@@ -5223,11 +5406,6 @@
5223	5406	private MenuItem doubleItem;
5224	5407	private MenuItem tripleItem;
5225	5408
5226		- private MenuItem importGFDItem;
5227		- private MenuItem importVRMLX3DItem;
5228		- private MenuItem import3DSItem;
5229		- private MenuItem importOBJItem;
5230		-
5231	5409	private MenuItem computeAOItem;
5232	5410	private MenuItem recompileItem;
5233	5411	private MenuItem editScriptItem;
..	..	@@ -5237,4 +5415,8 @@
5237	5415	private MenuItem analyzeItem;
5238	5416	private MenuItem dumpItem;
5239	5417	//boolean freezemodel = false;
	5418	+
	5419	+ Menu cameraMenu;
	5420	+ MenuItem editCameraItem;
	5421	+ MenuItem revertCameraItem;
5240	5422	}