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/main/RubikSurfaceView.java
32 32
import org.distorted.library.type.Static4D;
33 33

  
34 34
import org.distorted.objectlib.main.ObjectControl;
35
import org.distorted.objectlib.main.ObjectPreRender;
36 35

  
37 36
import org.distorted.screens.ScreenList;
38 37

  
......
69 68

  
70 69
///////////////////////////////////////////////////////////////////////////////////////////////////
71 70

  
72
    ObjectPreRender getPreRender()
71
    ObjectControl getObjectControl()
73 72
      {
74
      return mObjectController.getPreRender();
73
      return mObjectController;
75 74
      }
76 75

  
77 76
///////////////////////////////////////////////////////////////////////////////////////////////////
......
85 84
      if(!isInEditMode())
86 85
        {
87 86
        RubikActivity act = (RubikActivity)context;
88
        mRenderer = new RubikRenderer(this);
89 87
        mObjectController = new ObjectControl(act,new RubikObjectStateActioner());
88
        mRenderer = new RubikRenderer(this);
90 89

  
91 90
        final ActivityManager activityManager= (ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE);
92 91

  

Also available in: Unified diff