implement Sprite

engine/Sprite.cpp

@@ -27,42 +27,13 @@ OTHER DEALINGS IN THE SOFTWARE.
 #include "Sprite.h"
 #include "Vector3.h"
 #include "Quaternion.h"
-#include "TextureResource.h"
+#include "SpriteResource.h"
 #include "Device.h"
 #include "Renderer.h"
 
 namespace crown
 {
 
-static float quad_vertices[] =
-{
-	-1.0f, -1.0f, 
-	 0.0f, 0.0f, 1.0f,
-	 1.0f, 1.0f, 1.0f, 1.0f,
-	 0.0f, 0.0f,
-
-	 1.0f, -1.0f,
-	 0.0f, 0.0f, 1.0f,
-	 1.0f, 1.0f, 1.0f, 1.0f,
-	 1.0f, 0.0f,
-
-	 1.0f,  1.0f,
-	 0.0f, 0.0f, 1.0f,
-	 1.0f, 1.0f, 1.0f, 1.0f,
-	 1.0f, 1.0f,
-
-	-1.0f,  1.0f,
-	 0.0f, 0.0f, 1.0f,
-	 1.0f, 1.0f, 1.0f, 1.0f,
-	 0.0f, 1.0f
-};
-
-static uint16_t quad_indices[] =
-{
-	0, 1, 3,
-	1, 2, 3
-};
-
 //-----------------------------------------------------------------------------
 static const char* sprite_vs =
 	"uniform mat4      	u_model;"
@@ -92,27 +63,23 @@ static const char* sprite_fs =
 
 	"void main(void)"
 	"{"
-	"	gl_FragColor = texture(u_tex, tex_coord0) * color;"
+	"	gl_FragColor = texture(u_tex, tex_coord0);"
 	"}";
 
 //-----------------------------------------------------------------------------
-void Sprite::create(const TextureResource* tr, int32_t node, const Vector3& pos, const Quaternion& rot)
+void Sprite::create(SpriteResource* sr, int32_t node, const Vector3& pos, const Quaternion& rot)
 {
 	Renderer* r = device()->renderer();
 
-	m_texture = tr->m_texture;
-
-	m_vb = r->create_vertex_buffer(4, VertexFormat::P2_N3_C4_T2, quad_vertices);
-	m_ib = r->create_index_buffer(6, quad_indices);
+	m_vb = sr->m_vb;
+	m_ib = sr->m_ib;
+	m_texture = sr->m_texture;
 
 	m_vertex = r->create_shader(ShaderType::VERTEX, sprite_vs);
 	m_fragment = r->create_shader(ShaderType::FRAGMENT, sprite_fs);
-
 	m_program = r->create_gpu_program(m_vertex, m_fragment);
-
 	m_uniform = r->create_uniform("u_tex", UniformType::INTEGER_1, 1);
 
-
 	set_local_position(pos);
 	set_local_rotation(rot);
 

engine/Sprite.h

@@ -32,14 +32,14 @@ OTHER DEALINGS IN THE SOFTWARE.
 namespace crown
 {
 
-class TextureResource;
+class SpriteResource;
 class Vector3;
 class Quaternion;
 
 struct Sprite
 {
-	void			create(const TextureResource* tr, int32_t node, const Vector3& pos, const Quaternion& rot);
-
+	void			create(SpriteResource* sr, int32_t node, const Vector3& pos, const Quaternion& rot);
+	
 	Vector3			local_position() const;
 	Quaternion		local_rotation() const;
 	Matrix4x4		local_pose() const;
@@ -53,7 +53,7 @@ struct Sprite
 	void			set_local_pose(const Matrix4x4& pose);
 
 public:
-
+	
 	int32_t 		m_node;
 
 	Matrix4x4 		m_local_pose;
@@ -69,7 +69,6 @@ public:
 	GPUProgramId	m_program;
 
 	UniformId 		m_uniform;
-
 };
 
 } // namespace crown