X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;ds=sidebyside;f=include%2Fmqo.h;h=ec7a8c952288433d7c0fe982eebf1489e1a5e871;hb=4b7b856e70fe8047f985e2598020032d0d87a672;hp=66646949f29f4c7e2f51684d286ac9085e78d3ad;hpb=131e387afb18392dca8f52fdf172067499656337;p=meshio%2Fmeshio.git diff --git a/include/mqo.h b/include/mqo.h index 6664694..ec7a8c9 100644 --- a/include/mqo.h +++ b/include/mqo.h @@ -85,7 +85,7 @@ struct Material RGBA color; float diffuse; float ambient; - float emmit; + float emit; float specular; float power; std::string texture; @@ -94,7 +94,7 @@ struct Material int vcol; Material() - : shader(0), diffuse(1), ambient(0), emmit(0), specular(0), power(0), + : shader(0), diffuse(1), ambient(0), emit(0), specular(0), power(0), vcol(0) {} @@ -111,7 +111,7 @@ inline std::ostream &operator<<(std::ostream &os, const Material &rhs) << ", color:" << rhs.color << ", diffuse:" << rhs.diffuse << ", ambient:" << rhs.ambient - << ", emmit:" << rhs.emmit + << ", emit:" << rhs.emit << ", specular:" << rhs.specular << ", power:" << rhs.power << ", texture:\"" << rhs.texture << '"' @@ -251,7 +251,8 @@ struct IO //#ifdef _WIN32 bool read(const wchar_t *path); //#endif - bool write(std::ostream &os); + bool write(binary::IWriter &writer); + bool write(const char *path); }; } // namespace mqo