Project

General

Profile

« Previous | Next » 

Revision ca4a3a68

Added by Leszek Koltunski 12 months ago

Algorithms now have their 'layers' in bitmap form.

We have to update all object JSON files.

View differences:

src/main/java/org/distorted/objectlib/objects/TwistyCamouflage.java
22 22
import org.distorted.objectlib.main.InitData;
23 23
import org.distorted.objectlib.main.ObjectSignatures;
24 24
import org.distorted.objectlib.main.ObjectType;
25
import org.distorted.objectlib.scrambling.ObjectScrambler;
26 25

  
27 26
///////////////////////////////////////////////////////////////////////////////////////////////////
28 27

  
......
156 155
    return new int[][]
157 156
      {
158 157
        // VTS' algorithm1: ('swap 2 edges and 2 pairs of centers')
159
        {2, 1, 1,  1, 0, 1,  0, 2, 1,  1, 0,-1,  0, 2,-1,
160
         1, 0, 1,  0, 2, 1,  1, 0,-1,  0, 2,-1,  2, 1,-1,
161
         0, 2, 1,  1, 0, 1,  0, 2,-1,  1, 0,-1,  0, 2, 1,
162
         1, 0, 1,  0, 2,-1,  1, 0,-1,  0, 2, 1,  0, 3, 1,
163
         1, 0, 2,  2, 0, 1,  1, 0,-2,  2, 0,-1,  1, 0, 2,
164
         0, 2,-1,  2, 1, 1,  0, 2, 1,  1, 0, 2,  2, 0, 1,
165
         1, 0,-2,  2, 0,-1,  1, 0, 2,  0, 2,-1,  2, 1,-2},
158
        {2, 2, 1,  1, 1, 1,  0, 4, 1,  1, 1,-1,  0, 4,-1,
159
         1, 1, 1,  0, 4, 1,  1, 1,-1,  0, 4,-1,  2, 2,-1,
160
         0, 4, 1,  1, 1, 1,  0, 4,-1,  1, 1,-1,  0, 4, 1,
161
         1, 1, 1,  0, 4,-1,  1, 1,-1,  0, 4, 1,  0, 8, 1,
162
         1, 1, 2,  2, 1, 1,  1, 1,-2,  2, 1,-1,  1, 1, 2,
163
         0, 4,-1,  2, 2, 1,  0, 4, 1,  1, 1, 2,  2, 1, 1,
164
         1, 1,-2,  2, 1,-1,  1, 1, 2,  0, 4,-1,  2, 2,-2},
166 165

  
167 166
        // algorithm1 rotated around the corner
168
        {1, 1, 1,  0, 2,-1,  2, 0,-1,  0, 2, 1,  2, 0, 1,
169
         0, 2,-1,  2, 0,-1,  0, 2, 1,  2, 0, 1,  1, 1,-1,
170
         2, 0,-1,  0, 2,-1,  2, 0, 1,  0, 2, 1,  2, 0,-1,
171
         0, 2,-1,  2, 0, 1,  0, 2, 1,  2, 1,-1,  2, 0,-1,
172
         0, 2,-2,  1, 0, 1,  0, 2, 2,  1, 0,-1,  0, 2,-2,
173
         2, 0, 1,  1, 1, 1,  2, 0,-1,  0, 2,-2,  1, 0, 1,
174
         0, 2, 2,  1, 0,-1,  0, 2,-2,  2, 0, 1,  1, 1,-2},
167
        {1, 2, 1,  0, 4,-1,  2, 1,-1,  0, 4, 1,  2, 1, 1,
168
         0, 4,-1,  2, 1,-1,  0, 4, 1,  2, 1, 1,  1, 2,-1,
169
         2, 1,-1,  0, 4,-1,  2, 1, 1,  0, 4, 1,  2, 1,-1,
170
         0, 4,-1,  2, 1, 1,  0, 4, 1,  2, 2,-1,  2, 1,-1,
171
         0, 4,-2,  1, 1, 1,  0, 4, 2,  1, 1,-1,  0, 4,-2,
172
         2, 1, 1,  1, 2, 1,  2, 1,-1,  0, 4,-2,  1, 1, 1,
173
         0, 4, 2,  1, 1,-1,  0, 4,-2,  2, 1, 1,  1, 2,-2},
175 174

  
176 175
        // algorithm1 rotated again around the corner
177
        {0, 2,-1,  2, 0, 1,  1, 0,-1,  2, 0,-1,  1, 0, 1,
178
         2, 0, 1,  1, 0,-1,  2, 0,-1,  1, 0, 1,  0, 2, 1,
179
         1, 0,-1,  2, 0, 1,  1, 0, 1,  2, 0,-1,  1, 0,-1,
180
         2, 0, 1,  1, 0, 1,  2, 0,-1,  1, 1,-1,  1, 0,-1,
181
         2, 0, 2,  0, 2,-1,  2, 0,-2,  0, 2, 1,  2, 0, 2,
182
         1, 0, 1,  0, 2,-1,  1, 0,-1,  2, 0, 2,  0, 2,-1,
183
         2, 0,-2,  0, 2, 1,  2, 0, 2,  1, 0, 1,  0, 2, 2},
176
        {0, 4,-1,  2, 1, 1,  1, 1,-1,  2, 1,-1,  1, 1, 1,
177
         2, 1, 1,  1, 1,-1,  2, 1,-1,  1, 1, 1,  0, 4, 1,
178
         1, 1,-1,  2, 1, 1,  1, 1, 1,  2, 1,-1,  1, 1,-1,
179
         2, 1, 1,  1, 1, 1,  2, 1,-1,  1, 2,-1,  1, 1,-1,
180
         2, 1, 2,  0, 4,-1,  2, 1,-2,  0, 4, 1,  2, 1, 2,
181
         1, 1, 1,  0, 4,-1,  1, 1,-1,  2, 1, 2,  0, 4,-1,
182
         2, 1,-2,  0, 4, 1,  2, 1, 2,  1, 1, 1,  0, 4, 2},
184 183

  
185 184
       // VTS' algorithm2: swap two 221 edges
186
        {2, 2, 1,  1, 0, 1,  2, 2,-1,  1, 0,-1,  1, 2, 1,
187
         2, 2,-2,  0, 2,-1,  2, 2, 2,  0, 2, 1,  2, 2,-2,
188
         1, 2,-1,  0, 2,-1,  1, 2, 1,  2, 2,-2,  0, 2,-1,
189
         2, 2, 2,  0, 2, 1,  2, 2,-2,  1, 2,-1,  0, 2,-2,
190
         1, 0, 1,  2, 2, 1,  1, 0,-1,  2, 2, -1},
185
        {2, 4, 1,  1, 1, 1,  2, 4,-1,  1, 1,-1,  1, 4, 1,
186
         2, 4,-2,  0, 4,-1,  2, 4, 2,  0, 4, 1,  2, 4,-2,
187
         1, 4,-1,  0, 4,-1,  1, 4, 1,  2, 4,-2,  0, 4,-1,
188
         2, 4, 2,  0, 4, 1,  2, 4,-2,  1, 4,-1,  0, 4,-2,
189
         1, 1, 1,  2, 4, 1,  1, 1,-1,  2, 4,-1},
191 190

  
192 191
       // algorithm2 rotated around the corner
193
        {0, 0,-1,  2, 0, 1,  0, 0, 1,  2, 0,-1,  2, 2, 1,
194
         0, 0, 2,  1, 0, 1,  0, 0,-2,  1, 0,-1,  0, 0, 2,
195
         2, 2,-1,  1, 1, 1,  2, 2, 1,  0, 0, 2,  1, 0, 1,
196
         0, 0,-2,  1, 0,-1,  0, 0, 2,  2, 2,-1,  1, 1, 2,
197
         2, 0, 1,  0, 0,-1,  2, 0,-1,  0, 0, 1},
192
        {0, 1,-1,  2, 1, 1,  0, 1, 1,  2, 1,-1,  2, 4, 1,
193
         0, 1, 2,  1, 1, 1,  0, 1,-2,  1, 1,-1,  0, 1, 2,
194
         2, 4,-1,  1, 2, 1,  2, 4, 1,  0, 1, 2,  1, 1, 1,
195
         0, 1,-2,  1, 1,-1,  0, 1, 2,  2, 4,-1,  1, 2, 2,
196
         2, 1, 1,  0, 1,-1,  2, 1,-1,  0, 1, 1},
198 197

  
199 198
       // algorithm2 rotated again around the corner
200
        {1, 2, 1,  0, 2,-1,  1, 2,-1,  0, 2, 1,  0, 0,-1,
201
         1, 2,-2,  2, 0, 1,  1, 2, 2,  2, 0,-1,  1, 2,-2,
202
         0, 0, 1,  2, 1, 1,  0, 0,-1,  1, 2,-2,  2, 0, 1,
203
         1, 2, 2,  2, 0,-1,  1, 2,-2,  0, 0, 1,  2, 1, 2,
204
         0, 2,-1,  1, 2, 1,  0, 2, 1,  1, 2,-1},
199
        {1, 4, 1,  0, 4,-1,  1, 4,-1,  0, 4, 1,  0, 1,-1,
200
         1, 4,-2,  2, 1, 1,  1, 4, 2,  2, 1,-1,  1, 4,-2,
201
         0, 1, 1,  2, 2, 1,  0, 1,-1,  1, 4,-2,  2, 1, 1,
202
         1, 4, 2,  2, 1,-1,  1, 4,-2,  0, 1, 1,  2, 2, 2,
203
         0, 4,-1,  1, 4, 1,  0, 4, 1,  1, 4,-1},
205 204

  
206 205
       // VTS' algorithm3: swap two 221 blocks
207
        {2, 2,-2,  0, 2,-1,  2, 2, 2,  0, 2, 1,  2, 2,-2,
208
         1, 2,-1,  0, 2,-1,  1, 2, 1,  2, 2,-2,  0, 2,-1,
209
         2, 2, 2,  0, 2, 1,  2, 2,-2,  1, 2,-1,  0, 2, 2,
210
         1, 2, 1 },
206
        {2, 4,-2,  0, 4,-1,  2, 4, 2,  0, 4, 1,  2, 4,-2,
207
         1, 4,-1,  0, 4,-1,  1, 4, 1,  2, 4,-2,  0, 4,-1,
208
         2, 4, 2,  0, 4, 1,  2, 4,-2,  1, 4,-1,  0, 4, 2,
209
         1, 4, 1 },
211 210

  
212 211
       // algorithm3 rotated around the corner
213
        {0, 0,-2,  1, 0, 1,  0, 0,-2,  1, 0,-1,  0, 0, 2,
214
         2, 2,-1,  1, 1, 1,  2, 2, 1,  0, 0, 2,  1, 0, 1,
215
         0, 0,-2,  1, 0,-1,  0, 0, 2,  2, 2,-1,  1, 1,-2,
216
         2, 2, 1 },
212
        {0, 1,-2,  1, 1, 1,  0, 1,-2,  1, 1,-1,  0, 1, 2,
213
         2, 4,-1,  1, 2, 1,  2, 4, 1,  0, 1, 2,  1, 1, 1,
214
         0, 1,-2,  1, 1,-1,  0, 1, 2,  2, 4,-1,  1, 4,-2,
215
         2, 4, 1 },
217 216

  
218 217
       // algorithm3 rotated again around the corner
219
        {1, 2, 2,  2, 0, 1,  1, 2, 2,  2, 0,-1,  1, 2,-2,
220
         0, 0, 1,  2, 1, 1,  0, 0,-1,  1, 2,-2,  2, 0, 1,
221
         1, 2, 2,  2, 0,-1,  1, 2,-2,  0, 0, 1,  2, 1,-2,
222
         0, 0,-1 }
218
        {1, 4, 2,  2, 1, 1,  1, 4, 2,  2, 1,-1,  1, 4,-2,
219
         0, 1, 1,  2, 2, 1,  0, 1,-1,  1, 4,-2,  2, 1, 1,
220
         1, 4, 2,  2, 1,-1,  1, 4,-2,  0, 1, 1,  2, 2,-2,
221
         0, 1,-1 }
223 222
      };
224 223
    }
225 224

  

Also available in: Unified diff