.. | .. |
---|
100 | 100 | other.softtouched = softtouched; |
---|
101 | 101 | |
---|
102 | 102 | other.random = random; |
---|
103 | | - other.link2master = link2master; |
---|
| 103 | + other.link2support = link2support; |
---|
104 | 104 | other.transformcount = transformcount; |
---|
105 | 105 | other.marked = marked; |
---|
106 | 106 | other.skip = skip; |
---|
.. | .. |
---|
220 | 220 | return; |
---|
221 | 221 | |
---|
222 | 222 | transientsupport = support; |
---|
223 | | - transientlink2master = link2master; |
---|
| 223 | + transientlink2master = link2support; |
---|
224 | 224 | |
---|
225 | 225 | support = null; |
---|
226 | | - link2master = false; |
---|
| 226 | + link2support = false; |
---|
227 | 227 | |
---|
228 | 228 | if (bRep != null) |
---|
229 | 229 | { |
---|
.. | .. |
---|
247 | 247 | return; |
---|
248 | 248 | |
---|
249 | 249 | support = transientsupport; |
---|
250 | | - link2master = transientlink2master; |
---|
| 250 | + link2support = transientlink2master; |
---|
251 | 251 | transientsupport = null; |
---|
252 | 252 | transientlink2master = false; |
---|
253 | 253 | |
---|
.. | .. |
---|
633 | 633 | transient boolean keepdontselect; |
---|
634 | 634 | boolean dontselect = false; |
---|
635 | 635 | boolean hide = false; |
---|
636 | | - boolean link2master = false; // performs reset support/master at each frame |
---|
| 636 | + boolean link2support = false; // performs reset support/master at each frame |
---|
637 | 637 | boolean marked = false; // animation node |
---|
638 | 638 | boolean skip = false; // centroid issue |
---|
639 | 639 | boolean skipmocap = false; // mocap data |
---|
.. | .. |
---|
2202 | 2202 | { |
---|
2203 | 2203 | support = other; |
---|
2204 | 2204 | |
---|
2205 | | - link2master = support != null; |
---|
| 2205 | + link2support = support != null; |
---|
2206 | 2206 | |
---|
2207 | 2207 | if (support != null && bRep.trimmed) |
---|
2208 | 2208 | { |
---|
.. | .. |
---|
3921 | 3921 | //if (bRep != null) |
---|
3922 | 3922 | if (//marked || // does not make sense |
---|
3923 | 3923 | (bRep != null || material != null)) // borderline... |
---|
3924 | | - link2master = h; |
---|
| 3924 | + link2support = h; |
---|
3925 | 3925 | |
---|
3926 | 3926 | for (int i = 0; i < Size(); i++) |
---|
3927 | 3927 | { |
---|
.. | .. |
---|
6159 | 6159 | boolean NeedSupport() |
---|
6160 | 6160 | { |
---|
6161 | 6161 | return |
---|
6162 | | - CameraPane.SUPPORT && (!CameraPane.movingcamera || (!Globals.FREEZEONMOVE && Globals.isLIVE())) && link2master && /*live &&*/ support != null |
---|
| 6162 | + CameraPane.SUPPORT && (!CameraPane.movingcamera || (!Globals.FREEZEONMOVE && Globals.isLIVE())) && link2support && /*live &&*/ support != null |
---|
6163 | 6163 | // PROBLEM with CROWD!! |
---|
6164 | 6164 | && (Globals.DrawMode() == iCameraPane.SHADOW || !Globals.RENDERSHADOW || Globals.CROWD); |
---|
6165 | 6165 | } |
---|
.. | .. |
---|
6243 | 6243 | support = support; |
---|
6244 | 6244 | |
---|
6245 | 6245 | boolean usecalllists = !IsDynamic() && |
---|
6246 | | - IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT || support == null || !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch); |
---|
| 6246 | + IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT || support == null || !link2support); // !(this instanceof cSpring) && !(this instanceof BezierPatch); |
---|
6247 | 6247 | //boolean usecalllists = false; //!IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT || support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch); |
---|
6248 | 6248 | |
---|
6249 | 6249 | //usecalllists &= display.DrawMode() == display.DEFAULT; // Don't compute list in shadow pass. |
---|
.. | .. |
---|
6350 | 6350 | { |
---|
6351 | 6351 | if (display.DrawMode() == iCameraPane.SHADOW) |
---|
6352 | 6352 | { |
---|
6353 | | - if (!link2master // tricky to cull in shadow mode. |
---|
| 6353 | + if (!link2support // tricky to cull in shadow mode. |
---|
6354 | 6354 | && GetBRep().FrustumCull(this, null, display.LightCamera(), true)) |
---|
6355 | 6355 | { |
---|
6356 | 6356 | //System.out.print("CULLED"); |
---|