~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"));
..	..	@@ -287,6 +293,8 @@
287	293	genNormalsCADItem.addActionListener(this);
288	294	genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
289	295	genNormalsMESHItem.addActionListener(this);
	296	+ genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	297	+ genNormalsMINEItem.addActionListener(this);
290	298	stripifyItem = menu.add(new MenuItem("Stripify"));
291	299	stripifyItem.addActionListener(this);
292	300	unstripifyItem = menu.add(new MenuItem("Unstripify"));
..	..	@@ -429,7 +437,7 @@
429	437	oe.aConstraints.gridwidth = 1;
430	438	oe.aConstraints.gridx = 0;
431	439
432		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", CameraPane.isLIVE()), oe.aConstraints);
	440	+ oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE()), oe.aConstraints);
433	441	liveCB.addItemListener(this);
434	442
435	443	oe.aConstraints.gridx += 1;
..	..	@@ -441,7 +449,7 @@
441	449	// localCB.addItemListener(this);
442	450
443	451	oe.aConstraints.gridx += 1;
444		- oe.toolbarPanel.add(crowdCB = new cCheckBox("Crowd", CameraPane.CROWD), oe.aConstraints);
	452	+ oe.toolbarPanel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD), oe.aConstraints);
445	453	crowdCB.addItemListener(this);
446	454
447	455	oe.aConstraints.gridx += 1;
..	..	@@ -512,6 +520,9 @@
512	520
513	521	oe.toolbarPanel.add(flashSelectionButton = new cButton(" ? ")); //, oe.aConstraints);
514	522	flashSelectionButton.addActionListener(this);
	523	+
	524	+ oe.toolbarPanel.add(new cButton(" ", false));
	525	+
515	526	oe.aConstraints.gridx += 1;
516	527	oe.aConstraints.weighty = 0;
517	528	oe.aConstraints.gridwidth = 1;
..	..	@@ -638,14 +649,14 @@
638	649
639	650	void EditObject(Object3D obj)
640	651	{
641		- cRadio dummyButton = new cRadio(obj.name);
642		- dummyButton.SetObject(obj);
643		- dummyButton.layout = sevenButton;
644		- dummyButton.SetCamera(cameraView.renderCamera, false);
645		- dummyButton.addActionListener(this);
646		- radioPanel.add(dummyButton);
647		- buttonGroup.add(dummyButton);
648		- 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();
649	660	}
650	661	void SetupViews(ObjEditor oe)
651	662	{
..	..	@@ -707,8 +718,7 @@
707	718	dropAttributes \|= Object3D.TEXTURE;
708	719	else
709	720	dropAttributes &= ~Object3D.TEXTURE;
710		- }
711		- else if(e.getSource() == liveCB)
	721	+ } else if(e.getSource() == liveCB)
712	722	{
713	723	cameraView.ToggleLive();
714	724	}
..	..	@@ -1035,6 +1045,8 @@
1035	1045	torusItem.addActionListener(this);
1036	1046	superItem = menu.add(new MenuItem("Superellipsoid"));
1037	1047	superItem.addActionListener(this);
	1048	+ kleinItem = menu.add(new MenuItem("Klein Bottle"));
	1049	+ kleinItem.addActionListener(this);
1038	1050	particleItem = menu.add(new MenuItem("Particle system"));
1039	1051	particleItem.addActionListener(this);
1040	1052	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1108,6 +1120,8 @@
1108	1120	resetParentItem.addActionListener(this);
1109	1121	repairParentItem = menu.add(new MenuItem("Repair Parent"));
1110	1122	repairParentItem.addActionListener(this);
	1123	+ repairShadowItem = menu.add(new MenuItem("Repair Shadow"));
	1124	+ repairShadowItem.addActionListener(this);
1111	1125	menu.add(invariantsItem = new MenuItem("Invariants"));
1112	1126	invariantsItem.addActionListener(this);
1113	1127	menu.add(recompileItem = new MenuItem("Recompile"));
..	..	@@ -1595,6 +1609,10 @@
1595	1609	{
1596	1610	makeSomething(new Superellipsoid());
1597	1611	} else
	1612	+ if (event.getSource() == kleinItem)
	1613	+ {
	1614	+ makeSomething(new Klein());
	1615	+ } else
