Mal/mr-crocs-adventures
Mal
/
mr-crocs-adventures
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Final collision fixup.

This commit is contained in:
Mal 2020-01-26 23:25:18 +01:00
parent 0d7b99a903
commit d6283d57e4
6 changed files with 30 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
graphics/mr-croc-walk-left.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 8.2 KiB

BIN
graphics/mr-croc-walk-right.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
graphics/tileset-landscape01.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 10 KiB

24
js/module.js
View File

@ -78,7 +78,7 @@ function MainLoop(timestamp)
/* Movement left and right */ /* Movement left and right */
if (KeyLeft.isPressed()) { if (KeyLeft.isPressed()) {
let lastWallLeft = Math.max( let lastWallLeft = Math.min(
architecture.getWallLeft(mrCroc.getPositionHeadLeft()), architecture.getWallLeft(mrCroc.getPositionHeadLeft()),
architecture.getWallLeft(mrCroc.getPositionFootLeft()) architecture.getWallLeft(mrCroc.getPositionFootLeft())
); );
@ -89,7 +89,7 @@ function MainLoop(timestamp)
mrCroc.position.x = lastWallLeft + mrCroc.getWidth() * 0.5 + 1; mrCroc.position.x = lastWallLeft + mrCroc.getWidth() * 0.5 + 1;
} }
} else if (KeyRight.isPressed()) { } else if (KeyRight.isPressed()) {
let lastWallRight = Math.min( let lastWallRight = Math.max(
architecture.getWallRight(mrCroc.getPositionHeadRight()), architecture.getWallRight(mrCroc.getPositionHeadRight()),
architecture.getWallRight(mrCroc.getPositionFootRight()) architecture.getWallRight(mrCroc.getPositionFootRight())
); );
@ -106,9 +106,10 @@ function MainLoop(timestamp)
context.clearRect(0, 0, window.innerWidth, window.innerHeight); context.clearRect(0, 0, window.innerWidth, window.innerHeight);
architecture.draw(context); architecture.draw(context);
mrCroc.draw(context); mrCroc.draw(context);
/* /*
context.fillRect(0, lastCeilingHeight, window.innerWidth, 1); context.fillRect(0, ceilingHeight, window.innerWidth, 1);
context.fillRect(0, lastGroundHeight, window.innerWidth, 1); context.fillRect(0, groundHeight, window.innerWidth, 1);
context.fillStyle = 'black'; context.fillStyle = 'black';
context.fillRect(lastWallRight, 0, 1, window.innerHeight); context.fillRect(lastWallRight, 0, 1, window.innerHeight);
context.fillStyle = 'red'; context.fillStyle = 'red';
@ -118,6 +119,7 @@ function MainLoop(timestamp)
mrCroc.getPositionHeadLeft().draw(context); mrCroc.getPositionHeadLeft().draw(context);
mrCroc.getPositionFootLeft().draw(context); mrCroc.getPositionFootLeft().draw(context);
*/ */
lastRendered = timestamp; lastRendered = timestamp;
} }
@ -131,7 +133,7 @@ const FRAME_DURATION = 1000 / FPS;
const GAME_SPEED = 1; const GAME_SPEED = 1;
const GRAVITY = 2; const GRAVITY = 2;
let levelJson = new FileLoader('levels/test.json'); let levelJson = new FileLoader('levels/level.json');
const LEVEL = levelJson.getContent(); const LEVEL = levelJson.getContent();
let lastRendered = undefined; let lastRendered = undefined;
@ -145,10 +147,6 @@ let KeyJump = new Key('Space');
let loader = new ImageLoader(); let loader = new ImageLoader();
let image = new Image();
image.src = 'graphics/mr-croc-stand.png';
loader.addImage(image);
let imgAnimation = new Image(); let imgAnimation = new Image();
imgAnimation.src = 'graphics/mr-croc-walk-right.png'; imgAnimation.src = 'graphics/mr-croc-walk-right.png';
loader.addImage(imgAnimation); loader.addImage(imgAnimation);
@ -157,10 +155,6 @@ let imgAnimationB = new Image();
imgAnimationB.src = 'graphics/mr-croc-walk-left.png'; imgAnimationB.src = 'graphics/mr-croc-walk-left.png';
loader.addImage(imgAnimationB); loader.addImage(imgAnimationB);
let imgBackground = new Image();
imgBackground.src = 'graphics/ground.jpg';
loader.addImage(imgBackground);
let imgArch = new Image(); let imgArch = new Image();
imgArch.src = 'graphics/tileset-landscape01.jpg'; imgArch.src = 'graphics/tileset-landscape01.jpg';
loader.addImage(imgArch); loader.addImage(imgArch);
@ -185,8 +179,8 @@ window.addEventListener(
architecture = RetroArchitecture.createFromJson(LEVEL); architecture = RetroArchitecture.createFromJson(LEVEL);
mrCroc = new MrCroc(); mrCroc = new MrCroc();
mrCroc.position.x = 300; mrCroc.position.x = 250;
mrCroc.position.y = 100; mrCroc.position.y = 0;
window.requestAnimationFrame(MainLoop); window.requestAnimationFrame(MainLoop);
} }

