Project

General

Profile

« Previous | Next » 

Revision 2afc6754

Added by Leszek Koltunski over 2 years ago

Move RubikControl to objectlib (as 'ObjectAutomator')
Hide ObjectPreRender inside objectlib and move its APi to ObjectControl.

View differences:

src/main/java/org/distorted/tutorials/TutorialScreen.java
24 24 
import android.widget.LinearLayout;
25 25 

  		




  26
  26
  
    
import org.distorted.helpers.MovesController;


  		




  27
  
  
    
import org.distorted.objectlib.main.ObjectPreRender;


  		




  
  27
  
    
import org.distorted.objectlib.main.ObjectControl;


  		




  28
  28
  
    
import org.distorted.objectlib.main.ObjectType;


  		




  
  29
  
    
import org.distorted.objectlib.helpers.TwistyActivity;


  		




  29
  30
  
    

  		




  30
  31
  
    
import org.distorted.helpers.LockController;


  		




  31
  
  
    
import org.distorted.objectlib.helpers.TwistyActivity;


  		




  32
  32
  
    
import org.distorted.main.R;


  		




  33
  33
  
    
import org.distorted.main.RubikActivity;


  		




  34
  34
  
    
import org.distorted.screens.RubikScreenPlay;


  		




  ......




  55
  55
  
    
      @Override


  		




  56
  56
  
    
      public void onClick(View v)


  		




  57
  57
  
    
        {


  		




  58
  
  
    
        act.getPreRender().solveObject();


  		




  
  58
  
    
        act.getControl().solveObject();


  		




  59
  59
  
    
        mMovesController.clearMoves(act);


  		




  60
  60
  
    
        }


  		




  61
  61
  
    
      });


  		




  ......




  76
  76
  
    
        RubikScreenPlay play = (RubikScreenPlay) ScreenList.PLAY.getScreenClass();


  		




  77
  77
  
    
        int ordinal = play.getObject().ordinal();


  		




  78
  78
  
    
        int numScrambles = ObjectType.getNumScramble(ordinal);


  		




  79
  
  
    
        act.getPreRender().scrambleObject(numScrambles);


  		




  
  79
  
    
        act.getControl().scrambleObject(numScrambles);


  		




  80
  80
  
    
        }


  		




  81
  81
  
    
      });


  		




  82
  82
  
    
    }


  		




  ......




  93
  93
  
    
      @Override


  		




  94
  94
  
    
      public void onClick(View v)


  		




  95
  95
  
    
        {


  		




  96
  
  
    
        ObjectPreRender pre = act.getPreRender();


  		




  97
  
  
    
        if( pre!=null ) pre.unblockEverything();


  		




  
  96
  
    
        ObjectControl control = act.getControl();


  		




  
  97
  
    
        if( control!=null ) control.unblockEverything();


  		




  98
  98
  
    
        act.finish();


  		




  99
  99
  
    
        }


  		




  100
  100
  
    
      });


  		












Also available in:  Unified diff