Mocap big data

Normand Briere

2019-06-13 4629090fafbef256abd0686a85ee12042d658868

 Object3D.java
..
..
@@ -24,6 +24,11 @@
24
24
     
25
25
     private UUID uuid = UUID.randomUUID();
26
26
     
27
+    // TEMPORARY for mocap undo
28
+    mocap.reader.BVHReader.BVHResult bvh;
29
+    Object3D skeleton;
30
+    //
31
+    
27
32
     ScriptNode scriptnode;
28
33
 
29
34
         void InitOthers()
..
..
@@ -104,117 +109,136 @@
104
109
     
105
110
 //    transient boolean reduced; // for morph reduction
106
111
     
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
109
114
 
110
-transient Object3D transientsupport; // for cloning
111
-transient boolean transientlink2master;
115
+    transient Object3D transientsupport; // for cloning
116
+    transient boolean transientlink2master;
112
117
 
113
-void SaveSupports()
114
-{
115
-    if (blockloop)
116
-        return;
118
+    void SaveSupports()
119
+    {
120
+        if (blockloop)
121
+            return;
117
122
 
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;
139
125
 
140
-void RestoreSupports()
141
-{
142
-    if (blockloop)
143
-        return;
126
+        support = null;
127
+        link2master = false;
144
128
 
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
+        }
165
133
 
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
+        }
177
143
     }
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
-}
197
144
 
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()
214
146
     {
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
+        }
216
169
     }
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
+            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
+    }
218
242
 
219
243
 // MOCAP SUPPORT
220
244
     double tx,ty,tz,rx,ry,rz;
..
..
@@ -2685,6 +2709,18 @@
2685
2709
         //Touch();
2686
2710
     }
2687
2711
 
2712
+    void GenNormalsMeshS()
2713
+    {
2714
+        selection.GenNormalsMesh();
2715
+//        for (int i=0; i<selection.size(); i++)
2716
+//        {
2717
+//            Object3D selectee = (Object3D) selection.elementAt(i);
2718
+//            selectee.GenNormals(crease);
2719
+//        }
2720
+
2721
+        //Touch();
2722
+    }
2723
+
2688
2724
     void ClearColorsS()
2689
2725
     {
2690
2726
         selection.ClearColors();
..
..
@@ -2816,6 +2852,24 @@
2816
2852
             if (child == null)
2817
2853
                 continue;
2818
2854
             child.GenNormals(crease);
2855
+//            Children().release(i);
2856
+        }
2857
+        blockloop = false;
2858
+    }
2859
+
2860
+    void GenNormalsMesh()
2861
+    {
2862
+        if (blockloop)
2863
+            return;
2864
+        
2865
+        blockloop = true;
2866
+        GenNormalsMesh0();
2867
+        for (int i = 0; i < Children().Size(); i++)
2868
+        {
2869
+            Object3D child = (Object3D) Children().get(i); // reserve(i);
2870
+            if (child == null)
2871
+                continue;
2872
+            child.GenNormalsMesh();
2819
2873
 //            Children().release(i);
2820
2874
         }
2821
2875
         blockloop = false;
..
..
@@ -2988,6 +3042,15 @@
2988
3042
         }
2989
3043
     }
2990
3044
 
3045
+    void GenNormalsMesh0()
3046
+    {
3047
+        if (bRep != null)
3048
+        {
3049
+            bRep.GenerateNormalsMesh();
3050
+            Touch();
3051
+        }
3052
+    }
3053
+
2991
3054
     void GenNormalsMINE0()
2992
3055
     {
2993
3056
         if (bRep != null)