~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -417,13 +417,13 @@
417	417
418	418	assert(false);
419	419
420		- if (copy.versionlist == null)
421		- {
422		- copy.versionlist = new Object3D[100];
423		- copy.versionindex = -1;
424		-
425		- //Save(true);
426		- }
	420	+// if (copy.versionlist == null)
	421	+// {
	422	+// copy.versionlist = new Object3D[100];
	423	+// copy.versionindex = -1;
	424	+//
	425	+// //Save(true);
	426	+// }
427	427
428	428	if(ui)
429	429	SetupUI(objEditor);
..	..	@@ -446,13 +446,13 @@
446	446
447	447	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
448	448
449		- if (copy.versionlist == null)
450		- {
451		- copy.versionlist = new Object3D[100];
452		- copy.versionindex = -1;
453		-
454		- //Save(true);
455		- }
	449	+// if (copy.versionlist == null)
	450	+// {
	451	+// copy.versionlist = new Object3D[100];
	452	+// copy.versionindex = -1;
	453	+//
	454	+// //Save(true);
	455	+// }
456	456	}
457	457
458	458	void CloneSelection(boolean supports)
..	..	@@ -765,11 +765,11 @@
765	765	shadowYItem.addActionListener(this);
766	766	shadowZItem = menu.add(new MenuItem("Shadow Blue"));
767	767	shadowZItem.addActionListener(this);
768		- attributeItem = menu.add(new MenuItem("Attribute"));
769		- attributeItem.addActionListener(this);
770	768
771	769	if (Globals.ADVANCED)
772	770	{
	771	+ attributeItem = menu.add(new MenuItem("Attribute"));
	772	+ attributeItem.addActionListener(this);
773	773	menu.add("-");
774	774	linkerItem = menu.add(new MenuItem("Linker"));
775	775	linkerItem.addActionListener(this);
..	..	@@ -779,11 +779,18 @@
779	779	pointflowItem.addActionListener(this);
780	780	}
781	781	menu.add("-");
	782	+ textureRatioRItem = menu.add(new MenuItem("Texture Ratio Red"));
	783	+ textureRatioRItem.addActionListener(this);
	784	+ textureRatioGItem = menu.add(new MenuItem("Texture Ratio Green"));
	785	+ textureRatioGItem.addActionListener(this);
	786	+ textureRatioBItem = menu.add(new MenuItem("Texture Ratio Blue"));
	787	+ textureRatioBItem.addActionListener(this);
	788	+ menu.add("-");
782	789	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
783	790	resetTransformItem.addActionListener(this);
784	791	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
785	792	resetCentroidItem.addActionListener(this);
786		- resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	793	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XZ"));
787	794	resetCentroidXZItem.addActionListener(this);
788	795	transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
789	796	transformGeometryItem.addActionListener(this);
..	..	@@ -835,6 +842,8 @@
835	842	}
836	843
837	844	oe.menuBar.add(menu = new Menu("Attributes"));
	845	+ clearVersionsItem = menu.add(new MenuItem("Clear Versions"));
	846	+ clearVersionsItem.addActionListener(this);
838	847	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
839	848	clearMaterialsItem.addActionListener(this);
840	849	resetAllItem = menu.add(new MenuItem("Reset All"));
..	..	@@ -936,6 +945,8 @@
936	945	cGridBag currenttab;
937	946	//boolean added; // patch for jar
938	947
	948	+ int totalcount = 0;
	949	+
939	950	int tabcount = 0;
940	951	int colcount = 0;
941	952	int rowcount = 0;
..	..	@@ -964,7 +975,7 @@
964	975	texturecount = 0;
965	976	}
966	977
967		- if (path.length > 2 && path[2].toLowerCase().endsWith(".jpg"))
	978	+ if (path.length > 2 && (path[2].toLowerCase().endsWith(".jpg") \|\| path[2].toLowerCase().endsWith(".png")))
