Skip to content

Commit

Permalink
added sendeplan and tisch graphics
Browse files Browse the repository at this point in the history
  • Loading branch information
deets committed Apr 3, 2011
1 parent 0b111ee commit b7207fe
Show file tree
Hide file tree
Showing 9 changed files with 22 additions and 3 deletions.
16 changes: 14 additions & 2 deletions stn/static/js/game.js
Expand Up @@ -73,7 +73,16 @@ Schedule.prototype = _.extend(
this.game.sorting_stage(this.items);
}
}
}
},

render : function(game, elapsed) {
var parent_drawable = DropZone.prototype.render.call(this, game, elapsed);
return _.bind(function() {
parent_drawable();
var name = "sendeplan_" + (1 + this.items.length);
game.ctx.drawImage(rm.get(name), this.frame.left, this.frame.top);
}, this);
}
}
);

Expand Down Expand Up @@ -101,7 +110,7 @@ Game.prototype = _.extend(
render_messages(messages, 240);
this.game_items = new GameItems();
this.floaters = new GameItems();
var plan = new Schedule(3, this, "rgba(0, 255, 0, .5)", 0, 0, canvas.width / 4, canvas.height);
var plan = new Schedule(6, this, "rgba(0, 255, 0, .5)", 0, 0, canvas.width / 4, canvas.height);
var bin = new DropZone(this, "rgba(255, 0, 0, .5)", canvas.width - canvas.width / 4, 0, canvas.width / 4, canvas.height);
this.dropzones = [plan, bin];
this.td = new TimerDisplay(60.0);
Expand Down Expand Up @@ -282,6 +291,9 @@ Game.prototype = _.extend(
var bg = rm.get("start_bg");
ctx.drawImage(bg, 0, 0);

var table = rm.get("table");
ctx.drawImage(table, 0, this.frame.height - table.height);

var drawers = [];
drawers.push(this.td.render(this, elapsed));

Expand Down
9 changes: 8 additions & 1 deletion stn/static/js/resources.js
Expand Up @@ -5,6 +5,7 @@ RESOURCES = [
["btn_info", "media/Startseite/Infobutton_norm.png"],
["btn_info_active", "media/Startseite/Infobutton_aktiv.png"],
["corners", "media/Startseite/Corners.png"],
["table", "media/Tisch.png"],
["kasten1_01", "media/Startseite/Kasten1/01.png"],
["kasten1_02", "media/Startseite/Kasten1/02.png"],
["kasten1_03", "media/Startseite/Kasten1/03.png"],
Expand All @@ -28,7 +29,13 @@ RESOURCES = [
["kasten4_07", "media/Startseite/Kasten4/03.png"],
["kasten4_08", "media/Startseite/Kasten4/04.png"],
["kasten4_09", "media/Startseite/Kasten4/05.png"],
["kasten4_10", "media/Startseite/Kasten4/06.png"]
["kasten4_10", "media/Startseite/Kasten4/06.png"],
["sendeplan_1", "media/Sendeplan/01.png"],
["sendeplan_2", "media/Sendeplan/02.png"],
["sendeplan_3", "media/Sendeplan/03.png"],
["sendeplan_4", "media/Sendeplan/04.png"],
["sendeplan_5", "media/Sendeplan/05.png"],
["sendeplan_6", "media/Sendeplan/06.png"]
]


Expand Down
Binary file added stn/static/media/Sendeplan/01.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added stn/static/media/Sendeplan/02.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added stn/static/media/Sendeplan/03.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added stn/static/media/Sendeplan/04.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added stn/static/media/Sendeplan/05.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added stn/static/media/Sendeplan/06.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added stn/static/media/Tisch.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit b7207fe

Please sign in to comment.