KittyPatch/kitty
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix develop_gl for changes in the sprites class

Browse Source
This commit is contained in:
Kovid Goyal
2016-10-31 11:03:05 +05:30
parent 0a6feee71a
commit fede13ae6b
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
kitty/develop_gl.py
View File

@@ -33,6 +33,7 @@ class Renderer:
] ]
self.program = ShaderProgram(*cell_shader) self.program = ShaderProgram(*cell_shader)
self.sprites = Sprites() self.sprites = Sprites()
self.sprites.initialize()
self.do_layout() self.do_layout()
def on_resize(self, window, w, h): def on_resize(self, window, w, h):
@@ -43,12 +44,14 @@ class Renderer:
def do_layout(self): def do_layout(self):
# Divide into cells # Divide into cells
cell_width, cell_height = cell_size() cell_width, cell_height = cell_size()
self.sprites.do_layout(cell_width, cell_height)
self.sprites.ensure_state()
self.screen_geometry = sg = calculate_vertices(cell_width, cell_height, self.w, self.h) self.screen_geometry = sg = calculate_vertices(cell_width, cell_height, self.w, self.h)
data = (gl.GLuint * (sg.xnum * sg.ynum * 9))() data = (gl.GLuint * (sg.xnum * sg.ynum * 9))()
for i in range(0, len(data), 9): for i in range(0, len(data), 9):
idx = i // 9 idx = i // 9
c = '%d' % (idx % 10) c = '%d' % (idx % 10)
data[i:i+3] = self.sprites.primary_sprite_position(c) data[i:i+3] = self.sprites.primary_sprite_position((c, 0))
fg, bg = self.color_pairs[idx % 3] fg, bg = self.color_pairs[idx % 3]
data[i+3:i+9] = fg + bg data[i+3:i+9] = fg + bg
self.sprites.set_sprite_map(data) self.sprites.set_sprite_map(data)