~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -368,16 +368,6 @@
368	368	refreshContents();
369	369	}
370	370
371		- public void Show3DView()
372		- {
373		- // bug
374		- //gridPanel.setDividerLocation(1.0);
375		- //bigPanel.setDividerLocation(0.0);
376		- bigThree.ClearUI();
377		- bigThree.add(centralPanel);
378		- bigThree.FlushUI();
379		- }
380		-
381	371	//ObjEditor objEditor;
382	372	public void closeUI2()
383	373	{
..	..	@@ -417,13 +407,13 @@
417	407
418	408	assert(false);
419	409
420		- if (copy.versionlist == null)
421		- {
422		- copy.versionlist = new Object3D[100];
423		- copy.versionindex = -1;
424		-
425		- //Save(true);
426		- }
	410	+// if (copy.versionlist == null)
	411	+// {
	412	+// copy.versionlist = new Object3D[100];
	413	+// copy.versionindex = -1;
	414	+//
	415	+// //Save(true);
	416	+// }
427	417
428	418	if(ui)
429	419	SetupUI(objEditor);
..	..	@@ -446,13 +436,13 @@
446	436
447	437	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
448	438
449		- if (copy.versionlist == null)
450		- {
451		- copy.versionlist = new Object3D[100];
452		- copy.versionindex = -1;
453		-
454		- //Save(true);
455		- }
	439	+// if (copy.versionlist == null)
	440	+// {
	441	+// copy.versionlist = new Object3D[100];
	442	+// copy.versionindex = -1;
	443	+//
	444	+// //Save(true);
	445	+// }
456	446	}
457	447
458	448	void CloneSelection(boolean supports)
..	..	@@ -493,11 +483,16 @@
493	483
494	484	Object3D parent = obj.parent;
495	485	obj.parent = null;
	486	+
496	487	// Object3D support = obj.support;
497	488	// obj.support = null;
498	489	if (!supports)
499	490	obj.SaveSupports();
	491	+
500	492	Object3D clone = (Object3D)Grafreed.clone(obj);
	493	+
	494	+ clone.ResetUUIDs();
	495	+
501	496	obj.parent = parent;
502	497	// obj.support = support;
503	498	// clone.support = support; // aout 2013
..	..	@@ -567,8 +562,10 @@
567	562	pasteLinkItem.addActionListener(this);
568	563	pasteCloneItem = oe.jTree.popup.add(new JMenuItem("Paste clone"));
569	564	pasteCloneItem.addActionListener(this);
570		-// CRASH pasteExpandItem = oe.jTree.popup.add(new JMenuItem("Paste expand"));
571		-// pasteExpandItem.addActionListener(this);
	565	+// CRASH
	566	+ pasteExpandItem = oe.jTree.popup.add(new JMenuItem("Paste expand"));
	567	+//
	568	+ pasteExpandItem.addActionListener(this);
572	569	//menu.add("-");
573	570	oe.jTree.popup.addSeparator();
574	571
..	..	@@ -765,9 +762,9 @@
765	762	shadowYItem.addActionListener(this);
766	763	shadowZItem = menu.add(new MenuItem("Shadow Blue"));
767	764	shadowZItem.addActionListener(this);
	765	+
768	766	attributeItem = menu.add(new MenuItem("Attribute"));
769	767	attributeItem.addActionListener(this);
770		-
771	768	if (Globals.ADVANCED)
772	769	{
773	770	menu.add("-");
..	..	@@ -779,11 +776,18 @@
779	776	pointflowItem.addActionListener(this);
780	777	}
781	778	menu.add("-");
	779	+ textureRatioRItem = menu.add(new MenuItem("Texture Ratio Red"));
	780	+ textureRatioRItem.addActionListener(this);
	781	+ textureRatioGItem = menu.add(new MenuItem("Texture Ratio Green"));
	782	+ textureRatioGItem.addActionListener(this);
	783	+ textureRatioBItem = menu.add(new MenuItem("Texture Ratio Blue"));
	784	+ textureRatioBItem.addActionListener(this);
	785	+ menu.add("-");
782	786	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
783	787	resetTransformItem.addActionListener(this);
784	788	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
785	789	resetCentroidItem.addActionListener(this);
786		- resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	790	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XZ"));
787	791	resetCentroidXZItem.addActionListener(this);
788	792	transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
789	793	transformGeometryItem.addActionListener(this);
..	..	@@ -799,7 +803,7 @@
799	803	genNormalsCADItem.addActionListener(this);
800	804	genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
801	805	genNormalsMESHItem.addActionListener(this);
802		- if (Globals.ADVANCED)
	806	+ //if (Globals.ADVANCED)
