Skip to content

A fast 2D and 3D game engine — TypeScript SDK, C++/WebAssembly core, visual editor. Ship one project to web, desktop, WeChat MiniGames, playable ads, and native Android / iOS.

fix: add UByte4N shader data type for packed color vertex attribute

esengine09dbb7f867ab
diff --git a/src/esengine/renderer/Buffer.cpp b/src/esengine/renderer/Buffer.cpp
index a9dbfd1f7..b012cac40 100644
--- a/src/esengine/renderer/Buffer.cpp
+++ b/src/esengine/renderer/Buffer.cpp
@@ -28,6 +28,7 @@ u32 shaderDataTypeSize(ShaderDataType type) {
case ShaderDataType::Int3: return 4 * 3;
case ShaderDataType::Int4: return 4 * 4;
case ShaderDataType::Bool: return 1;
+ case ShaderDataType::UByte4N: return 4;
default: return 0;
}
}
@@ -43,6 +44,7 @@ u32 shaderDataTypeComponentCount(ShaderDataType type) {
case ShaderDataType::Int3: return 3;
case ShaderDataType::Int4: return 4;
case ShaderDataType::Bool: return 1;
+ case ShaderDataType::UByte4N: return 4;
default: return 0;
}
}
@@ -296,17 +298,23 @@ void VertexArray::addVertexBuffer(Shared<VertexBuffer> buffer) {
glType = GL_INT;
break;
case ShaderDataType::Bool:
+ case ShaderDataType::UByte4N:
glType = GL_UNSIGNED_BYTE;
break;
default:
break;
}
+ GLboolean normalized = attr.normalized ? GL_TRUE : GL_FALSE;
+ if (attr.type == ShaderDataType::UByte4N) {
+ normalized = GL_TRUE;
+ }
+
glVertexAttribPointer(
vertexAttribIndex_,
shaderDataTypeComponentCount(attr.type),
glType,
- attr.normalized ? GL_TRUE : GL_FALSE,
+ normalized,
layout.getStride(),
reinterpret_cast<const void*>(static_cast<uintptr_t>(attr.offset))
);
diff --git a/src/esengine/renderer/Buffer.hpp b/src/esengine/renderer/Buffer.hpp
index d4b9d2dc8..506e3e3b3 100644
--- a/src/esengine/renderer/Buffer.hpp
+++ b/src/esengine/renderer/Buffer.hpp
@@ -45,7 +45,8 @@ enum class ShaderDataType {
Int2, ///< ivec2 (2 ints)
Int3, ///< ivec3 (3 ints)
Int4, ///< ivec4 (4 ints)
- Bool ///< Boolean (1 byte)
+ Bool, ///< Boolean (1 byte)
+ UByte4N ///< 4 unsigned bytes, normalized to [0,1] vec4
};
/**
diff --git a/src/esengine/renderer/Renderer.cpp b/src/esengine/renderer/Renderer.cpp
index 8d04bc438..4f6711c72 100644
--- a/src/esengine/renderer/Renderer.cpp
+++ b/src/esengine/renderer/Renderer.cpp
@@ -356,7 +356,7 @@ void BatchRenderer2D::init() {
*data_->vbo = std::move(*VertexBuffer::create(MAX_VERTICES * sizeof(BatchVertex)));
data_->vbo->setLayout({
{ ShaderDataType::Float2, "a_position" },
- { ShaderDataType::Float, "a_color" },
+ { ShaderDataType::UByte4N, "a_color" },
{ ShaderDataType::Float2, "a_texCoord" }
});