summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorjacksonmj <mj-pt@jacksonmj.co.uk>2011-03-26 12:04:55 (GMT)
committer Simon <simon@hardwired.org.uk>2011-04-04 15:06:35 (GMT)
commitcf005403038a70ff68e1b54baa5c7a7daad81112 (patch)
tree4d3eda1f9912fbd46c93694e1f1a746416a51adc /src
parenta5f01099d73cd229d1820c8f15ee5848c02f59ce (diff)
downloadpowder-cf005403038a70ff68e1b54baa5c7a7daad81112.zip
powder-cf005403038a70ff68e1b54baa5c7a7daad81112.tar.gz
Restore new stamp manipulation
Overwritten by: Python console 2e401babb793238564ca640fc802a52ab7f6c293
Diffstat (limited to 'src')
-rw-r--r--src/main.c48
1 files changed, 36 insertions, 12 deletions
diff --git a/src/main.c b/src/main.c
index 2d5a90c..0bbbd73 100644
--- a/src/main.c
+++ b/src/main.c
@@ -2751,18 +2751,42 @@ int main(int argc, char *argv[])
}
}
}
- if (sdl_key=='r'&&(sdl_mod & (KMOD_CTRL))&&(sdl_mod & (KMOD_SHIFT)))
- {
- save_mode = 1;
- copy_mode = 4;//invert
- }
- else if (sdl_key=='r'&&(sdl_mod & (KMOD_LCTRL|KMOD_RCTRL)))
- {
- save_mode = 1;
- copy_mode = 3;//rotate
- }
- else if (sdl_key=='r')
- GENERATION = 0;
+ if (load_mode==1)
+ {
+ matrix2d transform = m2d_identity;
+ vector2d translate = v2d_zero;
+ void *ndata;
+ int doTransform = 0;
+ if (sdl_key=='r'&&(sdl_mod & (KMOD_CTRL))&&(sdl_mod & (KMOD_SHIFT)))
+ {
+ transform = m2d_new(-1,0,0,1); //horizontal invert
+ doTransform = 1;
+ }
+ else if (sdl_key=='r'&&(sdl_mod & (KMOD_LCTRL|KMOD_RCTRL)))
+ {
+ transform = m2d_new(0,1,-1,0); //rotate anticlockwise 90 degrees
+ doTransform = 1;
+ }
+ else if (sdl_mod & (KMOD_CTRL))
+ {
+ doTransform = 1;
+ if (sdl_key==SDLK_LEFT) translate = v2d_new(-1,0);
+ else if (sdl_key==SDLK_RIGHT) translate = v2d_new(1,0);
+ else if (sdl_key==SDLK_UP) translate = v2d_new(0,-1);
+ else if (sdl_key==SDLK_DOWN) translate = v2d_new(0,1);
+ else doTransform = 0;
+ }
+ if (doTransform)
+ {
+ ndata = transform_save(load_data, &load_size, transform, translate);
+ if (ndata!=load_data) free(load_data);
+ free(load_img);
+ load_data = ndata;
+ load_img = prerender_save(load_data, load_size, &load_w, &load_h);
+ }
+ }
+ if (sdl_key=='r'&&!(sdl_mod & (KMOD_CTRL|KMOD_SHIFT)))
+ GENERATION = 0;
if (sdl_key=='x'&&(sdl_mod & (KMOD_LCTRL|KMOD_RCTRL)))
{
save_mode = 1;