more mods

ramseyball · Oct 10, 2023 · 777b0fa · 777b0fa
1 parent c7e5829
commit 777b0fa
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 41 deletions.
diff --git a/button.ts b/button.ts
@@ -70,12 +70,10 @@ namespace microcode {
     export class Button implements IComponent, ISizable, IPlaceable {
         private xfrm_: Affine
         private icon: Sprite
-        //private text: TextSprite;
         private style: ButtonStyle
         private iconId: string | Image
         private _ariaId: string
         public onClick?: (button: Button) => void
-        private bounds_: Bounds
 
         //% blockCombine block="xfrm" callInDebugger
         public get xfrm() {
@@ -112,7 +110,12 @@ namespace microcode {
 
         public get bounds() {
             // Returns bounds in local space
-            return this.bounds_
+            // This isn't quite right, but it's close enough for now
+            return Bounds.GrowXY(
+                            this.icon.bounds,
+                            borderLeft(this.style),
+                            borderTop(this.style)
+                        )
         }
 
         public get rootXfrm(): Affine {
@@ -142,7 +145,7 @@ namespace microcode {
             this.onClick = opts.onClick
             this.buildSprite()
         }
-        
+
         public getIcon() {
             return this.iconId
         }
@@ -168,12 +171,6 @@ namespace microcode {
                         : this.iconId,
             })
             this.icon.xfrm.parent = this.xfrm
-            // This isn't quite right, but it's close enough for now
-            this.bounds_ = Bounds.GrowXY(
-                this.icon.bounds,
-                borderLeft(this.style),
-                borderTop(this.style)
-            )
         }
 
         public occlusions(bounds: Bounds) {

diff --git a/editor.ts b/editor.ts
@@ -585,7 +585,7 @@ namespace microcode {
         public addToNavigator() {
             this.ruleEditors.forEach(rule => {
                 this.editor.navigator.addRule(rule.ruledef)
-                rule.addToNavigator()
+                this.editor.addButtons(rule.getRuleButtons())
             })
         }
 
@@ -622,11 +622,11 @@ namespace microcode {
             }
         }
 
-        /* override */ update() {
+        update() {
             this.ruleEditors.forEach(rule => rule.update())
         }
 
-        /* override */ draw() {
+        draw() {
             control.enablePerfCounter()
             this.ruleEditors.forEach(rule => rule.draw())
         }

diff --git a/ruleeditor.ts b/ruleeditor.ts
@@ -114,6 +114,7 @@ namespace microcode {
                     changed = true
                 }
             })
+            // TODO: do we really need this?
             if (changed) this.editor.changed()
         }
 
@@ -374,7 +375,7 @@ namespace microcode {
             return Language.getTileSuggestions(this.ruledef, name, index)
         }
 
-        public addToNavigator() {
+        public getRuleButtons() {
             // TODO: can this be done lazily instead?
             const btns: Button[] = []
             btns.push(this.handleBtn)
@@ -388,7 +389,7 @@ namespace microcode {
 
             if (this.doInsertBtn) btns.push(this.doInsertBtn)
 
-            this.editor.addButtons(btns)
+            return btns
         }
 
         public isEmpty() {

diff --git a/sprite.ts b/sprite.ts
@@ -56,43 +56,17 @@ namespace microcode {
                 p.x - (this.width >> 1) > Screen.RIGHT_EDGE
             )
         }
-        /*
-        public isOffScreen(): boolean {
-            const p = this.xfrm.worldPos
-            return (
-                p.x + (this.width >> 1) < Screen.LEFT_EDGE ||
-                p.y + (this.height >> 1) < Screen.TOP_EDGE ||
-                p.x - (this.width >> 1) > Screen.RIGHT_EDGE ||
-                p.y - (this.height >> 1) > Screen.BOTTOM_EDGE
-            )
-        }
-        public isClipped(): boolean {
-            const p = this.xfrm.worldPos
-            return (
-                p.x - (this.width >> 1) < Screen.LEFT_EDGE ||
-                p.y - (this.height >> 1) < Screen.TOP_EDGE ||
-                p.x + (this.width >> 1) > Screen.RIGHT_EDGE ||
-                p.y + (this.height >> 1) > Screen.BOTTOM_EDGE
-            )
-        }*/
         draw() {
             control.enablePerfCounter()
             if (this.invisible) {
                 return
             }
-
-            // perf: this is not really required anymore as rules are clipped vertically and tiles horizontally
-            // if (this.isOffScreen()) {
-            //    return
-            //}
-
             Screen.drawTransparentImageXfrm(
                 this.xfrm,
                 this.image,
                 -(this.image.width >> 1),
                 -(this.image.height >> 1)
             )
-            //this.hitbox.drawRect(15);
         }
     }