dmuratshin vor 9 Jahren
Ursprung
Commit
cf6e83de60

+ 2 - 2
oxygine/src/Image.cpp

@@ -735,7 +735,7 @@ namespace oxygine
         log::warning("Image. can't unpack data unknown file format");
 
         init(16, 16, TF_R8G8B8A8);
-        fill_zero();
+        fillZero();
 
         return false;
     }
@@ -824,7 +824,7 @@ namespace oxygine
     {
         OX_ASSERT(this != &dest);
         dest.init(nextPOT(_image.w), nextPOT(_image.h), _image.format);
-        dest.fill_zero();
+        dest.fillZero();
         dest.updateRegion(0, 0, _image);
     }
 

+ 3 - 0
oxygine/src/Image.h

@@ -34,7 +34,10 @@ namespace oxygine
         void convert(Image& dest, TextureFormat format);
         //void convert2pot(MemoryTexture &dest);
 
+        OXYGINE_DEPRECATED
         void fill_zero();
+
+        void fillZero() { fill(0); }
         void fill(unsigned int val);
 
         unsigned int    getSizeVRAM() const {return (unsigned int)_buffer.size();}

+ 1 - 1
oxygine/src/STDRenderer.cpp

@@ -178,7 +178,7 @@ namespace oxygine
         white->setLinearFilter(false);
 
 
-        memwhite.fill_zero();
+        memwhite.fillZero();
         invisible = IVideoDriver::instance->createTexture();
         invisible->setName("!renderer. invisible");
         invisible->init(im, false);

+ 1 - 1
oxygine/src/core/gl/NativeTextureGLES.cpp

@@ -356,7 +356,7 @@ namespace oxygine
         if (_format != data.format)
         {
             mt.init(data.w, data.h, _format);
-            mt.fill_zero();
+            mt.fillZero();
             mt.updateRegion(0, 0, data);
             data = mt.lock();
         }

+ 1 - 1
oxygine/src/res/ResAtlasGeneric.cpp

@@ -185,7 +185,7 @@ namespace oxygine
     void ResAtlasGeneric::nextAtlas(int w, int h, TextureFormat tf, atlas_data& ad, const char* name)
     {
         ad.mt.init(w, h, tf);
-        ad.mt.fill_zero();
+        ad.mt.fillZero();
 
         ad.atlas.clean();
         ad.atlas.init(w, h);