ecker/engine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

for opengl, have uniform colors bind to a draw command via pointer like an actual shader uniform (and also have it prioritize vertex colors instead)

Browse Source
This commit is contained in:
ecker 2025-08-16 00:46:00 -05:00
parent cb1d9c4daf
commit 9858cf9800
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
engine/inc/uf/ext/opengl/commands.h
View File

@ -75,6 +75,7 @@ namespace ext {
struct {
bool enabled = false;
pod::Vector4f value = { 1, 1, 1, 1 };
const pod::Vector4f* pointer = NULL;
} color;
};
/*

13
engine/src/ext/opengl/commands.cpp
View File

@ -434,18 +434,19 @@ void ext::opengl::CommandBuffer::drawIndexed( const ext::opengl::CommandBuffer::
GL_ERROR_CHECK(glNormalPointer(normalType, drawInfo.attributes.normal.stride, normalPtr));
}
if ( drawInfo.attributes.color.pointer ) {
// prioritize uniform color for now
if ( drawInfo.color.enabled ) {
const auto& color = drawInfo.color.pointer ? *drawInfo.color.pointer : drawInfo.color.value;
colors = uf::stl::vector<pod::Vector4f>( drawInfo.descriptor.inputs.vertex.count, color );
GL_ERROR_CHECK(glColorPointer(4, GL_FLOAT, sizeof(pod::Vector4f), colors.data()));
// GL_ERROR_CHECK(glColor4f( color[0], color[1], color[2], color[3] ));
} else if ( drawInfo.attributes.color.pointer ) {
GLenum colorType = GL_UNSIGNED_BYTE;
switch ( drawInfo.attributes.color.descriptor.size / drawInfo.attributes.color.descriptor.components ) {
case sizeof(uint8_t): colorType = GL_UNSIGNED_BYTE; break;
case sizeof(float): colorType = GL_FLOAT; break;
}
GL_ERROR_CHECK(glColorPointer(drawInfo.attributes.color.descriptor.components, colorType, drawInfo.attributes.color.stride, colorPtr));
} else if ( drawInfo.color.enabled ) {
colors = uf::stl::vector<pod::Vector4f>( drawInfo.descriptor.inputs.vertex.count, drawInfo.color.value );
GL_ERROR_CHECK(glColorPointer(4, GL_FLOAT, sizeof(pod::Vector4f), &(colors[0][0])));
// GL_ERROR_CHECK(glColor4f( drawInfo.color.value[0], drawInfo.color.value[1], drawInfo.color.value[2], drawInfo.color.value[3] ));
}
if ( drawInfo.textures.primary.image && drawInfo.attributes.uv.pointer ) {

3
engine/src/ext/opengl/graphic.cpp
View File

@ -389,8 +389,9 @@ void ext::opengl::Graphic::record( CommandBuffer& commandBuffer, const GraphicDe
drawCommandInfoBase.matrices.model = &uniforms->modelView;
drawCommandInfoBase.matrices.projection = &uniforms->projection;
drawCommandInfoBase.color.pointer = &uniforms->color;
drawCommandInfoBase.color.value = uniforms->color;
drawCommandInfoBase.color.enabled = drawCommandInfoBase.color.value != pod::Vector4f{1.0f, 1.0f, 1.0f, 1.0f};
drawCommandInfoBase.color.enabled = true; // drawCommandInfoBase.color.value != pod::Vector4f{1.0f, 1.0f, 1.0f, 1.0f};
}
struct {