Menu
▾
▴
[Qonk-commit] SF.net SVN: qonk: [10] branches
|
From: <eX...@us...> - 2007-03-26 15:05:17
|
Revision: 10
http://qonk.svn.sourceforge.net/qonk/?rev=10&view=rev
Author: eXinion
Date: 2007-03-26 07:55:05 -0700 (Mon, 26 Mar 2007)
Log Message:
-----------
Added Paths:
-----------
branches/networked_original_2007-03-26/
branches/networked_original_2007-03-26/client/
branches/networked_original_2007-03-26/client/COPYING
branches/networked_original_2007-03-26/client/Makefile
branches/networked_original_2007-03-26/client/Makefile_client
branches/networked_original_2007-03-26/client/SDL_gfxPrimitives.c
branches/networked_original_2007-03-26/client/SDL_gfxPrimitives.h
branches/networked_original_2007-03-26/client/SDL_gfxPrimitives_font.h
branches/networked_original_2007-03-26/client/actions.cpp
branches/networked_original_2007-03-26/client/actions.h
branches/networked_original_2007-03-26/client/animations.cpp
branches/networked_original_2007-03-26/client/animations.h
branches/networked_original_2007-03-26/client/config.cpp
branches/networked_original_2007-03-26/client/config.h
branches/networked_original_2007-03-26/client/coordinate.cpp
branches/networked_original_2007-03-26/client/coordinate.h
branches/networked_original_2007-03-26/client/extensions.cpp
branches/networked_original_2007-03-26/client/extensions.h
branches/networked_original_2007-03-26/client/font.ttf
branches/networked_original_2007-03-26/client/fonts.cpp
branches/networked_original_2007-03-26/client/fonts.h
branches/networked_original_2007-03-26/client/gmon.out
branches/networked_original_2007-03-26/client/main.cpp
branches/networked_original_2007-03-26/client/messages.cpp
branches/networked_original_2007-03-26/client/messages.h
branches/networked_original_2007-03-26/client/network.cpp
branches/networked_original_2007-03-26/client/network.h
branches/networked_original_2007-03-26/client/output
branches/networked_original_2007-03-26/client/planets.cpp
branches/networked_original_2007-03-26/client/planets.h
branches/networked_original_2007-03-26/client/players.cpp
branches/networked_original_2007-03-26/client/players.h
branches/networked_original_2007-03-26/client/profile
branches/networked_original_2007-03-26/client/raknet/
branches/networked_original_2007-03-26/client/raknet/NetworkTypes.h
branches/networked_original_2007-03-26/client/raknet/PacketEnumerations.h
branches/networked_original_2007-03-26/client/raknet/PacketPriority.h
branches/networked_original_2007-03-26/client/raknet/RakClientInterface.h
branches/networked_original_2007-03-26/client/raknet/RakNetLibStatic.lib
branches/networked_original_2007-03-26/client/raknet/RakNetLibStaticDebug.lib
branches/networked_original_2007-03-26/client/raknet/RakNetworkFactory.h
branches/networked_original_2007-03-26/client/raknet/RakPeerInterface.h
branches/networked_original_2007-03-26/client/raknet/RakServerInterface.h
branches/networked_original_2007-03-26/client/raknet/network.cpp
branches/networked_original_2007-03-26/client/raknet/network.h
branches/networked_original_2007-03-26/client/raknet/ships.cpp
branches/networked_original_2007-03-26/client/raknet/ships.h
branches/networked_original_2007-03-26/client/selection.cpp
branches/networked_original_2007-03-26/client/selection.h
branches/networked_original_2007-03-26/client/ships.cpp
branches/networked_original_2007-03-26/client/ships.h
branches/networked_original_2007-03-26/client/stars.cpp
branches/networked_original_2007-03-26/client/stars.h
branches/networked_original_2007-03-26/client/timer.cpp
branches/networked_original_2007-03-26/client/timer.h
branches/networked_original_2007-03-26/client/universe.cpp
branches/networked_original_2007-03-26/client/universe.h
branches/networked_original_2007-03-26/server/
branches/networked_original_2007-03-26/server/COPYING
branches/networked_original_2007-03-26/server/Makefile
branches/networked_original_2007-03-26/server/SDL_gfxPrimitives.c
branches/networked_original_2007-03-26/server/SDL_gfxPrimitives.h
branches/networked_original_2007-03-26/server/SDL_gfxPrimitives_font.h
branches/networked_original_2007-03-26/server/actions.cpp
branches/networked_original_2007-03-26/server/actions.h
branches/networked_original_2007-03-26/server/animations.cpp
branches/networked_original_2007-03-26/server/animations.h
branches/networked_original_2007-03-26/server/config.cpp
branches/networked_original_2007-03-26/server/config.h
branches/networked_original_2007-03-26/server/coordinate.cpp
branches/networked_original_2007-03-26/server/coordinate.h
branches/networked_original_2007-03-26/server/extensions.cpp
branches/networked_original_2007-03-26/server/extensions.h
branches/networked_original_2007-03-26/server/font.ttf
branches/networked_original_2007-03-26/server/fonts.cpp
branches/networked_original_2007-03-26/server/fonts.h
branches/networked_original_2007-03-26/server/gmon.out
branches/networked_original_2007-03-26/server/main.cpp
branches/networked_original_2007-03-26/server/main.cpp.notneeded
branches/networked_original_2007-03-26/server/main.h
branches/networked_original_2007-03-26/server/messages.cpp
branches/networked_original_2007-03-26/server/messages.h
branches/networked_original_2007-03-26/server/network.cpp
branches/networked_original_2007-03-26/server/network.h
branches/networked_original_2007-03-26/server/output
branches/networked_original_2007-03-26/server/planets.cpp
branches/networked_original_2007-03-26/server/planets.h
branches/networked_original_2007-03-26/server/players.cpp
branches/networked_original_2007-03-26/server/players.h
branches/networked_original_2007-03-26/server/profile
branches/networked_original_2007-03-26/server/raknet/
branches/networked_original_2007-03-26/server/raknet/NetworkTypes.h
branches/networked_original_2007-03-26/server/raknet/PacketEnumerations.h
branches/networked_original_2007-03-26/server/raknet/PacketPriority.h
branches/networked_original_2007-03-26/server/raknet/RakClientInterface.h
branches/networked_original_2007-03-26/server/raknet/RakNetLibStatic.lib
branches/networked_original_2007-03-26/server/raknet/RakNetLibStaticDebug.lib
branches/networked_original_2007-03-26/server/raknet/RakNetworkFactory.h
branches/networked_original_2007-03-26/server/raknet/RakPeerInterface.h
branches/networked_original_2007-03-26/server/raknet/RakServerInterface.h
branches/networked_original_2007-03-26/server/selection.cpp
branches/networked_original_2007-03-26/server/selection.h
branches/networked_original_2007-03-26/server/ships.cpp
branches/networked_original_2007-03-26/server/ships.h
branches/networked_original_2007-03-26/server/stars.cpp
branches/networked_original_2007-03-26/server/stars.h
branches/networked_original_2007-03-26/server/timer.cpp
branches/networked_original_2007-03-26/server/timer.h
branches/networked_original_2007-03-26/server/universe.cpp
branches/networked_original_2007-03-26/server/universe.h
Added: branches/networked_original_2007-03-26/client/COPYING
===================================================================
--- branches/networked_original_2007-03-26/client/COPYING (rev 0)
+++ branches/networked_original_2007-03-26/client/COPYING 2007-03-26 14:55:05 UTC (rev 10)
@@ -0,0 +1,340 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+ 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users. This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it. (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.) You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+ To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have. You must make sure that they, too, receive or can get the
+source code. And you must show them these terms so they know their
+rights.
+
+ We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+ Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software. If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+ Finally, any free program is threatened constantly by software
+patents. We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary. To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ GNU GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License. The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language. (Hereinafter, translation is included without limitation in
+the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+ 1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+ 2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) You must cause the modified files to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ b) You must cause any work that you distribute or publish, that in
+ whole or in part contains or is derived from the Program or any
+ part thereof, to be licensed as a whole at no charge to all third
+ parties under the terms of this License.
+
+ c) If the modified program normally reads commands interactively
+ when run, you must cause it, when started running for such
+ interactive use in the most ordinary way, to print or display an
+ announcement including an appropriate copyright notice and a
+ notice that there is no warranty (or else, saying that you provide
+ a warranty) and that users may redistribute the program under
+ these conditions, and telling the user how to view a copy of this
+ License. (Exception: if the Program itself is interactive but
+ does not normally print such an announcement, your work based on
+ the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+ a) Accompany it with the complete corresponding machine-readable
+ source code, which must be distributed under the terms of Sections
+ 1 and 2 above on a medium customarily used for software interchange; or,
+
+ b) Accompany it with a written offer, valid for at least three
+ years, to give any third party, for a charge no more than your
+ cost of physically performing source distribution, a complete
+ machine-readable copy of the corresponding source code, to be
+ distributed under the terms of Sections 1 and 2 above on a medium
+ customarily used for software interchange; or,
+
+ c) Accompany it with the information you received as to the offer
+ to distribute corresponding source code. (This alternative is
+ allowed only for noncommercial distribution and only if you
+ received the program in object code or executable form with such
+ an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it. For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable. However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License. Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+ 5. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Program or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+ 6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+ 7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all. For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded. In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+ 9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation. If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+ 10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission. For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this. Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+ NO WARRANTY
+
+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+ Gnomovision version 69, Copyright (C) year name of author
+ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+ `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+ <signature of Ty Coon>, 1 April 1989
+ Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs. If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library. If this is what you want to do, use the GNU Library General
+Public License instead of this License.
Added: branches/networked_original_2007-03-26/client/Makefile
===================================================================
--- branches/networked_original_2007-03-26/client/Makefile (rev 0)
+++ branches/networked_original_2007-03-26/client/Makefile 2007-03-26 14:55:05 UTC (rev 10)
@@ -0,0 +1,15 @@
+CXX=g++
+CFLAGS=`sdl-config --cflags` -O3 -I/usr/local/include/raknet
+LIBS=`sdl-config --libs` -lSDL_ttf -lraknet
+OBJECTS=SDL_gfxPrimitives.o extensions.o coordinate.o stars.o planets.o selection.o ships.o main.o actions.o players.o universe.o animations.o fonts.o messages.o timer.o config.o network.o
+
+all: qonk
+
+qonk: $(OBJECTS)
+ $(CXX) $(CFLAGS) $(LIBS) $(OBJECTS) -o qonk
+
+.cpp.o:
+ $(CXX) $(CFLAGS) -c $<
+
+clean:
+ @rm -vf *.o *~ qonk screenshot.bmp DEADJOE
Added: branches/networked_original_2007-03-26/client/Makefile_client
===================================================================
--- branches/networked_original_2007-03-26/client/Makefile_client (rev 0)
+++ branches/networked_original_2007-03-26/client/Makefile_client 2007-03-26 14:55:05 UTC (rev 10)
@@ -0,0 +1,15 @@
+CXX=g++
+CFLAGS=`sdl-config --cflags` -O3 -I/usr/local/include/raknet -I/usr/local/lib
+LIBS=`sdl-config --libs` -lSDL_ttf -lraknet
+OBJECTS=SDL_gfxPrimitives.o extensions.o coordinate.o stars.o planets.o selection.o ships.o main.o actions.o players.o universe.o animations.o fonts.o messages.o timer.o config.o network.o
+
+all: qonk
+
+qonk: $(OBJECTS)
+ $(CXX) $(CFLAGS) $(LIBS) $(OBJECTS) -o qonk
+
+.cpp.o:
+ $(CXX) $(CFLAGS) -c $<
+
+clean:
+ @rm -vf *.o *~ qonk screenshot.bmp DEADJOE
Added: branches/networked_original_2007-03-26/client/SDL_gfxPrimitives.c
===================================================================
--- branches/networked_original_2007-03-26/client/SDL_gfxPrimitives.c (rev 0)
+++ branches/networked_original_2007-03-26/client/SDL_gfxPrimitives.c 2007-03-26 14:55:05 UTC (rev 10)
@@ -0,0 +1,3708 @@
+/*
+
+ SDL_gfxPrimitives - Graphics primitives for SDL surfaces
+
+ LGPL (c) A. Schiffler
+
+*/
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <math.h>
+#include <string.h>
+
+#include "SDL_gfxPrimitives.h"
+#include "SDL_gfxPrimitives_font.h"
+
+/* -===================- */
+
+/* ----- Defines for pixel clipping tests */
+
+#define clip_xmin(surface) surface->clip_rect.x
+#define clip_xmax(surface) surface->clip_rect.x+surface->clip_rect.w-1
+#define clip_ymin(surface) surface->clip_rect.y
+#define clip_ymax(surface) surface->clip_rect.y+surface->clip_rect.h-1
+
+/* ----- Pixel - fast, no blending, no locking, clipping */
+
+int fastPixelColorNolock(SDL_Surface * dst, Sint16 x, Sint16 y, Uint32 color)
+{
+ int bpp;
+ Uint8 *p;
+
+ /*
+ * Honor clipping setup at pixel level
+ */
+ if ((x >= clip_xmin(dst)) && (x <= clip_xmax(dst)) && (y >= clip_ymin(dst)) && (y <= clip_ymax(dst))) {
+
+ /*
+ * Get destination format
+ */
+ bpp = dst->format->BytesPerPixel;
+ p = (Uint8 *) dst->pixels + y * dst->pitch + x * bpp;
+ switch (bpp) {
+ case 1:
+ *p = color;
+ break;
+ case 2:
+ *(Uint16 *) p = color;
+ break;
+ case 3:
+ if (SDL_BYTEORDER == SDL_BIG_ENDIAN) {
+ p[0] = (color >> 16) & 0xff;
+ p[1] = (color >> 8) & 0xff;
+ p[2] = color & 0xff;
+ } else {
+ p[0] = color & 0xff;
+ p[1] = (color >> 8) & 0xff;
+ p[2] = (color >> 16) & 0xff;
+ }
+ break;
+ case 4:
+ *(Uint32 *) p = color;
+ break;
+ } /* switch */
+
+
+ }
+
+ return (0);
+}
+
+/* ----- Pixel - fast, no blending, no locking, no clipping */
+
+/* (faster but dangerous, make sure we stay in surface bounds) */
+
+int fastPixelColorNolockNoclip(SDL_Surface * dst, Sint16 x, Sint16 y, Uint32 color)
+{
+ int bpp;
+ Uint8 *p;
+
+ /*
+ * Get destination format
+ */
+ bpp = dst->format->BytesPerPixel;
+ p = (Uint8 *) dst->pixels + y * dst->pitch + x * bpp;
+ switch (bpp) {
+ case 1:
+ *p = color;
+ break;
+ case 2:
+ *(Uint16 *) p = color;
+ break;
+ case 3:
+ if (SDL_BYTEORDER == SDL_BIG_ENDIAN) {
+ p[0] = (color >> 16) & 0xff;
+ p[1] = (color >> 8) & 0xff;
+ p[2] = color & 0xff;
+ } else {
+ p[0] = color & 0xff;
+ p[1] = (color >> 8) & 0xff;
+ p[2] = (color >> 16) & 0xff;
+ }
+ break;
+ case 4:
+ *(Uint32 *) p = color;
+ break;
+ } /* switch */
+
+ return (0);
+}
+
+/* ----- Pixel - fast, no blending, locking, clipping */
+
+int fastPixelColor(SDL_Surface * dst, Sint16 x, Sint16 y, Uint32 color)
+{
+ int result;
+
+ /*
+ * Lock the surface
+ */
+ if (SDL_MUSTLOCK(dst)) {
+ if (SDL_LockSurface(dst) < 0) {
+ return (-1);
+ }
+ }
+
+ result = fastPixelColorNolock(dst, x, y, color);
+
+ /*
+ * Unlock surface
+ */
+ if (SDL_MUSTLOCK(dst)) {
+ SDL_UnlockSurface(dst);
+ }
+
+ return (result);
+}
+
+/* ----- Pixel - fast, no blending, locking, RGB input */
+
+int fastPixelRGBA(SDL_Surface * dst, Sint16 x, Sint16 y, Uint8 r, Uint8 g, Uint8 b, Uint8 a)
+{
+ Uint32 color;
+
+ /*
+ * Setup color
+ */
+ color = SDL_MapRGBA(dst->format, r, g, b, a);
+
+ /*
+ * Draw
+ */
+ return (fastPixelColor(dst, x, y, color));
+
+}
+
+/* ----- Pixel - fast, no blending, no locking RGB input */
+
+int fastPixelRGBANolock(SDL_Surface * dst, Sint16 x, Sint16 y, Uint8 r, Uint8 g, Uint8 b, Uint8 a)
+{
+ Uint32 color;
+
+ /*
+ * Setup color
+ */
+ color = SDL_MapRGBA(dst->format, r, g, b, a);
+
+ /*
+ * Draw
+ */
+ return (fastPixelColorNolock(dst, x, y, color));
+}
+
+/* PutPixel routine with alpha blending, input color in destination format */
+
+/* New, faster routine - default blending pixel */
+
+int _putPixelAlpha(SDL_Surface * surface, Sint16 x, Sint16 y, Uint32 color, Uint8 alpha)
+{
+ Uint32 Rmask = surface->format->Rmask, Gmask =
+ surface->format->Gmask, Bmask = surface->format->Bmask, Amask = surface->format->Amask;
+ Uint32 R, G, B, A = 0;
+
+ if (x >= clip_xmin(surface) && x <= clip_xmax(surface)
+ && y >= clip_ymin(surface) && y <= clip_ymax(surface)) {
+
+ switch (surface->format->BytesPerPixel) {
+ case 1:{ /* Assuming 8-bpp */
+ if (alpha == 255) {
+ *((Uint8 *) surface->pixels + y * surface->pitch + x) = color;
+ } else {
+ Uint8 *pixel = (Uint8 *) surface->pixels + y * surface->pitch + x;
+
+ Uint8 dR = surface->format->palette->colors[*pixel].r;
+ Uint8 dG = surface->format->palette->colors[*pixel].g;
+ Uint8 dB = surface->format->palette->colors[*pixel].b;
+ Uint8 sR = surface->format->palette->colors[color].r;
+ Uint8 sG = surface->format->palette->colors[color].g;
+ Uint8 sB = surface->format->palette->colors[color].b;
+
+ dR = dR + ((sR - dR) * alpha >> 8);
+ dG = dG + ((sG - dG) * alpha >> 8);
+ dB = dB + ((sB - dB) * alpha >> 8);
+
+ *pixel = SDL_MapRGB(surface->format, dR, dG, dB);
+ }
+ }
+ break;
+
+ case 2:{ /* Probably 15-bpp or 16-bpp */
+ if (alpha == 255) {
+ *((Uint16 *) surface->pixels + y * surface->pitch / 2 + x) = color;
+ } else {
+ Uint16 *pixel = (Uint16 *) surface->pixels + y * surface->pitch / 2 + x;
+ Uint32 dc = *pixel;
+
+ R = ((dc & Rmask) + (((color & Rmask) - (dc & Rmask)) * alpha >> 8)) & Rmask;
+ G = ((dc & Gmask) + (((color & Gmask) - (dc & Gmask)) * alpha >> 8)) & Gmask;
+ B = ((dc & Bmask) + (((color & Bmask) - (dc & Bmask)) * alpha >> 8)) & Bmask;
+ if (Amask)
+ A = ((dc & Amask) + (((color & Amask) - (dc & Amask)) * alpha >> 8)) & Amask;
+
+ *pixel = R | G | B | A;
+ }
+ }
+ break;
+
+ case 3:{ /* Slow 24-bpp mode, usually not used */
+ Uint8 *pix = (Uint8 *) surface->pixels + y * surface->pitch + x * 3;
+ Uint8 rshift8 = surface->format->Rshift / 8;
+ Uint8 gshift8 = surface->format->Gshift / 8;
+ Uint8 bshift8 = surface->format->Bshift / 8;
+ Uint8 ashift8 = surface->format->Ashift / 8;
+
+
+ if (alpha == 255) {
+ *(pix + rshift8) = color >> surface->format->Rshift;
+ *(pix + gshift8) = color >> surface->format->Gshift;
+ *(pix + bshift8) = color >> surface->format->Bshift;
+ *(pix + ashift8) = color >> surface->format->Ashift;
+ } else {
+ Uint8 dR, dG, dB, dA = 0;
+ Uint8 sR, sG, sB, sA = 0;
+
+ pix = (Uint8 *) surface->pixels + y * surface->pitch + x * 3;
+
+ dR = *((pix) + rshift8);
+ dG = *((pix) + gshift8);
+ dB = *((pix) + bshift8);
+ dA = *((pix) + ashift8);
+
+ sR = (color >> surface->format->Rshift) & 0xff;
+ sG = (color >> surface->format->Gshift) & 0xff;
+ sB = (color >> surface->format->Bshift) & 0xff;
+ sA = (color >> surface->format->Ashift) & 0xff;
+
+ dR = dR + ((sR - dR) * alpha >> 8);
+ dG = dG + ((sG - dG) * alpha >> 8);
+ dB = dB + ((sB - dB) * alpha >> 8);
+ dA = dA + ((sA - dA) * alpha >> 8);
+
+ *((pix) + rshift8) = dR;
+ *((pix) + gshift8) = dG;
+ *((pix) + bshift8) = dB;
+ *((pix) + ashift8) = dA;
+ }
+ }
+ break;
+
+ case 4:{ /* Probably 32-bpp */
+ if (alpha == 255) {
+ *((Uint32 *) surface->pixels + y * surface->pitch / 4 + x) = color;
+ } else {
+ Uint32 *pixel = (Uint32 *) surface->pixels + y * surface->pitch / 4 + x;
+ Uint32 dc = *pixel;
+
+ R = ((dc & Rmask) + (((color & Rmask) - (dc & Rmask)) * alpha >> 8)) & Rmask;
+ G = ((dc & Gmask) + (((color & Gmask) - (dc & Gmask)) * alpha >> 8)) & Gmask;
+ B = ((dc & Bmask) + (((color & Bmask) - (dc & Bmask)) * alpha >> 8)) & Bmask;
+ if (Amask)
+ A = ((dc & Amask) + (((color & Amask) - (dc & Amask)) * alpha >> 8)) & Amask;
+
+ *pixel = R | G | B | A;
+ }
+ }
+ break;
+ }
+ }
+
+ return (0);
+}
+
+/* ----- Pixel - pixel draw with blending enabled if a<255 */
+
+int pixelColor(SDL_Surface * dst, Sint16 x, Sint16 y, Uint32 color)
+{
+ Uint8 alpha;
+ Uint32 mcolor;
+ int result = 0;
+
+ /*
+ * Lock the surface
+ */
+ if (SDL_MUSTLOCK(dst)) {
+ if (SDL_LockSurface(dst) < 0) {
+ return (-1);
+ }
+ }
+
+ /*
+ * Setup color
+ */
+ alpha = color & 0x000000ff;
+ mcolor =
+ SDL_MapRGBA(dst->format, (color & 0xff000000) >> 24,
+ (color & 0x00ff0000) >> 16, (color & 0x0000ff00) >> 8, alpha);
+
+ /*
+ * Draw
+ */
+ result = _putPixelAlpha(dst, x, y, mcolor, alpha);
+
+ /*
+ * Unlock the surface
+ */
+ if (SDL_MUSTLOCK(dst)) {
+ SDL_UnlockSurface(dst);
+ }
+
+ return (result);
+}
+
+int pixelColorNolock(SDL_Surface * dst, Sint16 x, Sint16 y, Uint32 color)
+{
+ Uint8 alpha;
+ Uint32 mcolor;
+ int result = 0;
+
+ /*
+ * Setup color
+ */
+ alpha = color & 0x000000ff;
+ mcolor =
+ SDL_MapRGBA(dst->format, (color & 0xff000000) >> 24,
+ (color & 0x00ff0000) >> 16, (color & 0x0000ff00) >> 8, alpha);
+
+ /*
+ * Draw
+ */
+ result = _putPixelAlpha(dst, x, y, mcolor, alpha);
+
+ return (result);
+}
+
+
+/* Filled rectangle with alpha blending, color in destination format */
+
+int _filledRectAlpha(SDL_Surface * surface, Sint16 x1, Sint16 y1, Sint16 x2, Sint16 y2, Uint32 color, Uint8 alpha)
+{
+ Uint32 Rmask = surface->format->Rmask, Gmask =
+ surface->format->Gmask, Bmask = surface->format->Bmask, Amask = surface->format->Amask;
+ Uint32 R, G, B, A = 0;
+ Sint16 x, y;
+
+ switch (surface->format->BytesPerPixel) {
+ case 1:{ /* Assuming 8-bpp */
+ Uint8 *row, *pixel;
+ Uint8 dR, dG, dB;
+
+ Uint8 sR = surface->format->palette->colors[color].r;
+ Uint8 sG = surface->format->palette->colors[color].g;
+ Uint8 sB = surface->format->palette->colors[color].b;
+
+ for (y = y1; y <= y2; y++) {
+ row = (Uint8 *) surface->pixels + y * surface->pitch;
+ for (x = x1; x <= x2; x++) {
+ pixel = row + x;
+
+ dR = surface->format->palette->colors[*pixel].r;
+ dG = surface->format->palette->colors[*pixel].g;
+ dB = surface->format->palette->colors[*pixel].b;
+
+ dR = dR + ((sR - dR) * alpha >> 8);
+ dG = dG + ((sG - dG) * alpha >> 8);
+ dB = dB + ((sB - dB) * alpha >> 8);
+
+ *pixel = SDL_MapRGB(surface->format, dR, dG, dB);
+ }
+ }
+ }
+ break;
+
+ case 2:{ /* Probably 15-bpp or 16-bpp */
+ Uint16 *row, *pixel;
+ Uint32 dR = (color & Rmask), dG = (color & Gmask), dB = (color & Bmask), dA = (color & Amask);
+
+ for (y = y1; y <= y2; y++) {
+ row = (Uint16 *) surface->pixels + y * surface->pitch / 2;
+ for (x = x1; x <= x2; x++) {
+ pixel = row + x;
+
+ R = ((*pixel & Rmask) + ((dR - (*pixel & Rmask)) * alpha >> 8)) & Rmask;
+ G = ((*pixel & Gmask) + ((dG - (*pixel & Gmask)) * alpha >> 8)) & Gmask;
+ B = ((*pixel & Bmask) + ((dB - (*pixel & Bmask)) * alpha >> 8)) & Bmask;
+ if (Amask)
+ A = ((*pixel & Amask) + ((dA - (*pixel & Amask)) * alpha >> 8)) & Amask;
+
+ *pixel = R | G | B | A;
+ }
+ }
+ }
+ break;
+
+ case 3:{ /* Slow 24-bpp mode, usually not used */
+ Uint8 *row, *pix;
+ Uint8 dR, dG, dB, dA;
+ Uint8 rshift8 = surface->format->Rshift / 8;
+ Uint8 gshift8 = surface->format->Gshift / 8;
+ Uint8 bshift8 = surface->format->Bshift / 8;
+ Uint8 ashift8 = surface->format->Ashift / 8;
+
+ Uint8 sR = (color >> surface->format->Rshift) & 0xff;
+ Uint8 sG = (color >> surface->format->Gshift) & 0xff;
+ Uint8 sB = (color >> surface->format->Bshift) & 0xff;
+ Uint8 sA = (color >> surface->format->Ashift) & 0xff;
+
+ for (y = y1; y <= y2; y++) {
+ row = (Uint8 *) surface->pixels + y * surface->pitch;
+ for (x = x1; x <= x2; x++) {
+ pix = row + x * 3;
+
+ dR = *((pix) + rshift8);
+ dG = *((pix) + gshift8);
+ dB = *((pix) + bshift8);
+ dA = *((pix) + ashift8);
+
+ dR = dR + ((sR - dR) * alpha >> 8);
+ dG = dG + ((sG - dG) * alpha >> 8);
+ dB = dB + ((sB - dB) * alpha >> 8);
+ dA = dA + ((sA - dA) * alpha >> 8);
+
+ *((pix) + rshift8) = dR;
+ *((pix) + gshift8) = dG;
+ *((pix) + bshift8) = dB;
+ *((pix) + ashift8) = dA;
+ }
+ }
+
+ }
+ break;
+
+ case 4:{ /* Probably 32-bpp */
+ Uint32 *row, *pixel;
+ Uint32 dR = (color & Rmask), dG = (color & Gmask), dB = (color & Bmask), dA = (color & Amask);
+
+ for (y = y1; y <= y2; y++) {
+ row = (Uint32 *) surface->pixels + y * surface->pitch / 4;
+ for (x = x1; x <= x2; x++) {
+ pixel = row + x;
+
+ R = ((*pixel & Rmask) + ((dR - (*pixel & Rmask)) * alpha >> 8)) & Rmask;
+ G = ((*pixel & Gmask) + ((dG - (*pixel & Gmask)) * alpha >> 8)) & Gmask;
+ B = ((*pixel & Bmask) + ((dB - (*pixel & Bmask)) * alpha >> 8)) & Bmask;
+ if (Amask)
+ A = ((*pixel & Amask) + ((dA - (*pixel & Amask)) * alpha >> 8)) & Amask;
+
+ *pixel = R | G | B | A;
+ }
+ }
+ }
+ break;
+ }
+
+ return (0);
+}
+
+/* Draw rectangle with alpha enabled from RGBA color. */
+
+int filledRectAlpha(SDL_Surface * dst, Sint16 x1, Sint16 y1, Sint16 x2, Sint16 y2, Uint32 color)
+{
+ Uint8 alpha;
+ Uint32 mcolor;
+ int result = 0;
+
+ /*
+ * Lock the surface
+ */
+ if (SDL_MUSTLOCK(dst)) {
+ if (SDL_LockSurface(dst) < 0) {
+ return (-1);
+ }
+ }
+
+ /*
+ * Setup color
+ */
+ alpha = color & 0x000000ff;
+ mcolor =
+ SDL_MapRGBA(dst->format, (color & 0xff000000) >> 24,
+ (color & 0x00ff0000) >> 16, (color & 0x0000ff00) >> 8, alpha);
+
+ /*
+ * Draw
+ */
+ result = _filledRectAlpha(dst, x1, y1, x2, y2, mcolor, alpha);
+
+ /*
+ * Unlock the surface
+ */
+ if (SDL_MUSTLOCK(dst)) {
+ SDL_UnlockSurface(dst);
+ }
+
+ return (result);
+}
+
+/* Draw horizontal line with alpha enabled from RGBA color */
+
+int HLineAlpha(SDL_Surface * dst, Sint16 x1, Sint16 x2, Sint16 y, Uint32 color)
+{
+ return (filledRectAlpha(dst, x1, y, x2, y, color));
+}
+
+
+/* Draw vertical line with alpha enabled from RGBA color */
+
+int VLineAlpha(SDL_Surface * dst, Sint16 x, Sint16 y1, Sint16 y2, Uint32 color)
+{
+ return (filledRectAlpha(dst, x, y1, x, y2, color));
+}
+
+
+/* Pixel - using alpha weight on color for AA-drawing */
+
+int pixelColorWeight(SDL_Surface * dst, Sint16 x, Sint16 y, Uint32 color, Uint32 weight)
+{
+ Uint32 a;
+
+ /*
+ * Get alpha
+ */
+ a = (color & (Uint32) 0x000000ff);
+
+ /*
+ * Modify Alpha by weight
+ */
+ a = ((a * weight) >> 8);
+
+ return (pixelColor(dst, x, y, (color & (Uint32) 0xffffff00) | (Uint32) a));
+}
+
+/* Pixel - using alpha weight on color for AA-drawing - no locking */
+
+int pixelColorWeightNolock(SDL_Surface * dst, Sint16 x, Sint16 y, Uint32 color, Uint32 weight)
+{
+ Uint32 a;
+
+ /*
+ * Get alpha
+ */
+ a = (color & (Uint32) 0x000000ff);
+
+ /*
+ * Modify Alpha by weight
+ */
+ a = ((a * weight) >> 8);
+
+ return (pixelColorNolock(dst, x, y, (color & (Uint32) 0xffffff00) | (Uint32) a));
+}
+
+int pixelRGBA(SDL_Surface * dst, Sint16 x, Sint16 y, Uint8 r, Uint8 g, Uint8 b, Uint8 a)
+{
+ Uint32 color;
+
+ /*
+ * Check Alpha
+ */
+ if (a == 255) {
+ /*
+ * No alpha blending required
+ */
+ /*
+ * Setup color
+ */
+ color = SDL_MapRGBA(dst->format, r, g, b, a);
+ /*
+ * Draw
+ */
+ return (fastPixelColor(dst, x, y, color));
+ } else {
+ /*
+ * Alpha blending required
+ */
+ /*
+ * Draw
+ */
+ return (pixelColor(dst, x, y, ((Uint32) r << 24) | ((Uint32) g << 16) | ((Uint32) b << 8) | (Uint32) a));
+ }
+}
+
+/* ----- Horizontal line */
+
+/* Just store color including alpha, no blending */
+
+int hlineColorStore(SDL_Surface * dst, Sint16 x1, Sint16 x2, Sint16 y, Uint32 color)
+{
+ Sint16 left, right, top, bottom;
+ Uint8 *pixel, *pixellast;
+ int dx;
+ int pixx, pixy;
+ Sint16 w;
+ Sint16 xtmp;
+ int result = -1;
+
+ /*
+ * Get clipping boundary
+ */
+ left = dst->clip_rect.x;
+ right = dst->clip_rect.x + dst->clip_rect.w - 1;
+ top = dst->clip_rect.y;
+ bottom = dst->clip_rect.y + dst->clip_rect.h - 1;
+
+ /*
+ * Check visibility of hline
+ */
+ if ((x1<left) && (x2<left)) {
+ return(0);
+ }
+ if ((x1>right) && (x2>right)) {
+ return(0);
+ }
+ if ((y<top) || (y>bottom)) {
+ return (0);
+ }
+
+ /*
+ * Clip x
+ */
+ if (x1 < left) {
+ x1 = left;
+ }
+ if (x2 > right) {
+ x2 = right;
+ }
+
+ /*
+ * Swap x1, x2 if required
+ */
+ if (x1 > x2) {
+ xtmp = x1;
+ x1 = x2;
+ x2 = xtmp;
+ }
+
+ /*
+ * Calculate width
+ */
+ w = x2 - x1;
+
+ /*
+ * Sanity check on width
+ */
+ if (w < 0) {
+ return (0);
+ }
+
+ /*
+ * Lock surface
+ */
+ SDL_LockSurface(dst);
+
+ /*
+ * More variable setup
+ */
+ dx = w;
+ pixx = dst->format->BytesPerPixel;
+ pixy = dst->pitch;
+ pixel = ((Uint8 *) dst->pixels) + pixx * (int) x1 + pixy * (int) y;
+
+ /*
+ * Draw
+ */
+ switch (dst->format->BytesPerPixel) {
+ case 1:
+ memset(pixel, color, dx);
+ break;
+ case 2:
+ pixellast = pixel + dx + dx;
+ for (; pixel <= pixellast; pixel += pixx) {
+ *(Uint16 *) pixel = color;
+ }
+ break;
+ case 3:
+ pixellast = pixel + dx + dx + dx;
+ for (; pixel <= pixellast; pixel += pixx) {
+ if (SDL_BYTEORDER == SDL_BIG_ENDIAN) {
+ pixel[0] = (color >> 16) & 0xff;
+ pixel[1] = (color >> 8) & 0xff;
+ pixel[2] = color & 0xff;
+ } else {
+ pixel[0] = color & 0xff;
+ pixel[1] = (color >> 8) & 0xff;
+ pixel[2] = (color >> 16) & 0xff;
+ }
+ }
+ break;
+ default: /* case 4 */
+ dx = dx + dx;
+ pixellast = pixel + dx + dx;
+ for (; pixel <= pixellast; pixel += pixx) {
+ *(Uint32 *) pixel = color;
+ }
+ break;
+ }
+
+ /*
+ * Unlock surface
+ */
+ SDL_UnlockSurface(dst);
+
+ /*
+ * Set result code
+ */
+ result = 0;
+
+ return (result);
+}
+
+int hlineRGBAStore(SDL_Surface * dst, Sint16 x1, Sint16 x2, Sint16 y, Uint8 r, Uint8 g, Uint8 b, Uint8 a)
+{
+ /*
+ * Draw
+ */
+ return (hlineColorStore(dst, x1, x2, y, ((Uint32) r << 24) | ((Uint32) g << 16) | ((Uint32) b << 8) | (Uint32) a));
+}
+
+int hlineColor(SDL_Surface * dst, Sint16 x1, Sint16 x2, Sint16 y, Uint32 color)
+{
+ Sint16 left, right, top, bottom;
+ Uint8 *pixel, *pixellast;
+ int dx;
+ int pixx, pixy;
+ Sint16 w;
+ Sint16 xtmp;
+ int result = -1;
+ Uint8 *colorptr;
+
+ /*
+ * Get clipping boundary
+ */
+ left = dst->clip_rect.x;
+ right = dst->clip_rect.x + dst->clip_rect.w - 1;
+ top = dst->clip_rect.y;
+ bottom = dst->clip_rect.y + dst->clip_rect.h - 1;
+
+ /*
+ * Check visibility of hline
+ */
+ if ((x1<left) && (x2<left)) {
+ return(0);
+ }
+ if ((x1>right) && (x2>right)) {
+ return(0);
+ }
+ if ((y<top) || (y>bottom)) {
+ return (0);
+ }
+
+ /*
+ * Clip x
+ */
+ if (x1 < left) {
+ x1 = left;
+ }
+ if (x2 > right) {
+ x2 = right;
+ }
+
+ /*
+ * Swap x1, x2 if required
+ */
+ if (x1 > x2) {
+ xtmp = x1;
+ x1 = x2;
+ x2 = xtmp;
+ }
+
+ /*
+ * Calculate width
+ */
+ w = x2 - x1;
+
+ /*
+ * Sanity check on width
+ */
+ if (w < 0) {
+ return (0);
+ }
+
+ /*
+ * Alpha check
+ */
+ if ((color & 255) == 255) {
+
+ /*
+ * No alpha-blending required
+ */
+
+ /*
+ * Setup color
+ */
+ colorptr = (Uint8 *) & color;
+ if (SDL_BYTEORDER == SDL_BIG_ENDIAN) {
+ color = SDL_MapRGBA(dst->format, colorptr[0], colorptr[1], colorptr[2], colorptr[3]);
+ } else {
+ color = SDL_MapRGBA(dst->format, colorptr[3], colorptr[2], colorptr[1], colorptr[0]);
+ }
+
+ /*
+ * Lock surface
+ */
+ SDL_LockSurface(dst);
+
+ /*
+ * More variable setup
+ */
+ dx = w;
+ pixx = dst->format->BytesPerPixel;
+ pixy = dst->pitch;
+ pixel = ((Uint8 *) dst->pixels) + pixx * (int) x1 + pixy * (int) y;
+
+ /*
+ * Draw
+ */
+ switch (dst->format->BytesPerPixel) {
+ case 1:
+ memset(pixel, color, dx);
+ break;
+ case 2:
+ pixellast = pixel + dx + dx;
+ for (; pixel <= pixellast; pixel += pixx) {
+ *(Uint16 *) pixel = color;
+ }
+ break;
+ case 3:
+ pixellast = pixel + dx + dx + dx;
+ for (; pixel <= pixellast; pixel += pixx) {
+ if (SDL_BYTEORDER == SDL_BIG_ENDIAN) {
+ pixel[0] = (color >> 16) & 0xff;
+ pixel[1] = (color >> 8) & 0xff;
+ pixel[2] = color & 0xff;
+ } else {
+ pixel[0] = color & 0xff;
+ pixel[1] = (color >> 8) & 0xff;
+ pixel[2] = (color >> 16) & 0xff;
+ }
+ }
+ break;
+ default: /* case 4 */
+ dx = dx + dx;
+ pixellast = pixel + dx + dx;
+ for (; pixel <= pixellast; pixel += pixx) {
+ *(Uint32 *) pixel = color;
+ }
+ break;
+ }
+
+ /*
+ * Unlock surface
+ */
+ SDL_UnlockSurface(dst);
+
+ /*
+ * Set result code
+ */
+ result = 0;
+
+ } else {
+
+ /*
+ * Alpha blending blit
+ */
+
+ result = HLineAlpha(dst, x1, x1 + w, y, color);
+
+ }
+
+ return (result);
+}
+
+int hlineRGBA(SDL_Surface * dst, Sint16 x1, Sint16 x2, Sint16 y, Uint8 r, Uint8 g, Uint8 b, Uint8 a)
+{
+ /*
+ * Draw
+ */
+ return (hlineColor(dst, x1, x2, y, ((Uint32) r << 24) | ((Uint32) g << 16) | ((Uint32) b << 8) | (Uint32) a));
+}
+
+/* ----- Vertical line */
+
+int vlineColor(SDL_Surface * dst, Sint16 x, Sint16 y1, Sint16 y2, Uint32 color)
+{
+ Sint16 left, right, top, bottom;
+ Uint8 *pixel, *pixellast;
+ int dy;
+ int pixx, pixy;
+ Sint16 h;
+ Sint16 ytmp;
+ int result = -1;
+ Uint8 *colorptr;
+
+ /*
+ * Get clipping boundary
+ */
+ left = dst->clip_rect.x;
+ right = dst->clip_rect.x + dst->clip_rect.w - 1;
+ top = dst->clip_rect.y;
+ bottom = dst->clip_rect.y + dst->clip_rect.h - 1;
+
+ /*
+ * Check visibility of vline
+ */
+ if ((x<left) || (x>right)) {
+ return (0);
+ }
+ if ((y1<top) && (y2<top)) {
+ return(0);
+ }
+ if ((y1>bottom) && (y2>bottom)) {
+ return(0);
+ }
+
+ /*
+ * Clip y
+ */
+ if (y1 < top) {
+ y1 = top;
+ }
+ if (y2 > bottom) {
+ y2 = bottom;
+ }
+
+ /*
+ * Swap y1, y2 if required
+ */
+ if (y1 > y2) {
+ ytmp = y1;
+ y1 = y2;
+ y2 = ytmp;
+ }
+
+ /*
+ * Calculate height
+ */
+ h = y2 - y1;
+
+ /*
+ * Sanity check on height
+ */
+ if (h < 0) {
+ return (0);
+ }
+
+ /*
+ * Alpha check
+ */
+ if ((color & 255) == 255) {
+
+ /*
+ * No alpha-blending required
+ */
+
+ /*
+ * Setup color
+ */
+ colorptr = (Uint8 *) & color;
+ if (SDL_BYTEORDER == SDL_BIG_ENDIAN) {
+ color = SDL_MapRGBA(dst->format, colorptr[0], colorptr[1], colorptr[2], colorptr[3]);
+ } else {
+ color = SDL_MapRGBA(dst->format, colorptr[3], colorptr[2], colorptr[1], colorptr[0]);
+ }
+
+ /*
+ * Lock surface
+ */
+ SDL_LockSurface(dst);
+
+ /*
+ * More variable setup
+ */
+ dy = h;
+ pixx = dst->format->BytesPerPixel;
+ pixy = dst->pitch;
+ pixel = ((Uint8 *) dst->pixels) + pixx * (int) x + pixy * (int) y1;
+ pixellast = pixel + pixy * dy;
+
+ /*
+ * Draw
+ */
+ switch (dst->format->BytesPerPixel) {
+ case 1:
+ for (; pixel <= pixellast; pixel += pixy) {
+ *(Uint8 *) pixel = color;
+ }
+ break;
+ case 2:
+ for (; pixel <= pixellast; pixel += pixy) {
+ *(Uint16 *) pixel = color;
+ }
+ break;
+ case 3:
+ for (; pixel <= pixellast; pixel += pixy) {
+ if (SDL_BYTEORDER == SDL_BIG_ENDIAN) {
+ pixel[0] = (color >> 16) & 0xff;
+ pixel[1] = (color >> 8) & 0xff;
+ pixel[2] = color & 0xff;
+ } else {
+ pixel[0] = color & 0xff;
+ pixel[1] = (color >> 8) & 0xff;
+ pixel[2] = (color >> 16) & 0xff;
+ }
+ }
+ break;
+ default: /* case 4 */
+ for (; pixel <= pixellast; pixel += pixy) {
+ *(Uint32 *) pixel = color;
+ }
+ break;
+ }
+
+ /*
+ * Unlock surface
+ */
+ SDL_UnlockSurface(dst);
+
+ /*
+ * Set result code
+ */
+ result = 0;
+
+ } else {
+
+ /*
+ * Alpha blending blit
+ */
+
+ result = VLineAlpha(dst, x, y1, y1 + h, color);
+
+ }
+
+ return (result);
+}
+
+int vlineRGBA(SDL_Surface * dst, Sint16 x, Sint16 y1, Sint16 y2, Uint8 r, Uint8 g, Uint8 b, Uint8 a)
+{
+ /*
+ * Draw
+ */
+ return (vlineColor(dst, x, y1, y2, ((Uint32) r << 24) | ((Uint32) g << 16) | ((Uint32) b << 8) | (Uint32) a));
+}
+
+/* ----- Rectangle */
+
+int rectangleColor(SDL_Surface * dst, Sint16 x1, Sint16 y1, Sint16 x2, Sint16 y2, Uint32 color)
+{
+ int result;
+ Sint16 w, h, xtmp, ytmp;
+
+ /*
+ * Swap x1, x2 if required
+ */
+ if (x1 > x2) {
+ xtmp = x1;
+ x1 = x2;
+ x2 = xtmp;
+ }
+
+ /*
+ * Swap y1, y2 if required
+ */
+ if (y1 > y2) {
+ ytmp = y1;
+ y1 = y2;
+ y2 = ytmp;
+ }
+
+ /*
+ * Calculate width&height
+ */
+ w = x2 - x1;
+ h = y2 - y1;
+
+ /*
+ * Sanity check
+ */
+ if ((w < 0) || (h < 0)) {
+ return (0);
+ }
+
+ /*
+ * Test for special cases of straight lines or single point
+ */
+ if (x1 == x2) {
+ if (y1 == y2) {
+ return (pixelColor(dst, x1, y1, color));
+ } else {
+ return (vlineColor(dst, x1, y1, y2, color));
+ }
+ } else {
+ if (y1 == y2) {
+ return (hlineColor(dst, x1, x2, y1, color));
+ }
+ }
+
+ /*
+ * Draw rectangle
+ */
+ result = 0;
+ result |= hlineColor(dst, x1, x2, y1, color);
+ result |= hlineColor(dst, x1, x2, y2, color);
+ y1 += 1;
+ y2 -= 1;
+ if (y1<=y2) {
+ result |= vlineColor(dst, x1, y1, y2, color);
+ result |= vlineColor(dst, x2, y1, y2, color);
+ }
+ return (result);
+
+}
+
+int rectangleRGBA(SDL_Surface * dst, Sint16 x1, Sint16 y1, Sint16 x2, Sint16 y2, Uint8 r, Uint8 g, Uint8 b, Uint8 a)
+{
+ /*
+ * Draw
+ */
+ return (rectangleColor
+ (dst, x1, y1, x2, y2, ((Uint32) r << 24) | ((Uint32) g << 16) | ((Uint32) b << 8) | (Uint32) a));
+}
+
+/* --------- Clipping routines for line */
+
+/* Clipping based heavily on code from */
+/* http://www.ncsa.uiuc.edu/Vis/Graphics/src/clipCohSuth.c */
+
+#define CLIP_LEFT_EDGE 0x1
+#define CLIP_RIGHT_EDGE 0x2
+#define CLIP_BOTTOM_EDGE 0x4
+#define CLIP_TOP_EDGE 0x8
+#define CLIP_INSIDE(a) (!a)
+#define CLIP_REJECT(a,b) (a&b)
+#define CLIP_ACCEPT(a,b) (!(a|b))
+
+static int clipEncode(Sint16 x, Sint16 y, Sint16 left, Sint16 top, Sint16 right, Sint16 bottom)
+{
+ int code = 0;
+
+ if (x < left) {
+ code |= CLIP_LEFT_EDGE;
+ } else if (x > right) {
+ code |= CLIP_RIGHT_EDGE;
+ }
+ if (y < top) {
+ code |= CLIP_TOP_EDGE;
+ } else if (y > bottom) {
+ code |= CLIP_BOTTOM_EDGE;
+ }
+ return code;
+}
+
+static int clipLine(SDL_Surface * dst, Sint16 * x1, Sint16 * y1, Sint16 * x2, Sint16 * y2)
+{
+ Sint16 left, right, top, bottom;
+ int code1, code2;
+ int draw = 0;
+ Sint16 swaptmp;
+ float m;
+
+ /*
+ * Get clipping boundary
+ */
+ left = dst->clip_rect.x;
+ right = dst->clip_rect.x + dst->clip_rect.w - 1;
+ top = dst->clip_rect.y;
+ bottom = dst->clip_rect.y + dst->clip_rect.h - 1;
+
+ while (1) {
+ code1 = clipEncode(*x1, *y1, left, top, right, bottom);
+ code2 = clipEncode(*x2, *y2, left, top, right, bottom);
+ if (CLIP_ACCEPT(code1, code2)) {
+ draw = 1;
+ break;
+ } else if (CLIP_REJECT(code1, code2))
+ break;
+ else {
+ if (CLIP_INSIDE(code1)) {
+ swaptmp = *x2;
+ *x2 = *x1;
+ *x1 = swaptmp;
+ swaptmp = *y2;
+ *y2 = *y1;
+ *y1 = swaptmp;
+ swaptmp = code2;
+ code2 = code1;
+ code1 = swaptmp;
+ }
+ if (*x2 != *x1) {
+ m = (*y2 - *y1) / (float) (*x2 - *x1);
+ } else {
+ m = 1.0f;
+ }
+ if (code1 & CLIP_LEFT_EDGE) {
+ *y1 += (Sint16) ((left - *x1) * m);
+ *x1 = left;
+ } else if (code1 & CLIP_RIGHT_EDGE) {
+ *y1 += (Sint16) ((right - *x1) * m);
+ *x1 = right;
+ } else if (code1 & CLIP_BOTTOM_EDGE) {
+ if (*x2 != *x1) {
+ *x1 += (Sint16) ((bottom - *y1) / m);
+ }
+ *y1 = bottom;
+ } else if (code1 & CLIP_TOP_EDGE) {
+ if (*x2 != *x1) {
+ *x1 += (Sint16) ((top - *y1) / m);
+ }
+ *y1 = top;
+ }
+ }
+ }
+
+ return draw;
+}
+
+/* ----- Filled rectangle (Box) */
+
+int boxColor(SDL_Surface * dst, Sint16 x1, Sint16 y1, Sint16 x2, Sint16 y2, Uint32 color)
+{
+ Sint16 left, right, top, bottom;
+ Uint8 *pixel, *pixellast;
+ int x, dx;
+ int dy;
+ int pixx, pixy;
+ Sint16 w, h, tmp;
+ int result;
+ Uint8 *colorptr;
+
+ /*
+ * Get clipping boundary
+ */
+ left = dst->clip_rect.x;
+ right = dst->clip_rect.x + dst->clip_rect.w - 1;
+ top = dst->clip_rect.y;
+ bottom = dst->clip_rect.y + dst->clip_rect.h - 1;
+
+ /* Check visibility */
+ if ((x1<left) && (x2<left)) {
+ return(0);
+ }
+ if ((x1>right) && (x2>right)) {
+ return(0);
+ }
+ if ((y1<top) && (y2<top)) {
+ return(0);
+ }
+ if ((y1>bottom) && (y2>bottom)) {
+ return(0);
+ }
+
+ /* Clip all points */
+ if (x1<left) {
+ x1=left;
+ } else if (x1>right) {
+ x1=right;
+ }
+ if (x2<left) {
+ x2=left;
+ } else if (x2>right) {
+ x2=right;
+ }
+ if (y1<top) {
+ y1=top;
+ } else if (y1>bottom) {
+ y1=bottom;
+ }
+ if (y2<top) {
+ y2=top;
+ } else if (y2>bottom) {
+ y2=bottom;
+ }
+
+ /*
+ * Order coordinates
+ */
+ if (x1 > x2) {
+ tmp = x1;
+ x1 = x2;
+ x2 = tmp;
+ }
+ if (y1 > y2) {
+ tmp = y1;
+ y1 = y2;
+ y2 = tmp;
+ }
+
+ /*
+ * Test for special cases of straight line or single point
+ */
+ if (x1 == x2) {
+ if (y1 == y2) {
+ return (pixelColor(dst, x1, y1, color));
+ } else {
+ return (vlineColor(dst, x1, y1, y2, color));
+ }
+ }
+ if (y1 == y2) {
+ return (hlineColor(dst, x1, x2, y1, color));
+ }
+
+
+ /*
+ * Calculate width&height
+ */
+ w = x2 - x1;
+ h = y2 - y1;
+
+ /*
+ * Alpha check
+ */
+ if ((color & 255) == 255) {
+
+ /*
+ * No alpha-blending required
+ */
+
+ /*
+ * Setup color
+ */
+ colorptr = (Uint8 *) & color;
+ if (SDL_BYTEORDER == SDL_BIG_ENDIAN) {
+ color = SDL_MapRGBA(dst->format, colorptr[0], colorptr[1], colorptr[2], colorptr[3]);
+ } else {
+ color = SDL_MapRGBA(dst->format, colorptr[3], colorptr[2], colorptr[1], colorptr[0]);
+ }
+
+ /*
+ * Lock surface
+ */
+ SDL_LockSurface(dst);
+
+ /*
+ * More variable setup
+ */
+ dx = w;
+ dy = h;
+ pixx = dst->format->BytesPerPixel;
+ pixy = dst->pitch;
+ pixel = ((Uint8 *) dst->pixels) + pixx * (int) x1 + pixy * (int) y1;
+ pixellast = pixel + pixx * dx + pixy * dy;
+ dx++;
+
+ /*
+ * Draw
+ */
+ switch (dst->format->BytesPerPixel) {
+ case 1:
+ for (; pixel <= pixellast; pixel += pixy) {
+ memset(pixel, (Uint8) color, dx);
+ }
+ break;
+ case 2:
+ pixy -= (pixx * dx);
+ for (; pixel <= pixellast; pixel += pixy) {
+ for (x = 0; x < dx; x++) {
+ *(Uint16 *) pixel = color;
+ pixel += pixx;
+ }
+ }
+ break;
+ case 3:
+ pixy -= (pixx * dx);
+ for (; pixel <= pixellast; pixel += pixy) {
+ for (x = 0; x < dx; x++) {
+ if (SDL_BYTEORDER == SDL_BIG_ENDIAN) {
+ pixel[0] = (color >> 16) & 0xff;
+ pixel[1] = (color >> 8) & 0xff;
+ pixel[2] = color & 0xff;
+ } else {
+ pixel[0] = color & 0xff;
+ pixel[1] = (color >> 8) & 0xff;
+ pixel[2] = (color >> 16) & 0xff;
+ }
+ pixel += pixx;
+ }
+ }
+ break;
+ default: /* case 4 */
+ pixy -= (pixx * dx);
+ for (; pixel <= pixellast; pixel += pixy) {
+ for (x = 0; x < dx; x++) {
+ *(Uint32 *) pixel = color;
+ pixel += pixx;
+ }
+ }
+ break;
+ }
+
+ /*
+ * Unlock surface
+ */
+ SDL_UnlockSurface(dst);
+
+ result = 0;
+
+ } else {
+
+ result = filledRectAlpha(dst, x1, y1, x1 + w, y1 + h, color);
+
+ }
+
+ return (result);
+}
+
+int boxRGBA(SDL_Surface * dst, Sint16 x1, Sint16 y1, Sint16 x2, Sint16 y2, Uint8 r, Uint8 g, Uint8 b, Uint8 a)
+{
+ /*
+ * Draw
+ */
+ return (boxColor(dst, x1, y1, x2, y2, ((Uint32) r << 24) | ((Uint32) g << 16) | ((Uint32) b << 8) | (Uint32) a));
+}
+
+/* ----- Line */
+
+/* Non-alpha line drawing code adapted from routine */
+/* by Pete Shinners, pe...@sh... */
+/* Originally from pygame, http://pygame.seul.org */
+
+#define ABS(a) (((a)<0) ? -(a) : (a))
+
+int lineColor(SDL_Surface * dst, Sint16 x1, Sint16 y1, Sint16 x2, Sint16 y2, Uint32 color)
+{
+ int pixx, pixy;
+ int x, y;
+ int dx, dy;
+ int ax, ay;
+ int sx, sy;
+ int swaptmp;
+ Uint8 *pixel;
+ Uint8 *colorptr;
+
+ /*
+ * Clip line and test if we h...
[truncated message content] |