Revision e8b6aa95
Added by Leszek Koltunski over 7 years ago
src/main/java/org/distorted/examples/matrix3d/Matrix3DRenderer.java | ||
---|---|---|
23 | 23 |
import android.opengl.GLSurfaceView; |
24 | 24 |
|
25 | 25 |
import org.distorted.library.Distorted; |
26 |
import org.distorted.library.DistortedObjectGrid; |
|
26 | 27 |
import org.distorted.library.DistortedObject; |
27 | 28 |
import org.distorted.library.EffectTypes; |
28 | 29 |
|
... | ... | |
35 | 36 |
{ |
36 | 37 |
private GLSurfaceView mView; |
37 | 38 |
private DistortedObject mObject; |
39 |
private DistortedObjectGrid mGrid; |
|
38 | 40 |
|
39 | 41 |
private int mWidth, mHeight; |
40 | 42 |
|
... | ... | |
44 | 46 |
{ |
45 | 47 |
mView = v; |
46 | 48 |
|
47 |
mObject= ((Matrix3DActivity)v.getContext()).getObject(); |
|
49 |
Matrix3DActivity act = (Matrix3DActivity)v.getContext(); |
|
50 |
|
|
51 |
mObject= act.getObject(); |
|
52 |
mGrid = act.getGrid(); |
|
48 | 53 |
} |
49 | 54 |
|
50 | 55 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
... | ... | |
55 | 60 |
|
56 | 61 |
long time = System.currentTimeMillis(); |
57 | 62 |
|
58 |
mObject.draw(time); |
|
63 |
mObject.draw(time,mGrid);
|
|
59 | 64 |
} |
60 | 65 |
|
61 | 66 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
... | ... | |
92 | 97 |
|
93 | 98 |
Matrix3DActivity act = (Matrix3DActivity)mView.getContext(); |
94 | 99 |
|
95 |
mObject.setBitmap( act.getBitmap() );
|
|
100 |
mObject.setTexture(act.getBitmap());
|
|
96 | 101 |
|
97 | 102 |
try |
98 | 103 |
{ |
Also available in: Unified diff
Major change in API: separate the GRID from DistortedObject; completely remove classes derived from DistortedObject.