~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -21,6 +21,19 @@
21	21
22	22	ScriptNode scriptnode;
23	23
	24	+ void InitOthers()
	25	+ {
	26	+ if (projectedVertices == null \|\| projectedVertices.length <= 2)
	27	+ {
	28	+ projectedVertices = new Object3D.cVector2[3];
	29	+ }
	30	+ for (int i = 0; i < 3; i++)
	31	+ {
	32	+ projectedVertices[i] = new cVector2(); // Others
	33	+ }
	34	+ projectedVertices[0].x = 100; // bump
	35	+ }
	36	+
24	37	void MinMax(cVector minima, cVector maxima)
25	38	{
26	39	for (int xyz = 0; xyz < 3; xyz++)
..	..	@@ -296,6 +309,8 @@
296	309	boolean speedup = false;
297	310	boolean rewind = false;
298	311
	312	+ float NORMALPUSH = 0;
	313	+
299	314	Object3D support;
300	315
301	316	Object3D GetObject()
..	..	@@ -355,7 +370,7 @@
355	370
356	371	int MemorySize()
357	372	{
358		- if (memorysize == 0)
	373	+ if (true) // memorysize == 0)
359	374	{
360	375	try
361	376	{
..	..	@@ -779,7 +794,10 @@
779	794	// factor = CameraPane.STEP;
780	795	// }
781	796
782		- if (marked && CameraPane.isLIVE() && live && CameraPane.drawMode == CameraPane.SHADOW && currentframe != CameraPane.framecount)
	797	+ if (marked && CameraPane.isLIVE() && live &&
	798	+ //TEMP21aug2018
	799	+ CameraPane.drawMode == CameraPane.SHADOW &&
	800	+ currentframe != CameraPane.framecount)
783	801	{
784	802	currentframe = CameraPane.framecount;
785	803
..	..	@@ -935,7 +953,7 @@
935	953
936	954	public Object clone()
937	955	{
938		- return GraphreeD.clone(this);
	956	+ return GrafreeD.clone(this);
939	957	}
940	958
941	959	Object3D copyExpand()
..	..	@@ -1446,7 +1464,16 @@
1446	1464	// if (other == null)
1447	1465	// return;
1448	1466
1449		- System.out.println("Link support this = " + this + "; other = " + other);
	1467	+ if (other != null)
	1468	+ {
	1469	+ BoundaryRep.SEUIL = other.material.cameralight;
	1470	+
	1471	+ // Set default to 0.1
	1472	+ BoundaryRep.SEUIL /= 2;
	1473	+ System.out.println("SEUIL = " + BoundaryRep.SEUIL);
	1474	+ }
	1475	+
	1476	+ System.out.println("Link this = " + this + "; support = " + other);
1450	1477
1451	1478	//if (bRep != null)
1452	1479	// bRep.linkVerticesThis(other.bRep);
..	..	@@ -1701,7 +1728,7 @@
1701	1728	Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name);
1702	1729	o.bRep = transientrep;
1703	1730	if (clone)
1704		- o.bRep = (BoundaryRep) GraphreeD.clone(transientrep);
	1731	+ o.bRep = (BoundaryRep) GrafreeD.clone(transientrep);
1705	1732	o.CreateMaterial();
1706	1733	o.SetAttributes(this, -1);
1707	1734	//parent
..	..	@@ -1714,7 +1741,7 @@
1714	1741	Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name);
1715	1742	o.bRep = bRep;
1716	1743	if (clone)
1717		- o.bRep = (BoundaryRep) GraphreeD.clone(bRep);
	1744	+ o.bRep = (BoundaryRep) GrafreeD.clone(bRep);
1718	1745	o.CreateMaterial();
1719	1746	//o.overwriteThis(this, -1);
1720	1747	o.SetAttributes(this, -1);
..	..	@@ -1756,7 +1783,7 @@
1756	1783	// {
1757	1784	// assert(bRep == null);
1758	1785	// Object3D o = new Object3D("Geometry:" + this.name);
1759		-// o.bRep = (BoundaryRep) GraphreeD.clone(transientrep);
	1786	+// o.bRep = (BoundaryRep) GrafreeD.clone(transientrep);
1760	1787	// o.CreateMaterial();
1761	1788	// parent.addChild(o);
1762	1789	// }
..	..	@@ -1765,7 +1792,7 @@
1765	1792	// {
1766	1793	// assert(transientrep == null);
1767	1794	// Object3D o = new Object3D("Geometry:" + this.name);
1768		-// o.bRep = (BoundaryRep) GraphreeD.clone(bRep);
	1795	+// o.bRep = (BoundaryRep) GrafreeD.clone(bRep);
1769	1796	// o.CreateMaterial();
1770	1797	// parent.addChild(o);
1771	1798	// }
..	..	@@ -1816,8 +1843,9 @@
1816	1843	if (obj.name == null)
1817	1844	continue; // can't be a null one
1818	1845
1819		- //if (n.contains(obj.name)) // dec 2013 name.split(":")[0])) // Poser generates a count
1820		- if (n.startsWith(obj.name))
	1846	+ String name = obj.name.split(":")[0]; // Poser generates a count
	1847	+ //if (n.startsWith(obj.name))
	1848	+ if (n.contains(name))
1821	1849	{
1822	1850	theobj = obj;
1823	1851	count++;
..	..	@@ -2120,15 +2148,8 @@
2120	2148	if (/parent != null &&/ material == null)
2121	2149	{
2122	2150	material = new cMaterial(GetMaterial());
2123		- if (projectedVertices == null \|\| projectedVertices.length <= 2)
2124		- {
2125		- projectedVertices = new Object3D.cVector2[3];
2126		- }
2127		- for (int i = 0; i < 3; i++)
2128		- {
2129		- projectedVertices[i] = new cVector2(); // Others
2130		- }
2131		- projectedVertices[0].x = 100; // bump
	2151	+
	2152	+ InitOthers();
2132	2153
2133	2154	if (this instanceof Camera)
2134	2155	{
..	..	@@ -2732,6 +2753,24 @@
2732	2753	blockloop = false;
2733	2754	}
2734	2755
	2756	+ void GenNormalsMINE()
	2757	+ {
	2758	+ if (blockloop)
	2759	+ return;
	2760	+
	2761	+ blockloop = true;
	2762	+ GenNormalsMINE0();
	2763	+ for (int i = 0; i < Children().Size(); i++)
	2764	+ {
	2765	+ Object3D child = (Object3D) Children().get(i); // reserve(i);
	2766	+ if (child == null)
	2767	+ continue;
	2768	+ child.GenNormalsMINE();
	2769	+// Children().release(i);
	2770	+ }
	2771	+ blockloop = false;
	2772	+ }
	2773	+
2735	2774	void ClearColors()
2736	2775	{
2737	2776	if (blockloop)
..	..	@@ -2876,6 +2915,15 @@
2876	2915	if (bRep != null)
2877	2916	{
2878	2917	bRep.GenerateNormals(crease);
	2918	+ Touch();
	2919	+ }
	2920	+ }
	2921	+
	2922	+ void GenNormalsMINE0()
	2923	+ {
	2924	+ if (bRep != null)
	2925	+ {
	2926	+ bRep.GenerateNormalsMINE();
2879	2927	Touch();
2880	2928	}
2881	2929	}
..	..	@@ -3153,7 +3201,7 @@
3153	3201
3154	3202	BoundaryRep sup = bRep.support;
3155	3203	bRep.support = null;
3156		- BoundaryRep temprep = (BoundaryRep) GraphreeD.clone(bRep);
	3204	+ BoundaryRep temprep = (BoundaryRep) GrafreeD.clone(bRep);
3157	3205	// bRep.SplitInTwo(onlyone); // thread...
3158	3206	temprep.SplitInTwo(reduction34, onlyone);
3159	3207	bRep = temprep;
..	..	@@ -3677,7 +3725,7 @@
3677	3725	if (child == null)
3678	3726	continue;
3679	3727
3680		- if (GraphreeD.RENDERME > 0)
	3728	+ if (GrafreeD.RENDERME > 0)
3681	3729	{
3682	3730	if (child instanceof Merge)
3683	3731	((Merge)child).renderme();
..	..	@@ -3828,7 +3876,7 @@
3828	3876	if (child == null)
3829	3877	continue;
3830	3878
3831		- if (GraphreeD.RENDERME > 0)
	3879	+ if (GrafreeD.RENDERME > 0)
3832	3880	{
3833	3881	if (child instanceof Merge)
3834	3882	((Merge)child).renderme();
..	..	@@ -4023,7 +4071,7 @@
4023	4071	if (child == null)
4024	4072	continue;
4025	4073
4026		- if (GraphreeD.RENDERME > 0)
	4074	+ if (GrafreeD.RENDERME > 0)
4027	4075	{
4028	4076	if (child instanceof Merge)
4029	4077	((Merge)child).renderme();
..	..	@@ -4111,7 +4159,7 @@
4111	4159	if (blockloop)
4112	4160	return;
4113	4161
4114		- for (int i=0; i<size(); i++)
	4162	+ for (int i=0; i<Size(); i++)
4115	4163	{
4116	4164	if (get(i).parent != this)
4117	4165	{
..	..	@@ -4120,6 +4168,22 @@
4120	4168	}
4121	4169	blockloop = true;
4122	4170	get(i).RepairParent();
	4171	+ blockloop = false;
	4172	+ }
	4173	+ }
	4174	+
	4175	+ void RepairShadow()
	4176	+ {
	4177	+ if (blockloop)
	4178	+ return;
	4179	+
	4180	+ if (this.material != null)
	4181	+ this.InitOthers();
	4182	+
	4183	+ for (int i=0; i<Size(); i++)
	4184	+ {
	4185	+ blockloop = true;
	4186	+ get(i).RepairShadow();
4123	4187	blockloop = false;
4124	4188	}
4125	4189	}
..	..	@@ -5519,7 +5583,9 @@
5519	5583	display.options2[2] = material.factor;
5520	5584
5521	5585	cColor.HSBtoRGB(material.color, material.modulation, 1, display.options3);
5522		- display.options3[3] = material.cameralight/0.2f;
	5586	+ display.options4[0] = material.cameralight/0.2f;
	5587	+ display.options4[1] = material.subsurface;
	5588	+ display.options4[2] = material.sheen;
5523	5589
5524	5590	// if (display.CURRENTANTIALIAS > 0)
5525	5591	// display.options3[3] /= 4;
..	..	@@ -5819,12 +5885,12 @@
5819	5885	if (!child.HasTransparency())
5820	5886	{
5821	5887	sel = root != null && root.selection != null && root.selection.indexOf(child) != -1;
5822		- // GraphreeD.tracein("draw ", child);
	5888	+ // GrafreeD.tracein("draw ", child);
5823	5889	boolean wasblocked = blockdraw;
5824	5890	blockdraw = true;
5825	5891	child.draw(display, root, selected \|\| sel, wasblocked \|\| blocked); // \|\| child.IsSelected());
5826	5892	blockdraw = false;
5827		- // GraphreeD.traceout("draw ", child);
	5893	+ // GrafreeD.traceout("draw ", child);
5828	5894	}
5829	5895
5830	5896	release(i);
..	..	@@ -5919,7 +5985,7 @@
5919	5985
5920	5986	javax.media.opengl.GL gl = display.GetGL();
5921	5987
5922		- if (CameraPane.BOXMODE) // \|\| CameraPane.movingcamera)
	5988	+ if (CameraPane.BOXMODE && !selected) // \|\| CameraPane.movingcamera)
5923	5989	{
5924	5990	int fc = bRep.FaceCount();
5925	5991	int vc = bRep.VertexCount();
..	..	@@ -6660,13 +6726,26 @@
6660	6726	gl.glNormal3f((float) v2.x, (float) v2.y, (float) v2.z);
6661	6727	}
6662	6728
	6729	+ // P
	6730	+ float x = (float)pv.x;
	6731	+ float y = (float)pv.y;
	6732	+ float z = (float)pv.z;
	6733	+
6663	6734	if (hasnorm)
6664	6735	{
6665	6736	// if (!pv.norm.normalized())
6666	6737	// assert(pv.norm.normalized());
6667	6738
6668	6739	//System.out.println("normalp = " + pv.norm.x + ", " + pv.norm.y + ", " + pv.norm.z);
6669		- gl.glNormal3f((float) pv.norm.x, (float) pv.norm.y, (float) pv.norm.z);
	6740	+ float nx = (float)pv.norm.x;
	6741	+ float ny = (float)pv.norm.y;
	6742	+ float nz = (float)pv.norm.z;
	6743	+
	6744	+ x += nx * NORMALPUSH;
	6745	+ y += ny * NORMALPUSH;
	6746	+ z += nz * NORMALPUSH;
	6747	+
	6748	+ gl.glNormal3f(nx, ny, nz);
6670	6749	}
6671	6750	gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
6672	6751	SetColor(display, pv);
..	..	@@ -6677,13 +6756,28 @@
6677	6756	else
6678	6757	gl.glTexCoord2f((float) pv.s, (float) pv.t);
6679	6758	//System.out.println("vertexp = " + pv.x + ", " + pv.y + ", " + pv.z);
6680		- gl.glVertex3f((float) pv./pos./x, (float) pv./pos./y, (float) pv./pos./z);
	6759	+
	6760	+ gl.glVertex3f(x, y, z);
	6761	+
	6762	+ // Q
	6763	+ x = (float)qv.x;
	6764	+ y = (float)qv.y;
	6765	+ z = (float)qv.z;
	6766	+
6681	6767	// Print(pv);
6682	6768	if (hasnorm)
6683	6769	{
6684	6770	// assert(qv.norm.normalized());
6685	6771	//System.out.println("normalq = " + qv.norm.x + ", " + qv.norm.y + ", " + qv.norm.z);
6686		- gl.glNormal3f((float) qv.norm.x, (float) qv.norm.y, (float) qv.norm.z);
	6772	+ float nx = (float)qv.norm.x;
	6773	+ float ny = (float)qv.norm.y;
	6774	+ float nz = (float)qv.norm.z;
	6775	+
	6776	+ x += nx * NORMALPUSH;
	6777	+ y += ny * NORMALPUSH;
	6778	+ z += nz * NORMALPUSH;
	6779	+
	6780	+ gl.glNormal3f(nx, ny, nz);
6687	6781	}
6688	6782	//System.out.println("vertexq = " + qv.s + ", " + qv.t);
6689	6783	// boolean locked = false;
..	..	@@ -6707,16 +6801,31 @@
6707	6801	// }
6708	6802	gl.glColor4f(qv.AO, qv.AO, qv.AO, 1);
6709	6803	SetColor(display, qv);
	6804	+
	6805	+ gl.glVertex3f(x, y, z);
6710	6806	//gl.glColor4f(r, g, b, 1);
6711	6807	//gl.glColor4f(qv.boundary, qv.boundary, qv.boundary, 1);
6712	6808	//System.out.println("vertexq = " + qv.x + ", " + qv.y + ", " + qv.z);
6713		- gl.glVertex3f((float) qv./pos./x, (float) qv./pos./y, (float) qv./pos./z);
6714	6809	// Print(qv);
	6810	+
	6811	+ // R
	6812	+ x = (float)rv.x;
	6813	+ y = (float)rv.y;
	6814	+ z = (float)rv.z;
	6815	+
6715	6816	if (hasnorm)
6716	6817	{
6717	6818	// assert(rv.norm.normalized());
6718	6819	//System.out.println("normalr = " + rv.norm.x + ", " + rv.norm.y + ", " + rv.norm.z);
6719		- gl.glNormal3f((float) rv.norm.x, (float) rv.norm.y, (float) rv.norm.z);
	6820	+ float nx = (float)rv.norm.x;
	6821	+ float ny = (float)rv.norm.y;
	6822	+ float nz = (float)rv.norm.z;
	6823	+
	6824	+ x += nx * NORMALPUSH;
	6825	+ y += ny * NORMALPUSH;
	6826	+ z += nz * NORMALPUSH;
	6827	+
	6828	+ gl.glNormal3f(nx, ny, nz);
6720	6829	}
6721	6830
6722	6831	// if ((dot&4) == 0)
..	..	@@ -6737,7 +6846,7 @@
6737	6846	//gl.glColor4f(r, g, b, 1);
6738	6847	//gl.glColor4f(rv.boundary, rv.boundary, rv.boundary, 1);
6739	6848	//System.out.println("vertexr = " + rv.x + ", " + rv.y + ", " + rv.z);
6740		- gl.glVertex3f((float) rv./pos./x, (float) rv./pos./y, (float) rv./pos./z);
	6849	+ gl.glVertex3f(x, y, z);
6741	6850	// Print(rv);
6742	6851	//gl.glEnd();
6743	6852	}
..	..	@@ -7731,7 +7840,7 @@
7731	7840	if (parent == null)
7732	7841	{
7733	7842	System.out.println("NULL PARENT");
7734		- new Exception().printStackTrace();
	7843	+ //new Exception().printStackTrace();
7735	7844	} else
7736	7845	{
7737	7846	if (parent instanceof BezierPatch)
..	..	@@ -8041,7 +8150,7 @@
8041	8150	{
8042	8151	assert(bRep != null);
8043	8152	if (!(support instanceof GenericJoint)) // support.bRep != null)
8044		- GraphreeD.Assert(support.bRep == bRep.support);
	8153	+ GrafreeD.Assert(support.bRep == bRep.support);
8045	8154	}
8046	8155	else
8047	8156	{
..	..	@@ -8124,6 +8233,8 @@
8124	8233	{
8125	8234	Object3D targ = this;
8126	8235
	8236	+ targ.NORMALPUSH = obj.NORMALPUSH;
	8237	+
8127	8238	if (obj.material != null)
8128	8239	{
8129	8240	if ((mask&MATERIAL)!=0) // ==(COLOR\|MATERIAL))