From: Alexis Laferrière <alexis.laf@xymus.net>
Date: Sun, 7 May 2017 03:47:10 +0000 (-0400)
Subject: gamnit: remove `Gamnit` from `GamnitRootTexture` and `GamnitSubtexture`
X-Git-Url: http://nitlanguage.org

gamnit: remove `Gamnit` from `GamnitRootTexture` and `GamnitSubtexture`

Signed-off-by: Alexis Laferrière <alexis.laf@xymus.net>
---

diff --git a/lib/gamnit/depth/more_materials.nit b/lib/gamnit/depth/more_materials.nit
index e8c6746..6374dea 100644
--- a/lib/gamnit/depth/more_materials.nit
+++ b/lib/gamnit/depth/more_materials.nit
@@ -146,7 +146,7 @@ class TexturedMaterial
 		# If using a texture, set `texture_coords`
 		program.tex_coord.array_enabled = sample_used_texture != null
 		if sample_used_texture != null then
-			if sample_used_texture isa GamnitRootTexture then
+			if sample_used_texture isa RootTexture then
 				# Coordinates are directly valid
 				program.tex_coord.array(mesh.texture_coords, 2)
 			else
diff --git a/lib/gamnit/depth/selection.nit b/lib/gamnit/depth/selection.nit
index 18744ee..3d0e841 100644
--- a/lib/gamnit/depth/selection.nit
+++ b/lib/gamnit/depth/selection.nit
@@ -210,7 +210,7 @@ redef class TexturedMaterial
 		# If using a texture, set `texture_coords`
 		program.tex_coord.array_enabled = sample_used_texture != null
 		if sample_used_texture != null then
-			if sample_used_texture isa GamnitRootTexture then
+			if sample_used_texture isa RootTexture then
 				# Coordinates are directly valid
 				program.tex_coord.array(mesh.texture_coords, 2)
 			else
diff --git a/lib/gamnit/flat.nit b/lib/gamnit/flat.nit
index cfd8150..8edb17f 100644
--- a/lib/gamnit/flat.nit
+++ b/lib/gamnit/flat.nit
@@ -601,7 +601,7 @@ private class SpriteSet
 	super HashSet[Sprite]
 
 	# Map texture then static vs dynamic to a `SpriteContext`
-	var contexts_map = new HashMap2[GamnitRootTexture, Bool, SpriteContext]
+	var contexts_map = new HashMap2[RootTexture, Bool, SpriteContext]
 
 	# Contexts in `contexts_map`
 	var contexts_items = new Array[SpriteContext]
@@ -696,7 +696,7 @@ private class SpriteContext
 	# Context config and state
 
 	# Only root texture drawn by this context
-	var texture: nullable GamnitRootTexture
+	var texture: nullable RootTexture
 
 	# OpenGL ES usage of `buffer_array` and `buffer_element`
 	var usage: GLBufferUsage
diff --git a/lib/gamnit/textures.nit b/lib/gamnit/textures.nit
index 9b980fb..fd45ec5 100644
--- a/lib/gamnit/textures.nit
+++ b/lib/gamnit/textures.nit
@@ -23,8 +23,8 @@ abstract class Texture
 	# Prepare a texture located at `path` within the `assets` folder
 	new (path: Text) do return new TextureAsset(path.to_s)
 
-	# Root texture of which `self` is derived
-	fun root: GamnitRootTexture is abstract
+	# Root texture from which `self` is derived
+	fun root: RootTexture is abstract
 
 	# Width in pixels of this texture
 	var width = 0.0
@@ -42,10 +42,10 @@ abstract class Texture
 	fun gl_texture: Int do return root.gl_texture
 
 	# Prepare a subtexture from this texture, from the given pixel offsets
-	fun subtexture(left, top, width, height: Numeric): GamnitSubtexture
+	fun subtexture(left, top, width, height: Numeric): Subtexture
 	do
 		# Setup the subtexture
-		var subtex = new GamnitSubtexture(root, self, left.to_f, top.to_f, width.to_f, height.to_f)
+		var subtex = new Subtexture(root, self, left.to_f, top.to_f, width.to_f, height.to_f)
 		return subtex
 	end
 
@@ -64,7 +64,7 @@ end
 
 # Colorful small texture of 2x2 pixels
 class CheckerTexture
-	super GamnitRootTexture
+	super RootTexture
 
 	redef fun load(force)
 	do
@@ -84,7 +84,7 @@ class CheckerTexture
 end
 
 # Texture with its own pixels
-class GamnitRootTexture
+class RootTexture
 	super Texture
 
 	redef fun root do return self
@@ -143,7 +143,7 @@ end
 
 # Texture loaded from the assets folder
 class TextureAsset
-	super GamnitRootTexture
+	super RootTexture
 
 	# Path to this texture within the `assets` folder
 	var path: String
@@ -166,7 +166,7 @@ class TextureAsset
 end
 
 # Texture derived from another texture, does not own its pixels
-class GamnitSubtexture
+class Subtexture
 	super Texture
 
 	redef var root