Texture refactor

-Texture renamed to Texture2D
-TextureLayered as base now inherits 2Darray, cubemap and cubemap array
-Removed all references to flags in textures (they will go in the shader)
-Texture3D gone for now (will come back later done properly)
-Create base rasterizer for RenderDevice, RasterizerRD

1 files changed, 6 insertions, 6 deletions

diff --git a/scene/2d/sprite.h b/scene/2d/sprite.h
index d72bf3168d..55f78015eb 100644
--- a/scene/2d/sprite.h
+++ b/scene/2d/sprite.h
@@ -38,8 +38,8 @@ class Sprite : public Node2D {
 
 	GDCLASS(Sprite, Node2D);
 
-	Ref<Texture> texture;
-	Ref<Texture> normal_map;
+	Ref<Texture2D> texture;
+	Ref<Texture2D> normal_map;
 
 	bool centered;
 	Point2 offset;
@@ -82,11 +82,11 @@ public:
 
 	bool is_pixel_opaque(const Point2 &p_point) const;
 
-	void set_texture(const Ref<Texture> &p_texture);
-	Ref<Texture> get_texture() const;
+	void set_texture(const Ref<Texture2D> &p_texture);
+	Ref<Texture2D> get_texture() const;
 
-	void set_normal_map(const Ref<Texture> &p_texture);
-	Ref<Texture> get_normal_map() const;
+	void set_normal_map(const Ref<Texture2D> &p_texture);
+	Ref<Texture2D> get_normal_map() const;
 
 	void set_centered(bool p_center);
 	bool is_centered() const;