fix text bubble

Author: mikebarkmin

examples/java/Sensing/Sensing.java

@@ -17,6 +17,11 @@ public Sensing() {
     m = new MovableHero();
     this.add(h);
     this.add(m);
+
+    var uiH = new Hero();
+    uiH.isUI(true);
+    uiH.setPosition(300, 300);
+    this.add(uiH);
   }
 
   public void run() {
@@ -84,7 +89,7 @@ public void run() {
     if (this.isKeyPressed(82)) {
       this.turnRight(1);
     }
-    if (this.isTouchingSprite(Sensing.h)) {
+    if (this.isTouchingSprite(Hero.class)) {
       this.say("Hit");
     } else {
       this.say(null);

src/org/openpatch/scratch/Sprite.java

@@ -449,7 +449,7 @@ public void setOnEdgeBounce(boolean b) {
   }
 
   public void ifOnEdgeBounce() {
-    if (this.hitboxDisabled) return;
+    if (this.hitboxDisabled || this.isUI) return;
 
     var h = this.getHitbox();
 
@@ -739,6 +739,11 @@ public boolean isTouchingMousePointer() {
     var mx = this.getMouseX();
     var my = this.getMouseY();
 
+    if (isUI && this.stage != null) {
+      mx = this.stage.getCamera().toGlobalX(mx);
+      my = this.stage.getCamera().toGlobalY(my);
+    }
+
     double[] mouse = Utils.rotateXY(mx, my, this.x, this.y, this.direction - 90);
 
     var relativeMouseX = (int) Math.round(mouse[0] - this.x + this.getWidth() / 2);
@@ -879,6 +884,7 @@ public boolean isTouchingSprite(Sprite sprite) {
   public boolean isTouchingSprite(Class<? extends Sprite> c) {
     if (stage == null) return false;
     return this.stage.sprites.stream()
+        .filter(s -> !s.isUI())
         .filter(s -> c.isInstance(s) && this.isTouchingSprite(s))
         .findFirst()
         .isPresent();
@@ -887,6 +893,7 @@ public boolean isTouchingSprite(Class<? extends Sprite> c) {
   public <T extends Sprite> T getTouchingSprite(Class<T> c) {
     if (stage == null) return null;
     return this.stage.sprites.stream()
+        .filter(s -> !s.isUI())
         .filter(s -> c.isInstance(s) && this.isTouchingSprite(s))
         .findFirst()
         .map(c::cast)
@@ -896,6 +903,7 @@ public <T extends Sprite> T getTouchingSprite(Class<T> c) {
   public <T extends Sprite> List<T> getTouchingSprites(Class<T> c) {
     if (stage == null) return null;
     return this.stage.sprites.stream()
+        .filter(s -> !s.isUI())
         .filter(s -> c.isInstance(s) && this.isTouchingSprite(s))
         .map(c::cast)
         .collect(Collectors.toList());
@@ -1211,7 +1219,7 @@ public void draw() {
   }
 
   public void drawDebug() {
-    if (!this.hitboxDisabled) {
+    if (!this.hitboxDisabled && !this.isUI) {
       this.getHitbox().drawDebug(this.getStage().getDebugBuffer());
     }
     if (this.costumes.size() > 0 && this.show) {

src/org/openpatch/scratch/Stage.java

@@ -1080,8 +1080,9 @@ public void draw() {
       this.debugBuffer.scale((float) this.camera.getZoom() / 100.0f);
       this.debugBuffer.translate((float) -this.camera.getX(), (float) this.camera.getY());
       this.debugBuffer.clear();
-      this.sprites.stream().forEach(s -> s.drawDebug());
+      this.sprites.stream().filter(s -> !s.isUI()).forEach(s -> s.drawDebug());
       this.debugBuffer.popMatrix();
+      this.sprites.stream().filter(s -> s.isUI()).forEach(s -> s.drawDebug());
       this.debugBuffer.strokeWeight(1);
       this.debugBuffer.stroke(Window.DEBUG_COLOR[0], Window.DEBUG_COLOR[1], Window.DEBUG_COLOR[2]);
       this.debugBuffer.fill(Window.DEBUG_COLOR[0], Window.DEBUG_COLOR[1], Window.DEBUG_COLOR[2]);

src/org/openpatch/scratch/extensions/text/Text.java

@@ -276,28 +276,28 @@ private void drawBubble() {
       return;
     }
 
-    this.y = -this.sprite.getY() - this.sprite.getHeight() * 1.1 / 2;
-    this.x = this.sprite.getX() + this.sprite.getWidth() * 0.9 / 2;
+    this.y = this.sprite.getY() + this.sprite.getHeight() * 1.1 / 2;
+    this.x = this.sprite.getX() + this.sprite.getWidth() * 0.9 / 2.0;
 
     this.width = maxLineWidth + 16;
     this.text = String.join("\n", lines);
     this.height = (this.textSize + 4) * lines.length + 16;
     applet.rectMode(PApplet.CORNER);
 
     // bound for top
-    var y = Math.max(0, this.y - this.height);
+    var y = Math.min(applet.getHeight() / 2.0, this.y + this.height);
 
     // bound for bottom
-    if (y + this.height > applet.getHeight()) {
-      y = applet.getHeight() - this.height;
+    if (y - this.height < -applet.getHeight() / 2.0) {
+      y = -applet.getHeight() / 2.0 + this.height;
     }
 
-    // bound for left side
-    var x = Math.max(0, this.x);
-
     // bound for right side
+    var x = Math.min(applet.getWidth() / 2.0 - this.width, this.x + this.width);
+
+    // bound for left side
     var mirror = false;
-    if (x + this.width > applet.getWidth()) {
+    if (x - this.width < -applet.getWidth() / 2.0) {
       mirror = true;
     }
 
@@ -306,9 +306,9 @@ private void drawBubble() {
       if (x < 0) {
         x = 0;
       }
-      applet.translate((float) x, (float) y);
+      applet.translate((float) x, (float) -y);
     } else {
-      applet.translate((float) x, (float) y);
+      applet.translate((float) x, (float) -y);
     }
     applet.stroke(
         (float) this.strokeColor.getRed(),
@@ -377,8 +377,7 @@ private void drawBox() {
     this.text = String.join("\n", lines);
 
     applet.rectMode(PApplet.CORNER);
-    applet.translate(
-        (float) this.x, (float) (-this.y - this.height));
+    applet.translate((float) this.x, (float) (-this.y - this.height));
     applet.stroke(
         (float) this.strokeColor.getRed(),
         (float) this.strokeColor.getGreen(),