Revision 3f7a4363
Added by Leszek Koltunski over 2 years ago
src/main/java/org/distorted/main/RubikActivity.java | ||
---|---|---|
21 | 21 |
|
22 | 22 |
import android.content.Intent; |
23 | 23 |
import android.content.SharedPreferences; |
24 |
import android.content.res.Resources; |
|
25 | 24 |
import android.os.Build; |
26 | 25 |
import android.os.Bundle; |
27 | 26 |
import android.os.LocaleList; |
... | ... | |
36 | 35 |
|
37 | 36 |
import com.google.firebase.analytics.FirebaseAnalytics; |
38 | 37 |
|
38 |
import org.distorted.library.main.DistortedLibrary; |
|
39 |
import org.distorted.library.main.DistortedScreen; |
|
40 |
import org.distorted.library.type.Static4D; |
|
41 |
|
|
42 |
import org.distorted.objectlib.main.TwistyObject; |
|
43 |
import org.distorted.objectlib.main.ObjectList; |
|
44 |
|
|
39 | 45 |
import org.distorted.dialogs.RubikDialogError; |
40 | 46 |
import org.distorted.dialogs.RubikDialogPrivacy; |
41 | 47 |
import org.distorted.effects.BaseEffect; |
42 | 48 |
import org.distorted.helpers.BlockController; |
43 | 49 |
import org.distorted.helpers.TwistyActivity; |
44 | 50 |
import org.distorted.helpers.TwistyPreRender; |
45 |
import org.distorted.library.main.DistortedEffects; |
|
46 |
import org.distorted.library.main.DistortedLibrary; |
|
47 |
|
|
48 |
import org.distorted.library.main.DistortedScreen; |
|
49 |
import org.distorted.library.main.DistortedTexture; |
|
50 |
import org.distorted.library.mesh.MeshSquare; |
|
51 |
import org.distorted.library.type.Static4D; |
|
52 |
import org.distorted.objectlib.TwistyObject; |
|
53 | 51 |
import org.distorted.network.RubikScores; |
54 | 52 |
import org.distorted.network.RubikNetwork; |
55 |
import org.distorted.objectlib.ObjectList; |
|
56 |
import org.distorted.objects.TwistyBandaged2Bar; |
|
57 |
import org.distorted.objects.TwistyBandaged3Plate; |
|
58 |
import org.distorted.objects.TwistyBandagedEvil; |
|
59 |
import org.distorted.objects.TwistyBandagedFused; |
|
60 |
import org.distorted.objects.TwistyCube; |
|
61 |
import org.distorted.objects.TwistyDiamond; |
|
62 |
import org.distorted.objects.TwistyDino4; |
|
63 |
import org.distorted.objects.TwistyDino6; |
|
64 |
import org.distorted.objects.TwistyHelicopter; |
|
65 |
import org.distorted.objects.TwistyIvy; |
|
66 |
import org.distorted.objects.TwistyJing; |
|
67 |
import org.distorted.objects.TwistyKilominx; |
|
68 |
import org.distorted.objects.TwistyMegaminx; |
|
69 |
import org.distorted.objects.TwistyMirror; |
|
70 |
import org.distorted.objects.TwistyPyraminx; |
|
71 |
import org.distorted.objects.TwistyRedi; |
|
72 |
import org.distorted.objects.TwistyRex; |
|
73 |
import org.distorted.objects.TwistySkewb; |
|
74 |
import org.distorted.objects.TwistySquare1; |
|
75 |
import org.distorted.objects.TwistySquare2; |
|
76 |
import org.distorted.objects.TwistyUltimate; |
|
77 | 53 |
import org.distorted.screens.ScreenList; |
78 | 54 |
import org.distorted.screens.RubikScreenPlay; |
79 | 55 |
import org.distorted.tutorials.TutorialActivity; |
... | ... | |
674 | 650 |
myIntent.putExtra("siz", size); |
675 | 651 |
startActivity(myIntent); |
676 | 652 |
} |
677 |
|
|
678 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
679 |
|
|
680 |
public static TwistyObject create(ObjectList object, int size, Static4D quat, int[][] moves, Resources res, int scrWidth) |
|
681 |
{ |
|
682 |
DistortedTexture texture = new DistortedTexture(); |
|
683 |
DistortedEffects effects = new DistortedEffects(); |
|
684 |
MeshSquare mesh = new MeshSquare(20,20); // mesh of the node, not of the cubits |
|
685 |
|
|
686 |
switch(object.ordinal()) |
|
687 |
{ |
|
688 |
case 0: return new TwistyCube (size, quat, texture, mesh, effects, moves, res, scrWidth); |
|
689 |
case 1: return new TwistyJing (size, quat, texture, mesh, effects, moves, res, scrWidth); |
|
690 |
case 2: return new TwistyPyraminx (size, quat, texture, mesh, effects, moves, res, scrWidth); |
|
691 |
case 3: return new TwistyKilominx (size, quat, texture, mesh, effects, moves, res, scrWidth); |
|
692 |
case 4: return new TwistyMegaminx (size, quat, texture, mesh, effects, moves, res, scrWidth); |
|
693 |
case 5: return new TwistyUltimate (size, quat, texture, mesh, effects, moves, res, scrWidth); |
|
694 |
case 6: return new TwistyDiamond (size, quat, texture, mesh, effects, moves, res, scrWidth); |
|
695 |
case 7: return new TwistyDino6 (size, quat, texture, mesh, effects, moves, res, scrWidth); |
|
696 |
case 8: return new TwistyDino4 (size, quat, texture, mesh, effects, moves, res, scrWidth); |
|
697 |
case 9: return new TwistyRedi (size, quat, texture, mesh, effects, moves, res, scrWidth); |
|
698 |
case 10: return new TwistyHelicopter (size, quat, texture, mesh, effects, moves, res, scrWidth); |
|
699 |
case 11: return new TwistySkewb (size, quat, texture, mesh, effects, moves, res, scrWidth); |
|
700 |
case 12: return new TwistyIvy (size, quat, texture, mesh, effects, moves, res, scrWidth); |
|
701 |
case 13: return new TwistyRex (size, quat, texture, mesh, effects, moves, res, scrWidth); |
|
702 |
case 14: return new TwistyBandagedFused (size, quat, texture, mesh, effects, moves, res, scrWidth); |
|
703 |
case 15: return new TwistyBandaged2Bar (size, quat, texture, mesh, effects, moves, res, scrWidth); |
|
704 |
case 16: return new TwistyBandaged3Plate (size, quat, texture, mesh, effects, moves, res, scrWidth); |
|
705 |
case 17: return new TwistyBandagedEvil (size, quat, texture, mesh, effects, moves, res, scrWidth); |
|
706 |
case 18: return new TwistySquare1 (size, quat, texture, mesh, effects, moves, res, scrWidth); |
|
707 |
case 19: return new TwistySquare2 (size, quat, texture, mesh, effects, moves, res, scrWidth); |
|
708 |
case 20: return new TwistyMirror (size, quat, texture, mesh, effects, moves, res, scrWidth); |
|
709 |
} |
|
710 |
|
|
711 |
return null; |
|
712 |
} |
|
713 | 653 |
} |
Also available in: Unified diff
Remove all files that have been separated into a new library 'objectlib'