~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -954,7 +954,7 @@
954	954
955	955	public Object clone()
956	956	{
957		- return GrafreeD.clone(this);
	957	+ return Grafreed.clone(this);
958	958	}
959	959
960	960	Object3D copyExpand()
..	..	@@ -1729,7 +1729,7 @@
1729	1729	Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name);
1730	1730	o.bRep = transientrep;
1731	1731	if (clone)
1732		- o.bRep = (BoundaryRep) GrafreeD.clone(transientrep);
	1732	+ o.bRep = (BoundaryRep) Grafreed.clone(transientrep);
1733	1733	o.CreateMaterial();
1734	1734	o.SetAttributes(this, -1);
1735	1735	//parent
..	..	@@ -1742,7 +1742,7 @@
1742	1742	Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name);
1743	1743	o.bRep = bRep;
1744	1744	if (clone)
1745		- o.bRep = (BoundaryRep) GrafreeD.clone(bRep);
	1745	+ o.bRep = (BoundaryRep) Grafreed.clone(bRep);
1746	1746	o.CreateMaterial();
1747	1747	//o.overwriteThis(this, -1);
1748	1748	o.SetAttributes(this, -1);
..	..	@@ -2300,6 +2300,7 @@
2300	2300	{
2301	2301	if (newWindow)
2302	2302	{
	2303	+ new Exception().printStackTrace();
2303	2304	System.exit(0);
2304	2305	if (parent != null)
2305	2306	{
..	..	@@ -2476,13 +2477,13 @@
2476	2477	return retval;
2477	2478	}
2478	2479
2479		- void doEditDrag(ClickInfo info)
	2480	+ void doEditDrag(ClickInfo info, boolean opposite)
2480	2481	{
2481	2482	switch (doSomething)
2482	2483	{
2483	2484	case 1: // '\001'
2484	2485	//super.
2485		- doEditDrag0(info);
	2486	+ doEditDrag0(info, opposite);
2486	2487	break;
2487	2488
2488	2489	case 2: // '\002'
..	..	@@ -2495,11 +2496,11 @@
2495	2496	{
2496	2497	//sel.hitSomething = childToDrag.hitSomething;
2497	2498	//childToDrag.doEditDrag(info);
2498		- sel.doEditDrag(info);
	2499	+ sel.doEditDrag(info, opposite);
2499	2500	} else
2500	2501	{
2501	2502	//super.
2502		- doEditDrag0(info);
	2503	+ doEditDrag0(info, opposite);
2503	2504	}
2504	2505	}
2505	2506	break;
..	..	@@ -3203,7 +3204,7 @@
3203	3204
3204	3205	BoundaryRep sup = bRep.support;
3205	3206	bRep.support = null;
3206		- BoundaryRep temprep = (BoundaryRep) GrafreeD.clone(bRep);
	3207	+ BoundaryRep temprep = (BoundaryRep) Grafreed.clone(bRep);
3207	3208	// bRep.SplitInTwo(onlyone); // thread...
3208	3209	temprep.SplitInTwo(reduction34, onlyone);
3209	3210	bRep = temprep;
..	..	@@ -3727,7 +3728,7 @@
3727	3728	if (child == null)
3728	3729	continue;
3729	3730
3730		- if (GrafreeD.RENDERME > 0)
	3731	+ if (Grafreed.RENDERME > 0)
3731	3732	{
3732	3733	if (child instanceof Merge)
3733	3734	((Merge)child).renderme();
..	..	@@ -3878,7 +3879,7 @@
3878	3879	if (child == null)
3879	3880	continue;
3880	3881
3881		- if (GrafreeD.RENDERME > 0)
	3882	+ if (Grafreed.RENDERME > 0)
3882	3883	{
3883	3884	if (child instanceof Merge)
3884	3885	((Merge)child).renderme();
..	..	@@ -4073,7 +4074,7 @@
4073	4074	if (child == null)
4074	4075	continue;
4075	4076
4076		- if (GrafreeD.RENDERME > 0)
	4077	+ if (Grafreed.RENDERME > 0)
4077	4078	{
4078	4079	if (child instanceof Merge)
4079	4080	((Merge)child).renderme();
..	..	@@ -5158,10 +5159,34 @@
5158	5159
5159	5160	// System.out.println("Fullname = " + fullname);
5160	5161
5161		- if (fullname.name.indexOf(":") == -1)
5162		- return fullname.name;
	5162	+ // Does not work on Windows due to C:
	5163	+// if (fullname.name.indexOf(":") == -1)
	5164	+// return fullname.name;
	5165	+//
	5166	+// return fullname.name.substring(0,fullname.name.indexOf(":"));
5163	5167
5164		- return fullname.name.substring(0,fullname.name.indexOf(":"));
	5168	+ String[] split = fullname.name.split(":");
	5169	+
	5170	+ if (split.length == 0)
	5171	+ {
	5172	+ return "";
	5173	+ }
	5174	+
	5175	+ if (split.length <= 2)
	5176	+ {
	5177	+ if (fullname.name.endsWith(":"))
	5178	+ {
	5179	+ // Windows
	5180	+ return fullname.name.substring(0, fullname.name.length()-1);
	5181	+ }
	5182	+
	5183	+ return split[0];
	5184	+ }
	5185	+
	5186	+ // Windows
	5187	+ assert(split.length == 4);
	5188	+
	5189	+ return split[0] + ":" + split[1];
5165	5190	}
5166	5191
5167	5192	static String GetBump(cTexture fullname)
..	..	@@ -5170,10 +5195,38 @@
5170	5195	return "";
5171	5196
5172	5197	// System.out.println("Fullname = " + fullname);
5173		- if (fullname.name.indexOf(":") == -1)
5174		- return "";
5175		-
5176		- return fullname.name.substring(fullname.name.indexOf(":")+1,fullname.name.length());
	5198	+ // Does not work on Windows due to C:
	5199	+// if (fullname.name.indexOf(":") == -1)
	5200	+// return "";
	5201	+//
	5202	+// return fullname.name.substring(fullname.name.indexOf(":")+1,fullname.name.length());
	5203	+ String[] split = fullname.name.split(":");
	5204	+
	5205	+ if (split.length == 0)
	5206	+ {
	5207	+ return "";
	5208	+ }
	5209	+
	5210	+ if (split.length == 1)
	5211	+ {
	5212	+ return "";
	5213	+ }
	5214	+
	5215	+ if (split.length == 2)
	5216	+ {
	5217	+ if (fullname.name.endsWith(":"))
	5218	+ {
	5219	+ // Windows
	5220	+ return "";
	5221	+ }
	5222	+
	5223	+ return split[1];
	5224	+ }
	5225	+
	5226	+ // Windows
	5227	+ assert(split.length == 4);
	5228	+
	5229	+ return split[2] + ":" + split[3];
5177	5230	}
5178	5231
5179	5232	String GetPigmentTexture()
..	..	@@ -5247,7 +5300,7 @@
5247	5300	System.out.print("; textures = " + textures);
5248	5301	System.out.println("; usedtextures = " + usedtextures);
5249	5302
5250		- if (GetTextures() == null)
	5303	+ if (GetTextures() == null) // What is that??
5251	5304	GetTextures().name = ":";
5252	5305
5253	5306	String texname = tex;
..	..	@@ -6931,7 +6984,7 @@
6931	6984	}
6932	6985
6933	6986	//System.out.println("info.modifiers = " + info.modifiers);
6934		- modified = (info.modifiers & CameraPane.META) != 0;
	6987	+ modified = (info.modifiers & CameraPane.SHIFT) != 0; // Was META
6935	6988	//System.out.println("modified = " + modified);
6936	6989	//new Exception().printStackTrace();
6937	6990	//viewCode = info.pane.renderCamera.viewCode;
..	..	@@ -6959,7 +7012,7 @@
6959	7012	return true;
6960	7013	}
6961	7014
6962		- void doEditDrag0(ClickInfo info)
	7015	+ void doEditDrag0(ClickInfo info, boolean opposite)
6963	7016	{
6964	7017	if (hitSomething == 0)
6965	7018	{
..	..	@@ -6986,7 +7039,7 @@
6986	7039
6987	7040	scale = 0.05f Globals.theRenderer.RenderCamera().Distance();
6988	7041
6989		- if (modified)
	7042	+ if (modified \|\| opposite)
6990	7043	{
6991	7044	//assert(false);
6992	7045	/*
..	..	@@ -7080,6 +7133,7 @@
7080	7133
7081	7134	if (modified)
7082	7135	{
	7136	+ // Rotate 90 degrees
7083	7137	angle /= (Math.PI / 4);
7084	7138	angle = Math.floor(angle + 0.5);
7085	7139	angle *= (Math.PI / 4);
..	..	@@ -7377,6 +7431,7 @@
7377	7431	objectUI.closeUI();
7378	7432	if (editWindow != null)
7379	7433	{
	7434	+ editWindow.ctrlPanel.FlushUI();
7380	7435	editWindow.refreshContents();
7381	7436	} // ? new
7382	7437	objectUI = null;
..	..	@@ -7512,7 +7567,7 @@
7512	7567	{
7513	7568	assert(bRep != null);
7514	7569	if (!(support instanceof GenericJoint)) // support.bRep != null)
7515		- GrafreeD.Assert(support.bRep == bRep.support);
	7570	+ Grafreed.Assert(support.bRep == bRep.support);
7516	7571	}
7517	7572	else
7518	7573	{