~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -219,6 +219,8 @@
219	219	resetsupportItem.addActionListener(this);
220	220	linkverticesItem = menu.add(new MenuItem("Link to Support"));
221	221	linkverticesItem.addActionListener(this);
	222	+ relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
	223	+ relinkverticesItem.addActionListener(this);
222	224	setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
223	225	setMasterItem.addActionListener(this);
224	226
..	..	@@ -231,6 +233,10 @@
231	233	frontItem.addActionListener(this);
232	234	compositeItem = menu.add(new MenuItem("Composite"));
233	235	compositeItem.addActionListener(this);
	236	+ hideItem = menu.add(new MenuItem("Hide"));
	237	+ hideItem.addActionListener(this);
	238	+ ungroupItem = menu.add(new MenuItem("Ungroup"));
	239	+ ungroupItem.addActionListener(this);
234	240	menu.add("-");
235	241	randomItem = menu.add(new MenuItem("Random"));
236	242	randomItem.addActionListener(this);
..	..	@@ -252,6 +258,8 @@
252	258	oe.menuBar.add(menu = new Menu("Object"));
253	259	textureItem = menu.add(new MenuItem("Texture"));
254	260	textureItem.addActionListener(this);
	261	+ billboardItem = menu.add(new MenuItem("Billboard"));
	262	+ billboardItem.addActionListener(this);
255	263	csgItem = menu.add(new MenuItem("CSG"));
256	264	csgItem.addActionListener(this);
257	265	shadowXItem = menu.add(new MenuItem("Shadow X"));
..	..	@@ -269,14 +277,12 @@
269	277	pointflowItem = menu.add(new MenuItem("Point Flow"));
270	278	pointflowItem.addActionListener(this);
271	279	menu.add("-");
272		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
273		- transformgeometryItem.addActionListener(this);
274	280	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
275	281	resetTransformItem.addActionListener(this);
276	282	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
277	283	resetCentroidItem.addActionListener(this);
278		- ungroupItem = menu.add(new MenuItem("Ungroup"));
279		- ungroupItem.addActionListener(this);
	284	+ transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
	285	+ transformgeometryItem.addActionListener(this);
280	286
281	287	oe.menuBar.add(menu = new Menu("Geometry"));
282	288	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -285,6 +291,10 @@
285	291	genNormalsORGANItem.addActionListener(this);
286	292	genNormalsCADItem = menu.add(new MenuItem("CAD Normals"));
287	293	genNormalsCADItem.addActionListener(this);
	294	+ genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
	295	+ genNormalsMESHItem.addActionListener(this);
	296	+ genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	297	+ genNormalsMINEItem.addActionListener(this);
288	298	stripifyItem = menu.add(new MenuItem("Stripify"));
289	299	stripifyItem.addActionListener(this);
290	300	unstripifyItem = menu.add(new MenuItem("Unstripify"));
..	..	@@ -427,7 +437,7 @@
427	437	oe.aConstraints.gridwidth = 1;
428	438	oe.aConstraints.gridx = 0;
429	439
430		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", CameraPane.isLIVE()), oe.aConstraints);
	440	+ oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE()), oe.aConstraints);
431	441	liveCB.addItemListener(this);
432	442
433	443	oe.aConstraints.gridx += 1;
..	..	@@ -439,7 +449,7 @@
439	449	// localCB.addItemListener(this);
440	450
441	451	oe.aConstraints.gridx += 1;
442		- oe.toolbarPanel.add(crowdCB = new cCheckBox("Crowd", CameraPane.CROWD), oe.aConstraints);
	452	+ oe.toolbarPanel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD), oe.aConstraints);
443	453	crowdCB.addItemListener(this);
444	454
445	455	oe.aConstraints.gridx += 1;
..	..	@@ -510,6 +520,9 @@
510	520
511	521	oe.toolbarPanel.add(flashSelectionButton = new cButton(" ? ")); //, oe.aConstraints);
512	522	flashSelectionButton.addActionListener(this);
	523	+
	524	+ oe.toolbarPanel.add(new cButton(" ", false));
	525	+