803	807	{
804	808	genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
805	809	genNormalsMINEItem.addActionListener(this);
..	..	@@ -835,6 +839,8 @@
835	839	}
836	840
837	841	oe.menuBar.add(menu = new Menu("Attributes"));
	842	+ clearVersionsItem = menu.add(new MenuItem("Clear Versions"));
	843	+ clearVersionsItem.addActionListener(this);
838	844	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
839	845	clearMaterialsItem.addActionListener(this);
840	846	resetAllItem = menu.add(new MenuItem("Reset All"));
..	..	@@ -960,7 +966,7 @@
960	966	currenttab.setName(tabname);
961	967	//added = false;
962	968	resourcecontainer.add(currenttab);
963		- resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
	969	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture " + tabname);
964	970	rowcount = 1;
965	971	colcount = 0;
966	972	texturecount = 0;
..	..	@@ -975,6 +981,11 @@
975	981	currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname));
976	982	}
977	983
	984	+ columns = 5;
	985	+
	986	+ if (path[0].contains("D&R") \|\| path[0].contains("Paint"))
	987	+ columns = 4;
	988	+
978	989	AddTextureButton(path[0], path[1], path[2], ++texturecount, currenttab);
979	990	totalcount++;
980	991
..	..	@@ -1072,13 +1083,17 @@
1072	1083	// }
1073	1084	// });
1074	1085
	1086	+ oe.toolbarPanel.add(fullScreenButton = GetButton("icons/fullscreen.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1087	+ fullScreenButton.setToolTipText("Full-screen window");
	1088	+ fullScreenButton.addActionListener(this);
	1089	+
1075	1090	oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1076	1091	collapseButton.setToolTipText("Collapse toolbar");
1077	1092	collapseButton.addActionListener(this);
1078	1093
1079		- oe.toolbarPanel.add(maximize3DButton = GetButton("icons/square.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1080		- maximize3DButton.setToolTipText("Maximize 3D view");
1081		- maximize3DButton.addActionListener(this);
	1094	+// oe.toolbarPanel.add(maximize3DButton = GetButton("icons/square.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1095	+// maximize3DButton.setToolTipText("Maximize 3D view");
	1096	+// maximize3DButton.addActionListener(this);
1082	1097
1083	1098	oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1084	1099	twoButton.setToolTipText("Show 3D view only");
..	..	@@ -1098,10 +1113,6 @@
1098	1113	// sevenButton.setToolTipText("3-column layout");
1099	1114	// sevenButton.addActionListener(this);
1100	1115	//
1101		-
1102		- oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1103		- fullButton.setToolTipText("Full-screen window");
1104		- fullButton.addActionListener(this);
1105	1116
1106	1117	oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1107	1118	screenfitButton.setToolTipText("Screen fit");
..	..	@@ -1189,6 +1200,7 @@
1189	1200	//clearButton.addActionListener(this);
1190	1201
1191	1202	cGridBag row1 = new cGridBag();
	1203	+ row1.preferredHeight = 8;
1192	1204
1193	1205	// INSERT
1194	1206	row1.add(gridButton = GetButton("icons/grid.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
..	..	@@ -1215,7 +1227,7 @@
1215	1227	torusButton.setToolTipText("Create torus");
1216	1228	torusButton.addActionListener(this);
1217	1229
1218		- if (Globals.ADVANCED)
	1230	+ if (false) //Globals.ADVANCED)
1219	1231	{
1220	1232	oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1221	1233	kleinButton.setToolTipText("Create Klein bottle");
..	..	@@ -1229,6 +1241,7 @@
1229	1241	oe.toolboxPanel.add(row1);
1230	1242
1231	1243	cGridBag row2 = new cGridBag();
	1244	+ row2.preferredHeight = 8;
1232	1245
1233	1246	row2.add(groupButton = GetButton("icons/group.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1234	1247	groupButton.setToolTipText("Create group");
..	..	@@ -1331,6 +1344,7 @@
1331	1344
1332	1345	oe.treePanel.add(versionManagerPanel);
1333	1346	oe.treePanel.Return();
	1347	+
1334	1348	versionSliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
1335	1349	versionSlider = (cNumberSlider)versionSliderPane.getComponent(1);
1336	1350	versionSliderPane.preferredHeight = 3;
..	..	@@ -1390,7 +1404,7 @@
1390	1404	// supportCB.setToolTipText("Enable rigging");
1391	1405	// supportCB.addItemListener(this);
1392	1406
1393		- panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	1407	+ panel.add(freezeCB = new cCheckBox("Fast cam", Globals.FREEZEONMOVE)); //, constraints);
1394	1408	freezeCB.setToolTipText("Fast moving camera");
1395	1409	freezeCB.addItemListener(this);
1396	1410
..	..	@@ -1399,9 +1413,12 @@
1399	1413
1400	1414	panel.Return();
1401	1415
	1416	+ if (Globals.ADVANCED)
	1417	+ {
1402	1418	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
1403	1419	crowdCB.setToolTipText("Used for crowds");
1404	1420	crowdCB.addItemListener(this);
	1421	+ }
1405	1422
1406	1423	panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
1407	1424	smoothCB.setToolTipText("Snapping delay");
..	..	@@ -1414,30 +1431,26 @@
1414	1431	minshaderCB.setToolTipText("Minimal fast shader");
1415	1432	minshaderCB.addItemListener(this);
1416	1433
1417		-// constraints.gridy += 1;
1418	1434	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
1419	1435	// speakerMocapCB.addItemListener(this);
1420	1436
1421		- panel.Return();
1422		-
1423	1437	if (false)
1424	1438	{
1425	1439	// handled in scripts
1426		- //constraints.gridy += 1;
1427	1440	panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
1428	1441	speakerCameraCB.addItemListener(this);
1429	1442
1430		- //constraints.gridy += 1;
1431	1443	panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
1432	1444	speakerFocusCB.addItemListener(this);
1433	1445
1434		- //constraints.gridy += 1;
1435		- panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
1436		- smoothfocusCB.addItemListener(this);
1437	1446	panel.Return();
1438	1447	}
1439	1448
1440		-//constraints.gridx += 1;
	1449	+ panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
	1450	+ smoothfocusCB.addItemListener(this);
	1451	+
	1452	+ panel.Return();
	1453	+
1441	1454	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
1442	1455	// debugCB.addItemListener(this);
1443	1456
..	..	@@ -1491,7 +1504,7 @@
1491	1504
1492	1505	void EditObject(Object3D obj)
1493	1506	{
1494		- assert(obj instanceof Composite);
	1507	+ //assert(obj instanceof Composite);
1495	1508
1496	1509	// if (obj.versionlist == null)
1497	1510	// {
..	..	@@ -2076,7 +2089,7 @@
2076	2089	Object3D obj = (Object3D)group.selection.elementAt(0);
2077	2090	objEditor.ScreenFit(obj, false);
2078	2091
2079		- cameraView.pingthread.StepToTarget(true);
	2092	+ cameraView.pingthread.StepToTarget(); //true);
2080	2093	refreshContents();
2081	2094	}
2082	2095
..	..	@@ -2113,7 +2126,7 @@
2113	2126	obj.parent.TransformToWorld(maxima); //, maxima);
2114	2127	}
2115	2128
2116		- Object3D shadow = new Object3D("Shadow " + obj.name);
	2129	+ Object3D shadow = new Object3D("Shadow" + obj.name);
2117	2130
2118	2131	shadow.toParent = LA.newMatrix();
2119	2132	shadow.fromParent = LA.newMatrix();
..	..	@@ -2127,24 +2140,24 @@
2127	2140	switch(axis)
2128	2141	{
2129	2142	case 0 :
2130		- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
2131		- vert2.x = minima.x; vert2.y = maxima.y; vert2.z = minima.z;
2132		- vert3.x = minima.x; vert3.y = minima.y; vert3.z = maxima.z;
2133		- vert4.x = minima.x; vert4.y = maxima.y; vert4.z = maxima.z;
	2143	+ vert1.x = minima.x + 0.001f; vert1.y = minima.y; vert1.z = minima.z;
	2144	+ vert2.x = minima.x + 0.001f; vert2.y = maxima.y; vert2.z = minima.z;
	2145	+ vert3.x = minima.x + 0.001f; vert3.y = minima.y; vert3.z = maxima.z;
	2146	+ vert4.x = minima.x + 0.001f; vert4.y = maxima.y; vert4.z = maxima.z;
2134	2147	norm = cVector.X;
2135	2148	break;
2136	2149	case 1 :
2137		- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
2138		- vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z;
2139		- vert3.x = minima.x; vert3.y = minima.y; vert3.z = maxima.z;
2140		- vert4.x = maxima.x; vert4.y = minima.y; vert4.z = maxima.z;
	2150	+ vert1.x = minima.x; vert1.y = minima.y + 0.001f; vert1.z = minima.z;
	2151	+ vert2.x = maxima.x; vert2.y = minima.y + 0.001f; vert2.z = minima.z;
	2152	+ vert3.x = minima.x; vert3.y = minima.y + 0.001f; vert3.z = maxima.z;
	2153	+ vert4.x = maxima.x; vert4.y = minima.y + 0.001f; vert4.z = maxima.z;
2141	2154	norm = cVector.Y;
2142	2155	break;
2143	2156	case 2 :
2144		- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
2145		- vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z;
2146		- vert3.x = minima.x; vert3.y = maxima.y; vert3.z = minima.z;
2147		- vert4.x = maxima.x; vert4.y = maxima.y; vert4.z = minima.z;
	2157	+ vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z + 0.001f;
	2158	+ vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z + 0.001f;
	2159	+ vert3.x = minima.x; vert3.y = maxima.y; vert3.z = minima.z + 0.001f;
	2160	+ vert4.x = maxima.x; vert4.y = maxima.y; vert4.z = minima.z + 0.001f;
2148	2161	norm = cVector.Z;
2149	2162	break;
2150	2163	}
..	..	@@ -2713,11 +2726,11 @@
2713	2726	if (!group.selection.isEmpty())
2714	2727	{
2715	2728	Composite csg = new GroupLeaf();
	2729	+ group(csg);
2716	2730	csg.count = 5;
2717	2731	Composite child = new cGroup("Branch");
2718	2732	csg.addChild(child);
2719	2733	child.addChild(csg);
2720		- group(csg);
2721	2734	}
2722	2735	} else
2723	2736	if (source == doubleItem)
..	..	@@ -2725,6 +2738,7 @@
2725	2738	if (!group.selection.isEmpty())
2726	2739	{
2727	2740	Composite csg = new GroupLeaf("Fork");
	2741	+ group(csg);
2728	2742	csg.count = 5;
2729	2743	Composite child = new cGroup("Branch A");
2730	2744	csg.addChild(child);
..	..	@@ -2732,7 +2746,6 @@
2732	2746	child = new cGroup("Branch B");
2733	2747	csg.addChild(child);
2734	2748	child.addChild(csg);
2735		- group(csg);
2736	2749	}
2737	2750	} else
2738	2751	if (source == tripleItem)
..	..	@@ -2798,7 +2811,7 @@
2798	2811	{
2799	2812	Maximize();
2800	2813	} else
2801		- if (source == fullButton)
	2814	+ if (source == fullScreenButton)
2802	2815	{
2803	2816	ToggleFullScreen();
2804	2817	} else
..	..	@@ -2807,13 +2820,13 @@
2807	2820	this.expandedLayout = radio.layout;
2808	2821	CollapseToolbar();
2809	2822	} else
2810		- if (source == maximize3DButton)
2811		- {
2812		- this.expandedLayout = radio.layout;
2813		- radio.layout = twoButton;
2814		- Show3DView();
2815		- CollapseToolbar();
2816		- } else
	2823	+// if (source == maximize3DButton)
	2824	+// {
	2825	+// this.expandedLayout = radio.layout;
	2826	+// radio.layout = twoButton;
	2827	+// CollapseToolbar();
	2828	+// Show3DView();
	2829	+// } else
2817	2830	if (source == previousVersionButton)
2818	2831	{
2819	2832	// Go to previous version
..	..	@@ -2841,7 +2854,7 @@
2841	2854	if (source == saveVersionButton)
2842	2855	{
2843	2856	// Save a new version
2844		- if (!Save(true))
	2857	+ if (!DuplicateVersion()) //true))
2845	2858	java.awt.Toolkit.getDefaultToolkit().beep();
2846	2859	} else
2847	2860	if (source == deleteVersionButton)
..	..	@@ -3466,6 +3479,10 @@
3466	3479	{
3467	3480	ClearMaterials();
3468	3481	} else
	3482	+ if (source == clearVersionsItem)
	3483	+ {
	3484	+ ClearVersions();
	3485	+ } else
3469	3486	if (source == liveleavesItem)
3470	3487	{
3471	3488	LiveLeaves(true);
..	..	@@ -3605,6 +3622,18 @@
3605	3622	if (source == transformChildrenItem)
3606	3623	{
3607	3624	TransformChildren();
	3625	+ } else
	3626	+ if (source == textureRatioRItem)
	3627	+ {
	3628	+ TextureRatio(0);
	3629	+ } else
	3630	+ if (source == textureRatioGItem)
	3631	+ {
	3632	+ TextureRatio(1);
	3633	+ } else
	3634	+ if (source == textureRatioBItem)
	3635	+ {
	3636	+ TextureRatio(2);
3608	3637	} else
3609	3638	if (source == resetTransformItem)
3610	3639	{
..	..	@@ -3978,7 +4007,8 @@
3978	4007	if (source == closeButton)
3979	4008	{
3980	4009	//System.out.println("CLOSE: " + buttonGroup.getSelection());
3981		- Replace();
	4010	+ if (copy.versionlist != null)
	4011	+ Replace();
3982	4012
3983	4013	cRadio ab;
3984	4014	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
..	..	@@ -4078,7 +4108,8 @@
4078	4108	} else
4079	4109	if(source instanceof cRadio)
4080	4110	{
4081		- Replace();
	4111	+ if (copy.versionlist != null)
	4112	+ Replace();
4082	4113
4083	4114	group.parent = keepparent;
4084	4115	group.attributes = 0;
..	..	@@ -4131,7 +4162,7 @@
4131	4162	*/
4132	4163	radio.layout.doClick();
4133	4164
4134		- assert(copy instanceof Composite);
	4165	+ //assert(copy instanceof Composite);
4135	4166
4136	4167	if (copy.versionlist == null)
4137	4168	{
..	..	@@ -4142,12 +4173,15 @@
4142	4173	// and check if any of these nodes are reachable below the root.
4143	4174	Grafreed.grafreed.universe.TagObjects(copy, true);
4144	4175
4145		- if (!copy.HasTags())
	4176	+ if (copy instanceof Composite && !copy.HasTags())
4146	4177	{
4147		- copy.versionlist = new Object3D[100];
	4178	+ if (copy.versionlist == null)
	4179	+ copy.versionlist = new Object3D[100];
4148	4180
4149		- Save(true);
	4181	+ //Save(true);
4150	4182	}
	4183	+ else
	4184	+ copy.versionindex = -2;
4151	4185
4152	4186	Grafreed.grafreed.universe.TagObjects(copy, false);
4153	4187	}
..	..	@@ -4267,9 +4301,46 @@
4267	4301	refreshContents();
4268	4302	}
4269	4303
	4304	+ void TextureRatio(int axis)
	4305	+ {
	4306	+ Object3D obj;
	4307	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4308	+ {
	4309	+ obj = (Object3D)e.nextElement();
	4310	+ obj.TextureRatio(axis);
	4311	+ }
	4312	+
	4313	+ refreshContents();
	4314	+ }
	4315	+
4270	4316	void ResetTransform()
4271	4317	{
4272	4318	ResetTransform(-1);
	4319	+ }
	4320	+
	4321	+ void ScaleSelection(int scale)
	4322	+ {
	4323	+ Object3D obj;
	4324	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4325	+ {
	4326	+ obj = (Object3D)e.nextElement();
	4327	+
	4328	+ if (obj.toParent == null)
	4329	+ continue;
	4330	+
	4331	+ obj.Scale(scale);
	4332	+
	4333	+ if (obj.parent == null)
	4334	+ {
	4335	+ System.out.println("NULL PARENT!");
	4336	+ // new Exception().printStackTrace();
	4337	+ }
	4338	+ else
	4339	+ TouchTransform(obj);
	4340	+ //obj.parent.Touch();
	4341	+ }
	4342	+
	4343	+ refreshContents();
4273	4344	}
4274	4345
4275	4346	void ResetTransform(int mask)
..	..	@@ -4282,38 +4353,8 @@
4282	4353	if (obj.toParent == null)
4283	4354	continue;
4284	4355
4285		- if (mask == -1)
4286		- {
4287		- if (obj instanceof Camera) // jan 2014
4288		- {
4289		- LA.matIdentity(obj.toParent);
4290		- LA.matIdentity(obj.fromParent);
4291		- }
4292		- else
4293		- {
4294		- obj.toParent = null; // jan 2014 LA.matIdentity(obj.toParent);
4295		- obj.fromParent = null; // LA.matIdentity(obj.fromParent);
4296		- }
4297		- TouchTransform(obj);
4298		- continue;
4299		- }
4300		- if ((mask&2) != 0) // Scale/rotation
4301		- {
4302		- obj.toParent[0][0] = obj.toParent[1][1] = obj.toParent[2][2] = 1;
4303		- obj.toParent[0][1] = obj.toParent[1][0] = obj.toParent[2][0] = 0;
4304		- obj.toParent[0][2] = obj.toParent[1][2] = obj.toParent[2][1] = 0;
4305		- obj.fromParent[0][0] = obj.fromParent[1][1] = obj.fromParent[2][2] = 1;
4306		- obj.fromParent[0][1] = obj.fromParent[1][0] = obj.fromParent[2][0] = 0;
4307		- obj.fromParent[0][2] = obj.fromParent[1][2] = obj.fromParent[2][1] = 0;
4308		- }
4309		- if ((mask&1) != 0) // Translation
4310		- {
4311		- if (obj.toParent != null)
4312		- {
4313		- obj.toParent[3][0] = obj.toParent[3][1] = obj.toParent[3][2] = 0;
4314		- obj.fromParent[3][0] = obj.fromParent[3][1] = obj.fromParent[3][2] = 0;
4315		- }
4316		- }
	4356	+ obj.ResetTransform(mask);
	4357	+
4317	4358	if (obj.parent == null)
4318	4359	{
4319	4360	System.out.println("NULL PARENT!");
..	..	@@ -4822,10 +4863,17 @@
4822	4863	{
4823	4864	Object3D obj = group.selection.get(i);
4824	4865
	4866	+ if (obj.toParent == null)
	4867	+ {
	4868	+ obj.toParent = LA.newMatrix();
	4869	+ obj.fromParent = LA.newMatrix();
	4870	+ }
	4871	+
4825	4872	LA.matTranslate(obj.toParent, i * scale, 0, 0);
4826	4873	LA.matTranslateInv(obj.fromParent, -i * scale, 0, 0);
4827	4874	}
4828	4875
	4876	+ Globals.lighttouched = true;
4829	4877	refreshContents();
4830	4878	}
4831	4879
..	..	@@ -5113,6 +5161,12 @@
5113	5161	refreshContents();
5114	5162	}
5115	5163
	5164	+ void ClearVersions()
	5165	+ {
	5166	+ group.selection.ClearVersions();
	5167	+ refreshContents();
	5168	+ }
	5169	+
5116	5170	void FlipV(boolean flip)
5117	5171	{
5118	5172	group.selection.FlipV(flip);
..	..	@@ -5351,10 +5405,10 @@
5351	5405	if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
5352	5406	// a camera
5353	5407	{
5354		- if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
	5408	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crashes the camera because of invalid lightspace
5355	5409	{
5356	5410	CameraPane.camerachangeframe = 0; // don't refuse it
5357		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	5411	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent(), true);
5358	5412	}
5359	5413	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
5360	5414	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
..	..	@@ -5398,12 +5452,12 @@
5398	5452	}
5399	5453	}
5400	5454
5401		- rootButton.setEnabled(allComposites);
	5455	+ rootButton.setEnabled(true); // allComposites);
5402	5456	}
5403	5457
5404	5458	void refreshContents(boolean cp)
5405	5459	{
5406		- if (Globals.ADVANCED)
	5460	+ if (Globals.SHOWINFO)
5407	5461	//if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
5408	5462	if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
5409	5463	{
..	..	@@ -6354,6 +6408,7 @@
6354	6408	private MenuItem clipMeshItem;
6355	6409	private MenuItem smoothMeshItem;
6356	6410	private MenuItem clearMaterialsItem;
	6411	+ private MenuItem clearVersionsItem;
6357	6412
6358	6413	private MenuItem liveleavesItem;
6359	6414	private MenuItem unliveleavesItem;
..	..	@@ -6377,6 +6432,9 @@
6377	6432	private MenuItem maxTexturesItem;
6378	6433	private MenuItem panoTexturesItem;
6379	6434
	6435	+ private MenuItem textureRatioRItem;
	6436	+ private MenuItem textureRatioGItem;
	6437	+ private MenuItem textureRatioBItem;
6380	6438	private MenuItem resetCentroidItem;
6381	6439	private MenuItem resetCentroidXZItem;
6382	6440	private MenuItem resetTransformItem;