Revision eaf46415
Added by Leszek Koltunski over 2 years ago
| src/main/java/org/distorted/tutorials/TutorialActivity.java | ||
|---|---|---|
| 19 | 19 |
|
| 20 | 20 |
package org.distorted.tutorials; |
| 21 | 21 |
|
| 22 |
import android.content.SharedPreferences; |
|
| 22 | 23 |
import android.os.Build; |
| 23 | 24 |
import android.os.Bundle; |
| 25 |
import android.preference.PreferenceManager; |
|
| 24 | 26 |
import android.util.DisplayMetrics; |
| 25 | 27 |
import android.view.View; |
| 26 | 28 |
import android.view.ViewGroup; |
| ... | ... | |
| 32 | 34 |
|
| 33 | 35 |
import org.distorted.library.main.DistortedLibrary; |
| 34 | 36 |
|
| 37 |
import org.distorted.main.RubikSurfaceView; |
|
| 38 |
import org.distorted.network.RubikScores; |
|
| 39 |
import org.distorted.objectlib.effects.BaseEffect; |
|
| 40 |
import org.distorted.objectlib.main.ObjectPreRender; |
|
| 35 | 41 |
import org.distorted.objectlib.main.ObjectType; |
| 36 | 42 |
import org.distorted.objectlib.main.TwistyObject; |
| 37 |
|
|
| 38 |
import org.distorted.dialogs.RubikDialogError; |
|
| 39 | 43 |
import org.distorted.objectlib.helpers.BlockController; |
| 40 | 44 |
import org.distorted.objectlib.helpers.TwistyActivity; |
| 41 |
import org.distorted.objectlib.helpers.TwistyPreRender; |
|
| 45 |
|
|
| 42 | 46 |
import org.distorted.main.R; |
| 47 |
import org.distorted.dialogs.RubikDialogError; |
|
| 43 | 48 |
import org.distorted.screens.ScreenList; |
| 44 | 49 |
|
| 45 | 50 |
import static org.distorted.main.RubikRenderer.BRIGHTNESS; |
| ... | ... | |
| 205 | 210 |
TutorialSurfaceView view = findViewById(R.id.tutorialSurfaceView); |
| 206 | 211 |
view.onResume(); |
| 207 | 212 |
view.initialize(); |
| 213 |
restorePreferences(); |
|
| 208 | 214 |
|
| 209 | 215 |
if( mWebView!=null ) mWebView.onResume(); |
| 210 | 216 |
|
| ... | ... | |
| 224 | 230 |
DistortedLibrary.onDestroy(1); |
| 225 | 231 |
} |
| 226 | 232 |
|
| 233 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
| 234 |
|
|
| 235 |
private void restorePreferences() |
|
| 236 |
{
|
|
| 237 |
SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(this); |
|
| 238 |
TutorialSurfaceView view = findViewById(R.id.tutorialSurfaceView); |
|
| 239 |
view.getPreRender().restorePreferences(preferences); |
|
| 240 |
} |
|
| 241 |
|
|
| 227 | 242 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 228 | 243 |
|
| 229 | 244 |
void OpenGLError() |
| ... | ... | |
| 253 | 268 |
public TwistyObject getObject() |
| 254 | 269 |
{
|
| 255 | 270 |
TutorialSurfaceView view = findViewById(R.id.rubikSurfaceView); |
| 256 |
TutorialPreRender pre = view.getPreRender();
|
|
| 271 |
ObjectPreRender pre = view.getPreRender();
|
|
| 257 | 272 |
return pre.getObject(); |
| 258 | 273 |
} |
| 259 | 274 |
|
| ... | ... | |
| 273 | 288 |
|
| 274 | 289 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 275 | 290 |
|
| 276 |
public TutorialPreRender getPreRender() |
|
| 277 |
{
|
|
| 278 |
TutorialSurfaceView view = findViewById(R.id.tutorialSurfaceView); |
|
| 279 |
return view.getPreRender(); |
|
| 280 |
} |
|
| 281 |
|
|
| 282 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
| 283 |
|
|
| 284 |
public TwistyPreRender getTwistyPreRender() |
|
| 291 |
public ObjectPreRender getPreRender() |
|
| 285 | 292 |
{
|
| 286 | 293 |
TutorialSurfaceView view = findViewById(R.id.tutorialSurfaceView); |
| 287 | 294 |
return view.getPreRender(); |
Also available in: Unified diff
Move PreRender to objectlib.
This code is now shared betweeen the Rubik and Tutorial activities.