~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -41,6 +41,8 @@
41	41
42	42	java.util.Hashtable<java.util.UUID, Object3D> versiontable; // = new java.util.Hashtable<java.util.UUID, Object3D>();
43	43
	44	+ transient int tabIndex; // Tabs can change between sessions.
	45	+
44	46	ScriptNode scriptnode;
45	47
46	48	void deepCopyNode(Object3D other)
..	..	@@ -100,7 +102,7 @@
100	102	other.softtouched = softtouched;
101	103
102	104	other.random = random;
103		- other.link2master = link2master;
	105	+ other.link2master = Link2Support();
104	106	other.transformcount = transformcount;
105	107	other.marked = marked;
106	108	other.skip = skip;
..	..	@@ -140,6 +142,7 @@
140	142	projectedVertices[i] = new cVector2(); // Others
141	143	}
142	144	projectedVertices[0].x = 100; // bump
	145	+ projectedVertices[1].y = 1000; // punchthrough. only for png
143	146	}
144	147
145	148	void MinMax(cVector minima, cVector maxima)
..	..	@@ -219,7 +222,7 @@
219	222	return;
220	223
221	224	transientsupport = support;
222		- transientlink2master = link2master;
	225	+ transientlink2master = Link2Support();
223	226
224	227	support = null;
225	228	link2master = false;
..	..	@@ -632,7 +635,10 @@
632	635	transient boolean keepdontselect;
633	636	boolean dontselect = false;
634	637	boolean hide = false;
635		- boolean link2master = false; // performs reset support/master at each frame
	638	+
	639	+ boolean link2master = false; // performs reset support/master at each frame (cannot rename due to serialization)
	640	+ boolean link2support = false; // (cannot rename due to serialization)
	641	+
636	642	boolean marked = false; // animation node
637	643	boolean skip = false; // centroid issue
638	644	boolean skipmocap = false; // mocap data
..	..	@@ -640,6 +646,9 @@
640	646	boolean random = false;
641	647	boolean speedup = false;
642	648	boolean rewind = false;
	649	+
	650	+ // Option to sort triangles, e.g. for transparency.
	651	+ boolean sort = false;
