~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"));
..	..	@@ -1215,7 +1224,7 @@
1215	1224	torusButton.setToolTipText("Create torus");
1216	1225	torusButton.addActionListener(this);
1217	1226
1218		- if (Globals.ADVANCED)
	1227	+ if (false) //Globals.ADVANCED)
1219	1228	{
1220	1229	oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1221	1230	kleinButton.setToolTipText("Create Klein bottle");
..	..	@@ -1491,7 +1500,7 @@
1491	1500
1492	1501	void EditObject(Object3D obj)
1493	1502	{
1494		- assert(obj instanceof Composite);
	1503	+ //assert(obj instanceof Composite);
1495	1504
1496	1505	// if (obj.versionlist == null)
1497	1506	// {
..	..	@@ -2127,24 +2136,24 @@
2127	2136	switch(axis)
2128	2137	{
2129	2138	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;
	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;
2134	2143	norm = cVector.X;
2135	2144	break;
2136	2145	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;
	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;
2141	2150	norm = cVector.Y;
2142	2151	break;
2143	2152	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;
	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;
2148	2157	norm = cVector.Z;
2149	2158	break;
2150	2159	}
..	..	@@ -3466,6 +3475,10 @@
3466	3475	{
3467	3476	ClearMaterials();
3468	3477	} else
	3478	+ if (source == clearVersionsItem)
	3479	+ {
	3480	+ ClearVersions();
	3481	+ } else
3469	3482	if (source == liveleavesItem)
3470	3483	{
3471	3484	LiveLeaves(true);
..	..	@@ -3605,6 +3618,18 @@
3605	3618	if (source == transformChildrenItem)
3606	3619	{
3607	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);
3608	3633	} else
3609	3634	if (source == resetTransformItem)
3610	3635	{
..	..	@@ -3978,7 +4003,8 @@
3978	4003	if (source == closeButton)
3979	4004	{
3980	4005	//System.out.println("CLOSE: " + buttonGroup.getSelection());
3981		- Replace();
	4006	+ if (copy.versionlist != null)
	4007	+ Replace();
3982	4008
3983	4009	cRadio ab;
3984	4010	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
..	..	@@ -4078,7 +4104,8 @@
4078	4104	} else
4079	4105	if(source instanceof cRadio)
4080	4106	{
4081		- Replace();
	4107	+ if (copy.versionlist != null)
	4108	+ Replace();
4082	4109
4083	4110	group.parent = keepparent;
4084	4111	group.attributes = 0;
..	..	@@ -4131,7 +4158,7 @@
4131	4158	*/
4132	4159	radio.layout.doClick();
4133	4160
4134		- assert(copy instanceof Composite);
	4161	+ //assert(copy instanceof Composite);
4135	4162
4136	4163	if (copy.versionlist == null)
4137	4164	{
..	..	@@ -4142,12 +4169,14 @@
4142	4169	// and check if any of these nodes are reachable below the root.
4143	4170	Grafreed.grafreed.universe.TagObjects(copy, true);
4144	4171
4145		- if (!copy.HasTags())
	4172	+ if (copy instanceof Composite && copy.versionlist == null && !copy.HasTags())
4146	4173	{
4147	4174	copy.versionlist = new Object3D[100];
4148	4175
4149		- Save(true);
	4176	+ //Save(true);
4150	4177	}
	4178	+ else
	4179	+ copy.versionindex = -2;
4151	4180
4152	4181	Grafreed.grafreed.universe.TagObjects(copy, false);
4153	4182	}
..	..	@@ -4267,6 +4296,18 @@
4267	4296	refreshContents();
4268	4297	}
4269	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	+
4270	4311	void ResetTransform()
4271	4312	{
4272	4313	ResetTransform(-1);
..	..	@@ -4282,38 +4323,8 @@
4282	4323	if (obj.toParent == null)
4283	4324	continue;
4284	4325
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		- }
	4326	+ obj.ResetTransform(mask);
	4327	+
4317	4328	if (obj.parent == null)
4318	4329	{
4319	4330	System.out.println("NULL PARENT!");
..	..	@@ -4822,6 +4833,12 @@
4822	4833	{
4823	4834	Object3D obj = group.selection.get(i);
4824	4835
	4836	+ if (obj.toParent == null)
	4837	+ {
	4838	+ obj.toParent = LA.newMatrix();
	4839	+ obj.fromParent = LA.newMatrix();
	4840	+ }
	4841	+
4825	4842	LA.matTranslate(obj.toParent, i * scale, 0, 0);
4826	4843	LA.matTranslateInv(obj.fromParent, -i * scale, 0, 0);
4827	4844	}
..	..	@@ -5113,6 +5130,12 @@
5113	5130	refreshContents();
5114	5131	}
5115	5132
	5133	+ void ClearVersions()
	5134	+ {
	5135	+ group.selection.ClearVersions();
	5136	+ refreshContents();
	5137	+ }
	5138	+
5116	5139	void FlipV(boolean flip)
5117	5140	{
5118	5141	group.selection.FlipV(flip);
..	..	@@ -5398,7 +5421,7 @@
5398	5421	}
5399	5422	}
5400	5423
5401		- rootButton.setEnabled(allComposites);
	5424	+ rootButton.setEnabled(true); // allComposites);
5402	5425	}
5403	5426
5404	5427	void refreshContents(boolean cp)
..	..	@@ -6354,6 +6377,7 @@
6354	6377	private MenuItem clipMeshItem;
6355	6378	private MenuItem smoothMeshItem;
6356	6379	private MenuItem clearMaterialsItem;
	6380	+ private MenuItem clearVersionsItem;
6357	6381
6358	6382	private MenuItem liveleavesItem;
6359	6383	private MenuItem unliveleavesItem;
..	..	@@ -6377,6 +6401,9 @@
6377	6401	private MenuItem maxTexturesItem;
6378	6402	private MenuItem panoTexturesItem;
6379	6403
	6404	+ private MenuItem textureRatioRItem;
	6405	+ private MenuItem textureRatioGItem;
	6406	+ private MenuItem textureRatioBItem;
6380	6407	private MenuItem resetCentroidItem;
6381	6408	private MenuItem resetCentroidXZItem;
6382	6409	private MenuItem resetTransformItem;