Project

General

Profile

« Previous | Next » 

Revision 82eb152a

Added by Leszek Koltunski over 2 years ago

JsonReader (?) finished: the creator app can now read objects from JSON files.

View differences:

src/main/java/org/distorted/objectlib/objects/TwistyBandagedEvil.java
19 19

  
20 20
package org.distorted.objectlib.objects;
21 21

  
22
import android.content.res.Resources;
22
import java.io.InputStream;
23 23

  
24 24
import org.distorted.library.type.Static3D;
25 25
import org.distorted.library.type.Static4D;
26 26

  
27
import org.distorted.objectlib.R;
28 27
import org.distorted.objectlib.main.ObjectType;
29 28
import org.distorted.objectlib.helpers.ScrambleState;
30 29

  
......
32 31

  
33 32
public class TwistyBandagedEvil extends TwistyBandagedAbstract
34 33
{
35
  public TwistyBandagedEvil(int[] numL, Static4D quat, Static3D move, Resources res)
34
  public TwistyBandagedEvil(int[] numL, Static4D quat, Static3D move, InputStream stream)
36 35
    {
37
    super(numL, quat, move, res);
36
    super(numL, quat, move, stream);
38 37
    }
39 38

  
40 39
///////////////////////////////////////////////////////////////////////////////////////////////////
......
195 194
    return mStates;
196 195
    }
197 196

  
198
///////////////////////////////////////////////////////////////////////////////////////////////////
199

  
200
  protected int getResource(int[] numLayers)
201
    {
202
    return R.raw.ban4_3;
203
    }
204

  
205 197
///////////////////////////////////////////////////////////////////////////////////////////////////
206 198

  
207 199
  float[][] getPositions()

Also available in: Unified diff