blame | history | patch | commit | commitdiff
Normand Briere
2019-08-26 6266c8a4b2485b29a7d5bcb217460d7aad3e1c4a 
 Object3D.java
....@@ -40,6 +40,19 @@
4040     
4141     ScriptNode scriptnode;
4242 
43
+    int VersionCount()
44
+    {
45
+        int count = 0;
46
+        
47
+        for (int i = versionlist.length; --i >= 0;)
48
+        {
49
+            if (versionlist[i] != null)
50
+                count++;
51
+        }
52
+        
53
+        return count;
54
+    }
55
+    
4356         void InitOthers()
4457         {
4558                 if (projectedVertices == null || projectedVertices.length <= 2)
....@@ -568,11 +581,11 @@
568581         }
569582     }
570583     
571
-    int memorysize;
584
+    transient int memorysize; // needs to be transient, dunno why
572585     
573586     int MemorySize()
574587     {
575
-        if (true) // memorysize == 0)
588
+        if (memorysize == 0)
576589         {
577590             try
578591             {
....@@ -687,7 +700,7 @@
687700         {
688701             if (maxcount != 1)
689702             {
690
-                new Exception().printStackTrace();
703
+                //new Exception().printStackTrace();
691704             }
692705             
693706             toParentMarked = LA.newMatrix();
....@@ -2369,11 +2382,6 @@
23692382             
23702383             InitOthers();
23712384             
2372
-            if (this instanceof Camera)
2373
-            {
2374
-                material.shift = 90;
2375
-            }
2376
-
23772385             material.multiply = multiply;
23782386             
23792387             if (multiply)
....@@ -3269,6 +3277,93 @@
32693277     blockloop = false;
32703278 }
32713279             
3280
+    public void ResetTransform(int mask)
3281
+    {
3282
+        Object3D obj = this;
3283
+        
3284
+        if (mask == -1)
3285
+        {
3286
+            if (obj instanceof Camera) // jan 2014
3287
+            {
3288
+                LA.matIdentity(obj.toParent);
3289
+                LA.matIdentity(obj.fromParent);
3290
+            }
3291
+            else
3292
+            {
3293
+                obj.toParent = null; // jan 2014 LA.matIdentity(obj.toParent);
3294
+                obj.fromParent = null; // LA.matIdentity(obj.fromParent);
3295
+            }
3296
+            return;
3297
+        }
3298
+        
3299
+        if ((mask&2) != 0) // Scale/rotation
3300
+        {
3301
+            obj.toParent[0][0] = obj.toParent[1][1] = obj.toParent[2][2] = 1;
3302
+            obj.toParent[0][1] = obj.toParent[1][0] = obj.toParent[2][0] = 0;
3303
+            obj.toParent[0][2] = obj.toParent[1][2] = obj.toParent[2][1] = 0;
3304
+            obj.fromParent[0][0] = obj.fromParent[1][1] = obj.fromParent[2][2] = 1;
3305
+            obj.fromParent[0][1] = obj.fromParent[1][0] = obj.fromParent[2][0] = 0;
3306
+            obj.fromParent[0][2] = obj.fromParent[1][2] = obj.fromParent[2][1] = 0;
3307
+        }
3308
+        if ((mask&1) != 0) // Translation
3309
+        {
3310
+            if (obj.toParent != null)
3311
+            {
3312
+                obj.toParent[3][0] = obj.toParent[3][1] = obj.toParent[3][2] = 0;
3313
+                obj.fromParent[3][0] = obj.fromParent[3][1] = obj.fromParent[3][2] = 0;
3314
+            }
3315
+        }
3316
+    }
3317
+    
3318
+    public void TextureRatioTransform(int axis)
3319
+    {
3320
+        cTexture tex = GetTextures();
3321
+
3322
+        com.sun.opengl.util.texture.TextureData texturedata = null;
3323
+
3324
+        try
3325
+        {
3326
+            texturedata = Globals.theRenderer.GetTextureData(tex, false, texres);
3327
+        }
3328
+        catch (Exception e)
3329
+        {
3330
+            System.err.println("FAIL TextureRatio: " + this);
3331
+        }
3332
+        
3333
+        LA.matIdentity(Object3D.mat);
3334
+        Object3D.mat[axis][axis] = (double)texturedata.getWidth() / texturedata.getHeight();
3335
+
3336
+        if (toParent == null)
3337
+        {
3338
+            toParent = LA.newMatrix();
3339
+            fromParent = LA.newMatrix();
3340
+        }
3341
+
3342
+        ResetTransform(2);
3343
+        
3344
+        LA.matConcat(Object3D.mat, fromParent, fromParent);
3345
+        LA.matInvert(fromParent, toParent);
3346
+    }
3347
+
3348
+    void TextureRatio(int axis)
3349
+    {
3350
+        if (blockloop)
3351
+            return;
3352
+
3353
+        blockloop = true;
3354
+        
3355
+        TextureRatioTransform(axis);
3356
+        
3357
+        for (int i=Size(); --i>=0;)
3358
+        {
3359
+            Object3D v = get(i);
3360
+
3361
+            v.TextureRatio(axis);
3362
+        }
3363
+
3364
+        blockloop = false;
3365
+    }
3366
+
32723367     void TransformChildren()
32733368     {
32743369         if (toParent != null)
....@@ -5974,6 +6069,11 @@
59746069         return parent.IsLive();
59756070     }
59766071     
6072
+    boolean IsDynamic()
6073
+    {
6074
+        return live && bRep != null;
6075
+    }
6076
+    
59776077     void Draw(iCameraPane display, Object3D /*Composite*/ root, boolean selected, boolean blocked)
59786078     {
59796079         Invariants(); // june 2013
....@@ -6034,7 +6134,8 @@
60346134         if (support != null)
60356135             support = support;
60366136         
6037
-        boolean usecalllists = !IsLive() && IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT || support == null || !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
6137
+        boolean usecalllists = !IsDynamic() &&
6138
+                                    IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT || support == null || !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
60386139         //boolean usecalllists = false; //!IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT || support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
60396140         
60406141         //usecalllists &= display.DrawMode() == display.DEFAULT; // Don't compute list in shadow pass.
....@@ -7716,7 +7817,9 @@
77167817                 
77177818                 scale *= 0.05f * Globals.theRenderer.RenderCamera().Distance();
77187819                 
7719
-                if (modified || opposite)
7820
+                // Modified could snap
7821
+                if (//modified ||
7822
+                        opposite)
77207823                 {
77217824                     //assert(false);
77227825                             /*
....@@ -7810,7 +7913,7 @@
78107913 
78117914                 if (modified)
78127915                 {
7813
-                    // Rotate 90 degrees
7916
+                    // Rotate 45 degrees
78147917                     angle /= (Math.PI / 4);
78157918                     angle = Math.floor(angle + 0.5);
78167919                     angle *= (Math.PI / 4);
....@@ -7896,7 +7999,7 @@
78967999                     case 3: // '\001'
78978000                         if (modified || opposite)
78988001                         {
7899
-                            if (modified && opposite)
8002
+                            if (modified) // && opposite)
79008003                                 LA.matScale(toParent, totalScale, totalScale, totalScale);
79018004                             else
79028005                             //LA.matScale(toParent, 1, hScale, vScale);
....@@ -7912,7 +8015,7 @@
79128015                     case 2: // '\002'
79138016                         if (modified || opposite)
79148017                         {
7915
-                            if (modified && opposite)
8018
+                            if (modified) // && opposite)
79168019                                 LA.matScale(toParent, totalScale, totalScale, totalScale);
79178020                             else
79188021                                 //LA.matScale(toParent, hScale, 1, vScale);
....@@ -7926,7 +8029,7 @@
79268029                     case 1: // '\003'
79278030                         if (modified || opposite)
79288031                         {
7929
-                            if (modified && opposite)
8032
+                            if (modified) // && opposite)
79308033                                 LA.matScale(toParent, totalScale, totalScale, totalScale);
79318034                             else
79328035                                 //LA.matScale(toParent, hScale, vScale, 1);
....@@ -8078,10 +8181,10 @@
80788181         } //  + super.toString();
80798182     //return name + " (" + (SizeOf.deepSizeOf(this)/1024) + "K) " + this.getClass().getName();
80808183         
8081
-        if (!Globals.ADVANCED)
8082
-            return objname;
8184
+//        if (!Globals.ADVANCED)
8185
+//            return objname;
80838186         
8084
-        return objname + " " + System.identityHashCode(this);
8187
+        return objname + " " + System.identityHashCode(this); // + GetUUID()
80858188     }
80868189 
80878190     public int hashCode()