Revision 83e0ca5e
Added by Leszek Koltunski about 4 years ago
| src/main/java/org/distorted/examples/generic/GenericActivity.java | ||
|---|---|---|
| 108 | 108 |
Spinner typeSpinner = findViewById(R.id.objectpicker_spinnerType); |
| 109 | 109 |
typeSpinner.setOnItemSelectedListener(this); |
| 110 | 110 |
|
| 111 |
String[] objectType = new String[] {"Mesh: Cubes", "Mesh: Flat", "Mesh: Sphere", "Mesh: Quad"};
|
|
| 111 |
String[] objectType = new String[GenericMeshList.LENGTH]; |
|
| 112 |
|
|
| 113 |
for(int mesh=0; mesh<GenericMeshList.LENGTH; mesh++) |
|
| 114 |
{
|
|
| 115 |
objectType[mesh] = "Mesh: "+GenericMeshList.getName(mesh); |
|
| 116 |
} |
|
| 112 | 117 |
|
| 113 | 118 |
ArrayAdapter<String> adapterType = new ArrayAdapter<>(this, android.R.layout.simple_spinner_item, objectType); |
| 114 | 119 |
adapterType.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); |
| ... | ... | |
| 214 | 219 |
Intent mainInt = new Intent( getApplicationContext(), GenericActivity2.class); |
| 215 | 220 |
Bundle b = new Bundle(); |
| 216 | 221 |
|
| 217 |
int rows=0, cols=0;
|
|
| 222 |
int rows,cols;
|
|
| 218 | 223 |
|
| 219 |
switch(mObjectType)
|
|
| 224 |
switch( GenericMeshList.getDimension(mObjectType) )
|
|
| 220 | 225 |
{
|
| 221 |
case 0: |
|
| 222 |
case 1: rows = mNumRows; |
|
| 223 |
cols = mNumCols; |
|
| 226 |
case 0: rows = 1; // a quad |
|
| 227 |
cols = 1; |
|
| 224 | 228 |
break; |
| 225 |
case 2: rows = mNumRows; // always make the sphere equal in X and Y
|
|
| 226 |
cols = mNumRows; //
|
|
| 229 |
case 1: rows = mNumRows; // Triangles, Sphere
|
|
| 230 |
cols = mNumRows; |
|
| 227 | 231 |
break; |
| 228 |
case 3: rows = 1; // a quad is always 1x1
|
|
| 229 |
cols = 1;
|
|
| 232 |
default:rows = mNumRows;
|
|
| 233 |
cols = mNumCols;
|
|
| 230 | 234 |
break; |
| 231 | 235 |
} |
| 232 | 236 |
|
| ... | ... | |
| 265 | 269 |
mObjectType = pos; |
| 266 | 270 |
uncheckAll(); |
| 267 | 271 |
|
| 268 |
switch(mObjectType) |
|
| 269 |
{
|
|
| 270 |
case 0: mColsPicker.setEnabled(true); |
|
| 271 |
mRowsPicker.setEnabled(true); |
|
| 272 |
mSlicPicker.setEnabled(true); |
|
| 273 |
break; |
|
| 274 |
case 1: mColsPicker.setEnabled(true); |
|
| 275 |
mRowsPicker.setEnabled(true); |
|
| 276 |
mSlicPicker.setEnabled(false); |
|
| 277 |
break; |
|
| 278 |
case 2: mColsPicker.setEnabled(false); |
|
| 279 |
mRowsPicker.setEnabled(true); |
|
| 280 |
mSlicPicker.setEnabled(false); |
|
| 281 |
break; |
|
| 282 |
case 3: mColsPicker.setEnabled(false); |
|
| 283 |
mRowsPicker.setEnabled(false); |
|
| 284 |
mSlicPicker.setEnabled(false); |
|
| 285 |
break; |
|
| 286 |
} |
|
| 272 |
int dim = GenericMeshList.getDimension(mObjectType); |
|
| 273 |
|
|
| 274 |
mRowsPicker.setEnabled(dim>=1); |
|
| 275 |
mColsPicker.setEnabled(dim>=2); |
|
| 276 |
mSlicPicker.setEnabled(dim>=3); |
|
| 287 | 277 |
} |
| 288 | 278 |
break; |
| 289 | 279 |
case R.id.objectpicker_spinnerBitmap: switch(pos) |
Also available in: Unified diff
New Mesh 'Triangles' and updated Inflate & Generic apps to test it.