~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,11 +437,17 @@
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);
	441	+ liveCB.setToolTipText("Enabled animation");
433	442	liveCB.addItemListener(this);
434	443
435	444	oe.aConstraints.gridx += 1;
	445	+ oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST), oe.aConstraints);
	446	+ fastCB.setToolTipText("Fast mode");
	447	+ fastCB.addItemListener(this);
	448	+ oe.aConstraints.gridx += 1;
436	449	oe.toolbarPanel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT), oe.aConstraints);
	450	+ supportCB.setToolTipText("Enabled rigging");
437	451	supportCB.addItemListener(this);
438	452
439	453	// oe.aConstraints.gridx += 1;
..	..	@@ -441,22 +455,27 @@
441	455	// localCB.addItemListener(this);
442	456
443	457	oe.aConstraints.gridx += 1;
444		- oe.toolbarPanel.add(crowdCB = new cCheckBox("Crowd", CameraPane.CROWD), oe.aConstraints);
	458	+ oe.toolbarPanel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD), oe.aConstraints);
	459	+ crowdCB.setToolTipText("Used for crowds");
445	460	crowdCB.addItemListener(this);
446	461
447	462	oe.aConstraints.gridx += 1;
448	463	oe.toolbarPanel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA), oe.aConstraints);
	464	+ smoothCB.setToolTipText("Snapping delay");
449	465	smoothCB.addItemListener(this);
450	466
451	467	oe.aConstraints.gridx += 1;
452		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST), oe.aConstraints);
453		- fastCB.addItemListener(this);
454		- oe.aConstraints.gridx += 1;
455	468	oe.toolbarPanel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE), oe.aConstraints);
	469	+ slowCB.setToolTipText("Smooth interpolation");
456	470	slowCB.addItemListener(this);
457	471	oe.aConstraints.gridx += 1;
458		- oe.toolbarPanel.add(boxCB = new cCheckBox("Box", CameraPane.FAST), oe.aConstraints);
	472	+ oe.toolbarPanel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE), oe.aConstraints);
	473	+ boxCB.setToolTipText("Display bounding boxes");
459	474	boxCB.addItemListener(this);
	475	+ oe.aConstraints.gridx += 1;
	476	+ oe.toolbarPanel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE), oe.aConstraints);
	477	+ zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	478	+ zoomBoxCB.addItemListener(this);
460	479
461	480	// oe.aConstraints.gridx += 1;
462	481	// oe.toolbarPanel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), oe.aConstraints);
..	..	@@ -483,19 +502,22 @@
483	502	// debugCB.addItemListener(this);
484	503
485	504	oe.aConstraints.gridx += 1;
486		- oe.toolbarPanel.add(oeilCB = new cCheckBox("O", CameraPane.OEIL), oe.aConstraints);
	505	+ oe.toolbarPanel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL), oe.aConstraints);
487	506	oeilCB.addItemListener(this);
488	507
489	508	oe.aConstraints.gridx += 1;
490		- oe.toolbarPanel.add(lookAtCB = new cCheckBox("T", CameraPane.LOOKAT), oe.aConstraints);
	509	+ oe.toolbarPanel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT), oe.aConstraints);
	510	+ lookAtCB.setToolTipText("Look-at target");
491	511	lookAtCB.addItemListener(this);
492	512
493	513	oe.aConstraints.gridx += 1;
494	514	oe.toolbarPanel.add(trackCB = new cCheckBox(":", CameraPane.TRACK), oe.aConstraints);
	515	+ trackCB.setToolTipText("Enable tracking");
495	516	trackCB.addItemListener(this);
496	517
497	518	oe.aConstraints.gridx += 1;
498	519	oe.toolbarPanel.add(screenfitButton = new cButton("@ ")); //, oe.aConstraints);
	520	+ screenfitButton.setToolTipText("Screen fit");
499	521	screenfitButton.addActionListener(this);
500	522	oe.aConstraints.gridx += 1;
501	523	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
..	..	@@ -503,6 +525,7 @@
503	525	// oe.aConstraints.gridx += 1;
504	526	oe.toolbarPanel.add(snapobjectButton = new cButton(" O+ ")); //, oe.aConstraints);
505	527	snapobjectButton.addActionListener(this);
	528	+ snapobjectButton.setToolTipText("Snap Object");
