frame_transform transform;\r
};\r
\r
-struct layer\r
-{\r
- std::vector<item> items;\r
- blend_mode::type blend_mode;\r
-\r
- layer(blend_mode::type blend_mode) : blend_mode(blend_mode)\r
- {\r
- }\r
-};\r
+typedef std::pair<blend_mode::type, std::vector<item>> layer;\r
\r
class image_renderer\r
{\r
\r
BOOST_FOREACH(auto& layer, upper)\r
{\r
- boost::remove_erase_if(layer.items, [](const item& item){return !(item.transform.field_mode & field_mode::upper);});\r
- BOOST_FOREACH(auto& item, layer.items)\r
+ boost::remove_erase_if(layer.second, [](const item& item){return !(item.transform.field_mode & field_mode::upper);});\r
+ BOOST_FOREACH(auto& item, layer.second)\r
item.transform.field_mode = field_mode::upper;\r
}\r
\r
BOOST_FOREACH(auto& layer, lower)\r
{\r
- boost::remove_erase_if(layer.items, [](const item& item){return !(item.transform.field_mode & field_mode::lower);});\r
- BOOST_FOREACH(auto& item, layer.items)\r
+ boost::remove_erase_if(layer.second, [](const item& item){return !(item.transform.field_mode & field_mode::lower);});\r
+ BOOST_FOREACH(auto& item, layer.second)\r
item.transform.field_mode = field_mode::lower;\r
}\r
\r
safe_ptr<device_buffer>& draw_buffer,\r
std::shared_ptr<device_buffer>& layer_key_buffer)\r
{ \r
- if(layer.items.empty())\r
+ if(layer.second.empty())\r
return;\r
\r
std::shared_ptr<device_buffer> local_key_buffer;\r
std::shared_ptr<device_buffer> local_mix_buffer;\r
\r
- if(layer.blend_mode != blend_mode::normal && layer.items.size() > 1)\r
+ if(layer.first != blend_mode::normal && layer.second.size() > 1)\r
{\r
auto layer_draw_buffer = create_device_buffer(4);\r
\r
- BOOST_FOREACH(auto& item, layer.items)\r
+ BOOST_FOREACH(auto& item, layer.second)\r
draw_item(std::move(item), layer_draw_buffer, layer_key_buffer, local_key_buffer, local_mix_buffer); \r
\r
draw_device_buffer(layer_draw_buffer, std::move(local_mix_buffer), blend_mode::normal); \r
- draw_device_buffer(draw_buffer, std::move(layer_draw_buffer), layer.blend_mode);\r
+ draw_device_buffer(draw_buffer, std::move(layer_draw_buffer), layer.first);\r
}\r
else // fast path\r
{\r
- BOOST_FOREACH(auto& item, layer.items) \r
+ BOOST_FOREACH(auto& item, layer.second) \r
draw_item(std::move(item), draw_buffer, layer_key_buffer, local_key_buffer, local_mix_buffer); \r
\r
draw_device_buffer(draw_buffer, std::move(local_mix_buffer), blend_mode::normal);\r
\r
void begin_layer(blend_mode::type blend_mode)\r
{\r
- layers_.push_back(layer(blend_mode));\r
+ layers_.push_back(std::make_pair(blend_mode, std::vector<item>()));\r
}\r
\r
void begin(core::basic_frame& frame)\r
item.textures = frame.get_textures();\r
item.transform = transform_stack_.back();\r
\r
- layers_.back().items.push_back(item);\r
+ layers_.back().second.push_back(item);\r
}\r
\r
void end()\r