X-Git-Url: http://nitlanguage.org

diff --git a/lib/gamnit/flat.nit b/lib/gamnit/flat.nit
index cafac8a..85c702c 100644
--- a/lib/gamnit/flat.nit
+++ b/lib/gamnit/flat.nit
@@ -41,8 +41,8 @@ import more_collections
 import performance_analysis
 
 import gamnit
-import gamnit::cameras_cache
 intrude import gamnit::cameras
+intrude import gamnit::cameras_cache
 import gamnit::dynamic_resolution
 import gamnit::limit_fps
 import gamnit::camera_control
@@ -235,7 +235,10 @@ class Sprite
 	fun needs_update
 	do
 		var c = context
-		if c != null then c.sprites_to_update.add self
+		if c == null then return
+		if c.last_sprite_to_update == self then return
+		c.sprites_to_update.add self
+		c.last_sprite_to_update = self
 	end
 
 	# Request a resorting of this sprite in its sprite list
@@ -253,6 +256,9 @@ class Sprite
 	# Current context to which `self` was sorted
 	private var context: nullable SpriteContext = null
 
+	# Index in `context`
+	private var context_index: Int = -1
+
 	# Current context to which `self` belongs
 	private var sprite_set: nullable SpriteSet = null
 end
@@ -294,7 +300,7 @@ redef class App
 	do
 		texture.load
 
-		var splash = new Sprite(texture, ui_camera.center)
+		var splash = new Sprite(texture, ui_camera.center.offset(0.0, 0.0, 0.0))
 		ui_sprites.add splash
 
 		var display = display
@@ -372,11 +378,19 @@ redef class App
 		if display != null then display.close
 	end
 
-	redef fun frame_core(display)
+	redef fun on_resize(display)
 	do
-		# Prepare to draw, clear buffers
-		glClear(gl_COLOR_BUFFER_BIT | gl_DEPTH_BUFFER_BIT)
+		super
+
+		world_camera.mvp_matrix_cache = null
+		ui_camera.mvp_matrix_cache = null
+
+		# Update all sprites in the UI
+		for sprite in ui_sprites do sprite.needs_update
+	end
 
+	redef fun frame_core(display)
+	do
 		# Check errors
 		var gl_error = glGetError
 		assert gl_error == gl_NO_ERROR else print_error gl_error
@@ -685,6 +699,7 @@ private class SpriteSet
 
 		context.sprites.add sprite
 		context.sprites_to_update.add sprite
+		context.last_sprite_to_update = sprite
 
 		sprite.context = context
 		sprite.sprite_set = self
@@ -760,11 +775,14 @@ private class SpriteContext
 	var usage: GLBufferUsage
 
 	# Sprites drawn by this context
-	var sprites = new GroupedArray[Sprite]
+	var sprites = new GroupedSprites
 
 	# Sprites to update since last `draw`
 	var sprites_to_update = new Set[Sprite]
 
+	# Cache of the last `Sprite` added to `sprites_to_update` since the last call to `draw`
+	var last_sprite_to_update: nullable Sprite = null
+
 	# Sprites that have been update and for which `needs_update` can be set to false
 	var updated_sprites = new Array[Sprite]
 
@@ -870,8 +888,11 @@ private class SpriteContext
 	# Update GPU data of `sprite`
 	fun update_sprite(sprite: Sprite)
 	do
-		var sprite_index = sprites.index_of(sprite)
-		if sprite_index == -1 then return
+		var context = sprite.context
+		if context != self then return
+
+		var sprite_index = sprite.context_index
+		assert sprite_index != -1
 
 		# Vertices data
 
@@ -996,6 +1017,7 @@ private class SpriteContext
 
 			for sprite in sprites_to_update do update_sprite(sprite)
 			sprites_to_update.clear
+			last_sprite_to_update = null
 
 			sys.perfs["gamnit flat gpu update"].add app.perf_clock_sprites.lapse
 		end
@@ -1161,9 +1183,6 @@ private class GroupedArray[E]
 	# Number of item slots in the array
 	fun capacity: Int do return items.length
 
-	# Index of `item`
-	fun index_of(item: E): Int do return items.index_of(item)
-
 	# List of available slots
 	var available = new MinHeap[Int].default
 
@@ -1173,8 +1192,8 @@ private class GroupedArray[E]
 	# Index of the spots after filled chunks
 	var ends = new List[Int]
 
-	# Add `item` to the first available slot
-	fun add(item: E)
+	# Add `item` to the first available slot and return its index
+	fun add(item: E): Int
 	do
 		length += 1
 
@@ -1199,7 +1218,7 @@ private class GroupedArray[E]
 				# at end of first chunk
 				ends.first += 1
 			end
-			return
+			return i
 		end
 
 		items.add item
@@ -1207,13 +1226,20 @@ private class GroupedArray[E]
 			starts.add 0
 			ends.add 1
 		else ends.last += 1
+		return ends.last - 1
 	end
 
 	# Remove the first instance of `item`
 	fun remove(item: E)
 	do
-		var i = items.index_of(item)
-		assert i != -1
+		var index = items.index_of(item)
+		remove_at(item, index)
+	end
+
+	# Remove `item` at `index`
+	fun remove_at(item: E, index: Int)
+	do
+		var i = index
 		length -= 1
 		items[i] = null
 
@@ -1288,6 +1314,7 @@ private class GroupedArray[E]
 		while max > 0 and (starts.length > 1 or starts.first != 0) do
 			var i = ends.last - 1
 			var e = items[i]
+			assert e != null
 			remove e
 			add e
 			moved.add e
@@ -1320,6 +1347,20 @@ private class GroupedArray[E]
 	end
 end
 
+# Optimized `GroupedArray` to use `Sprite::context_index` and avoid using `index_of`
+private class GroupedSprites
+	super GroupedArray[Sprite]
+
+	redef fun add(item)
+	do
+		var index = super
+		item.context_index = index
+		return index
+	end
+
+	redef fun remove(item) do remove_at(item, item.context_index)
+end
+
 redef class GLfloatArray
 	private fun fill_from_matrix(matrix: Matrix, dst_offset: nullable Int)
 	do