Menu
▾
▴
E SVN: IN trunk/PROTO/enesim: . doc/img examples m4 src src/include src/include/private src/lib src/lib/drawer src/lib/rasterizer src/lib/renderer src/lib/util src/lib/vector src/lib/vector/component src/tool
Author: turran
Date: 2008-08-20 07:50:45 -0700 (Wed, 20 Aug 2008)
New Revision: 35582
Added:
trunk/PROTO/enesim/doc/img/enesim_text.svg trunk/PROTO/enesim/examples/enesim_bench.c trunk/PROTO/enesim/examples/image.c trunk/PROTO/enesim/examples/image.h trunk/PROTO/enesim/m4/ trunk/PROTO/enesim/m4/enesim_format.m4 trunk/PROTO/enesim/src/include/ trunk/PROTO/enesim/src/include/Enesim.h trunk/PROTO/enesim/src/include/Makefile.am trunk/PROTO/enesim/src/include/enesim_common.h trunk/PROTO/enesim/src/include/enesim_converter.h trunk/PROTO/enesim/src/include/enesim_drawer.h trunk/PROTO/enesim/src/include/enesim_main.h trunk/PROTO/enesim/src/include/enesim_private.h trunk/PROTO/enesim/src/include/enesim_rasterizer.h trunk/PROTO/enesim/src/include/enesim_renderer.h trunk/PROTO/enesim/src/include/enesim_surface.h trunk/PROTO/enesim/src/include/enesim_transformer.h trunk/PROTO/enesim/src/include/enesim_vector.h trunk/PROTO/enesim/src/include/extender_float.h trunk/PROTO/enesim/src/include/extender_int.h trunk/PROTO/enesim/src/include/private/ trunk/PROTO/enesim/src/include/private/curve.h trunk/PROTO/enesim/src/include/private/drawer.h trunk/PROTO/enesim/src/include/private/rasterizer.h trunk/PROTO/enesim/src/include/private/renderer.h trunk/PROTO/enesim/src/include/private/surface.h trunk/PROTO/enesim/src/include/private/surface_argb8888_rop.h trunk/PROTO/enesim/src/include/private/surface_argb8888_unpre_rop.h trunk/PROTO/enesim/src/include/private/surface_rgb565_b1a3_rop.h trunk/PROTO/enesim/src/include/private/surface_rgb565_rop.h trunk/PROTO/enesim/src/include/private/surface_rgb565_xa5_rop.h trunk/PROTO/enesim/src/include/private/transformer.h trunk/PROTO/enesim/src/lib/drawer/ trunk/PROTO/enesim/src/lib/drawer/Makefile.am trunk/PROTO/enesim/src/lib/enesim_converter.c trunk/PROTO/enesim/src/lib/enesim_core.c trunk/PROTO/enesim/src/lib/enesim_drawer.c trunk/PROTO/enesim/src/lib/enesim_main.c trunk/PROTO/enesim/src/lib/enesim_rasterizer.c trunk/PROTO/enesim/src/lib/enesim_renderer.c trunk/PROTO/enesim/src/lib/enesim_surface.c trunk/PROTO/enesim/src/lib/enesim_transformer.c trunk/PROTO/enesim/src/lib/rasterizer/ trunk/PROTO/enesim/src/lib/rasterizer/Makefile.am trunk/PROTO/enesim/src/lib/rasterizer/cpsc.c trunk/PROTO/enesim/src/lib/rasterizer/kiia.c trunk/PROTO/enesim/src/lib/rasterizer/kiia.h trunk/PROTO/enesim/src/lib/rasterizer/kiia16.c trunk/PROTO/enesim/src/lib/rasterizer/kiia32.c trunk/PROTO/enesim/src/lib/rasterizer/kiia8.c trunk/PROTO/enesim/src/lib/renderer/ trunk/PROTO/enesim/src/lib/renderer/Makefile.am trunk/PROTO/enesim/src/lib/renderer/color.c trunk/PROTO/enesim/src/lib/renderer/surface.c trunk/PROTO/enesim/src/tool/ trunk/PROTO/enesim/src/tool/Makefile.am trunk/PROTO/enesim/src/tool/README trunk/PROTO/enesim/src/tool/common.c trunk/PROTO/enesim/src/tool/common.h trunk/PROTO/enesim/src/tool/enesim_generator.c trunk/PROTO/enesim/src/tool/enesim_generator.h trunk/PROTO/enesim/src/tool/enesim_generator_core.c trunk/PROTO/enesim/src/tool/enesim_generator_drawer.c trunk/PROTO/enesim/src/tool/fixed.c trunk/PROTO/enesim/src/tool/transformer.c
Removed:
trunk/PROTO/enesim/src/lib/Enesim.h trunk/PROTO/enesim/src/lib/enesim_private.h trunk/PROTO/enesim/src/lib/raster/
Modified:
trunk/PROTO/enesim/COPYING trunk/PROTO/enesim/Doxyfile trunk/PROTO/enesim/Makefile.am trunk/PROTO/enesim/TODO trunk/PROTO/enesim/autogen.sh trunk/PROTO/enesim/configure.in trunk/PROTO/enesim/examples/Makefile.am trunk/PROTO/enesim/examples/enesim_test.c trunk/PROTO/enesim/examples/enesim_test.h trunk/PROTO/enesim/examples/surface.c trunk/PROTO/enesim/src/Makefile.am trunk/PROTO/enesim/src/lib/Makefile.am trunk/PROTO/enesim/src/lib/util/Makefile.am trunk/PROTO/enesim/src/lib/util/curve_decasteljau.c trunk/PROTO/enesim/src/lib/vector/Makefile.am trunk/PROTO/enesim/src/lib/vector/component/Makefile.am trunk/PROTO/enesim/src/lib/vector/component/bop.c trunk/PROTO/enesim/src/lib/vector/component/component.c trunk/PROTO/enesim/src/lib/vector/component/component.h trunk/PROTO/enesim/src/lib/vector/component/path.c trunk/PROTO/enesim/src/lib/vector/component/reader.c trunk/PROTO/enesim/src/lib/vector/component/reader.h trunk/PROTO/enesim/src/lib/vector/component/source_csv.c trunk/PROTO/enesim/src/lib/vector/component/transform.c trunk/PROTO/enesim/src/lib/vector/container.c trunk/PROTO/enesim/src/lib/vector/container.h trunk/PROTO/enesim/src/lib/vector/enesim_vector.h
Log:
Move efl-research enesim into e svn
Modified: trunk/PROTO/enesim/COPYING
===================================================================
--- trunk/PROTO/enesim/COPYING 2008-08-20 13:49:04 UTC (rev 35581)
+++ trunk/PROTO/enesim/COPYING 2008-08-20 14:50:45 UTC (rev 35582)
@@ -0,0 +1,504 @@
+ GNU LESSER GENERAL PUBLIC LICENSE
+ Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL. It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+ This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it. You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+ When we speak of free software, we are referring to freedom of use,
+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 and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+ To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights. These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+ For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you. You must make sure that they, too, receive or can get the source
+code. If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it. And you must show them these terms so they know their rights.
+
+ We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+ To protect each distributor, we want to make it very clear that
+there is no warranty for the free library. Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+ Finally, software patents pose a constant threat to the existence of
+any free program. We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder. Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+ Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License. This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License. We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+ When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library. The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom. The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+ We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License. It also provides other free software developers Less
+of an advantage over competing non-free programs. These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries. However, the Lesser license provides advantages in certain
+special circumstances.
+
+ For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard. To achieve this, non-free programs must be
+allowed to use the library. A more frequent case is that a free
+library does the same job as widely used non-free libraries. In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+ In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software. For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+ Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+ The precise terms and conditions for copying, distribution and
+modification follow. Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library". The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+ GNU LESSER GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+ A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+ The "Library", below, refers to any such software library or work
+which has been distributed under these terms. A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language. (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+ "Source code" for a work means the preferred form of the work for
+making modifications to it. For a library, 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 library.
+
+ Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it). Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+
+ 1. You may copy and distribute verbatim copies of the Library's
+complete 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 distribute a copy of this License along with the
+Library.
+
+ 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 Library or any portion
+of it, thus forming a work based on the Library, 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) The modified work must itself be a software library.
+
+ b) You must cause the files modified to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ c) You must cause the whole of the work to be licensed at no
+ charge to all third parties under the terms of this License.
+
+ d) If a facility in the modified Library refers to a function or a
+ table of data to be supplied by an application program that uses
+ the facility, other than as an argument passed when the facility
+ is invoked, then you must make a good faith effort to ensure that,
+ in the event an application does not supply such function or
+ table, the facility still operates, and performs whatever part of
+ its purpose remains meaningful.
+
+ (For example, a function in a library to compute square roots has
+ a purpose that is entirely well-defined independent of the
+ application. Therefore, Subsection 2d requires that any
+ application-supplied function or table used by this function must
+ be optional: if the application does not supply it, the square
+ root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Library,
+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 Library, 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 Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library. To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License. (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.) Do not make any other change in
+these notices.
+
+ Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+ This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+ 4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you 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.
+
+ If distribution of 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 satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library". Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+ However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library". The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+ When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library. The
+threshold for this to be true is not precisely defined by law.
+
+ If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work. (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+ Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+ 6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+ You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License. You must supply a copy of this License. If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License. Also, you must do one
+of these things:
+
+ a) Accompany the work with the complete corresponding
+ machine-readable source code for the Library including whatever
+ changes were used in the work (which must be distributed under
+ Sections 1 and 2 above); and, if the work is an executable linked
+ with the Library, with the complete machine-readable "work that
+ uses the Library", as object code and/or source code, so that the
+ user can modify the Library and then relink to produce a modified
+ executable containing the modified Library. (It is understood
+ that the user who changes the contents of definitions files in the
+ Library will not necessarily be able to recompile the application
+ to use the modified definitions.)
+
+ b) Use a suitable shared library mechanism for linking with the
+ Library. A suitable mechanism is one that (1) uses at run time a
+ copy of the library already present on the user's computer system,
+ rather than copying library functions into the executable, and (2)
+ will operate properly with a modified version of the library, if
+ the user installs one, as long as the modified version is
+ interface-compatible with the version that the work was made with.
+
+ c) Accompany the work with a written offer, valid for at
+ least three years, to give the same user the materials
+ specified in Subsection 6a, above, for a charge no more
+ than the cost of performing this distribution.
+
+ d) If distribution of the work is made by offering access to copy
+ from a designated place, offer equivalent access to copy the above
+ specified materials from the same place.
+
+ e) Verify that the user has already received a copy of these
+ materials or that you have already sent this user a copy.
+
+ For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it. However, as a special exception,
+the materials to be 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.
+
+ It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system. Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+ 7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+ a) Accompany the combined library with a copy of the same work
+ based on the Library, uncombined with any other library
+ facilities. This must be distributed under the terms of the
+ Sections above.
+
+ b) Give prominent notice with the combined library of the fact
+ that part of it is a work based on the Library, and explaining
+ where to find the accompanying uncombined form of the same work.
+
+ 8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License. Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library 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.
+
+ 9. 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 Library or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+ 10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+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 with
+this License.
+
+ 11. 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 Library at all. For example, if a patent
+license would not permit royalty-free redistribution of the Library 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 Library.
+
+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.
+
+ 12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library 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.
+
+ 13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser 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 Library
+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 Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+ 14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+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
+
+ 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "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
+LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+ 16. 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 LIBRARY 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
+LIBRARY (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 LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), 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 Libraries
+
+ If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change. You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+ To apply these terms, attach the following notices to the library. 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 library's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ This library 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
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the
+ library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+ <signature of Ty Coon>, 1 April 1990
+ Ty Coon, President of Vice
+
+That's all there is to it!
+
+
Modified: trunk/PROTO/enesim/Doxyfile
===================================================================
--- trunk/PROTO/enesim/Doxyfile 2008-08-20 13:49:04 UTC (rev 35581)
+++ trunk/PROTO/enesim/Doxyfile 2008-08-20 14:50:45 UTC (rev 35582)
@@ -1,7 +1,7 @@
PROJECT_NAME = Enesim
PROJECT_NUMBER =
OUTPUT_DIRECTORY = doc
-INPUT = ./src/lib
+INPUT = ./src/
IMAGE_PATH = doc/img
OUTPUT_LANGUAGE = English
GENERATE_HTML = YES
Modified: trunk/PROTO/enesim/Makefile.am
===================================================================
--- trunk/PROTO/enesim/Makefile.am 2008-08-20 13:49:04 UTC (rev 35581)
+++ trunk/PROTO/enesim/Makefile.am 2008-08-20 14:50:45 UTC (rev 35582)
@@ -1,12 +1,15 @@
## Process this file with automake to produce Makefile.in
-SUBDIRS = src examples data
+if TOOLS_ONLY
+SUBDIRS = src
+else
+SUBDIRS = $(native_tools) src examples data
+endif
MAINTAINERCLEANFILES = \
Makefile.in \
aclocal.m4 \
config.guess \
-config.h.in \
config.sub \
configure \
install-sh \
@@ -28,6 +31,55 @@
README \
enesim.pc.in
+if TOOLS_ONLY
+else
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = enesim.pc
-ACLOCAL_AMFLAGS = -I m4
+endif
+
+# Unit tests
+
+if BUILD_EXAMPLE
+
+check-local:
+ @./examples/enesim_bench
+
+else
+
+check-local:
+ @echo "reconfigure with --enable-tests"
+
+endif
+
+if ENESIM_ENABLE_COVERAGE
+lcov-reset:
+ @rm -rf coverage
+ @find . -name "*.gcda" -exec rm {} \;
+ @lcov --directory . --zerocounters
+
+lcov-report:
+ @mkdir coverage
+ @lcov --compat-libtool --directory . --capture --output-file coverage/coverage.info
+ @lcov -l coverage/coverage.info | grep -v "`cd $(top_srcdir) && pwd`" | cut -d: -f1 > coverage/remove
+ @lcov -r coverage/coverage.info `cat coverage/remove` > coverage/coverage.cleaned.info
+ @rm coverage/remove
+ @mv coverage/coverage.cleaned.info coverage/coverage.info
+ @genhtml -t "$(PACKAGE_STRING)" -o coverage coverage/coverage.info
+
+coverage:
+ @make lcov-reset
+ @make check
+ @make lcov-report
+
+clean-local:
+ @rm -rf coverage
+else
+lcov-reset:
+ @echo "reconfigure with --enable-coverage"
+
+lcov-report:
+ @echo "reconfigure with --enable-coverage"
+
+coverage:
+ @echo "reconfigure with --enable-tests --enable-coverage"
+endif
Modified: trunk/PROTO/enesim/TODO
===================================================================
--- trunk/PROTO/enesim/TODO 2008-08-20 13:49:04 UTC (rev 35581)
+++ trunk/PROTO/enesim/TODO 2008-08-20 14:50:45 UTC (rev 35582)
@@ -0,0 +1,4 @@
++ Right now the drawer functions are defined for every case (from/to format)
+we should benchmark the speed decrease in case we use function pointers for that
++ What to do with the rectangle/fixed/extender "classes", place them into eina?
++ Port every type to stdint.h types
Modified: trunk/PROTO/enesim/autogen.sh
===================================================================
--- trunk/PROTO/enesim/autogen.sh 2008-08-20 13:49:04 UTC (rev 35581)
+++ trunk/PROTO/enesim/autogen.sh 2008-08-20 14:50:45 UTC (rev 35582)
@@ -3,7 +3,7 @@
rm -rf autom4te.cache
rm -f aclocal.m4 ltmain.sh
-echo "Running aclocal..." ; aclocal $ACLOCAL_FLAGS || exit 1
+echo "Running aclocal..." ; aclocal $ACLOCAL_FLAGS -I m4 || exit 1
echo "Running autoheader..." ; autoheader || exit 1
echo "Running autoconf..." ; autoconf || exit 1
echo "Running libtoolize..." ; (libtoolize --copy --automake || glibtoolize --automake) || exit 1
Modified: trunk/PROTO/enesim/configure.in
===================================================================
--- trunk/PROTO/enesim/configure.in 2008-08-20 13:49:04 UTC (rev 35581)
+++ trunk/PROTO/enesim/configure.in 2008-08-20 14:50:45 UTC (rev 35582)
@@ -1,118 +1,153 @@
# get rid of that stupid cache mechanism
rm -f config.cache
-AC_INIT(configure.in)
+AC_INIT(enesim, 0.0.1, enl...@li...)
+AC_PREREQ(2.52)
+AC_CONFIG_SRCDIR(configure.in)
AC_CANONICAL_BUILD
AC_CANONICAL_HOST
AC_ISC_POSIX
-AM_INIT_AUTOMAKE(enesim, 0.0.1)
-AM_CONFIG_HEADER(config.h)
-AC_C_BIGENDIAN
+AM_INIT_AUTOMAKE(1.6 dist-bzip2)
+AM_CONFIG_HEADER(src/include/config.h)
+
AC_PROG_CC
AM_PROG_CC_STDC
AC_HEADER_STDC
AC_C_CONST
-AM_ENABLE_SHARED
-AM_PROG_LIBTOOL
+AC_C_BIGENDIAN
+AC_LIBTOOL_WIN32_DLL
+define([AC_LIBTOOL_LANG_CXX_CONFIG], [:])dnl
+define([AC_LIBTOOL_LANG_F77_CONFIG], [:])dnl
+AC_PROG_LIBTOOL
-MODULE_ARCH="$host_os-$host_cpu"
-AC_SUBST(MODULE_ARCH)
-AC_DEFINE_UNQUOTED(MODULE_ARCH, "$MODULE_ARCH", "Module architecture")
+VMAJ=`echo $PACKAGE_VERSION | awk -F. '{printf("%s", $1);}'`
+VMIN=`echo $PACKAGE_VERSION | awk -F. '{printf("%s", $2);}'`
+VMIC=`echo $PACKAGE_VERSION | awk -F. '{printf("%s", $3);}'`
+SNAP=`echo $PACKAGE_VERSION | awk -F. '{printf("%s", $4);}'`
+version_info=`expr $VMAJ + $VMIN`":$VMIC:$VMIN"
+AC_SUBST(version_info)
+create_shared_lib=""
+case "$host_os" in
+ mingw|mingw32)
+ create_shared_lib="-no-undefined"
+ ;;
+esac
+AC_SUBST(create_shared_lib)
-dnl Add the languages which your application supports here.
+PKG_CHECK_MODULES(EINA, [eina >= 0.0.1])
+PKG_CHECK_MODULES(PNG, [libpng >= 0.22], [have_png="yes"], [have_png="no"])
+#PKG_CHECK_MODULES(SDL, [sdl >= 1.2.10], [have_sdl="yes"], [have_sdl="no"])
-if test "x${bindir}" = 'x${exec_prefix}/bin'; then
- if test "x${exec_prefix}" = "xNONE"; then
- if test "x${prefix}" = "xNONE"; then
- bindir="${ac_default_prefix}/bin";
- else
- bindir="${prefix}/bin";
- fi
- else
- if test "x${prefix}" = "xNONE"; then
- bindir="${ac_default_prefix}/bin";
- else
- bindir="${prefix}/bin";
- fi
- fi
+build_example="no"
+#if test "x$have_sdl" = "xyes" && test "x$have_png" = "xyes"; then
+if test "x$have_png" = "xyes"; then
+ build_example="yes"
fi
-if test "x${libdir}" = 'x${exec_prefix}/lib'; then
- if test "x${exec_prefix}" = "xNONE"; then
- if test "x${prefix}" = "xNONE"; then
- libdir="${ac_default_prefix}/lib";
+## TODO Bench
+
+## Coverage
+AC_ARG_ENABLE([coverage],
+ [AC_HELP_STRING([--enable-coverage], [compile with coverage profiling instrumentation @<:@default=no@:>@])],
+ [
+ if test "x${enableval}" = "xyes" ; then
+ enable_coverage="yes"
else
- libdir="${prefix}/lib";
+ enable_coverage="no"
fi
- else
- if test "x${prefix}" = "xNONE"; then
- libdir="${ac_default_prefix}/lib";
- else
- libdir="${prefix}/lib";
- fi
- fi
+ ],
+ [enable_coverage="no"]
+)
+## lcov program for coverage report
+if test "x$build_example" = "xno" -a "x$enable_coverage" = "xyes" ; then
+ AC_MSG_WARN([Coverage report requested but tests not being built. Run configure with --enable-tests])
+ enable_coverage="no"
fi
-if test "x${prefix}" = "xNONE"; then
- AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${ac_default_prefix}/share/${PACKAGE}", [Shared Data Directory])
-else
- AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/share/${PACKAGE}", [Shared Data Directory])
+if test "x$enable_coverage" = "xyes"; then
+ AC_CHECK_PROG(have_lcov, [lcov], [yes], [no])
+ if test "x$have_lcov" = "xyes" ; then
+ COVERAGE_CFLAGS="-fprofile-arcs -ftest-coverage"
+ COVERAGE_LIBS="-lgcov"
+# remove any optimisation flag and force debug symbols
+ DEBUG_CFLAGS="-g -O0 -DDEBUG"
+ else
+ AC_MSG_WARN([lcov is not found, disable profiling instrumentation])
+ enable_coverage="no"
+ fi
fi
+AC_SUBST(COVERAGE_CFLAGS)
+AC_SUBST(COVERAGE_LIBS)
+AM_CONDITIONAL(ENESIM_ENABLE_COVERAGE, test "x${enable_coverage}" = "xyes")
-dnl Set PACKAGE_BIN_DIR in config.h.
-if test "x${bindir}" = 'xNONE'; then
- if test "x${prefix}" = "xNONE"; then
- AC_DEFINE_UNQUOTED(PACKAGE_BIN_DIR, "${ac_default_prefix}/bin", [Installation Directory for User Executables])
- else
- AC_DEFINE_UNQUOTED(PACKAGE_BIN_DIR, "${prefix}/bin", [Installation Directory for User Executables])
- fi
-else
- AC_DEFINE_UNQUOTED(PACKAGE_BIN_DIR, "${bindir}", [Installation Directory for User Executables])
-fi
-dnl Set PACKAGE_LIB_DIR in config.h.
-if test "x${libdir}" = 'xNONE'; then
- if test "x${prefix}" = "xNONE"; then
- AC_DEFINE_UNQUOTED(PACKAGE_LIB_DIR, "${ac_default_prefix}/lib", [Installation Directory for Libraries])
- else
- AC_DEFINE_UNQUOTED(PACKAGE_LIB_DIR, "${prefix}/lib", [Installation Directory for Libraries])
- fi
-else
- AC_DEFINE_UNQUOTED(PACKAGE_LIB_DIR, "${libdir}", [Installation Directory for Libraries])
-fi
+AC_MSG_CHECKING([whether to use profiling instrumentation])
+AC_MSG_RESULT([$enable_coverage])
-dnl Set PACKAGE_SOURCE_DIR in config.h.
-packagesrcdir=`cd $srcdir && pwd`
-AC_DEFINE_UNQUOTED(PACKAGE_SOURCE_DIR, "${packagesrcdir}", [Source Code Directory])
-case "$host_os" in
- *bsd*)
- AC_DEFINE(HAVE_BSD, [], "Have a BSD distribution")
- ;;
- linux*)
- AC_DEFINE(HAVE_LINUX, [], "Have a Linux distribution")
- ;;
-esac
+## Add conditionals for every surface format but the argb8888_pre, it is
+## the core format and cannot be optional
+ENESIM_SURFACE_FORMAT(argb8888_unpre, [yes])
+ENESIM_SURFACE_FORMAT(rgb888_a8, [no])
+ENESIM_SURFACE_FORMAT(rgb565_xa5, [no])
+ENESIM_SURFACE_FORMAT(rgb565_b1a3, [yes])
-PKG_CHECK_MODULES(EDATA, [edata >= 0.0.1])
-PKG_CHECK_MODULES(PNG, [libpng >= 0.22])
+EXAMPLE_CFLAGS="$SDL_CFLAGS $PNG_CFLAGS"
+EXAMPLE_LIBS="$SDL_LIBS $PNG_LIBS"
+AC_SUBST(EXAMPLE_CFLAGS)
+AC_SUBST(EXAMPLE_LIBS)
+AM_CONDITIONAL(BUILD_EXAMPLE, test "x${build_example}" = "xyes")
+
+ENESIM_CFLAGS="$EINA_CFLAGS $COVERAGE_CFLAGS"
+ENESIM_LIBS="$EINA_LIBS $COVERAGE_LIBS"
+AC_SUBST(ENESIM_CFLAGS)
+AC_SUBST(ENESIM_LIBS)
+
+## The tool directory
+## Code taken from texinfo
+if test "$cross_compiling" = no; then
+ native_tools=
+else
+ native_tools=tools
+ test -d "$native_tools" || mkdir "$native_tools"
+ confdir=`(cd "$srcdir";pwd)`
+ # Make sure the secondary configure won't fail with
+ # "error: source directory already configured".
+ rm -f config.status
+ AC_MSG_NOTICE([[Doing configure of native tools (${build}).]])
+ cd "$native_tools" || exit 1
+ # Run secondary configure in alternate environment or
+ # it gets the wrong CC etc.
+ # env -i gives this build host configure a clean environment;
+ # consequently, we have to re-initialize $PATH.
+ env -i CC="$BUILD_CC" AR="$BUILD_AR" RANLIB="$BUILD_RANLIB" \
+ PATH="$PATH" \
+ tools_only=1 \
+ ${confdir}/configure --build=${build} --host=${build}
+ cd .. || exit 1
+ AC_MSG_NOTICE([[Continuing with main configure (${host}).]])
+fi
+AC_SUBST(native_tools)
+AM_CONDITIONAL(TOOLS_ONLY, [[test "x$tools_only" = x1]])
+
## Make the debug preprocessor configurable
AC_OUTPUT([
Makefile
enesim.pc
src/Makefile
+src/include/Makefile
+src/tool/Makefile
src/lib/Makefile
-src/lib/raster/Makefile
-src/lib/raster/rasterizer/Makefile
-src/lib/raster/renderer/Makefile
-src/lib/raster/surface/Makefile
-src/lib/raster/surface/argb8888/Makefile
+src/lib/rasterizer/Makefile
+src/lib/renderer/Makefile
+src/lib/converter/Makefile
+src/lib/drawer/Makefile
src/lib/util/Makefile
src/lib/vector/Makefile
src/lib/vector/component/Makefile
@@ -120,12 +155,7 @@
data/Makefile
],[
])
-#deprecated
-#src/lib/raster/scanline/Makefile
-#src/lib/raster/surface/rop/Makefile
-#src/lib/raster/surface/rop/blend/Makefile
-
#####################################################################
## Info
@@ -139,8 +169,15 @@
echo
echo "Configuration Options Summary:"
echo
-echo "Installation Path.........: $prefix"
+echo " Build example.............................: ${build_example}"
+echo " Coverage..................................: ${enable_coverage}"
+echo " Build ARGB8888_UNPRE format support.......: ${format_argb8888_unpre}"
+echo " Build RGB8888_A8 format support...........: ${format_rgb888_a8}"
+echo " Build RGB565_XA5 format support...........: ${format_rgb565_xa5}"
+echo " Build RGB565_b1A3 format support..........: ${format_rgb565_b1a3}"
echo
+echo "Installation Path...........................: ${prefix}"
+echo
echo "Now type 'make' ('gmake' on some systems) to compile $PACKAGE,"
echo "and then afterwards as root (or the user who will install this), type"
echo "'make install'. Change users with 'su' or 'sudo' appropriately."
Added: trunk/PROTO/enesim/doc/img/enesim_text.svg
Modified: trunk/PROTO/enesim/examples/Makefile.am
===================================================================
--- trunk/PROTO/enesim/examples/Makefile.am 2008-08-20 13:49:04 UTC (rev 35581)
+++ trunk/PROTO/enesim/examples/Makefile.am 2008-08-20 14:50:45 UTC (rev 35582)
@@ -1,25 +1,24 @@
MAINTAINERCLEANFILES = Makefile.in
-EXTRA_DIST =
-
-INCLUDES = \
+AM_CPPFLAGS = \
-I. \
--I$(top_srcdir) \
--I$(top_srcdir)/src/lib \
--I$(top_srcdir)/src/lib/util \
-@EDATA_CFLAGS@ \
-@PNG_CFLAGS@
+-I$(top_srcdir)/src/include \
+-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
+@ENESIM_CFLAGS@ \
+@EXAMPLE_CFLAGS@
-bin_PROGRAMS = enesim_test
+if BUILD_EXAMPLE
-enesim_test_DEPENDENCIES = $(top_builddir)/src/lib/libenesim.la
+bin_PROGRAMS = enesim_bench
-enesim_test_SOURCES = \
-png.c \
-surface.c \
-enesim_test.c
-
-enesim_test_LDADD = \
+enesim_bench_DEPENDENCIES = $(top_builddir)/src/lib/libenesim.la
+enesim_bench_LDADD = \
$(top_builddir)/src/lib/libenesim.la \
-@EDATA_LIBS@ \
-@PNG_LIBS@
+@ENESIM_LIBS@ \
+@EXAMPLE_LIBS@
+
+enesim_bench_SOURCES = \
+enesim_bench.c \
+image.c
+
+endif
Added: trunk/PROTO/enesim/examples/enesim_bench.c
Modified: trunk/PROTO/enesim/examples/enesim_test.c
===================================================================
--- trunk/PROTO/enesim/examples/enesim_test.c 2008-08-20 13:49:04 UTC (rev 35581)
+++ trunk/PROTO/enesim/examples/enesim_test.c 2008-08-20 14:50:45 UTC (rev 35582)
@@ -1,14 +1,9 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <math.h>
-
-#include "Enesim.h"
-#include "fixed_16p16.h"
#include "enesim_test.h"
-#include "config.h"
+/* TODO change this to use SDL instead of dumping the file to png */
#define DSTDIR "/tmp"
+SDL_Surface *screen;
/*============================================================================*
* Common *
*============================================================================*/
@@ -20,135 +15,131 @@
#define TIGER_WIDTH 400
#define TIGER_HEIGHT 412
-Enesim_Surface * tiger_draw(void)
+
+static Enesim_Surface * tiger_draw(void)
{
Enesim_Surface *s;
- s = surface_new(TIGER_WIDTH, TIGER_HEIGHT, ENESIM_SURFACE_ARGB8888);
- png_load(s, PACKAGE_DATA_DIR"/tiger.png");
+
+ s = surface_new(TIGER_WIDTH, TIGER_HEIGHT, ENESIM_SURFACE_ARGB8888_UNPRE);
+ image_load(s, PACKAGE_DATA_DIR"/tiger.png");
+
return s;
}
-/*============================================================================*
- * Test3: *
- * Surface draw test *
- *============================================================================*/
-#define MATRIX_XX 0
-#define MATRIX_XY 1
-#define MATRIX_XZ 2
-#define MATRIX_YX 3
-#define MATRIX_YY 4
-#define MATRIX_YZ 5
-#define MATRIX_ZX 6
-#define MATRIX_ZY 7
-#define MATRIX_ZZ 8
-#define MATRIX_SIZE 9
-#define PI 3.14159265
+static void screen_clear(void)
+{
+ SDL_FillRect(screen, NULL, 0xffffffff);
+}
-static void transformation_compose(float *st, float *dt)
+static void rectangle_draw(Eina_Rectangle *r, Enesim_Surface *dst, unsigned int color, Enesim_Rop rop)
{
int i;
- float tmp[MATRIX_SIZE];
+ Enesim_Scanline_Alias sl;
+ Enesim_Renderer *renderer;
- tmp[MATRIX_XX] = (st[MATRIX_XX] * dt[MATRIX_XX]) + (st[MATRIX_XY] * dt[MATRIX_YX]) + (st[MATRIX_XZ] * dt[MATRIX_ZX]);
- tmp[MATRIX_XY] = (st[MATRIX_XX] * dt[MATRIX_XY]) + (st[MATRIX_XY] * dt[MATRIX_YY]) + (st[MATRIX_XZ] * dt[MATRIX_ZY]);
- tmp[MATRIX_XZ] = (st[MATRIX_XX] * dt[MATRIX_XZ]) + (st[MATRIX_XY] * dt[MATRIX_YZ]) + (st[MATRIX_XZ] * dt[MATRIX_ZZ]);
-
- tmp[MATRIX_YX] = (st[MATRIX_YX] * dt[MATRIX_XX]) + (st[MATRIX_YY] * dt[MATRIX_YX]) + (st[MATRIX_YZ] * dt[MATRIX_ZX]);
- tmp[MATRIX_YY] = (st[MATRIX_YX] * dt[MATRIX_XY]) + (st[MATRIX_YY] * dt[MATRIX_YY]) + (st[MATRIX_YZ] * dt[MATRIX_ZY]);
- tmp[MATRIX_YZ] = (st[MATRIX_YX] * dt[MATRIX_XZ]) + (st[MATRIX_YY] * dt[MATRIX_YZ]) + (st[MATRIX_YZ] * dt[MATRIX_ZZ]);
+ renderer = enesim_renderer_color_new();
+ enesim_renderer_color_color_set(renderer, color);
+ enesim_renderer_rop_set(renderer, rop);
+ for (i = 0; i < r->h; i++)
+ {
+ sl.w = r->w;
+ sl.x = r->x;
+ sl.y = r->y + i;
+ enesim_renderer_draw(renderer, ENESIM_SCANLINE_ALIAS, &sl, dst);
+ }
+ enesim_renderer_delete(renderer);
+}
- tmp[MATRIX_ZX] = (st[MATRIX_ZX] * dt[MATRIX_XX]) + (st[MATRIX_ZY] * dt[MATRIX_YX]) + (st[MATRIX_ZZ] * dt[MATRIX_ZX]);
- tmp[MATRIX_ZY] = (st[MATRIX_ZX] * dt[MATRIX_XY]) + (st[MATRIX_ZY] * dt[MATRIX_YY]) + (st[MATRIX_ZZ] * dt[MATRIX_ZY]);
- tmp[MATRIX_ZZ] = (st[MATRIX_ZX] * dt[MATRIX_XZ]) + (st[MATRIX_ZY] * dt[MATRIX_YZ]) + (st[MATRIX_ZZ] * dt[MATRIX_ZZ]);
+/* TODO add this to Enesim.h */
+#define MATRIX_SIZE 9
- for (i = 0; i < MATRIX_SIZE; i++)
- st[i] = tmp[i];
-}
-
-static void transformation_translate(float *t, float tx, float ty)
+/*============================================================================*
+ * Test4: *
+ * Renderers Demo *
+ *============================================================================*/
+static void test4(void)
{
- t[MATRIX_XX] = 1;
- t[MATRIX_XY] = 0;
- t[MATRIX_XZ] = tx;
- t[MATRIX_YX] = 0;
- t[MATRIX_YY] = 1;
- t[MATRIX_YZ] = ty;
- t[MATRIX_ZX] = 0;
- t[MATRIX_ZY] = 0;
- t[MATRIX_ZZ] = 1;
-}
-static void transformation_scale(float *t, float sx, float sy)
-{
- t[MATRIX_XX] = sx;
- t[MATRIX_XY] = 0;
- t[MATRIX_XZ] = 0;
- t[MATRIX_YX] = 0;
- t[MATRIX_YY] = sy;
- t[MATRIX_YZ] = 0;
- t[MATRIX_ZX] = 0;
- t[MATRIX_ZY] = 0;
- t[MATRIX_ZZ] = 1;
-}
-static void transformation_rotate(float *t, float rad)
-{
- float c = cos(rad);
- float s = sin(rad);
+ int i;
+ Enesim_Surface *dst;
+ Enesim_Scanline_Alias sl[100];
+ Enesim_Renderer *renderer;
- t[MATRIX_XX] = c;
- t[MATRIX_XY] = -s;
- t[MATRIX_XZ] = 0;
- t[MATRIX_YX] = s;
- t[MATRIX_YY] = c;
- t[MATRIX_YZ] = 0;
- t[MATRIX_ZX] = 0;
- t[MATRIX_ZY] = 0;
- t[MATRIX_ZZ] = 1;
+ dst = surface_new(SCREEN_WIDTH, SCREEN_HEIGHT, ENESIM_SURFACE_ARGB8888);
+ /* fill color renderer */
+ renderer = enesim_renderer_color_new();
+ enesim_renderer_color_color_set(renderer, 0xffff0000);
+ enesim_renderer_rop_set(renderer, ENESIM_FILL);
+ for (i = 0; i < 100; i++)
+ {
+ sl[i].x = 200;
+ sl[i].y = i + 50;
+ sl[i].w = 200;
+ enesim_renderer_draw(renderer, ENESIM_SCANLINE_ALIAS, &sl[i], dst);
+ }
+ enesim_renderer_color_color_set(renderer, 0x5500ff00);
+ enesim_renderer_rop_set(renderer, ENESIM_BLEND);
+ for (i = 0; i < 100; i++)
+ {
+ sl[i].x = 100;
+ sl[i].y = i + 100;
+ sl[i].w = 200;
+ enesim_renderer_draw(renderer, ENESIM_SCANLINE_ALIAS, &sl[i], dst);
+ }
+ surface_blt(dst, screen);
+ surface_free(dst);
}
-
-static void transformation_identity(float *t)
+/*============================================================================*
+ * Test3: *
+ * Surface draw test *
+ *============================================================================*/
+static void test3(void)
{
- t[MATRIX_XX] = 1;
- t[MATRIX_XY] = 0;
- t[MATRIX_XZ] = 0;
- t[MATRIX_YX] = 0;
- t[MATRIX_YY] = 1;
- t[MATRIX_YZ] = 0;
- t[MATRIX_ZX] = 0;
- t[MATRIX_ZY] = 0;
- t[MATRIX_ZZ] = 1;
-}
-void test3(void)
-{
Enesim_Surface *dst, *src;
- Enesim_Rectangle srect;
- Enesim_Rectangle drect;
+ Enesim_Transformation *tx;
+ Eina_Rectangle srect;
+ Eina_Rectangle drect;
+ int w, h;
float m1[9], m2[9];
src = tiger_draw();
dst = surface_new(TIGER_WIDTH, TIGER_HEIGHT, ENESIM_SURFACE_ARGB8888);
- png_save(src, DSTDIR"/enesim_test3_src.png", 0);
+ tx = enesim_transformation_new();
+ enesim_surface_size_get(src, &w, &h);
+
+ /* identity matrix */
srect.x = 0;
srect.y = 0;
- enesim_surface_size_get(src, &srect.w, &srect.h);
-
+ srect.w = w / 2;
+ srect.h = h / 2;
+
drect.x = 0;
drect.y = 0;
drect.w = srect.w;
drect.h = srect.h;
-
+ enesim_transformation_apply(tx, src, &srect, dst, &drect);
+ rectangle_draw(&drect, dst, 0x55888888, ENESIM_BLEND);
+ /* affine matrix */
+ enesim_transformation_matrix_scale(m1, 1.4, 0.9);
+ enesim_transformation_matrix_scale(m2, -20, -20);
+ enesim_transformation_matrix_compose(m1, m2);
+ enesim_transformation_matrix_rotate(m2, PI/4);
+ enesim_transformation_set(tx, m2);
+ drect.x = 200;
+ drect.y = 300;
+ enesim_transformation_apply(tx, src, &srect, dst, &drect);
+ rectangle_draw(&drect, dst, 0x55888888, ENESIM_BLEND);
+ /* projective matrix
transformation_scale(m1, 2.0, 2.0);
transformation_translate(m2, -20, -26);
transformation_compose(m1, m2);
transformation_rotate(m2, PI/4);
transformation_compose(m1, m2);
- /*
transformation_translate(m2, 200, 206);
transformation_compose(m1, m2);*/
+ /* view the result */
- enesim_surface_transformation_set(src, m1);
- enesim_surface_draw(src, &srect, dst, &drect, 0, 0);
- png_save(dst, DSTDIR"/enesim_test3_dst.png", 0);
+ surface_blt(dst, screen);
surface_free(dst);
surface_free(src);
}
@@ -159,7 +150,7 @@
#define STAR_WIDTH 400
#define STAR_HEIGHT 400
-void test2(void)
+static void test2(void)
{
}
@@ -167,32 +158,78 @@
* Test1: *
* Fixed point calculations *
*============================================================================*/
-void test1(void)
+static void test1(void)
{
- enesim_16p16_t fp, res;
+ Eina_F16p16 fp, res;
float r;
/* sqrt(2) */
- fp = enesim_16p16_int_from(2);
- res = enesim_16p16_sqrt(fp);
- r = enesim_16p16_float_to(res);
+ fp = eina_f16p16_int_from(2);
+ res = eina_f16p16_sqrt(fp);
+ r = eina_f16p16_float_to(res);
printf("sqrt(2) = %f\n", r);
}
+static void help(void)
+{
+
+}
+
int main(int argc, char **argv)
{
int i = 1;
-
+ int end = 0;
+ SDL_Event event;
+
if (argc < 2) return -1;
- while (i < argc)
+
+ SDL_Init(SDL_INIT_VIDEO);
+ if (!(screen = SDL_SetVideoMode(SCREEN_WIDTH, SCREEN_HEIGHT, 32, SDL_SWSURFACE)))
{
- if (!strcmp(argv[i], "test1"))
- test1();
- else if (!strcmp(argv[i], "test2"))
- test2();
- else if (!strcmp(argv[i], "test3"))
- test3();
- i++;
+ fprintf(stderr, "%s\n", SDL_GetError());
+ SDL_Quit();
+ return 1;
}
+ enesim_init();
+ screen_clear();
+ SDL_UpdateRect(screen, 0, 0, 0, 0);
+ while (!end)
+ {
+ while (SDL_PollEvent(&event))
+ {
+ switch (event.type)
+ {
+ case SDL_KEYDOWN:
+ /* iterate over argv */
+ if (i >= argc)
+ {
+ end = 1;
+ break;
+ }
+ screen_clear();
+ if (!strcmp(argv[i], "test1"))
+ test1();
+ else if (!strcmp(argv[i], "test2"))
+ test2();
+ else if (!strcmp(argv[i], "test3"))
+ test3();
+ else if (!strcmp(argv[i], "test4"))
+ test4();
+ else
+ {
+ end = 1;
+ break;
+ }
+ SDL_UpdateRect(screen, 0, 0, 0, 0);
+ i++;
+ break;
+
+ case SDL_QUIT:
+ end = 1;
+ break;
+ }
+ }
+ }
+ enesim_shutdown();
return 0;
}
Modified: trunk/PROTO/enesim/examples/enesim_test.h
===================================================================
--- trunk/PROTO/enesim/examples/enesim_test.h 2008-08-20 13:49:04 UTC (rev 35581)
+++ trunk/PROTO/enesim/examples/enesim_test.h 2008-08-20 14:50:45 UTC (rev 35582)
@@ -1,9 +1,27 @@
#ifndef _ENESIM_TEST_H_
#define _ENESIM_TEST_H_
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <math.h>
+#include <png.h>
+#include <setjmp.h>
+#include <alloca.h>
+#include <stdlib.h>
+
+#include "Eina.h"
+#include "Enesim.h"
+#include "config.h"
+//#include "SDL.h"
+
+#include "image.h"
+
+#define SCREEN_WIDTH 512
+#define SCREEN_HEIGHT 512
+#define PI 3.1415
Enesim_Surface * surface_new(int w, int h, Enesim_Surface_Format fmt);
-void surface_free(Enesim_Surface *s);
-void png_load(Enesim_Surface *s, char *file);
-void png_save(Enesim_Surface *s, char *file, int compress);
+//void surface_free(Enesim_Surface *s);
+//void surface_blt(Enesim_Surface *s, SDL_Surface *sdl);
#endif /*_ENESIM_TEST_H_*/
Added: trunk/PROTO/enesim/examples/image.c
Added: trunk/PROTO/enesim/examples/image.h
Modified: trunk/PROTO/enesim/examples/surface.c
===================================================================
--- trunk/PROTO/enesim/examples/surface.c 2008-08-20 13:49:04 UTC (rev 35581)
+++ trunk/PROTO/enesim/examples/surface.c 2008-08-20 14:50:45 UTC (rev 35582)
@@ -1,21 +1,28 @@
-#include <stdlib.h>
+#include "enesim_test.h"
-#include "Enesim.h"
-
Enesim_Surface * surface_new(int w, int h, Enesim_Surface_Format fmt)
{
Enesim_Surface *s = NULL;
+ Enesim_Surface_Data sdata;
+
switch(fmt)
{
case ENESIM_SURFACE_ARGB8888:
- {
- DATA32 *d;
+ sdata.argb8888.plane0 = calloc(1, sizeof(unsigned int) * w * h);
+ s = enesim_surface_new_data_from(fmt, w, h, &sdata);
+ break;
- d = calloc(1, sizeof(DATA32) * w * h);
- s = enesim_surface_new(fmt, w, h, ENESIM_SURFACE_ALPHA, d);
- }
+ case ENESIM_SURFACE_ARGB8888_UNPRE:
+ sdata.argb8888_unpre.plane0 = calloc(1, sizeof(unsigned int) * w * h);
+ s = enesim_surface_new_data_from(fmt, w, h, &sdata);
break;
-
+
+ case ENESIM_SURFACE_RGB565_XA5:
+ sdata.rgb565_xa5.plane0 = calloc(1, sizeof(unsigned short int) * w * h);
+ sdata.rgb565_xa5.plane1 = calloc(1, sizeof(unsigned char) * w * h);
+ s = enesim_surface_new_data_from(fmt, w, h, &sdata);
+ break;
+
default:
break;
}
@@ -25,18 +32,96 @@
void surface_free(Enesim_Surface *s)
{
Enesim_Surface_Format fmt;
+ Enesim_Surface_Data sdata;
+
fmt = enesim_surface_format_get(s);
+ enesim_surface_data_get(s, &sdata);
+
switch(fmt)
{
case ENESIM_SURFACE_ARGB8888:
- {
- DATA32 *d;
-
- enesim_surface_data_get(s, &d);
- free(d);
- }
+ free(sdata.argb8888.plane0);
+ break;
+
+ case ENESIM_SURFACE_ARGB8888_UNPRE:
+ free(sdata.argb8888_unpre.plane0);
+ break;
+
+ case ENESIM_SURFACE_RGB565_XA5:
+ free(sdata.rgb565_xa5.plane0);
+ free(sdata.rgb565_xa5.plane1);
+ break;
+
default:
break;
}
free(s);
}
+
+void surface_blt(Enesim_Surface *s, SDL_Surface *sdl)
+{
+ SDL_Surface *tmp;
+ Enesim_Surface_Data sdata;
+ Enesim_Surface_Format fmt;
+ void *data;
+ unsigned int amask, rmask, gmask, bmask, pitch, bpp;
+ int w, h;
+
+ enesim_surface_size_get(s, &w, &h);
+ enesim_surface_data_get(s, &sdata);
+ fmt = enesim_surface_format_get(s);
+ switch (fmt)
+ {
+
+ case ENESIM_SURFACE_ARGB8888:
+ amask = 0xff000000;
+ rmask = 0x00ff0000;
+ gmask = 0x0000ff00;
+ bmask = 0x000000ff;
+ pitch = 4 * w;
+ bpp = 32;
+ data = malloc(sizeof(unsigned int) * w * h);
+ /* TODO we have to fix this with the converter? */
+ {
+ unsigned int argb;
+ int i;
+ unsigned int *ptr = data;
+
+ for (i = 0; i < w * h; i++)
+ {
+ argb = enesim_surface_data_to_argb(&sdata, fmt);
+ enesim_surface_data_increment(&sdata, fmt, 1);
+ *ptr = argb;
+ ptr++;
+ }
+
+ }
+ break;
+
+ case ENESIM_SURFACE_ARGB8888_UNPRE:
+ amask = 0xff000000;
+ rmask = 0x00ff0000;
+ gmask = 0x0000ff00;
+ bmask = 0x000000ff;
+ pitch = 4 * w;
+ bpp = 32;
+ data = sdata.argb8888_unpre.plane0;
+ break;
+
+ case ENESIM_SURFACE_RGB565_XA5:
+ amask = 0x00000000;
+ rmask = 0x0000f800;
+ gmask = 0x000007e0;
+ bmask = 0x0000001f;
+ pitch = 2 * w;
+ bpp = 16;
+ data = sdata.rgb565_xa5.plane0;
+ break;
+
+ default:
+ return;
+ }
+ tmp = SDL_CreateRGBSurfaceFrom(data, w, h, bpp, pitch, rmask, gmask, bmask, amask);
+ SDL_BlitSurface(tmp, NULL, sdl, NULL);
+ SDL_FreeSurface(sdl);
+}
Added: trunk/PROTO/enesim/m4/enesim_format.m4
Modified: trunk/PROTO/enesim/src/Makefile.am
===================================================================
--- trunk/PROTO/enesim/src/Makefile.am 2008-08-20 13:49:04 UTC (rev 35581)
+++ trunk/PROTO/enesim/src/Makefile.am 2008-08-20 14:50:45 UTC (rev 35582)
@@ -1,3 +1,7 @@
-SUBDIRS = lib
+if TOOLS_ONLY
+SUBDIRS = tool
+else
+SUBDIRS = tool include lib
+endif
MAINTAINERCLEANFILES = Makefile.in
Added: trunk/PROTO/enesim/src/include/Enesim.h
Added: trunk/PROTO/enesim/src/include/Makefile.am
Added: trunk/PROTO/enesim/src/include/enesim_common.h
Added: trunk/PROTO/enesim/src/include/enesim_converter.h
Added: trunk/PROTO/enesim/src/include/enesim_drawer.h
Added: trunk/PROTO/enesim/src/include/enesim_main.h
Added: trunk/PROTO/enesim/src/include/enesim_private.h
Added: trunk/PROTO/enesim/src/include/enesim_rasterizer.h
Added: trunk/PROTO/enesim/src/include/enesim_renderer.h
Added: trunk/PROTO/enesim/src/include/enesim_surface.h
Added: trunk/PROTO/enesim/src/include/enesim_transforme...
[truncated message content] |