X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftexturecube.cpp;h=ef9d25297a4285c5ec630cd65e3237c6cddbf471;hb=2b779717e42b514210f7128cf9aee2276650e003;hp=a5874a6a66bbe9c64cbbec58e7e1477761c5e8e7;hpb=41b4cb3002f3551ce1bd6fdf15994ee7bc523788;p=libs%2Fgl.git diff --git a/source/texturecube.cpp b/source/texturecube.cpp index a5874a6a..ef9d2529 100644 --- a/source/texturecube.cpp +++ b/source/texturecube.cpp @@ -54,7 +54,7 @@ void TextureCube::image(TextureCubeFace face, unsigned level, PixelFormat fmt, D unsigned s = get_level_size(level); if(s==0) - throw invalid_argument("TextureCube::image"); + throw out_of_range("TextureCube::image"); Bind _bind(this, true); glTexImage2D(face, level, ifmt, s, s, 0, fmt, type, data); @@ -136,7 +136,7 @@ Vector3 TextureCube::get_texel_direction(TextureCubeFace face, unsigned u, unsig const Vector3 &fv = get_face_direction(face); const Vector3 &sv = get_s_direction(face); const Vector3 &tv = get_t_direction(face); - return Vector3(fv.x+s*sv.x, fv.y+t*tv.y, fv.z+s*sv.z+t*tv.z); + return fv+s*sv+t*tv; } } // namespace GL