.. | .. |
---|
174 | 174 | { |
---|
175 | 175 | Object3D o = hashtable.get(GetUUID()); |
---|
176 | 176 | |
---|
177 | | - assert(this.bRep == o.bRep); |
---|
| 177 | + Grafreed.Assert(this.bRep == o.bRep); |
---|
178 | 178 | if (this.bRep != null) |
---|
179 | 179 | assert(this.bRep.support == o.transientrep); |
---|
180 | 180 | |
---|
.. | .. |
---|
563 | 563 | toParent = LA.newMatrix(); |
---|
564 | 564 | fromParent = LA.newMatrix(); |
---|
565 | 565 | } |
---|
| 566 | + |
---|
566 | 567 | if (toParentMarked == null) |
---|
567 | 568 | { |
---|
568 | 569 | if (maxcount != 1) |
---|
569 | 570 | { |
---|
570 | 571 | new Exception().printStackTrace(); |
---|
571 | 572 | } |
---|
| 573 | + |
---|
572 | 574 | toParentMarked = LA.newMatrix(); |
---|
573 | 575 | fromParentMarked = LA.newMatrix(); |
---|
574 | 576 | } |
---|
.. | .. |
---|
5572 | 5574 | boolean NeedSupport() |
---|
5573 | 5575 | { |
---|
5574 | 5576 | return |
---|
5575 | | - CameraPane.SUPPORT && (!CameraPane.movingcamera || !Globals.FREEZEONMOVE) && link2master && /*live &&*/ support != null |
---|
| 5577 | + CameraPane.SUPPORT && (!CameraPane.movingcamera || (!Globals.FREEZEONMOVE && Globals.isLIVE())) && link2master && /*live &&*/ support != null |
---|
5576 | 5578 | // PROBLEM with CROWD!! |
---|
5577 | 5579 | && (Globals.DrawMode() == iCameraPane.SHADOW || !Globals.RENDERSHADOW || Globals.CROWD); |
---|
5578 | 5580 | } |
---|
5579 | 5581 | |
---|
5580 | 5582 | static boolean DEBUG_SELECTION = false; |
---|
| 5583 | + |
---|
| 5584 | + boolean IsLive() |
---|
| 5585 | + { |
---|
| 5586 | + if (live) |
---|
| 5587 | + return true; |
---|
| 5588 | + |
---|
| 5589 | + if (parent == null) |
---|
| 5590 | + return false; |
---|
| 5591 | + |
---|
| 5592 | + return parent.IsLive(); |
---|
| 5593 | + } |
---|
5581 | 5594 | |
---|
5582 | 5595 | void Draw(iCameraPane display, Object3D /*Composite*/ root, boolean selected, boolean blocked) |
---|
5583 | 5596 | { |
---|
.. | .. |
---|
5640 | 5653 | support = support; |
---|
5641 | 5654 | |
---|
5642 | 5655 | //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); |
---|
| 5656 | + boolean usecalllists = IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT || support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch); |
---|
5644 | 5657 | |
---|
5645 | 5658 | if (!usecalllists && bRep != null && bRep.displaylist > 0) |
---|
5646 | 5659 | { |
---|