Revision e8b6aa95
Added by Leszek Koltunski over 7 years ago
src/main/java/org/distorted/examples/cubes/CubesRenderer.java | ||
---|---|---|
28 | 28 |
import org.distorted.examples.R; |
29 | 29 |
|
30 | 30 |
import org.distorted.library.DistortedObject; |
31 |
import org.distorted.library.DistortedObjectGrid; |
|
31 | 32 |
import org.distorted.library.EffectTypes; |
32 | 33 |
import org.distorted.library.type.DynamicQuat; |
33 | 34 |
import org.distorted.library.type.Static4D; |
... | ... | |
45 | 46 |
{ |
46 | 47 |
private GLSurfaceView mView; |
47 | 48 |
private DistortedObject mObject; |
49 |
private DistortedObjectGrid mGrid; |
|
48 | 50 |
private int mObjWidth, mObjHeight; |
49 | 51 |
|
50 | 52 |
private DynamicQuat mQuatInt1, mQuatInt2; |
... | ... | |
58 | 60 |
{ |
59 | 61 |
mView = v; |
60 | 62 |
|
61 |
mObject = ((CubesActivity)v.getContext()).getObject(); |
|
63 |
CubesActivity act = (CubesActivity)v.getContext(); |
|
64 |
|
|
65 |
mObject = act.getObject(); |
|
66 |
mGrid = act.getGrid(); |
|
62 | 67 |
|
63 | 68 |
mObjWidth = mObject.getWidth(); |
64 | 69 |
mObjHeight= mObject.getHeight(); |
... | ... | |
78 | 83 |
public void onDrawFrame(GL10 glUnused) |
79 | 84 |
{ |
80 | 85 |
GLES20.glClear( GLES20.GL_DEPTH_BUFFER_BIT | GLES20.GL_COLOR_BUFFER_BIT); |
81 |
mObject.draw(System.currentTimeMillis()); |
|
86 |
mObject.draw(System.currentTimeMillis(),mGrid);
|
|
82 | 87 |
} |
83 | 88 |
|
84 | 89 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
... | ... | |
131 | 136 |
catch(IOException e) { } |
132 | 137 |
} |
133 | 138 |
|
134 |
mObject.setBitmap(bitmap);
|
|
139 |
mObject.setTexture(bitmap);
|
|
135 | 140 |
|
136 | 141 |
try |
137 | 142 |
{ |
Also available in: Unified diff
Major change in API: separate the GRID from DistortedObject; completely remove classes derived from DistortedObject.