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

merged files

Browse source
This commit is contained in:
meadowstream 2014-05-17 12:30:40 -04:00
commit 258e961548
2 changed files with 63 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
index.html
View file

@ -7,9 +7,8 @@
<center> <center>
<canvas id="canvas" width = '700' height = '700' style='background-color:rgba(23,23,23, 1)'></canvas> <canvas id="canvas" width = '700' height = '700' style='background-color:rgba(23,23,23, 1)'></canvas>
</center> </center>
<script src="entities.js"></script>
<script src="math.js"></script> <script src="math.js"></script>
<script src="entities.js"></script>
<script src="main.js"></script> <script src="main.js"></script>
</body> </body>
</html> </html>

63
main.js
View file

@ -1,4 +1,3 @@
// main thing here
var canvas = document.getElementById('canvas'); var canvas = document.getElementById('canvas');
var ctx = canvas.getContext('2d'); var ctx = canvas.getContext('2d');
@ -6,13 +5,14 @@ window.requestAnimFrame = (function(){
return window.requestAnimationFrame || return window.requestAnimationFrame ||
window.webkitRequestAnimationFrame || window.webkitRequestAnimationFrame ||
window.mozRequestAnimationFrame || window.mozRequestAnimationFrame ||
function( callback ){ function( callback ) {
window.setTimeout(callback, 1000 / 60); window.setTimeout(callback, 1000 / 60);
}; };
})(); })();
var blocks = []; // var blocks = [];
<<<<<<< HEAD
for (var i = 0; i < 12; i++) { for (var i = 0; i < 12; i++) {
blocks.push(new Block(i, 'green')); blocks.push(new Block(i, 'green'));
} }
@ -70,3 +70,60 @@ function Block(lane, color, distFromHex) {
}; };
} }
=======
// for (var i = 0; i < 6; i++) {
// blocks.push(new Block(i, 'green'));
// }
Render();
function drawPolygon(x, y, sides, radius, theta) {
ctx.beginPath();
ctx.moveTo(x, y + radius);
var oldX = 0;
var oldY = radius;
for (var i = 0; i < sides; i++) {
var coords = rotatePoint(oldX, oldY, 360 / sides);
ctx.lineTo(coords.x + x, coords.y + y);
ctx.moveTo(coords.x + x, coords.y + y);
oldX = coords.x;
oldY = coords.y;
// console.log(coords);
}
ctx.closePath();
ctx.fill();
ctx.stroke();
}
function Render() {
ctx.clearRect(0, 0, canvas.width, canvas.height);
// blocks.forEach(function(o){
// o.draw();
// });
drawPolygon(100, 100, 6, 100, 0);
requestAnimFrame(Render);
}
// function Block(lane, color, time) {
// this.lane = lane;
// this.angle = 15 * (Math.PI / 180) + 30 * (Math.PI / 180) * lane;
// this.color = color;
// this.draw = function() {
// ctx.translate(canvas.width / 2, canvas.height / 2);
// ctx.rotate(this.angle);
// 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) {
// this.time = time;
// }
// else {
// time = 200;
// }
// }
>>>>>>> cf79fbefde53e6994623e30795f806aa8efdb4d9