Revision 10b7e588
Added by Leszek Koltunski over 7 years ago
| src/main/java/org/distorted/examples/effects3d/Effects3DActivity.java | ||
|---|---|---|
| 38 | 38 |
|
| 39 | 39 |
import org.distorted.examples.R; |
| 40 | 40 |
import org.distorted.library.Distorted; |
| 41 |
import org.distorted.library.DistortedBitmapGrid;
|
|
| 42 |
import org.distorted.library.DistortedCubesGrid;
|
|
| 43 |
import org.distorted.library.DistortedObjectGrid;
|
|
| 41 |
import org.distorted.library.GridFlat;
|
|
| 42 |
import org.distorted.library.GridCubes;
|
|
| 43 |
import org.distorted.library.GridObject;
|
|
| 44 | 44 |
import org.distorted.library.DistortedObject; |
| 45 | 45 |
import org.distorted.library.EffectNames; |
| 46 | 46 |
import org.distorted.library.EffectTypes; |
| ... | ... | |
| 67 | 67 |
private NumberPicker mColsPicker, mRowsPicker; |
| 68 | 68 |
private boolean[] mShape; |
| 69 | 69 |
private DistortedObject mObject; |
| 70 |
private DistortedObjectGrid mGrid;
|
|
| 70 |
private GridObject mGrid;
|
|
| 71 | 71 |
private int mObjectType; |
| 72 | 72 |
private int mBitmapID; |
| 73 | 73 |
private Bitmap mBitmap; |
| ... | ... | |
| 224 | 224 |
|
| 225 | 225 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 226 | 226 |
|
| 227 |
public DistortedObjectGrid getGrid()
|
|
| 227 |
public GridObject getGrid()
|
|
| 228 | 228 |
{
|
| 229 | 229 |
return mGrid; |
| 230 | 230 |
} |
| ... | ... | |
| 402 | 402 |
int h = mBitmap.getHeight(); |
| 403 | 403 |
|
| 404 | 404 |
mObject = new DistortedObject(w,h,1); |
| 405 |
mGrid = new DistortedBitmapGrid(mNumCols,mNumCols*h/w);
|
|
| 405 |
mGrid = new GridFlat(mNumCols,mNumCols*h/w);
|
|
| 406 | 406 |
setEffectView(); |
| 407 | 407 |
} |
| 408 | 408 |
else |
| ... | ... | |
| 432 | 432 |
str += mShape[i] ? "1" : "0"; |
| 433 | 433 |
|
| 434 | 434 |
mObject = new DistortedObject(mNumCols,mNumRows,1); |
| 435 |
mGrid = new DistortedCubesGrid(mNumCols, str, false);
|
|
| 435 |
mGrid = new GridCubes(mNumCols, str, false);
|
|
| 436 | 436 |
|
| 437 | 437 |
setEffectView(); |
| 438 | 438 |
} |
Also available in: Unified diff
Rename various classes; fix a bug in Around the World.