Project

General

Profile

« Previous | Next » 

Revision 96208efc

Added by Leszek Koltunski over 3 years ago

MOve the FOV from ObjectList to individual object classes.

View differences:

src/main/java/org/distorted/objects/ObjectList.java
44 44
                       {5 , 24, 28, R.raw.cube5, R.drawable.ui_small_cube5, R.drawable.ui_medium_cube5, R.drawable.ui_big_cube5, R.drawable.ui_huge_cube5}
45 45
                     },
46 46
         TwistyCube.class,
47
         0,
48
         60
47
         0
49 48
       ),
50 49

  
51 50
  JING (
......
53 52
                       {2 , 11, 11, R.raw.jing, R.drawable.ui_small_jing2, R.drawable.ui_medium_jing2, R.drawable.ui_big_jing2, R.drawable.ui_huge_jing2} ,
54 53
                     },
55 54
         TwistyJing.class,
56
         1,
57
         30
55
         1
58 56
       ),
59 57

  
60 58
  PYRA (
......
64 62
                       {5 , 20, 23, R.raw.pyra5, R.drawable.ui_small_pyra5, R.drawable.ui_medium_pyra5, R.drawable.ui_big_pyra5, R.drawable.ui_huge_pyra5}
65 63
                     },
66 64
         TwistyPyraminx.class,
67
         1,
68
         30
65
         1
69 66
       ),
70 67

  
71 68
  KILO (
......
74 71
                       {5 , 33, 33, R.raw.kilo5, R.drawable.ui_small_kilo5, R.drawable.ui_medium_kilo5, R.drawable.ui_big_kilo5, R.drawable.ui_huge_kilo5} ,
75 72
                     },
76 73
         TwistyKilominx.class,
77
         2,
78
         30
74
         2
79 75
       ),
80 76

  
81 77
  MEGA (
......
84 80
                       {5 , 35, 37, R.raw.mega5, R.drawable.ui_small_mega5, R.drawable.ui_medium_mega5, R.drawable.ui_big_mega5, R.drawable.ui_huge_mega5} ,
85 81
                     },
86 82
         TwistyMegaminx.class,
87
         2,
88
         30
83
         2
89 84
       ),
90 85

  
91 86
  ULTI (
......
93 88
                       {2 , 18, 18, R.raw.ulti, R.drawable.ui_small_ulti, R.drawable.ui_medium_ulti, R.drawable.ui_big_ulti, R.drawable.ui_huge_ulti} ,
94 89
                     },
95 90
         TwistyUltimate.class,
96
         3,
97
         30
91
         3
98 92
       ),
99 93

  
100 94
  DIAM (
......
104 98
                       {4 , 32, 32, R.raw.diam4, R.drawable.ui_small_diam4, R.drawable.ui_medium_diam4, R.drawable.ui_big_diam4, R.drawable.ui_huge_diam4} ,
105 99
                     },
106 100
         TwistyDiamond.class,
107
         3,
108
         60
101
         3
109 102
       ),
110 103

  
111 104
  DINO (
......
113 106
                       {3 , 10, 10, R.raw.dino, R.drawable.ui_small_dino, R.drawable.ui_medium_dino, R.drawable.ui_big_dino, R.drawable.ui_huge_dino} ,
114 107
                     },
115 108
         TwistyDino6.class,
116
         4,
117
         60
109
         4
118 110
       ),
119 111

  
120 112
  DIN4 (
......
122 114
                       {3 , 7, 7, R.raw.dino, R.drawable.ui_small_din4, R.drawable.ui_medium_din4, R.drawable.ui_big_din4, R.drawable.ui_huge_din4} ,
123 115
                     },
124 116
         TwistyDino4.class,
125
         4,
126
         60
117
         4
127 118
       ),
128 119

  
129 120
  REDI (
......
131 122
                       {3 , 14, 16, R.raw.redi, R.drawable.ui_small_redi, R.drawable.ui_medium_redi, R.drawable.ui_big_redi, R.drawable.ui_huge_redi} ,
132 123
                     },
133 124
         TwistyRedi.class,
134
         4,
135
         60
125
         4
136 126
       ),
137 127

  
138 128
  HELI (
......
140 130
                       {3 , 18, 20, R.raw.heli, R.drawable.ui_small_heli, R.drawable.ui_medium_heli, R.drawable.ui_big_heli, R.drawable.ui_huge_heli} ,
141 131
                     },
142 132
         TwistyHelicopter.class,
143
         4,
144
         60
133
         4
145 134
       ),
146 135

  
147 136
  SKEW (
......
150 139
                       {3 , 17, 21, R.raw.skew3, R.drawable.ui_small_skewm, R.drawable.ui_medium_skewm, R.drawable.ui_big_skewm, R.drawable.ui_huge_skewm} ,
151 140
                     },
152 141
         TwistySkewb.class,
153
         5,
154
         60
142
         5
155 143
       ),
156 144

  
157 145
  IVY  (
......
159 147
                       {2 , 8, 8, R.raw.ivy, R.drawable.ui_small_ivy, R.drawable.ui_medium_ivy, R.drawable.ui_big_ivy, R.drawable.ui_huge_ivy} ,
160 148
                     },
161 149
         TwistyIvy.class,
162
         5,
163
         60
150
         5
164 151
       ),
165 152

  
166 153
  REX  (
......
168 155
                       {3 , 16, 19, R.raw.rex, R.drawable.ui_small_rex, R.drawable.ui_medium_rex, R.drawable.ui_big_rex, R.drawable.ui_huge_rex} ,
169 156
                     },
170 157
         TwistyRex.class,
171
         5,
172
         60
158
         5
173 159
       ),
174 160

  
175 161
  BAN1 (
......
177 163
                       {3 , 16, 16, R.raw.ban1, R.drawable.ui_small_ban1, R.drawable.ui_medium_ban1, R.drawable.ui_big_ban1, R.drawable.ui_huge_ban1} ,
178 164
                     },
179 165
         TwistyBandagedFused.class,
180
         6,
181
         60
166
         6
182 167
       ),
183 168

  
184 169
  BAN2 (
......
186 171
                       {3 , 16, 16, R.raw.ban2, R.drawable.ui_small_ban2, R.drawable.ui_medium_ban2, R.drawable.ui_big_ban2, R.drawable.ui_huge_ban2} ,
187 172
                     },
188 173
         TwistyBandaged2Bar.class,
189
         6,
190
         60
174
         6
191 175
       ),
192 176

  
193 177
  BAN3 (
......
195 179
                       {3 , 16, 16, R.raw.ban3, R.drawable.ui_small_ban3, R.drawable.ui_medium_ban3, R.drawable.ui_big_ban3, R.drawable.ui_huge_ban3} ,
196 180
                     },
197 181
         TwistyBandaged3Plate.class,
198
         6,
199
         60
182
         6
200 183
       ),
201 184

  
202 185
  BAN4 (
......
204 187
                       {3 , 16, 16, R.raw.ban4, R.drawable.ui_small_ban4, R.drawable.ui_medium_ban4, R.drawable.ui_big_ban4, R.drawable.ui_huge_ban4} ,
205 188
                     },
206 189
         TwistyBandagedEvil.class,
207
         6,
208
         60
190
         6
209 191
       ),
210 192

  
211 193
  SQU1 (
......
213 195
                       {3 , 24, 24, R.raw.square1, R.drawable.ui_small_square1, R.drawable.ui_medium_square1, R.drawable.ui_big_square1, R.drawable.ui_huge_square1} ,
214 196
                     },
215 197
         TwistySquare1.class,
216
         7,
217
         60
198
         7
218 199
       ),
219 200

  
220 201
  SQU2 (
......
222 203
                       {3 , 24, 24, R.raw.square2, R.drawable.ui_small_square2, R.drawable.ui_medium_square2, R.drawable.ui_big_square2, R.drawable.ui_huge_square2} ,
223 204
                     },
224 205
         TwistySquare2.class,
225
         7,
226
         60
206
         7
227 207
       ),
228 208

  
229 209
  MIRR (
......
232 212
                       {3 , 16, 17, R.raw.mirr3, R.drawable.ui_small_mirr3, R.drawable.ui_medium_mirr3, R.drawable.ui_big_mirr3, R.drawable.ui_huge_mirr3} ,
233 213
                     },
234 214
         TwistyMirror.class,
235
         7,
236
         60
215
         7
237 216
       ),
238 217
  ;
239 218

  
......
246 225
  private final int[] mObjectSizes, mDBLevels, mNumScrambles, mSmallIconIDs, mMediumIconIDs, mBigIconIDs, mHugeIconIDs, mResourceIDs;
247 226
  private final Class<? extends TwistyObject> mObjectClass;
248 227
  private final int mRow, mNumSizes;
249
  private final int mFOV;
250 228

  
251 229
  private static final ObjectList[] objects;
