m/grafX2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
815 Commits 1 Branch 0 Tags
Commit Graph

815 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Yves Rizoud
abb6204757 [layers] Limited to 32 layers. (previously there was no limit and the 16-bit depth buffer wrapped). Fixed a display bug after picture transforms or layers add/del. 
git-svn-id: svn://pulkomandy.tk/GrafX2/branches/layers@1075 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2009-10-14 00:13:49 +00:00
Yves Rizoud
2dcc1cf8bd [layers] Stats on memory usage in the Stats screen. Tracks the number and total memory size of the pages (bitmaps) used by layers and their backups. Doesn't count housekeeping costs. 
git-svn-id: svn://pulkomandy.tk/GrafX2/branches/layers@1074 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2009-10-13 19:07:58 +00:00
Yves Rizoud
7690cd9e50 [layers] Added functions to add and delete layers (Keyboard shortcuts alt-ins and alt-del) Now defaults back to 1 layer per image on startup. 
git-svn-id: svn://pulkomandy.tk/GrafX2/branches/layers@1073 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2009-10-13 01:03:32 +00:00
Yves Rizoud
64f1449a3b [layers] Merged in the changes from r1070. 
git-svn-id: svn://pulkomandy.tk/GrafX2/branches/layers@1072 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2009-10-12 23:50:09 +00:00
Yves Rizoud
d9e95ae921 (trunk) Tell svn to ignore changes in gfx2.cfg 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1071 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2009-10-12 23:39:49 +00:00
Yves Rizoud
9e866aec5c (trunk) Added shortcuts to more layers tools. Remove gfx2.cfg from versioning, so anybody can use his own (get http://grafx2.googlecode.com/svn-history/r1036/trunk/gfx2.cfg to recover latest version in your workspace) 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1070 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2009-10-12 23:32:40 +00:00
Yves Rizoud
2049f96c59 [layers] Implemented layer insertion. No keys or menu yet, but it's already used when loading images, to make an image with right number of layers. Undoing/redoing such change works. Implemented single-layer deletion (untested) 
git-svn-id: svn://pulkomandy.tk/GrafX2/branches/layers@1069 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2009-10-08 23:54:02 +00:00
Yves Rizoud
dc70d2f59f [layers] Merged-in the trunk changes (support for variable-height menu bar). Color replacer now works. Saving non-layer formats issues a warning and saves flattened version of the visible layers. 
git-svn-id: svn://pulkomandy.tk/GrafX2/branches/layers@1068 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2009-10-08 21:41:25 +00:00
Yves Rizoud
eb1878e413 [layers] Fix a merge error from last commit which disabled layer selection. Implemented Fill. Color replacer in progress (ie: it crashes). 
git-svn-id: svn://pulkomandy.tk/GrafX2/branches/layers@1067 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2009-10-08 00:58:45 +00:00
Yves Rizoud
953185205d Internal support for variable-height menu 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1066 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2009-10-07 22:27:14 +00:00
Yves Rizoud
0b07b43722 [layers] Merged r1063 from trunk. Separated the controls for layers from translucency keys. Can now control up to 8 layers 
git-svn-id: svn://pulkomandy.tk/GrafX2/branches/layers@1065 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2009-10-07 00:07:27 +00:00
Yves Rizoud
2f1888e50d [layers] Implemented 'Copy to spare - pixels'. It replaces the current layer in the spare, resizing the whole spare (all layers) as needed. 
git-svn-id: svn://pulkomandy.tk/GrafX2/branches/layers@1064 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2009-10-06 23:28:37 +00:00
Yves Rizoud
6f8223b09b trunk: Continued the handling of multiple effect on single shortcuts. Multiple window-open work (one after an other), and the restriction on shortcuts that are disabled while drawing is now applied correctly. 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1063 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2009-10-06 23:24:00 +00:00
Yves Rizoud
5fd28bdd3b trunk: Reserved hotkeys for layers. Allowed a single shortcut to launch several actions (Issue 88) 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1062 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2009-10-06 22:42:43 +00:00
Adrien Destugues
bdf0186c7f -Added help about rgb option 
-Better formatting of the video mode list


git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1061 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2009-10-06 12:26:29 +00:00
Yves Rizoud
874ccd4430 [layers] Fix a bug with scroll. Implemented basic save/load of layers in GIF as non-looping animation. 
git-svn-id: svn://pulkomandy.tk/GrafX2/branches/layers@1058 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2009-10-04 01:25:38 +00:00
Yves Rizoud
416ad0cd78 [layers] Added missing screen refresh on 'Kill page' 
git-svn-id: svn://pulkomandy.tk/GrafX2/branches/layers@1051 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2009-10-01 22:23:54 +00:00
Yves Rizoud
56e62c4b47 [layers] Fixed many embarrassing memory overruns and uninitialized memory reads. Woops. 
git-svn-id: svn://pulkomandy.tk/GrafX2/branches/layers@1050 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2009-10-01 22:11:26 +00:00
Yves Rizoud
9be9ed9c17 [layers] Sped up the switching from one active layer to another, when the new layer was already displayed (thanks to the depth buffer, again) 
git-svn-id: svn://pulkomandy.tk/GrafX2/branches/layers@1049 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2009-09-30 21:37:16 +00:00
Yves Rizoud
20b1aef7f5 [layers] cleanup 
git-svn-id: svn://pulkomandy.tk/GrafX2/branches/layers@1048 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2009-09-29 18:49:00 +00:00
Yves Rizoud
61f0a4ec71 [layers] Sped up the scrolling/adjusting of single layers. Speed is no longer relative to the number of visible layers. Pulkomandy, your idea of depth buffer was genius. 
git-svn-id: svn://pulkomandy.tk/GrafX2/branches/layers@1047 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2009-09-29 17:57:43 +00:00
Yves Rizoud
473679ce29 [layers] Implemented shared layers. Speeds up Backup() by 800. Little unrelated bug: On program start, use 'tab' at least once, or the undo buffers won't be updated on screen. 
git-svn-id: svn://pulkomandy.tk/GrafX2/branches/layers@1046 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2009-09-28 22:00:04 +00:00
Yves Rizoud
2fd88b81bb [layers] work on layer sharing (still stable) 
git-svn-id: svn://pulkomandy.tk/GrafX2/branches/layers@1045 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2009-09-28 21:01:29 +00:00
Yves Rizoud
057d5e76e4 [layers] working swap between main/spare, and loading files in command-line. Start of work on variable layers number and layer sharing. 
git-svn-id: svn://pulkomandy.tk/GrafX2/branches/layers@1044 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2009-09-28 18:48:05 +00:00
Yves Rizoud
b534cfd7d4 [layers] Picture effects now work 
git-svn-id: svn://pulkomandy.tk/GrafX2/branches/layers@1043 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2009-09-26 18:01:25 +00:00
Yves Rizoud
b18266e017 [layers] Resizing canvas now works 
git-svn-id: svn://pulkomandy.tk/GrafX2/branches/layers@1042 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2009-09-26 17:51:08 +00:00
Yves Rizoud
78e59e6127 (layers branch) Adjust tool implemented. Left click and drag to move a single layer, Right-click and drag to move everything. 
git-svn-id: svn://pulkomandy.tk/GrafX2/branches/layers@1041 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2009-09-22 22:55:02 +00:00
Yves Rizoud
cedb706326 First svn commit of the experiment with layers. Preemptive backup (to shorten delay before drawing) is currently disabled. Basic Undo/Redo works, but not image resizing, the adjust tool, and saving (not even flattened) 
git-svn-id: svn://pulkomandy.tk/GrafX2/branches/layers@1039 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2009-09-21 14:16:41 +00:00
Yves Rizoud
faea65e62b Initializing branch 'layers' from trunk at revision 1034 
git-svn-id: svn://pulkomandy.tk/GrafX2/branches/layers@1038 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2009-09-21 13:59:30 +00:00
Adrien Destugues
93efc7e9e9 Everything compiles. Some kludges left regarding version and pversion. Now to get it to link... 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1037 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2009-09-19 23:49:52 +00:00
Adrien Destugues
b3f2deedac ... and fixes the build back. 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1036 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2009-09-19 22:47:10 +00:00
Adrien Destugues
b12423d03b Trying to compile on amiga with vbcc. 
Removed some useless unixisms.
Still not working.
Hope I did not break too much things.




git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1035 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2009-09-19 22:41:51 +00:00
Yves Rizoud
7a19586b2d (trunk) Version label: '2.2wip' 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1034 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2009-09-13 16:06:55 +00:00
Yves Rizoud
1a72b90af3 (trunk) Removed sample images. 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1032 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2009-09-13 15:08:02 +00:00
Yves Rizoud
2241eee7f1 Report fix of issue 211 from release branch 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1030 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2009-09-13 14:48:35 +00:00
Yves Rizoud
2345a764d6 Fix severe old bug where RGB scale couldn't be set back to 256. Update NSIS script (win32 installer) 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1026 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2009-09-11 22:40:47 +00:00
Yves Rizoud
0f5d002505 version tag 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1025 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2009-09-11 22:16:41 +00:00
Yves Rizoud
8cf1266325 Updated readme 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1023 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2009-09-11 21:18:42 +00:00
Yves Rizoud
e1d8ca9d05 Fixed one compilation warning, fixed typo in help, Updated help and credits (pending approval by Pulkomandy!) 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1022 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2009-09-11 19:52:09 +00:00
Yves Rizoud
2ce0a2538b Merged in fix by Petter (issue 211 comment 26). Made the C64 save window remember its settings (while the program is open) 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1021 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2009-09-06 18:59:20 +00:00
Yves Rizoud
c894caf2f8 Merged in Petter's save options for c64 pictures. (issue 211 comment 25) 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1020 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2009-09-05 22:10:49 +00:00
Yves Rizoud
ba42b3cb17 In fullscreen mode, auto-activate wide/tall pixels when you load a C64 multicolor picture, or a PNG picture you saved with wide/tall pixels. 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1019 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2009-09-05 21:20:43 +00:00
Yves Rizoud
b934f1d57c 4-space tabs for c64 load/save code 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1018 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2009-09-05 20:52:43 +00:00
Yves Rizoud
b92e8f288e Updated copyright line 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1017 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2009-09-05 19:53:15 +00:00
Yves Rizoud
2e46820b83 Fixed tabulations to 2spaces (the most common in this file). Tiny bit of error-check on saving. Implemented preview scaling to display c64 widepixel pictures properly. Not done yet: Auto-set wide or wide2 pixels after loading a picture with wide pixels. 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1016 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2009-09-05 19:49:18 +00:00
Adrien Destugues
6c3963bf33 We're going to get it right... 
Some vocabulary :
-We call "screen" the pixels that the user actually sees, including any menu, cursor, opened window. So the function count_used_colors_screen_area counts colors there.
-We call "picture" the pixels that make the full picture, as you want to save it. count_used_colors and count_used_colors_area counts color there.


git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1015 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2009-09-05 17:02:18 +00:00
Adrien Destugues
62ba2fd885 Added c64 picture samples 
Put the correct version of loadsave.c. Sorry I'm a little ill today.


git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1014 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2009-09-05 16:22:35 +00:00
Adrien Destugues
cc47a21eca Added support for loading and saving c64 fileformats. Please test it :) 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1013 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2009-09-05 13:55:51 +00:00
Adrien Destugues
04cbf954ca Fixed a display bug with small picture in zoom mode and grad rect. 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1012 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2009-09-05 13:41:23 +00:00
Adrien Destugues
dcbbd07f8a Fixes issue 212 (segfault in gradrect). The operation is now cancelled if the rectangle is fully out of the picture. 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1011 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2009-09-05 12:55:09 +00:00