blame | history | patch | commit | commitdiff
Normand Briere
2019-06-21 15123b19e7bc8da2869429b07f0fbaa0598e945e 
 Object3D.java
....@@ -24,6 +24,11 @@
2424     
2525     private UUID uuid = UUID.randomUUID();
2626     
27
+    // TEMPORARY for mocap undo
28
+    mocap.reader.BVHReader.BVHResult bvh;
29
+    Object3D skeleton;
30
+    //
31
+    
2732     ScriptNode scriptnode;
2833 
2934         void InitOthers()
....@@ -104,117 +109,136 @@
104109     
105110 //    transient boolean reduced; // for morph reduction
106111     
107
-transient com.bulletphysics.linearmath.Transform cache; // for fast merge
108
-transient com.bulletphysics.linearmath.Transform cache_1; // for fast merge
112
+    transient com.bulletphysics.linearmath.Transform cache; // for fast merge
113
+    transient com.bulletphysics.linearmath.Transform cache_1; // for fast merge
109114 
110
-transient Object3D transientsupport; // for cloning
111
-transient boolean transientlink2master;
115
+    transient Object3D transientsupport; // for cloning
116
+    transient boolean transientlink2master;
112117 
113
-void SaveSupports()
114
-{
115
-    if (blockloop)
116
-        return;
118
+    void SaveSupports()
119
+    {
120
+        if (blockloop)
121
+            return;
117122 
118
-    transientsupport = support;
119
-    transientlink2master = link2master;
120
-    
121
-    support = null;
122
-    link2master = false;
123
-    
124
-    if (bRep != null)
125
-    {
126
-        bRep.SaveSupports();
127
-    }
128
-    
129
-    for (int i = 0; i < Size(); i++)
130
-    {
131
-        Object3D child = (Object3D) get(i);
132
-        if (child == null)
133
-            continue;
134
-        blockloop = true;
135
-        child.SaveSupports();
136
-        blockloop = false;
137
-    }
138
-}
123
+        transientsupport = support;
124
+        transientlink2master = link2master;
139125 
140
-void RestoreSupports()
141
-{
142
-    if (blockloop)
143
-        return;
126
+        support = null;
127
+        link2master = false;
144128 
145
-    support = transientsupport;
146
-    link2master = transientlink2master;
147
-    transientsupport = null;
148
-    transientlink2master = false;
149
-    
150
-    if (bRep != null)
151
-    {
152
-        bRep.RestoreSupports();
153
-    }
154
-    
155
-    for (int i = 0; i < Size(); i++)
156
-    {
157
-        Object3D child = (Object3D) get(i);
158
-        if (child == null)
159
-            continue;
160
-        blockloop = true;
161
-        child.RestoreSupports();
162
-        blockloop = false;
163
-    }
164
-}
129
+        if (bRep != null)
130
+        {
131
+            bRep.SaveSupports();
132
+        }
165133 
166
-void ExtractBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
167
-{
168
-    if (hashtable.containsKey(GetUUID()))
169
-        return;
170
-    
171
-    Object3D o = new Object3D();
172
-    o.bRep = this.bRep;
173
-    if (this.bRep != null)
174
-    {
175
-        o.transientrep = this.bRep.support;
176
-        o.bRep.support = null;
134
+        for (int i = 0; i < Size(); i++)
135
+        {
136
+            Object3D child = (Object3D) get(i);
137
+            if (child == null)
138
+                continue;
139
+            blockloop = true;
140
+            child.SaveSupports();
141
+            blockloop = false;
142
+        }
177143     }
178
-    
179
-//    o.support = this.support;
180
-//    o.fileparent = this.fileparent;
181
-//    if (this.bRep != null)
182
-//        o.bRep = this.bRep.support;
183
-    
184
-    hashtable.put(GetUUID(), o);
185
-    
186
-    this.bRep = null;
187
-//    if (this.bRep != null)
188
-//        this.bRep.support = null;
189
-//    this.support = null;
190
-//    this.fileparent = null;
191
-    
192
-    for (int i=0; i<Size(); i++)
193
-    {
194
-        get(i).ExtractBigData(hashtable);
195
-    }
196
-}
197144 
198
-void RestoreBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
199
-{
200
-    if (!hashtable.containsKey(GetUUID()))
201
-        return;
202
-    
203
-    Object3D o = hashtable.get(GetUUID());
204
-    
205
-    this.bRep = o.bRep;
206
-    if (this.bRep != null)
207
-        this.bRep.support = o.transientrep;
208
-//    this.support = o.support;
209
-//    this.fileparent = o.fileparent;
210
-    
211
-    hashtable.remove(GetUUID());
212
-    
213
-    for (int i=0; i<Size(); i++)
145
+    void RestoreSupports()
214146     {
215
-        get(i).RestoreBigData(hashtable);
147
+        if (blockloop)
148
+            return;
149
+
150
+        support = transientsupport;
151
+        link2master = transientlink2master;
152
+        transientsupport = null;
153
+        transientlink2master = false;
154
+
155
+        if (bRep != null)
156
+        {
157
+            bRep.RestoreSupports();
158
+        }
159
+
160
+        for (int i = 0; i < Size(); i++)
161
+        {
162
+            Object3D child = (Object3D) get(i);
163
+            if (child == null)
164
+                continue;
165
+            blockloop = true;
166
+            child.RestoreSupports();
167
+            blockloop = false;
168
+        }
216169     }
217
-}
170
+
171
+    void ExtractBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
172
+    {
173
+        if (hashtable.containsKey(GetUUID()))
174
+        {
175
+            Object3D o = hashtable.get(GetUUID());
176
+
177
+            Grafreed.Assert(this.bRep == o.bRep);
178
+            if (this.bRep != null)
179
+                assert(this.bRep.support == o.transientrep);
180
+
181
+            return;
182
+        }
183
+
184
+        Object3D o = new Object3D();
185
+
186
+        hashtable.put(GetUUID(), o);
187
+
188
+        for (int i=0; i<Size(); i++)
189
+        {
190
+            get(i).ExtractBigData(hashtable);
191
+        }
192
+        
193
+        ExtractBigData(o);
194
+    }
195
+
196
+    void ExtractBigData(Object3D o)
197
+    {
198
+        o.bRep = this.bRep;
199
+        if (this.bRep != null)
200
+        {
201
+            o.transientrep = this.bRep.support;
202
+            o.bRep.support = null;
203
+        }
204
+        
205
+        //    o.support = this.support;
206
+        //    o.fileparent = this.fileparent;
207
+        //    if (this.bRep != null)
208
+        //        o.bRep = this.bRep.support;
209
+        
210
+        this.bRep = null;
211
+    //    if (this.bRep != null)
212
+    //        this.bRep.support = null;
213
+    //    this.support = null;
214
+    //    this.fileparent = null;
215
+    }
216
+
217
+    void RestoreBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
218
+    {
219
+        if (!hashtable.containsKey(GetUUID()))
220
+            return;
221
+
222
+        Object3D o = hashtable.get(GetUUID());
223
+
224
+        RestoreBigData(o);
225
+
226
+        hashtable.remove(GetUUID());
227
+
228
+        for (int i=0; i<Size(); i++)
229
+        {
230
+            get(i).RestoreBigData(hashtable);
231
+        }
232
+    }
233
+
234
+    void RestoreBigData(Object3D o)
235
+    {
236
+        this.bRep = o.bRep;
237
+        if (this.bRep != null)
238
+            this.bRep.support = o.transientrep;
239
+    //    this.support = o.support;
240
+    //    this.fileparent = o.fileparent;
241
+    }
218242 
219243 // MOCAP SUPPORT
220244     double tx,ty,tz,rx,ry,rz;
....@@ -539,12 +563,14 @@
539563             toParent = LA.newMatrix();
540564             fromParent = LA.newMatrix();
541565         }
566
+        
542567         if (toParentMarked == null)
543568         {
544569             if (maxcount != 1)
545570             {
546571                 new Exception().printStackTrace();
547572             }
573
+            
548574             toParentMarked = LA.newMatrix();
549575             fromParentMarked = LA.newMatrix();
550576         }
....@@ -867,7 +893,8 @@
867893             
868894             boolean changedir = random && Math.random() < 0.01; // && !link2master;
869895 
870
-            if (transformcount*factor > maxcount || (step == 1 && changedir))
896
+            if (transformcount*factor >= maxcount && (rewind || random) ||
897
+                    (step == 1 && changedir))
871898             {
872899                 countdown = 1;
873900                 delay = speedup?8:1;
....@@ -2685,6 +2712,18 @@
26852712         //Touch();
26862713     }
26872714 
2715
+    void GenNormalsMeshS()
2716
+    {
2717
+        selection.GenNormalsMesh();
2718
+//        for (int i=0; i<selection.size(); i++)
2719
+//        {
2720
+//            Object3D selectee = (Object3D) selection.elementAt(i);
2721
+//            selectee.GenNormals(crease);
2722
+//        }
2723
+
2724
+        //Touch();
2725
+    }
2726
+
26882727     void ClearColorsS()
26892728     {
26902729         selection.ClearColors();
....@@ -2816,6 +2855,24 @@
28162855             if (child == null)
28172856                 continue;
28182857             child.GenNormals(crease);
2858
+//            Children().release(i);
2859
+        }
2860
+        blockloop = false;
2861
+    }
2862
+
2863
+    void GenNormalsMesh()
2864
+    {
2865
+        if (blockloop)
2866
+            return;
2867
+        
2868
+        blockloop = true;
2869
+        GenNormalsMesh0();
2870
+        for (int i = 0; i < Children().Size(); i++)
2871
+        {
2872
+            Object3D child = (Object3D) Children().get(i); // reserve(i);
2873
+            if (child == null)
2874
+                continue;
2875
+            child.GenNormalsMesh();
28192876 //            Children().release(i);
28202877         }
28212878         blockloop = false;
....@@ -2984,6 +3041,15 @@
29843041         if (bRep != null)
29853042         {
29863043             bRep.GenerateNormals(crease);
3044
+            Touch();
3045
+        }
3046
+    }
3047
+
3048
+    void GenNormalsMesh0()
3049
+    {
3050
+        if (bRep != null)
3051
+        {
3052
+            bRep.GenerateNormalsMesh();
29873053             Touch();
29883054         }
29893055     }
....@@ -3438,7 +3504,8 @@
34383504         if (blockloop)
34393505             return;
34403506         
3441
-        if (marked || (bRep != null && material != null)) // borderline...
3507
+        if (//marked || // does not make sense
3508
+                (bRep != null || material != null)) // borderline...
34423509             live = h;
34433510         
34443511         for (int i = 0; i < Size(); i++)
....@@ -3459,7 +3526,8 @@
34593526             return;
34603527         
34613528         //if (bRep != null)
3462
-        if (marked || (bRep != null && material != null)) // borderline...
3529
+        if (//marked || // does not make sense
3530
+                (bRep != null || material != null)) // borderline...
34633531             link2master = h;
34643532         
34653533         for (int i = 0; i < Size(); i++)
....@@ -3479,7 +3547,8 @@
34793547         if (blockloop)
34803548             return;
34813549         
3482
-        if (marked || (bRep != null && material != null)) // borderline...
3550
+        if (//marked || // does not make sense
3551
+                (bRep != null || material != null)) // borderline...
34833552             hide = h;
34843553         
34853554         for (int i = 0; i < Size(); i++)
....@@ -3499,7 +3568,7 @@
34993568         if (blockloop)
35003569             return;
35013570         
3502
-        if (bRep != null && material != null) // borderline...
3571
+        if (bRep != null || material != null) // borderline...
35033572             marked = h;
35043573         
35053574         for (int i = 0; i < Size(); i++)
....@@ -3509,6 +3578,46 @@
35093578                 continue;
35103579             blockloop = true;
35113580             child.MarkLeaves(h);
3581
+            blockloop = false;
3582
+         //   release(i);
3583
+        }
3584
+    }
3585
+    
3586
+    void RewindLeaves(boolean h)
3587
+    {
3588
+        if (blockloop)
3589
+            return;
3590
+        
3591
+        if (bRep != null || material != null) // borderline...
3592
+            rewind = h;
3593
+        
3594
+        for (int i = 0; i < Size(); i++)
3595
+        {
3596
+            Object3D child = (Object3D) get(i); // reserve(i);
3597
+            if (child == null)
3598
+                continue;
3599
+            blockloop = true;
3600
+            child.RewindLeaves(h);
3601
+            blockloop = false;
3602
+         //   release(i);
3603
+        }
3604
+    }
3605
+    
3606
+    void RandomLeaves(boolean h)
3607
+    {
3608
+        if (blockloop)
3609
+            return;
3610
+        
3611
+        if (bRep != null || material != null) // borderline...
3612
+            random = h;
3613
+        
3614
+        for (int i = 0; i < Size(); i++)
3615
+        {
3616
+            Object3D child = (Object3D) get(i); // reserve(i);
3617
+            if (child == null)
3618
+                continue;
3619
+            blockloop = true;
3620
+            child.RandomLeaves(h);
35123621             blockloop = false;
35133622          //   release(i);
35143623         }
....@@ -4282,6 +4391,55 @@
42824391         {               
42834392                 blockloop = true;
42844393             get(i).RepairShadow();
4394
+                blockloop = false;
4395
+        }
4396
+    }
4397
+    
4398
+    void RepairSOV()
4399
+    {
4400
+        if (blockloop)
4401
+            return;
4402
+
4403
+        String texname = this.GetPigmentTexture();
4404
+        
4405
+        if (texname.startsWith("sov"))
4406
+        {
4407
+            String[] s = texname.split("/");
4408
+
4409
+            String[] sname = s[1].split("Color.pn");
4410
+            
4411
+            texname = sname[0];
4412
+            
4413
+            if (sname.length > 1)
4414
+            {
4415
+                texname += "Color.jpg";
4416
+            }
4417
+            
4418
+            this.SetPigmentTexture("sov/" + texname);
4419
+        }
4420
+                
4421
+        texname = this.GetBumpTexture();
4422
+        
4423
+        if (texname.startsWith("sov"))
4424
+        {
4425
+            String[] s = texname.split("/");
4426
+
4427
+            String[] sname = s[1].split("Bump.pn");
4428
+            
4429
+            texname = sname[0];
4430
+            
4431
+            if (sname.length > 1)
4432
+            {
4433
+                texname += "Bump.jpg";
4434
+            }
4435
+            
4436
+            this.SetBumpTexture("sov/" + texname);
4437
+        }
4438
+                
4439
+        for (int i=0; i<Size(); i++)
4440
+        {               
4441
+                blockloop = true;
4442
+            get(i).RepairSOV();
42854443                 blockloop = false;
42864444         }
42874445     }
....@@ -5509,12 +5667,23 @@
55095667     boolean NeedSupport()
55105668     {
55115669         return
5512
-                CameraPane.SUPPORT && (!CameraPane.movingcamera || !Globals.FREEZEONMOVE) && link2master && /*live &&*/ support != null
5670
+                CameraPane.SUPPORT && (!CameraPane.movingcamera || (!Globals.FREEZEONMOVE && Globals.isLIVE())) && link2master && /*live &&*/ support != null
55135671                  // PROBLEM with CROWD!!
55145672                     && (Globals.DrawMode() == iCameraPane.SHADOW || !Globals.RENDERSHADOW || Globals.CROWD);
55155673     }
55165674     
55175675     static boolean DEBUG_SELECTION = false;
5676
+    
5677
+    boolean IsLive()
5678
+    {
5679
+        if (live)
5680
+            return true;
5681
+        
5682
+        if (parent == null)
5683
+            return false;
5684
+        
5685
+        return parent.IsLive();
5686
+    }
55185687     
55195688     void Draw(iCameraPane display, Object3D /*Composite*/ root, boolean selected, boolean blocked)
55205689     {
....@@ -5577,7 +5746,7 @@
55775746             support = support;
55785747         
55795748         //boolean usecalllists = IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT || support == null || !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5580
-        boolean usecalllists = false; // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT || support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5749
+        boolean usecalllists = IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT || support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
55815750         
55825751         if (!usecalllists && bRep != null && bRep.displaylist > 0)
55835752         {
....@@ -5597,10 +5766,12 @@
55975766         boolean selectmode = display.DrawMode() == display.SELECTION || display.IsDebugSelection();
55985767         
55995768         if (!selectmode && //display.DrawMode() != display.SELECTION &&
5600
-                (touched || (bRep != null && bRep.displaylist <= 0)))
5769
+                //(touched || (bRep != null && bRep.displaylist <= 0)))
5770
+                (Globals.isLIVE() || touched && (bRep != null && bRep.displaylist <= 0)))
56015771         {
56025772             Globals.lighttouched = true;
56035773         } // all panes...
5774
+        
56045775         //if (usecalllists && display.DrawMode() != display.SELECTION && display.DrawMode() != display.SHADOW &&
56055776         if (bRep != null && usecalllists && !selectmode && // june 2013 display.DrawMode() != display.SHADOW &&
56065777                 (touched || (bRep != null && bRep.displaylist <= 0)))
....@@ -5768,16 +5939,27 @@
57685939         tex = GetTextures();
57695940     }
57705941 
5771
-    boolean failed = false;
5942
+    boolean failedPigment = false;
5943
+    boolean failedBump = false;
57725944     
57735945     try
57745946     {
5775
-        display.BindTextures(tex, texres);
5947
+        display.BindPigmentTexture(tex, texres);
57765948     }
57775949     catch (Exception e)
57785950     {
57795951         System.err.println("FAILED: " + this);
5780
-        failed = true;
5952
+        failedPigment = true;
5953
+    }
5954
+           
5955
+    try
5956
+    {
5957
+        display.BindBumpTexture(tex, texres);
5958
+    }
5959
+    catch (Exception e)
5960
+    {
5961
+        //System.err.println("FAILED: " + this);
5962
+        failedBump = true;
57815963     }
57825964            
57835965             if (!compiled)
....@@ -5800,8 +5982,11 @@
58005982                 }
58015983             }
58025984 
5803
-    if (!failed)
5804
-        display.ReleaseTextures(tex);
5985
+    if (!failedBump)
5986
+        display.ReleaseBumpTexture(tex);
5987
+
5988
+    if (!failedPigment)
5989
+        display.ReleasePigmentTexture(tex);
58055990 
58065991     display.PopMaterial(this, selected);
58075992         }
....@@ -7026,7 +7211,7 @@
70267211             spot.translate(32, 32);
70277212             spotw = spot.x + spot.width;
70287213             spoth = spot.y + spot.height;
7029
-            info.g.setColor(Color.blue);
7214
+            info.g.setColor(Color.cyan);
70307215             info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
70317216 //            if (CameraPane.Xmin > spot.x)
70327217 //            {
....@@ -7044,11 +7229,12 @@
70447229 //            {
70457230 //                CameraPane.Ymax = spoth;
70467231 //            }
7047
-            // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - 15);
7048
-            //info.g.drawLine(spotw, spoth, spotw - 15, spoth);
7232
+            // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
7233
+            //info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
70497234             spot.translate(0, -32);
7050
-            info.g.setColor(Color.green);
7235
+            info.g.setColor(Color.yellow);
70517236             info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7237
+            info.g.setColor(Color.green);
70527238 //            if (CameraPane.Xmin > spot.x)
70537239 //            {
70547240 //                CameraPane.Xmin = spot.x;
....@@ -7366,19 +7552,20 @@
73667552                 switch (info.pane.RenderCamera().viewCode)
73677553                 {
73687554                     case 3: // '\001'
7369
-                        if (modified)
7555
+                        if (modified || opposite)
73707556                         {
73717557                             //LA.matScale(toParent, 1, hScale, vScale);
73727558                             LA.matScale(toParent, totalScale, 1, 1);
73737559                         } // vScale, 1);
73747560                         else
73757561                         {
7562
+                            // EXCEPTION!
73767563                             LA.matScale(toParent, totalScale, totalScale, totalScale);
73777564                         } // vScale, 1);
73787565                         break;
73797566 
73807567                     case 2: // '\002'
7381
-                        if (modified)
7568
+                        if (modified || opposite)
73827569                         {
73837570                             //LA.matScale(toParent, hScale, 1, vScale);
73847571                             LA.matScale(toParent, 1, totalScale, 1);
....@@ -7389,7 +7576,7 @@
73897576                         break;
73907577 
73917578                     case 1: // '\003'
7392
-                        if (modified)
7579
+                        if (modified || opposite)
73937580                         {
73947581                             //LA.matScale(toParent, hScale, vScale, 1);
73957582                             LA.matScale(toParent, 1, 1, totalScale);