X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Ftexturecube.cpp;h=2a15eb1bec3359a3f665e4d48c4f62392644b41f;hb=4a639bc5e80fce2467855a9e8f4c6cdff2f0adc0;hp=4bbf7e6f5d07da4e1f322775124e1b3eefe9de79;hpb=6065f6622cc275dc0b20baaf7c267e71169d18f3;p=libs%2Fgl.git diff --git a/source/core/texturecube.cpp b/source/core/texturecube.cpp index 4bbf7e6f..2a15eb1b 100644 --- a/source/core/texturecube.cpp +++ b/source/core/texturecube.cpp @@ -13,17 +13,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 +23,7 @@ Vector3 TextureCube::directions[6] = Vector3(0, 0, -1) }; -unsigned TextureCube::orientations[12] = +const unsigned TextureCube::orientations[12] = { 5, 3, 4, 3, @@ -45,12 +35,18 @@ unsigned TextureCube::orientations[12] = TextureCube::TextureCube(): Texture(GL_TEXTURE_CUBE_MAP), - size(0), - allocated(0) + size(0) { static Require _req(ARB_texture_cube_map); if(ARB_seamless_cube_map) - glEnable(GL_TEXTURE_CUBE_MAP_SEAMLESS); + { + 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) @@ -69,74 +65,39 @@ void TextureCube::storage(PixelFormat fmt, unsigned sz, unsigned lv) levels = get_n_levels(); if(lv>0) levels = min(levels, lv); -} - -void TextureCube::allocate(unsigned level) -{ - if(size==0) - throw invalid_operation("TextureCube::allocate"); - if(level>=levels) - throw invalid_argument("TextureCube::allocate"); - if(allocated&(64<(j)), i, gl_fmt, lv_size, lv_size, 0, comp, type, 0); + } + glTexParameteri(target, GL_TEXTURE_MAX_LEVEL, levels-1); } + + apply_swizzle(); } 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) throw out_of_range("TextureCube::sub_image"); - allocate(level); - + GLenum gl_face = get_gl_cube_face(face); 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); + glTextureSubImage3D(id, level, x, y, face, wd, ht, 1, comp, type, data); else { bind_scratch(); - glTexSubImage2D(face, level, x, y, wd, ht, comp, type, data); + glTexSubImage2D(gl_face, level, x, y, wd, ht, comp, type, data); } } @@ -190,7 +150,7 @@ void TextureCube::image(const Graphics::Image &img, unsigned lv) 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(static_cast(i), 0, pixels+i*face_size); } unsigned TextureCube::get_n_levels() const @@ -205,40 +165,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) @@ -312,6 +251,20 @@ void TextureCube::Loader::storage_levels(PixelFormat fmt, unsigned s, unsigned l } +GLenum get_gl_cube_face(TextureCubeFace face) +{ + switch(face) + { + case POSITIVE_X: return GL_TEXTURE_CUBE_MAP_POSITIVE_X; + case NEGATIVE_X: return GL_TEXTURE_CUBE_MAP_NEGATIVE_X; + case POSITIVE_Y: return GL_TEXTURE_CUBE_MAP_POSITIVE_Y; + case NEGATIVE_Y: return GL_TEXTURE_CUBE_MAP_NEGATIVE_Y; + case POSITIVE_Z: return GL_TEXTURE_CUBE_MAP_POSITIVE_Z; + case NEGATIVE_Z: return GL_TEXTURE_CUBE_MAP_NEGATIVE_Z; + default: throw invalid_argument("get_gl_cube_face"); + } +} + void operator>>(const LexicalConverter &conv, TextureCubeFace &face) { const string &str = conv.get();