513	526	oe.aConstraints.gridx += 1;
514	527	oe.aConstraints.weighty = 0;
515	528	oe.aConstraints.gridwidth = 1;
..	..	@@ -636,14 +649,14 @@
636	649
637	650	void EditObject(Object3D obj)
638	651	{
639		- cRadio dummyButton = new cRadio(obj.name);
640		- dummyButton.SetObject(obj);
641		- dummyButton.layout = sevenButton;
642		- dummyButton.SetCamera(cameraView.renderCamera, false);
643		- dummyButton.addActionListener(this);
644		- radioPanel.add(dummyButton);
645		- buttonGroup.add(dummyButton);
646		- dummyButton.doClick();
	652	+ cRadio radioButton = new cRadio(obj.name);
	653	+ radioButton.SetObject(obj);
	654	+ radioButton.layout = sevenButton;
	655	+ radioButton.SetCamera(cameraView.renderCamera, false);
	656	+ radioButton.addActionListener(this);
	657	+ radioPanel.add(radioButton);
	658	+ buttonGroup.add(radioButton);
	659	+ radioButton.doClick();
647	660	}
648	661	void SetupViews(ObjEditor oe)
649	662	{
..	..	@@ -705,8 +718,7 @@
705	718	dropAttributes \|= Object3D.TEXTURE;
706	719	else
707	720	dropAttributes &= ~Object3D.TEXTURE;
708		- }
709		- else if(e.getSource() == liveCB)
	721	+ } else if(e.getSource() == liveCB)
710	722	{
711	723	cameraView.ToggleLive();
712	724	}
..	..	@@ -1033,6 +1045,8 @@
1033	1045	torusItem.addActionListener(this);
1034	1046	superItem = menu.add(new MenuItem("Superellipsoid"));
1035	1047	superItem.addActionListener(this);
	1048	+ kleinItem = menu.add(new MenuItem("Klein Bottle"));
	1049	+ kleinItem.addActionListener(this);
1036	1050	particleItem = menu.add(new MenuItem("Particle system"));
1037	1051	particleItem.addActionListener(this);
1038	1052	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1106,6 +1120,8 @@
1106	1120	resetParentItem.addActionListener(this);
1107	1121	repairParentItem = menu.add(new MenuItem("Repair Parent"));
1108	1122	repairParentItem.addActionListener(this);
	1123	+ repairShadowItem = menu.add(new MenuItem("Repair Shadow"));
	1124	+ repairShadowItem.addActionListener(this);
1109	1125	menu.add(invariantsItem = new MenuItem("Invariants"));
1110	1126	invariantsItem.addActionListener(this);
1111	1127	menu.add(recompileItem = new MenuItem("Recompile"));
..	..	@@ -1593,6 +1609,10 @@
1593	1609	{
1594	1610	makeSomething(new Superellipsoid());
1595	1611	} else
	1612	+ if (event.getSource() == kleinItem)
	1613	+ {
	1614	+ makeSomething(new Klein());
	1615	+ } else
1596	1616	if (event.getSource() == blobItem)
1597	1617	{
1598	1618	Blob blob = new Blob();
..	..	@@ -1762,7 +1782,7 @@
1762	1782	} else
1763	1783	if (event.getSource() == computeAOItem)
1764	1784	{
1765		- CameraPane.drawMode = CameraPane.OCCLUSION;
	1785	+ Globals.drawMode = CameraPane.OCCLUSION;
1766	1786	CameraPane.theRenderer.repaint();
1767	1787	} else
1768	1788	if (event.getSource() == recompileItem)
..	..	@@ -1778,7 +1798,7 @@
1778	1798	if (event.getSource() == invariantsItem)
1779	1799	{
1780	1800	System.out.println("Invariants:");
1781		- GrafreeD.theApplet3D.universe.invariants();
	1801	+ GrafreeD.grafreeD.universe.invariants();
1782	1802	} else
1783	1803	if (event.getSource() == memoryItem)
1784	1804	{
..	..	@@ -2001,23 +2021,28 @@
2001	2021	if (group.selection.size() == 1)
2002	2022	one = true;
2003	2023
	2024	+ Object3D merge = null;
	2025	+
2004	2026	Object3D content = new cGroup();
2005	2027
2006	2028	for (int i=0; i<group.selection.size(); i++)
2007	2029	{
2008		- Object3D sel = new Merge(group.selection.get(i));
	2030	+ merge = new Merge(group.selection.get(i));
2009	2031
2010	2032	if (one)
2011		- makeSomething(sel, false);
	2033	+ makeSomething(merge, false);
2012	2034	else
2013		- content.addChild(sel);
	2035	+ content.addChild(merge);
2014	2036	}
2015	2037
2016	2038	if (!one)
2017		- makeSomething(content, false);
2018		-
2019		- ResetModel();
2020		- refreshContents();
	2039	+ makeSomething(content, true);
	2040	+ else
	2041	+ {
	2042	+ ResetModel();
	2043	+ Select(merge.GetTreePath(), true, false); // unselect... false);
	2044	+ refreshContents();
	2045	+ }
2021	2046	} else
2022	2047	if (event.getSource() == mergeGeometriesItem)
2023	2048	{
..	..	@@ -2094,6 +2119,15 @@
2094	2119
2095	2120	refreshContents();
2096	2121	} else
	2122	+ if (event.getSource() == relinkverticesItem)
	2123	+ {
	2124	+ boolean random = CameraPane.RANDOM;
	2125	+ CameraPane.RANDOM = false; // parse all random nodes
	2126	+ group.selection.RelinkToSupport();
	2127	+ CameraPane.RANDOM = random;
	2128	+
	2129	+ refreshContents();
	2130	+ } else
