Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion css/game.css
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,19 @@ html, body, ul, li {
margin: 0;
border: 0;
padding: 0;
background-color: black;
}

canvas {
display: block;
width: 762;
width: calc(100vh * 1.0666666666666667);
height: 100vh;
margin: 0 auto;
background-color: blue;
image-rendering: -moz-crisp-edges;
image-rendering: -webkit-crisp-edges;
image-rendering: pixelated;
image-rendering: crisp-edges;
}

p {
Expand All @@ -26,6 +32,8 @@ html {
}

.info {
font-family: monospace;
color: white;
position: absolute;
top: 0;
left: 0;
Expand Down
88 changes: 49 additions & 39 deletions index.html
Original file line number Diff line number Diff line change
@@ -1,44 +1,54 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">

<!-- The actual resolution of the NES is 256x240.
<head>
<meta charset="utf-8">

<!-- The actual resolution of the NES is 256x240.
Ideally, we draw in this size and scale appropriately.-->
<title>Super Mario Bros</title>
<meta name="description" content="">
<meta name="viewport" content="width=device-width">
<title>Super Mario Bros</title>
<meta name="description" content="">
<meta name="viewport" content="width=device-width">

<link rel="stylesheet" href="css/game.css">
</head>

<body>
<script type="text/javascript" src="js/util.js"></script>
<script type="text/javascript" src="js/input.js"></script>
<script type="text/javascript" src="js/resources.js"></script>
<script type="text/javascript" src="js/sprite.js"></script>
<script type="text/javascript" src="js/entity.js"></script>
<script type="text/javascript" src="js/pipe.js"></script>
<script type="text/javascript" src="js/mushroom.js"></script>
<script type="text/javascript" src="js/fireflower.js"></script>
<script type="text/javascript" src="js/star.js"></script>
<script type="text/javascript" src="js/fireball.js"></script>
<script type="text/javascript" src="js/coin.js"></script>
<script type="text/javascript" src="js/bcoin.js"></script>
<script type="text/javascript" src="js/goomba.js"></script>
<script type="text/javascript" src="js/koopa.js"></script>
<script type="text/javascript" src="js/floor.js"></script>
<script type="text/javascript" src="js/block.js"></script>
<script type="text/javascript" src="js/rubble.js"></script>
<script type="text/javascript" src="js/prop.js"></script>
<script type="text/javascript" src="js/player.js"></script>
<script type="text/javascript" src="js/flag.js"></script>
<script type="text/javascript" src="js/levels/level.js"></script>
<script type="text/javascript" src="js/levels/11.js"></script>
<script type="text/javascript" src="js/levels/11tunnel.js"></script>
<script type="text/javascript" src="js/game.js"></script>
<div class="info">
<p class="controls">Move: Arrow Keys, Jump: X, Run: Z</p>
<em>Garrett Johnson</em>
<div class="links">My Links
<br>
<a href="http://garrettjohnson.net">Portfolio</a>
<a href="http://linkedin.com/in/garretttjohnson">LinkedIn</a>
<a href="https://github.com/reruns">github</a>
<a href="https://github.com/reruns/mario">mario.js</a>
<div>
</div>
</body>

<link rel="stylesheet" href="css/game.css">
</head>
<body>
<script type="text/javascript" src="js/util.js"></script>
<script type="text/javascript" src="js/input.js"></script>
<script type="text/javascript" src="js/resources.js"></script>
<script type="text/javascript" src="js/sprite.js"></script>
<script type="text/javascript" src="js/entity.js"></script>
<script type="text/javascript" src="js/pipe.js"></script>
<script type="text/javascript" src="js/mushroom.js"></script>
<script type="text/javascript" src="js/fireflower.js"></script>
<script type="text/javascript" src="js/star.js"></script>
<script type="text/javascript" src="js/fireball.js"></script>
<script type="text/javascript" src="js/coin.js"></script>
<script type="text/javascript" src="js/bcoin.js"></script>
<script type="text/javascript" src="js/goomba.js"></script>
<script type="text/javascript" src="js/koopa.js"></script>
<script type="text/javascript" src="js/floor.js"></script>
<script type="text/javascript" src="js/block.js"></script>
<script type="text/javascript" src="js/rubble.js"></script>
<script type="text/javascript" src="js/prop.js"></script>
<script type="text/javascript" src="js/player.js"></script>
<script type="text/javascript" src="js/flag.js"></script>
<script type="text/javascript" src="js/levels/level.js"></script>
<script type="text/javascript" src="js/levels/11.js"></script>
<script type="text/javascript" src="js/levels/11tunnel.js"></script>
<script type="text/javascript" src="js/game.js"></script>
<div class="info">
<p class="controls">Move: Arrow Keys, Jump: X, Run: Z</p>
<div class="links">My Links <br><a href="http://garrettjohnson.net">Portfolio</a> <a href="http://linkedin.com/in/garretttjohnson">LinkedIn</a> <a href="https://github.com/reruns">github</a><div>
</div>
</body>
</html>
</html>
8 changes: 5 additions & 3 deletions js/game.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ var player = new Mario.Player([0,0]);
//Cool!
//TODO: Automatically scale the game to work and look good on widescreen.
//TODO: fiddling with scaled sprites looks BETTER, but not perfect. Hmm.
canvas.width = 762;
canvas.height = 720;
ctx.scale(3,3);
canvas.width = 256;
canvas.height = 240;
ctx.scale(1,1);
document.body.appendChild(canvas);

//viewport
Expand Down Expand Up @@ -90,6 +90,8 @@ function main() {
}

function update(dt) {
music.overworld.play();

gameTime += dt;

handleInput(dt);
Expand Down