azures04/crafatar
1
0
Fork 0
mirror of https://github.com/azures04/crafatar.git synced 2026-03-22 07:51:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Create get_render helpers method, move things around

Browse Source
This commit is contained in:
Jake 2014-12-05 21:08:33 -06:00
parent 55f023bfb3
commit 9ba3f5190a
3 changed files with 59 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
modules/helpers.js
View File

@ -3,6 +3,7 @@ var logging = require("./logging");
var config = require("./config"); var config = require("./config");
var cache = require("./cache"); var cache = require("./cache");
var skins = require("./skins"); var skins = require("./skins");
var renders = require("./renders")
var fs = require("fs"); var fs = require("fs");
// 0098cb60-fa8e-427c-b299-793cbd302c9a // 0098cb60-fa8e-427c-b299-793cbd302c9a
@ -175,4 +176,21 @@ exp.get_skin = function(uuid, callback) {
}); });
}; };
// handles creations of skin renders
// callback contanis error, hash, image buffer
exp.get_render = function(uuid, scale, helm, body, callback) {
logging.log(uuid + " render request");
exp.get_skin(uuid, function(err, hash, img) {
renders.draw_model(uuid, img, scale, helm, body, function(err, img) {
if (err) {
callback(err, -1, hash, null);
} else if (!img) {
callback(null, 0, hash, null);
} else {
callback(null, 2, hash, img);
}
});
});
};
module.exports = exp; module.exports = exp;

8
modules/renders.js
View File

@ -78,8 +78,7 @@ exp.draw_body = function(skin_canvas, model_ctx, scale) {
model_ctx.drawImage(skin_canvas, 44*scale, 16*scale, 4*scale, 4*scale, -16*scale, 16*scale, 4*scale, 4*scale); model_ctx.drawImage(skin_canvas, 44*scale, 16*scale, 4*scale, 4*scale, -16*scale, 16*scale, 4*scale, 4*scale);
} }
exp.draw_model = function(uuid, scale, helm, body, callback) { exp.draw_model = function(uuid, img, scale, helm, body, callback) {
helpers.get_skin(uuid, function(err, hash, img) {
var image = new Image; var image = new Image;
var width = 64 * scale; var width = 64 * scale;
var height = 64 * scale; var height = 64 * scale;
@ -90,7 +89,7 @@ exp.draw_model = function(uuid, scale, helm, body, callback) {
image.onerror = function(err) { image.onerror = function(err) {
logging.error("render error: " + err); logging.error("render error: " + err);
callback(err, 2, null, hash); callback(err, null);
}; };
image.onload = function() { image.onload = function() {
@ -109,12 +108,11 @@ exp.draw_model = function(uuid, scale, helm, body, callback) {
} }
model_canvas.toBuffer(function(err, buf){ model_canvas.toBuffer(function(err, buf){
callback(err, 2, buf, hash); callback(err, buf);
}); });
}; };
image.src = img; image.src = img;
});
} }
function scale_image(imageData, context, d_x, d_y, scale) { function scale_image(imageData, context, d_x, d_y, scale) {

13
routes/renders.js
View File

@ -5,6 +5,7 @@ var helpers = require('../modules/helpers');
var config = require('../modules/config'); var config = require('../modules/config');
var skins = require('../modules/skins'); var skins = require('../modules/skins');
var renders = require('../modules/renders'); var renders = require('../modules/renders');
var fs = require('fs');
var human_status = { var human_status = {
0: "none", 0: "none",
@ -47,7 +48,7 @@ router.get('/:type/:uuid.:ext?', function(req, res) {
uuid = uuid.replace(/-/g, ""); uuid = uuid.replace(/-/g, "");
try { try {
renders.draw_model(uuid, scale, helm, body, function(err, status, image, hash) { helpers.get_render(uuid, scale, helm, body, function(err, status, hash, image) {
logging.log(uuid + " - " + human_status[status]); logging.log(uuid + " - " + human_status[status]);
if (err) { if (err) {
logging.error(err); logging.error(err);
@ -66,13 +67,13 @@ router.get('/:type/:uuid.:ext?', function(req, res) {
logging.log("status: " + http_status); logging.log("status: " + http_status);
sendimage(http_status, status, image); sendimage(http_status, status, image);
} else { } else {
//handle_default(404, status); handle_default(404, status);
} }
}); });
} catch(e) { } catch(e) {
logging.error("Error!"); logging.error("Error!");
logging.error(e); logging.error(e);
//handle_default(500, status); handle_default(500, status);
} }
function handle_default(http_status, img_status) { function handle_default(http_status, img_status) {
@ -87,9 +88,13 @@ router.get('/:type/:uuid.:ext?', function(req, res) {
res.end(); res.end();
} else { } else {
def = def || skins.default_skin(uuid); def = def || skins.default_skin(uuid);
skins.resize_img("public/images/" + def + ".png", size, function(err, image) { fs.readFile("public/images/" + def + ".png", function (err, buf) {
if (err) throw err;
console.log(buf);
renders.draw_model(uuid, buf, scale, helm, body, function(err, status, image) {
sendimage(http_status, img_status, image); sendimage(http_status, img_status, image);
}); });
});
} }
} }