Update

Author: Secret-chest

config.py

@@ -40,7 +40,7 @@
 
 # Enable debug messages
 # Set whether debug messages (messages to stderr) should be allowed.
-enableDebugMessages: bool = False
+enableDebugMessages: bool = True
 
 # Enable pygame welcome message
 # Enable or disable the "

targetSprite.py

@@ -45,6 +45,7 @@ def __init__(self, target):
         self.sprite = sprite
         self.image = self.sprite.copy()
         self.rect = self.image.get_rect()
+        self.spriteRect = self.sprite.get_rect()
         self.isStage = target.isStage
         self.imageSize = sprite.get_size()
         if self.target.name == "Stage":
@@ -84,13 +85,8 @@ def setXy(self, x, y):
         self.x = x
         self.y = y
         print(_("debug-prefix"), _("new-sprite-position", x=x, y=y, name=self.name), file=sys.stderr)
-        # Scratch really is weird.
-        if self.isBitmap:
-            self.rect.x = self.x + scratch.WIDTH // 2 - round(self.target.costumes[self.target.currentCostume].rotationCenterX) + round(self.imageSize[0] / 2)
-            self.rect.y = scratch.HEIGHT // 2 - self.y - round(self.target.costumes[self.target.currentCostume].rotationCenterY) + round(self.imageSize[1] / 2)
-        else:
-            self.rect.x = self.x + scratch.WIDTH // 2 - round(self.target.costumes[self.target.currentCostume].rotationCenterX)
-            self.rect.y = scratch.HEIGHT // 2 - self.y - round(self.target.costumes[self.target.currentCostume].rotationCenterY)
+        self.rect.x = self.x + scratch.WIDTH // 2 - round(self.target.costumes[self.target.currentCostume].rotationCenterX) + (self.spriteRect.width - self.rect.width) / 2
+        self.rect.y = scratch.HEIGHT // 2 - self.y - round(self.target.costumes[self.target.currentCostume].rotationCenterY) + (self.spriteRect.height - self.rect.height) / 2
 
     # Relatively set self position
     def setXyDelta(self, dx, dy):
@@ -103,10 +99,19 @@ def setRot(self, rot):
         self.direction = rot
         print(_("debug-prefix"), _("new-sprite-rotation", rot=rot, name=self.name), file=sys.stderr)
         center = self.sprite.get_rect().center   # TODO get correct rotation centre of sprite
-        print(center, (self.rect.x + center[0], self.rect.y - center[1]), (self.rect.x, self.rect.y), (self.x, self.y), self.direction)
+        # self.image = pygame.transform.rotate(self.sprite, 90 - self.direction)
+        # self.rect = self.image.get_rect(center=(self.rect.x + center[0], self.rect.y - center[1]))
+        # # TODO calculate correct rotation centre
+        # self.setXy(self.x, self.y)
+        image_rect = self.sprite.get_rect(topleft=(self.rect.x - self.target.costumes[self.target.currentCostume].rotationCenterX, self.rect.y - self.target.costumes[self.target.currentCostume].rotationCenterX))
+        #offset_center_to_pivot = pygame.math.Vector2((self.rect.x, self.rect.y)) - image_rect.center
+        offset_center_to_pivot = pygame.math.Vector2((134, 36))
+        print(offset_center_to_pivot)
+        rotated_offset = offset_center_to_pivot.rotate(90 - self.direction)
+        rotated_image_center = (self.rect.x - rotated_offset.x, self.rect.y - rotated_offset.y)
+
         self.image = pygame.transform.rotate(self.sprite, 90 - self.direction)
-        self.rect = self.image.get_rect(center=(self.rect.x + center[0], self.rect.y - center[1]))
-        # TODO calculate correct rotation centre
+        self.rect = self.image.get_rect(center=rotated_image_center)
         self.setXy(self.x, self.y)
 
     # Relatively set self rotation (turn)