X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fcore%2Ftexturecube.cpp;h=0e0a1fc9178dca4ebd8b4cfc55bd52185b5e5b51;hp=460c109e91879b986129b4ea01ec36a6369c00e2;hb=df9119a9bf2d348a513c515ed92953353da97b54;hpb=cf1676a405c2a81413fd565bc83331b7a8778eb5 diff --git a/source/core/texturecube.cpp b/source/core/texturecube.cpp index 460c109e..0e0a1fc9 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,22 +29,6 @@ unsigned TextureCube::orientations[12] = 1, 3 }; -TextureCube::TextureCube(): - Texture(GL_TEXTURE_CUBE_MAP), - size(0) -{ - static Require _req(ARB_texture_cube_map); - if(ARB_seamless_cube_map) - { - static bool seamless_init = false; - if(!seamless_init) - { - glEnable(GL_TEXTURE_CUBE_MAP_SEAMLESS); - seamless_init = true; - } - } -} - void TextureCube::storage(PixelFormat fmt, unsigned sz, unsigned lv) { if(size>0) @@ -76,32 +46,15 @@ void TextureCube::storage(PixelFormat fmt, unsigned sz, unsigned lv) if(lv>0) levels = min(levels, lv); - GLenum gl_fmt = get_gl_pixelformat(storage_fmt); - if(ARB_texture_storage) - { - if(ARB_direct_state_access) - glTextureStorage2D(id, levels, gl_fmt, size, size); - else - { - bind_scratch(); - glTexStorage2D(target, levels, gl_fmt, size, size); - } - } - else - { - bind_scratch(); - GLenum comp = get_gl_components(get_components(storage_fmt)); - GLenum type = get_gl_type(get_component_type(storage_fmt)); - for(unsigned i=0; i(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) @@ -110,22 +63,14 @@ void TextureCube::image(TextureCubeFace face, unsigned level, const void *data) return sub_image(face, level, 0, 0, lsz, lsz, data); } -void TextureCube::sub_image(TextureCubeFace face, unsigned level, int x, int y, unsigned wd, unsigned ht, const void *data) +void TextureCube::sub_image(TextureCubeFace face, unsigned level, unsigned x, unsigned y, unsigned wd, unsigned ht, const void *data) { if(size==0) throw invalid_operation("TextureCube::sub_image"); - if(level>=levels) + if(level>=levels || x>size || x+wd>size || y>size || y+ht>size) throw out_of_range("TextureCube::sub_image"); - 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); - } + TextureCubeBackend::sub_image(face, level, x, y, wd, ht, data); } void TextureCube::image(TextureCubeFace face, const Graphics::Image &img) @@ -135,9 +80,7 @@ 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()); } @@ -150,16 +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); + image(0, img.get_pixels()); } unsigned TextureCube::get_n_levels() const @@ -174,40 +113,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)