*TextGenerator

4 files changed, 144 insertions, 21 deletions

diff --git a/Runtime/Graphics/GfxDevice.cpp b/Runtime/Graphics/GfxDevice.cpp
index d30a60a..f318487 100644
--- a/Runtime/Graphics/GfxDevice.cpp
+++ b/Runtime/Graphics/GfxDevice.cpp
@@ -80,6 +80,9 @@ void GfxDevice::UseShader(LuaBind::State& state, Shader* shader, int idx)
 
     m_Shader.shader = shader;
     m_Shader.ref.SetRef(state, idx);
+
+	glEnable(GL_BLEND);

+	glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
 }
 
 void GfxDevice::UnuseShader()
@@ -135,7 +138,8 @@ void GfxDevice::SetUniformTexture(const char* name, Texture* texture)
     int texUnit = s_TextureUnitBucket.back();
     s_TextureUnitBucket.pop_back();
     glActiveTexture(GL_TEXTURE0 + texUnit);

-    glBindTexture(GL_TEXTURE_2D, texture->GetGpuID());

+	//glBindTexture(GL_TEXTURE_2D, texture->GetGpuID());

+	glBindTexture(GL_TEXTURE_2D, 2);

 

     GLint loc = glGetUniformLocation(m_Shader.GetID(), name);
     glUniform1i(loc, texUnit);
diff --git a/Runtime/Graphics/ImageData.h b/Runtime/Graphics/ImageData.h
index 7bf0335..fe26776 100644
--- a/Runtime/Graphics/ImageData.h
+++ b/Runtime/Graphics/ImageData.h
@@ -5,29 +5,29 @@
 #include "Runtime/Threading/Job.h"
 #include "Runtime/Lua/LuaHelper.h"
 
+enum EPixelFormat
+{
+	PixelFormat_RGBA,
+	PixelFormat_RGB,
+	PixelFormat_R,
+	PixelFormat_RG,
+	PixelFormat_BGR,
+	PixelFormat_BGRA
+};
+
+enum EPixelElementType
+{
+	PixelType_UNSIGNED_BYTE,
+	PixelType_UNSIGNED_INT,
+	PixelType_BYTE,
+	PixelType_INT,
+	PixelType_FLOAT,
+};
+
 // ͼƬÏñËØÊý¾Ý
 class ImageData : public LuaBind::NativeClass<ImageData>
 {
 public:
-	enum EPixelFormat
-	{
-        RGBA, 
-        RGB, 
-        R, 
-        RG,
-        BGR,
-        BGRA
-	};
-
-    enum EPixelElementType
-    {
-        UNSIGNED_BYTE,
-        UNSIGNED_INT,
-        BYTE,
-        INT, 
-        FLOAT, 
-    };
-
     ImageData(LuaBind::VM* vm) 
         : LuaBind::NativeClass<ImageData>(vm) 
     {
diff --git a/Runtime/Graphics/Texture.cpp b/Runtime/Graphics/Texture.cpp
index 6b682e9..f92c094 100644
--- a/Runtime/Graphics/Texture.cpp
+++ b/Runtime/Graphics/Texture.cpp
@@ -3,7 +3,6 @@
 

 using namespace LuaBind;

 

-

 Texture::Texture(TextureSetting setting, ImageData* imgData)

 	: NativeClass<Texture>()

 {

@@ -94,7 +93,124 @@ void Texture::Init(TextureSetting setting, ImageData* imgData)
 	);

 }

 

+Texture::Texture(TextureSetting setting, int w, int h)

+	: NativeClass<Texture>()

+{

+	m_KeepPixelData = false;

+

+	m_Width = w;

+	m_Height = h;

+	m_Type = setting.type;

+	m_Format = setting.format;

+	m_WrapMode = setting.wrapMode;

+	m_FilterMode = setting.filterMode;

+	m_KeepPixelData = setting.keepImageData;

+

+	glGenTextures(1, &m_GPUID);

+	glBindTexture(GL_TEXTURE_2D, m_GPUID);

+

+	CheckGLError(

+		glDeleteTextures(1, &m_GPUID);

+		glBindTexture(GL_TEXTURE_2D, 0);

+		throw TextureException(error);

+	);

+

+	switch (m_WrapMode) {

+	case ETextureWrapMode::Clamp:

+		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP);

+		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP);

+		break;

+	case ETextureWrapMode::Repeat:

+		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);

