Revision 2afc6754
Added by Leszek Koltunski over 2 years ago
| src/main/java/org/distorted/tutorials/TutorialActivity.java | ||
|---|---|---|
| 31 | 31 |
import com.google.firebase.analytics.FirebaseAnalytics; |
| 32 | 32 |
|
| 33 | 33 |
import org.distorted.library.main.DistortedLibrary; |
| 34 |
|
|
| 35 | 34 |
import org.distorted.library.main.DistortedScreen; |
| 36 |
import org.distorted.objectlib.main.ObjectPreRender; |
|
| 35 |
|
|
| 36 |
import org.distorted.objectlib.main.ObjectControl; |
|
| 37 | 37 |
import org.distorted.objectlib.main.ObjectType; |
| 38 |
import org.distorted.objectlib.main.TwistyObject; |
|
| 39 | 38 |
import org.distorted.objectlib.helpers.BlockController; |
| 40 | 39 |
import org.distorted.objectlib.helpers.TwistyActivity; |
| 41 | 40 |
|
| ... | ... | |
| 210 | 209 |
if( mObjectOrdinal>=0 && mObjectOrdinal< ObjectType.NUM_OBJECTS ) |
| 211 | 210 |
{
|
| 212 | 211 |
ObjectType obj = ObjectType.getObject(mObjectOrdinal); |
| 213 |
view.getPreRender().changeObject(obj);
|
|
| 212 |
view.getObjectControl().changeObject(obj);
|
|
| 214 | 213 |
} |
| 215 | 214 |
} |
| 216 | 215 |
|
| ... | ... | |
| 247 | 246 |
return mFirebaseAnalytics; |
| 248 | 247 |
} |
| 249 | 248 |
|
| 250 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
| 251 |
|
|
| 252 |
public TwistyObject getObject() |
|
| 253 |
{
|
|
| 254 |
TutorialSurfaceView view = findViewById(R.id.rubikSurfaceView); |
|
| 255 |
ObjectPreRender pre = view.getPreRender(); |
|
| 256 |
return pre.getObject(); |
|
| 257 |
} |
|
| 258 |
|
|
| 259 | 249 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 260 | 250 |
|
| 261 | 251 |
public int getScreenWidthInPixels() |
| ... | ... | |
| 272 | 262 |
|
| 273 | 263 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 274 | 264 |
|
| 275 |
public ObjectPreRender getPreRender()
|
|
| 265 |
public ObjectControl getControl()
|
|
| 276 | 266 |
{
|
| 277 | 267 |
TutorialSurfaceView view = findViewById(R.id.tutorialSurfaceView); |
| 278 |
return view.getPreRender();
|
|
| 268 |
return view.getObjectControl();
|
|
| 279 | 269 |
} |
| 280 | 270 |
|
| 281 | 271 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
Also available in: Unified diff
Move RubikControl to objectlib (as 'ObjectAutomator')
Hide ObjectPreRender inside objectlib and move its APi to ObjectControl.