X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Ftexture3d.h;h=d791633d3a306ef08607016efe4b956d850f43fa;hb=be6ffe96ecb4707599fe1a6f620c348760213d46;hp=21893abc07e5fc19c4915cb34c4882086d5bdf36;hpb=160e9eea29bd10034733d59507fa1bcca36be401;p=libs%2Fgl.git diff --git a/source/core/texture3d.h b/source/core/texture3d.h index 21893abc..d791633d 100644 --- a/source/core/texture3d.h +++ b/source/core/texture3d.h @@ -31,14 +31,14 @@ public: }; protected: - unsigned width; - unsigned height; - unsigned depth; - unsigned levels; + unsigned width = 0; + unsigned height = 0; + unsigned depth = 0; + unsigned levels = 0; Texture3D(unsigned); public: - Texture3D(); + Texture3D() = default; /** Defines storage structure for the texture. If lv is zero, the number of mipmap levels is automatically determined from storage dimensions. @@ -64,8 +64,6 @@ public: storage. */ virtual void image(const Graphics::Image &, unsigned = 0); - using Texture::image; - unsigned get_width() const { return width; } unsigned get_height() const { return height; } unsigned get_depth() const { return depth; } @@ -75,7 +73,7 @@ protected: public: virtual AsyncLoader *load(IO::Seekable &, const Resources * = 0) { return 0; } - virtual std::uint64_t get_data_size() const; + virtual std::size_t get_data_size() const; virtual void unload() { } };