Revision 337f4660
Added by Leszek Koltunski 8 months ago
src/main/java/org/distorted/config/ConfigActivity.java | ||
---|---|---|
187 | 187 |
{ |
188 | 188 |
if( object!=null ) |
189 | 189 |
{ |
190 |
int meshState = object.getMeshState(); |
|
191 | 190 |
int iconMode = TwistyObject.MODE_NORM; |
192 | 191 |
InputStream jsonStream = object.getObjectStream(this); |
193 | 192 |
InputStream meshStream = object.getMeshStream(this); |
194 | 193 |
String name = object.getUpperName(); |
195 | 194 |
InitAssets asset = new InitAssets(jsonStream,meshStream,null); |
196 |
control.changeIfDifferent(ordinal,name,meshState,iconMode,asset);
|
|
195 |
control.changeIfDifferent(ordinal,name,iconMode,asset); |
|
197 | 196 |
} |
198 | 197 |
} |
199 | 198 |
|
... | ... | |
210 | 209 |
changeIfDifferent(object,ordinal,control); |
211 | 210 |
} |
212 | 211 |
|
213 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
214 |
|
|
215 |
public void changeMeshState(RubikObject object, int ordinal) |
|
216 |
{ |
|
217 |
if( object!=null ) |
|
218 |
{ |
|
219 |
ConfigSurfaceView view = findViewById(R.id.configSurfaceView); |
|
220 |
ObjectControl control = view.getObjectControl(); |
|
221 |
|
|
222 |
int meshState = object.getMeshState(); |
|
223 |
int iconMode = TwistyObject.MODE_NORM; |
|
224 |
InputStream jsonStream = object.getObjectStream(this); |
|
225 |
InputStream meshStream = object.getMeshStream(this); |
|
226 |
InitAssets asset = new InitAssets(jsonStream,meshStream,null); |
|
227 |
|
|
228 |
control.changeObject(ordinal,meshState,iconMode,asset); |
|
229 |
} |
|
230 |
} |
|
231 |
|
|
232 | 212 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
233 | 213 |
|
234 | 214 |
public int getHeightBar() |
Also available in: Unified diff
remove 'MESH_NICE'