Normand Briere
2019-10-01 65bdec7ae2c99ca2102c55f92bd62b48c9f14847
Object3D.java
....@@ -41,6 +41,8 @@
4141
4242 java.util.Hashtable<java.util.UUID, Object3D> versiontable; // = new java.util.Hashtable<java.util.UUID, Object3D>();
4343
44
+ int tabIndex;
45
+
4446 ScriptNode scriptnode;
4547
4648 void deepCopyNode(Object3D other)
....@@ -100,7 +102,7 @@
100102 other.softtouched = softtouched;
101103
102104 other.random = random;
103
- other.link2master = link2master;
105
+ other.link2master = Link2Support();
104106 other.transformcount = transformcount;
105107 other.marked = marked;
106108 other.skip = skip;
....@@ -140,7 +142,7 @@
140142 projectedVertices[i] = new cVector2(); // Others
141143 }
142144 projectedVertices[0].x = 100; // bump
143
- projectedVertices[1].y = 5000; // punchthrough. only for png
145
+ projectedVertices[1].y = 1000; // punchthrough. only for png
144146 }
145147
146148 void MinMax(cVector minima, cVector maxima)
....@@ -220,7 +222,7 @@
220222 return;
221223
222224 transientsupport = support;
223
- transientlink2master = link2master;
225
+ transientlink2master = Link2Support();
224226
225227 support = null;
226228 link2master = false;
....@@ -633,7 +635,10 @@
633635 transient boolean keepdontselect;
634636 boolean dontselect = false;
635637 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
+
637642 boolean marked = false; // animation node
638643 boolean skip = false; // centroid issue
639644 boolean skipmocap = false; // mocap data
....@@ -641,6 +646,9 @@
641646 boolean random = false;
642647 boolean speedup = false;
643648 boolean rewind = false;
649
+
650
+ // Option to sort triangles, e.g. for transparency.
651
+ boolean sort = false;
644652
645653 float NORMALPUSH = 0;
646654
....@@ -659,7 +667,7 @@
659667 {
660668 sorted = true;
661669
662
- for (int i=0; i<size()-1; i++)
670
+ for (int i=0; i<Size()-1; i++)
663671 {
664672 Object3D obji = get(i);
665673 Object3D objj = get(i+1);
....@@ -683,7 +691,7 @@
683691 {
684692 sorted = true;
685693
686
- for (int i=0; i<size()-1; i++)
694
+ for (int i=0; i<Size()-1; i++)
687695 {
688696 Object3D obji = get(i);
689697 Object3D objj = get(i+1);
....@@ -1020,7 +1028,7 @@
10201028
10211029 void Step()
10221030 {
1023
- // marde pour serialization de Texture
1031
+ // patch pour serialization de Texture
10241032 resetmaxcount();
10251033 resettransformcount();
10261034 resetstep();
....@@ -1213,24 +1221,28 @@
12131221 {
12141222 // return true;
12151223
1216
- if (material == null || material.multiply)
1217
- return true;
1224
+// if (material == null || material.multiply)
1225
+// return true;
1226
+//
1227
+// if (projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
1228
+// return false;
1229
+//
1230
+// // Transparent objects are dynamic because we have to sort the triangles.
1231
+// return material.opacity > 0.99;
12181232
1219
- if (projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
1220
- return false;
1221
-
1222
- // Transparent objects are dynamic because we have to sort the triangles.
1223
- return material.opacity > 0.99;
1233
+ return !sort;
12241234 }
12251235
12261236 boolean IsOpaque()
12271237 {
12281238 // return true;
12291239
1230
- if (material == null || material.multiply)
1231
- return true;
1240
+// if (material == null || material.multiply)
1241
+// return true;
1242
+//
1243
+// return material.opacity > 0.99;
12321244
1233
- return material.opacity > 0.99;
1245
+ return !sort;
12341246 }
12351247
12361248 Object3D()
....@@ -4041,6 +4053,7 @@
40414053
40424054 void RevertMeshes()
40434055 {
4056
+ // BLOCKLOOP
40444057 if (this instanceof cMesh)
40454058 {
40464059 ((cMesh)this).Revert();
....@@ -4071,11 +4084,6 @@
40714084 Touch();
40724085 }
40734086
4074
- ResetRecur();
4075
- }
4076
-
4077
- void ResetRecur()
4078
- {
40794087 for (int i = 0; i < size(); i++)
40804088 {
40814089 Object3D child = (Object3D) get(i); // reserve(i);
....@@ -4098,11 +4106,6 @@
40984106 Step();
40994107 Touch();
41004108
4101
- StepRecur();
4102
- }
4103
-
4104
- void StepRecur()
4105
- {
41064109 for (int i = 0; i < size(); i++)
41074110 {
41084111 Object3D child = (Object3D) get(i); // reserve(i);
....@@ -4289,8 +4292,8 @@
42894292 Touch();
42904293 }
42914294
4292
- transient cVector min = new cVector();
4293
- transient cVector max = new cVector();
4295
+ transient cVector min;
4296
+ transient cVector max;
42944297
42954298 void getBounds(cVector minima, cVector maxima, boolean xform)
42964299 {
....@@ -4306,7 +4309,7 @@
43064309 if (blockloop)
43074310 return;
43084311
4309
- if (min == null) // ???
4312
+ if (min == null)
43104313 {
43114314 min = new cVector();
43124315 max = new cVector();
....@@ -4347,7 +4350,7 @@
43474350
43484351 if (bRep != null)
43494352 {
4350
- bRep.getBounds(minima,maxima,this);
4353
+ bRep.getBounds(minima, maxima, xform?this:null);
43514354 }
43524355
43534356 if (false) // xform)
....@@ -6156,7 +6159,7 @@
61566159 boolean NeedSupport()
61576160 {
61586161 return
6159
- 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
61606163 // PROBLEM with CROWD!!
61616164 && (Globals.DrawMode() == iCameraPane.SHADOW || !Globals.RENDERSHADOW || Globals.CROWD);
61626165 }
....@@ -6179,6 +6182,15 @@
61796182 return live && bRep != null;
61806183 }
61816184
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
+
61826194 void Draw(iCameraPane display, Object3D /*Composite*/ root, boolean selected, boolean blocked)
61836195 {
61846196 Invariants(); // june 2013
....@@ -6186,6 +6198,29 @@
61866198 if (support != null)
61876199 {
61886200 // 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
+ }
61896224 }
61906225
61916226 if (display.DrawMode() == iCameraPane.SELECTION &&
....@@ -6240,7 +6275,7 @@
62406275 support = support;
62416276
62426277 boolean usecalllists = !IsDynamic() &&
6243
- 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);
62446279 //boolean usecalllists = false; //!IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT || support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
62456280
62466281 //usecalllists &= display.DrawMode() == display.DEFAULT; // Don't compute list in shadow pass.
....@@ -6251,7 +6286,8 @@
62516286 bRep.displaylist = 0;
62526287 }
62536288 // usecalllists &= !(parent instanceof RandomNode);
6254
- // usecalllists = false;
6289
+ if (CameraPane.BOXMODE) // Too dynamic
6290
+ usecalllists = false;
62556291
62566292 if (display.DrawMode() == display.SHADOW)
62576293 //GetBRep() != null)
....@@ -6307,8 +6343,8 @@
63076343 Globals.lighttouched = true; // all panes...
63086344 }
63096345
6310
- touched = GetBRep() == null; // this instanceof Composite || this instanceof FileObject; // false;
6311
- //touched = false;
6346
+ //touched = GetBRep() == null; // this instanceof Composite || this instanceof FileObject; // false;
6347
+ touched = false;
63126348
63136349 if (this instanceof Texture || this instanceof TextureNode)
63146350 {
....@@ -6347,7 +6383,7 @@
63476383 {
63486384 if (display.DrawMode() == iCameraPane.SHADOW)
63496385 {
6350
- if (!link2master // tricky to cull in shadow mode.
6386
+ if (!Link2Support() // tricky to cull in shadow mode.
63516387 && GetBRep().FrustumCull(this, null, display.LightCamera(), true))
63526388 {
63536389 //System.out.print("CULLED");
....@@ -6455,6 +6491,7 @@
64556491 boolean failedPigment = false;
64566492 boolean failedBump = false;
64576493
6494
+ CameraPane.lastObject = this;
64586495 try
64596496 {
64606497 display.BindPigmentTexture(tex, texres);
....@@ -6819,7 +6856,7 @@
68196856
68206857 //javax.media.opengl.GL gl = display.GetGL();
68216858
6822
- if (CameraPane.BOXMODE && !selected) // || CameraPane.movingcamera)
6859
+ if (CameraPane.BOXMODE && !Link2Support()) //selected) // || CameraPane.movingcamera)
68236860 {
68246861 int fc = bRep.FaceCount();
68256862 int vc = bRep.VertexCount();
....@@ -6981,7 +7018,7 @@
69817018 facescompare[k] = new FaceCompare(k);
69827019 }
69837020
6984
- center = new cVector();
7021
+ centertriangle = new cVector();
69857022 }
69867023 else
69877024 {
....@@ -7104,7 +7141,7 @@
71047141 */
71057142 }
71067143
7107
- transient cVector center;
7144
+ transient cVector centertriangle;
71087145
71097146 class FaceCompare implements Comparable
71107147 {
....@@ -7133,14 +7170,14 @@
71337170 Vertex q = bRep.GetVertex(face.q);
71347171 Vertex r = bRep.GetVertex(face.r);
71357172
7136
- center.set(p);
7137
- center.add(q);
7138
- center.add(r);
7139
- center.mul(1.0/3);
7173
+ centertriangle.set(p);
7174
+ centertriangle.add(q);
7175
+ centertriangle.add(r);
7176
+ centertriangle.mul(1.0/3);
71407177
7141
- center.sub(Globals.theRenderer.EyeCamera().location);
7178
+ centertriangle.sub(Globals.theRenderer.EyeCamera().location);
71427179
7143
- distance = center.dot(center);
7180
+ distance = centertriangle.dot(centertriangle);
71447181 }
71457182
71467183 return distance;
....@@ -8323,7 +8360,7 @@
83238360
83248361 public int hashCode()
83258362 {
8326
- // Fuck Vector...
8363
+ // Do not use Vector...
83278364 return System.identityHashCode(this);
83288365 }
83298366
....@@ -8563,8 +8600,8 @@
85638600 private static cVector2 qq2 = new cVector2();
85648601 private static cVector2 rr2 = new cVector2();
85658602 private static cVector2 ss2 = new cVector2();
8566
- private static cVector edge1 = new cVector();
8567
- private static cVector edge2 = new cVector();
8603
+// private static cVector edge1 = new cVector();
8604
+// private static cVector edge2 = new cVector();
85688605 //private static cVector norm = new cVector();
85698606 /*transient private*/ int hitSomething;
85708607 static final int hitCenter = 1;
....@@ -8762,7 +8799,275 @@
87628799
87638800 Touch();
87648801 }
8802
+
8803
+ static Vertex s1 = new Vertex();
8804
+ static Vertex s2 = new Vertex();
8805
+ static Vertex s3 = new Vertex();
87658806
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
+ }
87669071
87679072 public int Size()
87689073 {