blame | history | patch | commit | commitdiff
Normand Briere
2019-07-07 46dbce888e7c3eff8969f1ddbe22e144410b67f4 
 Object3D.java
....@@ -174,14 +174,14 @@
174174         {
175175             Object3D o = hashtable.get(GetUUID());
176176 
177
-            assert(this.bRep == o.bRep);
177
+            Grafreed.Assert(this.bRep == o.bRep);
178178             if (this.bRep != null)
179179                 assert(this.bRep.support == o.transientrep);
180180 
181181             return;
182182         }
183183 
184
-        Object3D o = new Object3D();
184
+        Object3D o = new Object3D("copy of " + this.name);
185185 
186186         hashtable.put(GetUUID(), o);
187187 
....@@ -219,16 +219,23 @@
219219         if (!hashtable.containsKey(GetUUID()))
220220             return;
221221 
222
+        if (blockloop)
223
+            return;
224
+
225
+        blockloop = true;
226
+
222227         Object3D o = hashtable.get(GetUUID());
223228 
224229         RestoreBigData(o);
225230 
226
-        hashtable.remove(GetUUID());
231
+        //hashtable.remove(GetUUID());
227232 
228233         for (int i=0; i<Size(); i++)
229234         {
230235             get(i).RestoreBigData(hashtable);
231236         }
237
+        
238
+        blockloop = false;
232239     }
233240 
234241     void RestoreBigData(Object3D o)
....@@ -563,12 +570,14 @@
563570             toParent = LA.newMatrix();
564571             fromParent = LA.newMatrix();
565572         }
573
+        
566574         if (toParentMarked == null)
567575         {
568576             if (maxcount != 1)
569577             {
570578                 new Exception().printStackTrace();
571579             }
580
+            
572581             toParentMarked = LA.newMatrix();
573582             fromParentMarked = LA.newMatrix();
574583         }
....@@ -879,7 +888,7 @@
879888         
880889         if (marked && Globals.isLIVE() && live &&
881890                 //TEMP21aug2018
882
-                (Globals.DrawMode() == iCameraPane.SHADOW || !Globals.RENDERSHADOW) &&
891
+                (Globals.DrawMode() == iCameraPane.SHADOW || !Globals.RENDERSHADOW || !Globals.COMPUTESHADOWWHENLIVE) &&
883892                 currentframe != Globals.framecount)
884893         {
885894             currentframe = Globals.framecount;
....@@ -891,7 +900,8 @@
891900             
892901             boolean changedir = random && Math.random() < 0.01; // && !link2master;
893902 
894
-            if (transformcount*factor > maxcount || (step == 1 && changedir))
903
+            if (transformcount*factor >= maxcount && (rewind || random) ||
904
+                    (step == 1 && changedir))
895905             {
896906                 countdown = 1;
897907                 delay = speedup?8:1;
....@@ -963,6 +973,7 @@
963973         if (material == null || material.multiply)
964974             return true;
965975         
976
+        // Transparent objects are dynamic because we have to sort the triangles.
966977         return material.opacity > 0.99;
967978     }
968979     
....@@ -2384,6 +2395,10 @@
23842395         }
23852396          */
23862397         }
2398
+        else
2399
+        {
2400
+            //((ObjEditor)editWindow).SetupUI2(null);
2401
+        }
23872402     }
23882403 
23892404     void createEditWindow(GroupEditor callee, boolean newWindow) //, boolean root)
....@@ -2425,6 +2440,14 @@
24252440         {
24262441             editWindow.refreshContents();
24272442         }
2443
+        else
2444
+        {
2445
+            if (manipWindow != null)
2446
+            {
2447
+                manipWindow.refreshContents();
2448
+            }
2449
+        }
2450
+                
24282451     //if (parent != null)
24292452     //parent.refreshEditWindow();
24302453     }
....@@ -3501,7 +3524,8 @@
35013524         if (blockloop)
35023525             return;
35033526         
3504
-        if (marked || (bRep != null && material != null)) // borderline...
3527
+        if (//marked || // does not make sense
3528
+                (bRep != null || material != null)) // borderline...
35053529             live = h;
35063530         
35073531         for (int i = 0; i < Size(); i++)
....@@ -3522,7 +3546,8 @@
35223546             return;
35233547         
35243548         //if (bRep != null)
3525
-        if (marked || (bRep != null && material != null)) // borderline...
3549
+        if (//marked || // does not make sense
3550
+                (bRep != null || material != null)) // borderline...
35263551             link2master = h;
35273552         
35283553         for (int i = 0; i < Size(); i++)
....@@ -3542,7 +3567,8 @@
35423567         if (blockloop)
35433568             return;
35443569         
3545
-        if (marked || (bRep != null && material != null)) // borderline...
3570
+        if (//marked || // does not make sense
3571
+                (bRep != null || material != null)) // borderline...
35463572             hide = h;
35473573         
35483574         for (int i = 0; i < Size(); i++)
....@@ -3562,7 +3588,7 @@
35623588         if (blockloop)
35633589             return;
35643590         
3565
-        if (bRep != null && material != null) // borderline...
3591
+        if (bRep != null || material != null) // borderline...
35663592             marked = h;
35673593         
35683594         for (int i = 0; i < Size(); i++)
....@@ -3572,6 +3598,46 @@
35723598                 continue;
35733599             blockloop = true;
35743600             child.MarkLeaves(h);
3601
+            blockloop = false;
3602
+         //   release(i);
3603
+        }
3604
+    }
3605
+    
3606
+    void RewindLeaves(boolean h)
3607
+    {
3608
+        if (blockloop)
3609
+            return;
3610
+        
3611
+        if (bRep != null || material != null) // borderline...
3612
+            rewind = h;
3613
+        
3614
+        for (int i = 0; i < Size(); i++)
3615
+        {
3616
+            Object3D child = (Object3D) get(i); // reserve(i);
3617
+            if (child == null)
3618
+                continue;
3619
+            blockloop = true;
3620
+            child.RewindLeaves(h);
3621
+            blockloop = false;
3622
+         //   release(i);
3623
+        }
3624
+    }
3625
+    
3626
+    void RandomLeaves(boolean h)
3627
+    {
3628
+        if (blockloop)
3629
+            return;
3630
+        
3631
+        if (bRep != null || material != null) // borderline...
3632
+            random = h;
3633
+        
3634
+        for (int i = 0; i < Size(); i++)
3635
+        {
3636
+            Object3D child = (Object3D) get(i); // reserve(i);
3637
+            if (child == null)
3638
+                continue;
3639
+            blockloop = true;
3640
+            child.RandomLeaves(h);
35753641             blockloop = false;
35763642          //   release(i);
35773643         }
....@@ -4349,6 +4415,55 @@
43494415         }
43504416     }
43514417     
4418
+    void RepairSOV()
4419
+    {
4420
+        if (blockloop)
4421
+            return;
4422
+
4423
+        String texname = this.GetPigmentTexture();
4424
+        
4425
+        if (texname.startsWith("sov"))
4426
+        {
4427
+            String[] s = texname.split("/");
4428
+
4429
+            String[] sname = s[1].split("Color.pn");
4430
+            
4431
+            texname = sname[0];
4432
+            
4433
+            if (sname.length > 1)
4434
+            {
4435
+                texname += "Color.jpg";
4436
+            }
4437
+            
4438
+            this.SetPigmentTexture("sov/" + texname);
4439
+        }
4440
+                
4441
+        texname = this.GetBumpTexture();
4442
+        
4443
+        if (texname.startsWith("sov"))
4444
+        {
4445
+            String[] s = texname.split("/");
4446
+
4447
+            String[] sname = s[1].split("Bump.pn");
4448
+            
4449
+            texname = sname[0];
4450
+            
4451
+            if (sname.length > 1)
4452
+            {
4453
+                texname += "Bump.jpg";
4454
+            }
4455
+            
4456
+            this.SetBumpTexture("sov/" + texname);
4457
+        }
4458
+                
4459
+        for (int i=0; i<Size(); i++)
4460
+        {               
4461
+                blockloop = true;
4462
+            get(i).RepairSOV();
4463
+                blockloop = false;
4464
+        }
4465
+    }
4466
+    
43524467     void RepairTexture()
43534468     {
43544469         if (this instanceof FileObject || blockloop)
....@@ -4863,6 +4978,14 @@
48634978         }
48644979     }
48654980     
4981
+    ObjEditor GetWindow()
4982
+    {
4983
+        if (editWindow != null)
4984
+            return editWindow;
4985
+        
4986
+        return manipWindow;
4987
+    }
4988
+    
48664989     cTreePath Select(int indexcount, boolean deselect)
48674990     {
48684991         if (hide || dontselect)
....@@ -4899,10 +5022,11 @@
48995022                 if (leaf != null)
49005023                 {
49015024                     cTreePath tp = new cTreePath(this, leaf);
4902
-                    if (editWindow != null)
5025
+                    ObjEditor window = GetWindow();
5026
+                    if (window != null)
49035027                     {
49045028                         //System.out.println("editWindow = " + editWindow + " vs " + this);
4905
-                        editWindow.Select(tp, deselect, true);
5029
+                        window.Select(tp, deselect, true);
49065030                     }
49075031 
49085032                     return tp;
....@@ -4919,6 +5043,7 @@
49195043 
49205044             if (child == null)
49215045                 continue;
5046
+            
49225047             if (child.HasTransparency() && child.size() != 0)
49235048             {
49245049                 cTreePath leaf = child.Select(indexcount, deselect);
....@@ -4928,9 +5053,10 @@
49285053                 if (leaf != null)
49295054                 {
49305055                     cTreePath tp = new cTreePath(this, leaf);
4931
-                    if (editWindow != null)
5056
+                    ObjEditor window = GetWindow();
5057
+                    if (window != null)
49325058                     {
4933
-                        editWindow.Select(tp, deselect, true);
5059
+                        window.Select(tp, deselect, true);
49345060                     }
49355061 
49365062                     return tp;
....@@ -5572,12 +5698,23 @@
55725698     boolean NeedSupport()
55735699     {
55745700         return
5575
-                CameraPane.SUPPORT && (!CameraPane.movingcamera || !Globals.FREEZEONMOVE) && link2master && /*live &&*/ support != null
5701
+                CameraPane.SUPPORT && (!CameraPane.movingcamera || (!Globals.FREEZEONMOVE && Globals.isLIVE())) && link2master && /*live &&*/ support != null
55765702                  // PROBLEM with CROWD!!
55775703                     && (Globals.DrawMode() == iCameraPane.SHADOW || !Globals.RENDERSHADOW || Globals.CROWD);
55785704     }
55795705     
55805706     static boolean DEBUG_SELECTION = false;
5707
+    
5708
+    boolean IsLive()
5709
+    {
5710
+        if (live)
5711
+            return true;
5712
+        
5713
+        if (parent == null)
5714
+            return false;
5715
+        
5716
+        return parent.IsLive();
5717
+    }
55815718     
55825719     void Draw(iCameraPane display, Object3D /*Composite*/ root, boolean selected, boolean blocked)
55835720     {
....@@ -5640,7 +5777,7 @@
56405777             support = support;
56415778         
56425779         //boolean usecalllists = IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT || support == null || !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5643
-        boolean usecalllists = false; // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT || support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5780
+        boolean usecalllists = !IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT || support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
56445781         
56455782         if (!usecalllists && bRep != null && bRep.displaylist > 0)
56465783         {
....@@ -5660,10 +5797,12 @@
56605797         boolean selectmode = display.DrawMode() == display.SELECTION || display.IsDebugSelection();
56615798         
56625799         if (!selectmode && //display.DrawMode() != display.SELECTION &&
5663
-                (touched || (bRep != null && bRep.displaylist <= 0)))
5800
+                //(touched || (bRep != null && bRep.displaylist <= 0)))
5801
+                (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE || touched && Globals.COMPUTESHADOWWHENLIVE)) // || (bRep != null && bRep.displaylist <= 0)))
56645802         {
56655803             Globals.lighttouched = true;
56665804         } // all panes...
5805
+        
56675806         //if (usecalllists && display.DrawMode() != display.SELECTION && display.DrawMode() != display.SHADOW &&
56685807         if (bRep != null && usecalllists && !selectmode && // june 2013 display.DrawMode() != display.SHADOW &&
56695808                 (touched || (bRep != null && bRep.displaylist <= 0)))
....@@ -5791,6 +5930,7 @@
57915930             if (GetBRep() != null)
57925931             {
57935932                 display.NextIndex();
5933
+                
57945934                 // vertex color conflict : gl.glCallList(list);
57955935                 DrawNode(display, root, selected);
57965936                 if (this instanceof BezierPatch)
....@@ -5831,16 +5971,27 @@
58315971         tex = GetTextures();
58325972     }
58335973 
5834
-    boolean failed = false;
5974
+    boolean failedPigment = false;
5975
+    boolean failedBump = false;
58355976     
58365977     try
58375978     {
5838
-        display.BindTextures(tex, texres);
5979
+        display.BindPigmentTexture(tex, texres);
58395980     }
58405981     catch (Exception e)
58415982     {
58425983         System.err.println("FAILED: " + this);
5843
-        failed = true;
5984
+        failedPigment = true;
5985
+    }
5986
+           
5987
+    try
5988
+    {
5989
+        display.BindBumpTexture(tex, texres);
5990
+    }
5991
+    catch (Exception e)
5992
+    {
5993
+        //System.err.println("FAILED: " + this);
5994
+        failedBump = true;
58445995     }
58455996            
58465997             if (!compiled)
....@@ -5863,8 +6014,11 @@
58636014                 }
58646015             }
58656016 
5866
-    if (!failed)
5867
-        display.ReleaseTextures(tex);
6017
+    if (!failedBump)
6018
+        display.ReleaseBumpTexture(tex);
6019
+
6020
+    if (!failedPigment)
6021
+        display.ReleasePigmentTexture(tex);
58686022 
58696023     display.PopMaterial(this, selected);
58706024         }
....@@ -6237,6 +6391,11 @@
62376391                 // dec 2012
62386392                 new Exception().printStackTrace();
62396393                 return;
6394
+            }
6395
+            
6396
+            if (dontselect)
6397
+            {
6398
+                //bRep.GenerateNormalsMINE();
62406399             }
62416400             
62426401             display.DrawGeometry(bRep, flipV, selectmode);
....@@ -7089,7 +7248,7 @@
70897248             spot.translate(32, 32);
70907249             spotw = spot.x + spot.width;
70917250             spoth = spot.y + spot.height;
7092
-            info.g.setColor(Color.blue);
7251
+            info.g.setColor(Color.cyan);
70937252             info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
70947253 //            if (CameraPane.Xmin > spot.x)
70957254 //            {
....@@ -7107,11 +7266,12 @@
71077266 //            {
71087267 //                CameraPane.Ymax = spoth;
71097268 //            }
7110
-            // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - 15);
7111
-            //info.g.drawLine(spotw, spoth, spotw - 15, spoth);
7269
+            // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
7270
+            //info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
71127271             spot.translate(0, -32);
7113
-            info.g.setColor(Color.green);
7272
+            info.g.setColor(Color.yellow);
71147273             info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7274
+            info.g.setColor(Color.green);
71157275 //            if (CameraPane.Xmin > spot.x)
71167276 //            {
71177277 //                CameraPane.Xmin = spot.x;
....@@ -7128,8 +7288,8 @@
71287288 //            {
71297289 //                CameraPane.Ymax = spoth;
71307290 //            }
7131
-            info.g.drawArc(boundary.x, boundary.y,
7132
-                    boundary.width, boundary.height, 0, 360);
7291
+            info.g.drawArc(boundary.x + info.DX, boundary.y + info.DY,
7292
+                    (int)(boundary.width * info.W), (int)(boundary.height * info.W), 0, 360);
71337293             //info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
71347294 //            if (CameraPane.Xmin > boundary.x)
71357295 //            {
....@@ -7429,19 +7589,20 @@
74297589                 switch (info.pane.RenderCamera().viewCode)
74307590                 {
74317591                     case 3: // '\001'
7432
-                        if (modified)
7592
+                        if (modified || opposite)
74337593                         {
74347594                             //LA.matScale(toParent, 1, hScale, vScale);
74357595                             LA.matScale(toParent, totalScale, 1, 1);
74367596                         } // vScale, 1);
74377597                         else
74387598                         {
7599
+                            // EXCEPTION!
74397600                             LA.matScale(toParent, totalScale, totalScale, totalScale);
74407601                         } // vScale, 1);
74417602                         break;
74427603 
74437604                     case 2: // '\002'
7444
-                        if (modified)
7605
+                        if (modified || opposite)
74457606                         {
74467607                             //LA.matScale(toParent, hScale, 1, vScale);
74477608                             LA.matScale(toParent, 1, totalScale, 1);
....@@ -7452,7 +7613,7 @@
74527613                         break;
74537614 
74547615                     case 1: // '\003'
7455
-                        if (modified)
7616
+                        if (modified || opposite)
74567617                         {
74577618                             //LA.matScale(toParent, hScale, vScale, 1);
74587619                             LA.matScale(toParent, 1, 1, totalScale);
....@@ -7672,6 +7833,10 @@
76727833             editWindow = null;
76737834         } // ?
76747835         }
7836
+        else
7837
+        {
7838
+            //editWindow.closeUI();
7839
+        }
76757840     }
76767841     
76777842     boolean root; // patch for edit windows
....@@ -7829,6 +7994,10 @@
78297994     }
78307995     
78317996     transient ObjEditor editWindow;
7997
+    transient ObjEditor manipWindow;
7998
+    
7999
+    transient boolean pinned;
8000
+    
78328001     transient ObjectUI objectUI;
78338002     public static int povDepth = 0;
78348003     private static cVector tbMin = new cVector();