clean code

This commit is contained in:
jomo 2014-12-08 16:57:17 +01:00 committed by Jake
parent 834e737498
commit a162387f83
4 changed files with 27 additions and 27 deletions

View File

@ -47,8 +47,8 @@ exp.run = function() {
} }
} }
files = fs.readdirSync(renderdir); files = fs.readdirSync(renderdir);
for (var i = 0; i < Math.min(files.length, config.cleaning_amount); i++) { for (var j = 0; j < Math.min(files.length, config.cleaning_amount); j++) {
var filename = files[i]; var filename = files[j];
if (filename[0] != ".") { if (filename[0] != ".") {
fs.unlink(renderdir + filename, function(){}); fs.unlink(renderdir + filename, function(){});
} }

View File

@ -3,7 +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 renders = require("./renders");
var fs = require("fs"); var fs = require("fs");
// 0098cb60-fa8e-427c-b299-793cbd302c9a // 0098cb60-fa8e-427c-b299-793cbd302c9a
@ -175,8 +175,8 @@ exp.get_skin = function(uuid, callback) {
}; };
function get_type(helm, body) { function get_type(helm, body) {
var text = body ? "body" : "head" var text = body ? "body" : "head";
return helm ? text+"helm" : text return helm ? text+"helm" : text;
} }
// handles creations of skin renders // handles creations of skin renders
@ -189,7 +189,7 @@ exp.get_render = function(uuid, scale, helm, body, callback) {
callback(err, -1, hash, null); callback(err, -1, hash, null);
return; return;
} }
console.log("TYPE: " + get_type(helm, body)) console.log("TYPE: " + get_type(helm, body));
var renderpath = __dirname + "/../" + config.renders_dir + hash + "-" + scale + "-" + get_type(helm, body) + ".png"; var renderpath = __dirname + "/../" + config.renders_dir + hash + "-" + scale + "-" + get_type(helm, body) + ".png";
if (fs.existsSync(renderpath)) { if (fs.existsSync(renderpath)) {
renders.open_render(renderpath, function(err, img) { renders.open_render(renderpath, function(err, img) {

View File

@ -154,7 +154,7 @@ exp.save_skin = function(uuid, hash, outpath, callback) {
logging.log(err); logging.log(err);
} }
callback(null, img); callback(null, img);
}) });
} }
}); });
} else { } else {

View File

@ -22,7 +22,7 @@ exp.draw_helmet = function(skin_canvas, model_ctx, scale) {
model_ctx.setTransform(-1,0.5,1,0.5,0,0); model_ctx.setTransform(-1,0.5,1,0.5,0,0);
model_ctx.scale(-1,1); model_ctx.scale(-1,1);
model_ctx.drawImage(skin_canvas, 40*scale, 0, 8*scale, 8*scale, -3*scale, 5*scale, 8*scale, 8*scale); model_ctx.drawImage(skin_canvas, 40*scale, 0, 8*scale, 8*scale, -3*scale, 5*scale, 8*scale, 8*scale);
} };
exp.draw_head = function(skin_canvas, model_ctx, scale) { exp.draw_head = function(skin_canvas, model_ctx, scale) {
//Head - Front //Head - Front
@ -35,7 +35,7 @@ exp.draw_head = function(skin_canvas, model_ctx, scale) {
model_ctx.setTransform(-1,0.5,1,0.5,0,0); model_ctx.setTransform(-1,0.5,1,0.5,0,0);
model_ctx.scale(-1,1); model_ctx.scale(-1,1);
model_ctx.drawImage(skin_canvas, 8*scale, 0, 8*scale, 8*scale, -3*scale, 5*scale, 8*scale, 8*scale); model_ctx.drawImage(skin_canvas, 8*scale, 0, 8*scale, 8*scale, -3*scale, 5*scale, 8*scale, 8*scale);
} };
exp.draw_body = function(skin_canvas, model_ctx, scale) { exp.draw_body = function(skin_canvas, model_ctx, scale) {
//Left Leg //Left Leg
@ -77,10 +77,10 @@ exp.draw_body = function(skin_canvas, model_ctx, scale) {
model_ctx.setTransform(-1,0.5,1,0.5,0,0); model_ctx.setTransform(-1,0.5,1,0.5,0,0);
model_ctx.scale(-1,1); model_ctx.scale(-1,1);
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, img, scale, helm, body, callback) { exp.draw_model = function(uuid, img, scale, helm, body, callback) {
var image = new Image; var image = new Image();
var width = 64 * scale; var width = 64 * scale;
var height = 64 * scale; var height = 64 * scale;
var model_canvas = new Canvas(20 * scale, (body ? 44.8 : 17.6) * scale); var model_canvas = new Canvas(20 * scale, (body ? 44.8 : 17.6) * scale);
@ -117,7 +117,7 @@ exp.draw_model = function(uuid, img, scale, helm, body, callback) {
}; };
image.src = img; image.src = img;
} };
exp.open_render = function(renderpath, callback) { exp.open_render = function(renderpath, callback) {
fs.readFile(renderpath, function (err, buf) { fs.readFile(renderpath, function (err, buf) {