Skip to content

Restore improvement made by Carl Edquist <edquist@cs.wisc.edu> #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rokicki wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Restore improvement made by Carl Edquist <edquist@cs.wisc.edu> #8

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions RCube/Cube.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -405,12 +405,12 @@ void Cube::PushCenterPieces(byte src, byte dst, byte color)

uint stkptr = 0;
uint pieces = 0;
uint start = Mid;
uint start = 1;

//If starting from a save state then set the start point
if (Itteration > 0) start = Itteration;

for (int quadrant = QState; quadrant < 4; ++quadrant)
for (int quadrant = QState; quadrant < 2; ++quadrant)
{
this->QState = quadrant;

Expand All @@ -431,8 +431,10 @@ void Cube::PushCenterPieces(byte src, byte dst, byte color)
{
pieces = 0;
stkptr = 0;
for (uint c = 1; c < Mid; ++c)
for (uint c = 1; c < R1; ++c)
{
//Avoid diagonal piece collisions
if (c == r) continue;
if (faces[src].GetRCQ(r, c, sq) == color)
{
pieces++;
Expand Down Expand Up @@ -473,7 +475,7 @@ void Cube::PushCenterPieces(byte src, byte dst, byte color)
}

//reset the start point
start = Mid;
start = 1;

//Rotate the src face to prepare for the next quadrant
Move(src, 0, 1);
Expand Down