45 Commits

Author SHA1 Message Date
Adrien Destugues
d016b8ba48 Some tweaks and fixups to the gradiation rectangles. Clipping and zoom mode work better, but :
-I introduced some weird bug making lines appear on the screen when drawing outside the limits of the zoom in zoom mode. Seems there is a XOR line function that get called with negative coordinates
-The preview rectangle is drawn with XOR-lines on the screen and does not modify the picture. So it is possible to erase it in the zoom screen by moving the cursor around it.
-Maybe I missed some testcases, i did not manage to reproduce the problem trigerred by grid clipping, for one.
-The gradiation vector is horizontal when it should be inclined. I probably missed something when writing the code for it. Probably a division gets out of precision... i should check if i used floats where needed


git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@339 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2008-11-13 21:56:03 +00:00
Yves Rizoud
de2f95863d Text tool: corrected colors, various fixes.
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@320 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2008-11-02 19:03:11 +00:00
Adrien Destugues
d72897e93d Some more fixes for the gradiation rectangles. The position is now calculated in an int, you should not experience any problem with the circle limit.
Also fixed the operation handling. The rectangle is now drawn properly when you finish sizing it.
The vector line still leaves some artifact on screen, however...


git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@310 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2008-10-27 09:02:33 +00:00
Yves Rizoud
45f1dfeb7b TEXT Tool, first work-in-progress commit.
Truetype only, compile with "make NOTTF=1" if you don't want to bother with it.
Only TTF is done, aliased (ok) and non-aliased (backgound color is
currently stuck to color index 0)
The Clear button doesn't update the window.
Only one font (certified to be public domain).
Preview not done.
Font selector not done.
SFont support not done.
Limit 30 characters.


git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@305 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2008-10-23 22:13:53 +00:00
Adrien Destugues
a327f92805 New makefile including os4 build. Thanks xeron ! :)
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@303 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2008-10-23 07:57:55 +00:00
Adrien Destugues
cef61562d0 Some progress on the gradiation rectangles. I messed up the vector calculation somehow. Is someone good at maths ?
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@301 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2008-10-22 19:56:30 +00:00
Adrien Destugues
dc9e10c054 Started work on the gradiation rectangle.
The handling in the operation engine should work pretty well. I would like to do some changes, however (displaying the bottomright of the rectangle, and use XOR for the vector, for example)
Now, i have to do the real thing, the gradiation calculation and drawing. But let's see that tomorrow...


git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@299 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2008-10-21 19:57:25 +00:00
Yves Rizoud
568e4b7349 Implemented the Additive and Substractive modes, missing from the DOS version
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@286 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2008-10-17 23:24:41 +00:00
Yves Rizoud
8f7d11ef04 Added back the confirmation message in "Copy Spare / Some colors" function.
I shouldn't have removed it in r279, it happens because the spare page has 
unsaved changes and will be modified.

git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@285 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2008-10-17 22:01:22 +00:00
Adrien Destugues
99d485210c Some speedup for macosx build
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@259 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2008-10-15 13:29:34 +00:00
Yves Rizoud
7ca68f33d0 Fixed many refresh problems in the Sieve menu, plus older logic bugs.
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@254 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2008-10-14 19:54:22 +00:00
Adrien Destugues
ff1d5d4dd6 Fixed screen update issues.
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@251 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2008-10-14 16:16:32 +00:00
Adrien Destugues
4a2bef2f6b Removed useless SDL.h include in main.c (already included in global.h)
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@250 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2008-10-14 15:06:07 +00:00
Yves Rizoud
96089af2ae Contextual help in all menus. Done!
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@240 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2008-10-12 21:28:16 +00:00
Adrien Destugues
393ced7451 Hopefully correct Mettre_Ecran_A_Jour for zoom. Still buggy in the colour brush, going on to check that
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@220 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2008-10-09 19:05:21 +00:00
Yves Rizoud
c8c037d00b Fixed resolution menu behavior when less than 12 resolutions are available.
gfx2.cfg : Reverted the default Shade (Blanks are needed to separate the gradients)


git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@215 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2008-10-07 19:21:17 +00:00
Adrien Destugues
ab3318caaf more work on the shade window.
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@209 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2008-10-07 16:13:32 +00:00
Adrien Destugues
8d5e4f6840 removed screen refreshing in the block drawing function and made the needed update in windows display. Should be a lot faster, but i may have missed some screen updates.
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@205 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2008-10-07 14:16:48 +00:00
Yves Rizoud
40fe3ccf09 SDL Graphics mode detection and checking if valid, CFG saves only configuration for valid modes where the user set <3 | Imperfect | Unsupported.
Modes are not sorted yet (cosmetic)


git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@199 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2008-10-05 02:10:53 +00:00
Yves Rizoud
0705aae104 Fixed an incompatibilty with gfx2.cfg from DOS version.
Fixed the invalid shades in the current version of gfx2.cfg : Somehow it was filled with multiple occurences of color 0(black), with a step of 0.