1598	1616	if (event.getSource() == blobItem)
1599	1617	{
1600	1618	Blob blob = new Blob();
..	..	@@ -1764,8 +1782,8 @@
1764	1782	} else
1765	1783	if (event.getSource() == computeAOItem)
1766	1784	{
1767		- CameraPane.drawMode = CameraPane.OCCLUSION;
1768		- CameraPane.theRenderer.repaint();
	1785	+ Globals.drawMode = CameraPane.OCCLUSION;
	1786	+ Globals.theRenderer.repaint();
1769	1787	} else
1770	1788	if (event.getSource() == recompileItem)
1771	1789	{
..	..	@@ -1780,7 +1798,7 @@
1780	1798	if (event.getSource() == invariantsItem)
1781	1799	{
1782	1800	System.out.println("Invariants:");
1783		- GrafreeD.theApplet3D.universe.invariants();
	1801	+ GrafreeD.grafreeD.universe.invariants();
1784	1802	} else
1785	1803	if (event.getSource() == memoryItem)
1786	1804	{
..	..	@@ -2003,23 +2021,28 @@
2003	2021	if (group.selection.size() == 1)
2004	2022	one = true;
2005	2023
	2024	+ Object3D merge = null;
	2025	+
2006	2026	Object3D content = new cGroup();
2007	2027
2008	2028	for (int i=0; i<group.selection.size(); i++)
2009	2029	{
2010		- Object3D sel = new Merge(group.selection.get(i));
	2030	+ merge = new Merge(group.selection.get(i));
2011	2031
2012	2032	if (one)
2013		- makeSomething(sel, false);
	2033	+ makeSomething(merge, false);
2014	2034	else
2015		- content.addChild(sel);
	2035	+ content.addChild(merge);
2016	2036	}
2017	2037
2018	2038	if (!one)
2019		- makeSomething(content, false);
2020		-
2021		- ResetModel();
2022		- refreshContents();
	2039	+ makeSomething(content, true);
	2040	+ else
	2041	+ {
	2042	+ ResetModel();
	2043	+ Select(merge.GetTreePath(), true, false); // unselect... false);
	2044	+ refreshContents();
	2045	+ }
2023	2046	} else
2024	2047	if (event.getSource() == mergeGeometriesItem)
2025	2048	{
..	..	@@ -2071,7 +2094,7 @@
2071	2094	if (content instanceof cGroup && ((cGroup)content).transientlink )
2072	2095	content = ((cGroup)content).get(0);
2073	2096
2074		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	2097	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2075	2098	for (int i=0; i<group.selection.size(); i++)
2076	2099	{
2077	2100	boolean random = CameraPane.RANDOM;
..	..	@@ -2080,7 +2103,7 @@
2080	2103	// group.selection.get(i).setMasterThis(content); // should be identity
2081	2104	CameraPane.RANDOM = random;
2082	2105	}
2083		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	2106	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2084	2107	refreshContents();
2085	2108	}
2086	2109	} else
..	..	@@ -2093,6 +2116,15 @@
2093	2116	group.selection.get(i).linkVerticesThis(null);
2094	2117	CameraPane.RANDOM = random;
2095	2118	}
	2119	+
	2120	+ refreshContents();
	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;
