Project

General

Profile

« Previous | Next » 

Revision 83e0ca5e

Added by Leszek Koltunski about 4 years ago

New Mesh 'Triangles' and updated Inflate & Generic apps to test it.

View differences:

src/main/java/org/distorted/examples/inflate/InflateActivity2.java
23 23
import org.distorted.examples.R;
24 24
import org.distorted.library.main.DistortedTexture;
25 25
import org.distorted.library.mesh.MeshBase;
26
import org.distorted.library.mesh.MeshCubes;
27
import org.distorted.library.mesh.MeshRectangles;
28
import org.distorted.library.mesh.MeshQuad;
29
import org.distorted.library.mesh.MeshSphere;
30
import org.distorted.library.type.Static4D;
31 26

  
32 27
import android.app.Activity;
33 28
import android.graphics.Bitmap;
......
54 49
    private TextView mTextLevel;
55 50
    private DistortedTexture mTexture;
56 51
    private MeshBase mMesh;
57
    private int mNumCols, mNumRows, mNumSlic;
58 52

  
59 53
///////////////////////////////////////////////////////////////////////////////////////////////////
60 54
    
......
100 94
      String str     = b.getString("string");
101 95
      int objectType = b.getInt("type");
102 96
      int bitmapID   = b.getInt("bitmap");
103
      mNumCols       = b.getInt("cols");
104
      mNumRows       = b.getInt("rows");
105
      mNumSlic       = b.getInt("slices");
106

  
107
      int maxsize = mNumCols > mNumRows ? (mNumCols>mNumSlic ? mNumCols:mNumSlic) : (mNumRows>mNumSlic ? mNumRows:mNumSlic) ;
97
      int numCols    = b.getInt("cols");
98
      int numRows    = b.getInt("rows");
99
      int numSlic    = b.getInt("slices");
108 100

  
101
      int maxsize = numCols > numRows ? (numCols>numSlic ? numCols:numSlic) : (numRows>numSlic ? numRows:numSlic);
109 102
      createBitmap(maxsize,bitmapID);
110

  
111
      switch(objectType)
112
        {
113
        case 0: if( bitmapID!=-1 )
114
                  {
115
                  mMesh = new MeshCubes(mNumCols, str, mNumSlic);
116
                  }
117
                else
118
                  {
119
                  Static4D mapFB = new Static4D(0.0f,0.0f, (float)mNumCols/maxsize, (float)mNumRows/maxsize);
120
                  Static4D mapLR = new Static4D(0.0f,0.0f, (float)mNumSlic/maxsize, (float)mNumRows/maxsize);
121
                  Static4D mapTB = new Static4D(0.0f,0.0f, (float)mNumCols/maxsize, (float)mNumSlic/maxsize);
122

  
123
                  mMesh = new MeshCubes(mNumCols, str, mNumSlic, mapFB, mapFB, mapLR, mapLR, mapTB, mapTB);
124
                  }
125
                mMesh.setStretch(mNumCols,mNumRows,mNumSlic);
126
                break;
127
        case 1: mMesh = new MeshRectangles(mNumCols,mNumRows);
128
                mMesh.setStretch(mNumCols,mNumRows,0);
129
                break;
130
        case 2: mMesh = new MeshSphere(mNumRows);
131
                mMesh.setStretch(mNumRows,mNumRows,mNumRows);
132
                break;
133
        case 3: mMesh = new MeshQuad();
134
                mMesh.setStretch(1,1,0);
135
                break;
136
        }
137

  
103
      mMesh =  InflateMeshList.createMesh(objectType, numCols, numRows, numSlic, bitmapID, str);
138 104
      mTexture = new DistortedTexture();
139 105

  
140 106
      setContentView(R.layout.inflatelayout);
141 107

  
142
      Spinner renderSpinner  = findViewById(R.id.inflateSpinnerMode);
108
      Spinner renderSpinner = findViewById(R.id.inflateSpinnerMode);
143 109
      renderSpinner.setOnItemSelectedListener(this);
144 110

  
145 111
      String[] objectBitmap = new String[] { "Render: Normal", "Render: OIT" };
......
268 234
      {
269 235
      return mMesh;
270 236
      }
271

  
272
///////////////////////////////////////////////////////////////////////////////////////////////////
273

  
274
    public int getNumCols()
275
      {
276
      return mNumCols;
277
      }
278

  
279
///////////////////////////////////////////////////////////////////////////////////////////////////
280

  
281
    public int getNumRows()
282
      {
283
      return mNumRows;
284
      }
285

  
286
///////////////////////////////////////////////////////////////////////////////////////////////////
287

  
288
    public int getNumSlic()
289
      {
290
      return mNumSlic;
291
      }
292 237
}

Also available in: Unified diff