643	652
644	653	float NORMALPUSH = 0;
645	654
..	..	@@ -658,7 +667,7 @@
658	667	{
659	668	sorted = true;
660	669
661		- for (int i=0; i<size()-1; i++)
	670	+ for (int i=0; i<Size()-1; i++)
662	671	{
663	672	Object3D obji = get(i);
664	673	Object3D objj = get(i+1);
..	..	@@ -682,7 +691,7 @@
682	691	{
683	692	sorted = true;
684	693
685		- for (int i=0; i<size()-1; i++)
	694	+ for (int i=0; i<Size()-1; i++)
686	695	{
687	696	Object3D obji = get(i);
688	697	Object3D objj = get(i+1);
..	..	@@ -1019,7 +1028,7 @@
1019	1028
1020	1029	void Step()
1021	1030	{
1022		- // marde pour serialization de Texture
	1031	+ // patch pour serialization de Texture
1023	1032	resetmaxcount();
1024	1033	resettransformcount();
1025	1034	resetstep();
..	..	@@ -1133,6 +1142,8 @@
1133	1142	(Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| !Globals.COMPUTESHADOWWHENLIVE) &&
1134	1143	currentframe != Globals.framecount)
1135	1144	{
	1145	+ Globals.lighttouched = true;
	1146	+
1136	1147	currentframe = Globals.framecount;
1137	1148
1138	1149	// System.err.println("transformcount = " + transformcount);
..	..	@@ -1212,24 +1223,28 @@
1212	1223	{
1213	1224	// return true;
1214	1225
1215		- if (material == null \|\| material.multiply)
1216		- return true;
	1226	+// if (material == null \|\| material.multiply)
	1227	+// return true;
	1228	+//
	1229	+// if (projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
	1230	+// return false;
	1231	+//
	1232	+// // Transparent objects are dynamic because we have to sort the triangles.
	1233	+// return material.opacity > 0.99;
1217	1234
1218		- if (projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
1219		- return false;
1220		-
1221		- // Transparent objects are dynamic because we have to sort the triangles.
1222		- return material.opacity > 0.99;
	1235	+ return !sort;
1223	1236	}
1224	1237
1225	1238	boolean IsOpaque()
1226	1239	{
1227	1240	// return true;
1228	1241
1229		- if (material == null \|\| material.multiply)
1230		- return true;
	1242	+// if (material == null \|\| material.multiply)
	1243	+// return true;
	1244	+//
	1245	+// return material.opacity > 0.99;
1231	1246
1232		- return material.opacity > 0.99;
	1247	+ return !sort;
1233	1248	}
1234	1249
1235	1250	Object3D()
..	..	@@ -3406,7 +3421,7 @@
3406	3421	}
3407	3422	}
3408	3423
3409		- public void Scale(int scale)
	3424	+ public void Scale(float scale)
3410	3425	{
3411	3426	Object3D obj = this;
3412	3427
..	..	@@ -4040,6 +4055,7 @@
4040	4055
4041	4056	void RevertMeshes()
4042	4057	{
	4058	+ // BLOCKLOOP
4043	4059	if (this instanceof cMesh)
4044	4060	{
4045	4061	((cMesh)this).Revert();
..	..	@@ -4070,11 +4086,6 @@
4070	4086	Touch();
4071	4087	}
4072	4088
4073		- ResetRecur();
4074		- }
4075		-
4076		- void ResetRecur()
4077		- {
4078	4089	for (int i = 0; i < size(); i++)
4079	4090	{
4080	4091	Object3D child = (Object3D) get(i); // reserve(i);
..	..	@@ -4097,11 +4108,6 @@
4097	4108	Step();
4098	4109	Touch();
4099	4110
4100		- StepRecur();
4101		- }
4102		-
4103		- void StepRecur()
4104		- {
4105	4111	for (int i = 0; i < size(); i++)
4106	4112	{
4107	4113	Object3D child = (Object3D) get(i); // reserve(i);
..	..	@@ -4288,8 +4294,8 @@
4288	4294	Touch();
4289	4295	}
4290	4296
4291		- transient cVector min = new cVector();
4292		- transient cVector max = new cVector();
	4297	+ transient cVector min;
	4298	+ transient cVector max;
4293	4299
4294	4300	void getBounds(cVector minima, cVector maxima, boolean xform)
4295	4301	{
..	..	@@ -4305,7 +4311,7 @@
4305	4311	if (blockloop)
4306	4312	return;
4307	4313
4308		- if (min == null) // ???
	4314	+ if (min == null)
4309	4315	{
4310	4316	min = new cVector();
4311	4317	max = new cVector();
..	..	@@ -4346,7 +4352,7 @@
4346	4352
4347	4353	if (bRep != null)
4348	4354	{
4349		- bRep.getBounds(minima,maxima,this);
	4355	+ bRep.getBounds(minima, maxima, xform?this:null);
4350	4356	}
4351	4357
4352	4358	if (false) // xform)
..	..	@@ -6155,7 +6161,7 @@
6155	6161	boolean NeedSupport()
6156	6162	{
6157	6163	return
6158		- CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| (!Globals.FREEZEONMOVE && Globals.isLIVE())) && link2master && /live &&/ support != null
	6164	+ CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| (!Globals.FREEZEONMOVE && Globals.isLIVE())) && Link2Support() && /live &&/ support != null
6159	6165	// PROBLEM with CROWD!!
6160	6166	&& (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| Globals.CROWD);
6161	6167	}
..	..	@@ -6178,6 +6184,15 @@
6178	6184	return live && bRep != null;
6179	6185	}
6180	6186
	6187	+ boolean Link2Support()
	6188	+ {
	6189	+ return link2master \|\| link2support;
	6190	+ }
	6191	+
	6192	+ static cVector minima = new cVector();
	6193	+ static cVector maxima = new cVector();
	6194	+ static javax.vecmath.Point3d center = new javax.vecmath.Point3d();
	6195	+
6181	6196	void Draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
6182	6197	{
6183	6198	Invariants(); // june 2013
..	..	@@ -6185,6 +6200,29 @@
6185	6200	if (support != null)
6186	6201	{
6187	6202	// System.err.println("Draw " + this + " Frame # " + ((Mocap)((Merge)support).object).frame);
	6203	+ }
	6204	+
	6205	+ if (false) // live && Link2Support() && support == null && !this.marked) // project on ground
	6206	+ {
	6207	+ getBounds(minima, maxima, true);
	6208	+ center.x = (minima.x + maxima.x) / 2;
	6209	+ center.y = 10000; // (minima.y + maxima.y) / 2;
	6210	+ center.z = (minima.z + maxima.z) / 2;
	6211	+
	6212	+ Ray ray = new Ray(center, new Vector3d(0,-1,0));
	6213	+
	6214	+ IntersectResult res = new IntersectResult();
	6215	+ res.t = Double.POSITIVE_INFINITY;
	6216	+
	6217	+ if (Grafreed.grafreed.universe.intersect(ray, res))
	6218	+ {
	6219	+ double resx = ray.eyePoint.x + ray.viewDirection.x * res.t;
	6220	+ double resy = ray.eyePoint.y + ray.viewDirection.y * res.t;
	6221	+ double resz = ray.eyePoint.z + ray.viewDirection.z * res.t;
	6222	+
	6223	+ LA.matTranslate(toParent, 0, resy - minima.y, 0);
	6224	+ LA.matInvert(toParent, fromParent);
	6225	+ }
6188	6226	}
6189	6227
6190	6228	if (display.DrawMode() == iCameraPane.SELECTION &&
..	..	@@ -6239,7 +6277,7 @@
6239	6277	support = support;
6240	6278
6241	6279	boolean usecalllists = !IsDynamic() &&
6242		- IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	6280	+ IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !Link2Support()); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
6243	6281	//boolean usecalllists = false; //!IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
6244	6282
6245	6283	//usecalllists &= display.DrawMode() == display.DEFAULT; // Don't compute list in shadow pass.
..	..	@@ -6250,7 +6288,8 @@
6250	6288	bRep.displaylist = 0;
6251	6289	}
6252	6290	// usecalllists &= !(parent instanceof RandomNode);
6253		- // usecalllists = false;
	6291	+ if (CameraPane.BOXMODE) // Too dynamic
	6292	+ usecalllists = false;
6254	6293
6255	6294	if (display.DrawMode() == display.SHADOW)
6256	6295	//GetBRep() != null)
..	..	@@ -6264,7 +6303,7 @@
6264	6303
6265	6304	if (!selectmode && //display.DrawMode() != display.SELECTION &&
6266	6305	//(touched \|\| (bRep != null && bRep.displaylist <= 0)))
6267		- (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE \|\| touched && Globals.COMPUTESHADOWWHENLIVE)) // \|\| (bRep != null && bRep.displaylist <= 0)))
	6306	+ ((Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE) \|\| touched)) // \|\| (bRep != null && bRep.displaylist <= 0)))
6268	6307	{
6269	6308	Globals.lighttouched = true;
6270	6309	} // all panes...
..	..	@@ -6306,8 +6345,8 @@
6306	6345	Globals.lighttouched = true; // all panes...
6307	6346	}
6308	6347
6309		- touched = GetBRep() == null; // this instanceof Composite \|\| this instanceof FileObject; // false;
6310		- //touched = false;
	6348	+ //touched = GetBRep() == null; // this instanceof Composite \|\| this instanceof FileObject; // false;
	6349	+ touched = false;
6311	6350
6312	6351	if (this instanceof Texture \|\| this instanceof TextureNode)
6313	6352	{
..	..	@@ -6346,7 +6385,7 @@
6346	6385	{
6347	6386	if (display.DrawMode() == iCameraPane.SHADOW)
6348	6387	{
6349		- if (!link2master // tricky to cull in shadow mode.
	6388	+ if (!Link2Support() // tricky to cull in shadow mode.
6350	6389	&& GetBRep().FrustumCull(this, null, display.LightCamera(), true))
6351	6390	{
6352	6391	//System.out.print("CULLED");
..	..	@@ -6454,6 +6493,7 @@
6454	6493	boolean failedPigment = false;
6455	6494	boolean failedBump = false;
6456	6495
	6496	+ CameraPane.lastObject = this;
6457	6497	try
6458	6498	{
6459	6499	display.BindPigmentTexture(tex, texres);
..	..	@@ -6818,7 +6858,8 @@
6818	6858
6819	6859	//javax.media.opengl.GL gl = display.GetGL();
6820	6860
6821		- if (CameraPane.BOXMODE && !selected) // \|\| CameraPane.movingcamera)
	6861	+ if (CameraPane.BOXMODE && //!Link2Support()) //
	6862	+ !selected) // \|\| CameraPane.movingcamera)
6822	6863	{
6823	6864	int fc = bRep.FaceCount();
6824	6865	int vc = bRep.VertexCount();
..	..	@@ -6980,7 +7021,7 @@
6980	7021	facescompare[k] = new FaceCompare(k);
6981	7022	}
6982	7023
6983		- center = new cVector();
	7024	+ centertriangle = new cVector();
6984	7025	}
6985	7026	else
6986	7027	{
..	..	@@ -7103,7 +7144,7 @@
7103	7144	*/
7104	7145	}
7105	7146
7106		- transient cVector center;
	7147	+ transient cVector centertriangle;
7107	7148
7108	7149	class FaceCompare implements Comparable
7109	7150	{
..	..	@@ -7132,14 +7173,14 @@
7132	7173	Vertex q = bRep.GetVertex(face.q);
7133	7174	Vertex r = bRep.GetVertex(face.r);
7134	7175
7135		- center.set(p);
7136		- center.add(q);
7137		- center.add(r);
7138		- center.mul(1.0/3);
	7176	+ centertriangle.set(p);
	7177	+ centertriangle.add(q);
	7178	+ centertriangle.add(r);
	7179	+ centertriangle.mul(1.0/3);
7139	7180
7140		- center.sub(Globals.theRenderer.EyeCamera().location);
	7181	+ centertriangle.sub(Globals.theRenderer.EyeCamera().location);
7141	7182
7142		- distance = center.dot(center);
	7183	+ distance = centertriangle.dot(centertriangle);
7143	7184	}
7144	7185
7145	7186	return distance;
..	..	@@ -8322,7 +8363,7 @@
8322	8363
8323	8364	public int hashCode()
8324	8365	{
8325		- // Fuck Vector...
	8366	+ // Do not use Vector...
8326	8367	return System.identityHashCode(this);
8327	8368	}
8328	8369
..	..	@@ -8562,8 +8603,8 @@
8562	8603	private static cVector2 qq2 = new cVector2();
8563	8604	private static cVector2 rr2 = new cVector2();
8564	8605	private static cVector2 ss2 = new cVector2();
8565		- private static cVector edge1 = new cVector();
8566		- private static cVector edge2 = new cVector();
	8606	+// private static cVector edge1 = new cVector();
	8607	+// private static cVector edge2 = new cVector();
8567	8608	//private static cVector norm = new cVector();
8568	8609	/transient private/ int hitSomething;
8569	8610	static final int hitCenter = 1;
..	..	@@ -8761,7 +8802,275 @@
8761	8802
8762	8803	Touch();
8763	8804	}
	8805	+
	8806	+ static Vertex s1 = new Vertex();
	8807	+ static Vertex s2 = new Vertex();
	8808	+ static Vertex s3 = new Vertex();
8764	8809
	8810	+ boolean intersectMesh(Ray ray, IntersectResult result)
	8811	+ {
	8812	+ boolean success = false;
	8813	+
	8814	+ if (bRep.stripified)
	8815	+ {
	8816	+ int[] strips = bRep.getRawIndices();
	8817	+
	8818	+ // TRIANGLE STRIP ARRAY
	8819	+ if (bRep.trimmed)
	8820	+ {
	8821	+ float[] v = bRep.getRawVertices();
	8822	+
	8823	+ int count3 = 0;
	8824	+
	8825	+ if (v.length > 0)
	8826	+ {
	8827	+ for (int i = 0; i < strips.length; i++)
	8828	+ {
	8829	+ s1.set(v[count3], v[count3 + 1], v[count3 + 2]);
	8830	+ count3 += 3;
	8831	+
	8832	+ s2.set(v[count3], v[count3 + 1], v[count3 + 2]);
	8833	+ count3 += 3;
	8834	+
	8835	+ for (int j = 0; j < strips[i] - 2; j++)
	8836	+ {
	8837	+ s3.set(v[count3], v[count3 + 1], v[count3 + 2]);
	8838	+ count3 += 3;
	8839	+
	8840	+ if (j%2 == 0)
	8841	+ success \|= intersectTriangle(ray, result, s1, s2, s3);
	8842	+ else
	8843	+ success \|= intersectTriangle(ray, result, s1, s3, s2);
	8844	+
	8845	+ s1.set(s2);
	8846	+ s2.set(s3);
	8847	+ }
	8848	+ }
	8849	+ }
	8850	+
	8851	+ assert count3 == v.length;
	8852	+ }
	8853	+ else // !trimmed
	8854	+ {
	8855	+ int count = 0;
	8856	+ for (int i = 0; i < strips.length; i++)
	8857	+ {
	8858	+ Vertex p = bRep.GetVertex(bRep.indices[count++]);
	8859	+ Vertex q = bRep.GetVertex(bRep.indices[count++]);
	8860	+
	8861	+ for (int j = 0; j < strips[i] - 2; j++)
	8862	+ {
	8863	+ Vertex r = bRep.GetVertex(bRep.indices[count++]);
	8864	+
	8865	+ if (j%2 == 0)
	8866	+ success \|= intersectTriangle(ray, result, p, q, r);
	8867	+ else
	8868	+ success \|= intersectTriangle(ray, result, p, r, q);
	8869	+
	8870	+ p = q;
	8871	+ q = r;
	8872	+ }
	8873	+ }
	8874	+ }
	8875	+ } else // catch (Error e)
	8876	+ {
	8877	+ int facecount = bRep.FaceCount();
	8878	+ for (int i = 0; i < facecount; i++)
	8879	+ {
	8880	+ Face face = bRep.GetFace(i);
	8881	+
	8882	+ Vertex p = bRep.GetVertex(face.p);
	8883	+ Vertex q = bRep.GetVertex(face.q);
	8884	+ Vertex r = bRep.GetVertex(face.r);
	8885	+
	8886	+ success \|= intersectTriangle(ray, result, p, q, r);
	8887	+ }
	8888	+ }
	8889	+
	8890	+ return success;
	8891	+ }
	8892	+
	8893	+ static cVector eye = new cVector();
	8894	+ static cVector dir = new cVector();
	8895	+
	8896	+ transient BBox bbox = null;
	8897	+
	8898	+ boolean intersect(Ray ray, IntersectResult result)
	8899	+ {
	8900	+ double eyex = ray.eyePoint.x;
	8901	+ double eyey = ray.eyePoint.y;
	8902	+ double eyez = ray.eyePoint.z;
	8903	+
	8904	+ double dirx = ray.viewDirection.x;
	8905	+ double diry = ray.viewDirection.y;
	8906	+ double dirz = ray.viewDirection.z;
	8907	+
	8908	+ if (this.fromParent != null && !(this instanceof TextureNode))
	8909	+ {
	8910	+ eye.x = eyex;
	8911	+ eye.y = eyey;
	8912	+ eye.z = eyez;
	8913	+ dir.x = dirx;
	8914	+ dir.y = diry;
	8915	+ dir.z = dirz;
	8916	+
	8917	+ LA.xformPos(eye, this.fromParent, eye);
	8918	+ LA.xformDir(dir, this.fromParent, dir);
	8919	+
	8920	+ ray.eyePoint.x = eye.x;
	8921	+ ray.eyePoint.y = eye.y;
	8922	+ ray.eyePoint.z = eye.z;
	8923	+
	8924	+ ray.viewDirection.x = dir.x;
	8925	+ ray.viewDirection.y = dir.y;
	8926	+ ray.viewDirection.z = dir.z;
	8927	+ }
	8928	+
	8929	+ boolean success = false;
	8930	+
	8931	+ boolean touch = false;
	8932	+
	8933	+ if (bRep != null && Link2Support())
	8934	+ {
	8935	+ if (bbox == null)
	8936	+ {
	8937	+ bbox = new BBox();
	8938	+
	8939	+ cVector min = new cVector();
	8940	+ cVector max = new cVector();
	8941	+
	8942	+ this.getBounds(min, max, true);
	8943	+
	8944	+ bbox.min.x = min.x;
	8945	+ bbox.min.y = min.y;
	8946	+ bbox.min.z = min.z;
	8947	+
	8948	+ bbox.max.x = max.x;
	8949	+ bbox.max.y = max.y;
	8950	+ bbox.max.z = max.z;
	8951	+ }
	8952	+
	8953	+ if (true) // NOT WORKING bbox.intersect(ray, result))
	8954	+ {
	8955	+ success \|= intersectMesh(ray, result);
	8956	+ }
	8957	+ else
	8958	+ {
	8959	+ //this.hide = true;
	8960	+ touch = true;
	8961	+ }
	8962	+ }
	8963	+
	8964	+ for (int i=0; i<size(); i++)
	8965	+ {
	8966	+ Object3D child = (Object3D) reserve(i);
	8967	+
	8968	+ if (child == null)
	8969	+ continue;
	8970	+
	8971	+ success \|= child.intersect(ray, result);
	8972	+ release(i);
	8973	+ }
	8974	+
	8975	+ ray.eyePoint.x = eyex;
	8976	+ ray.eyePoint.y = eyey;
	8977	+ ray.eyePoint.z = eyez;
	8978	+
	8979	+ ray.viewDirection.x = dirx;
	8980	+ ray.viewDirection.y = diry;
	8981	+ ray.viewDirection.z = dirz;
	8982	+
	8983	+// if (touch)
	8984	+// this.Touch(); // refresh display list
	8985	+
	8986	+ return success;
	8987	+ }
	8988	+
	8989	+ static Vector3d edge1 = new Vector3d();
	8990	+ static Vector3d edge2 = new Vector3d();
	8991	+ static Vector3d P = new Vector3d();
	8992	+ static Vector3d T = new Vector3d();
	8993	+ static Vector3d Q = new Vector3d();
	8994	+
	8995	+ private boolean intersectTriangle(Ray ray, IntersectResult result, Vertex v1, Vertex v2, Vertex v3)
	8996	+ {
	8997	+ if (false)
	8998	+ {
	8999	+ result.t = 0;
	9000	+ return true;
	9001	+ }
	9002	+
	9003	+ /*
	9004	+ Fast, Minimum Storage Ray/Triangle Intersection, Moller et al.
	9005	+
	9006	+ Reference: http://www.cs.virginia.edu/~gfx/Courses/2003/ImageSynthesis/papers/Acceleration/Fast%20MinimumStorage%20RayTriangle%20Intersection.pdf
	9007	+ */
	9008	+
	9009	+ // Calculate edges of the triangle
	9010	+ edge1.set(v2.x - v1.x, v2.y - v1.y, v2.z - v1.z);
	9011	+ edge2.set(v3.x - v1.x, v3.y - v1.y, v3.z - v1.z);
	9012	+
	9013	+ // Calculate the determinant (U parameter)
	9014	+ P.cross(ray.viewDirection, edge2);
	9015	+ double det = edge1.dot(P);
	9016	+
	9017	+ if (det > -1e-9 && det < 1e-9)
	9018	+ {
	9019	+ return false;
	9020	+ } // Ray lies in plane of triangle
	9021	+
	9022	+ double invDet = 1 / det;
	9023	+
	9024	+ // Calculate distance from vertex1 to ray origin
	9025	+ T.set(ray.eyePoint.x - v1.x, ray.eyePoint.y - v1.y, ray.eyePoint.z - v1.z);
	9026	+
	9027	+ double U = (T.dot(P)) * invDet; // Calculate U parameter
	9028	+
	9029	+ if (U < 0.f \|\| U > 1.f)
	9030	+ {
	9031	+ return false;
	9032	+ } // Intersection lies outside of the triangle
	9033	+
	9034	+ // Calculate V parameter
	9035	+ Q.cross(T, edge1);
	9036	+
	9037	+ double V = ray.viewDirection.dot(Q) * invDet;
	9038	+
	9039	+ if (V < 0.f \|\| (U + V) > 1.f)
	9040	+ {
	9041	+ return false;
	9042	+ } // Intersection lies outside of the triangle
	9043	+
	9044	+ double t = edge2.dot(Q) * invDet;
	9045	+
	9046	+ if (t > 1e-9) // Triangle and ray intersects
	9047	+ {
	9048	+ //result.isIntersected = true;
	9049	+ //result.id = id;
	9050	+
	9051	+ if (false) // isShadow)
	9052	+ {
	9053	+ result.t = t;
	9054	+ return true;
	9055	+ } else if (t < result.t)
	9056	+ {
	9057	+ result.object = this;
	9058	+
	9059	+ result.t = t;
	9060	+
	9061	+ //result.p.x = ray.eyePoint.x + ray.viewDirection.x * t;
	9062	+ //result.p.y = ray.eyePoint.y + ray.viewDirection.y * t;
	9063	+ //result.p.z = ray.eyePoint.z + ray.viewDirection.z * t;
	9064	+
	9065	+ result.n.cross(edge1, edge2);
	9066	+ result.n.normalize();
	9067	+ }
	9068	+
	9069	+ return true;
	9070	+ }
	9071	+
	9072	+ return false;
	9073	+ }
8765	9074
8766	9075	public int Size()
8767	9076	{