2096	2128
2097	2129	refreshContents();
2098	2130	} else
..	..	@@ -2164,6 +2196,10 @@
2164	2196	if (event.getSource() == grabItem)
2165	2197	{
2166	2198	group(new cGroup(), true);
	2199	+ } else
	2200	+ if (event.getSource() == hideItem)
	2201	+ {
	2202	+ group(new HiddenObject());
2167	2203	} else
2168	2204	if (event.getSource() == frontItem)
2169	2205	{
..	..	@@ -2287,6 +2323,10 @@
2287	2323	{
2288	2324	group(new TextureNode());
2289	2325	} else
	2326	+ if (event.getSource() == billboardItem)
	2327	+ {
	2328	+ group(new BillboardNode());
	2329	+ } else
2290	2330	if (event.getSource() == shadowXItem)
2291	2331	{
2292	2332	CastShadow(0);
..	..	@@ -2301,7 +2341,15 @@
2301	2341	} else
2302	2342	if (event.getSource() == ungroupItem)
2303	2343	{
2304		- 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();
2305	2353	} else
2306	2354	if (event.getSource() == genUVItem)
2307	2355	{
..	..	@@ -2318,6 +2366,10 @@
2318	2366	if (event.getSource() == genNormalsORGANItem)
2319	2367	{
2320	2368	GenNormals(false);
	2369	+ } else
	2370	+ if (event.getSource() == genNormalsMINEItem)
	2371	+ {
	2372	+ GenNormalsMINE();
2321	2373	} else
2322	2374	if (event.getSource() == stripifyItem)
2323	2375	{
..	..	@@ -2495,6 +2547,20 @@
2495	2547
2496	2548	refreshContents();
2497	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
2498	2564	if (event.getSource() == sortbysizeItem)
2499	2565	{
2500	2566	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2590,8 +2656,8 @@
2590	2656	// bug
2591	2657	//gridPanel.setDividerLocation(1.0);
2592	2658	//bigPanel.setDividerLocation(0.0);
2593		- bigThree.remove(jtp);
2594		- bigThree.remove(cameraPanel);
	2659	+ bigThree.remove(scenePanel);
	2660	+ bigThree.remove(centralPanel);
2595	2661	bigThree.remove(XYZPanel);
2596	2662	aWindowConstraints.gridx = 0;
2597	2663	aWindowConstraints.gridy = 0;
..	..	@@ -2606,7 +2672,7 @@
2606	2672	// aConstraints.gridheight = 3;
2607	2673	aWindowConstraints.gridx = 1;
2608	2674	aWindowConstraints.fill = GridBagConstraints.BOTH;
2609		- bigThree.add(cameraPanel, aWindowConstraints);
	2675	+ bigThree.add(centralPanel, aWindowConstraints);
2610	2676	aWindowConstraints.weightx = 0;
2611	2677	aWindowConstraints.gridx = 4;
2612	2678	aWindowConstraints.gridwidth = 1;
..	..	@@ -2618,8 +2684,8 @@
2618	2684	if (event.getSource() == threeButton)
2619	2685	{
2620	2686	radio.layout = threeButton;
2621		- bigThree.remove(jtp);
2622		- bigThree.remove(cameraPanel);
	2687	+ bigThree.remove(scenePanel);
	2688	+ bigThree.remove(centralPanel);
2623	2689	bigThree.remove(XYZPanel);
2624	2690	aWindowConstraints.gridx = 0;
2625	2691	aWindowConstraints.gridy = 0;
..	..	@@ -2634,7 +2700,7 @@
2634	2700	// aConstraints.gridheight = 3;
2635	2701	aWindowConstraints.gridx = 1;
2636	2702	aWindowConstraints.fill = GridBagConstraints.BOTH;
2637		- bigThree.add(cameraPanel, aWindowConstraints);
	2703	+ bigThree.add(centralPanel, aWindowConstraints);
2638	2704	aWindowConstraints.weightx = 0;
2639	2705	aWindowConstraints.gridx = 4;
2640	2706	aWindowConstraints.gridwidth = 1;
..	..	@@ -2646,8 +2712,8 @@
2646	2712	if (event.getSource() == fourButton)
2647	2713	{
2648	2714	radio.layout = fourButton;
2649		- bigThree.remove(jtp);
2650		- bigThree.remove(cameraPanel);
	2715	+ bigThree.remove(scenePanel);
	2716	+ bigThree.remove(centralPanel);
2651	2717	bigThree.remove(XYZPanel);
2652	2718	aWindowConstraints.gridx = 0;
2653	2719	aWindowConstraints.gridy = 0;
..	..	@@ -2656,7 +2722,7 @@
2656	2722	aWindowConstraints.fill = GridBagConstraints.BOTH;
2657	2723	aWindowConstraints.weightx = 1;
2658	2724	aWindowConstraints.weighty = 1;
2659		- bigThree.add(jtp, aWindowConstraints);
	2725	+ bigThree.add(scenePanel, aWindowConstraints);
2660	2726	aWindowConstraints.weightx = 1;
2661	2727	aWindowConstraints.gridwidth = 3;
2662	2728	// aConstraints.gridheight = 3;
..	..	@@ -2674,8 +2740,8 @@
2674	2740	if (event.getSource() == sixButton)
2675	2741	{
2676	2742	radio.layout = sixButton;
2677		- bigThree.remove(jtp);
2678		- bigThree.remove(cameraPanel);
	2743	+ bigThree.remove(scenePanel);
	2744	+ bigThree.remove(centralPanel);
2679	2745	bigThree.remove(XYZPanel);
2680	2746	aWindowConstraints.gridx = 0;
2681	2747	aWindowConstraints.gridy = 0;
..	..	@@ -2684,13 +2750,13 @@
2684	2750	aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2685	2751	aWindowConstraints.weightx = 0;
2686	2752	aWindowConstraints.weighty = 1;
2687		- bigThree.add(jtp, aWindowConstraints);
	2753	+ bigThree.add(scenePanel, aWindowConstraints);
2688	2754	aWindowConstraints.weightx = 1;
2689	2755	aWindowConstraints.gridwidth = 3;
2690	2756	// aWindowConstraints.gridheight = 3;
2691	2757	aWindowConstraints.gridx = 1;
2692	2758	aWindowConstraints.fill = GridBagConstraints.BOTH;
2693		- bigThree.add(cameraPanel, aWindowConstraints);
	2759	+ bigThree.add(centralPanel, aWindowConstraints);
2694	2760	aWindowConstraints.weightx = 0;
2695	2761	aWindowConstraints.gridx = 4;
2696	2762	aWindowConstraints.gridwidth = 1;
..	..	@@ -2702,8 +2768,8 @@
2702	2768	if (event.getSource() == sevenButton)
2703	2769	{
2704	2770	radio.layout = sevenButton;
2705		- bigThree.remove(jtp);
2706		- bigThree.remove(cameraPanel);
	2771	+ bigThree.remove(scenePanel);
	2772	+ bigThree.remove(centralPanel);
2707	2773	bigThree.remove(XYZPanel);
2708	2774	aWindowConstraints.gridx = 0;
2709	2775	aWindowConstraints.gridy = 0;
..	..	@@ -2712,13 +2778,13 @@
2712	2778	aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2713	2779	aWindowConstraints.weightx = 0;
2714	2780	aWindowConstraints.weighty = 1;
2715		- bigThree.add(jtp, aWindowConstraints);
	2781	+ bigThree.add(scenePanel, aWindowConstraints);
2716	2782	aWindowConstraints.weightx = 1;
2717	2783	aWindowConstraints.gridwidth = 3;
2718	2784	// aWindowConstraints.gridheight = 3;
2719	2785	aWindowConstraints.gridx = 1;
2720	2786	aWindowConstraints.fill = GridBagConstraints.BOTH;
2721		- bigThree.add(cameraPanel, aWindowConstraints);
	2787	+ bigThree.add(centralPanel, aWindowConstraints);
2722	2788	aWindowConstraints.weightx = 0;
2723	2789	aWindowConstraints.gridx = 4;
2724	2790	aWindowConstraints.gridwidth = 1;
..	..	@@ -2845,7 +2911,7 @@
2845	2911	}
2846	2912
2847	2913	copy = group;
2848		- //CameraPane.theRenderer.object = group;
	2914	+ //Globals.theRenderer.object = group;
2849	2915	if(!useclient)
2850	2916	{
2851	2917	cameraView.renderCamera = radio.camera;
..	..	@@ -2854,7 +2920,8 @@
2854	2920	cameraView.cameras[cameraView.cameracount] = radio.camera;
2855	2921	cameraView.targetLookAt.set(radio.camera.lookAt);
2856	2922	cameraView.object = group;
2857		- cameraView.lighttouched = true;
	2923	+ //cameraView.lighttouched = true;
	2924	+ Globals.lighttouched = true;
2858	2925	topView.object = group;
2859	2926	frontView.object = group;
2860	2927	sideView.object = group;
..	..	@@ -2890,7 +2957,7 @@
2890	2957	if (useclient)
2891	2958	{
2892	2959	cameraView.object = client;
2893		- cameraView.lighttouched = true;
	2960	+ Globals.lighttouched = true;
2894	2961	//topView.object = client;
2895	2962	//frontView.object = client;
2896	2963	//sideView.object = client;
..	..	@@ -2898,7 +2965,7 @@
2898	2965	else
2899	2966	{
2900	2967	cameraView.object = group;
2901		- cameraView.lighttouched = true;
	2968	+ Globals.lighttouched = true;
2902	2969	//topView.object = group;
2903	2970	//frontView.object = group;
2904	2971	//sideView.object = group;
..	..	@@ -3179,6 +3246,13 @@
3179	3246	refreshContents();
3180	3247	}
3181	3248
	3249	+ void GenNormalsMINE()
	3250	+ {
	3251	+ group.selection.GenNormalsMINE();
	3252	+
	3253	+ refreshContents();
	3254	+ }
	3255	+
3182	3256	void Stripify()
3183	3257	{
3184	3258	group.StripifyS();
..	..	@@ -3399,7 +3473,7 @@
3399	3473	String pigment = Object3D.GetPigment(tex);
3400	3474	//String bump = Object3D.GetBump(tex);
3401	3475
3402		- com.sun.opengl.util.texture.TextureData texturedata = CameraPane.theRenderer.GetTextureData(pigment, false, node.texres);
	3476	+ com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
3403	3477
3404	3478	double s = v.s;
3405	3479
..	..	@@ -3447,12 +3521,26 @@
3447	3521
3448	3522	void Align()
3449	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	+
3450	3538	for (int i=0; i<group.selection.size(); i++)
3451	3539	{
3452	3540	Object3D obj = group.selection.get(i);
3453	3541
3454		- LA.matTranslate(obj.toParent, i/2f, 0, 0);
3455		- 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);
3456	3544	}
3457	3545
3458	3546	refreshContents();
..	..	@@ -3686,7 +3774,7 @@
3686	3774	group.selection.RelinkToSupport(); // july 2014
3687	3775	System.out.println("DONE.");
3688	3776	refreshContents();
3689		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	3777	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
3690	3778	}
3691	3779
3692	3780	void ReduceMesh(boolean reduction34)
..	..	@@ -3971,16 +4059,16 @@
3971	4059
3972	4060	objEditor.SetText(); // jan 2014
3973	4061
3974		- 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))
3975	4063	CameraPane.flash = true;
3976	4064
3977	4065	if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
3978	4066	// a camera
3979	4067	{
3980	4068	CameraPane.camerachangeframe = 0; // don't refuse it
3981		- CameraPane.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
3982		- // CameraPane.theRenderer.renderCamera = CameraPane.theRenderer.manipCamera;
3983		- // CameraPane.theRenderer.eyeCamera = CameraPane.theRenderer.manipCamera;
	4069	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4070	+ // Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
	4071	+ // Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
3984	4072	}
3985	4073
3986	4074	refreshContents();
..	..	@@ -4474,6 +4562,26 @@
4474	4562	makeSomething(csg);
4475	4563	}
4476	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	+
4477	4585	void ungroup()
4478	4586	{
4479	4587	/*
..	..	@@ -4833,6 +4941,7 @@
4833	4941	private MenuItem resetsupportItem;
4834	4942	private MenuItem resetreferencesItem;
4835	4943	private MenuItem linkverticesItem;
	4944	+ private MenuItem relinkverticesItem;
4836	4945	private MenuItem setMasterItem;
4837	4946	private MenuItem resetMeshItem;
4838	4947	private MenuItem stepAllItem;
..	..	@@ -4854,6 +4963,7 @@
4854	4963	private MenuItem genNormalsMESHItem;
4855	4964	private MenuItem genNormalsCADItem;
4856	4965	private MenuItem genNormalsORGANItem;
	4966	+ private MenuItem genNormalsMINEItem;
4857	4967	private MenuItem stripifyItem;
4858	4968	private MenuItem unstripifyItem;
4859	4969	private MenuItem trimItem;
..	..	@@ -4895,6 +5005,7 @@
4895	5005	private MenuItem resetCentroidItem;
4896	5006	private MenuItem transformgeometryItem;
4897	5007	private MenuItem resetTransformItem;
	5008	+ private MenuItem hideItem;
4898	5009	private MenuItem grabItem;
4899	5010	private MenuItem backItem;
4900	5011	private MenuItem frontItem;
..	..	@@ -4915,6 +5026,7 @@
4915	5026
4916	5027	private MenuItem resetParentItem;
4917	5028	private MenuItem repairParentItem;
	5029	+ private MenuItem repairShadowItem;
4918	5030	private MenuItem sortbysizeItem;
4919	5031	private MenuItem sortbynameItem;
4920	5032
..	..	@@ -4935,6 +5047,7 @@
4935	5047	private MenuItem coneItem;
4936	5048	private MenuItem torusItem;
4937	5049	private MenuItem superItem;
	5050	+ private MenuItem kleinItem;
4938	5051	private MenuItem blobItem;
4939	5052	private MenuItem latheItem;
4940	5053	private MenuItem bezierItem;
..	..	@@ -4947,6 +5060,7 @@
4947	5060	private MenuItem csgItem;
4948	5061	private MenuItem templateItem;
4949	5062	private MenuItem textureItem;
	5063	+ private MenuItem billboardItem;
4950	5064	private MenuItem shadowXItem;
4951	5065	private MenuItem shadowYItem;
4952	5066	private MenuItem shadowZItem;