Project

General

Profile

« Previous | Next » 

Revision cf14e8f1

Added by Leszek Koltunski 2 months ago

Beginnings of color unification

View differences:

src/main/java/org/distorted/solvers/SolverDino4.java
9 9

  
10 10
package org.distorted.solvers;
11 11

  
12
import static org.distorted.objectlib.main.TwistyObject.*;
13

  
14 12
import android.content.res.Resources;
15 13

  
16 14
import org.distorted.main.R;
17 15
import org.distorted.objectlib.helpers.OperatingSystemInterface;
18 16
import org.distorted.objectlib.metadata.ListObjects;
19 17
import org.distorted.objectlib.main.TwistyObject;
18
import org.distorted.objectlib.shape.ShapeColors;
20 19
import org.distorted.objectlib.shape.ShapeHexahedron;
21 20
import org.distorted.objectlib.tablebases.ImplementedTablebasesList;
22 21
import org.distorted.objectlib.tablebases.TBDino4;
......
61 60
      {
62 61
      int color = hexColors[i];
63 62

  
64
      if( color==COLOR_WHITE  ) indW = i;
65
      if( color==COLOR_YELLOW ) indY = i;
66
      if( color==COLOR_RED    ) indR = i;
67
      if( color==COLOR_BLUE   ) indB = i;
63
      if( color == ShapeColors.COLOR_WHITE  ) indW = i;
64
      if( color == ShapeColors.COLOR_YELLOW ) indY = i;
65
      if( color == ShapeColors.COLOR_RED    ) indR = i;
66
      if( color == ShapeColors.COLOR_BLUE   ) indB = i;
68 67
      }
69 68

  
70 69
    for(int i=0; i<12; i++)

Also available in: Unified diff