azures04/crafatar
1
0
Fork 0
mirror of https://github.com/azures04/crafatar.git synced 2026-05-06 19:10:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:crafatar/crafatar

Browse Source
This commit is contained in:
Jake
2015-02-16 17:27:14 -06:00
parent 42b8c3c525 de5bad8702
commit 10af521f39
8 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
modules/helpers.js
View File

@@ -146,7 +146,15 @@ function store_images(rid, userId, details, type, callback) {
currently_running.push(new_hash);
networking.get_profile(rid, (is_uuid ? userId : null), function(err, profile) {
if (err || (is_uuid && !profile)) {
callback_for(userId, type, err, null);
if (!err && !profile) {
cache.save_hash(rid, userId, null, null, function(cache_err) {
// we have no profile, so we have neither skin nor cape
callback_for(userId, "skin", cache_err, null);
callback_for(userId, "cape", cache_err, null);
});
} else {
callback_for(userId, type, err, null);
}
} else {
store_skin(rid, userId, profile, details, function(err, skin_hash) {
cache.save_hash(rid, userId, skin_hash, null, function(cache_err) {

7
modules/renders.js
View File

@@ -2,7 +2,6 @@
// https://github.com/confuser/serverless-mc-skin-viewer
// Permission to use & distribute https://github.com/confuser/serverless-mc-skin-viewer/blob/master/LICENSE
var helpers = require("./helpers");
var logging = require("./logging");
var fs = require("fs");
var Canvas = require("canvas");
@@ -43,7 +42,7 @@ exp.draw_head = function(skin_canvas, model_ctx, scale) {
// using the skin from the +model_ctx+ at the +scale+
// parts are labeled as if drawn from the skin's POV
exp.draw_body = function(rid, skin_canvas, model_ctx, scale) {
if (skin_canvas.height == 32 * scale) {
if (skin_canvas.height === 32 * scale) {
logging.debug(rid + "uses old skin format");
//Left Leg
//Left Leg - Front
@@ -189,8 +188,8 @@ function scale_image(imageData, context, d_x, d_y, scale) {
var width = imageData.width;
var height = imageData.height;
context.clearRect(0,0,width,height); //Clear the spot where it originated from
for(y=0; y<height; y++) { //height original
for(x=0; x<width; x++) { //width original
for(var y = 0; y < height; y++) { // height original
for(var x = 0; x < width; x++) { // width original
//Gets original colour, then makes a scaled square of the same colour
var index = (x + y * width) * 4;
context.fillStyle = "rgba(" + imageData.data[index+0] + "," + imageData.data[index+1] + "," + imageData.data[index+2] + "," + imageData.data[index+3] + ")";