Skip to content

Commit 50c6c7f

Browse files
author
daniel-lundin
committed
Wrong matrix multiplication order for offset after code cleanup
1 parent 118abc5 commit 50c6c7f

File tree

4 files changed

+6
-18
lines changed

4 files changed

+6
-18
lines changed

‎dist/jquery.snabbt.min.js

Lines changed: 1 addition & 15 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/snabbt.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/main.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@ function snabbt(arg1, arg2, arg3) {
1212
var options = arg2;
1313

1414

15-
var start = snabbtjs.current_animation_transform(element);
15+
//var start = snabbtjs.current_animation_transform(element);
16+
//start = snabbtjs.state_from_options(start, options, 'from_');
17+
var start = snabbtjs.current_animation_transform(snabbtjs.State({}), options, 'from_');
1618
start = snabbtjs.state_from_options(start, options, 'from_');
1719
var end = new snabbtjs.State({});
1820
end = snabbtjs.state_from_options(end, options, '');

‎src/state.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ snabbtjs.State.prototype.as_matrix = function() {
7171
m = snabbtjs.mult(m, snabbtjs.rotZ(this.bz));
7272

7373
// Final offset
74-
m = snabbtjs.mult(m, snabbtjs.trans(this.offset_x, this.offset_y, this.offset_z));
74+
m = snabbtjs.mult(snabbtjs.trans(this.offset_x, this.offset_y, this.offset_z), m);
7575
return m;
7676
};
7777

0 commit comments

Comments
 (0)