string kind = name.substr(1, colon-1);
map<string, string> params;
- params["length"] = lexical_cast(type.get_length()*1000);
- params["width"] = lexical_cast(type.get_width()*1000);
- params["height"] = lexical_cast(type.get_height()*1000);
+ params["length"] = lexical_cast<string>(type.get_length()*1000);
+ params["width"] = lexical_cast<string>(type.get_width()*1000);
+ params["height"] = lexical_cast<string>(type.get_height()*1000);
if(colon!=string::npos)
{
string::size_type start = colon+1;
}
}
else
- return catalogue.get<GL::Object>(name);
+ return &catalogue.get<GL::Object>(name);
}
return ptr;
}
tex->storage(GL::RGB, 2, 1);
tex->set_min_filter(GL::NEAREST);
tex->set_mag_filter(GL::NEAREST);
- unsigned char data[6] = { color>>16, color>>8, color, color2>>16, color2>>8, color2 };
+ unsigned char data[6];
+ data[0] = color>>16; data[1] = color>>8; data[2] = color;
+ data[3] = color2>>16; data[4] = color2>>8; data[5] = color2;
tex->image(0, GL::RGB, GL::UNSIGNED_BYTE, data);
pass.set_texture(0, tex);