azures04/crafatar
1
0
Fork 0
mirror of https://github.com/azures04/crafatar.git synced 2026-03-21 23:41:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

clean up

Browse Source 
uses 'parts' object instead of tons of variables
This commit is contained in:
jomo 2015-11-22 05:33:48 +01:00
parent 25c4912db9
commit 4627aecd17
1 changed files with 53 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
lib/renders.js
View File

@ -43,29 +43,49 @@ exp.draw_model = function(rid, img, scale, helm, is_body, callback) {
var skin = new Image(); var skin = new Image();
skin.onload = function() { skin.onload = function() {
var old_type = skin.height === 32;
var arm_width = 4; var arm_width = 4;
var face = getPart(skin, 8, 8, 8, 8, scale); var parts = {
var head_right = getPart(skin, 0, 8, 8, 8, scale); head: {
var head_top = getPart(skin, 8, 0, 8, 8, scale); front: getPart(skin, 8, 8, 8, 8, scale),
var body = getPart(skin, 20, 20, 8, 12, scale); right: getPart(skin, 0, 8, 8, 8, scale),
var right_arm = getPart(skin, 44, 20, arm_width, 12, scale); top: getPart(skin, 8, 0, 8, 8, scale),
var right_arm_side = getPart(skin, 40, 20, 4, 12, scale); },
var right_leg = getPart(skin, 4, 20, 4, 12, scale); arm: {
var right_leg_side = getPart(skin, 0, 20, 4, 12, scale); right: {
var right_shoulder = getPart(skin, 44, 16, arm_width, 4, scale); front: getPart(skin, 44, 20, arm_width, 12, scale),
var left_leg; side: getPart(skin, 40, 20, 4, 12, scale),
var left_arm; },
var left_shoulder; left: {
if (old_type) { front: null,
left_arm = flip(right_arm); },
left_leg = flip(right_leg); },
left_shoulder = flip(right_shoulder); leg: {
right: {
front: getPart(skin, 4, 20, 4, 12, scale),
side: getPart(skin, 0, 20, 4, 12, scale),
},
left: {
front: null,
}
},
shoulder: {
right: getPart(skin, 44, 16, arm_width, 4, scale),
left: null,
},
body: getPart(skin, 20, 20, 8, 12, scale),
};
if (skin.height === 32) {
// old skin
parts.arm.left.front = flip(parts.arm.right.front);
parts.leg.left.front = flip(parts.leg.right.front);
parts.shoulder.left = flip(parts.shoulder.right);
} else { } else {
left_arm = getPart(skin, 36, 52, arm_width, 12, scale); // 1.8 skin - has separate left/right arms & legs
left_leg = getPart(skin, 20, 52, 4, 12, scale); parts.arm.left.front = getPart(skin, 36, 52, arm_width, 12, scale);
left_shoulder = getPart(skin, 36, 48, arm_width, 4, scale); parts.leg.left.front = getPart(skin, 20, 52, 4, 12, scale);
parts.shoulder.left = getPart(skin, 36, 48, arm_width, 4, scale);
} }
var x = 0; var x = 0;
@ -83,33 +103,33 @@ exp.draw_model = function(rid, img, scale, helm, is_body, callback) {
var frontc = front.getContext("2d"); var frontc = front.getContext("2d");
frontc.patternQuality = "fast"; frontc.patternQuality = "fast";
frontc.drawImage(right_arm, (4 - arm_width) * scale, 0 * scale, arm_width * scale, 12 * scale); frontc.drawImage(parts.arm.right.front, (4 - arm_width) * scale, 0 * scale, arm_width * scale, 12 * scale);
frontc.drawImage(left_arm, 12 * scale, 0 * scale, arm_width * scale, 12 * scale); frontc.drawImage(parts.arm.left.front, 12 * scale, 0 * scale, arm_width * scale, 12 * scale);
frontc.drawImage(body, 4 * scale, 0 * scale, 8 * scale, 12 * scale); frontc.drawImage(parts.body, 4 * scale, 0 * scale, 8 * scale, 12 * scale);
frontc.drawImage(right_leg, 4 * scale, 12 * scale, 4 * scale, 12 * scale); frontc.drawImage(parts.leg.right.front, 4 * scale, 12 * scale, 4 * scale, 12 * scale);
frontc.drawImage(left_leg, 8 * scale, 12 * scale, 4 * scale, 12 * scale); frontc.drawImage(parts.leg.left.front, 8 * scale, 12 * scale, 4 * scale, 12 * scale);
// top // top
x = x_offset + scale * 2; x = x_offset + scale * 2;
y = scale * -arm_width; y = scale * -arm_width;
z = z_offset + scale * 8; z = z_offset + scale * 8;
ctx.setTransform(1, -skew_a, 1, skew_a, 0, 0); ctx.setTransform(1, -skew_a, 1, skew_a, 0, 0);
ctx.drawImage(right_shoulder, y - z - 0.5, x + z, right_shoulder.width + 1, right_shoulder.height + 1); ctx.drawImage(parts.shoulder.right, y - z - 0.5, x + z, parts.shoulder.right.width + 1, parts.shoulder.right.height + 1);
y = scale * (4 + arm_width); y = scale * 8;
ctx.drawImage(left_shoulder, y - z, x + z, 4 * scale, 4 * scale + 1); ctx.drawImage(parts.shoulder.left, y - z, x + z, parts.shoulder.left.width, parts.shoulder.left.height + 1);
// right side // right side
ctx.setTransform(1, skew_a, 0, skew_b, 0, 0); ctx.setTransform(1, skew_a, 0, skew_b, 0, 0);
x = x_offset + scale * 2; x = x_offset + scale * 2;
y = 0; y = 0;
z = z_offset + scale * 20; z = z_offset + scale * 20;
ctx.drawImage(right_leg_side, x + y, z - y, right_leg_side.width, right_leg_side.height); ctx.drawImage(parts.leg.right.side, x + y, z - y, parts.leg.right.side.width, parts.leg.right.side.height);
x = x_offset + scale * 2; x = x_offset + scale * 2;
y = scale * -arm_width; y = scale * -arm_width;
z = z_offset + scale * 8; z = z_offset + scale * 8;
ctx.drawImage(right_arm_side, x + y, z - y - 0.5, right_arm_side.width, right_arm_side.height + 1); ctx.drawImage(parts.arm.right.side, x + y, z - y - 0.5, parts.arm.right.side.width, parts.arm.right.side.height + 1);
// front // front
z = z_offset + scale * 12; z = z_offset + scale * 12;
@ -123,21 +143,21 @@ exp.draw_model = function(rid, img, scale, helm, is_body, callback) {
y = -0.5; y = -0.5;
z = z_offset; z = z_offset;
ctx.setTransform(1, -skew_a, 1, skew_a, 0, 0); ctx.setTransform(1, -skew_a, 1, skew_a, 0, 0);
ctx.drawImage(head_top, y - z, x + z, head_top.width, head_top.height + 1); ctx.drawImage(parts.head.top, y - z, x + z, parts.head.top.width, parts.head.top.height + 1);
// head front // head front
x = x_offset + 8 * scale; x = x_offset + 8 * scale;
y = 0; y = 0;
z = z_offset - 0.5; z = z_offset - 0.5;
ctx.setTransform(1, -skew_a, 0, skew_b, 0, skew_a); ctx.setTransform(1, -skew_a, 0, skew_b, 0, skew_a);
ctx.drawImage(face, y + x, x + z, face.width, face.height); ctx.drawImage(parts.head.front, y + x, x + z, parts.head.front.width, parts.head.front.height);
// head right // head right
x = x_offset; x = x_offset;
y = 0; y = 0;
z = z_offset; z = z_offset;
ctx.setTransform(1, skew_a, 0, skew_b, 0, 0); ctx.setTransform(1, skew_a, 0, skew_b, 0, 0);
ctx.drawImage(head_right, x + y, z - y - 0.5, head_right.width, head_right.height + 1); ctx.drawImage(parts.head.right, x + y, z - y - 0.5, parts.head.right.width, parts.head.right.height + 1);
canvas.toBuffer(function(err, buf) { canvas.toBuffer(function(err, buf) {
if (err) { if (err) {