mirror of
https://github.com/amyinspace/MagicSetEditor2.git
synced 2026-06-10 04:57:00 -04:00
Conversion to new ScriptableImage complete, this affected quite a bit, including the evil thumbnail thread;
Added StyleListener, so style changes are only propagated to interested viewers. git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@329 0fc631ac-6414-0410-93d0-97cfa31319b6
This commit is contained in:
twanvl
+50
-172
@@ -11,8 +11,7 @@
|
||||
#include <script/to_value.hpp>
|
||||
#include <util/dynamic_arg.hpp>
|
||||
#include <util/io/package.hpp>
|
||||
|
||||
IMPLEMENT_DYNAMIC_ARG(Package*, load_images_from, nullptr);
|
||||
#include <gfx/generated_image.hpp>
|
||||
|
||||
// ----------------------------------------------------------------------------- : Utility
|
||||
|
||||
@@ -27,167 +26,76 @@ GeneratedImageP image_from_script(const ScriptValueP& value) {
|
||||
}
|
||||
}
|
||||
|
||||
// ----------------------------------------------------------------------------- : ScriptableImage2
|
||||
// ----------------------------------------------------------------------------- : ScriptableImage
|
||||
|
||||
Image ScriptableImage2::generate(const GeneratedImage::Options& options, bool cache) const {
|
||||
if (!isReady()) {
|
||||
Image ScriptableImage::generate(const GeneratedImage::Options& options, bool cache) const {
|
||||
if (cached.Ok() && cached.GetWidth() == options.width && cached.GetHeight() == options.height) {
|
||||
// cached, so we are done
|
||||
return cached;
|
||||
}
|
||||
// generate
|
||||
Image image;
|
||||
if (isReady()) {
|
||||
image = value->generate(options);
|
||||
} else {
|
||||
// error, return blank image
|
||||
Image i(1,1);
|
||||
i.InitAlpha();
|
||||
i.SetAlpha(0,0,0);
|
||||
return i;
|
||||
image = i;
|
||||
}
|
||||
if (cached.Ok() && cached.GetWidth() == options.width && cached.GetHeight() == options.height) {
|
||||
return cached;
|
||||
// resize?
|
||||
int iw = image.GetWidth(), ih = image.GetHeight();
|
||||
if ((iw == options.width && ih == options.height) || options.width == 0 || options.height == 0) {
|
||||
// already the right size
|
||||
} else if (options.preserve_aspect == ASPECT_FIT) {
|
||||
// determine actual size of resulting image
|
||||
int w, h;
|
||||
if (iw * options.height > ih * options.width) { // too much height requested
|
||||
w = options.width;
|
||||
h = options.width * ih / iw;
|
||||
} else {
|
||||
w = options.height * iw / ih;
|
||||
h = options.height;
|
||||
}
|
||||
Image resampled_image(w, h, false);
|
||||
resample(image, resampled_image);
|
||||
image = resampled_image;
|
||||
} else {
|
||||
Image resampled_image(options.width, options.height, false);
|
||||
if (options.preserve_aspect == ASPECT_BORDER && (options.width < options.height * 3) && (options.height < options.width * 3)) {
|
||||
// preserve the aspect ratio if there is not too much difference
|
||||
resample_preserve_aspect(image, resampled_image);
|
||||
} else {
|
||||
resample(image, resampled_image);
|
||||
}
|
||||
image = resampled_image;
|
||||
}
|
||||
Image img = value->generate(options);
|
||||
if (cache) cached = img;
|
||||
return img;
|
||||
if (options.saturate) {
|
||||
saturate(image, 40);
|
||||
}
|
||||
// cache? and return
|
||||
if (cache) cached = image;
|
||||
return image;
|
||||
}
|
||||
|
||||
ImageCombine ScriptableImage2::combine() const {
|
||||
ImageCombine ScriptableImage::combine() const {
|
||||
if (!isReady()) return COMBINE_NORMAL;
|
||||
return value->combine();
|
||||
}
|
||||
|
||||
bool ScriptableImage2::update(Context& ctx) {
|
||||
bool ScriptableImage::update(Context& ctx) {
|
||||
if (!isScripted()) return false;
|
||||
GeneratedImageP new_value = image_from_script(script.invoke(ctx));
|
||||
if (!new_value || !value || *new_value != *value) {
|
||||
value = new_value;
|
||||
cached = Image();
|
||||
return true;
|
||||
} else {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
// ----------------------------------------------------------------------------- : ScriptImage
|
||||
|
||||
ScriptType ScriptImage::type() const { return SCRIPT_IMAGE; }
|
||||
String ScriptImage::typeName() const { return _("image"); }
|
||||
|
||||
// ----------------------------------------------------------------------------- : Utility
|
||||
|
||||
/// Convert a script value to an image
|
||||
ScriptImageP to_script_image(const ScriptValueP& value) {
|
||||
if (ScriptImageP img = dynamic_pointer_cast<ScriptImage>(value)) {
|
||||
return img; // already an image
|
||||
} else if (value->type() == SCRIPT_STRING) {
|
||||
// open a file
|
||||
String filename = *value;
|
||||
Package* pkg = load_images_from();
|
||||
if (!pkg) throw ScriptError(_("Can only load images in a context where an image is expected"));
|
||||
InputStreamP file = pkg->openIn(filename);
|
||||
ScriptImageP img = new_intrusive<ScriptImage>();
|
||||
if (img->image.LoadFile(*file)) {
|
||||
if (img->image.HasMask()) img->image.InitAlpha(); // we can't handle masks
|
||||
return img;
|
||||
} else {
|
||||
throw ScriptError(_("Unable to load image '") + filename + _("' from '" + pkg->name() + _("'")));
|
||||
}
|
||||
} else if (value->type() == SCRIPT_NIL) {
|
||||
// error, return blank image
|
||||
Image i(1,1);
|
||||
i.InitAlpha();
|
||||
i.SetAlpha(0,0,0);
|
||||
return new_intrusive1<ScriptImage>(i);
|
||||
} else {
|
||||
throw ScriptError(_("Can not convert from '") + value->typeName() + _("' to image"));
|
||||
}
|
||||
}
|
||||
|
||||
/// Is the given image up to date?
|
||||
bool script_image_up_to_date(const ScriptValueP& value) {
|
||||
if (value->type() == SCRIPT_INT) {
|
||||
return (bool)*value; // boolean up-to-dateness from parameter
|
||||
} else {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// ----------------------------------------------------------------------------- : ScriptableImage
|
||||
|
||||
ScriptableImage::ScriptableImage(const String& script_)
|
||||
: script(script_)
|
||||
{}
|
||||
|
||||
ScriptImageP ScriptableImage::generate(Context& ctx, Package& pkg) const {
|
||||
try {
|
||||
WITH_DYNAMIC_ARG(load_images_from, &pkg);
|
||||
ScriptImageP img = to_script_image(script.invoke(ctx));
|
||||
return img;
|
||||
} catch (Error e) {
|
||||
// loading images can fail
|
||||
// it is likely we are inside a paint function or outside the main thread, handle error later
|
||||
handle_error(e, false, false);
|
||||
return new_intrusive1<ScriptImage>(Image(1,1));
|
||||
}
|
||||
}
|
||||
|
||||
ScriptImageP ScriptableImage::generate(Context& ctx, Package& pkg, UInt width, UInt height, PreserveAspect preserve_aspect, bool saturate) const {
|
||||
ScriptImageP image = generate(ctx, pkg);
|
||||
if (!image->image.Ok()) {
|
||||
// return an image so we don't fail
|
||||
image->image = Image(1,1);
|
||||
}
|
||||
UInt iw = image->image.GetWidth(), ih = image->image.GetHeight();
|
||||
if ((iw == width && ih == height) || width == 0) {
|
||||
// already the right size
|
||||
} else if (preserve_aspect == ASPECT_FIT) {
|
||||
// determine actual size of resulting image
|
||||
UInt w, h;
|
||||
if (iw * height > ih * width) { // too much height requested
|
||||
w = width;
|
||||
h = width * ih / iw;
|
||||
} else {
|
||||
w = height * iw / ih;
|
||||
h = height;
|
||||
}
|
||||
Image resampled_image(w, h, false);
|
||||
resample(image->image, resampled_image);
|
||||
image->image = resampled_image;
|
||||
} else {
|
||||
Image resampled_image(width, height, false);
|
||||
if (preserve_aspect == ASPECT_BORDER && (width < height * 3) && (height < width * 3)) {
|
||||
// preserve the aspect ratio if there is not too much difference
|
||||
resample_preserve_aspect(image->image, resampled_image);
|
||||
} else {
|
||||
resample(image->image, resampled_image);
|
||||
}
|
||||
image->image = resampled_image;
|
||||
}
|
||||
if (saturate) {
|
||||
::saturate(image->image, 40);
|
||||
}
|
||||
return image;
|
||||
}
|
||||
|
||||
ScriptImageP ScriptableImage::update(Context& ctx, Package& pkg, UInt width, UInt height, PreserveAspect preserve_aspect, bool saturate) {
|
||||
// up to date?
|
||||
if (!cache || (UInt)cache->image.GetWidth() != width || (UInt)cache->image.GetHeight() != height || !upToDate(ctx, last_update)) {
|
||||
// cache must be updated
|
||||
cache = generate(ctx, pkg, width, height, preserve_aspect, saturate);
|
||||
last_update.update();
|
||||
}
|
||||
return cache;
|
||||
}
|
||||
|
||||
bool ScriptableImage::upToDate(Context& ctx, Age age) const {
|
||||
if (!script) return true;
|
||||
try {
|
||||
WITH_DYNAMIC_ARG(last_update_age, age.get());
|
||||
return script_image_up_to_date(script.invoke(ctx));
|
||||
} catch (Error e) {
|
||||
return true; // script gives errors, don't update
|
||||
}
|
||||
}
|
||||
|
||||
// ----------------------------------------------------------------------------- : Reflection
|
||||
|
||||
// we need some custom io, because the behaviour is different for each of Reader/Writer/GetMember
|
||||
@@ -200,10 +108,8 @@ template <> void Reader::handle(ScriptableImage& s) {
|
||||
} else if (s.script.unparsed.find_first_of('{') != String::npos) {
|
||||
s.script.parse(*this, true);
|
||||
} else {
|
||||
// script is a constant function
|
||||
s.script.script = new_intrusive<Script>();
|
||||
s.script.script->addInstruction(I_PUSH_CONST, s.script.unparsed);
|
||||
s.script.script->addInstruction(I_RET);
|
||||
// a filename
|
||||
s.value = new_intrusive1<PackagedImage>(s.script.unparsed);
|
||||
}
|
||||
}
|
||||
template <> void Writer::handle(const ScriptableImage& s) {
|
||||
@@ -212,31 +118,3 @@ template <> void Writer::handle(const ScriptableImage& s) {
|
||||
template <> void GetDefaultMember::handle(const ScriptableImage& s) {
|
||||
handle(s.script.unparsed);
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
// ----------------------------------------------------------------------------- : Reflection
|
||||
|
||||
// we need some custom io, because the behaviour is different for each of Reader/Writer/GetMember
|
||||
|
||||
template <> void Reader::handle(ScriptableImage2& s) {
|
||||
handle(s.script.unparsed);
|
||||
if (starts_with(s.script.unparsed, _("script:"))) {
|
||||
s.script.unparsed = s.script.unparsed.substr(7);
|
||||
s.script.parse(*this);
|
||||
} else if (s.script.unparsed.find_first_of('{') != String::npos) {
|
||||
s.script.parse(*this, true);
|
||||
} else {
|
||||
// script is a constant function
|
||||
s.script.script = new_intrusive<Script>();
|
||||
s.script.script->addInstruction(I_PUSH_CONST, s.script.unparsed);
|
||||
s.script.script->addInstruction(I_RET);
|
||||
}
|
||||
}
|
||||
template <> void Writer::handle(const ScriptableImage2& s) {
|
||||
handle(s.script.unparsed);
|
||||
}
|
||||
template <> void GetDefaultMember::handle(const ScriptableImage2& s) {
|
||||
handle(s.script.unparsed);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user