Revision b01acdaf
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.GridFlat;
|
|
| 42 |
import org.distorted.library.GridCubes;
|
|
| 43 |
import org.distorted.library.GridObject;
|
|
| 41 |
import org.distorted.library.MeshCubes;
|
|
| 42 |
import org.distorted.library.MeshFlat;
|
|
| 43 |
import org.distorted.library.MeshObject;
|
|
| 44 | 44 |
import org.distorted.library.DistortedTexture; |
| 45 | 45 |
import org.distorted.library.DistortedEffects; |
| 46 | 46 |
import org.distorted.library.EffectNames; |
| ... | ... | |
| 69 | 69 |
private boolean[] mShape; |
| 70 | 70 |
private DistortedTexture mTexture; |
| 71 | 71 |
private DistortedEffects mEffects; |
| 72 |
private GridObject mGrid;
|
|
| 72 |
private MeshObject mMesh;
|
|
| 73 | 73 |
private int mObjectType; |
| 74 | 74 |
private int mBitmapID; |
| 75 | 75 |
private Bitmap mBitmap; |
| ... | ... | |
| 233 | 233 |
|
| 234 | 234 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 235 | 235 |
|
| 236 |
public GridObject getGrid()
|
|
| 236 |
public MeshObject getGrid()
|
|
| 237 | 237 |
{
|
| 238 |
return mGrid;
|
|
| 238 |
return mMesh;
|
|
| 239 | 239 |
} |
| 240 | 240 |
|
| 241 | 241 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| ... | ... | |
| 412 | 412 |
|
| 413 | 413 |
mEffects = new DistortedEffects(); |
| 414 | 414 |
mTexture= new DistortedTexture(w,h); |
| 415 |
mGrid = new GridFlat(mNumCols,mNumCols*h/w);
|
|
| 415 |
mMesh = new MeshFlat(mNumCols,mNumCols*h/w);
|
|
| 416 | 416 |
setEffectView(); |
| 417 | 417 |
} |
| 418 | 418 |
else |
| ... | ... | |
| 443 | 443 |
|
| 444 | 444 |
mEffects = new DistortedEffects(); |
| 445 | 445 |
mTexture= new DistortedTexture(mNumCols,mNumRows); |
| 446 |
mGrid = new GridCubes(mNumCols, str, false);
|
|
| 446 |
mMesh = new MeshCubes(mNumCols, str, false);
|
|
| 447 | 447 |
|
| 448 | 448 |
setEffectView(); |
| 449 | 449 |
} |
| ... | ... | |
| 496 | 496 |
|
| 497 | 497 |
public int getDepth() |
| 498 | 498 |
{
|
| 499 |
return mTexture==null ? 0: mTexture.getDepth(mGrid);
|
|
| 499 |
return mTexture==null ? 0: mTexture.getDepth(mMesh);
|
|
| 500 | 500 |
} |
| 501 | 501 |
|
| 502 | 502 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
Also available in: Unified diff
Rename Grid to Mesh