4
js/retro/RetroArchitecture.js
View File

@ -112,7 +112,7 @@ export default class RetroArchitecture
getWallRight(position) getWallRight(position)
{ {
let tilePosition = this.getTileForPosition(new GeometryPoint(position.x, position.y), 1, -1); let tilePosition = this.getTileForPosition(new GeometryPoint(position.x, position.y), 1, 0);
while (tilePosition !== null && tilePosition.x < this.columns) { while (tilePosition !== null && tilePosition.x < this.columns) {
if (this.matrix[tilePosition.y][tilePosition.x] !== null) { if (this.matrix[tilePosition.y][tilePosition.x] !== null) {
@ -127,7 +127,7 @@ export default class RetroArchitecture
getWallLeft(position) getWallLeft(position)
{ {
let tilePosition = this.getTileForPosition(new GeometryPoint(position.x, position.y), -1,-1); let tilePosition = this.getTileForPosition(new GeometryPoint(position.x, position.y), -1,0);
while (tilePosition !== null && tilePosition.x > 0) { while (tilePosition !== null && tilePosition.x > 0) {
if (this.matrix[tilePosition.y][tilePosition.x] !== null) { if (this.matrix[tilePosition.y][tilePosition.x] !== null) {

19
levels/level.json Normal file
View File

@ -0,0 +1,19 @@
{
"tileset": "graphics/tileset-landscape01.jpg",
"tiles": 8,
"scale": 3,
"rows": 10,
"columns": 17,
"matrix": [
[6 ,6 ,null ,null ,null ,null ,null ,null ,null ,null ,null ,null ,null ,null ,null ,4 ,4 ],
[6 ,6 ,null ,null ,null ,null ,null ,null ,null ,null ,null ,null ,null ,null ,null ,4 ,4 ],
[6 ,6 ,null ,null ,null ,null ,null ,null ,0 ,0 ,0 ,0 ,null ,null ,null ,4 ,4 ],
[6 ,6 ,2 ,null ,null ,null ,null ,0 ,4 ,4 ,4 ,4 ,0 ,null ,null ,4 ,4 ],
[6 ,6 ,6 ,2 ,2 ,null ,null ,null ,null ,null ,null ,null ,null ,null ,null ,4 ,4 ],
[5 ,5 ,5 ,5 ,5 ,1 ,null ,null ,null ,null ,null ,null ,null ,null ,0 ,4 ,4 ],
[4 ,4 ,null ,null ,null ,null ,null ,null ,null ,null ,null ,null ,null ,0 ,4 ,4 ,4 ],
[4 ,4 ,null ,null ,null ,null ,0 ,0 ,0 ,null ,null ,null ,0 ,4 ,4 ,4 ,4 ],
[4 ,4 ,0 ,0 ,0 ,null ,4 ,4 ,4 ,null ,null ,0 ,4 ,4 ,4 ,4 ,4 ],
[4 ,4 ,4 ,4 ,4 ,0 ,4 ,4 ,4 ,0 ,0 ,4 ,4 ,4 ,4 ,4 ,4 ]
]
}