New class CachedScriptableMask: like CachedScriptableImage, only containing an AlphaMask instead of an Image/Bitmap.

Use CachedScriptableMask for all masks.

TODO: This introduces some duplicate code in ValueViewers that could be fixed by moving mask to the Style base class.

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@1182 0fc631ac-6414-0410-93d0-97cfa31319b6

src/script/image.hpp

@@ -15,6 +15,8 @@
 #include <script/scriptable.hpp>
 #include <gfx/generated_image.hpp>
 
+class CachedScriptableMask;
+
 // ----------------------------------------------------------------------------- : ScriptableImage
 
 /// An image that can also be scripted
@@ -49,9 +51,10 @@ class ScriptableImage {
 	
 	/// Can this be safely generated from another thread?
 	inline bool threadSafe() const { return !value || value->threadSafe(); }
-	
 	/// Is this image specific to the set (the local_package)?
 	inline bool local() const { return value && value->local(); }
+	/// Is this image blank?
+	inline bool isBlank() const { return !value || value->isBlank(); }
 	
 	/// Get access to the script, be careful
 	inline Script& getMutableScript() { return script.getMutableScript(); }
@@ -89,7 +92,7 @@ class CachedScriptableImage : public ScriptableImage {
 	 *  Optionally, an alpha mask is applied to the image.
 	 */
 	void generateCached(const GeneratedImage::Options& img_options,
-	                    Image* mask,
+	                    CachedScriptableMask* mask,
 	                    ImageCombine* combine, wxBitmap* bitmap, wxImage* image, RealSize* size);
 	
 	/// Update the script, returns true if the value has changed
@@ -105,5 +108,29 @@ class CachedScriptableImage : public ScriptableImage {
 	int    cached_angle;
 };
 
+// ----------------------------------------------------------------------------- : CachedScriptableMask
+
+/// A version of ScriptableImage that caches an AlphaMask
+class CachedScriptableMask {
+  public:
+	
+	/// Update the script, returns true if the value has changed
+	bool update(Context& ctx);
+	
+	/// Get the alpha mask; with the given options
+	/** if img_options.width == 0 and the mask is already loaded, just returns it. */
+	const AlphaMask& get(const GeneratedImage::Options& img_options);
+	
+	/// Get a mask that is not cached
+	void getNoCache(const GeneratedImage::Options& img_options, AlphaMask& mask);
+	
+  private:
+	ScriptableImage script;
+	AlphaMask       mask;
+	friend class Reader;
+	friend class Writer;
+	friend class GetDefaultMember;
+};
+
 // ----------------------------------------------------------------------------- : EOF
 #endif