~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)
..	..	@@ -765,9 +755,9 @@
765	755	shadowYItem.addActionListener(this);
766	756	shadowZItem = menu.add(new MenuItem("Shadow Blue"));
767	757	shadowZItem.addActionListener(this);
	758	+
768	759	attributeItem = menu.add(new MenuItem("Attribute"));
769	760	attributeItem.addActionListener(this);
770		-
771	761	if (Globals.ADVANCED)
772	762	{
773	763	menu.add("-");
..	..	@@ -779,11 +769,18 @@
779	769	pointflowItem.addActionListener(this);
780	770	}
781	771	menu.add("-");
	772	+ textureRatioRItem = menu.add(new MenuItem("Texture Ratio Red"));
	773	+ textureRatioRItem.addActionListener(this);
	774	+ textureRatioGItem = menu.add(new MenuItem("Texture Ratio Green"));
	775	+ textureRatioGItem.addActionListener(this);
	776	+ textureRatioBItem = menu.add(new MenuItem("Texture Ratio Blue"));
	777	+ textureRatioBItem.addActionListener(this);
	778	+ menu.add("-");
782	779	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
783	780	resetTransformItem.addActionListener(this);
784	781	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
785	782	resetCentroidItem.addActionListener(this);
786		- resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	783	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XZ"));
787	784	resetCentroidXZItem.addActionListener(this);
788	785	transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
789	786	transformGeometryItem.addActionListener(this);
..	..	@@ -835,6 +832,8 @@
835	832	}
836	833
837	834	oe.menuBar.add(menu = new Menu("Attributes"));
	835	+ clearVersionsItem = menu.add(new MenuItem("Clear Versions"));
	836	+ clearVersionsItem.addActionListener(this);
838	837	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
839	838	clearMaterialsItem.addActionListener(this);
840	839	resetAllItem = menu.add(new MenuItem("Reset All"));
..	..	@@ -936,6 +935,8 @@
936	935	cGridBag currenttab;
937	936	//boolean added; // patch for jar
938	937
	938	+ int totalcount = 0;
	939	+
939	940	int tabcount = 0;
940	941	int colcount = 0;
941	942	int rowcount = 0;
..	..	@@ -974,6 +975,7 @@
974	975	}
975	976
976	977	AddTextureButton(path[0], path[1], path[2], ++texturecount, currenttab);
	978	+ totalcount++;
