wbrawner/hextris
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merge conflict resolve

Browse source
This commit is contained in:
Michael Yang 2014-05-17 11:18:28 -04:00
commit f0f2b2d08d
2 changed files with 13 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
index.html
View file

@ -2,11 +2,10 @@
<html>
<head>
<title>Wasted Time</title>
</head>
<body>
<center>
<canvas id="canvas"></canvas>
<canvas id="canvas" style = 'width:1200px;height:700px;background-color:yellow;'></canvas>
</center>
<script src="entities.js"></script>

25
main.js
View file

@ -17,17 +17,7 @@ for (var i = 0; i < 6; i++) {
blocks.push(new Block(i, 'green'));
}
(function animloop(){
requestAnimFrame(animloop);
render();
})();
function render() {
requestAnimFrame(animloop);
drawClock(10, 10, 0, 6);
}
Render();
function drawClock(x, y, sides, sideLength, theta) {
ctx.beginPath();
@ -38,6 +28,14 @@ function drawClock(x, y, sides, sideLength, theta) {
ctx.moveTo(coords.x, coords.y);
}
ctx.stroke();
function Render() {
ctx.clearRect(0, 0, canvas.width, canvas.height);
blocks.forEach(function(o){
o.draw();
});
requestAnimFrame(Render);
}
function Block(lane, color, time) {
@ -48,9 +46,10 @@ function Block(lane, color, time) {
this.draw = function() {
ctx.translate(canvas.width / 2, canvas.height / 2);
ctx.rotate(this.angle);
ctx.fillStyle = color;
ctx.fillRect(canvas.width/2 + Math.cos(this.angle) * time, canvas.height/2 + Math.sin(this.angle) * time, 70, 30);
ctx.fillStyle = '#000';
ctx.fillRect(canvas.width/2 + Math.cos(this.angle) * time, canvas.height/2 + Math.sin(this.angle) * time, 30, 30);
ctx.restore();
ctx.fillRect(200, 200, 200, 200);
};
if (!time) {