blame | history | patch | commit | commitdiff
Normand Briere
2019-04-22 c60a1ad4f6aa4904e80280586b440a584b5ff061 
 Object3D.java
....@@ -21,6 +21,19 @@
2121     
2222     ScriptNode scriptnode;
2323 
24
+        void InitOthers()
25
+        {
26
+                if (projectedVertices == null || projectedVertices.length <= 2)
27
+                {
28
+                    projectedVertices = new Object3D.cVector2[3];
29
+                }
30
+                for (int i = 0; i < 3; i++)
31
+                {
32
+                    projectedVertices[i] = new cVector2(); // Others
33
+                }
34
+                projectedVertices[0].x = 100; // bump
35
+        }
36
+
2437     void MinMax(cVector minima, cVector maxima)
2538     {
2639         for (int xyz = 0; xyz < 3; xyz++)
....@@ -295,6 +308,8 @@
295308     boolean random = false;
296309     boolean speedup = false;
297310     boolean rewind = false;
311
+    
312
+    float NORMALPUSH = 0;
298313     
299314     Object3D support;
300315     
....@@ -745,7 +760,7 @@
745760     
746761     int GetTransformCount()
747762     {
748
-        // marde pour serialization de Texture
763
+        // patch pour serialization de Texture
749764         resetmaxcount();
750765         resettransformcount();
751766         resetstep();
....@@ -779,9 +794,12 @@
779794 //            factor = CameraPane.STEP;
780795 //        }
781796         
782
-        if (marked && CameraPane.isLIVE() && live && CameraPane.drawMode == CameraPane.SHADOW && currentframe != CameraPane.framecount)
797
+        if (marked && Globals.isLIVE() && live &&
798
+                //TEMP21aug2018
799
+                Globals.DrawMode() == iCameraPane.SHADOW &&
800
+                currentframe != Globals.framecount)
783801         {
784
-            currentframe = CameraPane.framecount;
802
+            currentframe = Globals.framecount;
785803             
786804 //            System.err.println("transformcount = " + transformcount);
787805 //            System.err.println("factor = " + factor);
....@@ -2130,15 +2148,8 @@
21302148         if (/*parent != null &&*/ material == null)
21312149         {
21322150             material = new cMaterial(GetMaterial());
2133
-            if (projectedVertices == null || projectedVertices.length <= 2)
2134
-            {
2135
-                projectedVertices = new Object3D.cVector2[3];
2136
-            }
2137
-            for (int i = 0; i < 3; i++)
2138
-            {
2139
-                projectedVertices[i] = new cVector2(); // Others
2140
-            }
2141
-            projectedVertices[0].x = 100; // bump
2151
+            
2152
+            InitOthers();
21422153             
21432154             if (this instanceof Camera)
21442155             {
....@@ -4161,6 +4172,22 @@
41614172         }
41624173     }
41634174     
4175
+    void RepairShadow()
4176
+    {
4177
+        if (blockloop)
4178
+            return;
4179
+        
4180
+        if (this.material != null)
4181
+            this.InitOthers();
4182
+                
4183
+        for (int i=0; i<Size(); i++)
4184
+        {               
4185
+                blockloop = true;
4186
+            get(i).RepairShadow();
4187
+                blockloop = false;
4188
+        }
4189
+    }
4190
+    
41644191     void RepairTexture()
41654192     {
41664193         if (this instanceof FileObject || blockloop)
....@@ -4974,7 +5001,8 @@
49745001         } else //
49755002         if (editWindow != null)
49765003         {
4977
-            editWindow.cameraView.lighttouched = true;
5004
+            //editWindow.cameraView.lighttouched = true;
5005
+            Globals.lighttouched = true;
49785006         }
49795007     }
49805008 
....@@ -5286,25 +5314,21 @@
52865314         }
52875315     }
52885316     
5289
-    void draw(CameraPane display, Object3D /*Composite*/ root, boolean selected, boolean blocked)
5317
+    void draw(iCameraPane display, Object3D /*Composite*/ root, boolean selected, boolean blocked)
52905318     {
52915319         Draw(display, root, selected, blocked);
52925320     }
52935321     
5294
-    static cMaterial[] materialstack = new cMaterial[65536];
5295
-    static boolean[] selectedstack = new boolean[65536];
5296
-    static int materialdepth = 0;
5297
-
52985322     boolean NeedSupport()
52995323     {
53005324         return
53015325                 CameraPane.SUPPORT && !CameraPane.movingcamera && link2master && /*live &&*/ support != null
53025326                  // PROBLEM with CROWD!!
5303
-                    && (CameraPane.drawMode == CameraPane.SHADOW || CameraPane.CROWD);
5327
+                    && (Globals.DrawMode() == iCameraPane.SHADOW || Globals.CROWD);
53045328     }
53055329     
53065330     
5307
-    void Draw(CameraPane display, Object3D /*Composite*/ root, boolean selected, boolean blocked)
5331
+    void Draw(iCameraPane display, Object3D /*Composite*/ root, boolean selected, boolean blocked)
53085332     {
53095333         Invariants(); // june 2013
53105334             
....@@ -5313,7 +5337,7 @@
53135337         //    System.err.println("Draw " + this + " Frame # " + ((Mocap)((Merge)support).object).frame);
53145338         }
53155339         
5316
-        if (display.drawMode == CameraPane.SELECTION &&
5340
+        if (display.DrawMode() == iCameraPane.SELECTION &&
53175341                 hide)
53185342             return;
53195343 
....@@ -5332,7 +5356,7 @@
53325356         if (this instanceof Checker)
53335357             return;
53345358         
5335
-        if (display.drawMode == display.SHADOW && PASSTEST)
5359
+        if (display.DrawMode() == display.SHADOW && PASSTEST)
53365360             return;
53375361         
53385362         if (count <= 0)
....@@ -5340,8 +5364,8 @@
53405364             return;
53415365         }
53425366 
5343
-        if ((//display.drawMode == CameraPane.SHADOW ||
5344
-                display.drawMode == CameraPane.SELECTION || CameraPane.DEBUG_SELECTION) && HasTransparency())
5367
+        if ((//display.DrawMode() == CameraPane.SHADOW ||
5368
+                display.DrawMode() == CameraPane.SELECTION || CameraPane.DEBUG_SELECTION) && HasTransparency())
53455369         {
53465370             return;
53475371         }
....@@ -5382,15 +5406,15 @@
53825406 
53835407         boolean compiled = false;
53845408 
5385
-        boolean selectmode = display.drawMode == display.SELECTION || CameraPane.DEBUG_SELECTION;
5409
+        boolean selectmode = display.DrawMode() == display.SELECTION || CameraPane.DEBUG_SELECTION;
53865410         
5387
-        if (!selectmode && //display.drawMode != display.SELECTION &&
5411
+        if (!selectmode && //display.DrawMode() != display.SELECTION &&
53885412                 (touched || (bRep != null && bRep.displaylist <= 0)))
53895413         {
5390
-            display.lighttouched = true;
5414
+            Globals.lighttouched = true;
53915415         } // all panes...
5392
-        //if (usecalllists && display.drawMode != display.SELECTION && display.drawMode != display.SHADOW &&
5393
-        if (bRep != null && usecalllists && !selectmode && // june 2013 display.drawMode != display.SHADOW &&
5416
+        //if (usecalllists && display.DrawMode() != display.SELECTION && display.DrawMode() != display.SHADOW &&
5417
+        if (bRep != null && usecalllists && !selectmode && // june 2013 display.DrawMode() != display.SHADOW &&
53945418                 (touched || (bRep != null && bRep.displaylist <= 0)))
53955419         {
53965420             if (!(this instanceof Composite))
....@@ -5421,7 +5445,7 @@
54215445             }
54225446             //gl.glDrawBuffer(gl.GL_BACK);
54235447             // XXX touched = false;
5424
-            display.lighttouched = true; // all panes...
5448
+            Globals.lighttouched = true; // all panes...
54255449         }
54265450 
54275451         touched = GetBRep() == null; // this instanceof Composite || this instanceof FileObject; // false;
....@@ -5460,12 +5484,12 @@
54605484         
54615485         // frustum culling
54625486         if (CameraPane.FRUSTUM && !blocked && !IsInfinite() && GetBRep() != null // && GetBRep().VertexCount() != 1260 // default grid
5463
-                && display.drawMode != CameraPane.SELECTION)
5487
+                && display.DrawMode() != CameraPane.SELECTION)
54645488         {
5465
-            if (display.drawMode == CameraPane.SHADOW)
5489
+            if (display.DrawMode() == CameraPane.SHADOW)
54665490             {
54675491                 if (!link2master // tricky to cull in shadow mode.
5468
-                         && GetBRep().FrustumCull(this, gl, display.lightCamera, true))
5492
+                         && GetBRep().FrustumCull(this, gl, display.LightCamera(), true))
54695493                 {
54705494                     //System.out.print("CULLED");
54715495                     culled = true;
....@@ -5473,7 +5497,7 @@
54735497             }
54745498             else
54755499                 //GetBRep().getBounds(v0, v1, this);
5476
-                if (GetBRep().FrustumCull(this, gl, display.renderCamera, false))
5500
+                if (GetBRep().FrustumCull(this, gl, display.RenderCamera(), false))
54775501                     culled = true;
54785502             
54795503 //            LA.xformPos(v0, display.renderCamera.toScreen, v0);
....@@ -5509,7 +5533,7 @@
55095533 
55105534 
55115535         if (!culled)
5512
-        if (display.drawMode == display.SELECTION || CameraPane.DEBUG_SELECTION)
5536
+        if (display.DrawMode() == display.SELECTION || CameraPane.DEBUG_SELECTION)
55135537         {
55145538             if (GetBRep() != null)
55155539             {
....@@ -5535,55 +5559,7 @@
55355559             color[2] /= 2;
55365560             gl.glMaterialfv(gl.GL_BACK, gl.GL_AMBIENT_AND_DIFFUSE, color, 0);
55375561              */
5538
-            if (material != null)
5539
-            {
5540
-                materialstack[materialdepth] = material;
5541
-                selectedstack[materialdepth] = selected;
5542
-                cStatic.objectstack[materialdepth++] = this;
5543
-                //System.out.println("material " + material);
5544
-                //Applet3D.tracein(this, selected);
5545
-                display.vector2buffer = projectedVertices;
5546
-                if (this instanceof Camera)
5547
-                {
5548
-                    display.options1[0] = material.shift;
5549
-                //System.out.println("shift " + material.shift);
5550
-                    display.options1[1] = material.lightarea;
5551
-                    display.options1[2] = material.shadowbias;
5552
-                    display.options1[3] = material.aniso;
5553
-                    display.options1[4] = material.anisoV;
5554
-                    display.options2[0] = material.opacity;
5555
-                    display.options2[1] = material.diffuse;
5556
-                    display.options2[2] = material.factor;
5557
-
5558
-                    cColor.HSBtoRGB(material.color, material.modulation, 1, display.options3);
5559
-                    display.options4[0] = material.cameralight/0.2f;
5560
-                    display.options4[1] = material.subsurface;
5561
-                    display.options4[2] = material.sheen;
5562
-                    
5563
-                 //   if (display.CURRENTANTIALIAS > 0)
5564
-                 //       display.options3[3] /= 4;
5565
-
5566
-                    /*
5567
-                    System.out.println("Focus = " + display.options1[0]);
5568
-                    System.out.println("Aperture = " + display.options1[1]);
5569
-                    System.out.println("ShadowBlur = " + display.options1[2]);
5570
-                    System.out.println("Antialiasing = " + display.options1[3]);
5571
-                    System.out.println("Fog = " + display.options2[0]);
5572
-                    System.out.println("Intensity = " + display.options2[1]);
5573
-                    System.out.println("Elevation = " + display.options2[2]);
5574
-                /**/
5575
-                } else
5576
-                {
5577
-                    material.Draw(display, selected);
5578
-                }
5579
-            } else
5580
-            {
5581
-                if (selected && CameraPane.flash)
5582
-                {
5583
-                    display.modelParams4[1] = 100;
5584
-                    gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 4, display.modelParams4, 0);
5585
-                }
5586
-            }
5562
+                display.PushMaterial(this, selected);
55875563 
55885564             //System.out.println("call list " + list);
55895565             //System.out.println();
....@@ -5625,23 +5601,8 @@
56255601             }
56265602 
56275603     display.ReleaseTextures(tex);
5628
-     
5629
-            //if (parent != null && parent.GetMaterial() != null)
5630
-            //	parent.GetMaterial().Draw(display, parent.IsSelected(this));
5631
-            if (material != null)
5632
-            {
5633
-                materialdepth -= 1;
5634
-                if (materialdepth > 0)
5635
-                {
5636
-                    display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
5637
-                    materialstack[materialdepth - 1].Draw(display, selectedstack[materialdepth - 1]);
5638
-                }
5639
-            //Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
5640
-            } else if (selected && CameraPane.flash && GetMaterial() != null)
5641
-            {
5642
-                display.modelParams4[1] = GetMaterial().cameralight;
5643
-                gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 4, display.modelParams4, 0);
5644
-            }
5604
+
5605
+    display.PopMaterial(this, selected);
56455606         }
56465607 
56475608         if (this instanceof Texture || this instanceof TextureNode)
....@@ -5683,7 +5644,7 @@
56835644 //            resetMasterNode();
56845645     }
56855646 
5686
-    void CallList(CameraPane display, Object3D /*Composite*/ root, boolean selected, boolean blocked)
5647
+    void CallList(iCameraPane display, Object3D /*Composite*/ root, boolean selected, boolean blocked)
56875648     {
56885649         if (GetBRep() == null)
56895650         {
....@@ -5766,7 +5727,7 @@
57665727     boolean flipV = false; // true;
57675728     int texres = 0; // 0 = low, 1 = normal, 2 = high res texture
57685729     
5769
-    void drawSelf(CameraPane display, Object3D /*Composite*/ root, boolean selected, boolean blocked)
5730
+    void drawSelf(iCameraPane display, Object3D /*Composite*/ root, boolean selected, boolean blocked)
57705731     {
57715732         if (hide)
57725733             return;
....@@ -5825,16 +5786,7 @@
58255786 //  // ???????????????????????????          Touch();
58265787 //        }
58275788 
5828
-        if (material != null)
5829
-        {
5830
-            materialstack[materialdepth] = material;
5831
-            selectedstack[materialdepth] = selected;
5832
-            cStatic.objectstack[materialdepth++] = this;
5833
-            //System.out.println("material " + material);
5834
-            //Applet3D.tracein("selected ", selected);
5835
-            display.vector2buffer = projectedVertices;
5836
-            material.Draw(display, selected);
5837
-        }
5789
+display.PushMaterial2(this, selected);
58385790 
58395791         Object3D child;
58405792         boolean sel;
....@@ -5886,19 +5838,7 @@
58865838          */
58875839         //depth += 1;
58885840 
5889
-        if (material != null)
5890
-        {
5891
-            materialdepth -= 1;
5892
-            if (materialdepth > 0)
5893
-            {
5894
-                display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
5895
-                materialstack[materialdepth - 1].Draw(display, selectedstack[materialdepth - 1]);
5896
-            }
5897
-        //Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
5898
-        //else
5899
-        //material.Draw(display, false);
5900
-        }
5901
-        
5841
+display.PopMaterial2(this);        
59025842 /*
59035843         display.ReleaseTextures(tex);
59045844  */
....@@ -5909,9 +5849,9 @@
59095849 
59105850     //static cVector min,max;
59115851     
5912
-    void DrawNode(CameraPane display, Object3D /*Composite*/ root, boolean selected)
5852
+    void DrawNode(iCameraPane display, Object3D /*Composite*/ root, boolean selected)
59135853     {
5914
-        if (display.drawMode == display.SHADOW && projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
5854
+        if (display.DrawMode() == display.SHADOW && projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
59155855             return; // no shadow for transparent objects
59165856         
59175857         if (hide)
....@@ -5958,7 +5898,7 @@
59585898 
59595899         javax.media.opengl.GL gl = display.GetGL();
59605900 
5961
-        if (CameraPane.BOXMODE) // || CameraPane.movingcamera)
5901
+        if (CameraPane.BOXMODE && !selected) // || CameraPane.movingcamera)
59625902         {
59635903             int fc = bRep.FaceCount();
59645904             int vc = bRep.VertexCount();
....@@ -6033,7 +5973,7 @@
60335973         {
60345974             //throw new Error();
60355975 
6036
-            boolean selectmode = display.drawMode == display.SELECTION || CameraPane.DEBUG_SELECTION;
5976
+            boolean selectmode = display.DrawMode() == display.SELECTION || CameraPane.DEBUG_SELECTION;
60375977 
60385978             int[] strips = bRep.getRawIndices();
60395979 
....@@ -6277,7 +6217,7 @@
62776217 //               //         r.norm.dot(v3) > -0.5)
62786218 //               //         continue;
62796219 
6280
-                    drawFace(p, q, r, display, face);
6220
+                    display.DrawFace(this, p, q, r, face);
62816221                 }
62826222                 gl.glEnd();
62836223             }
....@@ -6321,7 +6261,7 @@
63216261                     Vertex q = bRep.GetVertex(face.q);
63226262                     Vertex r = bRep.GetVertex(face.r);
63236263 
6324
-                    drawFace(p, q, r, display, face);
6264
+                    display.DrawFace(this, p, q, r, face);
63256265                 }
63266266                 gl.glEnd();
63276267             }
....@@ -6461,180 +6401,6 @@
64616401     
64626402     transient FaceCompare[] facescompare = null;
64636403     
6464
-    void SetColor(CameraPane display, Vertex p0)
6465
-    {
6466
-        if (display.RENDERPROGRAM == 0)
6467
-        {
6468
-            float r = 0;
6469
-            if (bRep != null)
6470
-            {
6471
-                if (bRep.stripified)
6472
-                {
6473
-                    r = 1;
6474
-                }
6475
-            }
6476
-            float g = 0;
6477
-            if (bRep != null)
6478
-            {
6479
-                if (bRep.trimmed)
6480
-                {
6481
-                    g = 1;
6482
-                }
6483
-            }
6484
-            float b = 0;
6485
-            if (support != null && link2master)
6486
-            {
6487
-                b = 1;
6488
-            }
6489
-            display.GetGL().glColor3f(r*p0.AO, g*p0.AO, b*p0.AO);
6490
-            return;
6491
-        }
6492
-        
6493
-        if (display.drawMode != CameraPane.SHADOW)
6494
-            return;
6495
-        
6496
-        javax.media.opengl.GL gl = display.GetGL();
6497
-//        if (true) return;
6498
-//        float ao = p.AO;
6499
-//        
6500
-//    //    if (ao == 0 && !bRep.AOdone) // transient problem!
6501
-//    //        ao = 1;
6502
-//        
6503
-//        gl.glColor4f(ao, ao, ao, 1);
6504
-        
6505
-//        CameraPane.selectedpoint.
6506
-//            getAverage(cStatic.point1, true);
6507
-        if (CameraPane.pointflow == null) // !random) // live)
6508
-        {
6509
-            return;
6510
-        }
6511
-        
6512
-        cStatic.point1.set(0,0,0);
6513
-        LA.xformPos(cStatic.point1, CameraPane.selectedpoint.toParent, cStatic.point1);
6514
-
6515
-        cStatic.point1.sub(p0);
6516
-
6517
-
6518
-//        if (marked && (p0.vertexlinks == null || support == null || support.bRep == null)) // no position delta?
6519
-//        {
6520
-//            return;
6521
-//        }
6522
-        
6523
-        //if (true)
6524
-        if (cStatic.point1.dot(cStatic.point1) > 0.000001)
6525
-        {
6526
-            return;
6527
-        }
6528
-        
6529
-        float[] colorV = new float[3];
6530
-        
6531
-        if (false) // marked)
6532
-        {
6533
-            // debug rigging weights
6534
-            for (int object = 0; object < p0.vertexlinks.length; object++)
6535
-            {
6536
-                float weight = p0.weights[object] / p0.totalweight;
6537
-
6538
-    //            if (weight < 0.1)
6539
-    //            {
6540
-    //                assert(weight == 0);
6541
-    //                continue;
6542
-    //            }
6543
-
6544
-                if (p0.vertexlinks[object] == -1)
6545
-                    continue;
6546
-
6547
-                Vertex q = support.bRep.GetVertex(p0.vertexlinks[object]);
6548
-
6549
-                int color = //1 << object; //
6550
-                            //p.vertexlinks.length;
6551
-                        support.bRep.supports[p0.closestsupport].links[object];
6552
-                colorV[2] += (color & 1) * weight;
6553
-                colorV[1] += ((color & 2) >> 1) * weight;
6554
-                colorV[0] += ((color & 4) >> 2) * weight;
6555
-            }
6556
-        }
6557
-        else
6558
-        {
6559
-            if (drawingstarted)
6560
-            {
6561
-                // find next point
6562
-                if (bRep.GetVertex(0).faceindices == null)
6563
-                {
6564
-                    bRep.InitFaceIndices();
6565
-                }
6566
-                
6567
-                double ymin = p0.y;
6568
-                
6569
-                Vertex newp = p0;
6570
-
6571
-                for (int fii = 0; fii < p0.faceindices.length; fii++)
6572
-                {
6573
-                    int fi = p0.faceindices[fii];
6574
-
6575
-                    if (fi == -1)
6576
-                        break;
6577
-
6578
-                    Face f = bRep.GetFace(fi);
6579
-
6580
-                    Vertex p = bRep.GetVertex(f.p);
6581
-                    Vertex q = bRep.GetVertex(f.q);
6582
-                    Vertex r = bRep.GetVertex(f.r);
6583
-                    
6584
-                    int swap = (int)(Math.random()*3);
6585
-                    
6586
-//                    for (int s=swap; --s>=0;)
6587
-//                    {
6588
-//                        Vertex t = p;
6589
-//                        p = q;
6590
-//                        q = r;
6591
-//                        r = t;
6592
-//                    }
6593
-                    if (ymin > p.y)
6594
-                    {
6595
-                        ymin = p.y;
6596
-                        newp = p;
6597
-//                        break;
6598
-                    }
6599
-                    if (ymin > q.y)
6600
-                    {
6601
-                        ymin = q.y;
6602
-                        newp = q;
6603
-//                        break;
6604
-                    }
6605
-                    if (ymin > r.y)
6606
-                    {
6607
-                        ymin = r.y;
6608
-                        newp = r;
6609
-//                        break;
6610
-                    }
6611
-                }
6612
-             
6613
-                CameraPane.selectedpoint.toParent[3][0] = newp.x;
6614
-                CameraPane.selectedpoint.toParent[3][1] = newp.y;
6615
-                CameraPane.selectedpoint.toParent[3][2] = newp.z;
6616
-                
6617
-                drawingstarted = false;
6618
-                
6619
-               // return;
6620
-            }
6621
-            
6622
-            if (false) // CameraPane.DRAW
6623
-            {
6624
-                p0.AO = colorV[0] = 2;
6625
-                colorV[1] = 2;
6626
-                colorV[2] = 2;
6627
-            }
6628
-            
6629
-            CameraPane.pointflow.add(p0);
6630
-            CameraPane.pointflow.Touch();
6631
-        }
6632
-        
6633
-//        gl.glColor3f(colorV[0], colorV[1], colorV[2]);
6634
-//        gl.glMaterialfv(gl.GL_FRONT, gl.GL_DIFFUSE, colorV, 0);
6635
-//        gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
6636
-    }
6637
-    
66386404     void Print(Vertex v)
66396405     {
66406406         //System.err.println("(" + v.x + ", " + v.y + ", " + v.z + ")");
....@@ -6656,152 +6422,6 @@
66566422         gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
66576423     }
66586424     
6659
-    void drawFace(Vertex pv, Vertex qv, Vertex rv,
6660
-                  CameraPane display, Face face)
6661
-    {
6662
-        if (pv.y == -10000 ||
6663
-            qv.y == -10000 ||
6664
-            rv.y == -10000)
6665
-            return;
6666
-            
6667
-//        float b = f.nbiterations & 1;
6668
-//        float g = (f.nbiterations>>1) & 1;
6669
-//        float r = (f.nbiterations>>2) & 1;
6670
-//
6671
-//        //if (f.weight == 10000)
6672
-//        //{
6673
-//        //    r = 1; g = b = 0;
6674
-//        //}
6675
-//        //else
6676
-//        //{
6677
-//        //    assert(f.weight < 10000);
6678
-//            r = g = b = (float)bRep.FaceWeight(f)*100;
6679
-//            if (r<0)
6680
-//            assert(r>=0);
6681
-//        //}
6682
-        
6683
-        javax.media.opengl.GL gl = display.GetGL();
6684
-        
6685
-        boolean selectmode = display.drawMode == display.SELECTION || CameraPane.DEBUG_SELECTION;
6686
-        
6687
-        //System.out.println("p = " + pv + "; q = " + qv + "; r = " + rv);
6688
-        if (!selectmode) // display.drawMode != display.SELECTION) // && display.drawMode != display.SHADOW) // (attributes & FILL) != 0)
6689
-        {
6690
-            //gl.glBegin(gl.GL_TRIANGLES);
6691
-            boolean hasnorm = pv.norm != null; // && (pv.norm.x != 0 || pv.norm.y != 0 || pv.norm.z != 0);
6692
-            if (!hasnorm)
6693
-            {
6694
-           //     System.out.println("FUCK!!");
6695
-                LA.vecSub(pv/*.pos*/, qv/*.pos*/, v0);
6696
-                LA.vecSub(pv/*.pos*/, rv/*.pos*/, v1);
6697
-                LA.vecCross(v0, v1, v2);
6698
-                LA.vecNormalize(v2);
6699
-                gl.glNormal3f((float) v2.x, (float) v2.y, (float) v2.z);
6700
-            }
6701
-
6702
-            if (hasnorm)
6703
-            {
6704
-//            if (!pv.norm.normalized())
6705
-//                assert(pv.norm.normalized());
6706
-            
6707
-                //System.out.println("normalp = " + pv.norm.x + ", " + pv.norm.y + ", " + pv.norm.z);
6708
-                gl.glNormal3f((float) pv.norm.x, (float) pv.norm.y, (float) pv.norm.z);
6709
-            }
6710
-            gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
6711
-            SetColor(display, pv);
6712
-            //gl.glColor4f(r, g, b, 1);
6713
-    //gl.glColor4f(pv.boundary, pv.boundary, pv.boundary, 1);
6714
-            if (flipV)
6715
-                gl.glTexCoord2f((float) pv.s, 1-(float) pv.t);
6716
-            else
6717
-                gl.glTexCoord2f((float) pv.s, (float) pv.t);
6718
-            //System.out.println("vertexp = " + pv.x + ", " + pv.y + ", " + pv.z);
6719
-            gl.glVertex3f((float) pv./*pos.*/x, (float) pv./*pos.*/y, (float) pv./*pos.*/z);
6720
-//            Print(pv);
6721
-            if (hasnorm)
6722
-            {
6723
-//            assert(qv.norm.normalized());
6724
-                //System.out.println("normalq = " + qv.norm.x + ", " + qv.norm.y + ", " + qv.norm.z);
6725
-                gl.glNormal3f((float) qv.norm.x, (float) qv.norm.y, (float) qv.norm.z);
6726
-            }
6727
-            //System.out.println("vertexq = " + qv.s + ", " + qv.t);
6728
-        //    boolean locked = false;
6729
-        //    float eps = 0.1f;
6730
-        //    boolean wrap = CameraPane.UVWRAP; // true; // UV WRAP TEXTURE ISSUE: true = artifacts, false = nice
6731
-            
6732
-        //    int dot = 0; //*/ (int)f.dot;
6733
-            
6734
-        //    if ((dot&1) == 0)
6735
-        //        dot |= (Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps) ? 3 : 1;
6736
-            
6737
-        //    if (wrap || (dot&2) != 0) // Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps)
6738
-            if (flipV)
6739
-                gl.glTexCoord2f((float) qv.s, 1-(float) qv.t);
6740
-            else
6741
-                gl.glTexCoord2f((float) qv.s, (float) qv.t);
6742
-        //    else
6743
-        //    {
6744
-        //        locked = true;
6745
-        //        gl.glTexCoord2f((float) pv.s, (float) pv.t);
6746
-        //    }
6747
-            gl.glColor4f(qv.AO, qv.AO, qv.AO, 1);
6748
-            SetColor(display, qv);
6749
-            //gl.glColor4f(r, g, b, 1);
6750
-   //gl.glColor4f(qv.boundary, qv.boundary, qv.boundary, 1);
6751
-            //System.out.println("vertexq = " + qv.x + ", " + qv.y + ", " + qv.z);
6752
-            gl.glVertex3f((float) qv./*pos.*/x, (float) qv./*pos.*/y, (float) qv./*pos.*/z);
6753
-//            Print(qv);
6754
-            if (hasnorm)
6755
-            {
6756
-//            assert(rv.norm.normalized());
6757
-                //System.out.println("normalr = " + rv.norm.x + ", " + rv.norm.y + ", " + rv.norm.z);
6758
-                gl.glNormal3f((float) rv.norm.x, (float) rv.norm.y, (float) rv.norm.z);
6759
-            }
6760
-            
6761
-        //    if ((dot&4) == 0)
6762
-        //        dot |= (Math.abs(rv.s - pv.s) < eps && Math.abs(rv.t - pv.t) < eps) ? 12 : 4;
6763
-            
6764
-        //    if (wrap || !locked && (dot&8) != 0)
6765
-            if (flipV)
6766
-                gl.glTexCoord2f((float) rv.s, 1-(float) rv.t);
6767
-            else
6768
-                gl.glTexCoord2f((float) rv.s, (float) rv.t);
6769
-        //    else
6770
-        //        gl.glTexCoord2f((float) pv.s, (float) pv.t);
6771
-            
6772
-        //    f.dot = dot;
6773
-            
6774
-            gl.glColor4f(rv.AO, rv.AO, rv.AO, 1);
6775
-            SetColor(display, rv);
6776
-            //gl.glColor4f(r, g, b, 1);
6777
-   //gl.glColor4f(rv.boundary, rv.boundary, rv.boundary, 1);
6778
-            //System.out.println("vertexr = " + rv.x + ", " + rv.y + ", " + rv.z);
6779
-            gl.glVertex3f((float) rv./*pos.*/x, (float) rv./*pos.*/y, (float) rv./*pos.*/z);
6780
-//            Print(rv);
6781
-        //gl.glEnd();
6782
-        }
6783
-        else
6784
-        {
6785
-            gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
6786
-            gl.glVertex3f((float) qv.x, (float) qv.y, (float) qv.z);
6787
-            gl.glVertex3f((float) rv.x, (float) rv.y, (float) rv.z);
6788
-            
6789
-        }
6790
-
6791
-        if (false) // (attributes & WIREFRAME) != 0)
6792
-        {
6793
-            gl.glDisable(gl.GL_LIGHTING);
6794
-
6795
-            gl.glBegin(gl.GL_LINE_LOOP);
6796
-            gl.glVertex3d(pv./*pos.*/x, pv./*pos.*/y, pv./*pos.*/z);
6797
-            gl.glVertex3d(qv./*pos.*/x, qv./*pos.*/y, qv./*pos.*/z);
6798
-            gl.glVertex3d(rv./*pos.*/x, rv./*pos.*/y, rv./*pos.*/z);
6799
-            gl.glEnd();
6800
-
6801
-            gl.glEnable(gl.GL_LIGHTING);
6802
-        }
6803
-    }
6804
-
68056425     void drawSelf(ClickInfo info, int level, boolean select)
68066426     {
68076427         if (bRep == null)
....@@ -8163,6 +7783,8 @@
81637783     {
81647784         Object3D targ = this;
81657785         
7786
+        targ.NORMALPUSH = obj.NORMALPUSH;
7787
+        
81667788         if (obj.material != null)
81677789         {
81687790             if ((mask&MATERIAL)!=0) // ==(COLOR|MATERIAL))