From 7447809cdc69518c2eecabce7e12f2c538a67dc0 Mon Sep 17 00:00:00 2001
From: L4168 <L4168@student.jamk.fi>
Date: Tue, 16 Jul 2019 16:49:57 +0300
Subject: [PATCH] different images for players
---
.../src/leaflet.trackplayback/draw.js | 36 ++++++++++++++-----
1 file changed, 27 insertions(+), 9 deletions(-)
diff --git a/src/track-playback/src/leaflet.trackplayback/draw.js b/src/track-playback/src/leaflet.trackplayback/draw.js
index 2664aed..302df5f 100644
--- a/src/track-playback/src/leaflet.trackplayback/draw.js
+++ b/src/track-playback/src/leaflet.trackplayback/draw.js
@@ -67,7 +67,16 @@ export const Draw = L.Class.extend({
// ç›®æ ‡å¦‚æžœä½¿ç”¨å›¾ç‰‡ï¼Œå…ˆåŠ è½½å›¾ç‰‡
if (this.targetOptions.useImg) {
- const img = new Image();
+ let img = new Image();
+ let img2 = new Image();
+ img2.onload = () => {
+ this._targetImg2 = img2;
+ };
+ img2.onerror = () => {
+ throw new Error("img load error!");
+ };
+ img2.src = this.targetOptions.imgUrl;
+
img.onload = () => {
this._targetImg = img;
};
@@ -303,17 +312,25 @@ export const Draw = L.Class.extend({
};
this._ctx.save();
this._ctx.translate(point.x, point.y);
- let svg = document.createElementNS(`../${info[0]["value"]}`, "svg");
- let img = new Image();
- img.onload = () => {
- this._ctx.drawImage(img, 0 - offset.x, 0 - offset.y, width, height);
- };
- img.src = `../${info[0]["value"]}`;
- console.log(img);
+
+ //let svg = document.createElementNS(`../${info[0]["value"]}`, "svg"); //http://www.sclance.com/pngs/random-png/random_png_1136179.png
+ let image =
+ info[0]["value"] === "infantry.svg" ? this._targetImg : this._targetImg2;
+ image.src = `../${info[0]["value"]}`;
+ this._ctx.drawImage(image, 0 - offset.x, 0 - offset.y, width, height);
this._ctx.restore();
},
- /* _drawShipImage: function(trackpoint) {
+ // _createImage: async function() {
+ // const newimg = await new Image();
+ // newimg.onload = async () => {};
+ // newimg.onerror = async () => {
+ // throw new Error("img load error!");
+ // };
+ // return await newimg;
+ // },
+
+ /* _drawShipImage: function(trackpoint, info) {
let point = this._getLayerPoint(trackpoint);
let width = this.targetOptions.width;
let height = this.targetOptions.height;
@@ -330,6 +347,7 @@ export const Draw = L.Class.extend({
width,
height
);
+ console.log(this._targetImg);
this._ctx.restore();
}, */
--
GitLab