252 230
  private static int mNumAll;
......
543 521

  
544 522
///////////////////////////////////////////////////////////////////////////////////////////////////
545 523

  
546
  ObjectList(int[][] info, Class<? extends TwistyObject> object , int row, int fov)
524
  ObjectList(int[][] info, Class<? extends TwistyObject> object , int row)
547 525
    {
548 526
    mNumSizes = info.length;
549 527

  
......
570 548

  
571 549
    mObjectClass= object;
572 550
    mRow        = row;
573
    mFOV        = fov;
574 551
    }
575 552

  
576 553
///////////////////////////////////////////////////////////////////////////////////////////////////
......
580 557
    return mObjectSizes;
581 558
    }
582 559

  
583
///////////////////////////////////////////////////////////////////////////////////////////////////
584

  
585
  public int[] getDBLevels()
586
    {
587
    return mDBLevels;
588
    }
589

  
590
///////////////////////////////////////////////////////////////////////////////////////////////////
591

  
592
  public int[] getNumScrambles()
593
    {
594
    return mNumScrambles;
595
    }
596

  
597
///////////////////////////////////////////////////////////////////////////////////////////////////
598

  
599
  public int getFOV()
600
    {
601
    return mFOV;
602
    }
603

  
604 560
///////////////////////////////////////////////////////////////////////////////////////////////////
605 561

  
606 562
  public int[] getIconIDs()
......
623 579
    return mResourceIDs;
624 580
    }
625 581

  
626
///////////////////////////////////////////////////////////////////////////////////////////////////
627

  
628
  public int getNumVariants()
629
    {
630
    return mObjectSizes.length;
631
    }
632

  
633 582
///////////////////////////////////////////////////////////////////////////////////////////////////
634 583

  
635 584
  public TwistyObject create(int size, Static4D quat, int[][] moves, Resources res, int scrWidth)
src/main/java/org/distorted/objects/Twisty12.java
72 72
    return 12;
73 73
    }
74 74

  
75
///////////////////////////////////////////////////////////////////////////////////////////////////
76

  
77
  int getFOV()
78
    {
79
    return 30;
80
    }
81

  
75 82
///////////////////////////////////////////////////////////////////////////////////////////////////
76 83

  
77 84
  float getScreenRatio()
78 85
    {
79
    return 0.33f;
86
    return 0.35f;
80 87
    }
81 88

  
82 89
///////////////////////////////////////////////////////////////////////////////////////////////////
src/main/java/org/distorted/objects/Twisty4.java
58 58
    return 4;
59 59
    }
60 60

  
61
///////////////////////////////////////////////////////////////////////////////////////////////////
62

  
63
  int getFOV()
64
    {
65
    return 30;
66
    }
67

  
61 68
///////////////////////////////////////////////////////////////////////////////////////////////////
62 69

  
63 70
  float getScreenRatio()
src/main/java/org/distorted/objects/Twisty6.java
59 59
    return 6;
60 60
    }
61 61

  
62
///////////////////////////////////////////////////////////////////////////////////////////////////
63

  
64
  int getFOV()
65
    {
66
    return 60;
67
    }
68

  
62 69
///////////////////////////////////////////////////////////////////////////////////////////////////
63 70

  
64 71
  float getScreenRatio()
src/main/java/org/distorted/objects/Twisty8.java
60 60
    return 8;
61 61
    }
62 62

  
63
///////////////////////////////////////////////////////////////////////////////////////////////////
64

  
65
  int getFOV()
66
    {
67
    return 60;
68
    }
69

  
63 70
///////////////////////////////////////////////////////////////////////////////////////////////////
64 71

  
65 72
  float getScreenRatio()
src/main/java/org/distorted/objects/TwistyObject.java
240 240

  
241 241
    setupPosition(moves);
242 242

  
243
    float fov = list.getFOV();
243
    float fov = getFOV();
244 244
    double halfFOV = fov * (Math.PI/360);
245 245
    mCameraDist = 0.5f*NODE_RATIO / (float)Math.tan(halfFOV);
246 246

  
......
1306 1306
  abstract ObjectShape getObjectShape(int cubit, int numLayers);
1307 1307
  abstract int[] getSolvedQuats(int cubit, int numLayers);
1308 1308
  abstract int getSolvedFunctionIndex();
1309
  abstract int getFOV();
1309 1310
  abstract ScrambleState[] getScrambleStates();
1310 1311

  
1311 1312
  public abstract Movement getMovement();

Also available in: Unified diff