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
This commit is contained in:
twanvl
2008-08-30 21:51:38 +00:00
parent acb3493b59
commit a183ecc9a6
23 changed files with 306 additions and 159 deletions
+5 -1
View File
@@ -277,7 +277,11 @@ class ScriptString : public ScriptValue {
return c;
}
virtual GeneratedImageP toImage(const ScriptValueP&) const {
return new_intrusive1<PackagedImage>(value);
if (value.empty()) {
return new_intrusive<BlankImage>();
} else {
return new_intrusive1<PackagedImage>(value);
}
}
virtual int itemCount() const { return (int)value.size(); }
virtual ScriptValueP getMember(const String& name) const {