+		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);

+		break;

+	case ETextureWrapMode::Mirror:

+		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_MIRRORED_REPEAT);

+		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_MIRRORED_REPEAT);

+		break;

+	default:

+		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP);

+		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP);

+		break;

+	}

+

+	CheckGLError(

+		glDeleteTextures(1, &m_GPUID);

+		glBindTexture(GL_TEXTURE_2D, 0);

+		throw TextureException(error);

+	);

+

+	switch (m_FilterMode) {

+		case ETextureFilterMode::Linear:

+			glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);

+			glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);

+			break;

+		case ETextureFilterMode::Nearest:

+			glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);

+			glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);

+			break;

+		default:

+			glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);

+			glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);

+			break;

+	}

+	GLenum internalFormat = GL_RGB;

+	if (m_Format == ETextureFormat::R8)

+	{

+		internalFormat = GL_RED;

+	}

+

+	glPixelStorei(GL_UNPACK_ALIGNMENT, 1);

+

+	glTexImage2D(GL_TEXTURE_2D, 0, internalFormat, w, h, 0, GL_RED, GL_UNSIGNED_BYTE, NULL);

+

+	CheckGLError(

+		glDeleteTextures(1, &m_GPUID);

+		glBindTexture(GL_TEXTURE_2D, 0);

+		throw TextureException(error);

+	);

+}

+

 Texture::~Texture()

 {

     glDeleteTextures(1, &m_GPUID);

+}

+

+void Texture::UpdateSubImage(Internal::Rect rect, int format, int type, const void* data)

+{

+	glBindTexture(GL_TEXTURE_2D, m_GPUID);

+

+	CheckGLError(

+		glBindTexture(GL_TEXTURE_2D, 0);

+		throw TextureException(error);

+	);

+

+	GLenum fmt = GL_RED; 

+	switch (format)

+	{

+		case EPixelFormat::PixelFormat_BGR: fmt = GL_BGR; break;

+		case EPixelFormat::PixelFormat_BGRA:fmt = GL_BGRA; break;

+		case EPixelFormat::PixelFormat_R:  fmt = GL_RED; break;

+		case EPixelFormat::PixelFormat_RG: fmt = GL_RG; break;

+		case EPixelFormat::PixelFormat_RGB: fmt = GL_RGB; break;

+		case EPixelFormat::PixelFormat_RGBA: fmt = GL_RGBA; break;

+	}

+	GLenum t = GL_UNSIGNED_BYTE;

+	switch (type) 

+	{

+		case EPixelElementType::PixelType_UNSIGNED_BYTE: t = GL_UNSIGNED_BYTE; break;

+		case EPixelElementType::PixelType_UNSIGNED_INT: t = GL_UNSIGNED_INT; break;

+		case EPixelElementType::PixelType_BYTE: t = GL_BYTE; break;

+		case EPixelElementType::PixelType_INT: t = GL_INT; break;

+		case EPixelElementType::PixelType_FLOAT: t = GL_FLOAT; break;

+	}

+

+	glTexSubImage2D(GL_TEXTURE_2D, 0, rect.x, rect.y, rect.width, rect.height, fmt, t, data);

+

+	CheckGLError(

+		glBindTexture(GL_TEXTURE_2D, 0);

+		throw TextureException(error);

+	);

+

+	glBindTexture(GL_TEXTURE_2D, 0);

 }
\ No newline at end of file
diff --git a/Runtime/Graphics/Texture.h b/Runtime/Graphics/Texture.h
index d02634c..6ead2fb 100644
--- a/Runtime/Graphics/Texture.h
+++ b/Runtime/Graphics/Texture.h
@@ -61,10 +61,13 @@ public:
 class Texture : public LuaBind::NativeClass<Texture>
 {
 public: 
+	Texture(TextureSetting setting, int width, int height)/*throw TextureException*/; // ¿ÕÌùͼ
 	Texture(TextureSetting setting, ImageData* imgData)/*throw TextureException*/;
 	Texture(LuaBind::VM* vm, TextureSetting setting, ImageData* imgData)/*throw TextureException*/;
 	~Texture();
 
+	void UpdateSubImage(Internal::Rect rect, int format, int type, const void* data);
+
 	GET(int, Width, m_Width);
 	GET(int, Height, m_Height);