From 14b701ed1540e928ed108c65166199137e3dea14 Mon Sep 17 00:00:00 2001 From: sam Date: Fri, 24 Nov 2023 12:24:14 +0100 Subject: [PATCH 1/7] updated yml folder --- .gitlab-ci.yml | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index abbc216..d46467f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -23,24 +23,9 @@ pages: - "docs/**/*" - "mkdocs.yml" - ".gitmodules" - -game: - stage: deploy - tags: - - hva - script: - - time cp -rf web public - - time cp -rf webdev public - - artifacts: - paths: - - public - rules: - - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH - changes: - - web/**/*" + - "web/**/*" - "webdev/**/*" - - ".gitmodules" + variables: From 7d3452b88b22ca2d0b7c70b357342a41a48dbc58 Mon Sep 17 00:00:00 2001 From: sam Date: Fri, 24 Nov 2023 12:29:08 +0100 Subject: [PATCH 2/7] Attempt fix script --- webdev/game.js | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/webdev/game.js b/webdev/game.js index e1ff54e..943a435 100644 --- a/webdev/game.js +++ b/webdev/game.js @@ -71,17 +71,17 @@ async function disconnect() { let Playerposx = 500; let Playerposy = 300; -if (booleanArray) { - if (booleanArray[1]) { - Playerposx += 1;} - if (booleanArray[3]) { - Playerposx -= 1;} - if (booleanArray[0]) { - Playerposy += 1;} - if (booleanArray[2]) { - Playerposy -= 1;} + +if (booleanArray[1]) { + Playerposx += 1;} +if (booleanArray[3]) { + Playerposx -= 1;} +if (booleanArray[0]) { + Playerposy += 1;} +if (booleanArray[2]) { + Playerposy -= 1;} -} + // the function setup() is called once when the page is loaded function setup(){ From e9008e8a31809138c7ab2a6141334088a9fa1524 Mon Sep 17 00:00:00 2001 From: sam Date: Fri, 24 Nov 2023 12:32:35 +0100 Subject: [PATCH 3/7] made booleanaray a public variable --- webdev/game.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/webdev/game.js b/webdev/game.js index 943a435..2e5ba8b 100644 --- a/webdev/game.js +++ b/webdev/game.js @@ -2,7 +2,7 @@ let port; let reader; const decoder = new TextDecoder("utf-8"); let readibleoutput = 0; - +let booleanArray = []; // Request a port and open a connection. async function connect() { //vraag aan de browser om een serial port te selecteren @@ -40,7 +40,7 @@ async function readLoop() { if (Array.isArray(SerialArray)) { //Convert the array of strings to a boolean array //When a bit is 1 it becomes true, when a bit is 0 it becomes false - let booleanArray = SerialArray.map(bit => bit == '1'); + booleanArray = SerialArray.map(bit => bit == '1'); console.log(booleanArray); } else { console.error("Dit is geen Array"); From 2058977791be7ed6d5b7c00b731630814fe646ea Mon Sep 17 00:00:00 2001 From: sam Date: Fri, 24 Nov 2023 12:35:45 +0100 Subject: [PATCH 4/7] Added conditions to if statements for movement --- webdev/game.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/webdev/game.js b/webdev/game.js index 2e5ba8b..87d9ad0 100644 --- a/webdev/game.js +++ b/webdev/game.js @@ -72,13 +72,13 @@ let Playerposx = 500; let Playerposy = 300; -if (booleanArray[1]) { - Playerposx += 1;} -if (booleanArray[3]) { +if (booleanArray[1] = true) { + Playerposx + 1;} +if (booleanArray[3] = true) { Playerposx -= 1;} -if (booleanArray[0]) { +if (booleanArray[0] = true) { Playerposy += 1;} -if (booleanArray[2]) { +if (booleanArray[2] = true) { Playerposy -= 1;} From ddea68c38a855ff815bdde4fd9735c366fa532a9 Mon Sep 17 00:00:00 2001 From: sam Date: Fri, 24 Nov 2023 12:41:25 +0100 Subject: [PATCH 5/7] Added movementloop --- webdev/game.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/webdev/game.js b/webdev/game.js index 87d9ad0..f622fc8 100644 --- a/webdev/game.js +++ b/webdev/game.js @@ -48,7 +48,7 @@ async function readLoop() { } catch (e) { console.log("json niet geparserd"); } - + Movementloop() buffer = []; } if (done) { @@ -72,6 +72,8 @@ let Playerposx = 500; let Playerposy = 300; + +async function Movementloop() { if (booleanArray[1] = true) { Playerposx + 1;} if (booleanArray[3] = true) { @@ -80,7 +82,7 @@ if (booleanArray[0] = true) { Playerposy += 1;} if (booleanArray[2] = true) { Playerposy -= 1;} - +} // the function setup() is called once when the page is loaded From 3815cf6b9c11cbce3c5861d4730195295c3f3a4e Mon Sep 17 00:00:00 2001 From: sam Date: Fri, 24 Nov 2023 12:44:54 +0100 Subject: [PATCH 6/7] Added async movement loop function --- webdev/game.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/webdev/game.js b/webdev/game.js index f622fc8..003831b 100644 --- a/webdev/game.js +++ b/webdev/game.js @@ -74,13 +74,13 @@ let Playerposy = 300; async function Movementloop() { -if (booleanArray[1] = true) { +if (booleanArray[1]) { Playerposx + 1;} -if (booleanArray[3] = true) { +if (booleanArray[3]) { Playerposx -= 1;} -if (booleanArray[0] = true) { +if (booleanArray[0]) { Playerposy += 1;} -if (booleanArray[2] = true) { +if (booleanArray[2]) { Playerposy -= 1;} } From 0e3f8f50d64234dde6af68190ba0e5cfdce25e30 Mon Sep 17 00:00:00 2001 From: sam Date: Fri, 24 Nov 2023 12:47:46 +0100 Subject: [PATCH 7/7] changed framerate and fixed controls --- webdev/game.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/webdev/game.js b/webdev/game.js index 003831b..87320f5 100644 --- a/webdev/game.js +++ b/webdev/game.js @@ -75,13 +75,13 @@ let Playerposy = 300; async function Movementloop() { if (booleanArray[1]) { - Playerposx + 1;} + Playerposx += 2;} if (booleanArray[3]) { - Playerposx -= 1;} -if (booleanArray[0]) { - Playerposy += 1;} + Playerposx -= 2;} if (booleanArray[2]) { - Playerposy -= 1;} + Playerposy += 2;} +if (booleanArray[0]) { + Playerposy -= 2;} } @@ -89,7 +89,7 @@ if (booleanArray[2]) { function setup(){ // create a canvas element and append it to the body createCanvas(1250, 600); - + frameRate(244); // disable the outline of shapes noStroke(); }