blame | history | patch | commit | commitdiff
Normand Briere
2019-06-24 c67da2e5d8655704601d6d06e8bc60aabe212253 
 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,125 +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;
117
-
118
-    transientsupport = support;
119
-    transientlink2master = link2master;
120
-    
121
-    support = null;
122
-    link2master = false;
123
-    
124
-    if (bRep != null)
118
+    void SaveSupports()
125119     {
126
-        bRep.SaveSupports();
120
+        if (blockloop)
121
+            return;
122
+
123
+        transientsupport = support;
124
+        transientlink2master = link2master;
125
+
126
+        support = null;
127
+        link2master = false;
128
+
129
+        if (bRep != null)
130
+        {
131
+            bRep.SaveSupports();
132
+        }
133
+
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
+        }
127143     }
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
-}
139144 
140
-void RestoreSupports()
141
-{
142
-    if (blockloop)
143
-        return;
145
+    void RestoreSupports()
146
+    {
147
+        if (blockloop)
148
+            return;
144149 
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
-}
150
+        support = transientsupport;
151
+        link2master = transientlink2master;
152
+        transientsupport = null;
153
+        transientlink2master = false;
165154 
166
-void ExtractBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
167
-{
168
-    if (hashtable.containsKey(GetUUID()))
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
+        }
169
+    }
170
+
171
+    void ExtractBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
169172     {
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
+
170222         Object3D o = hashtable.get(GetUUID());
171223 
172
-        assert(this.bRep == o.bRep);
173
-        if (this.bRep != null)
174
-            assert(this.bRep.support == o.transientrep);
175
-        
176
-        return;
177
-    }
178
-    
179
-    Object3D o = new Object3D();
180
-    o.bRep = this.bRep;
181
-    if (this.bRep != null)
182
-    {
183
-        o.transientrep = this.bRep.support;
184
-        o.bRep.support = null;
185
-    }
186
-    
187
-//    o.support = this.support;
188
-//    o.fileparent = this.fileparent;
189
-//    if (this.bRep != null)
190
-//        o.bRep = this.bRep.support;
191
-    
192
-    hashtable.put(GetUUID(), o);
193
-    
194
-    this.bRep = null;
195
-//    if (this.bRep != null)
196
-//        this.bRep.support = null;
197
-//    this.support = null;
198
-//    this.fileparent = null;
199
-    
200
-    for (int i=0; i<Size(); i++)
201
-    {
202
-        get(i).ExtractBigData(hashtable);
203
-    }
204
-}
224
+        RestoreBigData(o);
205225 
206
-void RestoreBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
207
-{
208
-    if (!hashtable.containsKey(GetUUID()))
209
-        return;
210
-    
211
-    Object3D o = hashtable.get(GetUUID());
212
-    
213
-    this.bRep = o.bRep;
214
-    if (this.bRep != null)
215
-        this.bRep.support = o.transientrep;
216
-//    this.support = o.support;
217
-//    this.fileparent = o.fileparent;
218
-    
219
-    hashtable.remove(GetUUID());
220
-    
221
-    for (int i=0; i<Size(); i++)
222
-    {
223
-        get(i).RestoreBigData(hashtable);
226
+        hashtable.remove(GetUUID());
227
+
228
+        for (int i=0; i<Size(); i++)
229
+        {
230
+            get(i).RestoreBigData(hashtable);
231
+        }
224232     }
225
-}
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
+    }
226242 
227243 // MOCAP SUPPORT
228244     double tx,ty,tz,rx,ry,rz;
....@@ -547,12 +563,14 @@
547563             toParent = LA.newMatrix();
548564             fromParent = LA.newMatrix();
549565         }
566
+        
550567         if (toParentMarked == null)
551568         {
552569             if (maxcount != 1)
553570             {
554571                 new Exception().printStackTrace();
555572             }
573
+            
556574             toParentMarked = LA.newMatrix();
557575             fromParentMarked = LA.newMatrix();
558576         }
....@@ -863,7 +881,7 @@
863881         
864882         if (marked && Globals.isLIVE() && live &&
865883                 //TEMP21aug2018
866
-                (Globals.DrawMode() == iCameraPane.SHADOW || !Globals.RENDERSHADOW) &&
884
+                (Globals.DrawMode() == iCameraPane.SHADOW || !Globals.RENDERSHADOW || !Globals.COMPUTESHADOWWHENLIVE) &&
867885                 currentframe != Globals.framecount)
868886         {
869887             currentframe = Globals.framecount;
....@@ -875,7 +893,8 @@
875893             
876894             boolean changedir = random && Math.random() < 0.01; // && !link2master;
877895 
878
-            if (transformcount*factor > maxcount || (step == 1 && changedir))
896
+            if (transformcount*factor >= maxcount && (rewind || random) ||
897
+                    (step == 1 && changedir))
879898             {
880899                 countdown = 1;
881900                 delay = speedup?8:1;
....@@ -947,6 +966,7 @@
947966         if (material == null || material.multiply)
948967             return true;
949968         
969
+        // Transparent objects are dynamic because we have to sort the triangles.
950970         return material.opacity > 0.99;
951971     }
952972     
....@@ -2368,6 +2388,10 @@
23682388         }
23692389          */
23702390         }
2391
+        else
2392
+        {
2393
+            //((ObjEditor)editWindow).SetupUI2(null);
2394
+        }
23712395     }
23722396 
23732397     void createEditWindow(GroupEditor callee, boolean newWindow) //, boolean root)
....@@ -2693,6 +2717,18 @@
26932717         //Touch();
26942718     }
26952719 
2720
+    void GenNormalsMeshS()
2721
+    {
2722
+        selection.GenNormalsMesh();
2723
+//        for (int i=0; i<selection.size(); i++)
2724
+//        {
2725
+//            Object3D selectee = (Object3D) selection.elementAt(i);
2726
+//            selectee.GenNormals(crease);
2727
+//        }
2728
+
2729
+        //Touch();
2730
+    }
2731
+
26962732     void ClearColorsS()
26972733     {
26982734         selection.ClearColors();
....@@ -2824,6 +2860,24 @@
28242860             if (child == null)
28252861                 continue;
28262862             child.GenNormals(crease);
2863
+//            Children().release(i);
2864
+        }
2865
+        blockloop = false;
2866
+    }
2867
+
2868
+    void GenNormalsMesh()
2869
+    {
2870
+        if (blockloop)
2871
+            return;
2872
+        
2873
+        blockloop = true;
2874
+        GenNormalsMesh0();
2875
+        for (int i = 0; i < Children().Size(); i++)
2876
+        {
2877
+            Object3D child = (Object3D) Children().get(i); // reserve(i);
2878
+            if (child == null)
2879
+                continue;
2880
+            child.GenNormalsMesh();
28272881 //            Children().release(i);
28282882         }
28292883         blockloop = false;
....@@ -2992,6 +3046,15 @@
29923046         if (bRep != null)
29933047         {
29943048             bRep.GenerateNormals(crease);
3049
+            Touch();
3050
+        }
3051
+    }
3052
+
3053
+    void GenNormalsMesh0()
3054
+    {
3055
+        if (bRep != null)
3056
+        {
3057
+            bRep.GenerateNormalsMesh();
29953058             Touch();
29963059         }
29973060     }
....@@ -3446,7 +3509,8 @@
34463509         if (blockloop)
34473510             return;
34483511         
3449
-        if (marked || (bRep != null && material != null)) // borderline...
3512
+        if (//marked || // does not make sense
3513
+                (bRep != null || material != null)) // borderline...
34503514             live = h;
34513515         
34523516         for (int i = 0; i < Size(); i++)
....@@ -3467,7 +3531,8 @@
34673531             return;
34683532         
34693533         //if (bRep != null)
3470
-        if (marked || (bRep != null && material != null)) // borderline...
3534
+        if (//marked || // does not make sense
3535
+                (bRep != null || material != null)) // borderline...
34713536             link2master = h;
34723537         
34733538         for (int i = 0; i < Size(); i++)
....@@ -3487,7 +3552,8 @@
34873552         if (blockloop)
34883553             return;
34893554         
3490
-        if (marked || (bRep != null && material != null)) // borderline...
3555
+        if (//marked || // does not make sense
3556
+                (bRep != null || material != null)) // borderline...
34913557             hide = h;
34923558         
34933559         for (int i = 0; i < Size(); i++)
....@@ -3507,7 +3573,7 @@
35073573         if (blockloop)
35083574             return;
35093575         
3510
-        if (bRep != null && material != null) // borderline...
3576
+        if (bRep != null || material != null) // borderline...
35113577             marked = h;
35123578         
35133579         for (int i = 0; i < Size(); i++)
....@@ -3517,6 +3583,46 @@
35173583                 continue;
35183584             blockloop = true;
35193585             child.MarkLeaves(h);
3586
+            blockloop = false;
3587
+         //   release(i);
3588
+        }
3589
+    }
3590
+    
3591
+    void RewindLeaves(boolean h)
3592
+    {
3593
+        if (blockloop)
3594
+            return;
3595
+        
3596
+        if (bRep != null || material != null) // borderline...
3597
+            rewind = h;
3598
+        
3599
+        for (int i = 0; i < Size(); i++)
3600
+        {
3601
+            Object3D child = (Object3D) get(i); // reserve(i);
3602
+            if (child == null)
3603
+                continue;
3604
+            blockloop = true;
3605
+            child.RewindLeaves(h);
3606
+            blockloop = false;
3607
+         //   release(i);
3608
+        }
3609
+    }
3610
+    
3611
+    void RandomLeaves(boolean h)
3612
+    {
3613
+        if (blockloop)
3614
+            return;
3615
+        
3616
+        if (bRep != null || material != null) // borderline...
3617
+            random = h;
3618
+        
3619
+        for (int i = 0; i < Size(); i++)
3620
+        {
3621
+            Object3D child = (Object3D) get(i); // reserve(i);
3622
+            if (child == null)
3623
+                continue;
3624
+            blockloop = true;
3625
+            child.RandomLeaves(h);
35203626             blockloop = false;
35213627          //   release(i);
35223628         }
....@@ -4290,6 +4396,55 @@
42904396         {               
42914397                 blockloop = true;
42924398             get(i).RepairShadow();
4399
+                blockloop = false;
4400
+        }
4401
+    }
4402
+    
4403
+    void RepairSOV()
4404
+    {
4405
+        if (blockloop)
4406
+            return;
4407
+
4408
+        String texname = this.GetPigmentTexture();
4409
+        
4410
+        if (texname.startsWith("sov"))
4411
+        {
4412
+            String[] s = texname.split("/");
4413
+
4414
+            String[] sname = s[1].split("Color.pn");
4415
+            
4416
+            texname = sname[0];
4417
+            
4418
+            if (sname.length > 1)
4419
+            {
4420
+                texname += "Color.jpg";
4421
+            }
4422
+            
4423
+            this.SetPigmentTexture("sov/" + texname);
4424
+        }
4425
+                
4426
+        texname = this.GetBumpTexture();
4427
+        
4428
+        if (texname.startsWith("sov"))
4429
+        {
4430
+            String[] s = texname.split("/");
4431
+
4432
+            String[] sname = s[1].split("Bump.pn");
4433
+            
4434
+            texname = sname[0];
4435
+            
4436
+            if (sname.length > 1)
4437
+            {
4438
+                texname += "Bump.jpg";
4439
+            }
4440
+            
4441
+            this.SetBumpTexture("sov/" + texname);
4442
+        }
4443
+                
4444
+        for (int i=0; i<Size(); i++)
4445
+        {               
4446
+                blockloop = true;
4447
+            get(i).RepairSOV();
42934448                 blockloop = false;
42944449         }
42954450     }
....@@ -5517,12 +5672,23 @@
55175672     boolean NeedSupport()
55185673     {
55195674         return
5520
-                CameraPane.SUPPORT && (!CameraPane.movingcamera || !Globals.FREEZEONMOVE) && link2master && /*live &&*/ support != null
5675
+                CameraPane.SUPPORT && (!CameraPane.movingcamera || (!Globals.FREEZEONMOVE && Globals.isLIVE())) && link2master && /*live &&*/ support != null
55215676                  // PROBLEM with CROWD!!
55225677                     && (Globals.DrawMode() == iCameraPane.SHADOW || !Globals.RENDERSHADOW || Globals.CROWD);
55235678     }
55245679     
55255680     static boolean DEBUG_SELECTION = false;
5681
+    
5682
+    boolean IsLive()
5683
+    {
5684
+        if (live)
5685
+            return true;
5686
+        
5687
+        if (parent == null)
5688
+            return false;
5689
+        
5690
+        return parent.IsLive();
5691
+    }
55265692     
55275693     void Draw(iCameraPane display, Object3D /*Composite*/ root, boolean selected, boolean blocked)
55285694     {
....@@ -5585,7 +5751,7 @@
55855751             support = support;
55865752         
55875753         //boolean usecalllists = IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT || support == null || !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5588
-        boolean usecalllists = false; // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT || support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5754
+        boolean usecalllists = !IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT || support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
55895755         
55905756         if (!usecalllists && bRep != null && bRep.displaylist > 0)
55915757         {
....@@ -5605,10 +5771,12 @@
56055771         boolean selectmode = display.DrawMode() == display.SELECTION || display.IsDebugSelection();
56065772         
56075773         if (!selectmode && //display.DrawMode() != display.SELECTION &&
5608
-                (touched || (bRep != null && bRep.displaylist <= 0)))
5774
+                //(touched || (bRep != null && bRep.displaylist <= 0)))
5775
+                (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE || touched && (bRep != null && bRep.displaylist <= 0)))
56095776         {
56105777             Globals.lighttouched = true;
56115778         } // all panes...
5779
+        
56125780         //if (usecalllists && display.DrawMode() != display.SELECTION && display.DrawMode() != display.SHADOW &&
56135781         if (bRep != null && usecalllists && !selectmode && // june 2013 display.DrawMode() != display.SHADOW &&
56145782                 (touched || (bRep != null && bRep.displaylist <= 0)))
....@@ -5776,16 +5944,27 @@
57765944         tex = GetTextures();
57775945     }
57785946 
5779
-    boolean failed = false;
5947
+    boolean failedPigment = false;
5948
+    boolean failedBump = false;
57805949     
57815950     try
57825951     {
5783
-        display.BindTextures(tex, texres);
5952
+        display.BindPigmentTexture(tex, texres);
57845953     }
57855954     catch (Exception e)
57865955     {
57875956         System.err.println("FAILED: " + this);
5788
-        failed = true;
5957
+        failedPigment = true;
5958
+    }
5959
+           
5960
+    try
5961
+    {
5962
+        display.BindBumpTexture(tex, texres);
5963
+    }
5964
+    catch (Exception e)
5965
+    {
5966
+        //System.err.println("FAILED: " + this);
5967
+        failedBump = true;
57895968     }
57905969            
57915970             if (!compiled)
....@@ -5808,8 +5987,11 @@
58085987                 }
58095988             }
58105989 
5811
-    if (!failed)
5812
-        display.ReleaseTextures(tex);
5990
+    if (!failedBump)
5991
+        display.ReleaseBumpTexture(tex);
5992
+
5993
+    if (!failedPigment)
5994
+        display.ReleasePigmentTexture(tex);
58135995 
58145996     display.PopMaterial(this, selected);
58155997         }
....@@ -6182,6 +6364,11 @@
61826364                 // dec 2012
61836365                 new Exception().printStackTrace();
61846366                 return;
6367
+            }
6368
+            
6369
+            if (dontselect)
6370
+            {
6371
+                //bRep.GenerateNormalsMINE();
61856372             }
61866373             
61876374             display.DrawGeometry(bRep, flipV, selectmode);
....@@ -7034,7 +7221,7 @@
70347221             spot.translate(32, 32);
70357222             spotw = spot.x + spot.width;
70367223             spoth = spot.y + spot.height;
7037
-            info.g.setColor(Color.blue);
7224
+            info.g.setColor(Color.cyan);
70387225             info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
70397226 //            if (CameraPane.Xmin > spot.x)
70407227 //            {
....@@ -7052,11 +7239,12 @@
70527239 //            {
70537240 //                CameraPane.Ymax = spoth;
70547241 //            }
7055
-            // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - 15);
7056
-            //info.g.drawLine(spotw, spoth, spotw - 15, spoth);
7242
+            // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
7243
+            //info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
70577244             spot.translate(0, -32);
7058
-            info.g.setColor(Color.green);
7245
+            info.g.setColor(Color.yellow);
70597246             info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7247
+            info.g.setColor(Color.green);
70607248 //            if (CameraPane.Xmin > spot.x)
70617249 //            {
70627250 //                CameraPane.Xmin = spot.x;
....@@ -7374,19 +7562,20 @@
73747562                 switch (info.pane.RenderCamera().viewCode)
73757563                 {
73767564                     case 3: // '\001'
7377
-                        if (modified)
7565
+                        if (modified || opposite)
73787566                         {
73797567                             //LA.matScale(toParent, 1, hScale, vScale);
73807568                             LA.matScale(toParent, totalScale, 1, 1);
73817569                         } // vScale, 1);
73827570                         else
73837571                         {
7572
+                            // EXCEPTION!
73847573                             LA.matScale(toParent, totalScale, totalScale, totalScale);
73857574                         } // vScale, 1);
73867575                         break;
73877576 
73887577                     case 2: // '\002'
7389
-                        if (modified)
7578
+                        if (modified || opposite)
73907579                         {
73917580                             //LA.matScale(toParent, hScale, 1, vScale);
73927581                             LA.matScale(toParent, 1, totalScale, 1);
....@@ -7397,7 +7586,7 @@
73977586                         break;
73987587 
73997588                     case 1: // '\003'
7400
-                        if (modified)
7589
+                        if (modified || opposite)
74017590                         {
74027591                             //LA.matScale(toParent, hScale, vScale, 1);
74037592                             LA.matScale(toParent, 1, 1, totalScale);
....@@ -7617,6 +7806,10 @@
76177806             editWindow = null;
76187807         } // ?
76197808         }
7809
+        else
7810
+        {
7811
+            //editWindow.closeUI();
7812
+        }
76207813     }
76217814     
76227815     boolean root; // patch for edit windows