Object properties remove colors

doc/lua_api.md

@@ -9213,9 +9213,6 @@ Player properties need to be saved manually.
     -- "mesh" requires one texture for each mesh buffer/material (in order)
     -- Deprecated usage of "wielditem" expects 'textures = {itemname}' (see 'visual' above).
 
-    colors = {},
-    -- Number of required colors depends on visual
-
     use_texture_alpha = false,
     -- Use texture's alpha channel.
     -- Excludes "upright_sprite" and "wielditem".

src/client/content_cao.cpp

@@ -1404,8 +1404,8 @@ void GenericCAO::updateTextures(std::string mod)
 				});
 			}
 			// Set mesh color (only if lighting is disabled)
-			if (!m_prop.colors.empty() && m_prop.glow < 0)
-				setMeshColor(mesh, m_prop.colors[0]);
+			if (m_prop.glow < 0)
+				setMeshColor(mesh, {255, 255, 255, 255});
 		}
 	}
 	// Prevent showing the player after changing texture
@@ -1573,7 +1573,6 @@ bool GenericCAO::visualExpiryRequired(const ObjectProperties &new_) const
 		old.visual != new_.visual ||
 		old.visual_size != new_.visual_size ||
 		old.wield_item != new_.wield_item ||
-		old.colors != new_.colors ||
 		(uses_legacy_texture && old.textures != new_.textures);
 }
 

src/object_properties.cpp

@@ -16,7 +16,6 @@ static const video::SColor NULL_BGCOLOR{0, 1, 1, 1};
 ObjectProperties::ObjectProperties()
 {
 	textures.emplace_back("no_texture.png");
-	colors.emplace_back(255,255,255,255);
 }
 
 std::string ObjectProperties::dump() const
@@ -35,12 +34,6 @@ std::string ObjectProperties::dump() const
 		os << "\"" << texture << "\" ";
 	}
 	os << "]";
-	os << ", colors=[";
-	for (const video::SColor &color : colors) {
-		os << "\"" << color.getAlpha() << "," << color.getRed() << ","
-			<< color.getGreen() << "," << color.getBlue() << "\" ";
-	}
-	os << "]";
 	os << ", spritediv=" << spritediv;
 	os << ", initial_sprite_basepos=" << initial_sprite_basepos;
 	os << ", is_visible=" << is_visible;
@@ -75,7 +68,7 @@ static auto tie(const ObjectProperties &o)
 {
 	// Make sure to add new members to this list!
 	return std::tie(
-	o.textures, o.colors, o.collisionbox, o.selectionbox, o.visual, o.mesh,
+	o.textures, o.collisionbox, o.selectionbox, o.visual, o.mesh,
 	o.damage_texture_modifier, o.nametag, o.infotext, o.wield_item, o.visual_size,
 	o.nametag_color, o.nametag_bgcolor, o.spritediv, o.initial_sprite_basepos,
 	o.stepheight, o.automatic_rotate, o.automatic_face_movement_dir_offset,
@@ -148,10 +141,7 @@ void ObjectProperties::serialize(std::ostream &os) const
 	writeU8(os, makes_footstep_sound);
 	writeF32(os, automatic_rotate);
 	os << serializeString16(mesh);
-	writeU16(os, colors.size());
-	for (video::SColor color : colors) {
-		writeARGB8(os, color);
-	}
+	writeU16(os, 0); // colors field got removed
 	writeU8(os, collideWithObjects);
 	writeF32(os, stepheight);
 	writeU8(os, automatic_face_movement_dir);
@@ -210,11 +200,7 @@ void ObjectProperties::deSerialize(std::istream &is)
 	makes_footstep_sound = readU8(is);
 	automatic_rotate = readF32(is);
 	mesh = deSerializeString16(is);
-	colors.clear();
-	u32 color_count = readU16(is);
-	for (u32 i = 0; i < color_count; i++){
-		colors.push_back(readARGB8(is));
-	}
+	readU16(is); // colors field got removed
 	collideWithObjects = readU8(is);
 	stepheight = readF32(is);
 	automatic_face_movement_dir = readU8(is);

src/object_properties.h

@@ -16,7 +16,6 @@ struct ObjectProperties
 	/* member variables ordered roughly by size */
 
 	std::vector<std::string> textures;
-	std::vector<video::SColor> colors;
 	// Values are BS=1
 	aabb3f collisionbox = aabb3f(-0.5f, -0.5f, -0.5f, 0.5f, 0.5f, 0.5f);
 	// Values are BS=1

src/script/common/c_content.cpp

@@ -370,18 +370,6 @@ void read_object_properties(lua_State *L, int index,
 	}
 	lua_pop(L, 1);
 
-	lua_getfield(L, -1, "colors");
-	if (lua_istable(L, -1)) {
-		int table = lua_gettop(L);
-		prop->colors.clear();
-		for (lua_pushnil(L); lua_next(L, table); lua_pop(L, 1)) {
-			video::SColor color(255, 255, 255, 255);
-			read_color(L, -1, &color);
-			prop->colors.push_back(color);
-		}
-	}
-	lua_pop(L, 1);
-
 	lua_getfield(L, -1, "spritediv");
 	if(lua_istable(L, -1))
 		prop->spritediv = read_v2s16(L, -1);
@@ -488,14 +476,6 @@ void push_object_properties(lua_State *L, const ObjectProperties *prop)
 	}
 	lua_setfield(L, -2, "textures");
 
-	lua_createtable(L, prop->colors.size(), 0);
-	i = 1;
-	for (const video::SColor &color : prop->colors) {
-		push_ARGB8(L, color);
-		lua_rawseti(L, -2, i++);
-	}
-	lua_setfield(L, -2, "colors");
-
 	push_v2s16(L, prop->spritediv);
 	lua_setfield(L, -2, "spritediv");
 	push_v2s16(L, prop->initial_sprite_basepos);

src/server/player_sao.cpp

@@ -31,8 +31,6 @@ PlayerSAO::PlayerSAO(ServerEnvironment *env_, RemotePlayer *player_, session_t p
 	m_prop.textures.clear();
 	m_prop.textures.emplace_back("player.png");
 	m_prop.textures.emplace_back("player_back.png");
-	m_prop.colors.clear();
-	m_prop.colors.emplace_back(255, 255, 255, 255);
 	m_prop.spritediv = v2s16(1,1);
 	m_prop.eye_height = 1.625f;
 	// End of default appearance