blame | history | patch | commit | commitdiff
Normand Briere
2019-06-17 e36047725ce3217618d4e5807ac7c8769b9e3598 
 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         }
....@@ -2693,6 +2711,18 @@
26932711         //Touch();
26942712     }
26952713 
2714
+    void GenNormalsMeshS()
2715
+    {
2716
+        selection.GenNormalsMesh();
2717
+//        for (int i=0; i<selection.size(); i++)
2718
+//        {
2719
+//            Object3D selectee = (Object3D) selection.elementAt(i);
2720
+//            selectee.GenNormals(crease);
2721
+//        }
2722
+
2723
+        //Touch();
2724
+    }
2725
+
26962726     void ClearColorsS()
26972727     {
26982728         selection.ClearColors();
....@@ -2824,6 +2854,24 @@
28242854             if (child == null)
28252855                 continue;
28262856             child.GenNormals(crease);
2857
+//            Children().release(i);
2858
+        }
2859
+        blockloop = false;
2860
+    }
2861
+
2862
+    void GenNormalsMesh()
2863
+    {
2864
+        if (blockloop)
2865
+            return;
2866
+        
2867
+        blockloop = true;
2868
+        GenNormalsMesh0();
2869
+        for (int i = 0; i < Children().Size(); i++)
2870
+        {
2871
+            Object3D child = (Object3D) Children().get(i); // reserve(i);
2872
+            if (child == null)
2873
+                continue;
2874
+            child.GenNormalsMesh();
28272875 //            Children().release(i);
28282876         }
28292877         blockloop = false;
....@@ -2992,6 +3040,15 @@
29923040         if (bRep != null)
29933041         {
29943042             bRep.GenerateNormals(crease);
3043
+            Touch();
3044
+        }
3045
+    }
3046
+
3047
+    void GenNormalsMesh0()
3048
+    {
3049
+        if (bRep != null)
3050
+        {
3051
+            bRep.GenerateNormalsMesh();
29953052             Touch();
29963053         }
29973054     }
....@@ -4294,6 +4351,55 @@
42944351         }
42954352     }
42964353     
4354
+    void RepairSOV()
4355
+    {
4356
+        if (blockloop)
4357
+            return;
4358
+
4359
+        String texname = this.GetPigmentTexture();
4360
+        
4361
+        if (texname.startsWith("sov"))
4362
+        {
4363
+            String[] s = texname.split("/");
4364
+
4365
+            String[] sname = s[1].split("Color.pn");
4366
+            
4367
+            texname = sname[0];
4368
+            
4369
+            if (sname.length > 1)
4370
+            {
4371
+                texname += "Color.jpg";
4372
+            }
4373
+            
4374
+            this.SetPigmentTexture("sov/" + texname);
4375
+        }
4376
+                
4377
+        texname = this.GetBumpTexture();
4378
+        
4379
+        if (texname.startsWith("sov"))
4380
+        {
4381
+            String[] s = texname.split("/");
4382
+
4383
+            String[] sname = s[1].split("Bump.pn");
4384
+            
4385
+            texname = sname[0];
4386
+            
4387
+            if (sname.length > 1)
4388
+            {
4389
+                texname += "Bump.jpg";
4390
+            }
4391
+            
4392
+            this.SetBumpTexture("sov/" + texname);
4393
+        }
4394
+                
4395
+        for (int i=0; i<Size(); i++)
4396
+        {               
4397
+                blockloop = true;
4398
+            get(i).RepairSOV();
4399
+                blockloop = false;
4400
+        }
4401
+    }
4402
+    
42974403     void RepairTexture()
42984404     {
42994405         if (this instanceof FileObject || blockloop)
....@@ -5517,12 +5623,23 @@
55175623     boolean NeedSupport()
55185624     {
55195625         return
5520
-                CameraPane.SUPPORT && (!CameraPane.movingcamera || !Globals.FREEZEONMOVE) && link2master && /*live &&*/ support != null
5626
+                CameraPane.SUPPORT && (!CameraPane.movingcamera || (!Globals.FREEZEONMOVE && Globals.isLIVE())) && link2master && /*live &&*/ support != null
55215627                  // PROBLEM with CROWD!!
55225628                     && (Globals.DrawMode() == iCameraPane.SHADOW || !Globals.RENDERSHADOW || Globals.CROWD);
55235629     }
55245630     
55255631     static boolean DEBUG_SELECTION = false;
5632
+    
5633
+    boolean IsLive()
5634
+    {
5635
+        if (live)
5636
+            return true;
5637
+        
5638
+        if (parent == null)
5639
+            return false;
5640
+        
5641
+        return parent.IsLive();
5642
+    }
55265643     
55275644     void Draw(iCameraPane display, Object3D /*Composite*/ root, boolean selected, boolean blocked)
55285645     {
....@@ -5585,7 +5702,7 @@
55855702             support = support;
55865703         
55875704         //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);
5705
+        boolean usecalllists = IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT || support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
55895706         
55905707         if (!usecalllists && bRep != null && bRep.displaylist > 0)
55915708         {
....@@ -5605,10 +5722,12 @@
56055722         boolean selectmode = display.DrawMode() == display.SELECTION || display.IsDebugSelection();
56065723         
56075724         if (!selectmode && //display.DrawMode() != display.SELECTION &&
5608
-                (touched || (bRep != null && bRep.displaylist <= 0)))
5725
+                //(touched || (bRep != null && bRep.displaylist <= 0)))
5726
+                (Globals.isLIVE() || touched && (bRep != null && bRep.displaylist <= 0)))
56095727         {
56105728             Globals.lighttouched = true;
56115729         } // all panes...
5730
+        
56125731         //if (usecalllists && display.DrawMode() != display.SELECTION && display.DrawMode() != display.SHADOW &&
56135732         if (bRep != null && usecalllists && !selectmode && // june 2013 display.DrawMode() != display.SHADOW &&
56145733                 (touched || (bRep != null && bRep.displaylist <= 0)))
....@@ -5776,16 +5895,27 @@
57765895         tex = GetTextures();
57775896     }
57785897 
5779
-    boolean failed = false;
5898
+    boolean failedPigment = false;
5899
+    boolean failedBump = false;
57805900     
57815901     try
57825902     {
5783
-        display.BindTextures(tex, texres);
5903
+        display.BindPigmentTexture(tex, texres);
57845904     }
57855905     catch (Exception e)
57865906     {
57875907         System.err.println("FAILED: " + this);
5788
-        failed = true;
5908
+        failedPigment = true;
5909
+    }
5910
+           
5911
+    try
5912
+    {
5913
+        display.BindBumpTexture(tex, texres);
5914
+    }
5915
+    catch (Exception e)
5916
+    {
5917
+        //System.err.println("FAILED: " + this);
5918
+        failedBump = true;
57895919     }
57905920            
57915921             if (!compiled)
....@@ -5808,8 +5938,11 @@
58085938                 }
58095939             }
58105940 
5811
-    if (!failed)
5812
-        display.ReleaseTextures(tex);
5941
+    if (!failedBump)
5942
+        display.ReleaseBumpTexture(tex);
5943
+
5944
+    if (!failedPigment)
5945
+        display.ReleasePigmentTexture(tex);
58135946 
58145947     display.PopMaterial(this, selected);
58155948         }
....@@ -7034,7 +7167,7 @@
70347167             spot.translate(32, 32);
70357168             spotw = spot.x + spot.width;
70367169             spoth = spot.y + spot.height;
7037
-            info.g.setColor(Color.blue);
7170
+            info.g.setColor(Color.cyan);
70387171             info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
70397172 //            if (CameraPane.Xmin > spot.x)
70407173 //            {
....@@ -7052,11 +7185,12 @@
70527185 //            {
70537186 //                CameraPane.Ymax = spoth;
70547187 //            }
7055
-            // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - 15);
7056
-            //info.g.drawLine(spotw, spoth, spotw - 15, spoth);
7188
+            // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
7189
+            //info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
70577190             spot.translate(0, -32);
7058
-            info.g.setColor(Color.green);
7191
+            info.g.setColor(Color.yellow);
70597192             info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7193
+            info.g.setColor(Color.green);
70607194 //            if (CameraPane.Xmin > spot.x)
70617195 //            {
70627196 //                CameraPane.Xmin = spot.x;
....@@ -7374,19 +7508,20 @@
73747508                 switch (info.pane.RenderCamera().viewCode)
73757509                 {
73767510                     case 3: // '\001'
7377
-                        if (modified)
7511
+                        if (modified || opposite)
73787512                         {
73797513                             //LA.matScale(toParent, 1, hScale, vScale);
73807514                             LA.matScale(toParent, totalScale, 1, 1);
73817515                         } // vScale, 1);
73827516                         else
73837517                         {
7518
+                            // EXCEPTION!
73847519                             LA.matScale(toParent, totalScale, totalScale, totalScale);
73857520                         } // vScale, 1);
73867521                         break;
73877522 
73887523                     case 2: // '\002'
7389
-                        if (modified)
7524
+                        if (modified || opposite)
73907525                         {
73917526                             //LA.matScale(toParent, hScale, 1, vScale);
73927527                             LA.matScale(toParent, 1, totalScale, 1);
....@@ -7397,7 +7532,7 @@
73977532                         break;
73987533 
73997534                     case 1: // '\003'
7400
-                        if (modified)
7535
+                        if (modified || opposite)
74017536                         {
74027537                             //LA.matScale(toParent, hScale, vScale, 1);
74037538                             LA.matScale(toParent, 1, 1, totalScale);