~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	+ int tabIndex;
	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;
..	..	@@ -220,7 +222,7 @@
220	222	return;
221	223
222	224	transientsupport = support;
223		- transientlink2master = link2master;
	225	+ transientlink2master = Link2Support();
224	226
225	227	support = null;
226	228	link2master = false;
..	..	@@ -633,7 +635,10 @@
633	635	transient boolean keepdontselect;
634	636	boolean dontselect = false;
635	637	boolean hide = false;
636		- 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	+
637	642	boolean marked = false; // animation node
638	643	boolean skip = false; // centroid issue
639	644	boolean skipmocap = false; // mocap data
..	..	@@ -662,7 +667,7 @@
662	667	{
663	668	sorted = true;
664	669
665		- for (int i=0; i<size()-1; i++)
	670	+ for (int i=0; i<Size()-1; i++)
666	671	{
667	672	Object3D obji = get(i);
668	673	Object3D objj = get(i+1);
..	..	@@ -686,7 +691,7 @@
686	691	{
687	692	sorted = true;
688	693
689		- for (int i=0; i<size()-1; i++)
	694	+ for (int i=0; i<Size()-1; i++)
690	695	{
691	696	Object3D obji = get(i);
692	697	Object3D objj = get(i+1);
..	..	@@ -1023,7 +1028,7 @@
1023	1028
1024	1029	void Step()
1025	1030	{
1026		- // marde pour serialization de Texture
	1031	+ // patch pour serialization de Texture
1027	1032	resetmaxcount();
1028	1033	resettransformcount();
1029	1034	resetstep();
..	..	@@ -4048,6 +4053,7 @@
4048	4053
4049	4054	void RevertMeshes()
4050	4055	{
	4056	+ // BLOCKLOOP
4051	4057	if (this instanceof cMesh)
4052	4058	{
4053	4059	((cMesh)this).Revert();
..	..	@@ -4078,11 +4084,6 @@
4078	4084	Touch();
4079	4085	}
4080	4086
4081		- ResetRecur();
4082		- }
4083		-
4084		- void ResetRecur()
4085		- {
4086	4087	for (int i = 0; i < size(); i++)
4087	4088	{
4088	4089	Object3D child = (Object3D) get(i); // reserve(i);
..	..	@@ -4105,11 +4106,6 @@
4105	4106	Step();
4106	4107	Touch();
4107	4108
4108		- StepRecur();
4109		- }
4110		-
4111		- void StepRecur()
4112		- {
4113	4109	for (int i = 0; i < size(); i++)
4114	4110	{
4115	4111	Object3D child = (Object3D) get(i); // reserve(i);
..	..	@@ -4296,8 +4292,8 @@
4296	4292	Touch();
4297	4293	}
4298	4294
4299		- transient cVector min = new cVector();
4300		- transient cVector max = new cVector();
	4295	+ transient cVector min;
	4296	+ transient cVector max;
4301	4297
4302	4298	void getBounds(cVector minima, cVector maxima, boolean xform)
4303	4299	{
..	..	@@ -4313,7 +4309,7 @@
4313	4309	if (blockloop)
4314	4310	return;
4315	4311
4316		- if (min == null) // ???
	4312	+ if (min == null)
4317	4313	{
4318	4314	min = new cVector();
4319	4315	max = new cVector();
..	..	@@ -4354,7 +4350,7 @@
4354	4350
4355	4351	if (bRep != null)
4356	4352	{
4357		- bRep.getBounds(minima,maxima,this);
	4353	+ bRep.getBounds(minima, maxima, xform?this:null);
4358	4354	}
4359	4355
4360	4356	if (false) // xform)
..	..	@@ -6163,7 +6159,7 @@
6163	6159	boolean NeedSupport()
6164	6160	{
6165	6161	return
6166		- CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| (!Globals.FREEZEONMOVE && Globals.isLIVE())) && link2master && /live &&/ support != null
	6162	+ CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| (!Globals.FREEZEONMOVE && Globals.isLIVE())) && Link2Support() && /live &&/ support != null
6167	6163	// PROBLEM with CROWD!!
6168	6164	&& (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| Globals.CROWD);
6169	6165	}
..	..	@@ -6186,6 +6182,15 @@
6186	6182	return live && bRep != null;
6187	6183	}
6188	6184
	6185	+ boolean Link2Support()
	6186	+ {
	6187	+ return link2master \|\| link2support;
	6188	+ }
	6189	+
	6190	+ static cVector minima = new cVector();
	6191	+ static cVector maxima = new cVector();
	6192	+ static javax.vecmath.Point3d center = new javax.vecmath.Point3d();
	6193	+
6189	6194	void Draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
6190	6195	{
6191	6196	Invariants(); // june 2013
..	..	@@ -6193,6 +6198,29 @@
6193	6198	if (support != null)
6194	6199	{
6195	6200	// System.err.println("Draw " + this + " Frame # " + ((Mocap)((Merge)support).object).frame);
	6201	+ }
	6202	+
	6203	+ if (false) // live && Link2Support() && support == null && !this.marked) // project on ground
	6204	+ {
	6205	+ getBounds(minima, maxima, true);
	6206	+ center.x = (minima.x + maxima.x) / 2;
	6207	+ center.y = 10000; // (minima.y + maxima.y) / 2;
	6208	+ center.z = (minima.z + maxima.z) / 2;
	6209	+
	6210	+ Ray ray = new Ray(center, new Vector3d(0,-1,0));
	6211	+
	6212	+ IntersectResult res = new IntersectResult();
	6213	+ res.t = Double.POSITIVE_INFINITY;
	6214	+
	6215	+ if (Grafreed.grafreed.universe.intersect(ray, res))
	6216	+ {
	6217	+ double resx = ray.eyePoint.x + ray.viewDirection.x * res.t;
	6218	+ double resy = ray.eyePoint.y + ray.viewDirection.y * res.t;
	6219	+ double resz = ray.eyePoint.z + ray.viewDirection.z * res.t;
	6220	+
	6221	+ LA.matTranslate(toParent, 0, resy - minima.y, 0);
	6222	+ LA.matInvert(toParent, fromParent);
	6223	+ }
6196	6224	}
6197	6225
6198	6226	if (display.DrawMode() == iCameraPane.SELECTION &&
..	..	@@ -6247,7 +6275,7 @@
6247	6275	support = support;
6248	6276
6249	6277	boolean usecalllists = !IsDynamic() &&
6250		- IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	6278	+ IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !Link2Support()); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
6251	6279	//boolean usecalllists = false; //!IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
6252	6280
6253	6281	//usecalllists &= display.DrawMode() == display.DEFAULT; // Don't compute list in shadow pass.
..	..	@@ -6258,7 +6286,8 @@
6258	6286	bRep.displaylist = 0;
6259	6287	}
6260	6288	// usecalllists &= !(parent instanceof RandomNode);
6261		- // usecalllists = false;
	6289	+ if (CameraPane.BOXMODE) // Too dynamic
	6290	+ usecalllists = false;
6262	6291
6263	6292	if (display.DrawMode() == display.SHADOW)
6264	6293	//GetBRep() != null)
..	..	@@ -6354,7 +6383,7 @@
6354	6383	{
6355	6384	if (display.DrawMode() == iCameraPane.SHADOW)
6356	6385	{
6357		- if (!link2master // tricky to cull in shadow mode.
	6386	+ if (!Link2Support() // tricky to cull in shadow mode.
6358	6387	&& GetBRep().FrustumCull(this, null, display.LightCamera(), true))
6359	6388	{
6360	6389	//System.out.print("CULLED");
..	..	@@ -6827,7 +6856,7 @@
6827	6856
6828	6857	//javax.media.opengl.GL gl = display.GetGL();
6829	6858
6830		- if (CameraPane.BOXMODE && !selected) // \|\| CameraPane.movingcamera)
	6859	+ if (CameraPane.BOXMODE && !Link2Support()) //selected) // \|\| CameraPane.movingcamera)
6831	6860	{
6832	6861	int fc = bRep.FaceCount();
6833	6862	int vc = bRep.VertexCount();
..	..	@@ -6989,7 +7018,7 @@
6989	7018	facescompare[k] = new FaceCompare(k);
6990	7019	}
6991	7020
6992		- center = new cVector();
	7021	+ centertriangle = new cVector();
6993	7022	}
6994	7023	else
6995	7024	{
..	..	@@ -7112,7 +7141,7 @@
7112	7141	*/
7113	7142	}
7114	7143
7115		- transient cVector center;
	7144	+ transient cVector centertriangle;
7116	7145
7117	7146	class FaceCompare implements Comparable
7118	7147	{
..	..	@@ -7141,14 +7170,14 @@
7141	7170	Vertex q = bRep.GetVertex(face.q);
7142	7171	Vertex r = bRep.GetVertex(face.r);
7143	7172
7144		- center.set(p);
7145		- center.add(q);
7146		- center.add(r);
7147		- center.mul(1.0/3);
	7173	+ centertriangle.set(p);
	7174	+ centertriangle.add(q);
	7175	+ centertriangle.add(r);
	7176	+ centertriangle.mul(1.0/3);
7148	7177
7149		- center.sub(Globals.theRenderer.EyeCamera().location);
	7178	+ centertriangle.sub(Globals.theRenderer.EyeCamera().location);
7150	7179
7151		- distance = center.dot(center);
	7180	+ distance = centertriangle.dot(centertriangle);
7152	7181	}
7153	7182
7154	7183	return distance;
..	..	@@ -8331,7 +8360,7 @@
8331	8360
8332	8361	public int hashCode()
8333	8362	{
8334		- // Fuck Vector...
	8363	+ // Do not use Vector...
8335	8364	return System.identityHashCode(this);
8336	8365	}
8337	8366
..	..	@@ -8571,8 +8600,8 @@
8571	8600	private static cVector2 qq2 = new cVector2();
8572	8601	private static cVector2 rr2 = new cVector2();
8573	8602	private static cVector2 ss2 = new cVector2();
8574		- private static cVector edge1 = new cVector();
8575		- private static cVector edge2 = new cVector();
	8603	+// private static cVector edge1 = new cVector();
	8604	+// private static cVector edge2 = new cVector();
8576	8605	//private static cVector norm = new cVector();
8577	8606	/transient private/ int hitSomething;
8578	8607	static final int hitCenter = 1;
..	..	@@ -8770,7 +8799,275 @@
8770	8799
8771	8800	Touch();
8772	8801	}
	8802	+
	8803	+ static Vertex s1 = new Vertex();
	8804	+ static Vertex s2 = new Vertex();
	8805	+ static Vertex s3 = new Vertex();
8773	8806
	8807	+ boolean intersectMesh(Ray ray, IntersectResult result)
	8808	+ {
	8809	+ boolean success = false;
	8810	+
	8811	+ if (bRep.stripified)
	8812	+ {
	8813	+ int[] strips = bRep.getRawIndices();
	8814	+
	8815	+ // TRIANGLE STRIP ARRAY
	8816	+ if (bRep.trimmed)
	8817	+ {
	8818	+ float[] v = bRep.getRawVertices();
	8819	+
	8820	+ int count3 = 0;
	8821	+
	8822	+ if (v.length > 0)
	8823	+ {
	8824	+ for (int i = 0; i < strips.length; i++)
	8825	+ {
	8826	+ s1.set(v[count3], v[count3 + 1], v[count3 + 2]);
	8827	+ count3 += 3;
	8828	+
	8829	+ s2.set(v[count3], v[count3 + 1], v[count3 + 2]);
	8830	+ count3 += 3;
	8831	+
	8832	+ for (int j = 0; j < strips[i] - 2; j++)
	8833	+ {
	8834	+ s3.set(v[count3], v[count3 + 1], v[count3 + 2]);
	8835	+ count3 += 3;
	8836	+
	8837	+ if (j%2 == 0)
	8838	+ success \|= intersectTriangle(ray, result, s1, s2, s3);
	8839	+ else
	8840	+ success \|= intersectTriangle(ray, result, s1, s3, s2);
	8841	+
	8842	+ s1.set(s2);
	8843	+ s2.set(s3);
	8844	+ }
	8845	+ }
	8846	+ }
	8847	+
	8848	+ assert count3 == v.length;
	8849	+ }
	8850	+ else // !trimmed
	8851	+ {
	8852	+ int count = 0;
	8853	+ for (int i = 0; i < strips.length; i++)
	8854	+ {
	8855	+ Vertex p = bRep.GetVertex(bRep.indices[count++]);
	8856	+ Vertex q = bRep.GetVertex(bRep.indices[count++]);
	8857	+
	8858	+ for (int j = 0; j < strips[i] - 2; j++)
	8859	+ {
	8860	+ Vertex r = bRep.GetVertex(bRep.indices[count++]);
	8861	+
	8862	+ if (j%2 == 0)
	8863	+ success \|= intersectTriangle(ray, result, p, q, r);
	8864	+ else
	8865	+ success \|= intersectTriangle(ray, result, p, r, q);
	8866	+
	8867	+ p = q;
	8868	+ q = r;
	8869	+ }
	8870	+ }
	8871	+ }
	8872	+ } else // catch (Error e)
	8873	+ {
	8874	+ int facecount = bRep.FaceCount();
	8875	+ for (int i = 0; i < facecount; i++)
	8876	+ {
	8877	+ Face face = bRep.GetFace(i);
	8878	+
	8879	+ Vertex p = bRep.GetVertex(face.p);
	8880	+ Vertex q = bRep.GetVertex(face.q);
	8881	+ Vertex r = bRep.GetVertex(face.r);
	8882	+
	8883	+ success \|= intersectTriangle(ray, result, p, q, r);
	8884	+ }
	8885	+ }
	8886	+
	8887	+ return success;
	8888	+ }
	8889	+
	8890	+ static cVector eye = new cVector();
	8891	+ static cVector dir = new cVector();
	8892	+
	8893	+ transient BBox bbox = null;
	8894	+
	8895	+ boolean intersect(Ray ray, IntersectResult result)
	8896	+ {
	8897	+ double eyex = ray.eyePoint.x;
	8898	+ double eyey = ray.eyePoint.y;
	8899	+ double eyez = ray.eyePoint.z;
	8900	+
	8901	+ double dirx = ray.viewDirection.x;
	8902	+ double diry = ray.viewDirection.y;
	8903	+ double dirz = ray.viewDirection.z;
	8904	+
	8905	+ if (this.fromParent != null && !(this instanceof TextureNode))
	8906	+ {
	8907	+ eye.x = eyex;
	8908	+ eye.y = eyey;
	8909	+ eye.z = eyez;
	8910	+ dir.x = dirx;
	8911	+ dir.y = diry;
	8912	+ dir.z = dirz;
	8913	+
	8914	+ LA.xformPos(eye, this.fromParent, eye);
	8915	+ LA.xformDir(dir, this.fromParent, dir);
	8916	+
	8917	+ ray.eyePoint.x = eye.x;
	8918	+ ray.eyePoint.y = eye.y;
	8919	+ ray.eyePoint.z = eye.z;
	8920	+
	8921	+ ray.viewDirection.x = dir.x;
	8922	+ ray.viewDirection.y = dir.y;
	8923	+ ray.viewDirection.z = dir.z;
	8924	+ }
	8925	+
	8926	+ boolean success = false;
	8927	+
	8928	+ boolean touch = false;
	8929	+
	8930	+ if (bRep != null && Link2Support())
	8931	+ {
	8932	+ if (bbox == null)
	8933	+ {
	8934	+ bbox = new BBox();
	8935	+
	8936	+ cVector min = new cVector();
	8937	+ cVector max = new cVector();
	8938	+
	8939	+ this.getBounds(min, max, true);
	8940	+
	8941	+ bbox.min.x = min.x;
	8942	+ bbox.min.y = min.y;
	8943	+ bbox.min.z = min.z;
	8944	+
	8945	+ bbox.max.x = max.x;
	8946	+ bbox.max.y = max.y;
	8947	+ bbox.max.z = max.z;
	8948	+ }
	8949	+
	8950	+ if (true) // NOT WORKING bbox.intersect(ray, result))
	8951	+ {
	8952	+ success \|= intersectMesh(ray, result);
	8953	+ }
	8954	+ else
	8955	+ {
	8956	+ //this.hide = true;
	8957	+ touch = true;
	8958	+ }
	8959	+ }
	8960	+
	8961	+ for (int i=0; i<size(); i++)
	8962	+ {
	8963	+ Object3D child = (Object3D) reserve(i);
	8964	+
	8965	+ if (child == null)
	8966	+ continue;
	8967	+
	8968	+ success \|= child.intersect(ray, result);
	8969	+ release(i);
	8970	+ }
	8971	+
	8972	+ ray.eyePoint.x = eyex;
	8973	+ ray.eyePoint.y = eyey;
	8974	+ ray.eyePoint.z = eyez;
	8975	+
	8976	+ ray.viewDirection.x = dirx;
	8977	+ ray.viewDirection.y = diry;
	8978	+ ray.viewDirection.z = dirz;
	8979	+
	8980	+// if (touch)
	8981	+// this.Touch(); // refresh display list
	8982	+
	8983	+ return success;
	8984	+ }
	8985	+
	8986	+ static Vector3d edge1 = new Vector3d();
	8987	+ static Vector3d edge2 = new Vector3d();
	8988	+ static Vector3d P = new Vector3d();
	8989	+ static Vector3d T = new Vector3d();
	8990	+ static Vector3d Q = new Vector3d();
	8991	+
	8992	+ private boolean intersectTriangle(Ray ray, IntersectResult result, Vertex v1, Vertex v2, Vertex v3)
	8993	+ {
	8994	+ if (false)
	8995	+ {
	8996	+ result.t = 0;
	8997	+ return true;
	8998	+ }
	8999	+
	9000	+ /*
	9001	+ Fast, Minimum Storage Ray/Triangle Intersection, Moller et al.
	9002	+
	9003	+ Reference: http://www.cs.virginia.edu/~gfx/Courses/2003/ImageSynthesis/papers/Acceleration/Fast%20MinimumStorage%20RayTriangle%20Intersection.pdf
	9004	+ */
	9005	+
	9006	+ // Calculate edges of the triangle
	9007	+ edge1.set(v2.x - v1.x, v2.y - v1.y, v2.z - v1.z);
	9008	+ edge2.set(v3.x - v1.x, v3.y - v1.y, v3.z - v1.z);
	9009	+
	9010	+ // Calculate the determinant (U parameter)
	9011	+ P.cross(ray.viewDirection, edge2);
	9012	+ double det = edge1.dot(P);
	9013	+
	9014	+ if (det > -1e-9 && det < 1e-9)
	9015	+ {
	9016	+ return false;
	9017	+ } // Ray lies in plane of triangle
	9018	+
	9019	+ double invDet = 1 / det;
	9020	+
	9021	+ // Calculate distance from vertex1 to ray origin
	9022	+ T.set(ray.eyePoint.x - v1.x, ray.eyePoint.y - v1.y, ray.eyePoint.z - v1.z);
	9023	+
	9024	+ double U = (T.dot(P)) * invDet; // Calculate U parameter
	9025	+
	9026	+ if (U < 0.f \|\| U > 1.f)
	9027	+ {
	9028	+ return false;
	9029	+ } // Intersection lies outside of the triangle
	9030	+
	9031	+ // Calculate V parameter
	9032	+ Q.cross(T, edge1);
	9033	+
	9034	+ double V = ray.viewDirection.dot(Q) * invDet;
	9035	+
	9036	+ if (V < 0.f \|\| (U + V) > 1.f)
	9037	+ {
	9038	+ return false;
	9039	+ } // Intersection lies outside of the triangle
	9040	+
	9041	+ double t = edge2.dot(Q) * invDet;
	9042	+
	9043	+ if (t > 1e-9) // Triangle and ray intersects
	9044	+ {
	9045	+ //result.isIntersected = true;
	9046	+ //result.id = id;
	9047	+
	9048	+ if (false) // isShadow)
	9049	+ {
	9050	+ result.t = t;
	9051	+ return true;
	9052	+ } else if (t < result.t)
	9053	+ {
	9054	+ result.object = this;
	9055	+
	9056	+ result.t = t;
	9057	+
	9058	+ //result.p.x = ray.eyePoint.x + ray.viewDirection.x * t;
	9059	+ //result.p.y = ray.eyePoint.y + ray.viewDirection.y * t;
	9060	+ //result.p.z = ray.eyePoint.z + ray.viewDirection.z * t;
	9061	+
	9062	+ result.n.cross(edge1, edge2);
	9063	+ result.n.normalize();
	9064	+ }
	9065	+
	9066	+ return true;
	9067	+ }
	9068	+
	9069	+ return false;
	9070	+ }
8774	9071
8775	9072	public int Size()
8776	9073	{