X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Ftexturecube.cpp;h=bfa63873b2e188f2f339940fc48bf09e4c38034e;hb=11a5d4f2a35dfdcf61e16d4fcfba22e20ea6a3db;hp=6eaa3a4470445d3221afeba689a86f508fb76bc0;hpb=4e9fe48180c7b4646ac2591e172de61f7a693b32;p=libs%2Fgl.git diff --git a/source/core/texturecube.cpp b/source/core/texturecube.cpp index 6eaa3a44..bfa63873 100644 --- a/source/core/texturecube.cpp +++ b/source/core/texturecube.cpp @@ -1,8 +1,4 @@ #include -#include -#include -#include -#include #include #include #include "error.h" @@ -13,17 +9,7 @@ using namespace std; namespace Msp { namespace GL { -TextureCubeFace TextureCube::face_order[6] = -{ - POSITIVE_X, - NEGATIVE_X, - POSITIVE_Y, - NEGATIVE_Y, - POSITIVE_Z, - NEGATIVE_Z -}; - -Vector3 TextureCube::directions[6] = +const Vector3 TextureCube::directions[6] = { Vector3(1, 0, 0), Vector3(-1, 0, 0), @@ -33,7 +19,7 @@ Vector3 TextureCube::directions[6] = Vector3(0, 0, -1) }; -unsigned TextureCube::orientations[12] = +const unsigned TextureCube::orientations[12] = { 5, 3, 4, 3, @@ -43,21 +29,11 @@ unsigned TextureCube::orientations[12] = 1, 3 }; -TextureCube::TextureCube(): - Texture(GL_TEXTURE_CUBE_MAP), - size(0), - allocated(0) -{ - static Require _req(ARB_texture_cube_map); - if(ARB_seamless_cube_map) - glEnable(GL_TEXTURE_CUBE_MAP_SEAMLESS); -} - void TextureCube::storage(PixelFormat fmt, unsigned sz, unsigned lv) { if(size>0) { - if(fmt!=format || sz!=size || (lv && lv!=levels)) + if(fmt!=format || sz!=size || (lv && lv!=n_levels)) throw incompatible_data("TextureCube::storage"); return; } @@ -66,111 +42,35 @@ void TextureCube::storage(PixelFormat fmt, unsigned sz, unsigned lv) set_format(fmt); size = sz; - levels = get_n_levels(); + n_levels = count_levels(size); if(lv>0) - levels = min(levels, lv); + n_levels = min(n_levels, lv); + + allocate(); } -void TextureCube::allocate(unsigned level) +void TextureCube::image(unsigned level, const void *data) { - if(size==0) - throw invalid_operation("TextureCube::allocate"); - if(level>=levels) - throw invalid_argument("TextureCube::allocate"); - if(allocated&(64<(data); + unsigned face_size = size*size*get_pixel_size(storage_fmt); + for(unsigned i=0; i<6; ++i) + image(static_cast(i), level, pixels+i*face_size); } void TextureCube::image(TextureCubeFace face, unsigned level, const void *data) { - if(size==0) - throw invalid_operation("TextureCube::image"); - if(level>=levels) - throw out_of_range("TextureCube::image"); - unsigned lsz = get_level_size(level); - - if(ARB_texture_storage) - return sub_image(face, level, 0, 0, lsz, lsz, data); - - if(!allocated) - { - glTexParameteri(target, GL_TEXTURE_MAX_LEVEL, levels-1); - apply_swizzle(); - } - - GLenum fmt = get_gl_pixelformat(storage_fmt); - GLenum comp = get_gl_components(get_components(storage_fmt)); - GLenum type = get_gl_type(get_component_type(storage_fmt)); - glTexImage2D(face, level, fmt, lsz, lsz, 0, comp, type, data); - - if(level==0) - { - allocated |= 1<=levels) + if(level>=n_levels || x>size || x+wd>size || y>size || y+ht>size) throw out_of_range("TextureCube::sub_image"); - allocate(level); - - GLenum comp = get_gl_components(get_components(storage_fmt)); - GLenum type = get_gl_type(get_component_type(storage_fmt)); - if(ARB_direct_state_access) - glTextureSubImage3D(id, level, x, y, get_face_index(face), wd, ht, 1, comp, type, data); - else - { - bind_scratch(); - glTexSubImage2D(face, level, x, y, wd, ht, comp, type, data); - } -} - -void TextureCube::sub_image(TextureCubeFace face, unsigned level, int x, int y, unsigned wd, unsigned ht, PixelComponents comp, DataType type, const void *data) -{ - if(comp!=get_components(format) || type!=get_component_type(format)) - throw incompatible_data("TextureCube::subimage"); - sub_image(face, level, x, y, wd, ht, data); + TextureCubeBackend::sub_image(face, level, x, y, wd, ht, data); } void TextureCube::image(TextureCubeFace face, const Graphics::Image &img) @@ -180,17 +80,10 @@ void TextureCube::image(TextureCubeFace face, const Graphics::Image &img) if(w!=h) throw incompatible_data("TextureCube::image"); - PixelFormat fmt = pixelformat_from_image(img); - storage(make_pixelformat(get_components(fmt), get_component_type(fmt), use_srgb_format), w); - + storage(pixelformat_from_image(img, use_srgb_format), w); image(face, 0, img.get_pixels()); } -void TextureCube::image(TextureCubeFace face, const Graphics::Image &img, bool) -{ - image(face, img); -} - void TextureCube::image(const Graphics::Image &img, unsigned lv) { unsigned w = img.get_width(); @@ -200,23 +93,12 @@ void TextureCube::image(const Graphics::Image &img, unsigned lv) throw incompatible_data("TextureCube::image"); h /= 6; - PixelFormat fmt = pixelformat_from_image(img); if(size==0) - storage(make_pixelformat(get_components(fmt), get_component_type(fmt), use_srgb_format), w, lv); + storage(pixelformat_from_image(img, use_srgb_format), w, lv); else if(w!=size || h!=size) throw incompatible_data("TextureCube::image"); - const char *pixels = reinterpret_cast(img.get_pixels()); - unsigned face_size = img.get_stride()*size; - for(unsigned i=0; i<6; ++i) - image(enumerate_faces(i), 0, pixels+i*face_size); -} - -unsigned TextureCube::get_n_levels() const -{ - unsigned n = 0; - for(unsigned s=size; s; s>>=1, ++n) ; - return n; + image(0, img.get_pixels()); } unsigned TextureCube::get_level_size(unsigned level) const @@ -224,40 +106,19 @@ unsigned TextureCube::get_level_size(unsigned level) const return size>>level; } -TextureCubeFace TextureCube::enumerate_faces(unsigned i) -{ - if(i>=6) - throw out_of_range("TextureCube::enumerate_faces"); - return face_order[i]; -} - -unsigned TextureCube::get_face_index(TextureCubeFace face) -{ - switch(face) - { - case POSITIVE_X: return 0; - case NEGATIVE_X: return 1; - case POSITIVE_Y: return 2; - case NEGATIVE_Y: return 3; - case POSITIVE_Z: return 4; - case NEGATIVE_Z: return 5; - default: throw invalid_argument("TextureCube::get_face_index"); - } -} - const Vector3 &TextureCube::get_face_direction(TextureCubeFace face) { - return directions[get_face_index(face)]; + return directions[face]; } const Vector3 &TextureCube::get_s_direction(TextureCubeFace face) { - return directions[orientations[get_face_index(face)*2]]; + return directions[orientations[face*2]]; } const Vector3 &TextureCube::get_t_direction(TextureCubeFace face) { - return directions[orientations[get_face_index(face)*2+1]]; + return directions[orientations[face*2+1]]; } Vector3 TextureCube::get_texel_direction(TextureCubeFace face, unsigned u, unsigned v) @@ -270,11 +131,6 @@ 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(storage_fmt) : 0; -} - TextureCube::Loader::Loader(TextureCube &t): DataFile::DerivedObjectLoader(t)