118 Commits

Author SHA1 Message Date
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
9a759615ae Cleaned up some DOS leftovers.
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@282 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2008-10-17 21:30:38 +00:00
Yves Rizoud
763087a626 Implemented Meilleure_couleur_sans_exclusion().
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@281 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2008-10-17 21:01:47 +00:00
Franck Charlet
0f74b81151 Removed the shift + click right mouse button emulation as it looks like is already handled with the apple key.
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@272 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2008-10-16 23:07:26 +00:00
Franck Charlet
6a778031fe Handling for these formats were broken due to endianness problems on PPC: pkm img bmp gif
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@268 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2008-10-16 00:29:04 +00:00
Yves Rizoud
9770d70f2a Refactored the "#ifndef __macosx__" that were around every SDL_UpdateRect().
Redraw method is now defined once, in sdlscreen.c

git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@266 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2008-10-15 22:52:00 +00:00
Franck Charlet
99b99322be Added the missing objective C files for the macosx and fixed the changes you forgot in main.c etc..
Also added a way to handle the right mouse button when the shift key is pressed (for mice with only have 1 button :]).

git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@264 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2008-10-15 20:55:31 +00:00
Adrien Destugues
b4673bf9de Fixed big ellipses
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@246 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2008-10-13 19:50:33 +00:00
Adrien Destugues
0bbed15383 Removed the useless "squares table" wich only worked for resolutions <= 1024 px.
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@245 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2008-10-13 19:38:58 +00:00
Yves Rizoud
5fd1e42ea0 Copyright notices in source files
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@217 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2008-10-08 19:40:47 +00:00
Yves Rizoud
dd984538bf Removed some old DOS code, unified (for gcc) the handling of file paths.
Probably fixed some linux issues there.
Fixed the filename search by typing in Save/load.


git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@196 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2008-10-04 21:56:02 +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
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
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
11a4a488a6 Changed all the remaining OEM characters in the source code into Windows-1252.
Except in aide.c, because the strings are printed with an OEM font.

git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@175 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2008-09-27 22:11:17 +00:00
Yves Rizoud
8ec86f1899 gfxcfg now uses SDL keysyms for input, you can test it to check how SDL understands keys on your platform. The utility still doesn't load gfx2.cfg, and still saves is badly.
Fixed more hardcoded scancodes (shade menu).


git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@171 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2008-09-27 16:53:26 +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
Yves Rizoud
e219797b16 Implemented a time simulator for Wait_VBL()
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@166 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2008-09-25 18:53:16 +00:00
Yves Rizoud
f26c8fe9f1 Save/Load: Much better filename input, can enter French keys and characters.
The text functions now apply a Windows-1252 -> OEM conversion, since the two
main fonts are an OEM code page.


git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@161 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2008-09-19 00:24:00 +00:00
Yves Rizoud
204dee8549 Display is now using RGB range 0-255 instead of 0-250.
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@160 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2008-09-17 22:43:59 +00:00
Yves Rizoud
f90388d670 implemented Palette_64_to_256()
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@147 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2008-09-14 19:23:46 +00:00
Yves Rizoud
beea105ef7 Enabled keyboard repeat (maybe not in the best way).
Fixed FX/Feedback button that couldn't be switched off.


git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@145 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2008-09-14 00:50:18 +00:00
Yves Rizoud
3894c39631 Updated makefile for MingW support, fixed some strict compilation warnings.
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@133 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2008-09-11 23:40:06 +00:00
Adrien Destugues
2b609d6e03 -BMP Loading
-Fixed PCX loading
-Some work on ILBM loading
-Little adaptation for long filenames (does not crash anymore, but there are display bugs)
-Some other small fixes i can't remember


git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@123 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2008-08-14 20:21:11 +00:00
Adrien Destugues
867ac703ca Working palette reduction ! You can now load 24b pcx images !
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@121 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2008-08-13 17:31:32 +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
027ffd4bf5 Smoothing, QuickShade.
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@117 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2008-08-12 16:52:20 +00:00
Adrien Destugues
d9cc87b669 Set_color did not divide colors by 4 for VGAcompatibility
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@115 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2008-08-10 13:18:58 +00:00
Adrien Destugues
2c187ef632 Corrected the palette reduction system. Gif loading now OK
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@113 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2008-08-10 13:00:13 +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
21dacf51f1 Some work on brush operations. Resize, rotate, flip,... Still some work needed for correct brush preview in zoomed mode.
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@87 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2008-08-01 11:18:56 +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
7e48434e19 Right click is working. You can stop drawing polylines and do various other things
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@83 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2008-07-30 20:08:02 +00:00
Adrien Destugues
ec2a3083b7 Watcom fix
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@81 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2008-07-30 18:58:00 +00:00
Adrien Destugues
9093f3c09c Debugged keyboard input. You can now change the picture size.
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@80 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2008-07-30 18:43:43 +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
d40d948c78 Proper screen update on zoomed fill
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@78 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2008-07-30 13:34:21 +00:00
Adrien Destugues
1f15bfbc3f Filling works ! *NEVER* put a ; after a for() !
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@77 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2008-07-30 13:06:44 +00:00
Adrien Destugues
b2f9193e85 Made it compile under windows with Open Watcom
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@66 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2008-07-27 21:04:12 +00:00
Adrien Destugues
ae9a534ad8 Working on the filling routine (still broken)
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@65 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2008-07-26 12:30:42 +00:00
Adrien Destugues
0843c8f742 Some work on filling (not working yet, sorry)
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@64 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2008-07-25 09:22:55 +00:00
Adrien Destugues
0797a72c70 circle drawing
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@62 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2008-07-24 19:02:41 +00:00
Adrien Destugues
a90c04af77 Debugged mouse cursor erasing !
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@60 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2008-07-24 13:16:03 +00:00
Adrien Destugues
69a0795f50 Some work to improve zoom window.
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@58 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2008-07-22 15:29:36 +00:00
Adrien Destugues
b458b4787e Improved display of Statistics window. Corrected color counting function
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@57 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2008-07-22 10:18:18 +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
7240396ae6 Mouse input is now fully working (we can even release a mouse button :) quite useful :))
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@52 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2008-04-05 11:54:10 +00:00
Adrien Destugues
50d60aa753 Correction de nombreux bugs dans la gestionde la souris et du clavier
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@51 416bcca6-2ee7-4201-b75f-2eb2f807beb1
2008-04-05 09:48:19 +00:00