Project

General

Profile

« Previous | Next » 

Revision cc7dc72a

Added by Leszek Koltunski about 4 years ago

Some progress with Pyraminx.

View differences:

src/main/java/org/distorted/object/RubikPyraminx.java
75 75

  
76 76
  Static3D[] getCubitPositions(int size)
77 77
    {
78
    /*
79
    int numCubits = size>1 ? 6*size*size - 12*size + 8 : 1;
78
    int numCubits = (size*size*size + 6*size*size -4*size)/3;
80 79
    Static3D[] tmp = new Static3D[numCubits];
81 80

  
82 81
    int currentPosition = 0;
83

  
84
    for(int x = 0; x<size; x++)
85
      for(int y = 0; y<size; y++)
86
        for(int z = 0; z<size; z++)
87
          if( x==0 || x==size-1 || y==0 || y==size-1 || z==0 || z==size-1 )
88
            {
89
            tmp[currentPosition++] = new Static3D(x,y,z);
90
            }
91

  
82
/*
83
    ??
84
      {
85
      tmp[currentPosition++] = new Static3D(x,y,z);
86
      }
87
*/
92 88
    return tmp;
93
    */
94
    return null;
95 89
    }
96 90

  
97 91
///////////////////////////////////////////////////////////////////////////////////////////////////
......
119 113

  
120 114
  void createFaceTexture(Canvas canvas, Paint paint, int face)
121 115
    {
122
    /*
123
    InputStream is = mView.getContext().getResources().openRawResource(R.raw.pyraminx);
124
    Bitmap bitmap;
116
    int xoffset = face*TEXTURE_HEIGHT;
117
    float STROKE = 0.05f*TEXTURE_HEIGHT;
118
    float OFF = STROKE/2 -1;
119
    float OFF2 = 0.577f*TEXTURE_HEIGHT + OFF;
120
    float HEIGHT = TEXTURE_HEIGHT - OFF;
121
    float RADIUS = TEXTURE_HEIGHT/12;
122
    float ARC1_H = 0.31f*TEXTURE_HEIGHT;
123
    float ARC1_W = TEXTURE_HEIGHT*0.5f;
124
    float ARC2_W = 0.152f*TEXTURE_HEIGHT;
125
    float ARC2_H = 0.91f*TEXTURE_HEIGHT;
126
    float ARC3_W = 0.847f*TEXTURE_HEIGHT;
127

  
128
    paint.setAntiAlias(true);
129
    paint.setStrokeWidth(STROKE);
130
    paint.setColor(FACE_COLORS[face]);
131
    paint.setStyle(Paint.Style.FILL);
125 132

  
126
    try
127
      {
128
      bitmap = BitmapFactory.decodeStream(is);
129
      }
130
    finally
131
      {
132
      try
133
        {
134
        is.close();
135
        }
136
      catch(IOException e) { }
137
      }
133
    canvas.drawRect(xoffset,0,xoffset+TEXTURE_HEIGHT,TEXTURE_HEIGHT,paint);
138 134

  
139
    paint.setColor(FACE_COLORS[face]);
140
    canvas.drawRect(face*TEXTURE_HEIGHT,0,(face+1)*TEXTURE_HEIGHT,TEXTURE_HEIGHT,paint);
141
    canvas.drawBitmap(bitmap,face*TEXTURE_HEIGHT,0,null);
142
    */
135
    paint.setColor(0xff000000);
136
    paint.setStyle(Paint.Style.STROKE);
137

  
138
    canvas.drawLine(                     xoffset,         HEIGHT,  TEXTURE_HEIGHT       +xoffset, HEIGHT, paint);
139
    canvas.drawLine(                OFF +xoffset, TEXTURE_HEIGHT,                 OFF2  +xoffset,      0, paint);
140
    canvas.drawLine((TEXTURE_HEIGHT-OFF)+xoffset, TEXTURE_HEIGHT, (TEXTURE_HEIGHT-OFF2) +xoffset,      0, paint);
141

  
142
    canvas.drawArc( ARC1_W-RADIUS+xoffset, ARC1_H-RADIUS, ARC1_W+RADIUS+xoffset, ARC1_H+RADIUS, 225, 90, false, paint);
143
    canvas.drawArc( ARC2_W-RADIUS+xoffset, ARC2_H-RADIUS, ARC2_W+RADIUS+xoffset, ARC2_H+RADIUS, 105, 90, false, paint);
144
    canvas.drawArc( ARC3_W-RADIUS+xoffset, ARC2_H-RADIUS, ARC3_W+RADIUS+xoffset, ARC2_H+RADIUS, 345, 90, false, paint);
143 145
    }
144 146

  
145 147
///////////////////////////////////////////////////////////////////////////////////////////////////

Also available in: Unified diff