summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorArjun Satarkar <me@arjunsatarkar.net>2024-10-31 12:07:30 +0000
committerArjun Satarkar <me@arjunsatarkar.net>2024-10-31 12:07:30 +0000
commit19def0070044c1594f70ea1413232967b68d91d0 (patch)
tree169714cdf9cb8676c6da83cd4264a59251e38187 /src
parent15be06b415c693dfe6a10750e619d3128b0b59de (diff)
downloadthrow_simulation-19def0070044c1594f70ea1413232967b68d91d0.tar
throw_simulation-19def0070044c1594f70ea1413232967b68d91d0.tar.gz
throw_simulation-19def0070044c1594f70ea1413232967b68d91d0.zip
Add scoring system
Diffstat (limited to 'src')
-rw-r--r--src/index.html15
-rw-r--r--src/index.js76
2 files changed, 70 insertions, 21 deletions
diff --git a/src/index.html b/src/index.html
index da667a9..b7ba10f 100644
--- a/src/index.html
+++ b/src/index.html
@@ -11,16 +11,29 @@
margin: 0;
}
- div#throwable {
+ #throwable {
position: fixed;
transform: translate(-50%, -50%);
border-radius: 50%;
background-color: black;
background-size: cover;
}
+
+ #scoreboard {
+ position: fixed;
+ transform: translate(-50%, -50%);
+ top: 70%;
+ left: 50%;
+ font-family: monospace;
+ }
</style>
</head>
<body>
+ <div id="scoreboard">
+ SCORE&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span id="score"></span>
+ <br />
+ HIGH SCORE&nbsp;&nbsp;<span id="high-score"></span>
+ </div>
<div id="throwable"></div>
</body>
</html>
diff --git a/src/index.js b/src/index.js
index e07ac8a..b6f6e0b 100644
--- a/src/index.js
+++ b/src/index.js
@@ -1,28 +1,35 @@
import RAPIER from "./rapier.es.js";
-const objElement = document.querySelector("div#throwable");
+const CLICK_IMPULSE_MULTIPLIER = 300_000;
+const GRAVITY = { x: 0.0, y: 2000 };
+const LINEAR_DAMPING = 0.5;
+const OBJ_BASE_RADIUS = 30;
+const OBJ_BASE_SIZE = { x: OBJ_BASE_RADIUS * 2, y: OBJ_BASE_RADIUS * 2 };
+const OBJ_MASS = 100;
+const SCORE_DECAY_RATE = 5;
+const SCORE_DECAY_THRESHOLD = 150;
+const SCORE_INCREMENT = 150;
+const STEP_MS = 33;
+const TARGET_WIDTH_FACTOR = 0.05;
+const VIEWPORT_SIZE = {
+ x: document.documentElement.clientWidth,
+ y: document.documentElement.clientHeight,
+};
+const WIDTH_JUMP_FACTOR = 5;
+
+const objElement = document.querySelector("#throwable");
const queryParams = new URLSearchParams(window.location.search);
const image = queryParams.get("image");
if (image !== null) {
+ objElement.style.backgroundColor = "white";
objElement.style.backgroundImage = `url(${decodeURI(image)})`;
}
-RAPIER.init().then(() => {
- const CLICK_IMPULSE_MULTIPLIER = 300_000;
- const GRAVITY = { x: 0.0, y: 2000 };
- const LINEAR_DAMPING = 0.5;
- const OBJ_BASE_RADIUS = 30;
- const OBJ_BASE_SIZE = { x: OBJ_BASE_RADIUS * 2, y: OBJ_BASE_RADIUS * 2 };
- const OBJ_MASS = 100;
- const STEP_MS = 33;
- const TARGET_WIDTH_FACTOR = 0.05;
- const VIEWPORT_SIZE = {
- x: document.documentElement.clientWidth,
- y: document.documentElement.clientHeight,
- };
- const WIDTH_JUMP_FACTOR = 5;
+const scoreElement = document.querySelector("#score");
+const highScoreElement = document.querySelector("#high-score");
+RAPIER.init().then(() => {
let world = new RAPIER.World(GRAVITY);
const wallColliderDescs = {
@@ -39,19 +46,48 @@ RAPIER.init().then(() => {
.setLinearDamping(LINEAR_DAMPING)
.setCcdEnabled(true);
let obj = world.createRigidBody(objRigidBodyDesc);
- world.createCollider(
- RAPIER.ColliderDesc.ball(OBJ_BASE_RADIUS).setMass(OBJ_MASS),
- obj,
- );
+ let objColliderDesc = RAPIER.ColliderDesc.ball(OBJ_BASE_RADIUS)
+ .setMass(OBJ_MASS)
+ .setActiveEvents(RAPIER.ActiveEvents.COLLISION_EVENTS);
+ world.createCollider(objColliderDesc, obj);
const objSize = {
x: OBJ_BASE_SIZE.x,
y: OBJ_BASE_SIZE.y,
};
let objVelocityLastFrame = null;
+ let lastCollision = { handle1: null, handle2: null };
+ let score = 0;
+ let highScore = score;
+ let lastScoredAt = performance.now();
let mainLoop = () => {
- world.step();
+ let eventQueue = new RAPIER.EventQueue(true);
+
+ world.step(eventQueue);
+
+ eventQueue.drainCollisionEvents((handle1, handle2, started) => {
+ if (
+ started &&
+ (handle1 !== lastCollision.handle1 || handle2 !== lastCollision.handle2)
+ ) {
+ score += SCORE_INCREMENT;
+ if (score > highScore) {
+ highScore = score;
+ }
+ lastScoredAt = performance.now();
+ }
+ lastCollision = { handle1: handle1, handle2: handle2 };
+ });
+
+ const now = performance.now();
+ if (now - lastScoredAt > SCORE_DECAY_THRESHOLD) {
+ score -= SCORE_DECAY_RATE;
+ score = Math.max(score, 0);
+ }
+
+ scoreElement.textContent = `${score}`;
+ highScoreElement.textContent = `${highScore}`;
const objPosition = obj.translation();
objElement.style.left = `${objPosition.x}px`;