Fix camera and hip height.

Normand Briere

2018-07-01 bb87fae3b097ddd5c5039bf1ab48d3718b900b08

 ObjEditor.java
..
..
@@ -522,18 +522,18 @@
522
522
                     maxima.y = sel.toParent[3][1];
523
523
                     maxima.z = sel.toParent[3][2];
524
524
                     si.SendInfo("    Orig: " + maxima, "regular");
525
-                    maxima.x = sel.globalTransform[3][0];
526
-                    maxima.y = sel.globalTransform[3][1];
527
-                    maxima.z = sel.globalTransform[3][2];
528
-        if (full)
529
-            si.SendInfo("    Global Orig: " + maxima, "regular");
530
525
                     maxima.x = sel.toParent[0][0];
531
526
                     maxima.y = sel.toParent[1][1];
532
527
                     maxima.z = sel.toParent[2][2];
533
528
                     si.SendInfo("    Scale: " + maxima, "regular");
534
-                    maxima.x = sel.globalTransform[0][0];
535
-                    maxima.y = sel.globalTransform[1][1];
536
-                    maxima.z = sel.globalTransform[2][2];
529
+        maxima.x = sel.globalTransform[3][0];
530
+        maxima.y = sel.globalTransform[3][1];
531
+        maxima.z = sel.globalTransform[3][2];
532
+        if (full)
533
+            si.SendInfo("    Global Orig: " + maxima, "regular");
534
+        maxima.x = sel.globalTransform[0][0];
535
+        maxima.y = sel.globalTransform[1][1];
536
+        maxima.z = sel.globalTransform[2][2];
537
537
         if (full)
538
538
             si.SendInfo("    Global Scale: " + maxima, "regular");
539
539
                 }
..
..
@@ -1859,19 +1859,21 @@
1859
1859
             }
1860
1860
 
1861
1861
             // Images/textures
1862
-            if (textures
1863
-                    && (filename.toLowerCase().endsWith(".jpg")
1864
-                    || filename.toLowerCase().endsWith(".jpeg")
1865
-                    || filename.toLowerCase().endsWith(".gif")
1866
-                    || filename.toLowerCase().endsWith(".png")
1867
-                    || filename.toLowerCase().endsWith(".tre")
1868
-                    || filename.toLowerCase().endsWith(".bmp")
1869
-                    || filename.toLowerCase().endsWith(".tga")
1870
-                    || filename.toLowerCase().endsWith(".sgi")
1871
-                    || filename.toLowerCase().endsWith(".tif")
1872
-                    || filename.toLowerCase().endsWith(".tiff")))
1862
+            if (filename.toLowerCase().endsWith(".jpg")
1863
+                || filename.toLowerCase().endsWith(".jpeg")
1864
+                || filename.toLowerCase().endsWith(".gif")
1865
+                || filename.toLowerCase().endsWith(".png")
1866
+                || filename.toLowerCase().endsWith(".tre")
1867
+                || filename.toLowerCase().endsWith(".bmp")
1868
+                || filename.toLowerCase().endsWith(".tga")
1869
+                || filename.toLowerCase().endsWith(".sgi")
1870
+                || filename.toLowerCase().endsWith(".tif")
1871
+                || filename.toLowerCase().endsWith(".tiff"))
1873
1872
             {
1874
-                DropTexture(filename);
1873
+                if (textures)
1874
+                    DropTexture(filename);
1875
+                else
1876
+                    CreateBillboard(filename);
1875
1877
                 continue;
1876
1878
             }
1877
1879
 
..
..
@@ -1880,6 +1882,60 @@
1880
1882
         }
1881
1883
 
1882
1884
         ResetModel();
