From 767be784dc7fe293bf5c5ee6507df242526be3ed Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Tue, 24 Sep 2019 02:10:06 -0400
Subject: [PATCH] Rag doll is back.

---
 Object3D.java |   60 ++++++++++++++++++++++++++++++++++++++++++++----------------
 1 files changed, 44 insertions(+), 16 deletions(-)

diff --git a/Object3D.java b/Object3D.java
index ba7e5c6..b4eaccb 100644
--- a/Object3D.java
+++ b/Object3D.java
@@ -1023,7 +1023,7 @@
     
     void Step()
     {
-        // marde pour serialization de Texture
+        // patch pour serialization de Texture
         resetmaxcount();
         resettransformcount();
         resetstep();
@@ -4101,11 +4101,6 @@
         Step();
         Touch();
         
-        StepRecur();
-    }
-    
-    void StepRecur()
-    {
         for (int i = 0; i < size(); i++)
         {
             Object3D child = (Object3D) get(i); // reserve(i);
@@ -6182,6 +6177,10 @@
         return live && bRep != null;
     }
     
+    static cVector minima = new cVector();
+    static cVector maxima = new cVector();
+    static javax.vecmath.Point3d center = new javax.vecmath.Point3d();
+    
     void Draw(iCameraPane display, Object3D /*Composite*/ root, boolean selected, boolean blocked)
     {
         Invariants(); // june 2013
@@ -6189,6 +6188,29 @@
         if (support != null)
         {
         //    System.err.println("Draw " + this + " Frame # " + ((Mocap)((Merge)support).object).frame);
+        }
+        
+        if (live && link2master && support == null && !this.marked) // project on ground
+        {
+            getBounds(minima, maxima, true);
+            center.x = (minima.x + maxima.x) / 2;
+            center.y = 10000; // (minima.y + maxima.y) / 2;
+            center.z = (minima.z + maxima.z) / 2;
+
+            Ray ray = new Ray(center, new Vector3d(0,-1,0));
+
+            IntersectResult res = new IntersectResult();
+            res.t = Double.POSITIVE_INFINITY;
+
+            if (Grafreed.grafreed.universe.intersect(ray, res))
+            {
+                double resx = ray.eyePoint.x + ray.viewDirection.x * res.t;
+                double resy = ray.eyePoint.y + ray.viewDirection.y * res.t;
+                double resz = ray.eyePoint.z + ray.viewDirection.z * res.t;
+                
+                LA.matTranslate(toParent, 0, resy - minima.y, 0);
+                LA.matInvert(toParent, fromParent);
+            }
         }
         
         if (display.DrawMode() == iCameraPane.SELECTION &&
@@ -6985,7 +7007,7 @@
                         facescompare[k] = new FaceCompare(k);
                     }
                     
-                    center = new cVector();
+                    centertriangle = new cVector();
                 }
                 else
                 {
@@ -7108,7 +7130,7 @@
          */
     }
 
-    transient cVector center;
+    transient cVector centertriangle;
     
     class FaceCompare implements Comparable
     {
@@ -7137,14 +7159,14 @@
                 Vertex q = bRep.GetVertex(face.q);
                 Vertex r = bRep.GetVertex(face.r);
 
-                center.set(p);
-                center.add(q);
-                center.add(r);
-                center.mul(1.0/3);
+                centertriangle.set(p);
+                centertriangle.add(q);
+                centertriangle.add(r);
+                centertriangle.mul(1.0/3);
                 
-                center.sub(Globals.theRenderer.EyeCamera().location);
+                centertriangle.sub(Globals.theRenderer.EyeCamera().location);
                 
-                distance = center.dot(center);
+                distance = centertriangle.dot(centertriangle);
             }
             
             return distance;
@@ -8903,7 +8925,7 @@
                 cVector min = new cVector();
                 cVector max = new cVector();
                 
-                this.getBounds(min, max, false);
+                this.getBounds(min, max, true);
                 
                 bbox.min.x = min.x;
                 bbox.min.y = min.y;
@@ -8914,7 +8936,7 @@
                 bbox.max.z = max.z;
             }
             
-            if (bbox.intersect(ray, result))
+            if (true) // NOT WORKING bbox.intersect(ray, result))
             {
                 success |= intersectMesh(ray, result);
             }
@@ -8958,6 +8980,12 @@
     
     private boolean intersectTriangle(Ray ray, IntersectResult result, Vertex v1, Vertex v2, Vertex v3)
     {
+        if (false)
+        {
+            result.t = 0;
+            return true;
+        }
+        
         /*
         Fast, Minimum Storage Ray/Triangle Intersection, Moller et al.
         

--
Gitblit v1.6.2