Skip to content
Permalink
Browse files

- Clear colors when reading property info.

- Set vertex colors on upright_sprites.
  • Loading branch information...
basicer authored and sfan5 committed Oct 22, 2017
1 parent 8037eda commit 787cd15c14b65f50b06c6b9ccecf28e937318430
Showing with 3 additions and 0 deletions.
  1. +2 −0 src/content_cao.cpp
  2. +1 −0 src/object_properties.cpp
@@ -1134,10 +1134,12 @@ void GenericCAO::updateTextures(std::string mod)
buf->getMaterial().AmbientColor = m_prop.colors[1];
buf->getMaterial().DiffuseColor = m_prop.colors[1];
buf->getMaterial().SpecularColor = m_prop.colors[1];
setMeshColor(mesh, m_prop.colors[1]);
} else if (!m_prop.colors.empty()) {
buf->getMaterial().AmbientColor = m_prop.colors[0];
buf->getMaterial().DiffuseColor = m_prop.colors[0];
buf->getMaterial().SpecularColor = m_prop.colors[0];
setMeshColor(mesh, m_prop.colors[0]);
}

buf->getMaterial().setFlag(video::EMF_TRILINEAR_FILTER, use_trilinear_filter);
@@ -145,6 +145,7 @@ void ObjectProperties::deSerialize(std::istream &is)
makes_footstep_sound = readU8(is);
automatic_rotate = readF1000(is);
mesh = deSerializeString(is);
colors.clear();
u32 color_count = readU16(is);
for (u32 i = 0; i < color_count; i++){
colors.push_back(readARGB8(is));

0 comments on commit 787cd15

Please sign in to comment.
You can’t perform that action at this time.