506	529	oe.aConstraints.gridx += 1;
507	530
508	531	//aConstraints.gridx = 0;
..	..	@@ -511,28 +534,39 @@
511	534	oe.aConstraints.gridwidth = 1;
512	535
513	536	oe.toolbarPanel.add(flashSelectionButton = new cButton(" ? ")); //, oe.aConstraints);
	537	+ flashSelectionButton.setToolTipText("Show selection");
514	538	flashSelectionButton.addActionListener(this);
	539	+
	540	+ oe.toolbarPanel.add(new cButton(" ", false));
	541	+
515	542	oe.aConstraints.gridx += 1;
516	543	oe.aConstraints.weighty = 0;
517	544	oe.aConstraints.gridwidth = 1;
518	545
519	546	//
520	547	oe.toolbarPanel.add(twoButton = new cButton(" \|+\| ")); //, oe.aConstraints);
	548	+ twoButton.setToolTipText("Show center view only");
521	549	twoButton.addActionListener(this);
522	550	oe.toolbarPanel.add(fourButton = new cButton("+\|\| ")); //, oe.aConstraints);
523	551	fourButton.addActionListener(this);
	552	+ fourButton.setToolTipText("Show left panel only");
524	553	oe.toolbarPanel.add(sixButton = new cButton("+\|+\| ")); //, oe.aConstraints);
	554	+ sixButton.setToolTipText("2-column layout left");
525	555	sixButton.addActionListener(this);
526	556	oe.toolbarPanel.add(threeButton = new cButton(" \|+\|+")); //, oe.aConstraints);
	557	+ threeButton.setToolTipText("2-column layout right");
527	558	threeButton.addActionListener(this);
528	559	oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+")); //, oe.aConstraints);
	560	+ sevenButton.setToolTipText("3-column layout");
529	561	sevenButton.addActionListener(this);
530	562	//
531	563
532		- oe.toolbarPanel.add(rootButton = new cButton(" o o o E ")); //, oe.aConstraints);
	564	+ oe.toolbarPanel.add(rootButton = new cButton(" o o o ")); //, oe.aConstraints);
	565	+ rootButton.setToolTipText("Edit object in new tab");
533	566	rootButton.addActionListener(this);
534	567	oe.aConstraints.gridx += 1;
535	568	oe.toolbarPanel.add(closeButton = new cButton(" X ")); //, oe.aConstraints);
	569	+ closeButton.setToolTipText("Close tab");
536	570	closeButton.addActionListener(this);
537	571	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
538	572	//clearButton.addActionListener(this);
..	..	@@ -638,14 +672,14 @@
638	672
639	673	void EditObject(Object3D obj)
640	674	{
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();
	675	+ cRadio radioButton = new cRadio(obj.name);
	676	+ radioButton.SetObject(obj);
	677	+ radioButton.layout = sevenButton;
	678	+ radioButton.SetCamera(cameraView.renderCamera, false);
	679	+ radioButton.addActionListener(this);
	680	+ radioPanel.add(radioButton);
	681	+ buttonGroup.add(radioButton);
	682	+ radioButton.doClick();
649	683	}
650	684	void SetupViews(ObjEditor oe)
651	685	{
..	..	@@ -665,6 +699,7 @@
665	699	JCheckBox fastCB;
666	700	JCheckBox slowCB;
667	701	JCheckBox boxCB;
	702	+ JCheckBox zoomBoxCB;
668	703	JCheckBox trackCB;
669	704	JCheckBox smoothfocusCB;
670	705	// JCheckBox speakerMocapCB;
..	..	@@ -707,8 +742,7 @@
707	742	dropAttributes \|= Object3D.TEXTURE;
708	743	else
709	744	dropAttributes &= ~Object3D.TEXTURE;
710		- }
711		- else if(e.getSource() == liveCB)
	745	+ } else if(e.getSource() == liveCB)
