asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #21355 from karroffel/gles2-multimesh-color-fix

Browse source 
[GLES2] fix multimesh byte colors
This commit is contained in:
Thomas Herzog 2018-08-24 12:06:16 +02:00 committed by GitHub
commit d53bb09fea
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
drivers/gles2/rasterizer_scene_gles2.cpp
View file

@ -1216,6 +1216,12 @@ void RasterizerSceneGLES2::_render_geometry(RenderList::Element *p_element) {
glDisableVertexAttribArray(15); // color glDisableVertexAttribArray(15); // color
glDisableVertexAttribArray(8); // custom data glDisableVertexAttribArray(8); // custom data
if (!s->attribs[VS::ARRAY_COLOR].enabled) {
glDisableVertexAttribArray(VS::ARRAY_COLOR);
glVertexAttrib4f(VS::ARRAY_COLOR, 1, 1, 1, 1);
}
glVertexAttrib4f(15, 1, 1, 1, 1); glVertexAttrib4f(15, 1, 1, 1, 1);
glVertexAttrib4f(8, 0, 0, 0, 0); glVertexAttrib4f(8, 0, 0, 0, 0);
@ -1259,7 +1265,12 @@ void RasterizerSceneGLES2::_render_geometry(RenderList::Element *p_element) {
} }
if (multi_mesh->color_floats) { if (multi_mesh->color_floats) {
glVertexAttrib4fv(15, buffer + color_ofs); if (multi_mesh->color_format == VS::MULTIMESH_COLOR_8BIT) {
uint8_t *color_data = (uint8_t *)(buffer + color_ofs);
glVertexAttrib4f(15, color_data[0] / 255.0, color_data[1] / 255.0, color_data[2] / 255.0, color_data[3] / 255.0);
} else {
glVertexAttrib4fv(15, buffer + color_ofs);
}
} }
if (multi_mesh->custom_data_floats) { if (multi_mesh->custom_data_floats) {