2097	2131	if (event.getSource() == resetreferencesItem)
2098	2132	{
2099	2133	for (int i=0; i<group.selection.size(); i++)
..	..	@@ -2162,6 +2196,10 @@
2162	2196	if (event.getSource() == grabItem)
2163	2197	{
2164	2198	group(new cGroup(), true);
	2199	+ } else
	2200	+ if (event.getSource() == hideItem)
	2201	+ {
	2202	+ group(new HiddenObject());
2165	2203	} else
2166	2204	if (event.getSource() == frontItem)
2167	2205	{
..	..	@@ -2285,6 +2323,10 @@
2285	2323	{
2286	2324	group(new TextureNode());
2287	2325	} else
	2326	+ if (event.getSource() == billboardItem)
	2327	+ {
	2328	+ group(new BillboardNode());
	2329	+ } else
2288	2330	if (event.getSource() == shadowXItem)
2289	2331	{
2290	2332	CastShadow(0);
..	..	@@ -2299,7 +2341,15 @@
2299	2341	} else
2300	2342	if (event.getSource() == ungroupItem)
2301	2343	{
2302		- ungroup();
	2344	+ //ungroup();
	2345	+ for (int i=0; i<group.selection.size(); i++)
	2346	+ {
	2347	+ Ungroup(group.selection.get(i));
	2348	+ }
	2349	+
	2350	+ ClearSelection(false);
	2351	+
	2352	+ refreshContents();
2303	2353	} else
2304	2354	if (event.getSource() == genUVItem)
2305	2355	{
..	..	@@ -2309,9 +2359,17 @@
2309	2359	{
2310	2360	GenNormals(true);
2311	2361	} else
	2362	+ if (event.getSource() == genNormalsMESHItem)
	2363	+ {
	2364	+ GenNormals(true); // TODO
	2365	+ } else
2312	2366	if (event.getSource() == genNormalsORGANItem)
2313	2367	{
2314	2368	GenNormals(false);
	2369	+ } else
	2370	+ if (event.getSource() == genNormalsMINEItem)
	2371	+ {
	2372	+ GenNormalsMINE();
2315	2373	} else
2316	2374	if (event.getSource() == stripifyItem)
2317	2375	{
..	..	@@ -2489,6 +2547,20 @@
2489	2547
2490	2548	refreshContents();
2491	2549	} else
	2550	+ if (event.getSource() == repairShadowItem)
	2551	+ {
	2552	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	2553	+ {
	2554	+ Object3D obj = (Object3D)e.nextElement();
	2555	+ obj.RepairShadow();
	2556	+// for (int i=0; i<obj.size(); i++)
	2557	+// {
	2558	+// obj.get(i).parent = obj;
	2559	+// }
	2560	+ }
	2561	+
	2562	+ refreshContents();
	2563	+ } else
2492	2564	if (event.getSource() == sortbysizeItem)
2493	2565	{
2494	2566	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2584,8 +2656,8 @@
2584	2656	// bug
2585	2657	//gridPanel.setDividerLocation(1.0);
2586	2658	//bigPanel.setDividerLocation(0.0);
2587		- bigThree.remove(jtp);
2588		- bigThree.remove(cameraPanel);
	2659	+ bigThree.remove(scenePanel);
	2660	+ bigThree.remove(centralPanel);
2589	2661	bigThree.remove(XYZPanel);
2590	2662	aWindowConstraints.gridx = 0;
2591	2663	aWindowConstraints.gridy = 0;
..	..	@@ -2600,7 +2672,7 @@
2600	2672	// aConstraints.gridheight = 3;
2601	2673	aWindowConstraints.gridx = 1;
2602	2674	aWindowConstraints.fill = GridBagConstraints.BOTH;
2603		- bigThree.add(cameraPanel, aWindowConstraints);
	2675	+ bigThree.add(centralPanel, aWindowConstraints);
2604	2676	aWindowConstraints.weightx = 0;
2605	2677	aWindowConstraints.gridx = 4;
2606	2678	aWindowConstraints.gridwidth = 1;
..	..	@@ -2612,8 +2684,8 @@
2612	2684	if (event.getSource() == threeButton)
2613	2685	{
2614	2686	radio.layout = threeButton;
2615		- bigThree.remove(jtp);
2616		- bigThree.remove(cameraPanel);
	2687	+ bigThree.remove(scenePanel);
	2688	+ bigThree.remove(centralPanel);
2617	2689	bigThree.remove(XYZPanel);
2618	2690	aWindowConstraints.gridx = 0;
2619	2691	aWindowConstraints.gridy = 0;
..	..	@@ -2628,7 +2700,7 @@
2628	2700	// aConstraints.gridheight = 3;
2629	2701	aWindowConstraints.gridx = 1;
2630	2702	aWindowConstraints.fill = GridBagConstraints.BOTH;
2631		- bigThree.add(cameraPanel, aWindowConstraints);
	2703	+ bigThree.add(centralPanel, aWindowConstraints);
2632	2704	aWindowConstraints.weightx = 0;
2633	2705	aWindowConstraints.gridx = 4;
2634	2706	aWindowConstraints.gridwidth = 1;
..	..	@@ -2640,8 +2712,8 @@
2640	2712	if (event.getSource() == fourButton)
2641	2713	{
2642	2714	radio.layout = fourButton;
2643		- bigThree.remove(jtp);
2644		- bigThree.remove(cameraPanel);
	2715	+ bigThree.remove(scenePanel);
	2716	+ bigThree.remove(centralPanel);
2645	2717	bigThree.remove(XYZPanel);
2646	2718	aWindowConstraints.gridx = 0;
2647	2719	aWindowConstraints.gridy = 0;
..	..	@@ -2650,7 +2722,7 @@
2650	2722	aWindowConstraints.fill = GridBagConstraints.BOTH;
2651	2723	aWindowConstraints.weightx = 1;
2652	2724	aWindowConstraints.weighty = 1;
2653		- bigThree.add(jtp, aWindowConstraints);
	2725	+ bigThree.add(scenePanel, aWindowConstraints);
2654	2726	aWindowConstraints.weightx = 1;
2655	2727	aWindowConstraints.gridwidth = 3;
2656	2728	// aConstraints.gridheight = 3;
..	..	@@ -2668,8 +2740,8 @@
2668	2740	if (event.getSource() == sixButton)
2669	2741	{
2670	2742	radio.layout = sixButton;
2671		- bigThree.remove(jtp);
2672		- bigThree.remove(cameraPanel);
	2743	+ bigThree.remove(scenePanel);
	2744	+ bigThree.remove(centralPanel);
2673	2745	bigThree.remove(XYZPanel);
2674	2746	aWindowConstraints.gridx = 0;
2675	2747	aWindowConstraints.gridy = 0;
..	..	@@ -2678,13 +2750,13 @@
2678	2750	aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2679	2751	aWindowConstraints.weightx = 0;
2680	2752	aWindowConstraints.weighty = 1;
2681		- bigThree.add(jtp, aWindowConstraints);
	2753	+ bigThree.add(scenePanel, aWindowConstraints);
2682	2754	aWindowConstraints.weightx = 1;
2683	2755	aWindowConstraints.gridwidth = 3;
2684	2756	// aWindowConstraints.gridheight = 3;
2685	2757	aWindowConstraints.gridx = 1;
2686	2758	aWindowConstraints.fill = GridBagConstraints.BOTH;
2687		- bigThree.add(cameraPanel, aWindowConstraints);
	2759	+ bigThree.add(centralPanel, aWindowConstraints);
2688	2760	aWindowConstraints.weightx = 0;
2689	2761	aWindowConstraints.gridx = 4;
2690	2762	aWindowConstraints.gridwidth = 1;
..	..	@@ -2696,8 +2768,8 @@
2696	2768	if (event.getSource() == sevenButton)
2697	2769	{
2698	2770	radio.layout = sevenButton;
2699		- bigThree.remove(jtp);
2700		- bigThree.remove(cameraPanel);
	2771	+ bigThree.remove(scenePanel);
	2772	+ bigThree.remove(centralPanel);
2701	2773	bigThree.remove(XYZPanel);
2702	2774	aWindowConstraints.gridx = 0;
2703	2775	aWindowConstraints.gridy = 0;
..	..	@@ -2706,13 +2778,13 @@
2706	2778	aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2707	2779	aWindowConstraints.weightx = 0;
2708	2780	aWindowConstraints.weighty = 1;
2709		- bigThree.add(jtp, aWindowConstraints);
	2781	+ bigThree.add(scenePanel, aWindowConstraints);
2710	2782	aWindowConstraints.weightx = 1;
2711	2783	aWindowConstraints.gridwidth = 3;
2712	2784	// aWindowConstraints.gridheight = 3;
2713	2785	aWindowConstraints.gridx = 1;
2714	2786	aWindowConstraints.fill = GridBagConstraints.BOTH;
2715		- bigThree.add(cameraPanel, aWindowConstraints);
	2787	+ bigThree.add(centralPanel, aWindowConstraints);
2716	2788	aWindowConstraints.weightx = 0;
2717	2789	aWindowConstraints.gridx = 4;
2718	2790	aWindowConstraints.gridwidth = 1;
..	..	@@ -2848,7 +2920,8 @@
2848	2920	cameraView.cameras[cameraView.cameracount] = radio.camera;
2849	2921	cameraView.targetLookAt.set(radio.camera.lookAt);
2850	2922	cameraView.object = group;
2851		- cameraView.lighttouched = true;
	2923	+ //cameraView.lighttouched = true;
	2924	+ Globals.lighttouched = true;
2852	2925	topView.object = group;
2853	2926	frontView.object = group;
2854	2927	sideView.object = group;
..	..	@@ -2884,7 +2957,7 @@
2884	2957	if (useclient)
2885	2958	{
2886	2959	cameraView.object = client;
2887		- cameraView.lighttouched = true;
	2960	+ Globals.lighttouched = true;
2888	2961	//topView.object = client;
2889	2962	//frontView.object = client;
2890	2963	//sideView.object = client;
..	..	@@ -2892,7 +2965,7 @@
2892	2965	else
2893	2966	{
2894	2967	cameraView.object = group;
2895		- cameraView.lighttouched = true;
	2968	+ Globals.lighttouched = true;
2896	2969	//topView.object = group;
2897	2970	//frontView.object = group;
2898	2971	//sideView.object = group;
..	..	@@ -3173,6 +3246,13 @@
3173	3246	refreshContents();
3174	3247	}
3175	3248
	3249	+ void GenNormalsMINE()
	3250	+ {
	3251	+ group.selection.GenNormalsMINE();
	3252	+
	3253	+ refreshContents();
	3254	+ }
	3255	+
3176	3256	void Stripify()
3177	3257	{
3178	3258	group.StripifyS();
..	..	@@ -3441,12 +3521,26 @@
3441	3521
3442	3522	void Align()
3443	3523	{
	3524	+ if (group.selection.size() == 0)
	3525	+ return;
	3526	+
	3527	+ cVector bbmin = new cVector();
	3528	+ cVector bbmax = new cVector();
	3529	+
	3530	+ group.selection.get(0).getBounds(bbmin, bbmax, true);
	3531	+
	3532	+ double dx = bbmax.x - bbmin.x;
	3533	+ double dy = bbmax.y - bbmin.y;
	3534	+ double dz = bbmax.z - bbmin.z;
	3535	+
	3536	+ double scale = Math.sqrt(dxdx + dydy + dz*dz);
	3537	+
3444	3538	for (int i=0; i<group.selection.size(); i++)
3445	3539	{
3446	3540	Object3D obj = group.selection.get(i);
3447	3541
3448		- LA.matTranslate(obj.toParent, i/2f, 0, 0);
3449		- LA.matTranslateInv(obj.fromParent, -i/2f, 0, 0);
	3542	+ LA.matTranslate(obj.toParent, i * scale, 0, 0);
	3543	+ LA.matTranslateInv(obj.fromParent, -i * scale, 0, 0);
3450	3544	}
3451	3545
3452	3546	refreshContents();
..	..	@@ -3965,7 +4059,7 @@
3965	4059
3966	4060	objEditor.SetText(); // jan 2014
3967	4061
3968		- if (flashIt && !CameraPane.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4062	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
3969	4063	CameraPane.flash = true;
3970	4064
3971	4065	if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
..	..	@@ -4468,6 +4562,26 @@
4468	4562	makeSomething(csg);
4469	4563	}
4470	4564
	4565	+ void Ungroup(Object3D g)
	4566	+ {
	4567	+ if (g instanceof HiddenObject)
	4568	+ {
	4569	+ HiddenObject h = (HiddenObject) g;
	4570	+
	4571	+ for (int i=0; i<h.ActualSize(); i++)
	4572	+ {
	4573	+ objEditor.makeSomething(h.get(i), false);
	4574	+ }
	4575	+ }
	4576	+ else
	4577	+ {
	4578	+ for (int i=0; i<g.Size(); i++)
	4579	+ {
	4580	+ objEditor.makeSomething(g.get(i), false);
	4581	+ }
	4582	+ }
	4583	+ }
	4584	+
4471	4585	void ungroup()
4472	4586	{
4473	4587	/*
..	..	@@ -4827,6 +4941,7 @@
4827	4941	private MenuItem resetsupportItem;
4828	4942	private MenuItem resetreferencesItem;
4829	4943	private MenuItem linkverticesItem;
	4944	+ private MenuItem relinkverticesItem;
4830	4945	private MenuItem setMasterItem;
4831	4946	private MenuItem resetMeshItem;
4832	4947	private MenuItem stepAllItem;
..	..	@@ -4845,8 +4960,10 @@
4845	4960	private MenuItem clearItem;
4846	4961	private MenuItem clearAllItem;
4847	4962	private MenuItem genUVItem;
	4963	+ private MenuItem genNormalsMESHItem;
4848	4964	private MenuItem genNormalsCADItem;
4849	4965	private MenuItem genNormalsORGANItem;
	4966	+ private MenuItem genNormalsMINEItem;
4850	4967	private MenuItem stripifyItem;
4851	4968	private MenuItem unstripifyItem;
4852	4969	private MenuItem trimItem;
..	..	@@ -4888,6 +5005,7 @@
4888	5005	private MenuItem resetCentroidItem;
4889	5006	private MenuItem transformgeometryItem;
4890	5007	private MenuItem resetTransformItem;
	5008	+ private MenuItem hideItem;
4891	5009	private MenuItem grabItem;
4892	5010	private MenuItem backItem;
4893	5011	private MenuItem frontItem;
..	..	@@ -4908,6 +5026,7 @@
4908	5026
4909	5027	private MenuItem resetParentItem;
4910	5028	private MenuItem repairParentItem;
	5029	+ private MenuItem repairShadowItem;
4911	5030	private MenuItem sortbysizeItem;
4912	5031	private MenuItem sortbynameItem;
4913	5032
..	..	@@ -4928,6 +5047,7 @@
4928	5047	private MenuItem coneItem;
4929	5048	private MenuItem torusItem;
4930	5049	private MenuItem superItem;
	5050	+ private MenuItem kleinItem;
4931	5051	private MenuItem blobItem;
4932	5052	private MenuItem latheItem;
4933	5053	private MenuItem bezierItem;
..	..	@@ -4940,6 +5060,7 @@
4940	5060	private MenuItem csgItem;
4941	5061	private MenuItem templateItem;
4942	5062	private MenuItem textureItem;
	5063	+ private MenuItem billboardItem;
4943	5064	private MenuItem shadowXItem;
4944	5065	private MenuItem shadowYItem;
4945	5066	private MenuItem shadowZItem;