BlueGit

blue-star speeltuin

mousebtns

timfa Tim · pushed by timfa

Authored 2022-10-15 · 4 years ago

Hash
95f32ae3b64bb64b061700416e58292c50f0a9e7
Parent
0808beee
2 files changed +18 −11
build/framework.js +13 −11
@@ -185,20 +185,22 @@ class Collider
185 185
186 186 update(deltaTime)
187 187 {
188 if (GameInput.mousePressed())
188 let pressed = GameInput.mousePressed();
189 let held = GameInput.mouseHeld();
190 if (pressed.left || pressed.middle || pressed.right)
189 191 {
190 this.checkClick(true);
192 this.checkClick(true, pressed);
191 193 }
192 194
193 if (GameInput.mouseHeld())
195 if (held.left || held.middle || held.right)
194 196 {
195 this.checkClick(false);
197 this.checkClick(false, held);
196 198 }
197 199
198 200 this.checkCollisions()
199 201 }
200 202
201 checkClick(thisFrame)
203 checkClick(thisFrame, btns)
202 204 {
203 205 var hit = false;
204 206 var clickPos = GameInput.mousePosition.subtract(this.gameObject.scene.position).subtract(this.gameObject.scene.cameraPosition);
@@ -218,11 +220,11 @@ class Collider
218 220 {
219 221 if (thisFrame)
220 222 {
221 this.onClick && this.onClick();
223 this.gameObject.onClick && this.gameObject.onClick(btns);
222 224 }
223 225 else
224 226 {
225 this.onMouseHeld && this.onMouseHeld();
227 this.gameObject.onMouseHeld && this.gameObject.onMouseHeld(btns);
226 228 }
227 229 }
228 230 }
@@ -1212,7 +1214,7 @@ var GameInput =
1212 1214 {
1213 1215 if(!GameInput.trueMousePosition)
1214 1216 GameInput.trueMousePosition = new vector();
1215
1217
1216 1218 GameInput.trueMousePosition.x = e.x;
1217 1219 GameInput.trueMousePosition.y = e.y;
1218 1220 }
@@ -1270,7 +1272,7 @@ var GameInput =
1270 1272
1271 1273 if(GameInput.g_middleMouseDownThisFrame && !GameInput.g_middleMouseDown)
1272 1274 {
1273 GameInput.g_midleMouseDown = true;
1275 GameInput.g_middleMouseDown = true;
1274 1276 }
1275 1277 },
1276 1278
@@ -1301,7 +1303,7 @@ var GameInput =
1301 1303 case GameInput.MouseButtons.Right: return GameInput.g_altMouseDownThisFrame;
1302 1304 }
1303 1305
1304 return GameInput.g_mouseDownThisFrame;
1306 return {left: GameInput.g_mouseDownThisFrame, middle: GameInput.g_middleMouseDownThisFrame, right: GameInput.g_altMouseDownThisFrame};
1305 1307 },
1306 1308
1307 1309 mouseHeld: function(btn)
@@ -1313,7 +1315,7 @@ var GameInput =
1313 1315 case GameInput.MouseButtons.Right: return GameInput.g_altMouseDown;
1314 1316 }
1315 1317
1316 return GameInput.g_mouseDown;
1318 return {left: GameInput.g_mouseDown, middle: GameInput.g_middleMouseDown, right: GameInput.g_altMouseDown};
1317 1319 }
1318 1320 }//
1319 1321 /*
@@ -185,20 +185,22 @@ class Collider
185
185
186 update(deltaTime)
186 update(deltaTime)
187 {
187 {
188 if (GameInput.mousePressed())
188 let pressed = GameInput.mousePressed();
189 let held = GameInput.mouseHeld();
190 if (pressed.left || pressed.middle || pressed.right)
189 {
191 {
190 this.checkClick(true);
192 this.checkClick(true, pressed);
191 }
193 }
192
194
193 if (GameInput.mouseHeld())
195 if (held.left || held.middle || held.right)
194 {
196 {
195 this.checkClick(false);
197 this.checkClick(false, held);
196 }
198 }
197
199
198 this.checkCollisions()
200 this.checkCollisions()
199 }
201 }
200
202
201 checkClick(thisFrame)
203 checkClick(thisFrame, btns)
202 {
204 {
203 var hit = false;
205 var hit = false;
204 var clickPos = GameInput.mousePosition.subtract(this.gameObject.scene.position).subtract(this.gameObject.scene.cameraPosition);
206 var clickPos = GameInput.mousePosition.subtract(this.gameObject.scene.position).subtract(this.gameObject.scene.cameraPosition);
@@ -218,11 +220,11 @@ class Collider
218 {
220 {
219 if (thisFrame)
221 if (thisFrame)
220 {
222 {
221 this.onClick && this.onClick();
223 this.gameObject.onClick && this.gameObject.onClick(btns);
222 }
224 }
223 else
225 else
224 {
226 {
225 this.onMouseHeld && this.onMouseHeld();
227 this.gameObject.onMouseHeld && this.gameObject.onMouseHeld(btns);
226 }
228 }
227 }
229 }
228 }
230 }
@@ -1212,7 +1214,7 @@ var GameInput =
1212 {
1214 {
1213 if(!GameInput.trueMousePosition)
1215 if(!GameInput.trueMousePosition)
1214 GameInput.trueMousePosition = new vector();
1216 GameInput.trueMousePosition = new vector();
1215
1217
1216 GameInput.trueMousePosition.x = e.x;
1218 GameInput.trueMousePosition.x = e.x;
1217 GameInput.trueMousePosition.y = e.y;
1219 GameInput.trueMousePosition.y = e.y;
1218 }
1220 }
@@ -1270,7 +1272,7 @@ var GameInput =
1270
1272
1271 if(GameInput.g_middleMouseDownThisFrame && !GameInput.g_middleMouseDown)
1273 if(GameInput.g_middleMouseDownThisFrame && !GameInput.g_middleMouseDown)
1272 {
1274 {
1273 GameInput.g_midleMouseDown = true;
1275 GameInput.g_middleMouseDown = true;
1274 }
1276 }
1275 },
1277 },
1276
1278
@@ -1301,7 +1303,7 @@ var GameInput =
1301 case GameInput.MouseButtons.Right: return GameInput.g_altMouseDownThisFrame;
1303 case GameInput.MouseButtons.Right: return GameInput.g_altMouseDownThisFrame;
1302 }
1304 }
1303
1305
1304 return GameInput.g_mouseDownThisFrame;
1306 return {left: GameInput.g_mouseDownThisFrame, middle: GameInput.g_middleMouseDownThisFrame, right: GameInput.g_altMouseDownThisFrame};
1305 },
1307 },
1306
1308
1307 mouseHeld: function(btn)
1309 mouseHeld: function(btn)
@@ -1313,7 +1315,7 @@ var GameInput =
1313 case GameInput.MouseButtons.Right: return GameInput.g_altMouseDown;
1315 case GameInput.MouseButtons.Right: return GameInput.g_altMouseDown;
1314 }
1316 }
1315
1317
1316 return GameInput.g_mouseDown;
1318 return {left: GameInput.g_mouseDown, middle: GameInput.g_middleMouseDown, right: GameInput.g_altMouseDown};
1317 }
1319 }
1318}//
1320}//
1319/*
1321/*
src/objects/arrow.js +5 −0
@@ -8,6 +8,11 @@ class Arrow extends GameObject
8 8 this.transform.angularVelocity = 40;
9 9 }
10 10
11 onClick(btn)
12 {
13 console.log(btn);
14 }
15
11 16 update(deltaTime)
12 17 {
13 18 super.update(deltaTime);
@@ -8,6 +8,11 @@ class Arrow extends GameObject
8 this.transform.angularVelocity = 40;
8 this.transform.angularVelocity = 40;
9 }
9 }
10
10
11 onClick(btn)
12 {
13 console.log(btn);
14 }
15
11 update(deltaTime)
16 update(deltaTime)
12 {
17 {
13 super.update(deltaTime);
18 super.update(deltaTime);