New rotation system (see forum thread).

Major changes:
  - when rotating, the top left corner of the rectangle stays in place.
  - ValueViewers get a dc that is pre-rotated/translated for them, i.e. (0,0) is the top-left of the viewer (with ValueViewer::getRotation).
  - moved 'angle' from individual Styles to the Style base class.
  - any rotation angle is now possible. angle is still an int for now.

This warrants a version bump

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

src/data/field/choice.cpp

@@ -178,7 +178,6 @@ ChoiceStyle::ChoiceStyle(const ChoiceFieldP& field)
 	, choice_images_initialized(false)
 	, combine(COMBINE_NORMAL)
 	, alignment(ALIGN_STRETCH)
-	, angle(0)
 	, thumbnails(nullptr)
 {}
 
@@ -291,7 +290,6 @@ IMPLEMENT_REFLECTION(ChoiceStyle) {
 	REFLECT_N("mask",mask_filename);
 	REFLECT(combine);
 	REFLECT(alignment);
-	REFLECT(angle);
 	REFLECT(font);
 	REFLECT(image);
 	REFLECT(choice_images);

src/data/field/choice.hpp

@@ -153,7 +153,6 @@ class ChoiceStyle : public Style {
 	ImageCombine                combine;            ///< Combining mode for drawing the images
 	Alignment                   alignment;          ///< Alignment of images
 	Image                       mask;               ///< The actual mask image
-	int                         angle;				///< Angle by which the images are rotated
 	wxImageList*                thumbnails;         ///< Thumbnails for the choices
 	vector<ThumbnailStatus>     thumbnails_status;	///< Which thumbnails are up to date?
 	// information from image rendering

src/data/field/image.cpp

@@ -25,14 +25,12 @@ IMPLEMENT_REFLECTION(ImageField) {
 
 IMPLEMENT_REFLECTION(ImageStyle) {
 	REFLECT_BASE(Style);
-	REFLECT(angle);
 	REFLECT_N("mask", mask_filename);
 	REFLECT_N("default", default_image);
 }
 
 int ImageStyle::update(Context& ctx) {
 	return Style       ::update(ctx)
-	     | angle        .update(ctx) * CHANGE_OTHER
 	     | mask_filename.update(ctx) * CHANGE_MASK
 	     | default_image.update(ctx) * CHANGE_DEFAULT;
 }

src/data/field/image.hpp

@@ -38,7 +38,6 @@ class ImageStyle : public Style {
 	inline ImageStyle(const ImageFieldP& field) : Style(field) {}
 	DECLARE_STYLE_TYPE(Image);
 	
-	Scriptable<int>    angle;         ///< Rotation of images
 	Scriptable<String> mask_filename; ///< Filename for a mask image
 	ScriptableImage    default_image; ///< Placeholder
 	

src/data/field/text.cpp

@@ -44,7 +44,6 @@ TextStyle::TextStyle(const TextFieldP& field)
 	: Style(field)
 	, always_symbol(false), allow_formating(true)
 	, alignment(ALIGN_TOP_LEFT)
-	, angle(0)
 	, padding_left  (0), padding_left_min  (10000)
 	, padding_right (0), padding_right_min (10000)
 	, padding_top   (0), padding_top_min   (10000)
@@ -73,8 +72,7 @@ int TextStyle::update(Context& ctx) {
 	return Style     ::update(ctx)
 	     | font       .update(ctx) * CHANGE_OTHER
 	     | symbol_font.update(ctx) * CHANGE_OTHER
-	     | alignment  .update(ctx) * CHANGE_OTHER
-	     | angle      .update(ctx) * CHANGE_OTHER;
+	     | alignment  .update(ctx) * CHANGE_OTHER;
 }
 void TextStyle::initDependencies(Context& ctx, const Dependency& dep) const {
 	Style     ::initDependencies(ctx, dep);
@@ -100,7 +98,6 @@ IMPLEMENT_REFLECTION(TextStyle) {
 	REFLECT(always_symbol);
 	REFLECT(allow_formating);
 	REFLECT(alignment);
-	REFLECT(angle);
 	REFLECT(padding_left);
 	REFLECT(padding_right);
 	REFLECT(padding_top);

src/data/field/text.hpp

@@ -35,6 +35,8 @@ class TextField : public Field {
 	
 	OptionalScript script;			///< Script to apply to all values
 	OptionalScript default_script;	///< Script that generates the default value
+	//%OptionalScript view_script;		///< Script to apply before viewing
+	//%OptionalScript unview_script;	///< Script to apply after changes to the view
 	bool multi_line;				///< Are newlines allowed in the text?
 	String default_name;			///< Name of "default" value
 	
@@ -57,7 +59,6 @@ class TextStyle : public Style {
 	bool always_symbol;							///< Should everything be drawn as symbols?
 	bool allow_formating;						///< Is formating (bold/italic/..) allowed?
 	Scriptable<Alignment> alignment;			///< Alignment inside the box
-	Scriptable<int> angle;						///< Angle of the text inside the box
 	double padding_left,   padding_left_min;	///< Padding
 	double padding_right,  padding_right_min;	///< Padding
 	double padding_top,    padding_top_min;		///< Padding
@@ -80,14 +81,6 @@ class TextStyle : public Style {
 	virtual void initDependencies(Context&, const Dependency&) const;
 	virtual void checkContentDependencies(Context&, const Dependency&) const;
 	
-	/// The rotation to use when drawing
-	inline Rotation getRotation() const {
-		return Rotation(angle, getRect(), 1.0, getStretch());
-	}
-	/// The rotation to use when determining content layout, does not include the stretch factor
-	inline Rotation getRotationNoStretch() const {
-		return Rotation(angle, getRect());
-	}
 	/// Stretch factor to use
 	double getStretch() const;