712	746	{
713	747	cameraView.ToggleLive();
714	748	}
..	..	@@ -745,6 +779,10 @@
745	779	Recompile();
746	780	cameraView.repaint();
747	781	// refreshContents();
	782	+ }
	783	+ else if(e.getSource() == zoomBoxCB)
	784	+ {
	785	+ cameraView.ToggleZoomBoxMode();
748	786	}
749	787	else if(e.getSource() == smoothfocusCB)
750	788	{
..	..	@@ -1035,6 +1073,8 @@
1035	1073	torusItem.addActionListener(this);
1036	1074	superItem = menu.add(new MenuItem("Superellipsoid"));
1037	1075	superItem.addActionListener(this);
	1076	+ kleinItem = menu.add(new MenuItem("Klein Bottle"));
	1077	+ kleinItem.addActionListener(this);
1038	1078	particleItem = menu.add(new MenuItem("Particle system"));
1039	1079	particleItem.addActionListener(this);
1040	1080	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1108,6 +1148,8 @@
1108	1148	resetParentItem.addActionListener(this);
1109	1149	repairParentItem = menu.add(new MenuItem("Repair Parent"));
1110	1150	repairParentItem.addActionListener(this);
	1151	+ repairShadowItem = menu.add(new MenuItem("Repair Shadow"));
	1152	+ repairShadowItem.addActionListener(this);
1111	1153	menu.add(invariantsItem = new MenuItem("Invariants"));
1112	1154	invariantsItem.addActionListener(this);
1113	1155	menu.add(recompileItem = new MenuItem("Recompile"));
..	..	@@ -1595,6 +1637,10 @@
1595	1637	{
1596	1638	makeSomething(new Superellipsoid());
1597	1639	} else
	1640	+ if (event.getSource() == kleinItem)
	1641	+ {
	1642	+ makeSomething(new Klein());
	1643	+ } else
1598	1644	if (event.getSource() == blobItem)
1599	1645	{
1600	1646	Blob blob = new Blob();
..	..	@@ -1764,8 +1810,8 @@
1764	1810	} else
1765	1811	if (event.getSource() == computeAOItem)
1766	1812	{
1767		- CameraPane.drawMode = CameraPane.OCCLUSION;
1768		- CameraPane.theRenderer.repaint();
	1813	+ Globals.drawMode = CameraPane.OCCLUSION;
	1814	+ Globals.theRenderer.repaint();
1769	1815	} else
1770	1816	if (event.getSource() == recompileItem)
1771	1817	{
..	..	@@ -1780,7 +1826,7 @@
1780	1826	if (event.getSource() == invariantsItem)
1781	1827	{
1782	1828	System.out.println("Invariants:");
1783		- GrafreeD.theApplet3D.universe.invariants();
	1829	+ GrafreeD.grafreeD.universe.invariants();
1784	1830	} else
1785	1831	if (event.getSource() == memoryItem)
1786	1832	{
..	..	@@ -2003,23 +2049,28 @@
2003	2049	if (group.selection.size() == 1)
2004	2050	one = true;
2005	2051
	2052	+ Object3D merge = null;
	2053	+
2006	2054	Object3D content = new cGroup();
2007	2055
2008	2056	for (int i=0; i<group.selection.size(); i++)
2009	2057	{
2010		- Object3D sel = new Merge(group.selection.get(i));
	2058	+ merge = new Merge(group.selection.get(i));
2011	2059
2012	2060	if (one)
2013		- makeSomething(sel, false);
	2061	+ makeSomething(merge, false);
2014	2062	else
2015		- content.addChild(sel);
	2063	+ content.addChild(merge);
2016	2064	}
2017	2065
2018	2066	if (!one)
2019		- makeSomething(content, false);
2020		-
2021		- ResetModel();
2022		- refreshContents();
	2067	+ makeSomething(content, true);
	2068	+ else
	2069	+ {
	2070	+ ResetModel();
	2071	+ Select(merge.GetTreePath(), true, false); // unselect... false);
	2072	+ refreshContents();
	2073	+ }
2023	2074	} else
2024	2075	if (event.getSource() == mergeGeometriesItem)
2025	2076	{
..	..	@@ -2071,7 +2122,7 @@
2071	2122	if (content instanceof cGroup && ((cGroup)content).transientlink )
2072	2123	content = ((cGroup)content).get(0);
2073	2124
2074		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	2125	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2075	2126	for (int i=0; i<group.selection.size(); i++)
2076	2127	{
2077	2128	boolean random = CameraPane.RANDOM;
..	..	@@ -2080,7 +2131,7 @@
2080	2131	// group.selection.get(i).setMasterThis(content); // should be identity
2081	2132	CameraPane.RANDOM = random;
2082	2133	}
2083		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	2134	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2084	2135	refreshContents();
2085	2136	}
2086	2137	} else
..	..	@@ -2093,6 +2144,15 @@
2093	2144	group.selection.get(i).linkVerticesThis(null);
2094	2145	CameraPane.RANDOM = random;
2095	2146	}
	2147	+
	2148	+ refreshContents();
	2149	+ } else
	2150	+ if (event.getSource() == relinkverticesItem)
	2151	+ {
	2152	+ boolean random = CameraPane.RANDOM;
	2153	+ CameraPane.RANDOM = false; // parse all random nodes
	2154	+ group.selection.RelinkToSupport();
	2155	+ CameraPane.RANDOM = random;
2096	2156
2097	2157	refreshContents();
2098	2158	} else
..	..	@@ -2164,6 +2224,10 @@
2164	2224	if (event.getSource() == grabItem)
2165	2225	{
2166	2226	group(new cGroup(), true);
	2227	+ } else
	2228	+ if (event.getSource() == hideItem)
	2229	+ {
	2230	+ group(new HiddenObject());
2167	2231	} else
2168	2232	if (event.getSource() == frontItem)
2169	2233	{
..	..	@@ -2287,6 +2351,10 @@
2287	2351	{
2288	2352	group(new TextureNode());
2289	2353	} else
	2354	+ if (event.getSource() == billboardItem)
	2355	+ {
	2356	+ group(new BillboardNode());
	2357	+ } else
2290	2358	if (event.getSource() == shadowXItem)
2291	2359	{
2292	2360	CastShadow(0);
..	..	@@ -2301,7 +2369,15 @@
2301	2369	} else
2302	2370	if (event.getSource() == ungroupItem)
2303	2371	{
2304		- ungroup();
	2372	+ //ungroup();
	2373	+ for (int i=0; i<group.selection.size(); i++)
	2374	+ {
	2375	+ Ungroup(group.selection.get(i));
	2376	+ }
	2377	+
	2378	+ ClearSelection(false);
	2379	+
	2380	+ refreshContents();
2305	2381	} else
2306	2382	if (event.getSource() == genUVItem)
2307	2383	{
..	..	@@ -2318,6 +2394,10 @@
2318	2394	if (event.getSource() == genNormalsORGANItem)
2319	2395	{
2320	2396	GenNormals(false);
	2397	+ } else
	2398	+ if (event.getSource() == genNormalsMINEItem)
	2399	+ {
	2400	+ GenNormalsMINE();
2321	2401	} else
2322	2402	if (event.getSource() == stripifyItem)
2323	2403	{
..	..	@@ -2495,6 +2575,20 @@
2495	2575
2496	2576	refreshContents();
2497	2577	} else
	2578	+ if (event.getSource() == repairShadowItem)
	2579	+ {
	2580	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	2581	+ {
	2582	+ Object3D obj = (Object3D)e.nextElement();
	2583	+ obj.RepairShadow();
	2584	+// for (int i=0; i<obj.size(); i++)
	2585	+// {
	2586	+// obj.get(i).parent = obj;
	2587	+// }
	2588	+ }
	2589	+
	2590	+ refreshContents();
	2591	+ } else
2498	2592	if (event.getSource() == sortbysizeItem)
2499	2593	{
2500	2594	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2590,8 +2684,8 @@
2590	2684	// bug
2591	2685	//gridPanel.setDividerLocation(1.0);
2592	2686	//bigPanel.setDividerLocation(0.0);
2593		- bigThree.remove(jtp);
2594		- bigThree.remove(cameraPanel);
	2687	+ bigThree.remove(scenePanel);
	2688	+ bigThree.remove(centralPanel);
2595	2689	bigThree.remove(XYZPanel);
2596	2690	aWindowConstraints.gridx = 0;
2597	2691	aWindowConstraints.gridy = 0;
..	..	@@ -2606,7 +2700,7 @@
2606	2700	// aConstraints.gridheight = 3;
2607	2701	aWindowConstraints.gridx = 1;
2608	2702	aWindowConstraints.fill = GridBagConstraints.BOTH;
2609		- bigThree.add(cameraPanel, aWindowConstraints);
	2703	+ bigThree.add(centralPanel, aWindowConstraints);
2610	2704	aWindowConstraints.weightx = 0;
2611	2705	aWindowConstraints.gridx = 4;
2612	2706	aWindowConstraints.gridwidth = 1;
..	..	@@ -2618,8 +2712,8 @@
2618	2712	if (event.getSource() == threeButton)
2619	2713	{
2620	2714	radio.layout = threeButton;
2621		- bigThree.remove(jtp);
2622		- bigThree.remove(cameraPanel);
	2715	+ bigThree.remove(scenePanel);
	2716	+ bigThree.remove(centralPanel);
2623	2717	bigThree.remove(XYZPanel);
2624	2718	aWindowConstraints.gridx = 0;
2625	2719	aWindowConstraints.gridy = 0;
..	..	@@ -2634,7 +2728,7 @@
2634	2728	// aConstraints.gridheight = 3;
2635	2729	aWindowConstraints.gridx = 1;
2636	2730	aWindowConstraints.fill = GridBagConstraints.BOTH;
2637		- bigThree.add(cameraPanel, aWindowConstraints);
	2731	+ bigThree.add(centralPanel, aWindowConstraints);
2638	2732	aWindowConstraints.weightx = 0;
2639	2733	aWindowConstraints.gridx = 4;
2640	2734	aWindowConstraints.gridwidth = 1;
..	..	@@ -2646,8 +2740,8 @@
2646	2740	if (event.getSource() == fourButton)
2647	2741	{
2648	2742	radio.layout = fourButton;
2649		- bigThree.remove(jtp);
2650		- bigThree.remove(cameraPanel);
	2743	+ bigThree.remove(scenePanel);
	2744	+ bigThree.remove(centralPanel);
2651	2745	bigThree.remove(XYZPanel);
2652	2746	aWindowConstraints.gridx = 0;
2653	2747	aWindowConstraints.gridy = 0;
..	..	@@ -2656,7 +2750,7 @@
2656	2750	aWindowConstraints.fill = GridBagConstraints.BOTH;
2657	2751	aWindowConstraints.weightx = 1;
2658	2752	aWindowConstraints.weighty = 1;
2659		- bigThree.add(jtp, aWindowConstraints);
	2753	+ bigThree.add(scenePanel, aWindowConstraints);
2660	2754	aWindowConstraints.weightx = 1;
2661	2755	aWindowConstraints.gridwidth = 3;
2662	2756	// aConstraints.gridheight = 3;
..	..	@@ -2674,8 +2768,8 @@
2674	2768	if (event.getSource() == sixButton)
2675	2769	{
2676	2770	radio.layout = sixButton;
2677		- bigThree.remove(jtp);
2678		- bigThree.remove(cameraPanel);
	2771	+ bigThree.remove(scenePanel);
	2772	+ bigThree.remove(centralPanel);
2679	2773	bigThree.remove(XYZPanel);
2680	2774	aWindowConstraints.gridx = 0;
2681	2775	aWindowConstraints.gridy = 0;
..	..	@@ -2684,13 +2778,13 @@
2684	2778	aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2685	2779	aWindowConstraints.weightx = 0;
2686	2780	aWindowConstraints.weighty = 1;
2687		- bigThree.add(jtp, aWindowConstraints);
	2781	+ bigThree.add(scenePanel, aWindowConstraints);
2688	2782	aWindowConstraints.weightx = 1;
2689	2783	aWindowConstraints.gridwidth = 3;
2690	2784	// aWindowConstraints.gridheight = 3;
2691	2785	aWindowConstraints.gridx = 1;
2692	2786	aWindowConstraints.fill = GridBagConstraints.BOTH;
2693		- bigThree.add(cameraPanel, aWindowConstraints);
	2787	+ bigThree.add(centralPanel, aWindowConstraints);
2694	2788	aWindowConstraints.weightx = 0;
2695	2789	aWindowConstraints.gridx = 4;
2696	2790	aWindowConstraints.gridwidth = 1;
..	..	@@ -2702,8 +2796,8 @@
2702	2796	if (event.getSource() == sevenButton)
2703	2797	{
2704	2798	radio.layout = sevenButton;
2705		- bigThree.remove(jtp);
2706		- bigThree.remove(cameraPanel);
	2799	+ bigThree.remove(scenePanel);
	2800	+ bigThree.remove(centralPanel);
2707	2801	bigThree.remove(XYZPanel);
2708	2802	aWindowConstraints.gridx = 0;
2709	2803	aWindowConstraints.gridy = 0;
..	..	@@ -2712,13 +2806,13 @@
2712	2806	aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2713	2807	aWindowConstraints.weightx = 0;
2714	2808	aWindowConstraints.weighty = 1;
2715		- bigThree.add(jtp, aWindowConstraints);
	2809	+ bigThree.add(scenePanel, aWindowConstraints);
2716	2810	aWindowConstraints.weightx = 1;
2717	2811	aWindowConstraints.gridwidth = 3;
2718	2812	// aWindowConstraints.gridheight = 3;
2719	2813	aWindowConstraints.gridx = 1;
2720	2814	aWindowConstraints.fill = GridBagConstraints.BOTH;
2721		- bigThree.add(cameraPanel, aWindowConstraints);
	2815	+ bigThree.add(centralPanel, aWindowConstraints);
2722	2816	aWindowConstraints.weightx = 0;
2723	2817	aWindowConstraints.gridx = 4;
2724	2818	aWindowConstraints.gridwidth = 1;
..	..	@@ -2845,7 +2939,7 @@
2845	2939	}
2846	2940
2847	2941	copy = group;
2848		- //CameraPane.theRenderer.object = group;
	2942	+ //Globals.theRenderer.object = group;
2849	2943	if(!useclient)
2850	2944	{
2851	2945	cameraView.renderCamera = radio.camera;
..	..	@@ -2854,7 +2948,8 @@
2854	2948	cameraView.cameras[cameraView.cameracount] = radio.camera;
2855	2949	cameraView.targetLookAt.set(radio.camera.lookAt);
2856	2950	cameraView.object = group;
2857		- cameraView.lighttouched = true;
	2951	+ //cameraView.lighttouched = true;
	2952	+ Globals.lighttouched = true;
2858	2953	topView.object = group;
2859	2954	frontView.object = group;
2860	2955	sideView.object = group;
..	..	@@ -2890,7 +2985,7 @@
2890	2985	if (useclient)
2891	2986	{
2892	2987	cameraView.object = client;
2893		- cameraView.lighttouched = true;
	2988	+ Globals.lighttouched = true;
2894	2989	//topView.object = client;
2895	2990	//frontView.object = client;
2896	2991	//sideView.object = client;
..	..	@@ -2898,7 +2993,7 @@
2898	2993	else
2899	2994	{
2900	2995	cameraView.object = group;
2901		- cameraView.lighttouched = true;
	2996	+ Globals.lighttouched = true;
2902	2997	//topView.object = group;
2903	2998	//frontView.object = group;
2904	2999	//sideView.object = group;
..	..	@@ -3179,6 +3274,13 @@
3179	3274	refreshContents();
3180	3275	}
3181	3276
	3277	+ void GenNormalsMINE()
	3278	+ {
	3279	+ group.selection.GenNormalsMINE();
	3280	+
	3281	+ refreshContents();
	3282	+ }
	3283	+
3182	3284	void Stripify()
3183	3285	{
3184	3286	group.StripifyS();
..	..	@@ -3399,7 +3501,7 @@
3399	3501	String pigment = Object3D.GetPigment(tex);
3400	3502	//String bump = Object3D.GetBump(tex);
3401	3503
3402		- com.sun.opengl.util.texture.TextureData texturedata = CameraPane.theRenderer.GetTextureData(pigment, false, node.texres);
	3504	+ com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
3403	3505
3404	3506	double s = v.s;
3405	3507
..	..	@@ -3447,12 +3549,26 @@
3447	3549
3448	3550	void Align()
3449	3551	{
	3552	+ if (group.selection.size() == 0)
	3553	+ return;
	3554	+
	3555	+ cVector bbmin = new cVector();
	3556	+ cVector bbmax = new cVector();
	3557	+
	3558	+ group.selection.get(0).getBounds(bbmin, bbmax, true);
	3559	+
	3560	+ double dx = bbmax.x - bbmin.x;
	3561	+ double dy = bbmax.y - bbmin.y;
	3562	+ double dz = bbmax.z - bbmin.z;
	3563	+
	3564	+ double scale = Math.sqrt(dxdx + dydy + dz*dz);
	3565	+
3450	3566	for (int i=0; i<group.selection.size(); i++)
3451	3567	{
3452	3568	Object3D obj = group.selection.get(i);
3453	3569
3454		- LA.matTranslate(obj.toParent, i/2f, 0, 0);
3455		- LA.matTranslateInv(obj.fromParent, -i/2f, 0, 0);
	3570	+ LA.matTranslate(obj.toParent, i * scale, 0, 0);
	3571	+ LA.matTranslateInv(obj.fromParent, -i * scale, 0, 0);
3456	3572	}
3457	3573
3458	3574	refreshContents();
..	..	@@ -3686,7 +3802,7 @@
3686	3802	group.selection.RelinkToSupport(); // july 2014
3687	3803	System.out.println("DONE.");
3688	3804	refreshContents();
3689		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	3805	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
3690	3806	}
3691	3807
3692	3808	void ReduceMesh(boolean reduction34)
..	..	@@ -3971,16 +4087,16 @@
3971	4087
3972	4088	objEditor.SetText(); // jan 2014
3973	4089
3974		- if (flashIt && !CameraPane.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4090	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
3975	4091	CameraPane.flash = true;
3976	4092
3977	4093	if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
3978	4094	// a camera
3979	4095	{
3980	4096	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;
	4097	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4098	+ // Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
	4099	+ // Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
3984	4100	}
3985	4101
3986	4102	refreshContents();
..	..	@@ -4474,6 +4590,26 @@
4474	4590	makeSomething(csg);
4475	4591	}
4476	4592
	4593	+ void Ungroup(Object3D g)
	4594	+ {
	4595	+ if (g instanceof HiddenObject)
	4596	+ {
	4597	+ HiddenObject h = (HiddenObject) g;
	4598	+
	4599	+ for (int i=0; i<h.ActualSize(); i++)
	4600	+ {
	4601	+ objEditor.makeSomething(h.get(i), false);
	4602	+ }
	4603	+ }
	4604	+ else
	4605	+ {
	4606	+ for (int i=0; i<g.Size(); i++)
	4607	+ {
	4608	+ objEditor.makeSomething(g.get(i), false);
	4609	+ }
	4610	+ }
	4611	+ }
	4612	+
4477	4613	void ungroup()
4478	4614	{
4479	4615	/*
..	..	@@ -4833,6 +4969,7 @@
4833	4969	private MenuItem resetsupportItem;
4834	4970	private MenuItem resetreferencesItem;
4835	4971	private MenuItem linkverticesItem;
	4972	+ private MenuItem relinkverticesItem;
4836	4973	private MenuItem setMasterItem;
4837	4974	private MenuItem resetMeshItem;
4838	4975	private MenuItem stepAllItem;
..	..	@@ -4854,6 +4991,7 @@
4854	4991	private MenuItem genNormalsMESHItem;
4855	4992	private MenuItem genNormalsCADItem;
4856	4993	private MenuItem genNormalsORGANItem;
	4994	+ private MenuItem genNormalsMINEItem;
4857	4995	private MenuItem stripifyItem;
4858	4996	private MenuItem unstripifyItem;
4859	4997	private MenuItem trimItem;
..	..	@@ -4895,6 +5033,7 @@
4895	5033	private MenuItem resetCentroidItem;
4896	5034	private MenuItem transformgeometryItem;
4897	5035	private MenuItem resetTransformItem;
	5036	+ private MenuItem hideItem;
4898	5037	private MenuItem grabItem;
4899	5038	private MenuItem backItem;
4900	5039	private MenuItem frontItem;
..	..	@@ -4915,6 +5054,7 @@
4915	5054
4916	5055	private MenuItem resetParentItem;
4917	5056	private MenuItem repairParentItem;
	5057	+ private MenuItem repairShadowItem;
4918	5058	private MenuItem sortbysizeItem;
4919	5059	private MenuItem sortbynameItem;
4920	5060
..	..	@@ -4935,6 +5075,7 @@
4935	5075	private MenuItem coneItem;
4936	5076	private MenuItem torusItem;
4937	5077	private MenuItem superItem;
	5078	+ private MenuItem kleinItem;
4938	5079	private MenuItem blobItem;
4939	5080	private MenuItem latheItem;
4940	5081	private MenuItem bezierItem;
..	..	@@ -4947,6 +5088,7 @@
4947	5088	private MenuItem csgItem;
4948	5089	private MenuItem templateItem;
4949	5090	private MenuItem textureItem;
	5091	+ private MenuItem billboardItem;
4950	5092	private MenuItem shadowXItem;
4951	5093	private MenuItem shadowYItem;
4952	5094	private MenuItem shadowZItem;