From e65e4799f9183ae2d442454122945767d9e8d3c2 Mon Sep 17 00:00:00 2001 From: William Kendrick Date: Sun, 21 Dec 2003 01:23:42 +0000 Subject: [PATCH] Added info on Grow/Shrink to docs. More playing with hq4x before bedtime. --- docs/README.txt | 13 ++++++++++--- docs/TODO.txt | 4 +++- docs/html/README.html | 14 +++++++++++--- src/hq4x.c | 2 +- src/hqxx.c | 3 +++ src/hqxx.h | 6 +++--- 6 files changed, 31 insertions(+), 11 deletions(-) diff --git a/docs/README.txt b/docs/README.txt index 927e86ab3..9e942b5db 100644 --- a/docs/README.txt +++ b/docs/README.txt @@ -9,7 +9,7 @@ bill@newbreedsoftware.com http://www.newbreedsoftware.com/tuxpaint/ - June 14, 2002 - December 19, 2003 + June 14, 2002 - December 20, 2003 ---------------------------------------------------------------------- @@ -829,8 +829,15 @@ Available Tools showing where the stamp will be placed. Different stamps can have different sound effects. Some - stamps can be colored or tinted. Many stamps can be flipped - vertically, or displayed as a mirror-image. + stamps can be colored or tinted. + + Stamps and be shrunk and expanded, and many stamps can be + flipped vertically, or displayed as a mirror-image, using + controls at the bottom right of the screen. + + (NOTE: If the "nostampcontrols" option is set, Tux Paint + won't display the Mirror, Flip, Shrink and Grow controls for + stamps. See the "Options" section of this document, above.) ---------------------------------------------------------------------- diff --git a/docs/TODO.txt b/docs/TODO.txt index 75c69eaed..4acceac32 100644 --- a/docs/TODO.txt +++ b/docs/TODO.txt @@ -6,7 +6,7 @@ Copyright (c) 2003 by Bill Kendrick bill@newbreedsoftware.com http://www.newbreedsoftware.com/tuxpaint/ -December 18, 2003 +December 20, 2003 LOW-PRIORITY DOCUMENTATION CHANGES: @@ -96,6 +96,8 @@ LOW-PRIORITY TRANSLATION STUFF: FEATURE IDEAS: -------------- + * "Cartoonify" magic tool. Kind of like posterize, but different? + * Create symbolic link "~/TuxPaintPictures" that points to "~/.tuxpaint/saved/"??? FREQUENTLY REQUESTED diff --git a/docs/html/README.html b/docs/html/README.html index af06aa1cc..a5d7541a4 100644 --- a/docs/html/README.html +++ b/docs/html/README.html @@ -23,7 +23,7 @@ New Breed Software

bill@newbreedsoftware.com
http://www.newbreedsoftware.com/tuxpaint/

-

June 14, 2002 - December 19, 2003

+

June 14, 2002 - December 20, 2003

@@ -1257,8 +1257,16 @@ New Breed Software

mouse, showing where the stamp will be placed.

Different stamps can have different sound effects. - Some stamps can be colored or tinted. Many stamps can be - flipped vertically, or displayed as a mirror-image.

+ Some stamps can be colored or tinted.

+ +

Stamps and be shrunk and expanded, and many stamps can be + flipped vertically, or displayed as a mirror-image, using + controls at the bottom right of the screen.

+ +

(NOTE: If the "nostampcontrols" option is set, + Tux Paint won't display the Mirror, Flip, Shrink and Grow + controls for stamps. See the "Options" section of this document, + above.)


diff --git a/src/hq4x.c b/src/hq4x.c index 749ced580..f58581949 100644 --- a/src/hq4x.c +++ b/src/hq4x.c @@ -36,7 +36,7 @@ #define PIXEL00_80 Interp8(dest, x * 4 + 0, y * 4 + 0, w[5], w[1], a) #define PIXEL00_81 Interp8(dest, x * 4 + 0, y * 4 + 0, w[5], w[4], a) #define PIXEL00_82 Interp8(dest, x * 4 + 0, y * 4 + 0, w[5], w[2], a) -#define PIXEL01_0 Interp0(dest, x * 4 + 0, y * 4 + 0, w[5], a) +#define PIXEL01_0 Interp0(dest, x * 4 + 1, y * 4 + 0, w[5], a) #define PIXEL01_10 Interp1(dest, x * 4 + 1, y * 4 + 0, w[5], w[1], a) #define PIXEL01_12 Interp1(dest, x * 4 + 1, y * 4 + 0, w[5], w[2], a) #define PIXEL01_14 Interp1(dest, x * 4 + 1, y * 4 + 0, w[2], w[5], a) diff --git a/src/hqxx.c b/src/hqxx.c index 596c2254b..371ca48d3 100644 --- a/src/hqxx.c +++ b/src/hqxx.c @@ -89,6 +89,9 @@ Uint16 hqxx_getpixel(SDL_Surface * surface, int x, int y, Uint8 * alpha) SDL_GetRGBA(pixel, surface->format, &r, &g, &b, alpha); + /* (Perhaps reducing the number of colors by chopping off the bottoms of + R, G and B will help?) */ + pixel16 = ((r >> 3) << 11) | ((g >> 2) << 5) | (b >> 3); return pixel16; diff --git a/src/hqxx.h b/src/hqxx.h index 8a38a9ede..8212d2c87 100644 --- a/src/hqxx.h +++ b/src/hqxx.h @@ -35,9 +35,9 @@ //trU in 32 = 0x00000700 //trV in 32 = 0x00000006 -#define trY 0x3000 -#define trU 0x00C0 -#define trV 0x0006 +#define trY ((0x30 & 0xF8) << 8) +#define trU ((0x07 & 0x7E) << 3) +#define trV ((0x06 & 0x1F)) Uint16 hqxx_getpixel(SDL_Surface * surface, int x, int y, Uint8 * alpha);