git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@198 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2008-10-04 23:47:53 +00:00
Adrien Destugues
ee6106d80f XOR lines when moving windows
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@194 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2008-10-04 20:37:09 +00:00
Adrien Destugues
1c669a2987 Displays the brush on his button
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@193 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2008-10-04 20:09:09 +00:00
Adrien Destugues
5a2f86a4d6 set the window caption to something useful
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@192 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2008-10-04 18:45:05 +00:00
Adrien Destugues
eaa35aa9c7 Fixed the palette window : color counting works (forgot to initialize the buffer), and correct display of selected colors.
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@191 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2008-10-04 18:14:29 +00:00
Adrien Destugues
9dac1feee7 Correct screen update for circles with gradiation.
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@190 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2008-10-04 16:40:04 +00:00
Adrien Destugues
3a9dd17bb5 Some rework in the polyfill routine... still imperfect ...
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@189 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2008-10-04 15:03:17 +00:00
Yves Rizoud
7ba9a726dc Implemented window sizing (and re-sizing) by draggin window edges.
Unfinished, more work needed in:
* command-line arguments (grafx2 myimage.pcx -width 640 -height 480)
* querying SDL for best modes
* detecting bad modes and recovering (though shift+return restores to window)
* saving settings in gfx2.ini.
Also, now the window's close button triggers Quit. Both events (quit, resize)
are only taken into account when all menus are closed.


git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@188 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2008-10-03 01:06:42 +00:00
Yves Rizoud
7bf71cd7b0 More work on endianness. Grid settings are now saved and reloaded.
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@187 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2008-09-30 19:24:49 +00:00
Yves Rizoud
acfe5836ce Grafx2 can now read and convert gfx2.cfg from the original DOS (96.5%) format.
Older .cfg files in svn were saved incorrectly: the wrong size of chunk #5
(0x0101 instead of 0xE1) made it impossible to re-read the file in gfxcfg.

gfxcfg can read and save gfx2.cfg. Upward compatibility is provided:
- If new chunk types are added to the format, it only needs a re-compile. Older
files can be read and saved.
- If new keyboard shortcuts are added (134 currently), the older files can be
read and the default shortcut will be used for missing keys.

Fixed many endianness cases, hopefully
Fixed LBM loading : bug in ASM->C conversion of Couleur_ILBM_line()
Broke PCX loading : argh!


git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@176 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2008-09-29 23:15:08 +00:00
Yves Rizoud
73ca66c084 Keyboard: Converted hardware scancodes to SDL keysyms.
Version becomes 97.0%, Charger_CFG() auto-converts 96.5% format as needed.

git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@169 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2008-09-26 23:08:21 +00:00
Adrien Destugues
b6986f2b56 All brush effects working !
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@119 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2008-08-12 17:52:55 +00:00
Adrien Destugues
db93420369 Some more brush effects
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@118 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2008-08-12 17:14:09 +00:00
Adrien Destugues
bcced2c747 wait vbl, set color, and ability to compile a fullscreen build
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@92 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2008-08-06 16:48:34 +00:00
Adrien Destugues
3bf7246855 Saving a picture and loading it back works, but there are struct misalignment problems, asved file will NOT be compatible with other tools
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@91 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2008-08-02 15:38:00 +00:00
Adrien Destugues
14191db899 Scroll_picture
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@84 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2008-07-30 22:03:03 +00:00
Adrien Destugues
6f9b6c977d Lines and curves are working.
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@79 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2008-07-30 17:52:59 +00:00
Adrien Destugues
0bd265706a Gradient circles.
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@76 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2008-07-29 17:22:11 +00:00
Adrien Destugues
2536cb6e88 Some corrections for windows drawing (preview Degradés, sprites special effects)
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@75 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2008-07-29 16:58:49 +00:00
Adrien Destugues
272506e850 Fixed all warnings, some little bugs, and improved compatibility with >1GB RAM
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@54 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2008-07-21 12:47:32 +00:00
Adrien Destugues
86edb4d1fb Correction de quelaues bugs: attente fin clic, sauvegarde sous nux, désactivation de distcc ds le makefile, début de gestion clavier (pas encore ascii mais bas niveau)
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@48 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2008-03-31 12:00:21 +00:00
Adrien Destugues
22eac2bb82 oups
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@44 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2007-12-08 15:00:44 +00:00
Adrien Destugues
5a1965f8fa pouet
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@42 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2007-12-08 14:24:22 +00:00
Adrien Destugues
689e6a21ed Restore screen resolution on quit. Clean SDL freeing.
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@41 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2007-11-11 18:59:25 +00:00
Adrien Destugues
d3b41bb251 config file SAVINg is also endian-aware now.
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@38 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2007-10-31 22:18:48 +00:00
Adrien Destugues
306a004e36 First upload of the code.
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@2 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2007-04-14 20:18:30 +00:00