summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 5c09416)
raw | patch | inline | side by side (parent: 5c09416)
author | tavmjong <tavmjong@users.sourceforge.net> | |
Fri, 7 Mar 2008 20:48:39 +0000 (20:48 +0000) | ||
committer | tavmjong <tavmjong@users.sourceforge.net> | |
Fri, 7 Mar 2008 20:48:39 +0000 (20:48 +0000) |
src/dialogs/clonetiler.cpp | patch | blob | history |
index 77725c525010ece42436030df9fd660f517d0da9..621f1acfad501be5eb1d5310dff562c984820e2f 100644 (file)
dia9 = dia6 * dia3.inverse();
dia10 = dia6 * dia4.inverse();
} else {
dia9 = dia6 * dia3.inverse();
dia10 = dia6 * dia4.inverse();
} else {
- ori = NR::Matrix(NR::translate (4*h * cos30 * pow((i/12 + 0.5*(j%2)), shiftx_exp) + dx, (2*h + 2*h * sin30) * pow(y, shifty_exp) + dy));
+ ori = NR::Matrix(NR::translate (4*h * cos30 * pow((i/12 + 0.5*(j%2)), shiftx_exp) + dx, (2*h + 2*h * sin30) * pow(j, shifty_exp) + dy));
dia1 = NR::Matrix (NR::translate (-w/2, -h/2) * NR::translate (h/2 * cos30, -h/2 * sin30) * NR::translate (w/2 * cos60, w/2 * sin60));
dia2 = dia1 * NR::Matrix (NR::translate (h * cos30, -h * sin30));
dia3 = dia2 * NR::Matrix (NR::translate (-w/2 * cos60, -w/2 * sin60) * NR::translate (h * cos30, 0) * NR::translate (-w/2 * cos60, w/2 * sin60));
dia1 = NR::Matrix (NR::translate (-w/2, -h/2) * NR::translate (h/2 * cos30, -h/2 * sin30) * NR::translate (w/2 * cos60, w/2 * sin60));
dia2 = dia1 * NR::Matrix (NR::translate (h * cos30, -h * sin30));
dia3 = dia2 * NR::Matrix (NR::translate (-w/2 * cos60, -w/2 * sin60) * NR::translate (h * cos30, 0) * NR::translate (-w/2 * cos60, w/2 * sin60));