1885
+    }
1886
+    
1887
+    void CreateBillboard(String filename)
1888
+    {
1889
+        Object3D source = null;
1890
+        Object3D group = copy;
1891
+
1892
+        if (group.selection.size() > 0)
1893
+        {
1894
+            source = group.selection.get(0);
1895
+        }
1896
+
1897
+        Grid grid = new Grid(1,1);
1898
+        grid.material = null;
1899
+        
1900
+        grid.toParent = LA.newMatrix();
1901
+        grid.fromParent = LA.newMatrix();
1902
+        LA.matYRotate(grid.toParent, Math.PI/2);
1903
+        LA.matXRotate(grid.toParent, -Math.PI/2);
1904
+        LA.matXRotate(grid.fromParent, Math.PI/2);
1905
+        LA.matYRotate(grid.fromParent, -Math.PI/2);
1906
+        
1907
+        BillboardNode bb = new BillboardNode();
1908
+        bb.addChild(grid);
1909
+        
1910
+        Object3D newgroup = new Object3D();
1911
+        newgroup.CreateMaterial();
1912
+        
1913
+        File file = new File(filename);
1914
+        newgroup.name = file.getName();
1915
+        newgroup.addChild(bb);
1916
+        
1917
+        Object3D main = newgroup;
1918
+        
1919
+        main.SetPigmentTexture(filename);
1920
+        
1921
+        if (source != null)
1922
+        {
1923
+            main.material = new cMaterial(source.material);
1924
+            if (main.projectedVertices.length < source.projectedVertices.length)
1925
+            {
1926
+                main.projectedVertices = new Object3D.cVector2[source.projectedVertices.length];
1927
+            }
1928
+            
1929
+            for (int i=0; i<source.projectedVertices.length; i++)
1930
+            {
1931
+                main.projectedVertices[i].x = source.projectedVertices[i].x;
1932
+                main.projectedVertices[i].y = source.projectedVertices[i].y;
1933
+            }
1934
+            
1935
+            main.texres = source.texres;
1936
+        }
1937
+        
1938
+        makeSomething(newgroup, false);
1883
1939
     }
1884
1940
     
1885
1941
     Point location;
..
..
@@ -2138,6 +2194,8 @@
2138
2194
             {
2139
2195
                 Mocap sel = (Mocap) copy.selection.get(0);
2140
2196
 
2197
+                sel.SetCurrentBones(sel.frame);
2198
+            
2141
2199
                 sel.fullname = fullname;
2142
2200
 
2143
2201
                 if (changename)
..
..
@@ -2151,14 +2209,18 @@
2151
2209
                 sel.smoothed = false;
2152
2210
 
2153
2211
                 //    if (!changename)
2154
-                sel.SetPositionDelta(false, true, true, true/*?*/); // false
2212
+                //sel.SetPositionDelta(false, true, true, true/*?*/); // false
2213
+                sel.SetGlobalTransform();
2214
+                sel.LoadData();
2215
+                sel.Rewind();
2216
+                sel.Fade();
2155
2217
                 //                sel.setPose(0);
2156
2218
                 refreshContents();
2157
2219
             } else
2158
2220
             {
2159
2221
                 mocap.Reset();
2160
2222
                 // new skeleton
2161
-                makeSomething(mocap, false); // true);
2223
+                makeSomething(mocap, true); // true);
2162
2224
             }
2163
2225
         } catch (Exception e)
2164
2226
         {
..
..
@@ -2185,6 +2247,8 @@
2185
2247
         {
2186
2248
             Mocap sel = (Mocap) select;
2187
2249
 
2250
+            sel.SetCurrentBones(sel.frame);
2251
+            
2188
2252
             File file = new File(fullname);
2189
2253
 
2190
2254
             //       Mocap mocap = new Mocap("Mocap" + file.getName());
..
..
@@ -2251,7 +2315,11 @@
2251
2315
 
2252
2316
             if (!changename)
2253
2317
             {
2254
-                sel.SetPositionDelta(false, true, true, true/*?*/);
2318
+                //sel.SetPositionDelta(false, true, true, true/*?*/);
2319
+                sel.SetGlobalTransform();
2320
+                sel.LoadData();
2321
+                sel.Rewind();
2322
+                sel.Fade();
2255
2323
             }
2256
2324
 
2257
2325
             //          sel.setPose(0);