Project

General

Profile

« Previous | Next » 

Revision 7d2fe403

Added by Leszek Koltunski almost 2 years ago

Decider&Follower cubits: fix solving the whole puzzle.

View differences:

src/main/java/org/distorted/objectlib/main/TwistyObject.java
1162 1162 
            }
1163 1163 
          else if( mCubits[j].getType()==Cubit.TYPE_FOLLOWER )
1164 1164 
            {
1165 
            mCubits[j].adjustRotRowPostRotateADecider();
1165 
            mCubits[j].computeRotationRow();
1166 1166 
            setCubitQuat(j,mCubits[j].computeAssociation(),mCubits[j].mQuatIndex);
1167 1167 
            }
1168 1168 
          }
......
1366 1366 
        }
1367 1367 
      else if( mCubits[i].getType()==Cubit.TYPE_FOLLOWER )
1368 1368 
        {
1369 
        mCubits[i].adjustRotRowPostRotateADecider();
1369 
        mCubits[i].computeRotationRow();
1370 1370 
        setCubitQuat(i,mCubits[i].computeAssociation(),mCubits[i].mQuatIndex);
1371 1371 
        }
1372 1372 
      }
......
1910 1910 
    for(int i=0; i<mNumCubits; i++)
1911 1911 
      {
1912 1912 
      mCubits[i].solve();
1913 
      }
1914 

  		




  
  1915
  
    
    recomputeFaceOffsets();


  		




  
  1916
  
    

  		




  
  1917
  
    
    for(int i=0; i<mNumCubits; i++)


  		




  
  1918
  
    
      {


  		




  
  1919
  
    
      mCubits[i].computeRotationRow();


  		




  1913
  1920
  
    
      setCubitQuat(i,mCubits[i].computeAssociation(),0);


  		




  1914
  1921
  
    
      }


  		




  1915
  1922
  
    
    }


  		












Also available in:  Unified diff