Reorder functions in Sampler

diff --git a/source/core/sampler.cpp b/source/core/sampler.cpp
index 7560029c64642cdef978b147c9d2be5e4263bafe..d45dee54242b9f6ef60b9c2fd7bacdc811a3b2ce 100644 (file)
--- a/source/core/sampler.cpp
+++ b/source/core/sampler.cpp
@@ -46,13 +46,6 @@ void Sampler::set_max_anisotropy(float a)
                dirty_params |= MAX_ANISOTROPY;
 }
 
-void Sampler::set_wrap(TextureWrap w)
-{
-       set_wrap_s(w);
-       set_wrap_t(w);
-       set_wrap_r(w);
-}
-
 void Sampler::set_wrap_s(TextureWrap w)
 {
        wrap_s = w;
@@ -71,6 +64,13 @@ void Sampler::set_wrap_r(TextureWrap w)
        dirty_params |= WRAP_R;
 }
 
+void Sampler::set_wrap(TextureWrap w)
+{
+       set_wrap_s(w);
+       set_wrap_t(w);
+       set_wrap_r(w);
+}
+
 void Sampler::set_border_color(const Color &c)
 {
        border_color = c;

diff --git a/source/core/sampler.h b/source/core/sampler.h
index 7cf3d83a7b0915481eef1417e2fe48c0a1e8bcee..c9f8ec963bd462ea3bf978a3990b0ee481d55986 100644 (file)
--- a/source/core/sampler.h
+++ b/source/core/sampler.h
@@ -125,15 +125,16 @@ public:
        than 1, filtering will consider more than than four samples when the texture
        is drawn at an oblique angle. */
        void set_max_anisotropy(float);
-       float get_max_anisotropy() const { return max_anisotropy; }
 
-       /** Sets the wrapping mode for all coordinates. */
-       void set_wrap(TextureWrap);
+       float get_max_anisotropy() const { return max_anisotropy; }
 
        void set_wrap_s(TextureWrap);
        void set_wrap_t(TextureWrap);
        void set_wrap_r(TextureWrap);
 
+       /** Sets the wrapping mode for all coordinates. */
+       void set_wrap(TextureWrap);
+
        /** Sets the border color for CLAMP_TO_BORDER wrap mode. */
        void set_border_color(const Color &);