Project

General

Profile

« Previous | Next » 

Revision 3bf19410

Added by Leszek Koltunski about 2 years ago

Mode the 'iconMode' from static variable in ObjectControl to member varaible in TwistyObject (safer)

View differences:

src/main/java/org/distorted/objectlib/objects/TwistyCrystal.java
25 25 
import org.distorted.library.type.Static4D;
26 26 
import org.distorted.objectlib.helpers.ObjectFaceShape;
27 27 
import org.distorted.objectlib.helpers.ObjectShape;
28 
import org.distorted.objectlib.main.ObjectControl;
29 28 
import org.distorted.objectlib.main.ObjectType;
30 29 

  		




  31
  30
  
    
///////////////////////////////////////////////////////////////////////////////////////////////////


  		




  ......




  40
  39
  
    

  		




  41
  40
  
    
///////////////////////////////////////////////////////////////////////////////////////////////////


  		




  42
  41
  
    

  		




  43
  
  
    
  public TwistyCrystal(int[] numL, int meshState, Static4D quat, Static3D move, float scale, InputStream stream)


  		




  
  42
  
    
  public TwistyCrystal(int[] numL, int meshState, int iconMode, Static4D quat, Static3D move, float scale, InputStream stream)


  		




  44
  43
  
    
    {


  		




  45
  
  
    
    super(numL, meshState, quat, move, scale, stream);


  		




  
  44
  
    
    super(numL, meshState, iconMode, quat, move, scale, stream);


  		




  46
  45
  
    
    }


  		




  47
  46
  
    

  		




  48
  47
  
    
///////////////////////////////////////////////////////////////////////////////////////////////////


  		




  ......




  159
  158
  
    
    {


  		




  160
  159
  
    
    if( variant==0 )


  		




  161
  160
  
    
      {


  		




  162
  
  
    
      float[][] bands     = { {0.03f,17,0.5f,0.2f,5,1,0}, {0.01f, 1,0.5f,0.2f,5,1,0} };


  		




  
  161
  
    
      float h1 = isInIconMode() ? 0.001f : 0.03f;


  		




  
  162
  
    
      float h2 = isInIconMode() ? 0.001f : 0.01f;


  		




  
  163
  
    
      float[][] bands     = { {h1,17,0.5f,0.2f,5,1,0}, {h2, 1,0.5f,0.2f,5,1,0} };


  		




  163
  164
  
    
      int[] bandIndices   = { 0,0,1,1 };


  		




  164
  165
  
    
      float[][] corners   = { { 0.015f, 0.20f } };


  		




  165
  166
  
    
      int[] cornerIndices = { 0,0,0,0 };


  		




  ......




  169
  170
  
    
      }


  		




  170
  171
  
    
    else


  		




  171
  172
  
    
      {


  		




  172
  
  
    
      float[][] bands     = { {0.03f,17,0.5f,0.2f,5,1,0}, {0.01f, 1,0.5f,0.2f,5,1,0}, {0.01f, 1,0.5f,0.2f,3,0,0} };


  		




  
  173
  
    
      float h1 = isInIconMode() ? 0.001f : 0.03f;


  		




  
  174
  
    
      float h2 = isInIconMode() ? 0.001f : 0.01f;


  		




  
  175
  
    
      float[][] bands     = { {h1,17,0.5f,0.2f,5,1,0}, {h2, 1,0.5f,0.2f,5,1,0}, {h2, 1,0.5f,0.2f,3,0,0} };


  		




  173
  176
  
    
      int[] bandIndices   = { 0,0,0,1,1,1,2 };


  		




  174
  177
  
    
      float[][] corners   = { { 0.01f, 0.20f } };


  		




  175
  178
  
    
      int[] cornerIndices = { 0,0,0,0,0,0,0 };


  		




  ......




  218
  221
  
    

  		




  219
  222
  
    
  public float getStickerStroke()


  		




  220
  223
  
    
    {


  		




  221
  
  
    
    return ObjectControl.isInIconMode() ? 0.22f : 0.15f;


  		




  
  224
  
    
    return isInIconMode() ? 0.22f : 0.15f;


  		




  222
  225
  
    
    }


  		




  223
  226
  
    

  		




  224
  227
  
    
///////////////////////////////////////////////////////////////////////////////////////////////////


  		












Also available in:  Unified diff