summaryrefslogtreecommitdiff
path: root/src/resources/image.cpp
AgeCommit message (Collapse)AuthorFilesLines
2009-03-27Fixed include structure in resource/ directoryBjørn Lindeijer1-15/+15
There is also a new rule that trivial constructors and destructors should no longer be trivially "documented", since this just takes up space with no gain.
2009-03-23Merge branch 'aethyra/master'Bjørn Lindeijer1-2/+77
Conflicts: Many files.
2009-03-17Added an image merge feature loosely based on a merge function found inIra Rice1-2/+77
the open source project Wormux. To improve SDL performance, the number of layers that are pushed out to the hardware or software buffers should be reduced, which is where this function comes into play, as it combines two surfaces together so that the number of blit operations is reduced. This function is currently not used, but will be used once a good way to link each of the target systems is determined so that it only initiates when SDL is enabled, as well as making sure that each hook that uses this function is benefiting from it sufficiently. At the moment, it's suspected that the particle engine will likely be the most likely to benefit from this function, followed by tile drawing, then sprite drawing. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-10Fixed header files, as well as removed the unused buddy list class (notIra Rice1-2/+3
useful since buddy lists are tracked through the player relation interface instead) Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-30Some style cleanups to the image class. TODO: Find a way to fix theIra Rice1-21/+22
subimage class so that when OpenGL isn't enabled, GUI opacities can still be applied. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-23Removed unnecessary references to The Mana World in code headersBjørn Lindeijer1-4/+4
This dates back to the old days of TMW, but the usage instructions of GPLv2 don't mention this being necessary. Since it doesn't add anything, avoid the branding in these sections.
2008-11-18Pedantic fixes to the client, where I alphabetized all of the include Ira Rice1-4/+1
statements, as well as removing the new skill dialog, which we do not, nor will we use (if we do, it'd be a new one that we'd make). WARNING!!! This, and all other previous builds have a linker error for the Gnome libraries version 4.3.2 on my setup. It's assumed that this is also the case for other users of this library as well. I'm currently assuming that there's a bug in the compiler itself, and will look into reporting this, but in the mean time, it doesn't build for these users, unfortunately. Sorry about this.
2008-07-18Import of client treeLloyd Bryant1-1/+1
2007-11-21Merged revisions 3705-3711,3714,3718,3721-3722,3729-3731,3735,3742 via ↵Bjørn Lindeijer1-1/+46
svnmerge from https://themanaworld.svn.sourceforge.net/svnroot/themanaworld/tmw/trunk (dynamic recoloring of sprites and related changes) ........ r3705 | gmelquio | 2007-11-03 10:58:25 +0100 (Sat, 03 Nov 2007) | 1 line Fixed double load of hair graphics. ........ r3706 | gmelquio | 2007-11-03 22:04:51 +0100 (Sat, 03 Nov 2007) | 1 line Added automatic recoloring of images. Inspired by fungos' ideas (PR #41). ........ r3707 | gmelquio | 2007-11-03 22:08:21 +0100 (Sat, 03 Nov 2007) | 1 line Experimented recoloring on scorpions. ........ r3708 | gmelquio | 2007-11-04 12:52:44 +0100 (Sun, 04 Nov 2007) | 1 line Tightened palette handling. ........ r3709 | gmelquio | 2007-11-04 12:54:31 +0100 (Sun, 04 Nov 2007) | 1 line Experimented with scorpions again. ........ r3710 | gmelquio | 2007-11-04 16:40:37 +0100 (Sun, 04 Nov 2007) | 1 line Applied recoloring to hair styles. ........ r3711 | gmelquio | 2007-11-04 17:50:37 +0100 (Sun, 04 Nov 2007) | 1 line Converted slimes to recoloring. ........ r3742 | gmelquio | 2007-11-16 14:16:00 +0100 (Fri, 16 Nov 2007) | 1 line Sped up recoloring of transparent pixels. ........
2007-11-20Merged revisions 3642,3662-3664,3667 via svnmerge from Bjørn Lindeijer1-24/+11
https://themanaworld.svn.sourceforge.net/svnroot/themanaworld/tmw/trunk ........ r3642 | gmelquio | 2007-10-19 19:46:46 +0200 (Fri, 19 Oct 2007) | 1 line Factored code between resource handlers. Implemented failure-friendly sprite loader. ........ r3662 | gmelquio | 2007-10-21 21:01:16 +0200 (Sun, 21 Oct 2007) | 1 line Added persistent positioning. ........ r3663 | gmelquio | 2007-10-21 21:03:43 +0200 (Sun, 21 Oct 2007) | 1 line Fixed missing pixels at bottom and right. ........ r3664 | gmelquio | 2007-10-21 21:05:56 +0200 (Sun, 21 Oct 2007) | 1 line Changed to use default values when restoring missing settings. ........ r3667 | gmelquio | 2007-10-21 22:09:08 +0200 (Sun, 21 Oct 2007) | 1 line Fixed invisible text in dropboxes and shopboxes. ........
2007-10-18Merged removal of dependency on Guichan OpenGL from trunk to 0.0 branch, Bjørn Lindeijer1-23/+43
including optimization of OpenGL memory usage on modern OpenGL drivers. Patches by Guillaume Melquiond.
2007-09-20Merged a bunch of small changes from trunk to 0.0 and set svn:eol-style Bjørn Lindeijer1-2/+2
to native for some files that were still missing this property. This is a feeble attempt to reduce the amount of conflicts for future merges.
2007-06-20Set GL texture index to zero when an image uses the SDL backend (fix by ↵Philipp Sehmisch1-1/+5
Guillaume Melquiond from trunk version)
2007-06-03Fixed image loading in software mode to not check for alpha layer with imagesBjørn Lindeijer1-11/+14
aren't 32-bit and removed drawImageTransparent from Graphics class, should be set on image.
2007-06-03Fixed image loading in software mode to not assume all images are 32-bit.Bjørn Lindeijer1-1/+1
2007-03-20Reduced amount of useless logging, calculate nearest power of two in a functionBjørn Lindeijer1-37/+44
and only do the alpha check in software mode.
2007-03-18Added man page by Patrick Matthäi and restored alpha layer check.Bjørn Lindeijer1-3/+30
2007-03-18Added --version to the arguments, deleted the 'pink-code'.Rogier Polak1-68/+4
2006-12-24Major rendering performance increase in software mode, by not using RLEBjørn Lindeijer1-3/+3
compression on loaded images while most of the time, we're only drawing a small subimage of them. Also, don't try to draw an icon when it is not defined or failed to load properly.
2006-11-26Higher precision log timestamps, some more logging and support for TGA images.Bjørn Lindeijer1-1/+9
2006-09-07Fixed a typo.Björn Steinbrink1-1/+1
2006-09-07Worked around a memory leak when using OpenGL.Björn Steinbrink1-5/+16
2006-03-16A bunch of cosmetic changes.Björn Steinbrink1-5/+7
2006-03-09Made all class members named like mClassMember.Björn Steinbrink1-17/+17
2006-03-08Some fixes for compiling with pedantic compiler settings and const char* checks.Bjørn Lindeijer1-2/+2
2006-03-08Removed some conditional code.Björn Steinbrink1-16/+4
2006-03-05Merged new_playerset branch into trunk.Eugenio Favalli1-2/+2
2005-10-15Some small cleanups.Björn Steinbrink1-13/+8
2005-10-09* Made Sprite into an interface implemented by both FloorItem and Being, whichBjørn Lindeijer1-43/+32
hook themselves into the map on construction. The improved fringe layer is working as expected now. * Made sure TMW compiles without warnings even when using "-Wconversion -Wshadow -Wcast-qual -Wwrite-strings -ansi -pedantic", lots of cleanups. * Added two new small tilesets that contain the desert tiles that are twice and three times the height of a normal tile. One well in new_3-1 has been converted to use the new double tiles for testing purposes.
2005-09-16Tiny error reporting improvement.Bjørn Lindeijer1-1/+1
2005-08-29Clean up of the ConfigListener and Resource interfaces.Björn Steinbrink1-8/+10
2005-08-25Fixed line length in ChangeLog and some other small changes.Bjørn Lindeijer1-1/+1
2005-08-14Fully removed the useOpenGL global.Björn Steinbrink1-37/+59
2005-08-14Started to fade out the useOpenGL global variable.Björn Steinbrink1-1/+1
2005-08-14Moved image drawing code into the graphics class.Björn Steinbrink1-108/+20
2005-08-13Huge header cleanup to reduce dependencies and compile time.Björn Steinbrink1-3/+5
2005-08-11Little cleanup and simplification.Andrej Sinicyn1-4/+1
2005-07-27Committing merging opengl and sdl part 3 by AndrejBjørn Lindeijer1-6/+17
2005-07-26OpenGL/SDL combined in the same exe. Not in the cutest way, but we'll find aBjørn Lindeijer1-172/+187
nicer approach after the release.
2005-07-16Made Image/SubImage being drawn by Graphics. Removed some redundant code.Björn Steinbrink1-80/+6
2005-07-11Committed header dependencies reducing patch by DoenerBjørn Lindeijer1-4/+1
2005-06-23Finishing resource manager ability to clean up resources. Still work to do onBjørn Lindeijer1-4/+1
resources other than images.
2005-06-21Image loader now automatically determines whether to use masked drawing orBjørn Lindeijer1-53/+104
an alpha layer.
2005-05-27autoTarget is now a Being*, also may have fixed related crash and added labelBjørn Lindeijer1-4/+1
to show current target.
2005-05-21Fix opacity of Window titles in OpenGL and scroll areas which broke last commitBjørn Lindeijer1-0/+2
2005-05-13Fixed minimap transparent background to work in both SDL and OpenGL by usingBjørn Lindeijer1-33/+0
Guichan.
2005-05-08Somehow fixed segmentation fault which was occuring on line:Aaron Marks1-2/+2
this->alpha = alpha;
2005-05-02Made config.xml, tmw.log and chatlog.txt always appear in ~/.tmw on *nix.Bjørn Lindeijer1-4/+4
2005-03-26Images are now exclusively loaded through PhysFS, and Tiled maps should loadBjørn Lindeijer1-29/+7
fine again.
2005-03-25Fix compile issues on Windows.Bjørn Lindeijer1-3/+3
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-09-08 11:59:34 +0000