Project

General

Profile

« Previous | Next » 

Revision 3ef1609d

Added by Leszek Koltunski about 2 years ago

Simplify the way we remember cubit quats, and delete those from SharedPrefs when we delete a bandaged object.

View differences:

src/main/java/org/distorted/objectlib/main/Cubit.java
163 163

  
164 164
///////////////////////////////////////////////////////////////////////////////////////////////////
165 165

  
166
  void savePreferences(String key, SharedPreferences.Editor editor)
166
  void savePreferences(String key, int cubit, SharedPreferences.Editor editor)
167 167
    {
168
    String number = mOrigPosition[0]+"_"+mOrigPosition[1]+"_"+mOrigPosition[2];
169
    editor.putInt(key+number, mQuatIndex);
168
    editor.putInt(key+"_"+cubit, mQuatIndex);
170 169
    }
171 170

  
172 171
///////////////////////////////////////////////////////////////////////////////////////////////////
173 172

  
174
  int restorePreferences(String key, SharedPreferences preferences)
173
  int restorePreferences(String key, int cubit, SharedPreferences preferences)
175 174
    {
176
    String number = mOrigPosition[0]+"_"+mOrigPosition[1]+"_"+mOrigPosition[2];
177
    mQuatIndex = preferences.getInt(key+number, 0);
175
    mQuatIndex = preferences.getInt(key+"_"+cubit, 0);
178 176
    return mQuatIndex;
179 177
    }
180 178

  
src/main/java/org/distorted/objectlib/main/TwistyObject.java
1204 1204

  
1205 1205
    for(int i=0; i<mNumCubits; i++)
1206 1206
      {
1207
      mQuatDebug[i] = mCubits[i].restorePreferences(key,preferences);
1207
      mQuatDebug[i] = mCubits[i].restorePreferences(key,i,preferences);
1208 1208

  
1209 1209
      if( mQuatDebug[i]>=0 && mQuatDebug[i]<mNumQuats )
1210 1210
        {
......
1232 1232
  void savePreferences(SharedPreferences.Editor editor)
1233 1233
    {
1234 1234
    String key = getShortName();
1235
    for(int i=0; i<mNumCubits; i++) mCubits[i].savePreferences(key,editor);
1235
    for(int i=0; i<mNumCubits; i++) mCubits[i].savePreferences(key,i,editor);
1236 1236
    }
1237 1237

  
1238 1238
///////////////////////////////////////////////////////////////////////////////////////////////////

Also available in: Unified diff