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

Add default image support. Custom images are not rendered - alex or steve are

Browse Source
This commit is contained in:
Jake 2014-12-05 23:16:14 -06:00
parent 5e453ced02
commit b151e03035
4 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/helpers.js
View File

@ -181,7 +181,12 @@ exp.get_skin = function(uuid, callback) {
exp.get_render = function(uuid, scale, helm, body, callback) { exp.get_render = function(uuid, scale, helm, body, callback) {
logging.log(uuid + " render request"); logging.log(uuid + " render request");
exp.get_skin(uuid, function(err, hash, img) { exp.get_skin(uuid, function(err, hash, img) {
if (!img) {
callback(err, 0, hash, null);
return;
}
renders.draw_model(uuid, img, scale, helm, body, function(err, img) { renders.draw_model(uuid, img, scale, helm, body, function(err, img) {
console.log("thing" + img);
if (err) { if (err) {
callback(err, -1, hash, null); callback(err, -1, hash, null);
} else if (!img) { } else if (!img) {

3
modules/renders.js
View File

@ -108,6 +108,9 @@ exp.draw_model = function(uuid, img, scale, helm, body, callback) {
} }
model_canvas.toBuffer(function(err, buf){ model_canvas.toBuffer(function(err, buf){
if (err) {
logging.log("error creating buffer: " + err);
}
callback(err, buf); callback(err, buf);
}); });
}; };

17
routes/renders.js
View File

@ -30,7 +30,7 @@ router.get('/:type/:uuid.:ext?', function(req, res) {
var body = raw_type == "head" ? false : true var body = raw_type == "head" ? false : true
var uuid = req.params.uuid; var uuid = req.params.uuid;
var def = req.params.def; var def = req.query.default;
var scale = parseInt(req.query.scale) || config.default_scale; var scale = parseInt(req.query.scale) || config.default_scale;
var helm = req.query.hasOwnProperty('helm'); var helm = req.query.hasOwnProperty('helm');
var start = new Date(); var start = new Date();
@ -67,6 +67,7 @@ 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 {
logging.log("image not found, using default.")
handle_default(404, status); handle_default(404, status);
} }
}); });
@ -88,11 +89,15 @@ 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);
fs.readFile("public/images/" + def + ".png", function (err, buf) { fs.readFile("public/images/" + def + "_skin.png", function (err, buf) {
if (err) throw err; if (err) {
console.log(buf); logging.error("error rendering default image: " + err);
renders.draw_model(uuid, buf, scale, helm, body, function(err, status, image) { }
sendimage(http_status, img_status, image); renders.draw_model(uuid, buf, scale, helm, body, function(err, def_img) {
if (err) {
logging.log("error while rendering default image: " + err);
}
sendimage(http_status, img_status, def_img);
}); });
}); });
} }

3
views/index.jade
View File

@ -83,7 +83,8 @@ block content
.code .code
| #{domain}/renders/body/ | #{domain}/renders/body/
mark.green id mark.green id
| The <b>default</b> parameter can also be used here. The scale factor will not be applied. | The <b>default</b> parameter can also be used here. Using alex or steve will create a
| render with the same parameters. A custom image will not be rendered.
| Using the <b>helm</b> parameter is also allowed, which will be overlayed onto the head. | Using the <b>helm</b> parameter is also allowed, which will be overlayed onto the head.
| The <b>head</b> render type will return only a render of the skin's head, while the | The <b>head</b> render type will return only a render of the skin's head, while the
| <b>body</b> render will return a render of the entire skin. | <b>body</b> render will return a render of the entire skin.