Revision 7fca6741
Added by Leszek Koltunski almost 8 years ago
| src/main/java/org/distorted/examples/cubes/CubesActivity.java | ||
|---|---|---|
| 214 | 214 |
|
| 215 | 215 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 216 | 216 |
|
| 217 |
public MeshObject getGrid()
|
|
| 217 |
public MeshObject getMesh()
|
|
| 218 | 218 |
{
|
| 219 | 219 |
return mMesh; |
| 220 | 220 |
} |
| src/main/java/org/distorted/examples/cubes/CubesRenderer.java | ||
|---|---|---|
| 67 | 67 |
|
| 68 | 68 |
mEffects = new DistortedEffects(); |
| 69 | 69 |
mTexture = act.getTexture(); |
| 70 |
mMesh = act.getGrid();
|
|
| 70 |
mMesh = act.getMesh();
|
|
| 71 | 71 |
|
| 72 | 72 |
mObjWidth = mTexture.getWidth(); |
| 73 | 73 |
mObjHeight= mTexture.getHeight(); |
| src/main/java/org/distorted/examples/effects3d/Effects3DActivity.java | ||
|---|---|---|
| 130 | 130 |
Spinner typeSpinner = (Spinner)findViewById(R.id.objectpicker_spinnerType); |
| 131 | 131 |
typeSpinner.setOnItemSelectedListener(this); |
| 132 | 132 |
|
| 133 |
String[] objectType = new String[] {"CubesGrid", "FlatGrid"};
|
|
| 133 |
String[] objectType = new String[] {"Cubes", "Flat"};
|
|
| 134 | 134 |
|
| 135 | 135 |
ArrayAdapter<String> adapterType = new ArrayAdapter<>(this, android.R.layout.simple_spinner_item, objectType); |
| 136 | 136 |
adapterType.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); |
| ... | ... | |
| 233 | 233 |
|
| 234 | 234 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 235 | 235 |
|
| 236 |
public MeshObject getGrid()
|
|
| 236 |
public MeshObject getMesh()
|
|
| 237 | 237 |
{
|
| 238 | 238 |
return mMesh; |
| 239 | 239 |
} |
| src/main/java/org/distorted/examples/effects3d/Effects3DRenderer.java | ||
|---|---|---|
| 75 | 75 |
Effects3DActivity act = (Effects3DActivity)v.getContext(); |
| 76 | 76 |
|
| 77 | 77 |
mObjectTexture = act.getTexture(); |
| 78 |
mObjectMesh = act.getGrid();
|
|
| 78 |
mObjectMesh = act.getMesh();
|
|
| 79 | 79 |
mObjectEffects = act.getEffects(); |
| 80 | 80 |
mBackgroundTexture = new DistortedTexture(100,100); |
| 81 | 81 |
mCenterTexture = new DistortedTexture(100,100); |
| src/main/java/org/distorted/examples/matrix3d/Matrix3DActivity.java | ||
|---|---|---|
| 116 | 116 |
|
| 117 | 117 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 118 | 118 |
|
| 119 |
public MeshObject getGrid()
|
|
| 119 |
public MeshObject getMesh()
|
|
| 120 | 120 |
{
|
| 121 | 121 |
return mMesh; |
| 122 | 122 |
} |
| src/main/java/org/distorted/examples/matrix3d/Matrix3DRenderer.java | ||
|---|---|---|
| 53 | 53 |
|
| 54 | 54 |
mEffects= act.getEffects(); |
| 55 | 55 |
mTexture= act.getTexture(); |
| 56 |
mMesh = act.getGrid();
|
|
| 56 |
mMesh = act.getMesh();
|
|
| 57 | 57 |
mScreen = new DistortedFramebuffer(0); |
| 58 | 58 |
} |
| 59 | 59 |
|
Also available in: Unified diff
rename all the 'grid' variables to 'mesh'.