]> git.tdb.fi Git - r2c2.git/commitdiff
Texture2D::storage no longer takes border parameter
authorMikko Rasa <tdb@tdb.fi>
Mon, 6 Dec 2010 09:37:45 +0000 (09:37 +0000)
committerMikko Rasa <tdb@tdb.fi>
Mon, 6 Dec 2010 09:37:45 +0000 (09:37 +0000)
source/3d/vehicletype.cpp
source/engineer/trainview.cpp

index fc4f2d49095332c502c36434d81c8af8372d1d95..93601f75e12d56993df015f8f5de7417e493f5bc 100644 (file)
@@ -154,7 +154,7 @@ GL::Technique *VehicleType3D::create_technique(const map<string, string> &params
        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 };
index f282b4e07487c6ad24f479bc02a8de7fb39b0ff5..805fec5cfdf375f96dcd56bcbe8ca8d70c8ec3ca 100644 (file)
@@ -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);