Skip to content

Commit

Permalink
Release 3.0.b0
Browse files Browse the repository at this point in the history
  • Loading branch information
dmaccarthy committed Mar 12, 2023
1 parent bcee128 commit cd85171
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 15 deletions.
5 changes: 2 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,9 @@ Latest stable release (2.2):
pip3 install sc8pr
```

Alpha release (3.0.a3):
Beta release (3.0.b0): Please note that **sc8prx** includes “extras” that have dependencies other than **pygame**. Use **sc8pr** if you just want the core features with no extra dependencies.
```
pip3 install https://github.com/dmaccarthy/sc8pr/archive/v3.0.a3.zip
pip3 install https://github.com/dmaccarthy/sc8prx/archive/v3.0.a3.zip
pip3 install sc8prx==3.0b0
```

Development version (3.0.dev):
Expand Down
12 changes: 2 additions & 10 deletions sc8pr/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
# along with "sc8pr". If not, see <http://www.gnu.org/licenses/>.


version = 3, 0, "a5"
version = 3, 0, "b0"
print("sc8pr {}.{}.{}: https://dmaccarthy.github.io/sc8pr".format(*version))

import sys, struct
Expand Down Expand Up @@ -209,7 +209,7 @@ def blitPosition(self, offset, blitSize):
def calcBlitRect(self, blitSize):
cv = self.canvas
offset = cv.rect.topleft if cv else (0,0)
return pygame.Rect(self.blitPosition(offset, blitSize), blitSize) ## !!!
return pygame.Rect(self.blitPosition(offset, blitSize), blitSize)

def relPos(self, pos):
"Calculate coordinates relative to the graphic object"
Expand Down Expand Up @@ -653,20 +653,12 @@ def convert(self, alpha=False):
img = self.image
srf = surface(img, alpha)
return self if srf is img else Image(srf)
# if alpha is not None and self.original.get_bitsize() != (32 if alpha else 24):
# srf = self.image
# img = Image(srf.convert_alpha() if alpha else srf.convert(24))
# else: img = self
# return img

@property
def rgb(self): return self.convert(False)

@property
def rgba(self): return self.convert(True)
# "Return a new Image of the original surface, ensuring it is RGBA"
# srf = self.original
# return Image(srf if hasAlpha(srf) else srf.convert_alpha())

def tiles(self, cols=1, rows=1, flip=0, padding=0):
"Create a list of images from a spritesheet"
Expand Down
4 changes: 2 additions & 2 deletions setup.cfg
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[metadata]
name = sc8pr
version = 3.0.a4
version = 3.0.b0
author = D.G. MacCarthy
author_email = [email protected]
url = https://dmaccarthy.github.io/sc8pr
Expand All @@ -10,7 +10,7 @@ long_description_content_type = text/markdown
keywords = graphics animation sprite gui robotics pygame educational
license = GPLv3
classifiers =
Development Status :: 3 - Alpha
Development Status :: 4 - Beta
Intended Audience :: Developers
Intended Audience :: Education
License :: OSI Approved :: GNU General Public License v3 (GPLv3)
Expand Down

0 comments on commit cd85171

Please sign in to comment.