Project

General

Profile

« Previous | Next » 

Revision 379b3273

Added by Leszek Koltunski about 1 year ago

Icosamate: mesh, jsons.

View differences:

src/main/java/org/distorted/screens/RubikScreenSolver.java
34 34 
import org.distorted.objectlib.shape.ShapeDiamond;
35 35 
import org.distorted.objectlib.shape.ShapeDodecahedron;
36 36 
import org.distorted.objectlib.shape.ShapeHexahedron;
37 
import org.distorted.objectlib.shape.ShapeIcosahedron;
37 38 
import org.distorted.objectlib.shape.ShapeOctahedron;
38 39 
import org.distorted.objectlib.shape.ShapeTetrahedron;
39 40 
import org.distorted.objects.RubikObjectList;
......
149 150 
      mFaceColors = ShapeTetrahedron.FACE_COLORS;
150 151 
      }
151 152 
    else if( object== ObjectSignatures.DIAM_2 ||
152 
        object== ObjectSignatures.DIAM_3 ||
153 
        object== ObjectSignatures.DIAM_4 ||
154 
        object== ObjectSignatures.TRAJ_3 ||
155 
        object== ObjectSignatures.TRAJ_4 ||
156 
        object== ObjectSignatures.PDIA_3  )
153 
             object== ObjectSignatures.DIAM_3 ||
154 
             object== ObjectSignatures.DIAM_4 ||
155 
             object== ObjectSignatures.TRAJ_3 ||
156 
             object== ObjectSignatures.TRAJ_4 ||
157 
             object== ObjectSignatures.PDIA_3  )
157 158 
      {
158 159 
      mNumColors  = ShapeOctahedron.NUM_FACES;
159 160 
      mFaceColors = ShapeOctahedron.FACE_COLORS;
160 161 
      }
161 162 
    else if( object== ObjectSignatures.CRYS_3 ||
162 
        object== ObjectSignatures.STAR_3 ||
163 
        object== ObjectSignatures.PENT_2 ||
164 
        object== ObjectSignatures.KILO_3 ||
165 
        object== ObjectSignatures.KILO_5 ||
166 
        object== ObjectSignatures.MEGA_3 ||
167 
        object== ObjectSignatures.MEGA_5  )
163 
             object== ObjectSignatures.STAR_3 ||
164 
             object== ObjectSignatures.PENT_2 ||
165 
             object== ObjectSignatures.KILO_3 ||
166 
             object== ObjectSignatures.KILO_5 ||
167 
             object== ObjectSignatures.MEGA_3 ||
168 
             object== ObjectSignatures.MEGA_5  )
168 169 
      {
169 170 
      mNumColors  = ShapeDodecahedron.NUM_FACES;
170 171 
      mFaceColors = ShapeDodecahedron.FACE_COLORS;
......
174 175 
      mNumColors  = ShapeDiamond.NUM_FACES;
175 176 
      mFaceColors = ShapeDiamond.FACE_COLORS;
176 177 
      }
178 
    else if( object== ObjectSignatures.ICOS_2 )
179 
      {
180 
      mNumColors  = ShapeIcosahedron.NUM_FACES;
181 
      mFaceColors = ShapeIcosahedron.FACE_COLORS;
182 
      }
177 183 
    else
178 184 
      {
179 185 
      mNumColors  = ShapeHexahedron.NUM_FACES;

Also available in: Unified diff