Revision b3fff6fb
Added by Leszek Koltunski over 2 years ago
| src/main/java/org/distorted/objectlib/automator/ObjectAutomatorWhole.java | ||
|---|---|---|
| 22 | 22 |
import java.io.IOException; |
| 23 | 23 |
import java.io.InputStream; |
| 24 | 24 |
|
| 25 |
import android.app.Activity; |
|
| 25 | 26 |
import android.graphics.Bitmap; |
| 26 | 27 |
import android.graphics.BitmapFactory; |
| 27 | 28 |
|
| ... | ... | |
| 35 | 36 |
import org.distorted.library.type.Dynamic; |
| 36 | 37 |
import org.distorted.library.type.Dynamic3D; |
| 37 | 38 |
import org.distorted.library.type.Static3D; |
| 39 |
|
|
| 38 | 40 |
import org.distorted.objectlib.R; |
| 39 |
import org.distorted.objectlib.helpers.TwistyActivity; |
|
| 40 | 41 |
import org.distorted.objectlib.main.ObjectControl; |
| 41 | 42 |
|
| 42 | 43 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| ... | ... | |
| 79 | 80 |
|
| 80 | 81 |
private void setPostFrame(boolean on) |
| 81 | 82 |
{
|
| 82 |
TwistyActivity act = mControl.getActivity();
|
|
| 83 |
Activity act = mControl.getActivity(); |
|
| 83 | 84 |
// act.setControlState(on); |
| 84 | 85 |
mLastTime = -1; |
| 85 | 86 |
} |
| 86 | 87 |
|
| 87 | 88 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 88 | 89 |
|
| 89 |
private Bitmap openBitmap(TwistyActivity act, int resource)
|
|
| 90 |
private Bitmap openBitmap(Activity act, int resource) |
|
| 90 | 91 |
{
|
| 91 | 92 |
try( InputStream is = act.getResources().openRawResource(resource) ) |
| 92 | 93 |
{
|
| ... | ... | |
| 825 | 826 |
mQuad = new MeshQuad(); |
| 826 | 827 |
} |
| 827 | 828 |
|
| 828 |
TwistyActivity act = mControl.getActivity();
|
|
| 829 |
Activity act = mControl.getActivity(); |
|
| 829 | 830 |
|
| 830 | 831 |
if( act!=null ) |
| 831 | 832 |
{
|
Also available in: Unified diff
Remove the concept of a 'TwistyActivity' altogether.