Slight cleanup refactor

jcreedcmu · Feb 6, 2024 · 56327c6 · 56327c6
1 parent 7e7a657
commit 56327c6
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 8 deletions.
diff --git a/src/ui/drawPanicBar.ts b/src/ui/drawPanicBar.ts
@@ -26,7 +26,6 @@ export function wordBubblePanicRect(textCenter: Point, lineHeight: number, lines
   return { rect: { p: minp, sz: vsub(maxp, minp) }, color: lerpSpline(panicColorSpline, progress) as RgbColor };
 }
 
-
 export function renderPanicBar(panic: PanicData, game_from_clock: SE1): RenderableRect {
   const panic_fraction = getPanicFraction(panic, game_from_clock);
 

diff --git a/src/ui/gl-render.ts b/src/ui/gl-render.ts
@@ -25,7 +25,7 @@ import { FIXED_WORD_BUBBLE_SIZE, canvas_from_hand_tile } from "./render";
 import { spriteLocOfMob } from "./sprite-sheet";
 import { resizeView } from "./ui-helpers";
 import { CanvasGlInfo } from "./use-canvas";
-import { BUBBLE_FONT_SIZE, canvas_from_drag_tile, cell_in_canvas, drawBubbleAux, pan_canvas_from_world_of_state } from "./view-helpers";
+import { BUBBLE_FONT_SIZE, canvas_from_drag_tile, cell_in_canvas, drawBubbleAux, pan_canvas_from_world_of_state, textCenterOfBubble } from "./view-helpers";
 import { canvas_bds_in_canvas, getWidgetPoint, hand_bds_in_canvas, panic_bds_in_canvas } from "./widget-helpers";
 
 const shadowColorRgba: RgbaColor = [128, 128, 100, Math.floor(0.4 * 255)];
@@ -248,7 +248,7 @@ export function renderGlPane(ci: CanvasGlInfo, env: GlEnv, state: GameState): vo
       // draw word bubble progress bars
       for (const wordBonus of cs.wordBonusState.active) {
         if (cs.wordBonusState.shown !== undefined && vequal(cs.wordBonusState.shown, wordBonus.p_in_world_int)) {
-          const text_in_canvas = vadd({ x: -24, y: -24 }, apply(canvas_from_world, vadd(wordBonus.p_in_world_int, { x: 0.4, y: 0 })));
+          const text_in_canvas = textCenterOfBubble(canvas_from_world, wordBonus.p_in_world_int);
           const rr = wordBubblePanicRect(text_in_canvas, BUBBLE_FONT_SIZE, 2, FIXED_WORD_BUBBLE_SIZE, getWordBonusFraction(wordBonus, cs.game_from_clock));
           glFillRect(env, rr.rect, rr.color);
         }

diff --git a/src/ui/render.ts b/src/ui/render.ts
@@ -19,7 +19,7 @@ import { vadd, vdiv, vequal, vm, vscale, vsub, vtrans } from '../util/vutil';
 import { drawAnimation } from './drawAnimation';
 import { drawBonus } from './drawBonus';
 import { CanvasInfo } from './use-canvas';
-import { cell_in_canvas, drawBubble, drawBubbleAux, pan_canvas_from_world_of_state } from './view-helpers';
+import { apexOfBubble, cell_in_canvas, drawBubble, drawBubbleAux, pan_canvas_from_world_of_state, textCenterOfBubble } from './view-helpers';
 import { GLOBAL_BORDER, PANIC_THICK, canvas_bds_in_canvas, canvas_from_hand, canvas_from_toolbar, effective_toolbar_bds_in_canvas, getWidgetPoint, hand_bds_in_canvas, inner_hand_bds_in_canvas, panic_bds_in_canvas, pause_button_bds_in_canvas, score_bds_in_canvas, spacer1_bds_in_canvas, spacer2_bds_in_canvas, toolbar_bds_in_canvas, world_bds_in_canvas } from './widget-helpers';
 
 const INTERFACE_RADIUS = 2 * GLOBAL_BORDER;
@@ -217,8 +217,8 @@ export function canvas_from_hand_tile(index: number): SE2 {
 function drawWordBubble(ci: CanvasInfo, cs: CoreState, pan_canvas_from_world: SE2) {
   for (const wordBonus of cs.wordBonusState.active) {
     if (cs.wordBonusState.shown !== undefined && vequal(cs.wordBonusState.shown, wordBonus.p_in_world_int)) {
-      const apex_in_canvas = apply(pan_canvas_from_world, vadd(wordBonus.p_in_world_int, { x: 0.4, y: 0.4 }));
-      const text_in_canvas = vadd({ x: -24, y: -24 }, apply(pan_canvas_from_world, vadd(wordBonus.p_in_world_int, { x: 0.4, y: 0 })));
+      const apex_in_canvas = apexOfBubble(pan_canvas_from_world, wordBonus.p_in_world_int);
+      const text_in_canvas = textCenterOfBubble(pan_canvas_from_world, wordBonus.p_in_world_int);
       drawBubbleAux(ci.d, [wordBonus.word.toUpperCase(), ''], text_in_canvas, apex_in_canvas, FIXED_WORD_BUBBLE_SIZE, 1);
     }
   }

diff --git a/src/ui/view-helpers.ts b/src/ui/view-helpers.ts
@@ -1,5 +1,5 @@
 import { apply, compose, ident, inverse, SE2, translate } from '../util/se2';
-import { vm, vsub } from '../util/vutil';
+import { vadd, vm, vsub } from '../util/vutil';
 import { CoreState, GameState, MouseState } from '../core/state';
 import { Point, Rect } from '../util/types';
 import { getDragWidgetPoint, getWidgetPoint } from './widget-helpers';
@@ -127,3 +127,11 @@ export function drawBubbleAux(
     d.fillText(lines[i], textCenter.x, textCenter.y + i * BUBBLE_FONT_SIZE);
   }
 }
+
+export function textCenterOfBubble(canvas_from_world: SE2, p_in_world_int: Point): Point {
+  return vadd({ x: -24, y: -24 }, apply(canvas_from_world, vadd(p_in_world_int, { x: 0.4, y: 0 })));
+}
+
+export function apexOfBubble(canvas_from_world: SE2, p_in_world_int: Point): Point {
+  return apply(canvas_from_world, vadd(p_in_world_int, { x: 0.4, y: 0.4 }));
+}
diff --git a/src/util/debug.ts b/src/util/debug.ts
@@ -14,7 +14,7 @@ export const DEBUG = {
   instructions: false,
   skipAheadPanic: false,
   acceleratePanic: false,
-  accelerateWordBonus: false,
+  accelerateWordBonus: true,
   interval: false,
   glProfiling: false,
   canvasProfiling: false,