977	979
978	980	if (++colcount >= columns)
979	981	{
..	..	@@ -999,6 +1001,8 @@
999	1001	container.add(resourcecontainer);
1000	1002
1001	1003	Grafreed.ParseResources("textures", this);
	1004	+
	1005	+ // 935. System.out.println("Total = " + totalcount);
1002	1006	}
1003	1007
1004	1008	void SetupUI2(ObjEditor oe)
..	..	@@ -1067,13 +1071,17 @@
1067	1071	// }
1068	1072	// });
1069	1073
	1074	+ oe.toolbarPanel.add(fullScreenButton = GetButton("icons/fullscreen.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1075	+ fullScreenButton.setToolTipText("Full-screen window");
	1076	+ fullScreenButton.addActionListener(this);
	1077	+
1070	1078	oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1071	1079	collapseButton.setToolTipText("Collapse toolbar");
1072	1080	collapseButton.addActionListener(this);
1073	1081
1074		- oe.toolbarPanel.add(maximize3DButton = GetButton("icons/square.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1075		- maximize3DButton.setToolTipText("Maximize 3D view");
1076		- maximize3DButton.addActionListener(this);
	1082	+// oe.toolbarPanel.add(maximize3DButton = GetButton("icons/square.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1083	+// maximize3DButton.setToolTipText("Maximize 3D view");
	1084	+// maximize3DButton.addActionListener(this);
1077	1085
1078	1086	oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1079	1087	twoButton.setToolTipText("Show 3D view only");
..	..	@@ -1093,10 +1101,6 @@
1093	1101	// sevenButton.setToolTipText("3-column layout");
1094	1102	// sevenButton.addActionListener(this);
1095	1103	//
1096		-
1097		- oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1098		- fullButton.setToolTipText("Full-screen window");
1099		- fullButton.addActionListener(this);
1100	1104
1101	1105	oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1102	1106	screenfitButton.setToolTipText("Screen fit");
..	..	@@ -1210,7 +1214,7 @@
1210	1214	torusButton.setToolTipText("Create torus");
1211	1215	torusButton.addActionListener(this);
1212	1216
1213		- if (Globals.ADVANCED)
	1217	+ if (false) //Globals.ADVANCED)
1214	1218	{
1215	1219	oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1216	1220	kleinButton.setToolTipText("Create Klein bottle");
..	..	@@ -1486,7 +1490,7 @@
1486	1490
1487	1491	void EditObject(Object3D obj)
1488	1492	{
1489		- assert(obj instanceof Composite);
	1493	+ //assert(obj instanceof Composite);
1490	1494
1491	1495	// if (obj.versionlist == null)
1492	1496	// {
..	..	@@ -2122,24 +2126,24 @@
2122	2126	switch(axis)
2123	2127	{
2124	2128	case 0 :
2125		- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
2126		- vert2.x = minima.x; vert2.y = maxima.y; vert2.z = minima.z;
2127		- vert3.x = minima.x; vert3.y = minima.y; vert3.z = maxima.z;
2128		- vert4.x = minima.x; vert4.y = maxima.y; vert4.z = maxima.z;
	2129	+ vert1.x = minima.x + 0.001f; vert1.y = minima.y; vert1.z = minima.z;
	2130	+ vert2.x = minima.x + 0.001f; vert2.y = maxima.y; vert2.z = minima.z;
	2131	+ vert3.x = minima.x + 0.001f; vert3.y = minima.y; vert3.z = maxima.z;
	2132	+ vert4.x = minima.x + 0.001f; vert4.y = maxima.y; vert4.z = maxima.z;
2129	2133	norm = cVector.X;
2130	2134	break;
2131	2135	case 1 :
2132		- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
2133		- vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z;
2134		- vert3.x = minima.x; vert3.y = minima.y; vert3.z = maxima.z;
2135		- vert4.x = maxima.x; vert4.y = minima.y; vert4.z = maxima.z;
	2136	+ vert1.x = minima.x; vert1.y = minima.y + 0.001f; vert1.z = minima.z;
	2137	+ vert2.x = maxima.x; vert2.y = minima.y + 0.001f; vert2.z = minima.z;
	2138	+ vert3.x = minima.x; vert3.y = minima.y + 0.001f; vert3.z = maxima.z;
	2139	+ vert4.x = maxima.x; vert4.y = minima.y + 0.001f; vert4.z = maxima.z;
2136	2140	norm = cVector.Y;
2137	2141	break;
2138	2142	case 2 :
2139		- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
2140		- vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z;
2141		- vert3.x = minima.x; vert3.y = maxima.y; vert3.z = minima.z;
2142		- vert4.x = maxima.x; vert4.y = maxima.y; vert4.z = minima.z;
	2143	+ vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z + 0.001f;
	2144	+ vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z + 0.001f;
	2145	+ vert3.x = minima.x; vert3.y = maxima.y; vert3.z = minima.z + 0.001f;
	2146	+ vert4.x = maxima.x; vert4.y = maxima.y; vert4.z = minima.z + 0.001f;
2143	2147	norm = cVector.Z;
2144	2148	break;
2145	2149	}
..	..	@@ -2708,11 +2712,11 @@
2708	2712	if (!group.selection.isEmpty())
2709	2713	{
2710	2714	Composite csg = new GroupLeaf();
	2715	+ group(csg);
2711	2716	csg.count = 5;
2712	2717	Composite child = new cGroup("Branch");
2713	2718	csg.addChild(child);
2714	2719	child.addChild(csg);
2715		- group(csg);
2716	2720	}
2717	2721	} else
2718	2722	if (source == doubleItem)
..	..	@@ -2720,6 +2724,7 @@
2720	2724	if (!group.selection.isEmpty())
2721	2725	{
2722	2726	Composite csg = new GroupLeaf("Fork");
	2727	+ group(csg);
2723	2728	csg.count = 5;
2724	2729	Composite child = new cGroup("Branch A");
2725	2730	csg.addChild(child);
..	..	@@ -2727,7 +2732,6 @@
2727	2732	child = new cGroup("Branch B");
2728	2733	csg.addChild(child);
2729	2734	child.addChild(csg);
2730		- group(csg);
2731	2735	}
2732	2736	} else
2733	2737	if (source == tripleItem)
..	..	@@ -2793,7 +2797,7 @@
2793	2797	{
2794	2798	Maximize();
2795	2799	} else
2796		- if (source == fullButton)
	2800	+ if (source == fullScreenButton)
2797	2801	{
2798	2802	ToggleFullScreen();
2799	2803	} else
..	..	@@ -2802,13 +2806,13 @@
2802	2806	this.expandedLayout = radio.layout;
2803	2807	CollapseToolbar();
2804	2808	} else
2805		- if (source == maximize3DButton)
2806		- {
2807		- this.expandedLayout = radio.layout;
2808		- radio.layout = twoButton;
2809		- Show3DView();
2810		- CollapseToolbar();
2811		- } else
	2809	+// if (source == maximize3DButton)
	2810	+// {
	2811	+// this.expandedLayout = radio.layout;
	2812	+// radio.layout = twoButton;
	2813	+// CollapseToolbar();
	2814	+// Show3DView();
	2815	+// } else
2812	2816	if (source == previousVersionButton)
2813	2817	{
2814	2818	// Go to previous version
..	..	@@ -3461,6 +3465,10 @@
3461	3465	{
3462	3466	ClearMaterials();
3463	3467	} else
	3468	+ if (source == clearVersionsItem)
	3469	+ {
	3470	+ ClearVersions();
	3471	+ } else
3464	3472	if (source == liveleavesItem)
3465	3473	{
3466	3474	LiveLeaves(true);
..	..	@@ -3600,6 +3608,18 @@
3600	3608	if (source == transformChildrenItem)
3601	3609	{
3602	3610	TransformChildren();
	3611	+ } else
	3612	+ if (source == textureRatioRItem)
	3613	+ {
	3614	+ TextureRatio(0);
	3615	+ } else
	3616	+ if (source == textureRatioGItem)
	3617	+ {
	3618	+ TextureRatio(1);
	3619	+ } else
	3620	+ if (source == textureRatioBItem)
	3621	+ {
	3622	+ TextureRatio(2);
3603	3623	} else
3604	3624	if (source == resetTransformItem)
3605	3625	{
..	..	@@ -3973,7 +3993,8 @@
3973	3993	if (source == closeButton)
3974	3994	{
3975	3995	//System.out.println("CLOSE: " + buttonGroup.getSelection());
3976		- Replace();
	3996	+ if (copy.versionlist != null)
	3997	+ Replace();
3977	3998
3978	3999	cRadio ab;
3979	4000	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
..	..	@@ -4073,7 +4094,8 @@
4073	4094	} else
4074	4095	if(source instanceof cRadio)
4075	4096	{
4076		- Replace();
	4097	+ if (copy.versionlist != null)
	4098	+ Replace();
4077	4099
4078	4100	group.parent = keepparent;
4079	4101	group.attributes = 0;
..	..	@@ -4126,7 +4148,7 @@
4126	4148	*/
4127	4149	radio.layout.doClick();
4128	4150
4129		- assert(copy instanceof Composite);
	4151	+ //assert(copy instanceof Composite);
4130	4152
4131	4153	if (copy.versionlist == null)
4132	4154	{
..	..	@@ -4137,12 +4159,15 @@
4137	4159	// and check if any of these nodes are reachable below the root.
4138	4160	Grafreed.grafreed.universe.TagObjects(copy, true);
4139	4161
4140		- if (!copy.HasTags())
	4162	+ if (copy instanceof Composite && !copy.HasTags())
4141	4163	{
4142		- copy.versionlist = new Object3D[100];
	4164	+ if (copy.versionlist == null)
	4165	+ copy.versionlist = new Object3D[100];
4143	4166
4144		- Save(true);
	4167	+ //Save(true);
4145	4168	}
	4169	+ else
	4170	+ copy.versionindex = -2;
4146	4171
4147	4172	Grafreed.grafreed.universe.TagObjects(copy, false);
4148	4173	}
..	..	@@ -4262,6 +4287,18 @@
4262	4287	refreshContents();
4263	4288	}
4264	4289
	4290	+ void TextureRatio(int axis)
	4291	+ {
	4292	+ Object3D obj;
	4293	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4294	+ {
	4295	+ obj = (Object3D)e.nextElement();
	4296	+ obj.TextureRatio(axis);
	4297	+ }
	4298	+
	4299	+ refreshContents();
	4300	+ }
	4301	+
4265	4302	void ResetTransform()
4266	4303	{
4267	4304	ResetTransform(-1);
..	..	@@ -4277,38 +4314,8 @@
4277	4314	if (obj.toParent == null)
4278	4315	continue;
4279	4316
4280		- if (mask == -1)
4281		- {
4282		- if (obj instanceof Camera) // jan 2014
4283		- {
4284		- LA.matIdentity(obj.toParent);
4285		- LA.matIdentity(obj.fromParent);
4286		- }
4287		- else
4288		- {
4289		- obj.toParent = null; // jan 2014 LA.matIdentity(obj.toParent);
4290		- obj.fromParent = null; // LA.matIdentity(obj.fromParent);
4291		- }
4292		- TouchTransform(obj);
4293		- continue;
4294		- }
4295		- if ((mask&2) != 0) // Scale/rotation
4296		- {
4297		- obj.toParent[0][0] = obj.toParent[1][1] = obj.toParent[2][2] = 1;
4298		- obj.toParent[0][1] = obj.toParent[1][0] = obj.toParent[2][0] = 0;
4299		- obj.toParent[0][2] = obj.toParent[1][2] = obj.toParent[2][1] = 0;
4300		- obj.fromParent[0][0] = obj.fromParent[1][1] = obj.fromParent[2][2] = 1;
4301		- obj.fromParent[0][1] = obj.fromParent[1][0] = obj.fromParent[2][0] = 0;
4302		- obj.fromParent[0][2] = obj.fromParent[1][2] = obj.fromParent[2][1] = 0;
4303		- }
4304		- if ((mask&1) != 0) // Translation
4305		- {
4306		- if (obj.toParent != null)
4307		- {
4308		- obj.toParent[3][0] = obj.toParent[3][1] = obj.toParent[3][2] = 0;
4309		- obj.fromParent[3][0] = obj.fromParent[3][1] = obj.fromParent[3][2] = 0;
4310		- }
4311		- }
	4317	+ obj.ResetTransform(mask);
	4318	+
4312	4319	if (obj.parent == null)
4313	4320	{
4314	4321	System.out.println("NULL PARENT!");
..	..	@@ -4817,6 +4824,12 @@
4817	4824	{
4818	4825	Object3D obj = group.selection.get(i);
4819	4826
	4827	+ if (obj.toParent == null)
	4828	+ {
	4829	+ obj.toParent = LA.newMatrix();
	4830	+ obj.fromParent = LA.newMatrix();
	4831	+ }
	4832	+
4820	4833	LA.matTranslate(obj.toParent, i * scale, 0, 0);
4821	4834	LA.matTranslateInv(obj.fromParent, -i * scale, 0, 0);
4822	4835	}
..	..	@@ -5108,6 +5121,12 @@
5108	5121	refreshContents();
5109	5122	}
5110	5123
	5124	+ void ClearVersions()
	5125	+ {
	5126	+ group.selection.ClearVersions();
	5127	+ refreshContents();
	5128	+ }
	5129	+
5111	5130	void FlipV(boolean flip)
5112	5131	{
5113	5132	group.selection.FlipV(flip);
..	..	@@ -5346,7 +5365,7 @@
5346	5365	if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
5347	5366	// a camera
5348	5367	{
5349		- if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
	5368	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crashes the camera because of invalid lightspace
5350	5369	{
5351	5370	CameraPane.camerachangeframe = 0; // don't refuse it
5352	5371	Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
..	..	@@ -5393,12 +5412,12 @@
5393	5412	}
5394	5413	}
5395	5414
5396		- rootButton.setEnabled(allComposites);
	5415	+ rootButton.setEnabled(true); // allComposites);
5397	5416	}
5398	5417
5399	5418	void refreshContents(boolean cp)
5400	5419	{
5401		- if (Globals.ADVANCED)
	5420	+ if (Globals.SHOWINFO)
5402	5421	//if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
5403	5422	if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
5404	5423	{
..	..	@@ -6349,6 +6368,7 @@
6349	6368	private MenuItem clipMeshItem;
6350	6369	private MenuItem smoothMeshItem;
6351	6370	private MenuItem clearMaterialsItem;
	6371	+ private MenuItem clearVersionsItem;
6352	6372
6353	6373	private MenuItem liveleavesItem;
6354	6374	private MenuItem unliveleavesItem;
..	..	@@ -6372,6 +6392,9 @@
6372	6392	private MenuItem maxTexturesItem;
6373	6393	private MenuItem panoTexturesItem;
6374	6394
	6395	+ private MenuItem textureRatioRItem;
	6396	+ private MenuItem textureRatioGItem;
	6397	+ private MenuItem textureRatioBItem;
6375	6398	private MenuItem resetCentroidItem;
6376	6399	private MenuItem resetCentroidXZItem;
6377	6400	private MenuItem resetTransformItem;