X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Fsampler.h;h=ff9201860e69bc4c7cc6ed8af2dc512940ac5615;hb=2b2676392aff2eb6b38c3e463cc67f4d67a4ef8b;hp=e1e9bec5d60332e5331cd6e1e52e421c5256e8e9;hpb=7aaec9a70b8d7733429bec043f8e33e02956f266;p=libs%2Fgl.git

diff --git a/source/core/sampler.h b/source/core/sampler.h
index e1e9bec5..ff920186 100644
--- a/source/core/sampler.h
+++ b/source/core/sampler.h
@@ -2,6 +2,7 @@
 #define MSP_GL_SAMPLER_H_
 
 #include <msp/datafile/objectloader.h>
+#include "color.h"
 #include "gl.h"
 #include "predicate.h"
 
@@ -38,6 +39,9 @@ enum TextureWrap
 	/// Extend the texels at the edge of the texture to infinity
 	CLAMP_TO_EDGE = GL_CLAMP_TO_EDGE,
 
+	/// Sampling outside the texture will return border color
+	CLAMP_TO_BORDER = GL_CLAMP_TO_BORDER,
+
 	/// Tile the texture, with every other repetition mirrored
 	MIRRORED_REPEAT = GL_MIRRORED_REPEAT
 };
@@ -69,6 +73,8 @@ public:
 	private:
 		void init();
 
+		void border_color(float, float, float, float);
+		void compare(Predicate);
 		void filter(TextureFilter);
 		void mag_filter(TextureFilter);
 		void max_anisotropy(float);
@@ -88,30 +94,30 @@ private:
 		WRAP_S = 8,
 		WRAP_T = 16,
 		WRAP_R = 32,
-		COMPARE = 64
+		BORDER_COLOR = 64,
+		COMPARE = 128
 	};
 
 	unsigned id;
-	const Texture *owner;
 	TextureFilter min_filter;
 	TextureFilter mag_filter;
 	float max_anisotropy;
 	TextureWrap wrap_s;
 	TextureWrap wrap_t;
 	TextureWrap wrap_r;
+	Color border_color;
 	bool compare;
 	Predicate cmp_func;
 	mutable int dirty_params;
 
 public:
 	Sampler();
-	Sampler(const Texture &);
-private:
-	void init();
 
-	void update_parameter(int) const;
+private:
+	void update() const;
 	void set_parameter_i(unsigned, int) const;
 	void set_parameter_f(unsigned, float) const;
+	void set_parameter_fv(unsigned, const float *) const;
 
 public:
 	void set_min_filter(TextureFilter);
@@ -134,6 +140,9 @@ public:
 	void set_wrap_t(TextureWrap);
 	void set_wrap_r(TextureWrap);
 
+	void set_border_color(const Color &);
+	const Color &get_border_color() const { return border_color; }
+
 	/** Disables depth comparison. */
 	void disable_compare();
 
@@ -146,14 +155,11 @@ public:
 	bool is_compare_enabled() const { return compare; }
 	Predicate get_compare_function() const { return cmp_func; }
 
-	void bind() const { bind_to(0); }
-	void bind_to(unsigned) const;
+	void refresh() const { if(dirty_params) update(); }
 
-	static const Sampler *current(unsigned = 0);
-	static void unbind() { unbind_from(0); }
-	static void unbind_from(unsigned);
+	unsigned get_id() const { return id; }
 
-	void unload();
+	void set_debug_name(const std::string &);
 };