Project

General

Profile

« Previous | Next » 

Revision e8b6aa95

Added by Leszek Koltunski over 7 years ago

Major change in API: separate the GRID from DistortedObject; completely remove classes derived from DistortedObject.

View differences:

src/main/java/org/distorted/examples/flag/FlagRenderer.java
26 26

  
27 27
import org.distorted.examples.R;
28 28
import org.distorted.library.Distorted;
29
import org.distorted.library.DistortedCubes;
29
import org.distorted.library.DistortedCubesGrid;
30 30
import org.distorted.library.DistortedObject;
31 31
import org.distorted.library.EffectTypes;
32 32
import org.distorted.library.type.Dynamic;
33 33
import org.distorted.library.type.Dynamic5D;
34 34
import org.distorted.library.type.DynamicQuat;
35
import org.distorted.library.type.Static2D;
36 35
import org.distorted.library.type.Static3D;
37 36
import org.distorted.library.type.Static4D;
38 37
import org.distorted.library.type.Static5D;
......
49 48
{
50 49
    private GLSurfaceView mView;
51 50
    private DistortedObject mObject;
51
    private DistortedCubesGrid mGrid;
52 52
    private int mObjWidth, mObjHeight;
53 53
    private DynamicQuat mQuatInt1, mQuatInt2;
54 54
    private Dynamic5D mWaveDyn;
......
63 63
      {
64 64
      mView = v;
65 65

  
66
      mObject = new DistortedCubes(50,30,10,false);
66
      mGrid = new DistortedCubesGrid(50,30,false);
67
      mObject = new DistortedObject(50,30,1);
67 68

  
68 69
      mObjWidth = mObject.getWidth();
69 70
      mObjHeight= mObject.getHeight();
......
135 136
    public void onDrawFrame(GL10 glUnused) 
136 137
      {
137 138
      GLES20.glClear( GLES20.GL_DEPTH_BUFFER_BIT | GLES20.GL_COLOR_BUFFER_BIT);
138
      mObject.draw(System.currentTimeMillis());
139
      mObject.draw(System.currentTimeMillis(), mGrid);
139 140
      }
140 141

  
141 142
///////////////////////////////////////////////////////////////////////////////////////////////////
......
188 189
        catch(IOException e) { }
189 190
        }  
190 191
      
191
      mObject.setBitmap(bitmap);
192
      mObject.setTexture(bitmap);
192 193
      
193 194
      try
194 195
        {

Also available in: Unified diff