Project

General

Profile

« Previous | Next » 

Revision 593cd919

Added by Leszek Koltunski about 1 year ago

Icosamate: mesh, jsons.

View differences:

src/main/java/org/distorted/objectlib/main/ObjectType.java
100 100
  PDUO_2 ( TwistyPyraminxDuo.class    ,  4, R.drawable.pduo_2, true,     0, new InitData(new int[] {2,2,2,2})),
101 101
  PDIA_3 ( TwistyPyraminxDiamond.class, 12, R.drawable.pdia_3, true,    40, new InitData(new int[] {3,3,3})),
102 102

  
103
  ICOS_2 ( TwistyIcosamate.class      , 32, R.drawable.pdia_3, true,    60, new InitData(new int[] {2,2,2,2,2,2})),
103
  ICOS_2 ( TwistyIcosamate.class      , 32, R.drawable.icos_2, true,    60, new InitData(new int[] {2,2,2,2,2,2})),
104 104
  BALL_4 ( TwistyMasterball.class     , 28, R.drawable.ball_4, false,   70, new InitData(new int[] {4,2,2,2,2})),
105 105
  BAN5_4 ( TwistyBandagedCuboid.class , 48, R.drawable.ban5_4, false,   50, new InitData(new int[] {4,4,4}, TwistyBandagedCuboid.POS_5)),
106 106
  BAN6_4 ( TwistyBandagedCuboid.class ,487, R.drawable.ban6_4, false,   50, new InitData(new int[] {4,4,4}, TwistyBandagedCuboid.POS_6)),
src/main/java/org/distorted/objectlib/objects/TwistyIcosamate.java
24 24
import org.distorted.objectlib.main.ObjectSignatures;
25 25
import org.distorted.objectlib.main.ObjectType;
26 26
import org.distorted.objectlib.scrambling.ScrambleEdgeGenerator;
27
import org.distorted.objectlib.shape.ShapeHexahedron;
27
import org.distorted.objectlib.shape.ShapeIcosahedron;
28 28
import org.distorted.objectlib.touchcontrol.TouchControlIcosahedron;
29 29

  
30 30
///////////////////////////////////////////////////////////////////////////////////////////////////
31 31

  
32
public class TwistyIcosamate extends ShapeHexahedron
32
public class TwistyIcosamate extends ShapeIcosahedron
33 33
{
34 34
  // topmost vertex (0,A,0) and 3 vertices from the second-topmost-layer, front one and two ones
35 35
  // to the right: (0,B,C) , (D,B,E) , (F,B,H)
......
172 172

  
173 173
      mPosition = new float[][]
174 174
         {
175
             { 0, AN, 0},
175
             {  0, AN,  0},
176 176

  
177 177
             {  0, BN, CN},
178 178
             { DN, BN, EN},
src/main/java/org/distorted/objectlib/shape/ShapeIcosahedron.java
52 52

  
53 53
  public static final int NUM_FACES = 20;
54 54
  public static final int FOV = 30;
55
  public static final float RATIO = 0.25f;
55
  public static final float RATIO = 0.52f;
56 56

  
57 57
///////////////////////////////////////////////////////////////////////////////////////////////////
58 58

  

Also available in: Unified diff