Commit 6dc4bc32 authored by Viktor Lidholt's avatar Viktor Lidholt

Merge pull request #345 from vlidholt/master

Fixes analyzer warnings in sprites
parents 947d505c fbb645bb
...@@ -561,9 +561,10 @@ class Laser extends Sprite { ...@@ -561,9 +561,10 @@ class Laser extends Sprite {
// Background starfield // Background starfield
class StarField extends Node { class StarField extends NodeWithSize {
Image _image; sky.Image _image;
int _numStars; int _numStars;
bool _autoScroll;
List<Point> _starPositions; List<Point> _starPositions;
List<double> _starScales; List<double> _starScales;
List<Rect> _rects; List<Rect> _rects;
...@@ -573,7 +574,7 @@ class StarField extends Node { ...@@ -573,7 +574,7 @@ class StarField extends Node {
..isAntiAlias = false ..isAntiAlias = false
..setTransferMode(sky.TransferMode.plus); ..setTransferMode(sky.TransferMode.plus);
StarField(SpriteSheet spriteSheet, this._numStars) { StarField(SpriteSheet spriteSheet, this._numStars, [this._autoScroll = false]) : super(new Size(1024.0, 1024.0)) {
_starPositions = []; _starPositions = [];
_starScales = []; _starScales = [];
_colors = []; _colors = [];
...@@ -618,6 +619,12 @@ class StarField extends Node { ...@@ -618,6 +619,12 @@ class StarField extends Node {
_starPositions[i] = new Point(xPos, yPos); _starPositions[i] = new Point(xPos, yPos);
} }
} }
void update(double dt) {
if (_autoScroll) {
move(dt * 100.0, 0.0);
}
}
} }
class Hud extends NodeWithSize { class Hud extends NodeWithSize {
......
...@@ -416,7 +416,7 @@ class Node { ...@@ -416,7 +416,7 @@ class Node {
} }
void _prePaint(PaintingCanvas canvas) { void _prePaint(PaintingCanvas canvas) {
_savedTotalMatrix = canvas.getTotalMatrix(); _savedTotalMatrix = new Matrix4.fromFloat32List(canvas.getTotalMatrix());;
// Get the transformation matrix and apply transform // Get the transformation matrix and apply transform
canvas.concat(transformMatrix.storage); canvas.concat(transformMatrix.storage);
...@@ -467,7 +467,7 @@ class Node { ...@@ -467,7 +467,7 @@ class Node {
} }
void _postPaint(PaintingCanvas canvas) { void _postPaint(PaintingCanvas canvas) {
canvas.setMatrix(_savedTotalMatrix); canvas.setMatrix(_savedTotalMatrix.storage);
} }
// Receiving update calls // Receiving update calls
......
...@@ -68,7 +68,7 @@ class Sprite extends NodeWithSize { ...@@ -68,7 +68,7 @@ class Sprite extends NodeWithSize {
void paint(PaintingCanvas canvas) { void paint(PaintingCanvas canvas) {
// Store old matrix // Store old matrix
Matrix4 savedMatrix = canvas.getTotalMatrix(); Matrix4 savedMatrix = new Matrix4.fromFloat32List(canvas.getTotalMatrix());
// Account for pivot point // Account for pivot point
applyTransformForPivot(canvas); applyTransformForPivot(canvas);
...@@ -113,6 +113,6 @@ class Sprite extends NodeWithSize { ...@@ -113,6 +113,6 @@ class Sprite extends NodeWithSize {
} }
// Restore matrix // Restore matrix
canvas.setMatrix(savedMatrix); canvas.setMatrix(savedMatrix.storage);
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment