made Texture.pixels return an Array2D of Colors. made GridEditor use …

…Array2D.

ursina/prefabs/grid_editor.py

@@ -509,7 +509,11 @@ def set_texture(self, texture, render=True, clear_undo_stack=True):
         self.canvas.texture = texture
         self.w, self.h = int(texture.width), int(texture.height)
         self.canvas.scale_x = self.canvas.scale_y * self.w / self.h
-        self.grid = [[texture.get_pixel(x,y) for y in range(texture.height)] for x in range(texture.width)]
+
+        # pixels = texture.pixels
+        self.grid = Array2D(width=texture.width, height=texture.height)
+        for (x,y), _ in enumerate_2d(self.grid):
+            self.grid[x][y] = texture.get_pixel(x,y)
         self.canvas.texture.filtering = None
 
         self.gizmo_parent.scale = Vec2(1/self.w, 1/self.h)
@@ -521,7 +525,6 @@ def set_texture(self, texture, render=True, clear_undo_stack=True):
             self.record_undo()
             self.undo_index = 0
 
-
         if render:
             self.render()
 
@@ -536,9 +539,8 @@ def draw(self, x, y):
 
 
     def render(self):
-        for y in range(self.h):
-            for x in range(self.w):
-                self.canvas.texture.set_pixel(x, y, self.grid[x][y])
+        for (x,y), value in enumerate_2d(self.grid):
+            self.canvas.texture.set_pixel(x, y, value)
 
         self.canvas.texture.apply()
 
@@ -571,8 +573,7 @@ def texture(self, value):
     '''
     from PIL import Image
     t = Texture(Image.new(mode='RGBA', size=(32,32), color=(0,0,0,1)))
-    editor = PixelEditor(parent=scene, texture=load_texture('brick'), scale=10)
-    # editor.set_texture(Texture('/home/rain/MechanicalHeart/Levels/Up.png'))
+    editor = PixelEditor(parent=scene, texture=load_texture('test_tileset'), scale=10)
     camera.orthographic = True
     camera.fov = 15
     EditorCamera(rotation_speed=0)

ursina/texture.py

@@ -6,6 +6,7 @@
 from ursina.vec2 import Vec2
 from ursina import color
 from ursina.ursinamath import clamp
+from ursina.array_tools import Array2D
 
 
 class Texture():
@@ -87,13 +88,14 @@ def height(self):
     def pixels(self):
         from numpy import asarray, flip
         from PIL import Image
+        from ursina.array_tools import rotate_2d_list
 
         if self._cached_image:
-            return asarray(self._cached_image)
+            return Array2D(data=asarray(self._cached_image))
 
         pixels = asarray(Image.open(self.path))
-        pixels = flip(pixels, axis=0)
-        return pixels
+        pixels = rotate_2d_list(pixels)
+        return Array2D(data=pixels)
 
 
     @property
@@ -183,12 +185,6 @@ def __repr__(self):
         return self.name
 
 
-    def __del__(self):
-        # self._texture.releaseAll()
-        del self._cached_image
-
-
-
 if __name__ == '__main__':
     from ursina import *
     from ursina import texture_importer
@@ -248,6 +244,13 @@ def input(key):
     e.texture = 'brick'
     # e.texture.set_pixels([e for e in e.texture.get_pixels()])
     e.texture.apply()
+
     tex = Texture.new((512,512), (255,0,0))
 
+    pixels = e.texture.pixels
+    new_grid = Array2D(width=pixels.width, height=pixels.height)
+    for (x,y), value in enumerate_2d(pixels):
+        new_grid[x][y] = int(color.rgba32(*value).v > .5)
+
+    print(new_grid)
     app.run()