From 61a61bd2fa9ab11370a68fec8ae845615e81a23f Mon Sep 17 00:00:00 2001 From: David Capello Date: Thu, 27 Mar 2008 14:29:33 +0000 Subject: [PATCH] Added eraser and blur tools. Added inks and better handling of tools->brushes->inks relationship. color_t is now a ase_uint32. Added the Background layer. Fixed bugs loading some king of BMP files. Removed the bgcolor from the Sprite and .ase files. Added FileData and BmpData. Renamed dirty_put to dirty_restore_image_data. Renamed dirty_get to dirty_save_image_data. Added get_pretty_memsize, sprite_get_memsize, undo_get_memsize to show memory-usage. --- ChangeLog | 56 + NEWS.txt | 13 +- TODO.txt | 14 +- config.h | 2 +- data/gui-en.xml | 196 ++-- data/jids/celprop.jid | 38 +- data/jids/newspr.jid | 1 + data/jids/options.jid | 6 + data/jids/sprprop.jid | 4 - data/jids/toolconf.jid | 2 +- docs/files/ase.txt | 72 +- makefile.lst | 4 +- src/commands/cmd_background_from_layer.c | 51 + src/commands/cmd_cel_properties.c | 112 +- src/commands/cmd_clear.c | 15 +- src/commands/cmd_configure_tools.c | 32 - src/commands/cmd_copy.c | 4 +- src/commands/cmd_crop.c | 12 +- src/commands/cmd_cut.c | 4 +- src/commands/cmd_drawing_tools.c | 80 +- src/commands/cmd_eyedropper_tool.c | 12 +- src/commands/cmd_layer_from_background.c | 55 + src/commands/cmd_merge_down_layer.c | 2 + src/commands/cmd_new_cel.c | 4 +- src/commands/cmd_new_file.c | 21 +- src/commands/cmd_new_frame.c | 6 +- src/commands/cmd_remove_cel.c | 4 +- src/commands/cmd_remove_layer.c | 4 +- src/commands/cmd_screen_shot.c | 8 +- src/commands/cmd_sprite_properties.c | 35 +- src/commands/commands.c | 16 +- src/commands/commands.h | 9 +- src/console/console.c | 19 +- src/core/app.c | 31 +- src/core/app.h | 7 + src/core/color.c | 438 +++---- src/core/color.h | 16 +- src/core/core.c | 12 + src/core/core.h | 1 + src/dialogs/drawtext.c | 1 + src/dialogs/filmedit.c | 26 +- src/dialogs/options.c | 14 +- src/dialogs/quick.c | 10 +- src/file/ase_format.c | 51 +- src/file/bmp_format.c | 819 +++++++------ src/file/file.c | 29 +- src/file/file.h | 7 +- src/{util/crop.h => file/filedata.c} | 85 +- src/file/filedata.h | 63 + src/jinete/jalert.c | 7 +- src/jinete/jfile.c | 202 ++-- src/jinete/jmanager.c | 13 +- src/jinete/jsystem.h | 1 + src/jinete/jtextbox.c | 2 +- src/jinete/jtooltips.c | 18 +- src/jinete/jxml.c | 22 + src/jinete/jxml.h | 1 + src/jinete/themes/jstandard_theme.c | 8 +- src/jinete/themes/jstandard_theme_icons.h | 52 +- src/jinete/themes/stand/cmove.pcx | Bin 1042 -> 1040 bytes src/jinete/themes/stand/cscroll.pcx | Bin 0 -> 1042 bytes src/modules/gfx.c | 16 +- src/modules/gfx.h | 7 +- src/modules/gfxdata.c | 56 +- src/modules/gui.c | 9 +- src/modules/rootmenu.c | 69 +- src/modules/sprites.c | 16 +- src/modules/tools.c | 1279 ++++++++++++++------- src/modules/tools.h | 93 +- src/modules/tools2.c | 46 +- src/modules/tools2.h | 1 - src/raster/brush.c | 31 +- src/raster/dirty.c | 33 +- src/raster/dirty.h | 15 +- src/raster/gfxobj.c | 4 +- src/raster/image.c | 72 +- src/raster/image.h | 15 + src/raster/layer.c | 90 +- src/raster/layer.h | 18 +- src/raster/mask.c | 20 +- src/raster/mask.h | 32 +- src/raster/sprite.c | 150 +-- src/raster/sprite.h | 10 +- src/raster/stock.c | 2 +- src/raster/undo.c | 200 ++-- src/raster/undo.h | 9 +- src/script/bindings.c | 6 +- src/script/functions.c | 502 ++++++-- src/script/functions.h | 9 + src/test/raster/00dirty.c | 4 +- src/util/autocrop.c | 4 +- src/util/clipbrd.c | 7 +- src/util/crop.c | 224 ---- src/util/misc.c | 13 +- src/util/misc.h | 2 +- src/util/render.c | 20 +- src/widgets/colbar.c | 141 +-- src/widgets/colbut.c | 6 +- src/widgets/colsel2.c | 36 +- src/widgets/curvedit.c | 4 +- src/widgets/editor.h | 5 +- src/widgets/editor/editor.c | 229 ++-- src/widgets/groupbut.c | 5 + src/widgets/statebar.c | 30 +- src/widgets/toolbar.c | 85 +- src/widgets/toolbar.h | 2 +- 106 files changed, 3837 insertions(+), 2639 deletions(-) create mode 100644 src/commands/cmd_background_from_layer.c create mode 100644 src/commands/cmd_layer_from_background.c rename src/{util/crop.h => file/filedata.c} (54%) create mode 100644 src/file/filedata.h create mode 100644 src/jinete/themes/stand/cscroll.pcx delete mode 100644 src/util/crop.c diff --git a/ChangeLog b/ChangeLog index c309a7447..39df32c99 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,59 @@ +2008-03-27 David A. Capello + + * src/commands/cmd_background_from_layer.c: Added. + +2008-03-26 David A. Capello + + * src/raster/brush.c (regenerate_brush): Now the line-brush is + more thick (this is a "shortcut" to avoid ugly effect when the + line-brush was used to draw, for example, a ellipse). + + * src/raster/sprite.c (sprite_set_imgtype): Fixed a bug where an + incorrect address was saved in the undo information. + + * src/commands/cmd_cel_properties.c, data/jids/celprop.jid: + Modified to display information only (the "opacity" of the Cel is + the only field that can be modified). + + * src/jinete/jfile.c (convert_tag_to_widget): Added grid support. + +2008-03-25 David A. Capello + + * src/raster/layer.c (layer_free_images): Added to fix a bug which + the stock has images of removed layers. + + * src/script/functions.c (FlattenLayers): Rewritten to use the + `Background' layer. + + * src/raster/undo.c (update_undo): the undo size is get from the + configuration. + + * src/dialogs/options.c (dialogs_options): Added option to change + the undo size limit per sprite. + +2008-03-24 David A. Capello + + * src/modules/tools.c (ase_tool_eraser): Added. + + * src/modules/tools.c (ase_tool_dots): Removed. + + * src/modules/tools.h (struct ToolData): Added. Restructured all + the tools handling. No more real-time dirty. Now a temporary + preview image is used and them a `dirty' is created using the + differences between the old and new layer pixels. + + * src/core/color.c: Removed alpha value of colors. + + * src/widgets/editor.h (Editor): Added ctrl_pressed to show the + move-cursor. + + * src/raster/sprite.h (struct Sprite): Removed the bgcolor + property (it's confusing). + +2008-03-23 David A. Capello + + * src/file/filedata.[ch]: Added FileData and BmpData. + 2008-03-22 David A. Capello * src/dialogs/filmedit.c (layer_box_msg_proc, cel_box_msg_proc): diff --git a/NEWS.txt b/NEWS.txt index 192908006..2daa09d4c 100644 --- a/NEWS.txt +++ b/NEWS.txt @@ -6,7 +6,10 @@ NEWS --- + Added support to load and save PNG files (through 'libpng'). -+ Rewritten the color-selector dialog. ++ Added the `Background' layer. ++ Transparent cel handling for the end-user (you can move a cel and + don't worry about its bounds). ++ Rewritten the color-bar and color-selector dialog. + Replaced the "List" menu with the tabs selector. + Rewritten the File Selector: + Preview support. @@ -28,7 +31,9 @@ NEWS + New XML format for the menus and keyboard shortcuts. - Removed a lot of "complex" functionality: - Removed mask-repositories (you can use .msk files instead). - - Removed menu scripting customization. + - Removed menu scripting customization: the scripting support is + broken, next versions of ASE will contain a better set of routines + to create scripts. - Removed screen saver. - Removed sessions. - Removed draw-text (it'll return in next versions). @@ -36,9 +41,7 @@ NEWS moment). - Removed mapgen. - Removed linked-cels (were complex for the end-user). - - Also the scripting support is broken, next versions of ASE will - contain a better set of routines to create scripts. - + 0.5 --- diff --git a/TODO.txt b/TODO.txt index 98bc0edac..4dec43c4d 100644 --- a/TODO.txt +++ b/TODO.txt @@ -1,20 +1,20 @@ Next beta --------- +- add the progress bar for effects and save-file. +- add layer_from_background +- fix colors - tooltips for color-bar. + agregar soporte para UNDO al cambiar los colores de la paleta. -- si está activado el cuadro para configurar herramientas las teclas G - y H deben actualizarlo - + Solución: con hooks y Options (agregar core/options.[ch]) -- fix this bug: - + Create a RGB image, - + change color mode to Indexed, - + Undo (with the mouse). High priority work ------------------ - search for TODO; +- if there is activated the Tools Configuration dialog box, the + Shift+G and Shift+S should update it + + Solution: with hooks and Options (add core/options.[ch]) +- add a consistent error handling. - rewrite the film editor. - rewrite tools-inks-drawingmode stuff; - new animation editor (remove the film editor) diff --git a/config.h b/config.h index 3f7641e7c..bcb3ee18a 100644 --- a/config.h +++ b/config.h @@ -24,7 +24,7 @@ #define __ASE_CONFIG_H /* general information */ -#define PACKAGE "ase" +#define PACKAGE "ASE" #define VERSION "0.6b2" #define WEBSITE "http://www.aseprite.org/" #define COPYRIGHT "Copyright (C) 2001-2008 David A. Capello" diff --git a/data/gui-en.xml b/data/gui-en.xml index 499c94043..18dc4f1ed 100644 --- a/data/gui-en.xml +++ b/data/gui-en.xml @@ -2,87 +2,93 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + @@ -109,32 +115,34 @@ - + - + - + - + - + - + + + - + - + @@ -148,7 +156,7 @@ - + @@ -194,22 +202,8 @@ - - - - - - - - - - - - - - - - + + diff --git a/data/jids/celprop.jid b/data/jids/celprop.jid index 22b9e57b6..51f7f52cf 100644 --- a/data/jids/celprop.jid +++ b/data/jids/celprop.jid @@ -3,29 +3,23 @@ - - - - - - - - - - - + +