Project

General

Profile

« Previous | Next » 

Revision ae9d9227

Added by Leszek Koltunski 5 months ago

Big step toward separating TwistyObject metadata.

View differences:

src/main/java/org/distorted/objectlib/objects/TwistyBandagedCuboid.java
18 18

  
19 19
import org.distorted.objectlib.bandaged.FactoryBandagedCuboid;
20 20
import org.distorted.objectlib.helpers.ObjectFaceShape;
21
import org.distorted.objectlib.metadata.Metadata;
21 22
import org.distorted.objectlib.signature.ObjectSignature;
22 23
import org.distorted.objectlib.helpers.ObjectVertexEffects;
23 24
import org.distorted.objectlib.main.InitAssets;
24
import org.distorted.objectlib.main.InitData;
25 25
import org.distorted.objectlib.helpers.ObjectShape;
26 26
import org.distorted.objectlib.main.ObjectType;
27 27
import org.distorted.objectlib.scrambling.ObjectScrambler;
......
235 235

  
236 236
///////////////////////////////////////////////////////////////////////////////////////////////////
237 237

  
238
  public TwistyBandagedCuboid(int iconMode, Static4D quat, Static3D move, float scale, InitData data, InitAssets asset)
238
  public TwistyBandagedCuboid(int iconMode, Static4D quat, Static3D move, float scale, Metadata meta, InitAssets asset)
239 239
    {
240
    super(iconMode, (data.getNumLayers()[0]+data.getNumLayers()[1]+data.getNumLayers()[2])/3.0f, quat, move, scale, data, asset);
240
    super(iconMode, (meta.getNumLayers()[0]+meta.getNumLayers()[1]+meta.getNumLayers()[2])/3.0f, quat, move, scale, meta, asset);
241 241
    }
242 242

  
243 243
///////////////////////////////////////////////////////////////////////////////////////////////////
......
290 290

  
291 291
  public int[][] getScrambleEdges()
292 292
    {
293
    if( mPosition==null ) mPosition = getInitData().getPos();
293
    if( mPosition==null ) mPosition = getMetadata().getPos();
294 294

  
295 295
    if( mPosition==POS_5 )
296 296
      {
......
326 326
  @Override
327 327
  public int[][] getScrambleAlgorithms()
328 328
    {
329
    if( mPosition==null ) mPosition = getInitData().getPos();
329
    if( mPosition==null ) mPosition = getMetadata().getPos();
330 330

  
331 331
    if( mPosition==POS_5 )
332 332
      {
......
389 389
  @Override
390 390
  public int getScrambleType()
391 391
    {
392
    if( mPosition==null ) mPosition = getInitData().getPos();
392
    if( mPosition==null ) mPosition = getMetadata().getPos();
393 393

  
394 394
    return mPosition==POS_5 ? ObjectScrambler.SCRAMBLING_ALGORITHMS : ObjectScrambler.SCRAMBLING_BANDAGED;
395 395
    }
......
744 744

  
745 745
  public float getStickerStroke()
746 746
    {
747
    if( mPosition==null ) mPosition = getInitData().getPos();
747
    if( mPosition==null ) mPosition = getMetadata().getPos();
748 748
    boolean icon = isInIconMode();
749 749

  
750 750
    if( mPosition==POS_5 ) return icon ? 0.30f : 0.11f;
......
757 757

  
758 758
  public String getShortName()
759 759
    {
760
    if( mPosition==null ) mPosition = getInitData().getPos();
760
    if( mPosition==null ) mPosition = getMetadata().getPos();
761 761

  
762 762
    if( mPosition==POS_1 ) return ObjectType.BAN1_3.name();
763 763
    if( mPosition==POS_2 ) return ObjectType.BAN2_3.name();
......
789 789

  
790 790
  public String getObjectName()
791 791
    {
792
    if( mPosition==null ) mPosition = getInitData().getPos();
792
    if( mPosition==null ) mPosition = getMetadata().getPos();
793 793

  
794 794
    if( mPosition==POS_1 ) return "Fused Cube";
795 795
    if( mPosition==POS_2 ) return "2Bar Cube";
......
805 805

  
806 806
  public String getInventor()
807 807
    {
808
    if( mPosition==null ) mPosition = getInitData().getPos();
808
    if( mPosition==null ) mPosition = getMetadata().getPos();
809 809

  
810 810
    if( mPosition==POS_1 ) return "Ting Huang";
811 811
    if( mPosition==POS_2 ) return "Unknown";
......
821 821

  
822 822
  public int getYearOfInvention()
823 823
    {
824
    if( mPosition==null ) mPosition = getInitData().getPos();
824
    if( mPosition==null ) mPosition = getMetadata().getPos();
825 825

  
826 826
    if( mPosition==POS_1 ) return 2011;
827 827
    if( mPosition==POS_2 ) return 0;
......
837 837

  
838 838
  public float getComplexity()
839 839
    {
840
    if( mPosition==null ) mPosition = getInitData().getPos();
840
    if( mPosition==null ) mPosition = getMetadata().getPos();
841 841

  
842 842
    if( mPosition==POS_1 ) return 1.8f;
843 843
    if( mPosition==POS_2 ) return 2.1f;
......
853 853

  
854 854
  public String[][] getTutorials()
855 855
    {
856
    if( mPosition==null ) mPosition = getInitData().getPos();
856
    if( mPosition==null ) mPosition = getMetadata().getPos();
857 857

  
858 858
    if( mPosition==POS_1 )
859 859
      {

Also available in: Unified diff