968	979	{
969	980	//if (!added)
970	981	{
..	..	@@ -973,7 +984,8 @@
973	984	currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname));
974	985	}
975	986
976		- AddTextureButton(path[0], path[1], path[2], texturecount++, currenttab);
	987	+ AddTextureButton(path[0], path[1], path[2], ++texturecount, currenttab);
	988	+ totalcount++;
977	989
978	990	if (++colcount >= columns)
979	991	{
..	..	@@ -999,6 +1011,8 @@
999	1011	container.add(resourcecontainer);
1000	1012
1001	1013	Grafreed.ParseResources("textures", this);
	1014	+
	1015	+ // 935. System.out.println("Total = " + totalcount);
1002	1016	}
1003	1017
1004	1018	void SetupUI2(ObjEditor oe)
..	..	@@ -1210,7 +1224,7 @@
1210	1224	torusButton.setToolTipText("Create torus");
1211	1225	torusButton.addActionListener(this);
1212	1226
1213		- if (Globals.ADVANCED)
	1227	+ if (false) //Globals.ADVANCED)
1214	1228	{
1215	1229	oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1216	1230	kleinButton.setToolTipText("Create Klein bottle");
..	..	@@ -1259,7 +1273,10 @@
1259	1273
1260	1274	CreateTexturePanel(textures);
1261	1275
1262		- resourcecontainer.setSelectedIndex((int)(Math.random() * resourcecontainer.getTabCount()));
	1276	+ int tabCount = resourcecontainer.getTabCount();
	1277	+
	1278	+ if (tabCount > 0)
	1279	+ resourcecontainer.setSelectedIndex((int)(Math.random() * tabCount));
1263	1280
1264	1281	oe.toolboxPanel.add(textures);
1265	1282
..	..	@@ -1483,7 +1500,7 @@
1483	1500
1484	1501	void EditObject(Object3D obj)
1485	1502	{
1486		- assert(obj instanceof Composite);
	1503	+ //assert(obj instanceof Composite);
1487	1504
1488	1505	// if (obj.versionlist == null)
1489	1506	// {
..	..	@@ -2119,24 +2136,24 @@
2119	2136	switch(axis)
2120	2137	{
2121	2138	case 0 :
2122		- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
2123		- vert2.x = minima.x; vert2.y = maxima.y; vert2.z = minima.z;
2124		- vert3.x = minima.x; vert3.y = minima.y; vert3.z = maxima.z;
2125		- vert4.x = minima.x; vert4.y = maxima.y; vert4.z = maxima.z;
	2139	+ vert1.x = minima.x + 0.001f; vert1.y = minima.y; vert1.z = minima.z;
	2140	+ vert2.x = minima.x + 0.001f; vert2.y = maxima.y; vert2.z = minima.z;
	2141	+ vert3.x = minima.x + 0.001f; vert3.y = minima.y; vert3.z = maxima.z;
	2142	+ vert4.x = minima.x + 0.001f; vert4.y = maxima.y; vert4.z = maxima.z;
2126	2143	norm = cVector.X;
2127	2144	break;
2128	2145	case 1 :
2129		- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
2130		- vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z;
2131		- vert3.x = minima.x; vert3.y = minima.y; vert3.z = maxima.z;
2132		- vert4.x = maxima.x; vert4.y = minima.y; vert4.z = maxima.z;
	2146	+ vert1.x = minima.x; vert1.y = minima.y + 0.001f; vert1.z = minima.z;
	2147	+ vert2.x = maxima.x; vert2.y = minima.y + 0.001f; vert2.z = minima.z;
	2148	+ vert3.x = minima.x; vert3.y = minima.y + 0.001f; vert3.z = maxima.z;
	2149	+ vert4.x = maxima.x; vert4.y = minima.y + 0.001f; vert4.z = maxima.z;
2133	2150	norm = cVector.Y;
2134	2151	break;
2135	2152	case 2 :
2136		- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
2137		- vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z;
2138		- vert3.x = minima.x; vert3.y = maxima.y; vert3.z = minima.z;
2139		- vert4.x = maxima.x; vert4.y = maxima.y; vert4.z = minima.z;
	2153	+ vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z + 0.001f;
	2154	+ vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z + 0.001f;
	2155	+ vert3.x = minima.x; vert3.y = maxima.y; vert3.z = minima.z + 0.001f;
	2156	+ vert4.x = maxima.x; vert4.y = maxima.y; vert4.z = minima.z + 0.001f;
2140	2157	norm = cVector.Z;
2141	2158	break;
2142	2159	}
..	..	@@ -3458,6 +3475,10 @@
3458	3475	{
3459	3476	ClearMaterials();
3460	3477	} else
	3478	+ if (source == clearVersionsItem)
	3479	+ {
	3480	+ ClearVersions();
	3481	+ } else
3461	3482	if (source == liveleavesItem)
3462	3483	{
3463	3484	LiveLeaves(true);
..	..	@@ -3597,6 +3618,18 @@
3597	3618	if (source == transformChildrenItem)
3598	3619	{
3599	3620	TransformChildren();
	3621	+ } else
	3622	+ if (source == textureRatioRItem)
	3623	+ {
	3624	+ TextureRatio(0);
	3625	+ } else
	3626	+ if (source == textureRatioGItem)
	3627	+ {
	3628	+ TextureRatio(1);
	3629	+ } else
	3630	+ if (source == textureRatioBItem)
	3631	+ {
	3632	+ TextureRatio(2);
3600	3633	} else
3601	3634	if (source == resetTransformItem)
3602	3635	{
..	..	@@ -3970,7 +4003,8 @@
3970	4003	if (source == closeButton)
3971	4004	{
3972	4005	//System.out.println("CLOSE: " + buttonGroup.getSelection());
3973		- Replace();
	4006	+ if (copy.versionlist != null)
	4007	+ Replace();
3974	4008
3975	4009	cRadio ab;
3976	4010	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
..	..	@@ -4070,7 +4104,8 @@
4070	4104	} else
4071	4105	if(source instanceof cRadio)
4072	4106	{
4073		- Replace();
	4107	+ if (copy.versionlist != null)
	4108	+ Replace();
4074	4109
4075	4110	group.parent = keepparent;
4076	4111	group.attributes = 0;
..	..	@@ -4123,7 +4158,7 @@
4123	4158	*/
4124	4159	radio.layout.doClick();
4125	4160
4126		- assert(copy instanceof Composite);
	4161	+ //assert(copy instanceof Composite);
4127	4162
4128	4163	if (copy.versionlist == null)
4129	4164	{
..	..	@@ -4134,12 +4169,14 @@
4134	4169	// and check if any of these nodes are reachable below the root.
4135	4170	Grafreed.grafreed.universe.TagObjects(copy, true);
4136	4171
4137		- if (!copy.HasTags())
	4172	+ if (copy instanceof Composite && copy.versionlist == null && !copy.HasTags())
4138	4173	{
4139	4174	copy.versionlist = new Object3D[100];
4140	4175
4141		- Save(true);
	4176	+ //Save(true);
4142	4177	}
	4178	+ else
	4179	+ copy.versionindex = -2;
4143	4180
4144	4181	Grafreed.grafreed.universe.TagObjects(copy, false);
4145	4182	}
..	..	@@ -4259,6 +4296,18 @@
4259	4296	refreshContents();
4260	4297	}
4261	4298
	4299	+ void TextureRatio(int axis)
	4300	+ {
	4301	+ Object3D obj;
	4302	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4303	+ {
	4304	+ obj = (Object3D)e.nextElement();
	4305	+ obj.TextureRatio(axis);
	4306	+ }
	4307	+
	4308	+ refreshContents();
	4309	+ }
	4310	+
4262	4311	void ResetTransform()
4263	4312	{
4264	4313	ResetTransform(-1);
..	..	@@ -4274,38 +4323,8 @@
4274	4323	if (obj.toParent == null)
4275	4324	continue;
4276	4325
4277		- if (mask == -1)
4278		- {
4279		- if (obj instanceof Camera) // jan 2014
4280		- {
4281		- LA.matIdentity(obj.toParent);
4282		- LA.matIdentity(obj.fromParent);
4283		- }
4284		- else
4285		- {
4286		- obj.toParent = null; // jan 2014 LA.matIdentity(obj.toParent);
4287		- obj.fromParent = null; // LA.matIdentity(obj.fromParent);
4288		- }
4289		- TouchTransform(obj);
4290		- continue;
4291		- }
4292		- if ((mask&2) != 0) // Scale/rotation
4293		- {
4294		- obj.toParent[0][0] = obj.toParent[1][1] = obj.toParent[2][2] = 1;
4295		- obj.toParent[0][1] = obj.toParent[1][0] = obj.toParent[2][0] = 0;
4296		- obj.toParent[0][2] = obj.toParent[1][2] = obj.toParent[2][1] = 0;
4297		- obj.fromParent[0][0] = obj.fromParent[1][1] = obj.fromParent[2][2] = 1;
4298		- obj.fromParent[0][1] = obj.fromParent[1][0] = obj.fromParent[2][0] = 0;
4299		- obj.fromParent[0][2] = obj.fromParent[1][2] = obj.fromParent[2][1] = 0;
4300		- }
4301		- if ((mask&1) != 0) // Translation
4302		- {
4303		- if (obj.toParent != null)
4304		- {
4305		- obj.toParent[3][0] = obj.toParent[3][1] = obj.toParent[3][2] = 0;
4306		- obj.fromParent[3][0] = obj.fromParent[3][1] = obj.fromParent[3][2] = 0;
4307		- }
4308		- }
	4326	+ obj.ResetTransform(mask);
	4327	+
4309	4328	if (obj.parent == null)
4310	4329	{
4311	4330	System.out.println("NULL PARENT!");
..	..	@@ -4814,6 +4833,12 @@
4814	4833	{
4815	4834	Object3D obj = group.selection.get(i);
4816	4835
	4836	+ if (obj.toParent == null)
	4837	+ {
	4838	+ obj.toParent = LA.newMatrix();
	4839	+ obj.fromParent = LA.newMatrix();
	4840	+ }
	4841	+
4817	4842	LA.matTranslate(obj.toParent, i * scale, 0, 0);
4818	4843	LA.matTranslateInv(obj.fromParent, -i * scale, 0, 0);
4819	4844	}
..	..	@@ -5105,6 +5130,12 @@
5105	5130	refreshContents();
5106	5131	}
5107	5132
	5133	+ void ClearVersions()
	5134	+ {
	5135	+ group.selection.ClearVersions();
	5136	+ refreshContents();
	5137	+ }
	5138	+
5108	5139	void FlipV(boolean flip)
5109	5140	{
5110	5141	group.selection.FlipV(flip);
..	..	@@ -5390,7 +5421,7 @@
5390	5421	}
5391	5422	}
5392	5423
5393		- rootButton.setEnabled(allComposites);
	5424	+ rootButton.setEnabled(true); // allComposites);
5394	5425	}
5395	5426
5396	5427	void refreshContents(boolean cp)
..	..	@@ -6346,6 +6377,7 @@
6346	6377	private MenuItem clipMeshItem;
6347	6378	private MenuItem smoothMeshItem;
6348	6379	private MenuItem clearMaterialsItem;
	6380	+ private MenuItem clearVersionsItem;
6349	6381
6350	6382	private MenuItem liveleavesItem;
6351	6383	private MenuItem unliveleavesItem;
..	..	@@ -6369,6 +6401,9 @@
6369	6401	private MenuItem maxTexturesItem;
6370	6402	private MenuItem panoTexturesItem;
6371	6403
	6404	+ private MenuItem textureRatioRItem;
	6405	+ private MenuItem textureRatioGItem;
	6406	+ private MenuItem textureRatioBItem;
6372	6407	private MenuItem resetCentroidItem;
6373	6408	private MenuItem resetCentroidXZItem;
6374	6409	private MenuItem resetTransformItem;