Revision aa171dee
Added by Leszek Koltunski about 4 years ago
src/main/java/org/distorted/magic/RubikActivity.java | ||
---|---|---|
31 | 31 |
import org.distorted.effect.BaseEffect; |
32 | 32 |
import org.distorted.library.main.DistortedLibrary; |
33 | 33 |
|
34 |
import org.distorted.object.RubikObject; |
|
34 | 35 |
import org.distorted.scores.RubikScores; |
35 | 36 |
import org.distorted.scores.RubikScoresDownloader; |
36 | 37 |
import org.distorted.object.RubikObjectList; |
... | ... | |
101 | 102 |
if( sizeIndex>=0 && sizeIndex<sizes.length ) |
102 | 103 |
{ |
103 | 104 |
success = true; |
104 |
view.getRenderer().createObject( obj, size );
|
|
105 |
view.getRenderer().changeObject( obj, size, null );
|
|
105 | 106 |
} |
106 | 107 |
|
107 | 108 |
} |
... | ... | |
112 | 113 |
int s = RubikStatePlay.DEF_SIZE; |
113 | 114 |
|
114 | 115 |
play.setObjectAndSize(obj,s); |
115 |
view.getRenderer().createObject(obj,s);
|
|
116 |
view.getRenderer().changeObject(obj,s, null);
|
|
116 | 117 |
} |
117 | 118 |
} |
118 | 119 |
|
... | ... | |
175 | 176 |
// PUBLIC API |
176 | 177 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
177 | 178 |
|
178 |
public void changeObject(RubikObjectList object, int size) |
|
179 |
public RubikObject getObject() |
|
180 |
{ |
|
181 |
RubikSurfaceView view = findViewById(R.id.rubikSurfaceView); |
|
182 |
RubikRenderer renderer = view.getRenderer(); |
|
183 |
return renderer.getObject(); |
|
184 |
} |
|
185 |
|
|
186 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
187 |
|
|
188 |
public void changeObject(RubikObjectList object, int size, String moves) |
|
179 | 189 |
{ |
180 | 190 |
RubikSurfaceView view = findViewById(R.id.rubikSurfaceView); |
181 | 191 |
RubikRenderer renderer = view.getRenderer(); |
182 | 192 |
|
183 | 193 |
if( renderer.canDrag() ) |
184 | 194 |
{ |
185 |
renderer.createObject(object,size);
|
|
195 |
renderer.changeObject(object,size,moves);
|
|
186 | 196 |
} |
187 | 197 |
} |
188 | 198 |
|
Also available in: Unified diff
More support for actual patterns!