From: Mikko Rasa Date: Mon, 6 Dec 2010 09:37:45 +0000 (+0000) Subject: Texture2D::storage no longer takes border parameter X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=735a3d70f1bbfa34d4a2709f2e24b70acd9d7ee7;p=r2c2.git Texture2D::storage no longer takes border parameter --- diff --git a/source/3d/vehicletype.cpp b/source/3d/vehicletype.cpp index fc4f2d4..93601f7 100644 --- a/source/3d/vehicletype.cpp +++ b/source/3d/vehicletype.cpp @@ -154,7 +154,7 @@ GL::Technique *VehicleType3D::create_technique(const map ¶ms mat->set_diffuse(GL::Color(1)); pass.set_material(mat); GL::Texture2D *tex = new GL::Texture2D; - tex->storage(GL::RGB, 2, 1, 0); + tex->storage(GL::RGB, 2, 1); tex->set_min_filter(GL::NEAREST); tex->set_mag_filter(GL::NEAREST); unsigned char data[6] = { color>>16, color>>8, color, color2>>16, color2>>8, color2 }; diff --git a/source/engineer/trainview.cpp b/source/engineer/trainview.cpp index f282b4e..805fec5 100644 --- a/source/engineer/trainview.cpp +++ b/source/engineer/trainview.cpp @@ -27,7 +27,7 @@ TrainView::TrainView(Engineer &e, const Train &t): set_size(300, 330); tex.set_min_filter(GL::LINEAR); - tex.storage(GL::RGB, 280, 280, 0); + tex.storage(GL::RGB, 280, 280); tex.image(0, GL::RGB, GL::UNSIGNED_BYTE, 0); fbo.attach(GL::COLOR_ATTACHMENT0, tex, 0); depth.storage(GL::DEPTH_COMPONENT, 280, 280);