GameBox 0.1.3__py3-none-any.whl → 0.3.0__py3-none-any.whl

GameBox/__init__.py

@@ -5,7 +5,7 @@ GameBox makes it easy to build 2D games with graphics, sound, and UI in just a f
 """
 
 
-__version__ = "0.1.3"
+__version__ = "0.3.0"
 __author__ = "Sam Fertig"
 
 #____imports____

GameBox/_game.py

@@ -28,7 +28,8 @@ class Game:
         self.objs = []
 
 
-    def update(self, frame_rate=60):
+    def update(self, event: pygame.event,frame_rate=60):
+        Global.event = event
         #clear collisions
         Global.collisions.clear()
 

GameBox/basics/_net.py

@@ -14,12 +14,13 @@ class _global_:
         #--game and cam
         self.game: object = None
         self.cam: object = None
+        self.event: pygame.event = None
         #-collisions
         self.collisions: list[pygame.Rect] = []
 
         #objects
         self.player = self._player()
-        self.tilemap: object = None
+        self.tilemap = []
 
     class _player:
         def __init__(self):

GameBox/helpers/_collisions.py

@@ -0,0 +1,110 @@
+import pygame
+import numpy as np
+
+from ..basics._net import Global
+
+
+def CheckCollisions(x, y, vx, vy, dim, sample, obj):
+        x, y = x + vx, y + vy
+
+
+        #basic object collisions
+        x, y, vx, vy = _mainCollisionLogic(Global.collisions, x, y, vx, vy, dim)
+        x, y, vx, vy = _checkTilemapCollisions(x, y, vx, vy, dim, sample, obj)
+
+        return x, y, vx, vy
+    
+def _mainCollisionLogic(collisions, x, y, vx, vy, dim):
+    new_rect = pygame.Rect((x, y), dim)
+    for collision in collisions:
+        #pygame.draw.rect(Global.screen, (255, 0, 0), collision, 1)
+        if collision.colliderect(new_rect):
+            if vx > 0:
+                x = collision.left - dim[0]
+            elif vx < 0:
+                x = collision.right
+            vx = 0
+
+    # Y-axis collisions
+    new_rect = pygame.Rect((x, y), dim)
+    for collision in collisions:
+        #pygame.draw.rect(Global.screen, (255, 0, 0), collision, 1)
+        if collision.colliderect(new_rect):
+            if vy > 0:  # falling
+                y = collision.top - dim[1]
+                vy = 0
+            elif vy < 0:  # jumping
+                y = collision.bottom
+                vy = 0
+
+    return x, y, vx, vy
+    
+def _checkTilemapCollisions(x, y, vx, vy, dim, sample, obj):
+    if len(Global.tilemap) == 0:
+        return x, y, vx, vy
+    
+    for tilemap in Global.tilemap:
+    
+        #get player reletive tilemap  pos
+        prect = pygame.Rect(x, y, dim[0], dim[1])
+        prx, pry = prect.center
+        if Global.cam.follow != obj:
+            if Global.cam.x != 0 or Global.cam.y != 0:
+                px = int((prx) - Global.cam.x)
+                py = int((pry) - Global.cam.y) 
+                px = int(px  // tilemap.tileDim[0])
+                py = int(py  // tilemap.tileDim[1])
+            else:
+                px = int((x) / tilemap.tileDim[0])
+                py = int((y ) / tilemap.tileDim[1])
+        else:
+            if Global.cam.x != 0 or Global.cam.y != 0:
+                px = int(((prx + Global.cam.x)) // tilemap.tileDim[0])
+                py = int(((pry + Global.cam.y)) // tilemap.tileDim[1])
+            else:
+                px = int((x) / tilemap.tileDim[0])
+                py = int((y) / tilemap.tileDim[1])
+
+
+        #check if player is on tilemap
+        if px < 0 or px >= tilemap.mapDim[0] or py < 0 or py >= tilemap.mapDim[1]:
+            return x, y, vx, vy
+        #get collision rects around player
+        collisions: list[pygame.Rect] = []
+        for tx in range(px - sample, px + sample):
+            for ty in range(py - sample, py + sample):
+                nx = int(px + tx)
+                ny = int(py + ty)
+                #if tile is on map
+                if nx < 0 or nx >= tilemap.mapDim[0] or ny < 0 or ny >= tilemap.mapDim[1]:
+                    continue
+                #if tile has defined collision shape
+                tile = str(tilemap.map[ny][nx])
+                if tile not in tilemap.collisionDict: continue
+
+                #get collision shape 
+                rectshape = tilemap.collisionDict[str(tile)]
+                rect = getattr(tilemap.collisionShapes, rectshape).copy()
+
+                # Position rect correctly in the world
+                if Global.cam.follow != obj:
+                    if Global.cam.x != 0 or Global.cam.y != 0:
+                        rect.x = ((nx * tilemap.tileDim[0])) - Global.cam.x
+                        rect.y = ((ny * tilemap.tileDim[1])) - Global.cam.y
+                    else:
+                        rect.x += (nx * tilemap.tileDim[0]) - Global.cam.x
+                        rect.y += (ny * tilemap.tileDim[1]) - Global.cam.y
+                else:
+                    if Global.cam.x != 0 or Global.cam.y != 0:
+                        rect.x += ((nx * tilemap.tileDim[0])) - Global.cam.x
+                        rect.y += ((ny * tilemap.tileDim[1])) - Global.cam.y
+                    else:
+                        rect.x += (nx * tilemap.tileDim[0]) - Global.cam.x
+                        rect.y += (ny * tilemap.tileDim[1]) - Global.cam.y
+                collisions.append(rect)
+
+        #check collisions
+        x, y, vx, vy = _mainCollisionLogic(collisions, x, y, vx, vy, dim)
+
+        return x, y, vx, vy
+

GameBox/helpers/_input.py

@@ -51,6 +51,7 @@ class _keys:
         self.escape = pygame.K_ESCAPE
         self.space = pygame.K_SPACE
         self.backspace = pygame.K_BACKSPACE
+        self.tab = pygame.K_TAB
 
         #arrow keys
         self.up = pygame.K_UP
@@ -62,7 +63,11 @@ class _keys:
         self.mouse_x, self.mouse_y = 0, 0
     def init(self): Global.game.objs.append(self)
 
-    def is_pressed(self, key): return pygame.key.get_pressed()[key]
+    def is_pressed(self, key): 
+        for event in Global.event:
+            if event.type == pygame.KEYDOWN:
+                if event.key == key: return True
+        return False
 
     def update(self): self.mouse_x, self.mouse_y = pygame.mouse.get_pos()
 

GameBox/player/_playerPhysics.py

@@ -3,6 +3,7 @@ import numpy as np
 
 from ..basics._net import Global
 from ..basics.utils import clamp, moveTward, zeroOut
+from ..helpers._collisions import CheckCollisions
 
 class _playerPhysics:
     def __init__(self, player, speed: float = 1.0, gravity: float = 0.0, jump: float = 0.0, maxV: float = 10.0, airRes: float = 0.2):
@@ -24,7 +25,9 @@ class _playerPhysics:
 
     def update(self):
         self.ckeck_is_on_ground()
-        x, y = self.check_collisions()
+        x, y, self.vx, self.vy = CheckCollisions(self.player.x, self.player.y, 
+                               self.vx, self.vy, self.player.dim, 
+                               self.sample,self.player)
         if (Global.cam.follow) != (self.player):
             self.player.x = x
             self.player.y = y
@@ -32,117 +35,6 @@ class _playerPhysics:
             dx = -(self.player.x - x)
             dy = -(self.player.y - y)
             Global.cam.move(self.vx, self.vy)
-            
-
-    def check_collisions(self):
-        x, y = self.player.x + self.vx, self.player.y + self.vy
-
-        #basic object collisions
-        x, y = self.collisionLogic(Global.collisions, x, y)
-        x, y = self.tilemap_collisions(x, y)
-
-        return x, y
-    
-    def collisionLogic(self, collisions, x, y):
-        new_rect = pygame.Rect((x, self.player.y), self.player.dim)
-        for collision in collisions:
-            #pygame.draw.rect(Global.screen, (255, 0, 0), collision, 1)
-            if collision.colliderect(new_rect):
-                if self.vx > 0:
-                    x = collision.left - self.player.dim[0]
-                elif self.vx < 0:
-                    x = collision.right
-                self.vx = 0
-
-        # Y-axis collisions
-        new_rect = pygame.Rect((x, y), self.player.dim)
-        for collision in collisions:
-            #pygame.draw.rect(Global.screen, (255, 0, 0), collision, 1)
-            if collision.colliderect(new_rect):
-                if self.vy > 0:  # falling
-                    y = collision.top - self.player.dim[1]
-                    self.vy = 0
-                elif self.vy < 0:  # jumping
-                    y = collision.bottom
-                    self.vy = 0
-
-        return x, y
-    
-    def tilemap_collisions(self, x, y):
-        sample = self.sample
-        if Global.tilemap is None:
-            return x, y
-        
-        #get player reletive tilemap  pos
-        prect = pygame.Rect(x, y, self.player.dim[0], self.player.dim[1])
-        prx, pry = prect.center
-        if Global.cam.follow != self.player:
-            if Global.cam.x != 0 or Global.cam.y != 0:
-                px = int((prx - Global.tilemap.offset[0]) - Global.cam.x)
-                py = int((pry - Global.tilemap.offset[1]) - Global.cam.y) 
-                px = int(px  // Global.tilemap.tileDim[0])
-                py = int(py  // Global.tilemap.tileDim[1])
-            else:
-                px = int((x - Global.tilemap.offset[0]) / Global.tilemap.tileDim[0])
-                py = int((y - Global.tilemap.offset[1]) / Global.tilemap.tileDim[1])
-        else:
-            if Global.cam.x != 0 or Global.cam.y != 0:
-                px = int(((prx + Global.cam.x)-Global.tilemap.offset[0]) // Global.tilemap.tileDim[0])
-                py = int(((pry + Global.cam.y)-Global.tilemap.offset[1]) // Global.tilemap.tileDim[1])
-            else:
-                px = int((x - Global.tilemap.offset[0]) / Global.tilemap.tileDim[0])
-                py = int((y - Global.tilemap.offset[1]) / Global.tilemap.tileDim[1])
-
-        #draw collision rect
-        #print(f"px: {px}, py: {py}  |  cam.x: {Global.cam.x}, cam.y: {Global.cam.y}  |  x: {x}, y: {y}")
-        #rect = pygame.Rect(px , py, self.player.dim[0], self.player.dim[1])
-        #pygame.draw.rect(Global.screen, "red", rect)
-        #rect.x *= Global.tilemap.tileDim[0]
-        #rect.y *= Global.tilemap.tileDim[1]
-        #pygame.draw.rect(Global.screen, "yellow", rect, 1)
-        #pygame.display.update(rect)
-
-        #check if player is on tilemap
-        if px < 0 or px >= Global.tilemap.mapDim[0] or py < 0 or py >= Global.tilemap.mapDim[1]:
-            return x, y
-        #get collision rects around player
-        collisions: list[pygame.Rect] = []
-        for tx in range(px - sample, px + sample):
-            for ty in range(py - sample, py + sample):
-                nx = int(px + tx)
-                ny = int(py + ty)
-                #if tile is on map
-                if nx < 0 or nx >= Global.tilemap.mapDim[0] or ny < 0 or ny >= Global.tilemap.mapDim[1]:
-                    continue
-                #if tile has defined collision shape
-                tile = str(Global.tilemap.map[ny][nx])
-                if tile not in Global.tilemap.collisionDict: continue
-
-                #get collision shape 
-                rectshape = Global.tilemap.collisionDict[str(tile)]
-                rect = getattr(Global.tilemap.collisionShapes, rectshape).copy()
-
-                # Position rect correctly in the world
-                if Global.cam.follow != self.player:
-                    if Global.cam.x != 0 or Global.cam.y != 0:
-                        rect.x = ((nx * Global.tilemap.tileDim[0]) + Global.tilemap.offset[0]) - Global.cam.x
-                        rect.y = ((ny * Global.tilemap.tileDim[1]) + Global.tilemap.offset[1]) - Global.cam.y
-                    else:
-                        rect.x += (nx * Global.tilemap.tileDim[0] + Global.tilemap.offset[0]) - Global.cam.x
-                        rect.y += (ny * Global.tilemap.tileDim[1] + Global.tilemap.offset[1]) - Global.cam.y
-                else:
-                    if Global.cam.x != 0 or Global.cam.y != 0:
-                        rect.x += ((nx * Global.tilemap.tileDim[0]) + Global.tilemap.offset[0]) - Global.cam.x
-                        rect.y += ((ny * Global.tilemap.tileDim[1]) + Global.tilemap.offset[1]) - Global.cam.y
-                    else:
-                        rect.x += (nx * Global.tilemap.tileDim[0] + Global.tilemap.offset[0]) - Global.cam.x
-                        rect.y += (ny * Global.tilemap.tileDim[1] + Global.tilemap.offset[1]) - Global.cam.y
-                collisions.append(rect)
-
-        #check collisions
-        x, y = self.collisionLogic(collisions, x, y)
-
-        return x, y
 
 
 

GameBox/tilemap/_Editor.py

@@ -0,0 +1,36 @@
+import pygame
+import numpy as np
+
+from..helpers._input import Keys
+from ..basics._net import Global
+from ._collisionDef import _tileCollisionDefs
+
+from._editorBrushes import _brushPencil, _collisionsPencil
+
+class _tilemapEditor:
+    def __init__(self, tilemap, activation):
+        self.tilemap = tilemap
+        self.activation = activation
+        self.active = False
+
+        self.mode = _brushPencil()
+
+        self.changes = {
+            "pencil": Keys.b,
+            "collisions": Keys.c
+            
+        }
+
+    def _update(self):
+        if  self.active:
+            self.change_mode()
+            #editor stuff
+            self.mode.update(self.tilemap)
+        #toggle
+        if Keys.is_pressed(self.activation): self.active = not self.active
+
+    def change_mode(self):
+        #key presses
+        if Keys.is_pressed(self.changes["pencil"]): self.mode = _brushPencil()
+        elif Keys.is_pressed(self.changes["collisions"]): self.mode = _collisionsPencil(self.tilemap)
+    

GameBox/tilemap/_collisionDef.py

@@ -3,6 +3,13 @@ import pygame
 class _tileCollisionDefs:
     def __init__(self, tileDim):
         width, height = tileDim
+
+
+        self.rects = ["full", "none", "halfLeft", "halfRight", "halfTop", "halfBottom", "topRight", 
+                      "topLeft", "bottomRight", "bottomLeft", "dot"]
+        
+        self.num = len(self.rects) + 1
+
         self.full = pygame.Rect(0, 0, width, height)
 
         self.halfLeft = pygame.Rect(0, 0, width / 2, height)

GameBox/tilemap/_editorBrushes.py

@@ -0,0 +1,166 @@
+import pygame
+import numpy as np
+
+from ..basics._net import Global
+from ..helpers._input import Keys
+from ._collisionDef import _tileCollisionDefs
+
+class _brushPencil():
+    def __init__(self):
+        self.selectedTile = 1
+        self.mode = "paint"
+
+    def update(self, tilemap):
+        #get all mouse calculations
+        x, y = Keys.mouse_x, Keys.mouse_y
+        x += Global.cam.x
+        y += Global.cam.y
+        mx = x // tilemap.tileDim[0] * tilemap.tileDim[0]
+        my = y // tilemap.tileDim[1] * tilemap.tileDim[1]
+
+        #get mode
+        x, y = Keys.mouse_x, Keys.mouse_y
+        if x > tilemap.tileset.get_size()[0] * tilemap.tilescale / 2 or y > tilemap.tileset.get_size()[1] * tilemap.tilescale / 2:
+            self.mode = "paint"
+        else:
+            self.mode = "select"
+
+        #--show tileset
+        tile = tilemap.tiles[self.selectedTile]
+        image = pygame.transform.scale_by(tilemap.tileset, tilemap.tilescale / 2)
+        Global.screen.blit(image, (0, 0))
+        #--show outlined sellected tile
+        x, y = tilemap.tilePosInImage[self.selectedTile]
+        x *= tilemap.tilescale / 2
+        y *= tilemap.tilescale / 2
+        width = tilemap.orginDim[0] * tilemap.tilescale / 2
+        height = tilemap.orginDim[1] * tilemap.tilescale / 2
+        outline = pygame.Rect(x, y, width, height)
+        pygame.draw.rect(Global.screen, "white", outline, 2)
+        #other stuff
+        if self.mode == "paint":
+            x = mx
+            y = my
+
+            x -= Global.cam.x
+            y -= Global.cam.y
+            Global.screen.blit(tile, (x, y))
+            #set tile or erase
+            if pygame.mouse.get_pressed()[0]:
+                #check if mouse is on tilemap
+                x, y = mx // tilemap.tileDim[0], my // tilemap.tileDim[1]
+                if x >= 0 and x < tilemap.mapDim[0] and y >= 0 and y < tilemap.mapDim[1]:
+                    tilemap.map[int(y)][int(x)] = self.selectedTile
+            elif pygame.mouse.get_pressed()[2]:
+                x, y = mx // tilemap.tileDim[0], my // tilemap.tileDim[1]
+                if x >= 0 and x < tilemap.mapDim[0] and y >= 0 and y < tilemap.mapDim[1]:
+                    tilemap.map[int(y)][int(x)] = 0
+        elif self.mode == "select":
+            #paint mouse hovered tile
+            x, y = Keys.mouse_x, Keys.mouse_y
+            x = (x // width)
+            y = (y // height)
+            outline = pygame.Rect(x * width, y * width, width, height)
+            pygame.draw.rect(Global.screen, "black", outline, 2)
+            if pygame.mouse.get_pressed()[0]:
+                x *= tilemap.orginDim[0]
+                y *= tilemap.orginDim[1]
+                self.selectedTile = tilemap.posToTile[(int(x), int(y))]
+
+        #move selection by arrow keys
+        x, y = tilemap.tilePosInImage[self.selectedTile]
+
+        width = 16
+        height = 16
+
+        if Keys.is_pressed(Keys.left): x -= width
+        if Keys.is_pressed(Keys.right): x += width
+        if Keys.is_pressed(Keys.up): y -= height
+        if Keys.is_pressed(Keys.down): y += height
+
+        if (int(x), int(y)) in tilemap.posToTile:
+            self.selectedTile = tilemap.posToTile[(int(x), int(y))]
+
+class _collisionsPencil():
+    def __init__(self, tilemap):
+        self.selectedTile = 0
+        self.shapes = tilemap.collisionShapes.num
+        self.mode = "paint"
+        size = tilemap.tilescale / 2
+        self.size = tilemap.orginDim[0] * size
+        self.coll = _tileCollisionDefs((tilemap.orginDim[0] * size, tilemap.orginDim[1] * size))
+
+    def update(self, tilemap):
+        x, y = Keys.mouse_x, Keys.mouse_y
+        #draw tilesets and background
+        Global.screen.fill("darkgrey")
+        image = pygame.transform.scale_by(tilemap.tileset, tilemap.tilescale / 2)
+        Global.screen.blit(image, (0, 0))
+        Global.screen.blit(image, (0, image.get_size()[1]+ 10))
+        #draw all collision rects on top tileset
+        for tile in range(tilemap.tilesetNum - 1):
+            tile+=1
+            if str(tile) not in tilemap.collisionDict: continue
+            rectshape = tilemap.collisionDict[str(tile)]
+            rect = getattr(self.coll, rectshape).copy()
+            tx, ty = tilemap.tilePosInImage[int(tile)]
+            tx = (tx // tilemap.orginDim[0]) * self.size
+            ty = (ty // tilemap.orginDim[1]) * self.size
+            rect.x += tx
+            rect.y += ty
+            pygame.draw.rect(Global.screen, "yellow", rect, 5)
+            outline = pygame.Rect(tx, ty, self.size, self.size)
+            pygame.draw.rect(Global.screen, "gray", outline, 2)
+        #change mode
+        if y > image.get_size()[1] * 2 + 50: self.mode = "select"
+        else: self.mode = "paint"
+        #draw collisions tiles at bottom
+        tx, ty = 0, image.get_size()[1] * 2 + 50
+        for tile in range(self.shapes-1):
+            rect = getattr(self.coll, tilemap.collisionShapes.rects[tile]).copy()
+            rect.x += tx
+            rect.y += ty
+            pygame.draw.rect(Global.screen, "yellow", rect, 5)
+            outline = pygame.Rect(tx, ty, self.size, self.size)
+            pygame.draw.rect(Global.screen, "gray", outline, 2)
+            tx += self.size + self.size / 2
+        #paint mode
+        if self.mode == "paint":
+            #draw tile around mouse
+            rect = getattr(self.coll, tilemap.collisionShapes.rects[self.selectedTile]).copy()
+            rect.x += x - self.size / 2
+            rect.y += y - self.size / 2
+            pygame.draw.rect(Global.screen, "yellow", rect, 5)
+            outline = pygame.Rect(x, y, self.size, self.size)
+            outline.center = (Keys.mouse_x, Keys.mouse_y)
+            pygame.draw.rect(Global.screen, "gray", outline, 2)
+            #paint collisions
+            size = tilemap.orginDim[0]
+            if pygame.mouse.get_pressed()[0]:
+                x = (x - (x % self.size)) // self.size
+                y = (y - (y % self.size)) // self.size
+                px = x * size
+                py = y * size
+                if (int(px), int(py)) in tilemap.posToTile:
+                    tilemap.collisionDict[str(tilemap.posToTile[(int(px), int(py))])] = self.coll.rects[self.selectedTile]
+            #erase collisions
+            if pygame.mouse.get_pressed()[2]:
+                x = (x - (x % self.size)) // self.size
+                y = (y - (y % self.size)) // self.size
+                px = x * size
+                py = y * size
+                if (int(px), int(py)) in tilemap.posToTile:
+                    tilemap.collisionDict[tilemap.posToTile[(int(px), int(py))]] = "none"
+
+        elif self.mode == "select":
+            #get tile at mouse
+            x = int(x // (self.size + self.size / 2))
+            #draw underline
+            underline = pygame.Rect((0, 0), (self.size, 5))
+            underline.center = (Keys.mouse_x, ty + self.size+5)
+            pygame.draw.rect(Global.screen, "black", underline)
+            #select tile
+            if pygame.mouse.get_pressed()[0] and x < self.shapes-1 and x >= 0:
+                self.selectedTile = int(x)
+                
+

GameBox/tilemap/_tilemap.py

@@ -5,33 +5,40 @@ import json
 from ..basics._net import Global
 
 from ._collisionDef import _tileCollisionDefs
+from ._Editor import _tilemapEditor
 
 class TileMap:
-    def __init__(self, tileSet: str, tileDim: tuple, tileScale: float, mapDim: tuple, mapFill: int, offset: tuple):
+    def __init__(self, tileSet: str, tileDim: tuple, tileScale: float, mapDim: tuple, mapFill: int, saveFile = None):
         self.tilesetFile = tileSet
-        self.mapFile = None
+        self.mapFile = saveFile
         self.tileDim = (tileDim[0] * tileScale, tileDim[1] * tileScale)
         self.tileDim = (self.tileDim[0] * Global.cam.scale, self.tileDim[1] * Global.cam.scale)
         self.mapDim = mapDim
-        self.offset = offset
         self.tilescale = tileScale
         self.orginDim = tileDim
 
+        self.tilesetNum = 0
+
+        self.editor = None
+
         Global.game.objs.append(self)
-        Global.tilemap = self
 
         self.collisionShapes = _tileCollisionDefs(self.tileDim)
 
         self.collisionDict = {}
 
+        self.tilePosInImage = {}
+        self.posToTile = {}
+
         #map, tile splitting, ect
         #--create map
         self.map = np.full(self.mapDim, mapFill)
         #--split map into tiles
         self.tiles = {}
         tileset = pygame.image.load(tileSet).convert_alpha()
+        self.tileset = tileset
         tile_w, tile_h = tileDim
-        tile_id = 0
+        tile_id = 1
         tileset_w, tileset_h = tileset.get_size()
 
         for y in range(0, tileset_h, tile_h):
@@ -39,10 +46,12 @@ class TileMap:
                 tile = pygame.Surface(tileDim, pygame.SRCALPHA)
                 tile.blit(tileset, (0, 0), (x, y, tile_w, tile_h))
                 self.tiles[tile_id] = pygame.transform.scale(tile, self.tileDim)
+                self.tilePosInImage[tile_id] = (x, y)
+                self.posToTile[(x, y)] = tile_id
+                self.tilesetNum += 1
                 tile_id += 1
 
-        print(f"tiles: {self.tiles}")
-        Global.tilmap = self
+        Global.tilemap.append(self)
 
     def load_map_from_json(self, filePath: str):
         with open(filePath, "r") as f:
@@ -54,16 +63,23 @@ class TileMap:
         self.mapFile = path
         self.collisionDict = data["collisions"]
 
+    def activate_editor(self, activation):
+        print(f"editor activated. press {activation} to toggle")
+        self.editor = _tilemapEditor(self, activation)
+
     def update(self):
         self.draw_tiles()
+        if self.editor is not None: self.editor._update()
             
 
     def draw_tiles(self):
         for y in range(self.mapDim[1]):
             for x in range(self.mapDim[0]):
+                if self.map[y][x] == 0:
+                    continue
                 tile = self.tiles[self.map[y][x]]
-                mx = (x * self.tileDim[0] + self.offset[0]) - Global.cam.x
-                my = (y * self.tileDim[1] + self.offset[1]) - Global.cam.y
+                mx = (x * self.tileDim[0]) - Global.cam.x
+                my = (y * self.tileDim[1]) - Global.cam.y
                 if mx < -self.tileDim[0] or mx > Global.screenDim[0] or my < -self.tileDim[1] or my > Global.screenDim[1]: continue
                 Global.screen.blit(tile, (mx, my))
 
@@ -72,4 +88,7 @@ class TileMap:
         if self.mapFile is not None:
             print('tilemap saved')
             with open(self.mapFile, "w") as f:
-                json.dump(self.map.tolist(), f)
+                data = {}
+                data["map"] = self.map.tolist()
+                data["collisions"] = self.collisionDict
+                json.dump(data, f)

{gamebox-0.1.3.dist-info → gamebox-0.3.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: GameBox
-Version: 0.1.3
+Version: 0.3.0
 Summary: GameBox is a beginner-friendly Python package built on top of pygame, designed to make 2D game development faster and easier. It provides ready-to-use modules, utilities, and abstractions that let new developers create polished games without needing advanced coding knowledge—while still offering the flexibility for experienced coders to customize and extend.
 Author-email: Sam Fertig <sfertig007@gmail.com>
 License-Expression: MIT
@@ -14,7 +14,7 @@ GameBox is a lightweight 2D game framework built on pygame.
 This is an early technical preview of a full engine rewrite.
 APIs may change frequently.
 
-github: {https://github.com/sfertig/GameBox}
+github: https://github.com/sfertig/GameBox
 
 Versioning
 GameBox follows a modified semantic versioning scheme.

gamebox-0.3.0.dist-info/RECORD

@@ -0,0 +1,20 @@
+GameBox/__init__.py,sha256=uY6ByC6ujfiIjG257S2V75gHN0SWVX-N0MaeQqctlHU,727
+GameBox/_game.py,sha256=QqfWQRLIiKQ-QjEGQYFLpsjEtPNuhxMqiCnPmXFyq3M,1548
+GameBox/basics/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+GameBox/basics/_net.py,sha256=tZsfUc-rOsbRPxgjzR95gY6vKa8CxM8TJhCBtDnVhtg,766
+GameBox/basics/_shapes.py,sha256=7k5Mxnm_NdFssW6Zao8DSJAHJQM3pVWx2xZ4QDyF6lQ,1035
+GameBox/basics/cammera.py,sha256=qo20hc5f3FLiBpFeWgBObj-EQ93Hg4RgEUtIwPIylOI,930
+GameBox/basics/utils.py,sha256=w6H34MhxcNoX58iQtlvbT5-4GXefy3RIMTxZGP9fSxA,432
+GameBox/helpers/_collisions.py,sha256=f19oIYsyY3G9-5J-nUVBvbuFT1EPeDwcbycIP0TLGms,4336
+GameBox/helpers/_input.py,sha256=97bPxM5dkonRywOhj11lgHVQVicuLAKYi_w8EPM0Af8,1963
+GameBox/player/_player.py,sha256=R0vH1mZhl6RENiQl3Vg4ACF9agR5OP50MenvhgFBYOk,1769
+GameBox/player/_playerControler.py,sha256=XEb87RFlgLFoXnXqxIS4lpzHN0wywMNCX5y-NIhw0cs,1715
+GameBox/player/_playerPhysics.py,sha256=XqgEC5FB5mrnlalY3M5TLScw40mSvNAc0AE9g3amEr0,2918
+GameBox/tilemap/_Editor.py,sha256=98JcwAvL6JgSG2S-V-527lwpfzbE-A-BbezCI9EfTyI,1027
+GameBox/tilemap/_collisionDef.py,sha256=VxWcfz3nlhyYI_Hemp-LvC6IDC-YN6wIdRaU8AsgipU,1621
+GameBox/tilemap/_editorBrushes.py,sha256=GFfRV0OB3t9sFb37eO3sB8Cmwyd5i_q64q5IjYlkx1k,7247
+GameBox/tilemap/_tilemap.py,sha256=SEQlokpsUO9zQkLMF-j6amx1FqNeD2eM2CRFj3zCnZ8,3330
+gamebox-0.3.0.dist-info/METADATA,sha256=gwV3s_16qJEtjpHlGRTHL9v1M7B02VXU14Rjm_bU1XA,1059
+gamebox-0.3.0.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+gamebox-0.3.0.dist-info/licenses/LICENSE,sha256=gcuuhKKc5-dwvyvHsXjlC9oM6N5gZ6umYbC8ewW1Yvg,35821
+gamebox-0.3.0.dist-info/RECORD,,

gamebox-0.1.3.dist-info/RECORD

@@ -1,17 +0,0 @@
-GameBox/__init__.py,sha256=jU3a32yFDiWvSHanU2_xJHNi3Ngcqrvjn190SyKlNwE,727
-GameBox/_game.py,sha256=eG_rCsLwDhkY4AdjvnO80efswhyRrqPPxNsTSR8uIaY,1498
-GameBox/basics/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-GameBox/basics/_net.py,sha256=PWt57uI51seDLszyQBXriFEiLVNiVCBj3zpiDR9k0B4,735
-GameBox/basics/_shapes.py,sha256=7k5Mxnm_NdFssW6Zao8DSJAHJQM3pVWx2xZ4QDyF6lQ,1035
-GameBox/basics/cammera.py,sha256=qo20hc5f3FLiBpFeWgBObj-EQ93Hg4RgEUtIwPIylOI,930
-GameBox/basics/utils.py,sha256=w6H34MhxcNoX58iQtlvbT5-4GXefy3RIMTxZGP9fSxA,432
-GameBox/helpers/_input.py,sha256=XzlrMmhomNwR6XoaKsOq5nDiNPAdK-vRCQEuayCHGHA,1812
-GameBox/player/_player.py,sha256=R0vH1mZhl6RENiQl3Vg4ACF9agR5OP50MenvhgFBYOk,1769
-GameBox/player/_playerControler.py,sha256=XEb87RFlgLFoXnXqxIS4lpzHN0wywMNCX5y-NIhw0cs,1715
-GameBox/player/_playerPhysics.py,sha256=m_W2SrTFscIFG70v8gj0G2grLnEM2IeyPIhgMXA48yI,8115
-GameBox/tilemap/_collisionDef.py,sha256=lZCmSwIsLgxvEB3X30re_izg1DHY83IWp84NcM1cIkM,1393
-GameBox/tilemap/_tilemap.py,sha256=YrDMv7h2B_awe_J9LCW1JaGXHGve2mqfgLQk4-tvxsE,2695
-gamebox-0.1.3.dist-info/METADATA,sha256=3oHumIWtO2w1051z48ltCg6ujYfxtakvL_dDD4RfXso,1061
-gamebox-0.1.3.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-gamebox-0.1.3.dist-info/licenses/LICENSE,sha256=gcuuhKKc5-dwvyvHsXjlC9oM6N5gZ6umYbC8ewW1Yvg,35821
-gamebox-0.1.3.dist-info/RECORD,,