Project

General

Profile

« Previous | Next » 

Revision ff60e713

Added by Leszek Koltunski almost 2 years ago

Progress with sticker overrides.

View differences:

src/main/java/org/distorted/objectlib/objects/TwistyCrazy3x3.java
20 20
package org.distorted.objectlib.objects;
21 21

  
22 22
import java.io.InputStream;
23
import java.util.ArrayList;
23 24

  
24 25
import org.distorted.library.type.Static3D;
25 26
import org.distorted.library.type.Static4D;
......
100 101
      };
101 102
    }
102 103

  
104
///////////////////////////////////////////////////////////////////////////////////////////////////
105

  
106
  private boolean cubitIsOverriden(int cubit)
107
    {
108
    float[] offset = getCubitRowOffset(cubit);
109
    return offset[0]*offset[0]+offset[1]*offset[1]+offset[2]*offset[2] == 0;
110
    }
103 111

  
104 112
///////////////////////////////////////////////////////////////////////////////////////////////////
105 113

  
106 114
  @Override
107 115
  public ObjectStickerOverride[] getStickerOverrides()
108 116
    {
109
    ObjectStickerOverride[] overrides = new ObjectStickerOverride[6];
117
    ArrayList<Integer> cubits = new ArrayList<>();
110 118

  
111 119
    for(int i=0; i<6; i++)
120
      if( cubitIsOverriden(20+i) ) cubits.add(20+i);
121

  
122
    int numOverrides = cubits.size();
123

  
124
    if( numOverrides>0 )
112 125
      {
113
      int cubit = 20+i;
114
      float[] offset = getCubitRowOffset(cubit);
115
      float isX = offset[0]*offset[0]+offset[1]*offset[1]+offset[2]*offset[2];
116
      overrides[i] = new ObjectStickerOverride(cubit,6,isX==0 ? 0xff0f0000 : 0xff000000 );
126
      ObjectStickerOverride[] overrides = new ObjectStickerOverride[1];
127
      int[] cubfac = new int[2*numOverrides];
128
      for(int i=0; i<numOverrides; i++)
129
        {
130
        cubfac[2*i  ] = cubits.get(i);
131
        cubfac[2*i+1] = 6;
132
        }
133
      overrides[0] = new ObjectStickerOverride(cubfac,0x00ffffff);
134
      return overrides;
117 135
      }
118 136

  
119
    return overrides;
137
    return null;
120 138
    }
121 139

  
122 140
///////////////////////////////////////////////////////////////////////////////////////////////////

Also available in: Unified diff