Give meshes a higher priority when loading

[libs/gl.git] / source / texturecube.cpp

diff --git a/source/texturecube.cpp b/source/texturecube.cpp
index b071e8545df50ce665b1476b0683058a00af0590..37390a853612523e503889230f030f2a70d2b73d 100644 (file)
--- a/source/texturecube.cpp
+++ b/source/texturecube.cpp
@@ -23,6 +23,7 @@ Vector3 TextureCube::directions[6] =
 
 TextureCube::TextureCube():
        Texture(GL_TEXTURE_CUBE_MAP),
+       ifmt(RGB),
        size(0),
        allocated(0)
 {
@@ -66,6 +67,8 @@ void TextureCube::image(TextureCubeFace face, unsigned level, PixelFormat fmt, D
        allocated |= 1<<level;
        if(gen_mipmap && level==0)
        {
+               // TODO Only do this once all faces are created
+               auto_generate_mipmap();
                for(; s; s>>=1, ++level) ;
                allocated |= (1<<level)-1;
        }
@@ -166,6 +169,11 @@ Vector3 TextureCube::get_texel_direction(TextureCubeFace face, unsigned u, unsig
        return fv+s*sv+t*tv;
 }
 
+UInt64 TextureCube::get_data_size() const
+{
+       return id ? size*size*6*get_pixel_size(ifmt) : 0;
+}
+
 
 TextureCube::Loader::Loader(TextureCube &t):
        DataFile::DerivedObjectLoader<TextureCube, Texture::Loader>(t)