Project

General

Profile

« Previous | Next » 

Revision e26eb4e7

Added by Leszek Koltunski over 2 years ago

Do not pull the inventors and the names of objects from Resources.

View differences:

src/main/java/org/distorted/objectlib/objects/TwistyDiamond.java
24 24

  
25 25
import android.content.res.Resources;
26 26

  
27
import org.distorted.library.main.DistortedEffects;
28
import org.distorted.library.main.DistortedTexture;
29
import org.distorted.library.mesh.MeshSquare;
30 27
import org.distorted.library.type.Static3D;
31 28
import org.distorted.library.type.Static4D;
32 29

  
......
591 588

  
592 589
///////////////////////////////////////////////////////////////////////////////////////////////////
593 590

  
594
  public int getObjectName(int[] numLayers)
591
  public String getObjectName()
595 592
    {
596
    switch(numLayers[0])
593
    switch(getNumLayers()[0])
597 594
      {
598
      case 2: return R.string.diam2;
599
      case 3: return R.string.diam3;
600
      case 4: return R.string.diam4;
595
      case 2: return "Skewb Diamond";
596
      case 3: return "Face Turning Octahedron";
597
      case 4: return "Master Face Turning Octahedron";
601 598
      }
602 599

  
603
    return 0;
600
    return "Skewb Diamond";
604 601
    }
605 602

  
606 603
///////////////////////////////////////////////////////////////////////////////////////////////////
607 604

  
608
  public int getInventor(int[] numLayers)
605
  public String getInventor()
609 606
    {
610
    switch(numLayers[0])
607
    switch(getNumLayers()[0])
611 608
      {
612
      case 2: return R.string.diam2_inventor;
613
      case 3: return R.string.diam3_inventor;
614
      case 4: return R.string.diam4_inventor;
609
      case 2: return "Uwe Meffert";
610
      case 3: return "David Pitcher";
611
      case 4: return "Timur Evbatyrov";
615 612
      }
616 613

  
617
    return 0;
614
    return "Uwe Meffert";
618 615
    }
619 616

  
620 617
///////////////////////////////////////////////////////////////////////////////////////////////////
621 618

  
622
  public int getYearOfInvention(int[] numLayers)
619
  public int getYearOfInvention()
623 620
    {
624
    switch(numLayers[0])
621
    switch(getNumLayers()[0])
625 622
      {
626 623
      case 2: return 1984;
627 624
      case 3: return 2003;
......
632 629

  
633 630
///////////////////////////////////////////////////////////////////////////////////////////////////
634 631

  
635
  public int getComplexity(int[] numLayers)
632
  public int getComplexity()
636 633
    {
637
    switch(numLayers[0])
634
    switch(getNumLayers()[0])
638 635
      {
639 636
      case 2: return 4;
640 637
      case 3: return 6;

Also available in: Unified diff