Project

General

Profile

« Previous | Next » 

Revision 2f6dc904

Added by Leszek Koltunski 9 months ago

minor

View differences:

src/main/java/org/distorted/objectlib/effects/BaseEffect.java
33 33
    SOLVE         ( 20, 1, R.string.solve_effect        , SolveEffect.class       ),
34 34
    SCRAMBLE      ( 60, 1, R.string.scramble_effect     , ScrambleEffect.class    ),
35 35
    FAST_SCRAMBLE ( 20, 0, R.string.fast_scramble_effect, FastScrambleEffect.class),
36
    PRESENT       (100, 0, R.string.present_effect, PresentEffect.class),
36
    PRESENT       (100, 0, R.string.present_effect      , PresentEffect.class     ),
37 37
    WIN           ( 20, 1, R.string.win_effect          , WinEffect.class         ),
38
    RESTICKER     ( 20, 0, R.string.resticker_effect          , RestickerEffect.class         ),
38
    RESTICKER     ( 20, 0, R.string.resticker_effect    , RestickerEffect.class   ),
39 39
    ;
40 40

  
41 41
    private final int mDefaultPos, mDefaultType;
src/main/java/org/distorted/objectlib/main/TwistyObject.java
183 183
      types[c] = getCubitRotationType(c);
184 184
      }
185 185

  
186
    super.initialize(axis, angles, positions, cuts, offsets, types, minCubits, faceAxis);
186
    super.initialize(axis, angles, positions, cuts, minCubits, offsets, types, faceAxis);
187 187

  
188 188
    mIconMode = iconMode;
189 189
    mQuat = quat;
......
1677 1677

  
1678 1678
///////////////////////////////////////////////////////////////////////////////////////////////////
1679 1679

  
1680
  protected void setReader(JsonReader reader)
1681
    {
1682
    // empty
1683
    }
1684

  
1685
///////////////////////////////////////////////////////////////////////////////////////////////////
1686

  
1687
  public String getInventor()
1688
    {
1689
    return mMetadata.getAuthor();
1690
    }
1691

  
1692
///////////////////////////////////////////////////////////////////////////////////////////////////
1693

  
1694
  public int getYearOfInvention()
1695
    {
1696
    return mMetadata.getYearOfInvention();
1697
    }
1698

  
1699
///////////////////////////////////////////////////////////////////////////////////////////////////
1700

  
1701
  public float getComplexity()
1702
    {
1703
    return mMetadata.getDifficulty();
1704
    }
1705

  
1706
///////////////////////////////////////////////////////////////////////////////////////////////////
1707

  
1708
  public String getObjectName()
1709
    {
1710
    return mMetadata.getObjectName();
1711
    }
1712

  
1713
///////////////////////////////////////////////////////////////////////////////////////////////////
1714

  
1715
  public ObjectSignature getSignature()
1716
    {
1717
    return mMetadata.getSignature();
1718
    }
1719

  
1720
///////////////////////////////////////////////////////////////////////////////////////////////////
1721

  
1722
  public int getCategory()
1723
    {
1724
    if( mMetadata!=null ) return mMetadata.getCategory();
1725

  
1726
    android.util.Log.e("D", "TwistyObject.getCategory(): metadata null!");
1727
    return 0;
1728
    }
1729

  
1730
///////////////////////////////////////////////////////////////////////////////////////////////////
1731

  
1732
  public boolean isSubmittable()
1733
    {
1734
    return mCurrentColorSchemeSubmittable;
1735
    }
1680
  protected void setReader(JsonReader reader) { }
1681
  public String getInventor()                 { return mMetadata.getAuthor(); }
1682
  public int getYearOfInvention()             { return mMetadata.getYearOfInvention(); }
1683
  public float getComplexity()                { return mMetadata.getDifficulty(); }
1684
  public String getObjectName()               { return mMetadata.getObjectName(); }
1685
  public ObjectSignature getSignature()       { return mMetadata.getSignature(); }
1686
  public int getCategory()                    { return mMetadata!=null ? mMetadata.getCategory() : 0; }
1687
  public boolean isSubmittable()              { return mCurrentColorSchemeSubmittable; }
1736 1688

  
1737 1689
///////////////////////////////////////////////////////////////////////////////////////////////////
1738 1690
  // for JSON only
src/main/java/org/distorted/objectlib/main/TwistyObjectTheoretical.java
40 40

  
41 41
///////////////////////////////////////////////////////////////////////////////////////////////////
42 42

  
43
  void initialize(Static3D[] axis, int[][] angles, float[][] positions, float[][] cuts, float[][] offsets, int[] types, int[][] minCubits, Static3D[] faceAxis)
43
  void initialize(Static3D[] axis, int[][] angles, float[][] positions, float[][] cuts,
44
                  int[][] minCubits, float[][] offsets, int[] types, Static3D[] faceAxis)
44 45
    {
45 46
    mAxis = axis;
46 47
    mFaceAxis = faceAxis;

Also available in: Unified diff