Minor refactoring

Author: aryanpingle

src/bits.ts

@@ -1,4 +1,18 @@
-// Bit manipulation utilities
+/**
+ * Bit manipulation utilities.
+ */
+
+/**
+ * Get the number of set bits (i.e. 1) in the given bitmask.
+ */
+export function countSetBits(bitstring: number) {
+    let count = 0;
+    while (bitstring != 0) {
+        count += bitstring % 2;
+        bitstring = bitstring >> 1;
+    }
+    return count;
+}
 
 export function getBit(bitmask: number, exponent: number): number {
     return (bitmask >> exponent) & 1;
@@ -19,6 +33,7 @@ export function setBits(bitmask: number, ...exponents: number[]): number {
 export function setBit(bitmask: number, exponent: number): number {
     return bitmask | (1 << exponent);
 }
+
 function toggleBit(bitmask: number, exponent: number): number {
     return bitmask ^ (1 << exponent);
 }

src/components/RuneSVG/index.tsx

@@ -332,12 +332,15 @@ export class RuneSVG extends Component<Props, State> {
                 xmlns="http://www.w3.org/2000/svg"
                 xmlnsXlink="http://www.w3.org/1999/xlink"
             >
-                <g
-                    ref={(e) => (this.guideLayer = e)}
-                    className="runic-layer runic-layer--guide"
-                >
-                    {...tokenLayers.guide}
-                </g>
+                {/* Simple optimization, may be removed if troublesome */}
+                {state.runeGuideColor !== "transparent" && (
+                    <g
+                        ref={(e) => (this.guideLayer = e)}
+                        className="runic-layer runic-layer--guide"
+                    >
+                        {...tokenLayers.guide}
+                    </g>
+                )}
                 <g
                     ref={(e) => (this.realLayer = e)}
                     className="runic-layer runic-layer--real"

src/rune.ts

@@ -1,4 +1,12 @@
-import { getBit, unsetBits, setBits, isBitSet, setBit, unsetBit } from "./bits";
+import {
+    getBit,
+    unsetBits,
+    setBits,
+    isBitSet,
+    setBit,
+    unsetBit,
+    countSetBits,
+} from "./bits";
 import {
     VOWEL_MASK,
     MIDDLE_LINE_MASK,
@@ -8,7 +16,6 @@ import {
     symbolToSymbolData,
     consonantDataTable,
 } from "./runeDataset";
-import { countSetBits } from "./utils";
 
 function containsBitmask(bitstring: number, bitmask: number) {
     return (bitstring & bitmask) === bitmask;