From e5e81ec8759ba71a971f42b7c341ffa47ad58b63 Mon Sep 17 00:00:00 2001 From: Alexandre Quessy Date: Sun, 24 Nov 2013 14:01:29 -0500 Subject: [PATCH 01/10] Remove autotools packaging files --- AUTHORS | 3 - COPYING | 674 -------------------------------------- ChangeLog | 0 INSTALL | 370 --------------------- Makefile.am | 9 - autogen.sh | 12 - configure.ac | 111 ------- data/Makefile.am | 7 - data/mapmap.desktop.in.in | 11 - data/mapmap.pc.in | 12 - mapmap/Makefile.am | 44 --- mapmap/version.c | 9 - mapmap/version.h | 13 - po/Makefile.am | 0 src/Makefile.am | 39 --- src/main-window.c | 0 src/main-window.h | 0 src/main.c | 151 --------- 18 files changed, 1465 deletions(-) delete mode 100644 AUTHORS delete mode 100644 COPYING delete mode 100644 ChangeLog delete mode 100644 INSTALL delete mode 100644 Makefile.am delete mode 100755 autogen.sh delete mode 100644 configure.ac delete mode 100644 data/Makefile.am delete mode 100644 data/mapmap.desktop.in.in delete mode 100644 data/mapmap.pc.in delete mode 100644 mapmap/Makefile.am delete mode 100644 mapmap/version.c delete mode 100644 mapmap/version.h delete mode 100644 po/Makefile.am delete mode 100644 src/Makefile.am delete mode 100644 src/main-window.c delete mode 100644 src/main-window.h delete mode 100644 src/main.c diff --git a/AUTHORS b/AUTHORS deleted file mode 100644 index 02893c9..0000000 --- a/AUTHORS +++ /dev/null @@ -1,3 +0,0 @@ -Alexandre Quessy -Sofian Audry -Sylvain Cormier diff --git a/COPYING b/COPYING deleted file mode 100644 index 94a9ed0..0000000 --- a/COPYING +++ /dev/null @@ -1,674 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU General Public License is a free, copyleft license for -software and other kinds of works. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. 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 -them 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 prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. 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. - - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. - - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey 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; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If 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 convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Use with the GNU Affero General Public License. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU 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 that a certain numbered version of the GNU General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - 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. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -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. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - 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 -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - 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 3 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, see . - -Also add information on how to contact you by electronic and paper mail. - - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: - - Copyright (C) - This program 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, your program's commands -might be different; for a GUI interface, you would use an "about box". - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -. - - The GNU 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 Lesser General -Public License instead of this License. But first, please read -. diff --git a/ChangeLog b/ChangeLog deleted file mode 100644 index e69de29..0000000 diff --git a/INSTALL b/INSTALL deleted file mode 100644 index 007e939..0000000 --- a/INSTALL +++ /dev/null @@ -1,370 +0,0 @@ -Installation Instructions -************************* - -Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation, -Inc. - - Copying and distribution of this file, with or without modification, -are permitted in any medium without royalty provided the copyright -notice and this notice are preserved. This file is offered as-is, -without warranty of any kind. - -Basic Installation -================== - - Briefly, the shell commands `./configure; make; make install' should -configure, build, and install this package. The following -more-detailed instructions are generic; see the `README' file for -instructions specific to this package. Some packages provide this -`INSTALL' file but do not implement all of the features documented -below. The lack of an optional feature in a given package is not -necessarily a bug. More recommendations for GNU packages can be found -in *note Makefile Conventions: (standards)Makefile Conventions. - - The `configure' shell script attempts to guess correct values for -various system-dependent variables used during compilation. It uses -those values to create a `Makefile' in each directory of the package. -It may also create one or more `.h' files containing system-dependent -definitions. Finally, it creates a shell script `config.status' that -you can run in the future to recreate the current configuration, and a -file `config.log' containing compiler output (useful mainly for -debugging `configure'). - - It can also use an optional file (typically called `config.cache' -and enabled with `--cache-file=config.cache' or simply `-C') that saves -the results of its tests to speed up reconfiguring. Caching is -disabled by default to prevent problems with accidental use of stale -cache files. - - If you need to do unusual things to compile the package, please try -to figure out how `configure' could check whether to do them, and mail -diffs or instructions to the address given in the `README' so they can -be considered for the next release. If you are using the cache, and at -some point `config.cache' contains results you don't want to keep, you -may remove or edit it. - - The file `configure.ac' (or `configure.in') is used to create -`configure' by a program called `autoconf'. You need `configure.ac' if -you want to change it or regenerate `configure' using a newer version -of `autoconf'. - - The simplest way to compile this package is: - - 1. `cd' to the directory containing the package's source code and type - `./configure' to configure the package for your system. - - Running `configure' might take a while. While running, it prints - some messages telling which features it is checking for. - - 2. Type `make' to compile the package. - - 3. Optionally, type `make check' to run any self-tests that come with - the package, generally using the just-built uninstalled binaries. - - 4. Type `make install' to install the programs and any data files and - documentation. When installing into a prefix owned by root, it is - recommended that the package be configured and built as a regular - user, and only the `make install' phase executed with root - privileges. - - 5. Optionally, type `make installcheck' to repeat any self-tests, but - this time using the binaries in their final installed location. - This target does not install anything. Running this target as a - regular user, particularly if the prior `make install' required - root privileges, verifies that the installation completed - correctly. - - 6. You can remove the program binaries and object files from the - source code directory by typing `make clean'. To also remove the - files that `configure' created (so you can compile the package for - a different kind of computer), type `make distclean'. There is - also a `make maintainer-clean' target, but that is intended mainly - for the package's developers. If you use it, you may have to get - all sorts of other programs in order to regenerate files that came - with the distribution. - - 7. Often, you can also type `make uninstall' to remove the installed - files again. In practice, not all packages have tested that - uninstallation works correctly, even though it is required by the - GNU Coding Standards. - - 8. Some packages, particularly those that use Automake, provide `make - distcheck', which can by used by developers to test that all other - targets like `make install' and `make uninstall' work correctly. - This target is generally not run by end users. - -Compilers and Options -===================== - - Some systems require unusual options for compilation or linking that -the `configure' script does not know about. Run `./configure --help' -for details on some of the pertinent environment variables. - - You can give `configure' initial values for configuration parameters -by setting variables in the command line or in the environment. Here -is an example: - - ./configure CC=c99 CFLAGS=-g LIBS=-lposix - - *Note Defining Variables::, for more details. - -Compiling For Multiple Architectures -==================================== - - You can compile the package for more than one kind of computer at the -same time, by placing the object files for each architecture in their -own directory. To do this, you can use GNU `make'. `cd' to the -directory where you want the object files and executables to go and run -the `configure' script. `configure' automatically checks for the -source code in the directory that `configure' is in and in `..'. This -is known as a "VPATH" build. - - With a non-GNU `make', it is safer to compile the package for one -architecture at a time in the source code directory. After you have -installed the package for one architecture, use `make distclean' before -reconfiguring for another architecture. - - On MacOS X 10.5 and later systems, you can create libraries and -executables that work on multiple system types--known as "fat" or -"universal" binaries--by specifying multiple `-arch' options to the -compiler but only a single `-arch' option to the preprocessor. Like -this: - - ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ - CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ - CPP="gcc -E" CXXCPP="g++ -E" - - This is not guaranteed to produce working output in all cases, you -may have to build one architecture at a time and combine the results -using the `lipo' tool if you have problems. - -Installation Names -================== - - By default, `make install' installs the package's commands under -`/usr/local/bin', include files under `/usr/local/include', etc. You -can specify an installation prefix other than `/usr/local' by giving -`configure' the option `--prefix=PREFIX', where PREFIX must be an -absolute file name. - - You can specify separate installation prefixes for -architecture-specific files and architecture-independent files. If you -pass the option `--exec-prefix=PREFIX' to `configure', the package uses -PREFIX as the prefix for installing programs and libraries. -Documentation and other data files still use the regular prefix. - - In addition, if you use an unusual directory layout you can give -options like `--bindir=DIR' to specify different values for particular -kinds of files. Run `configure --help' for a list of the directories -you can set and what kinds of files go in them. In general, the -default for these options is expressed in terms of `${prefix}', so that -specifying just `--prefix' will affect all of the other directory -specifications that were not explicitly provided. - - The most portable way to affect installation locations is to pass the -correct locations to `configure'; however, many packages provide one or -both of the following shortcuts of passing variable assignments to the -`make install' command line to change installation locations without -having to reconfigure or recompile. - - The first method involves providing an override variable for each -affected directory. For example, `make install -prefix=/alternate/directory' will choose an alternate location for all -directory configuration variables that were expressed in terms of -`${prefix}'. Any directories that were specified during `configure', -but not in terms of `${prefix}', must each be overridden at install -time for the entire installation to be relocated. The approach of -makefile variable overrides for each directory variable is required by -the GNU Coding Standards, and ideally causes no recompilation. -However, some platforms have known limitations with the semantics of -shared libraries that end up requiring recompilation when using this -method, particularly noticeable in packages that use GNU Libtool. - - The second method involves providing the `DESTDIR' variable. For -example, `make install DESTDIR=/alternate/directory' will prepend -`/alternate/directory' before all installation names. The approach of -`DESTDIR' overrides is not required by the GNU Coding Standards, and -does not work on platforms that have drive letters. On the other hand, -it does better at avoiding recompilation issues, and works well even -when some directory options were not specified in terms of `${prefix}' -at `configure' time. - -Optional Features -================= - - If the package supports it, you can cause programs to be installed -with an extra prefix or suffix on their names by giving `configure' the -option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. - - Some packages pay attention to `--enable-FEATURE' options to -`configure', where FEATURE indicates an optional part of the package. -They may also pay attention to `--with-PACKAGE' options, where PACKAGE -is something like `gnu-as' or `x' (for the X Window System). The -`README' should mention any `--enable-' and `--with-' options that the -package recognizes. - - For packages that use the X Window System, `configure' can usually -find the X include and library files automatically, but if it doesn't, -you can use the `configure' options `--x-includes=DIR' and -`--x-libraries=DIR' to specify their locations. - - Some packages offer the ability to configure how verbose the -execution of `make' will be. For these packages, running `./configure ---enable-silent-rules' sets the default to minimal output, which can be -overridden with `make V=1'; while running `./configure ---disable-silent-rules' sets the default to verbose, which can be -overridden with `make V=0'. - -Particular systems -================== - - On HP-UX, the default C compiler is not ANSI C compatible. If GNU -CC is not installed, it is recommended to use the following options in -order to use an ANSI C compiler: - - ./configure CC="cc -Ae -D_XOPEN_SOURCE=500" - -and if that doesn't work, install pre-built binaries of GCC for HP-UX. - - HP-UX `make' updates targets which have the same time stamps as -their prerequisites, which makes it generally unusable when shipped -generated files such as `configure' are involved. Use GNU `make' -instead. - - On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot -parse its `' header file. The option `-nodtk' can be used as -a workaround. If GNU CC is not installed, it is therefore recommended -to try - - ./configure CC="cc" - -and if that doesn't work, try - - ./configure CC="cc -nodtk" - - On Solaris, don't put `/usr/ucb' early in your `PATH'. This -directory contains several dysfunctional programs; working variants of -these programs are available in `/usr/bin'. So, if you need `/usr/ucb' -in your `PATH', put it _after_ `/usr/bin'. - - On Haiku, software installed for all users goes in `/boot/common', -not `/usr/local'. It is recommended to use the following options: - - ./configure --prefix=/boot/common - -Specifying the System Type -========================== - - There may be some features `configure' cannot figure out -automatically, but needs to determine by the type of machine the package -will run on. Usually, assuming the package is built to be run on the -_same_ architectures, `configure' can figure that out, but if it prints -a message saying it cannot guess the machine type, give it the -`--build=TYPE' option. TYPE can either be a short name for the system -type, such as `sun4', or a canonical name which has the form: - - CPU-COMPANY-SYSTEM - -where SYSTEM can have one of these forms: - - OS - KERNEL-OS - - See the file `config.sub' for the possible values of each field. If -`config.sub' isn't included in this package, then this package doesn't -need to know the machine type. - - If you are _building_ compiler tools for cross-compiling, you should -use the option `--target=TYPE' to select the type of system they will -produce code for. - - If you want to _use_ a cross compiler, that generates code for a -platform different from the build platform, you should specify the -"host" platform (i.e., that on which the generated programs will -eventually be run) with `--host=TYPE'. - -Sharing Defaults -================ - - If you want to set default values for `configure' scripts to share, -you can create a site shell script called `config.site' that gives -default values for variables like `CC', `cache_file', and `prefix'. -`configure' looks for `PREFIX/share/config.site' if it exists, then -`PREFIX/etc/config.site' if it exists. Or, you can set the -`CONFIG_SITE' environment variable to the location of the site script. -A warning: not all `configure' scripts look for a site script. - -Defining Variables -================== - - Variables not defined in a site shell script can be set in the -environment passed to `configure'. However, some packages may run -configure again during the build, and the customized values of these -variables may be lost. In order to avoid this problem, you should set -them in the `configure' command line, using `VAR=value'. For example: - - ./configure CC=/usr/local2/bin/gcc - -causes the specified `gcc' to be used as the C compiler (unless it is -overridden in the site shell script). - -Unfortunately, this technique does not work for `CONFIG_SHELL' due to -an Autoconf limitation. Until the limitation is lifted, you can use -this workaround: - - CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash - -`configure' Invocation -====================== - - `configure' recognizes the following options to control how it -operates. - -`--help' -`-h' - Print a summary of all of the options to `configure', and exit. - -`--help=short' -`--help=recursive' - Print a summary of the options unique to this package's - `configure', and exit. The `short' variant lists options used - only in the top level, while the `recursive' variant lists options - also present in any nested packages. - -`--version' -`-V' - Print the version of Autoconf used to generate the `configure' - script, and exit. - -`--cache-file=FILE' - Enable the cache: use and save the results of the tests in FILE, - traditionally `config.cache'. FILE defaults to `/dev/null' to - disable caching. - -`--config-cache' -`-C' - Alias for `--cache-file=config.cache'. - -`--quiet' -`--silent' -`-q' - Do not print messages saying which checks are being made. To - suppress all normal output, redirect it to `/dev/null' (any error - messages will still be shown). - -`--srcdir=DIR' - Look for the package's source code in directory DIR. Usually - `configure' can determine that directory automatically. - -`--prefix=DIR' - Use DIR as the installation prefix. *note Installation Names:: - for more details, including other options available for fine-tuning - the installation locations. - -`--no-create' -`-n' - Run the configure checks, but stop before creating any output - files. - -`configure' also accepts some other, not widely useful, options. Run -`configure --help' for more details. diff --git a/Makefile.am b/Makefile.am deleted file mode 100644 index 266c233..0000000 --- a/Makefile.am +++ /dev/null @@ -1,9 +0,0 @@ -ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} - -SUBDIRS = \ - mapmap \ - src \ - data \ - po \ - $(NULL) - diff --git a/autogen.sh b/autogen.sh deleted file mode 100755 index feebfc3..0000000 --- a/autogen.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh -# Run this to generate all the initial makefiles, etc. - -srcdir=`dirname $0` -test -z "$srcdir" && srcdir=. - -which gnome-autogen.sh || { - echo "You need to install gnome-common" - exit 1 -} - -ACLOCAL_FLAGS="$ACLOCAL_FLAGS" USE_GNOME2_MACROS=1 . gnome-autogen.sh diff --git a/configure.ac b/configure.ac deleted file mode 100644 index 9575c78..0000000 --- a/configure.ac +++ /dev/null @@ -1,111 +0,0 @@ -# Process this file with autoconf to produce a configure script. -AC_PREREQ([2.64]) -AC_INIT([MapMap], - [0.0.1], - [mapmap@toonloop.com], - [mapmap], - [http://mapmap.toonloop.com]) - -AC_CONFIG_AUX_DIR([build-aux]) -AC_CONFIG_HEADERS([src/config.h]) -AC_CONFIG_SRCDIR([configure.ac]) -AC_CONFIG_MACRO_DIR([m4]) - -AM_INIT_AUTOMAKE([1.11 -Wall -Wno-portability dist-xz no-define no-dist-gzip nostdinc subdir-objects]) -AM_MAINTAINER_MODE([enable]) -AM_SILENT_RULES([yes]) - -# Check for programs -AC_PROG_CC -AM_PROG_CC_C_O - -# Initialize libtool -LT_PREREQ([2.2]) -LT_INIT([disable-static]) - -PKG_PROG_PKG_CONFIG([0.24]) - -AC_SUBST([TOONLOOP_WFLAGS], ["-Wall -DGSEAL_ENABLE"]) - -GNOME_MAINTAINER_MODE_DEFINES -GNOME_COMPILE_WARNINGS([maximum]) - -#******************************************************************************* -# Libraries -#******************************************************************************* -# Before making a release, the LIB***_LT_VERSION string should be modified. -# The string is of the form C:R:A. -# - If interfaces have been changed or added, but binary compatibility has -# been preserved, change to C+1:0:A+1 -# - If binary compatibility has been broken (eg removed or changed interfaces) -# change to C+1:0:0 -# - If the interface is the same as the previous version, change to C:R+1:A -AC_SUBST([MAPMAP_LT_VERSION], [3:0:0]) - -# The version of the API. Should be major.minor and not change until not backward-compatible -AC_SUBST([MAPMAP_API_VERSION], [3.0]) - -#******************************************************************************* -# Internationalization -#******************************************************************************* -# AC_SUBST([GETTEXT_PACKAGE], [$PACKAGE_TARNAME]) -# AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], ["$GETTEXT_PACKAGE"], [GETTEXT package name]) -# IT_PROG_INTLTOOL([0.50.0]) - -#******************************************************************************* -# Check required libraries -#******************************************************************************* - -GLIB_REQUIRED="glib-2.0 >= 2.28.0" -GOBJECT_REQUIRED="gobject-2.0 >= 2.28.0" -GIO_REQUIRED="gio-2.0 >= 2.32.0" -GTK_REQUIRED="gtk+-3.0 >= 3.4.4" -GDK_REQUIRED="gdk-3.0 >= 3.3.6" -GDK_PIXBUF_REQUIRED="gdk-pixbuf-2.0" -GSTREAMER_VERSION=1.0.0 -GSTREAMER_REQUIRED="gstreamer-plugins-base-1.0 >= $GSTREAMER_VERSION gstreamer-1.0 >= $GSTREAMER_VERSION gstreamer-pbutils-1.0 >= $GSTREAMER_VERSION" -GSTREAMER_PLUGINS_BAD_VERSION=1.0.0 -GSTREAMER_PLUGINS_BAD_REQUIRED="gstreamer-plugins-bad-1.0 >= $GSTREAMER_PLUGINS_BAD_VERSION" -CAIRO_REQUIRED="cairo >= 1.10.0" -PANGOCAIRO_REQUIRED="pangocairo >= 1.28.0" -LIBRSVG_REQUIRED="librsvg-2.0 >= 2.32.0" -CLUTTER_REQUIRED="clutter-1.0 >= 1.13.2" -CLUTTERGTK_REQUIRED="clutter-gtk-1.0 >= 0.91.8" -CLUTTERGST_REQUIRED="clutter-gst-2.0 >= 1.9.0" -LIBCANBERRA_REQUIRED="libcanberra-gtk3 >= 0.26" - -# Libtool requires this, but it is only expanded once anyway. -AC_CANONICAL_HOST - -PKG_CHECK_MODULES([MAPMAP], - [$GLIB_REQUIRED - $GIO_REQUIRED - $GOBJECT_REQUIRED - $GDK_PIXBUF_REQUIRED - $GSTREAMER_REQUIRED - $GSTREAMER_PLUGINS_BAD_REQUIRED - $LIBCANBERRA_REQUIRED - $CAIRO_REQUIRED - $LIBRSVG_REQUIRED - $PANGOCAIRO_REQUIRED - $CLUTTER_REQUIRED - $GTK_REQUIRED - $GDK_REQUIRED - $CLUTTERGTK_REQUIRED - $CLUTTERGST_REQUIRED]) - -GLIB_GSETTINGS -#******************************************************************************* - -AC_CONFIG_FILES([ - Makefile - mapmap/Makefile - src/Makefile - data/Makefile - po/Makefile - data/mapmap.desktop.in - data/mapmap-${MAPMAP_API_VERSION}.pc:data/mapmap.pc.in - ]) -AC_OUTPUT - -#************************************************************************** diff --git a/data/Makefile.am b/data/Makefile.am deleted file mode 100644 index ab6b4df..0000000 --- a/data/Makefile.am +++ /dev/null @@ -1,7 +0,0 @@ -pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = \ - mapmap-@MAPMAP_API_VERSION@.pc \ - $(NULL) - -EXTRA_DIST = \ - $(NULL) diff --git a/data/mapmap.desktop.in.in b/data/mapmap.desktop.in.in deleted file mode 100644 index 0281bc6..0000000 --- a/data/mapmap.desktop.in.in +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -_Name=MapMap -_X-GNOME-FullName=MapMap Free Video Mapping Software -_Comment=Project video on non-plane surfaces -_Keywords=photo;video;webcam; -Exec=mapmap -Terminal=false -Type=Application -StartupNotify=true -Icon=mapmap -Categories=GNOME;AudioVideo; diff --git a/data/mapmap.pc.in b/data/mapmap.pc.in deleted file mode 100644 index 6062d1c..0000000 --- a/data/mapmap.pc.in +++ /dev/null @@ -1,12 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@ - -Name: mapmap -Description: MapMap video mapping utilities -Version: @PACKAGE_VERSION@ -Requires.private: gstreamer-1.0 gstreamer-plugins-base-1.0 clutter-gst-2.0 -Requires: clutter-1.0 -Libs: -L${libdir} -lmapmap -Cflags: -I${includedir}/mapmap diff --git a/mapmap/Makefile.am b/mapmap/Makefile.am deleted file mode 100644 index 41ed5b2..0000000 --- a/mapmap/Makefile.am +++ /dev/null @@ -1,44 +0,0 @@ -## SUBDIRS=test -AM_CFLAGS = \ - -DDATADIR=\"$(datadir)\" \ - -DPREFIX=\""$(prefix)"\" \ - -DSYSCONFDIR=\""$(sysconfdir)"\" \ - -DLIBDIR=\""$(libdir)"\" \ - -DPACKAGE_DATADIR=\""$(pkgdatadir)"\" \ - -DPACKAGE_LOCALEDIR=\""$(datadir)/locale"\" \ - -I$(top_builddir) \ - $(MAPMAP_CFLAGS) \ - $(MAPMAP_WFLAGS) \ - $(WARN_CFLAGS) \ - $(NULL) - -lib_LTLIBRARIES = libmapmap-@MAPMAP_API_VERSION@.la - -libmapmap_@MAPMAP_API_VERSION@_la_LIBADD = \ - $(MAPMAPLOOP_LIBS) \ - $(NULL) - -# use lib_LTLIBRARIES to build a shared lib: - -## Instruct libtool to include ABI version information in the generated shared -## library file (.so). The library ABI version is defined in configure.ac, so -## that all version information is kept in one place. -libmapmap_@MAPMAP_API_VERSION@_la_LDFLAGS = -export-dynamic -version-info $(MAPMAP_LT_VERSION) $(AM_LIBS) -libmapmap_@MAPMAP_API_VERSION@_la_LIBS = $(AM_LIBS) -libmapmap_@MAPMAP_API_VERSION@_la_CXXFLAGS = $(AM_CXXFLAGS) -libmapmap_@MAPMAP_API_VERSION@_la_includedir = $(includedir)/mapmap-$(MAPMAP_API_VERSION)/mapmap - -## Define the source file list for the "libmapmap-@MAPMAP_API_VERSION@.la" -## target. Note that @MAPMAP_API_VERSION@ is not interpreted by Automake and -## will therefore be treated as if it were literally part of the target name, -## and the variable name derived from that. -## PLEASE KEEP THEM IN ALPHABETICAL ORDER -libmapmap_@MAPMAP_API_VERSION@_la_SOURCES = \ - version.c \ - $(NULL) - -## PLEASE KEEP THEM IN ALPHABETICAL ORDER -libmapmap_@MAPMAP_API_VERSION@_la_include_HEADERS = \ - version.h \ - $(NULL) - diff --git a/mapmap/version.c b/mapmap/version.c deleted file mode 100644 index c89b1a4..0000000 --- a/mapmap/version.c +++ /dev/null @@ -1,9 +0,0 @@ -#include "mapmap/version.h" -#include "src/config.h" - -gchar * -mapmap_get_version () -{ - gchar *version = g_strdup (PACKAGE_VERSION); - return version; -} diff --git a/mapmap/version.h b/mapmap/version.h deleted file mode 100644 index ccf28ef..0000000 --- a/mapmap/version.h +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef __MAPMAP_VERSION_H__ -#define __MAPMAP_VERSION_H__ - -#include - -G_BEGIN_DECLS - -gchar * mapmap_get_version (); - -G_END_DECLS - -#endif - diff --git a/po/Makefile.am b/po/Makefile.am deleted file mode 100644 index e69de29..0000000 diff --git a/src/Makefile.am b/src/Makefile.am deleted file mode 100644 index c21b707..0000000 --- a/src/Makefile.am +++ /dev/null @@ -1,39 +0,0 @@ -AM_CFLAGS = \ - -DDATADIR=\"$(datadir)\" \ - -DPREFIX=\""$(prefix)"\" \ - -DSYSCONFDIR=\""$(sysconfdir)"\" \ - -DLIBDIR=\""$(libdir)"\" \ - -DPACKAGE_DATADIR=\""$(pkgdatadir)"\" \ - -DPACKAGE_LOCALEDIR=\""$(datadir)/locale"\" \ - -I$(top_builddir) \ - $(MAPMAP_CFLAGS) \ - $(MAPMAP_GTK_FLAGS) \ - $(MAPMAP_WFLAGS) \ - $(WARN_CFLAGS) - -bin_PROGRAMS = mapmap - -mapmap_SOURCES = \ - main.c \ - main-window.c \ - $(NULL) - -noinst_HEADERS = \ - main-window.h \ - $(NULL) - -mapmap_CPPFLAGS = \ - $(AM_CPPFLAGS) \ - $(MAPMAP_CFLAGS) \ - -include $(top_builddir)/src/$(CONFIG_HEADER) \ - -I$(top_srcdir) \ - -I$(top_srcdir)/src \ - $(NULL) - -mapmap_CFLAGS = -export-dynamic - -mapmap_LDADD = \ - $(top_srcdir)/mapmap/libmapmap-$(MAPMAP_API_VERSION).la \ - $(MAPMAP_LIBS) \ - $(NULL) - diff --git a/src/main-window.c b/src/main-window.c deleted file mode 100644 index e69de29..0000000 diff --git a/src/main-window.h b/src/main-window.h deleted file mode 100644 index e69de29..0000000 diff --git a/src/main.c b/src/main.c deleted file mode 100644 index 67b5f0d..0000000 --- a/src/main.c +++ /dev/null @@ -1,151 +0,0 @@ -#include -#include - -typedef struct _Data -{ - ClutterActor *stage; - ClutterActor *actor; - GstElement *pipeline0; - GstElement *videotestsrc0; - GstElement *capsfilter0; - GstElement *videoconvert0; - GstElement *cluttersink0; - ClutterTimeline *timeline; -} Data; - -static const ClutterColor STAGE_COLOR = { 0, 0, 0, 255 }; -static const gint DEFAULT_WIDTH = 1280; -static const gint DEFAULT_HEIGHT = 720; - -static gboolean -change_videotest_pattern (gpointer user_data) -{ - Data *data = (Data *) user_data; - gint current_pattern; - gint new_pattern; - - /* Let's disable this for now */ - return FALSE; - - g_object_get (data->videotestsrc0, - "pattern", ¤t_pattern, - NULL); - - new_pattern = (current_pattern + 1) % 2; - - g_message ("Set video test pattern to %d", new_pattern); - - g_object_set (data->videotestsrc0, - "pattern", new_pattern, - NULL); - return TRUE; -} - -static void -mm_create_stage (Data *data) -{ - gchar * caps_str; - GstCaps *size_caps; - - g_assert (data->stage == NULL); - - data->stage = clutter_stage_new (); - clutter_actor_set_background_color (data->stage, &STAGE_COLOR); - clutter_actor_set_size (data->stage, DEFAULT_WIDTH, DEFAULT_HEIGHT); - clutter_stage_set_minimum_size (CLUTTER_STAGE (data->stage), DEFAULT_WIDTH, DEFAULT_HEIGHT); - - data->pipeline0 = gst_pipeline_new ("pipeline0"); - data->videotestsrc0 = gst_element_factory_make ("videotestsrc", "videotestsrc0"); - data->capsfilter0 = gst_element_factory_make ("capsfilter", "capsfilter0"); - data->videoconvert0 = gst_element_factory_make ("videoconvert", "videoconvert0"); - data->cluttersink0 = gst_element_factory_make ("cluttersink", "cluttersink0"); - gst_bin_add_many (GST_BIN (data->pipeline0), - data->videotestsrc0, - data->capsfilter0, - data->videoconvert0, - data->cluttersink0, - NULL); - - g_assert (data->videotestsrc0); - g_assert (data->capsfilter0); - g_assert (data->videoconvert0); - g_assert (data->cluttersink0); - - g_assert (gst_element_link_many ( - data->videotestsrc0, - data->capsfilter0, - data->videoconvert0, - data->cluttersink0, - NULL)); - - /* set size caps */ - caps_str = g_strdup_printf ( - "video/x-raw,width=%d,height=%d,pixel-aspect-ratio=1/1", - DEFAULT_WIDTH, DEFAULT_HEIGHT); - size_caps = gst_caps_from_string (caps_str); - g_free (caps_str); - g_object_set (data->capsfilter0, - "caps", size_caps, - NULL); - gst_caps_unref (size_caps); - - /* create clutter texture */ - data->actor = CLUTTER_ACTOR (clutter_texture_new ()); - clutter_actor_set_size (data->actor, DEFAULT_WIDTH, DEFAULT_HEIGHT); - g_object_set (G_OBJECT (data->cluttersink0), - "texture", data->actor, - NULL); - clutter_actor_add_child (CLUTTER_ACTOR (data->stage), data->actor); - - g_signal_connect (data->stage, - "destroy", - G_CALLBACK (clutter_main_quit), - NULL); - - data->timeline = clutter_timeline_new (1000); - g_object_set (data->timeline, - "loop", TRUE, - NULL); - clutter_timeline_start (data->timeline); - - clutter_actor_show (data->stage); - gst_element_set_state (data->pipeline0, GST_STATE_PLAYING); - - g_timeout_add (1000, change_videotest_pattern, data); -} - -static void -print_version () -{ - gchar *version; - - version = mapmap_get_version (); - g_message ("MapMap version: %s", version); - - g_free (version); -} - -gint -main (gint argc, gchar ** argv) -{ - ClutterInitError status; - Data *data; - - print_version (); - - status = clutter_gst_init (&argc, &argv); - if (status != CLUTTER_INIT_SUCCESS) - { - g_critical ("Could not initiate Clutter GStreamer."); - return 1; - } - - data = g_new0 (Data, 1); - mm_create_stage (data); - - clutter_main (); - - g_free (data); - - return 0; -} From ddf7659678418206a336c47537a3abd0de6bb61b Mon Sep 17 00:00:00 2001 From: sylvain Date: Mon, 25 Nov 2013 22:10:18 -0500 Subject: [PATCH 02/10] added GLU dependency --- libremapping.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libremapping.pro b/libremapping.pro index d1e1137..f1fcc0e 100644 --- a/libremapping.pro +++ b/libremapping.pro @@ -3,5 +3,5 @@ TEMPLATE = app HEADERS = Common.h Util.h SourceGLCanvas.h DestinationGLCanvas.h MapperGLCanvas.h Mapper.h Shape.h Paint.h SOURCES = main.cpp Common.cpp Util.cpp Mapper.cpp SourceGLCanvas.cpp DestinationGLCanvas.cpp MapperGLCanvas.cpp QT += gui opengl -LIBS += -lSOIL -lglut +LIBS += -lSOIL -lglut -lGLU From c70af60c89b7047b2c0edc0b30e4257a6cbc5c05 Mon Sep 17 00:00:00 2001 From: Alexandre Quessy Date: Tue, 26 Nov 2013 21:31:58 -0500 Subject: [PATCH 03/10] git ignore more files --- .gitignore | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/.gitignore b/.gitignore index 1eaa4ba..f8044e6 100644 --- a/.gitignore +++ b/.gitignore @@ -10,25 +10,15 @@ *.tar *.rar Makefile -Makefile.in -aclocal.m4 -autom4te.cache -build-aux -config.log -config.status -configure -data/mapmap.desktop.in -libtool -m4/ -po/Makefile -po/Makefile.in prototypes/sdl/run -src/config.h -src/config.h.in -src/mapmap -src/stamp-h1 prototypes/wx-01-simple/run prototypes/wx-03-polyline/run prototypes/wx-04-gst/run Debug/ Release/ +libremapping +moc_DestinationGLCanvas.cpp +moc_MapperGLCanvas.cpp +moc_SourceGLCanvas.cpp +prototypes/gst/ +prototypes/wx-02-input-output/run From 9d36bc4922571b89f51b2b636d934c62376cada8 Mon Sep 17 00:00:00 2001 From: Alexandre Quessy Date: Tue, 26 Nov 2013 21:46:08 -0500 Subject: [PATCH 04/10] Use GL_CLAMP, not GL_REPEAT (and other changes) And also: * Use glVertex2f, not glVertex3f * Opening curly brackets on a new line * spaces between most operators * avoir some very long lines, or indentations --- DestinationGLCanvas.cpp | 28 ++++++++++++++++----------- HACKING | 1 + Mapper.cpp | 22 +++++++++++---------- SourceGLCanvas.cpp | 43 +++++++++++++++++++++++------------------ 4 files changed, 54 insertions(+), 40 deletions(-) diff --git a/DestinationGLCanvas.cpp b/DestinationGLCanvas.cpp index 286f2a4..1f88096 100644 --- a/DestinationGLCanvas.cpp +++ b/DestinationGLCanvas.cpp @@ -24,7 +24,8 @@ DestinationGLCanvas::DestinationGLCanvas(QWidget* parent, const QGLWidget * shar { } -Quad& DestinationGLCanvas::getQuad() { +Quad& DestinationGLCanvas::getQuad() +{ std::tr1::shared_ptr textureMapping = std::tr1::static_pointer_cast(Common::currentMapping); Q_CHECK_PTR(textureMapping); @@ -34,7 +35,8 @@ Quad& DestinationGLCanvas::getQuad() { return (*quad); } -void DestinationGLCanvas::doDraw() { +void DestinationGLCanvas::doDraw() +{ // TODO: Ceci est un hack necessaire car tout est en fonction de la width/height de la texture. // Il faut changer ca. std::tr1::shared_ptr textureMapping = std::tr1::static_pointer_cast(Common::currentMapping); @@ -43,16 +45,19 @@ void DestinationGLCanvas::doDraw() { std::tr1::shared_ptr texture = std::tr1::static_pointer_cast(textureMapping->getPaint()); Q_CHECK_PTR(texture); - for (int i=0; i tex = std::tr1::static_pointer_cast(Common::mappings[i]->getPaint()); Q_CHECK_PTR(tex); + // FIXME: maybe the texture id is actually 0 and it's ok, no? + // we should use a boolean is_texture_loaded, or so if (tex->getTextureId() == 0) { tex->loadTexture(); - tex->setPosition( (width() - tex->getWidth()) / 2, - (height() - tex->getHeight()) / 2 ); + tex->setPosition( + (width() - tex->getWidth()) / 2, + (height() - tex->getHeight()) / 2 ); } } @@ -60,7 +65,7 @@ void DestinationGLCanvas::doDraw() { // DRAW THE TEXTURE glPushMatrix(); - for (int i=0; idraw(); @@ -69,17 +74,18 @@ void DestinationGLCanvas::doDraw() { // Draw the quad. Quad& quad = getQuad(); - glColor4f(1, 0, 0, 1); + glColor4f(1.0, 0.0, 0.0, 1.0); // Destination quad. // Source quad. glLineWidth(5); glBegin (GL_LINE_STRIP); { - for (int i=0; i<5; i++) { - glVertex3f(quad.getVertex(i % 4).x, - quad.getVertex(i % 4).y, - 0); + for (int i=0; i<5; i++) + { + glVertex2f( + quad.getVertex(i % 4).x, + quad.getVertex(i % 4).y); } } glEnd (); diff --git a/HACKING b/HACKING index 4d75104..cc1beaf 100644 --- a/HACKING +++ b/HACKING @@ -7,3 +7,4 @@ Coding style * class names CamelCase * private data members with an underscore as a prefix: _likeThis * file names all lowercase +* always add spaces between operators such as +, -, /, * casts, etc. (except pointers and references) diff --git a/Mapper.cpp b/Mapper.cpp index f65b0f2..2efd724 100644 --- a/Mapper.cpp +++ b/Mapper.cpp @@ -39,25 +39,27 @@ void QuadTextureMapper::draw() glEnable (GL_TEXTURE_2D); glBindTexture(GL_TEXTURE_2D, texture->getTextureId()); - glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, texture->getWidth(), texture->getHeight(), 0, GL_RGBA, - GL_UNSIGNED_BYTE, texture->getBits()); + glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, + texture->getWidth(), texture->getHeight(), 0, GL_RGBA, + GL_UNSIGNED_BYTE, texture->getBits()); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); - glColor4f(1, 1, 1, 1.0f); + glColor4f(1.0f, 1.0f, 1.0f, 1.0f); glBegin(GL_QUADS); { for (int i=0; i<4; i++) { Util::correctGlTexCoord( - ( inputQuad->getVertex(i).x - texture->getX() ) / (GLfloat) texture->getWidth(), - ( inputQuad->getVertex(i).y - texture->getY() ) / (GLfloat) texture->getHeight()); - glVertex3f( quad->getVertex(i).x, - quad->getVertex(i).y, - 0); + (inputQuad->getVertex(i).x - texture->getX()) / (GLfloat) texture->getWidth(), + (inputQuad->getVertex(i).y - texture->getY()) / (GLfloat) texture->getHeight()); + glVertex2f( + quad->getVertex(i).x, + quad->getVertex(i).y + ); } } glEnd(); diff --git a/SourceGLCanvas.cpp b/SourceGLCanvas.cpp index b06d891..da5753c 100644 --- a/SourceGLCanvas.cpp +++ b/SourceGLCanvas.cpp @@ -24,7 +24,8 @@ SourceGLCanvas::SourceGLCanvas(QWidget* parent) { } -Quad& SourceGLCanvas::getQuad() { +Quad& SourceGLCanvas::getQuad() +{ std::tr1::shared_ptr textureMapping = std::tr1::static_pointer_cast(Common::currentMapping); Q_CHECK_PTR(textureMapping); @@ -34,7 +35,8 @@ Quad& SourceGLCanvas::getQuad() { return (*inputQuad); } -void SourceGLCanvas::doDraw() { +void SourceGLCanvas::doDraw() +{ // TODO: Ceci est un hack necessaire car tout est en fonction de la width/height de la texture. // Il faut changer ca. std::tr1::shared_ptr textureMapping = std::tr1::static_pointer_cast(Common::currentMapping); @@ -46,8 +48,10 @@ void SourceGLCanvas::doDraw() { std::cout << width() << " " << height() << std::endl; if (texture->getTextureId() == 0) { texture->loadTexture(); - texture->setPosition( (width() - texture->getWidth()) / 2, - (height() - texture->getHeight()) / 2 ); + texture->setPosition( + (width() - texture->getWidth()) / 2, + (height() - texture->getHeight()) / 2 + ); } // Now, draw @@ -67,8 +71,8 @@ void SourceGLCanvas::doDraw() { std::cout << texture->getX() << "x" << texture->getY() << " : " << texture->getWidth() << "x" << texture->getHeight() << " " << texture->getTextureId() << std::endl; - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); @@ -77,13 +81,13 @@ void SourceGLCanvas::doDraw() { // Draw source texture (not moving) in the center of the area. - float centerX = (float)width() / 2.0f; - float centerY = (float)height() / 2.0f; - float textureHalfWidth = (float)texture->getWidth() / 2.0f; - float textureHalfHeight = (float)texture->getHeight() / 2.0f; + // float centerX = (float) width() / 2.0f; + // float centerY = (float) height() / 2.0f; + // float textureHalfWidth = (float) texture->getWidth() / 2.0f; + // float textureHalfHeight = (float) texture->getHeight() / 2.0f; //printf("SRC: %f %f %f %f\n", centerX, centerY, textureHalfWidth, textureHalfHeight); - glColor4f (1, 1, 1, 1.0f); + glColor4f (1.0f, 1.0f, 1.0f, 1.0f); glBegin (GL_QUADS); { Util::correctGlTexCoord(0, 0); @@ -93,10 +97,10 @@ void SourceGLCanvas::doDraw() { glVertex3f (texture->getX()+texture->getWidth(), texture->getY(), 0); Util::correctGlTexCoord(1, 1); - glVertex3f (texture->getX()+texture->getWidth(), texture->getY()+texture->getHeight(), 0); + glVertex3f (texture->getX()+texture->getWidth(), texture->getY() + texture->getHeight(), 0); Util::correctGlTexCoord(0, 1); - glVertex3f (texture->getX(), texture->getY()+texture->getHeight(), 0); + glVertex3f (texture->getX(), texture->getY() + texture->getHeight(), 0); } glEnd (); @@ -105,17 +109,18 @@ void SourceGLCanvas::doDraw() { // Draw the quad. Quad& quad = getQuad(); - glColor4f(1, 0, 0, 1); + glColor4f(1.0f, 0.0f, 0.0f, 1.0f); - // Source quad. // Source quad. glLineWidth(5); glBegin (GL_LINE_STRIP); { - for (int i=0; i<5; i++) { - glVertex3f(quad.getVertex(i % 4).x, - quad.getVertex(i % 4).y, - 0); + for (int i = 0; i < 5; i++) + { + glVertex2f( + quad.getVertex(i % 4).x, + quad.getVertex(i % 4).y + ); } } glEnd (); From b6bcd27706b7bfaa276914e8e7740eeedb32030c Mon Sep 17 00:00:00 2001 From: Alexandre Quessy Date: Tue, 26 Nov 2013 22:04:39 -0500 Subject: [PATCH 05/10] update README --- README | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README b/README index e398920..e2158ad 100644 --- a/README +++ b/README @@ -9,7 +9,7 @@ a display surface for video projection. These objects may be complex industrial landscapes, such as buildings. By using specialized software, a two or three dimensional object is spatially mapped on the virtual program which mimics the real environment it is to be projected on. The software can interact with a -projector to fit any desired image onto the surface of that object.[1] This +projector to fit any desired image onto the surface of that object. This technique is used by artists and advertisers alike who can add extra dimensions, optical illusions, and notions of movement onto previously static objects. The video is commonly combined with, or triggered by, audio to create an @@ -20,6 +20,8 @@ Build Dependencies: * libwxgtk2.8-dev + * qt4-default + * qt4-qmake Build it:: From ed1056527d2b78fecab1e24dfd8af890e68f35fe Mon Sep 17 00:00:00 2001 From: Alexandre Quessy Date: Tue, 26 Nov 2013 22:08:02 -0500 Subject: [PATCH 06/10] Always draw OpenGL shapes' vertices in a counterclockwise order --- Common.cpp | 11 +++++------ Mapper.cpp | 2 +- MapperGLCanvas.cpp | 8 ++++---- Shape.h | 15 ++++++++++----- main.cpp | 9 ++------- 5 files changed, 22 insertions(+), 23 deletions(-) diff --git a/Common.cpp b/Common.cpp index 1f0af5b..1259f35 100644 --- a/Common.cpp +++ b/Common.cpp @@ -33,11 +33,12 @@ Quad* Common::createQuadForTexture(Texture* texture, int frameWidth, int frameHe float textureHalfWidth = texture->getWidth() / 2.0f; float textureHalfHeight = texture->getHeight() / 2.0f; + // XXX We should always draw OpenGL shapes counterclockwise return new Quad( - Point(centerX-textureHalfWidth, centerY-textureHalfHeight), - Point(centerX+textureHalfWidth, centerY-textureHalfHeight), - Point(centerX+textureHalfWidth, centerY+textureHalfHeight), - Point(centerX-textureHalfWidth, centerY+textureHalfHeight)); + Point(centerX - textureHalfWidth, centerY - textureHalfHeight), + Point(centerX - textureHalfWidth, centerY + textureHalfHeight), + Point(centerX + textureHalfWidth, centerY + textureHalfHeight), + Point(centerX + textureHalfWidth, centerY - textureHalfHeight)); } void Common::addImage(const std::string imagePath, int frameWidth, int frameHeight) @@ -46,10 +47,8 @@ void Common::addImage(const std::string imagePath, int frameWidth, int frameHeig TextureMapping* tm = new TextureMapping( img, - // Destination. createQuadForTexture(img, frameWidth, frameHeight), - // Input. createQuadForTexture(img, frameWidth, frameHeight) ); diff --git a/Mapper.cpp b/Mapper.cpp index 2efd724..63dc97c 100644 --- a/Mapper.cpp +++ b/Mapper.cpp @@ -51,7 +51,7 @@ void QuadTextureMapper::draw() glColor4f(1.0f, 1.0f, 1.0f, 1.0f); glBegin(GL_QUADS); { - for (int i=0; i<4; i++) + for (int i = 0; i < 4; i++) { Util::correctGlTexCoord( (inputQuad->getVertex(i).x - texture->getX()) / (GLfloat) texture->getWidth(), diff --git a/MapperGLCanvas.cpp b/MapperGLCanvas.cpp index 61e6763..3c0c538 100644 --- a/MapperGLCanvas.cpp +++ b/MapperGLCanvas.cpp @@ -33,7 +33,7 @@ void MapperGLCanvas::initializeGL() //glEnable(GL_CULL_FACE); } -void MapperGLCanvas::resizeGL(int width, int height) +void MapperGLCanvas::resizeGL(int /* width */, int /* height */) { // glClearColor(0.0, 0.0, 0.0, 0.0); // @@ -63,8 +63,8 @@ void MapperGLCanvas::draw() exitDraw(); } -void MapperGLCanvas::enterDraw() { - +void MapperGLCanvas::enterDraw() +{ glClearColor(0.0, 0.0, 0.0, 0.0); glClear(GL_COLOR_BUFFER_BIT); glViewport(0, 0, width(), height()); @@ -138,7 +138,7 @@ void MapperGLCanvas::keyPressEvent(QKeyEvent* event) emit quadChanged(); } -void MapperGLCanvas::paintEvent(QPaintEvent* event) +void MapperGLCanvas::paintEvent(QPaintEvent* /* event */) { std::cout << "Paint event" << std::endl; updateGL(); diff --git a/Shape.h b/Shape.h index 279e235..b5a0402 100644 --- a/Shape.h +++ b/Shape.h @@ -17,12 +17,10 @@ * along with this program. If not, see . */ - #ifndef SHAPE_H_ #define SHAPE_H_ #include -#include struct Point { @@ -41,8 +39,14 @@ public: virtual void build() {} - const Point& getVertex(int i) { return vertices[i]; } - void setVertex(int i, Point v) { vertices[i] = v; } + const Point& getVertex(int i) + { + return vertices[i]; + } + void setVertex(int i, Point v) + { + vertices[i] = v; + } void setVertex(int i, double x, double y) { vertices[i].x = x; @@ -54,7 +58,8 @@ class Quad : public Shape { public: Quad() {} - Quad(Point p1, Point p2, Point p3, Point p4) { + Quad(Point p1, Point p2, Point p3, Point p4) + { vertices.push_back(p1); vertices.push_back(p2); vertices.push_back(p3); diff --git a/main.cpp b/main.cpp index b51855d..7ab11a5 100644 --- a/main.cpp +++ b/main.cpp @@ -1,16 +1,12 @@ // NOTE: To run, it is recommended not to be in Compiz or Beryl, they have shown some instability. +#include #include #include - #include "Common.h" #include "DestinationGLCanvas.h" #include "SourceGLCanvas.h" -#include - -#include - #define DEFAULT_WIDTH 800 #define DEFAULT_HEIGHT 600 @@ -40,8 +36,7 @@ int main(int argc, char *argv[]) sourceCanvas.setFocusPolicy(Qt::ClickFocus); destinationCanvas.setFocusPolicy(Qt::ClickFocus); - - splitter.setWindowTitle(QObject::tr("Libremapping")); + splitter.setWindowTitle(QObject::tr("LibreMapping")); splitter.resize(DEFAULT_WIDTH, DEFAULT_HEIGHT); splitter.show(); From 83404dac47a6a830c4eb285a6a7b7fff54065525 Mon Sep 17 00:00:00 2001 From: Alexandre Quessy Date: Tue, 26 Nov 2013 22:13:46 -0500 Subject: [PATCH 07/10] Add Util::map_[float|int]. Change Util for a namespace, not a class with static methods. --- Util.cpp | 34 +++++++++++++++++++++++++++++++++- Util.h | 10 ++++++---- 2 files changed, 39 insertions(+), 5 deletions(-) diff --git a/Util.cpp b/Util.cpp index 5cedd74..f0a00f8 100644 --- a/Util.cpp +++ b/Util.cpp @@ -18,8 +18,40 @@ */ #include "Util.h" +#include -void Util::correctGlTexCoord(GLfloat x, GLfloat y) +namespace Util { + +void correctGlTexCoord(GLfloat x, GLfloat y) { glTexCoord2f (x, 1.0f - y); } + +/** + * Convenience function to map a variable from one coordinate space + * to another. + * The result is clipped in the range [ostart, ostop] + * Make sure ostop is bigger than ostart. + * + * To map a MIDI control value into the [0,1] range: + * map(value, 0.0, 1.0, 0. 127.); + * + * Depends on: #include + */ +float map_float(float value, float istart, float istop, float ostart, float ostop) +{ + float ret = ostart + (ostop - ostart) * ((value - istart) / (istop - istart)); + // In Processing, they don't do the following: (clipping) + return std::max(std::min(ret, ostop), ostart); +} + +int map_int(int value, int istart, int istop, int ostart, int ostop) +{ + float ret = ostart + (ostop - ostart) * ((value - istart) / float(istop - istart)); + //g_print("%f = %d + (%d-%d) * ((%d-%d) / (%d-%d))", ret, ostart, ostop, ostart, value, istart, istop, istart); + // In Processing, they don't do the following: (clipping) + return std::max(std::min(int(ret), ostop), ostart); +} + +} // end of namespace + diff --git a/Util.h b/Util.h index 78a576f..4e97cfa 100644 --- a/Util.h +++ b/Util.h @@ -22,10 +22,12 @@ #include -class Util { -public: +namespace Util { - static void correctGlTexCoord(GLfloat x, GLfloat y); -}; +void correctGlTexCoord(GLfloat x, GLfloat y); +float map_float(float value, float istart, float istop, float ostart, float ostop); +int map_int(int value, int istart, int istop, int ostart, int ostop); + +} // end of namespace #endif /* UTIL_H_ */ From 944ede8587b967827a9ff9e652914aa70b46b854 Mon Sep 17 00:00:00 2001 From: Alexandre Quessy Date: Tue, 26 Nov 2013 22:25:11 -0500 Subject: [PATCH 08/10] Add typedefs for std::tr1::shared_ptr<*> --- Common.h | 16 ++++++++++------ Mapper.cpp | 1 + Mapper.h | 26 ++++++++++++-------------- Paint.h | 4 ++-- Shape.h | 6 +++++- 5 files changed, 30 insertions(+), 23 deletions(-) diff --git a/Common.h b/Common.h index ab7fe26..440909e 100644 --- a/Common.h +++ b/Common.h @@ -27,12 +27,13 @@ #include "Shape.h" #include "Mapper.h" -class Common { +class Common +{ public: - static std::vector< std::tr1::shared_ptr > mappings; - static std::vector< std::tr1::shared_ptr > mappers; - static std::tr1::shared_ptr currentMapping; - static std::tr1::shared_ptr currentMapper; + static std::vector mappings; + static std::vector mappers; + static Mapping::ptr currentMapping; + static Mapper::ptr currentMapper; static int currentSourceIdx; @@ -41,7 +42,10 @@ public: static void initializeLibremapper(int frameWidth, int frameHeight); static void nextImage(); - static int nImages() { return mappings.size(); } + static int nImages() + { + return mappings.size(); + } }; #endif /* COMMON_H_ */ diff --git a/Mapper.cpp b/Mapper.cpp index 63dc97c..3c55e6f 100644 --- a/Mapper.cpp +++ b/Mapper.cpp @@ -21,6 +21,7 @@ void QuadTextureMapper::draw() { + // FIXME: use typedefs, member of the class for type names that are too long to type: std::tr1::shared_ptr textureMapping = std::tr1::static_pointer_cast(_mapping); Q_CHECK_PTR(textureMapping); diff --git a/Mapper.h b/Mapper.h index e571fb2..02ec5d2 100644 --- a/Mapper.h +++ b/Mapper.h @@ -22,26 +22,23 @@ #define MAPPER_H_ #include - -#include "Shape.h" -#include "Paint.h" - -#include "Util.h" - #include - #include #include #include #include +#include "Shape.h" +#include "Paint.h" +#include "Util.h" class Mapping { protected: - std::tr1::shared_ptr _paint; - std::tr1::shared_ptr _shape; + Paint::ptr _paint; + Shape::ptr _shape; public: + typedef std::tr1::shared_ptr ptr; Mapping(Paint* paint, Shape* shape) : _paint(paint), _shape(shape) {} @@ -52,14 +49,14 @@ public: } public: - std::tr1::shared_ptr getPaint() const { return _paint; } - std::tr1::shared_ptr getShape() const { return _shape; } + Paint::ptr getPaint() const { return _paint; } + Shape::ptr getShape() const { return _shape; } }; class TextureMapping : public Mapping { private: - std::tr1::shared_ptr _inputShape; + Shape::ptr _inputShape; public: TextureMapping(Paint* paint, @@ -74,17 +71,18 @@ public: _inputShape->build(); } public: - std::tr1::shared_ptr getInputShape() const { return _inputShape; } + Shape::ptr getInputShape() const { return _inputShape; } }; class Mapper { protected: - std::tr1::shared_ptr _mapping; + Mapping::ptr _mapping; Mapper(Mapping* mapping) : _mapping(mapping) {} virtual ~Mapper() {} public: + typedef std::tr1::shared_ptr ptr; virtual void draw() = 0; }; diff --git a/Paint.h b/Paint.h index 448bd79..2e7c213 100644 --- a/Paint.h +++ b/Paint.h @@ -23,16 +23,16 @@ #include #include - #include - #include +#include class Paint { protected: Paint() {} public: + typedef std::tr1::shared_ptr ptr; virtual ~Paint() {} virtual void build() {} }; diff --git a/Shape.h b/Shape.h index b5a0402..7541404 100644 --- a/Shape.h +++ b/Shape.h @@ -21,6 +21,7 @@ #define SHAPE_H_ #include +#include struct Point { @@ -32,9 +33,12 @@ struct Point class Shape { public: + typedef std::tr1::shared_ptr ptr; std::vector vertices; Shape() {} - Shape(std::vector vertices_) : vertices(vertices_) {} + Shape(std::vector vertices_) : + vertices(vertices_) + {} virtual ~Shape() {} virtual void build() {} From 9d1db533fa0e2b5bd8862cd610e315af9c07883d Mon Sep 17 00:00:00 2001 From: Alexandre Quessy Date: Tue, 26 Nov 2013 22:33:10 -0500 Subject: [PATCH 09/10] add a note --- SourceGLCanvas.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/SourceGLCanvas.cpp b/SourceGLCanvas.cpp index da5753c..e6e3eae 100644 --- a/SourceGLCanvas.cpp +++ b/SourceGLCanvas.cpp @@ -88,6 +88,7 @@ void SourceGLCanvas::doDraw() //printf("SRC: %f %f %f %f\n", centerX, centerY, textureHalfWidth, textureHalfHeight); glColor4f (1.0f, 1.0f, 1.0f, 1.0f); + // FIXME: Does this draw the quad counterclockwise? glBegin (GL_QUADS); { Util::correctGlTexCoord(0, 0); From 0e73f157f8deee9adf336b992861c224f69b13c9 Mon Sep 17 00:00:00 2001 From: Alexandre Quessy Date: Wed, 27 Nov 2013 01:33:04 -0500 Subject: [PATCH 10/10] Document with Doxygen --- .gitignore | 1 + Common.h | 3 + DestinationGLCanvas.h | 2 - Doxyfile | 1361 +++++++++++++++++++++++++++++++++++++++++ Mapper.h | 28 +- MapperGLCanvas.h | 3 + Paint.h | 18 +- Shape.h | 9 + Util.cpp | 3 + Util.h | 3 + build.sh | 2 +- index.dox | 28 + libremapping.pro | 6 +- sh_build_doc.sh | 3 + 14 files changed, 1463 insertions(+), 7 deletions(-) create mode 100644 Doxyfile create mode 100644 index.dox create mode 100755 sh_build_doc.sh diff --git a/.gitignore b/.gitignore index f8044e6..47fadbe 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ moc_MapperGLCanvas.cpp moc_SourceGLCanvas.cpp prototypes/gst/ prototypes/wx-02-input-output/run +html/ diff --git a/Common.h b/Common.h index 440909e..f889401 100644 --- a/Common.h +++ b/Common.h @@ -27,6 +27,9 @@ #include "Shape.h" #include "Mapper.h" +/** + * The main LibreMapping engine that deals with video mapping projects. + */ class Common { public: diff --git a/DestinationGLCanvas.h b/DestinationGLCanvas.h index 587a063..6d2fef1 100644 --- a/DestinationGLCanvas.h +++ b/DestinationGLCanvas.h @@ -20,8 +20,6 @@ #ifndef DESTINATIONGLCANVAS_H_ #define DESTINATIONGLCANVAS_H_ -#include - #include "MapperGLCanvas.h" class DestinationGLCanvas: public MapperGLCanvas diff --git a/Doxyfile b/Doxyfile new file mode 100644 index 0000000..f4765a9 --- /dev/null +++ b/Doxyfile @@ -0,0 +1,1361 @@ +# Doxyfile 1.5.5 + +# This file describes the settings to be used by the documentation system +# doxygen (www.doxygen.org) for a project +# +# All text after a hash (#) is considered a comment and will be ignored +# The format is: +# TAG = value [value, ...] +# For lists items can also be appended using: +# TAG += value [value, ...] +# Values that contain spaces should be placed between quotes (" ") + +#--------------------------------------------------------------------------- +# Project related configuration options +#--------------------------------------------------------------------------- + +# This tag specifies the encoding used for all characters in the config file +# that follow. The default is UTF-8 which is also the encoding used for all +# text before the first occurrence of this tag. Doxygen uses libiconv (or the +# iconv built into libc) for the transcoding. See +# http://www.gnu.org/software/libiconv for the list of possible encodings. + +DOXYFILE_ENCODING = UTF-8 + +# The PROJECT_NAME tag is a single word (or a sequence of words surrounded +# by quotes) that should identify the project. + +PROJECT_NAME = "LibreMapping" + +# The PROJECT_NUMBER tag can be used to enter a project or revision number. +# This could be handy for archiving the generated documentation or +# if some version control system is used. + +PROJECT_NUMBER = "0.0.1" + +# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) +# base path where the generated documentation will be put. +# If a relative path is entered, it will be relative to the location +# where doxygen was started. If left blank the current directory will be used. + +OUTPUT_DIRECTORY = + +# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create +# 4096 sub-directories (in 2 levels) under the output directory of each output +# format and will distribute the generated files over these directories. +# Enabling this option can be useful when feeding doxygen a huge amount of +# source files, where putting all generated files in the same directory would +# otherwise cause performance problems for the file system. + +CREATE_SUBDIRS = NO + +# The OUTPUT_LANGUAGE tag is used to specify the language in which all +# documentation generated by doxygen is written. Doxygen will use this +# information to generate all constant output in the proper language. +# The default language is English, other supported languages are: +# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional, +# Croatian, Czech, Danish, Dutch, Farsi, Finnish, French, German, Greek, +# Hungarian, Italian, Japanese, Japanese-en (Japanese with English messages), +# Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian, Polish, +# Portuguese, Romanian, Russian, Serbian, Slovak, Slovene, Spanish, Swedish, +# and Ukrainian. + +OUTPUT_LANGUAGE = English + +# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will +# include brief member descriptions after the members that are listed in +# the file and class documentation (similar to JavaDoc). +# Set to NO to disable this. + +BRIEF_MEMBER_DESC = YES + +# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend +# the brief description of a member or function before the detailed description. +# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the +# brief descriptions will be completely suppressed. + +REPEAT_BRIEF = YES + +# This tag implements a quasi-intelligent brief description abbreviator +# that is used to form the text in various listings. Each string +# in this list, if found as the leading text of the brief description, will be +# stripped from the text and the result after processing the whole list, is +# used as the annotated text. Otherwise, the brief description is used as-is. +# If left blank, the following values are used ("$name" is automatically +# replaced with the name of the entity): "The $name class" "The $name widget" +# "The $name file" "is" "provides" "specifies" "contains" +# "represents" "a" "an" "the" + +ABBREVIATE_BRIEF = YES + +# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then +# Doxygen will generate a detailed section even if there is only a brief +# description. + +ALWAYS_DETAILED_SEC = YES + +# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all +# inherited members of a class in the documentation of that class as if those +# members were ordinary class members. Constructors, destructors and assignment +# operators of the base classes will not be shown. + +INLINE_INHERITED_MEMB = YES + +# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full +# path before files name in the file list and in the header files. If set +# to NO the shortest path that makes the file name unique will be used. + +FULL_PATH_NAMES = NO + +# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag +# can be used to strip a user-defined part of the path. Stripping is +# only done if one of the specified strings matches the left-hand part of +# the path. The tag can be used to show relative paths in the file list. +# If left blank the directory from which doxygen is run is used as the +# path to strip. + +STRIP_FROM_PATH = + +# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of +# the path mentioned in the documentation of a class, which tells +# the reader which header file to include in order to use a class. +# If left blank only the name of the header file containing the class +# definition is used. Otherwise one should specify the include paths that +# are normally passed to the compiler using the -I flag. + +STRIP_FROM_INC_PATH = + +# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter +# (but less readable) file names. This can be useful is your file systems +# doesn't support long names like on DOS, Mac, or CD-ROM. + +SHORT_NAMES = NO + +# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen +# will interpret the first line (until the first dot) of a JavaDoc-style +# comment as the brief description. If set to NO, the JavaDoc +# comments will behave just like regular Qt-style comments +# (thus requiring an explicit @brief command for a brief description.) + +JAVADOC_AUTOBRIEF = YES + +# If the QT_AUTOBRIEF tag is set to YES then Doxygen will +# interpret the first line (until the first dot) of a Qt-style +# comment as the brief description. If set to NO, the comments +# will behave just like regular Qt-style comments (thus requiring +# an explicit \brief command for a brief description.) + +QT_AUTOBRIEF = NO + +# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen +# treat a multi-line C++ special comment block (i.e. a block of //! or /// +# comments) as a brief description. This used to be the default behaviour. +# The new default is to treat a multi-line C++ comment block as a detailed +# description. Set this tag to YES if you prefer the old behaviour instead. + +MULTILINE_CPP_IS_BRIEF = NO + +# If the DETAILS_AT_TOP tag is set to YES then Doxygen +# will output the detailed description near the top, like JavaDoc. +# If set to NO, the detailed description appears after the member +# documentation. + +# XXX: aalex commented this out +#DETAILS_AT_TOP = NO + +# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented +# member inherits the documentation from any documented member that it +# re-implements. + +INHERIT_DOCS = YES + +# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce +# a new page for each member. If set to NO, the documentation of a member will +# be part of the file/class/namespace that contains it. + +SEPARATE_MEMBER_PAGES = NO + +# The TAB_SIZE tag can be used to set the number of spaces in a tab. +# Doxygen uses this value to replace tabs by spaces in code fragments. + +TAB_SIZE = 4 + +# This tag can be used to specify a number of aliases that acts +# as commands in the documentation. An alias has the form "name=value". +# For example adding "sideeffect=\par Side Effects:\n" will allow you to +# put the command \sideeffect (or @sideeffect) in the documentation, which +# will result in a user-defined paragraph with heading "Side Effects:". +# You can put \n's in the value part of an alias to insert newlines. + +ALIASES = + +# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C +# sources only. Doxygen will then generate output that is more tailored for C. +# For instance, some of the names that are used will be different. The list +# of all members will be omitted, etc. + +OPTIMIZE_OUTPUT_FOR_C = NO + +# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java +# sources only. Doxygen will then generate output that is more tailored for +# Java. For instance, namespaces will be presented as packages, qualified +# scopes will look different, etc. + +OPTIMIZE_OUTPUT_JAVA = NO + +# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran +# sources only. Doxygen will then generate output that is more tailored for +# Fortran. + +OPTIMIZE_FOR_FORTRAN = NO + +# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL +# sources. Doxygen will then generate output that is tailored for +# VHDL. + +OPTIMIZE_OUTPUT_VHDL = NO + +# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want +# to include (a tag file for) the STL sources as input, then you should +# set this tag to YES in order to let doxygen match functions declarations and +# definitions whose arguments contain STL classes (e.g. func(std::string); v.s. +# func(std::string) {}). This also make the inheritance and collaboration +# diagrams that involve STL classes more complete and accurate. + +BUILTIN_STL_SUPPORT = YES + +# If you use Microsoft's C++/CLI language, you should set this option to YES to +# enable parsing support. + +CPP_CLI_SUPPORT = NO + +# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only. +# Doxygen will parse them like normal C++ but will assume all classes use public +# instead of private inheritance when no explicit protection keyword is present. + +SIP_SUPPORT = NO + +# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC +# tag is set to YES, then doxygen will reuse the documentation of the first +# member in the group (if any) for the other members of the group. By default +# all members of a group must be documented explicitly. + +DISTRIBUTE_GROUP_DOC = NO + +# Set the SUBGROUPING tag to YES (the default) to allow class member groups of +# the same type (for instance a group of public functions) to be put as a +# subgroup of that type (e.g. under the Public Functions section). Set it to +# NO to prevent subgrouping. Alternatively, this can be done per class using +# the \nosubgrouping command. + +SUBGROUPING = YES + +# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum +# is documented as struct, union, or enum with the name of the typedef. So +# typedef struct TypeS {} TypeT, will appear in the documentation as a struct +# with name TypeT. When disabled the typedef will appear as a member of a file, +# namespace, or class. And the struct will be named TypeS. This can typically +# be useful for C code in case the coding convention dictates that all compound +# types are typedef'ed and only the typedef is referenced, never the tag name. + +TYPEDEF_HIDES_STRUCT = NO + +#--------------------------------------------------------------------------- +# Build related configuration options +#--------------------------------------------------------------------------- + +# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in +# documentation are documented, even if no documentation was available. +# Private class members and static file members will be hidden unless +# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES + +EXTRACT_ALL = YES + +# If the EXTRACT_PRIVATE tag is set to YES all private members of a class +# will be included in the documentation. + +EXTRACT_PRIVATE = YES + +# If the EXTRACT_STATIC tag is set to YES all static members of a file +# will be included in the documentation. + +EXTRACT_STATIC = YES + +# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) +# defined locally in source files will be included in the documentation. +# If set to NO only classes defined in header files are included. + +EXTRACT_LOCAL_CLASSES = YES + +# This flag is only useful for Objective-C code. When set to YES local +# methods, which are defined in the implementation section but not in +# the interface are included in the documentation. +# If set to NO (the default) only methods in the interface are included. + +EXTRACT_LOCAL_METHODS = NO + +# If this flag is set to YES, the members of anonymous namespaces will be +# extracted and appear in the documentation as a namespace called +# 'anonymous_namespace{file}', where file will be replaced with the base +# name of the file that contains the anonymous namespace. By default +# anonymous namespace are hidden. + +EXTRACT_ANON_NSPACES = NO + +# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all +# undocumented members of documented classes, files or namespaces. +# If set to NO (the default) these members will be included in the +# various overviews, but no documentation section is generated. +# This option has no effect if EXTRACT_ALL is enabled. + +HIDE_UNDOC_MEMBERS = YES + +# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all +# undocumented classes that are normally visible in the class hierarchy. +# If set to NO (the default) these classes will be included in the various +# overviews. This option has no effect if EXTRACT_ALL is enabled. + +HIDE_UNDOC_CLASSES = YES + +# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all +# friend (class|struct|union) declarations. +# If set to NO (the default) these declarations will be included in the +# documentation. + +HIDE_FRIEND_COMPOUNDS = NO + +# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any +# documentation blocks found inside the body of a function. +# If set to NO (the default) these blocks will be appended to the +# function's detailed documentation block. + +HIDE_IN_BODY_DOCS = NO + +# The INTERNAL_DOCS tag determines if documentation +# that is typed after a \internal command is included. If the tag is set +# to NO (the default) then the documentation will be excluded. +# Set it to YES to include the internal documentation. + +INTERNAL_DOCS = NO + +# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate +# file names in lower-case letters. If set to YES upper-case letters are also +# allowed. This is useful if you have classes or files whose names only differ +# in case and if your file system supports case sensitive file names. Windows +# and Mac users are advised to set this option to NO. + +CASE_SENSE_NAMES = YES + +# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen +# will show members with their full class and namespace scopes in the +# documentation. If set to YES the scope will be hidden. + +HIDE_SCOPE_NAMES = NO + +# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen +# will put a list of the files that are included by a file in the documentation +# of that file. + +SHOW_INCLUDE_FILES = YES + +# If the INLINE_INFO tag is set to YES (the default) then a tag [inline] +# is inserted in the documentation for inline members. + +INLINE_INFO = NO + +# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen +# will sort the (detailed) documentation of file and class members +# alphabetically by member name. If set to NO the members will appear in +# declaration order. + +SORT_MEMBER_DOCS = NO + +# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the +# brief documentation of file, namespace and class members alphabetically +# by member name. If set to NO (the default) the members will appear in +# declaration order. + +SORT_BRIEF_DOCS = NO + +# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the +# hierarchy of group names into alphabetical order. If set to NO (the default) +# the group names will appear in their defined order. + +SORT_GROUP_NAMES = NO + +# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be +# sorted by fully-qualified names, including namespaces. If set to +# NO (the default), the class list will be sorted only by class name, +# not including the namespace part. +# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES. +# Note: This option applies only to the class list, not to the +# alphabetical list. + +SORT_BY_SCOPE_NAME = NO + +# The GENERATE_TODOLIST tag can be used to enable (YES) or +# disable (NO) the todo list. This list is created by putting \todo +# commands in the documentation. + +GENERATE_TODOLIST = YES + +# The GENERATE_TESTLIST tag can be used to enable (YES) or +# disable (NO) the test list. This list is created by putting \test +# commands in the documentation. + +GENERATE_TESTLIST = YES + +# The GENERATE_BUGLIST tag can be used to enable (YES) or +# disable (NO) the bug list. This list is created by putting \bug +# commands in the documentation. + +GENERATE_BUGLIST = YES + +# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or +# disable (NO) the deprecated list. This list is created by putting +# \deprecated commands in the documentation. + +GENERATE_DEPRECATEDLIST= YES + +# The ENABLED_SECTIONS tag can be used to enable conditional +# documentation sections, marked by \if sectionname ... \endif. + +ENABLED_SECTIONS = + +# The MAX_INITIALIZER_LINES tag determines the maximum number of lines +# the initial value of a variable or define consists of for it to appear in +# the documentation. If the initializer consists of more lines than specified +# here it will be hidden. Use a value of 0 to hide initializers completely. +# The appearance of the initializer of individual variables and defines in the +# documentation can be controlled using \showinitializer or \hideinitializer +# command in the documentation regardless of this setting. + +MAX_INITIALIZER_LINES = 30 + +# Set the SHOW_USED_FILES tag to NO to disable the list of files generated +# at the bottom of the documentation of classes and structs. If set to YES the +# list will mention the files that were used to generate the documentation. + +SHOW_USED_FILES = YES + +# If the sources in your project are distributed over multiple directories +# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy +# in the documentation. The default is NO. + +SHOW_DIRECTORIES = YES + +# The FILE_VERSION_FILTER tag can be used to specify a program or script that +# doxygen should invoke to get the current version for each file (typically from +# the version control system). Doxygen will invoke the program by executing (via +# popen()) the command , where is the value of +# the FILE_VERSION_FILTER tag, and is the name of an input file +# provided by doxygen. Whatever the program writes to standard output +# is used as the file version. See the manual for examples. + +FILE_VERSION_FILTER = + +#--------------------------------------------------------------------------- +# configuration options related to warning and progress messages +#--------------------------------------------------------------------------- + +# The QUIET tag can be used to turn on/off the messages that are generated +# by doxygen. Possible values are YES and NO. If left blank NO is used. + +QUIET = YES + +# The WARNINGS tag can be used to turn on/off the warning messages that are +# generated by doxygen. Possible values are YES and NO. If left blank +# NO is used. + +WARNINGS = YES + +# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings +# for undocumented members. If EXTRACT_ALL is set to YES then this flag will +# automatically be disabled. + +WARN_IF_UNDOCUMENTED = NO + +# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for +# potential errors in the documentation, such as not documenting some +# parameters in a documented function, or documenting parameters that +# don't exist or using markup commands wrongly. + +WARN_IF_DOC_ERROR = YES + +# This WARN_NO_PARAMDOC option can be abled to get warnings for +# functions that are documented, but have no documentation for their parameters +# or return value. If set to NO (the default) doxygen will only warn about +# wrong or incomplete parameter documentation, but not about the absence of +# documentation. + +WARN_NO_PARAMDOC = NO + +# The WARN_FORMAT tag determines the format of the warning messages that +# doxygen can produce. The string should contain the $file, $line, and $text +# tags, which will be replaced by the file and line number from which the +# warning originated and the warning text. Optionally the format may contain +# $version, which will be replaced by the version of the file (if it could +# be obtained via FILE_VERSION_FILTER) + +WARN_FORMAT = "$file:$line: $text" + +# The WARN_LOGFILE tag can be used to specify a file to which warning +# and error messages should be written. If left blank the output is written +# to stderr. + +WARN_LOGFILE = + +#--------------------------------------------------------------------------- +# configuration options related to the input files +#--------------------------------------------------------------------------- + +# The INPUT tag can be used to specify the files and/or directories that contain +# documented source files. You may enter file names like "myfile.cpp" or +# directories like "/usr/src/myproject". Separate the files or directories +# with spaces. + +INPUT = . +#../src + +# This tag can be used to specify the character encoding of the source files +# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is +# also the default input encoding. Doxygen uses libiconv (or the iconv built +# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for +# the list of possible encodings. + +INPUT_ENCODING = UTF-8 + +# If the value of the INPUT tag contains directories, you can use the +# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp +# and *.h) to filter out the source-files in the directories. If left +# blank the following patterns are tested: +# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx +# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py *.f90 + +FILE_PATTERNS = *.cpp *.c *.h *.py *.txt *.dox + +# The RECURSIVE tag can be used to turn specify whether or not subdirectories +# should be searched for input files as well. Possible values are YES and NO. +# If left blank NO is used. + +RECURSIVE = YES + +# The EXCLUDE tag can be used to specify files and/or directories that should +# excluded from the INPUT source files. This way you can easily exclude a +# subdirectory from a directory tree whose root is specified with the INPUT tag. + +EXCLUDE = prototypes + +# The EXCLUDE_SYMLINKS tag can be used select whether or not files or +# directories that are symbolic links (a Unix filesystem feature) are excluded +# from the input. + +EXCLUDE_SYMLINKS = NO + +# If the value of the INPUT tag contains directories, you can use the +# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude +# certain files from those directories. Note that the wildcards are matched +# against the file with absolute path, so to exclude all test directories +# for example use the pattern */test/* + +EXCLUDE_PATTERNS = *old/* *test/* + +# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names +# (namespaces, classes, functions, etc.) that should be excluded from the +# output. The symbol name can be a fully qualified name, a word, or if the +# wildcard * is used, a substring. Examples: ANamespace, AClass, +# AClass::ANamespace, ANamespace::*Test + +EXCLUDE_SYMBOLS = + +# The EXAMPLE_PATH tag can be used to specify one or more files or +# directories that contain example code fragments that are included (see +# the \include command). + +EXAMPLE_PATH = + +# If the value of the EXAMPLE_PATH tag contains directories, you can use the +# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp +# and *.h) to filter out the source-files in the directories. If left +# blank all files are included. + +EXAMPLE_PATTERNS = + +# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be +# searched for input files to be used with the \include or \dontinclude +# commands irrespective of the value of the RECURSIVE tag. +# Possible values are YES and NO. If left blank NO is used. + +EXAMPLE_RECURSIVE = NO + +# The IMAGE_PATH tag can be used to specify one or more files or +# directories that contain image that are included in the documentation (see +# the \image command). + +IMAGE_PATH = + +# The INPUT_FILTER tag can be used to specify a program that doxygen should +# invoke to filter for each input file. Doxygen will invoke the filter program +# by executing (via popen()) the command , where +# is the value of the INPUT_FILTER tag, and is the name of an +# input file. Doxygen will then use the output that the filter program writes +# to standard output. If FILTER_PATTERNS is specified, this tag will be +# ignored. + +INPUT_FILTER = + +# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern +# basis. Doxygen will compare the file name with each pattern and apply the +# filter if there is a match. The filters are a list of the form: +# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further +# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER +# is applied to all files. + +FILTER_PATTERNS = + +# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using +# INPUT_FILTER) will be used to filter the input files when producing source +# files to browse (i.e. when SOURCE_BROWSER is set to YES). + +FILTER_SOURCE_FILES = NO + +#--------------------------------------------------------------------------- +# configuration options related to source browsing +#--------------------------------------------------------------------------- + +# If the SOURCE_BROWSER tag is set to YES then a list of source files will +# be generated. Documented entities will be cross-referenced with these sources. +# Note: To get rid of all source code in the generated output, make sure also +# VERBATIM_HEADERS is set to NO. + +SOURCE_BROWSER = YES + +# Setting the INLINE_SOURCES tag to YES will include the body +# of functions and classes directly in the documentation. + +INLINE_SOURCES = YES + +# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct +# doxygen to hide any special comment blocks from generated source code +# fragments. Normal C and C++ comments will always remain visible. + +STRIP_CODE_COMMENTS = YES + +# If the REFERENCED_BY_RELATION tag is set to YES (the default) +# then for each documented function all documented +# functions referencing it will be listed. + +REFERENCED_BY_RELATION = YES + +# If the REFERENCES_RELATION tag is set to YES (the default) +# then for each documented function all documented entities +# called/used by that function will be listed. + +REFERENCES_RELATION = YES + +# If the REFERENCES_LINK_SOURCE tag is set to YES (the default) +# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from +# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will +# link to the source code. Otherwise they will link to the documentstion. + +REFERENCES_LINK_SOURCE = YES + +# If the USE_HTAGS tag is set to YES then the references to source code +# will point to the HTML generated by the htags(1) tool instead of doxygen +# built-in source browser. The htags tool is part of GNU's global source +# tagging system (see http://www.gnu.org/software/global/global.html). You +# will need version 4.8.6 or higher. + +USE_HTAGS = NO + +# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen +# will generate a verbatim copy of the header file for each class for +# which an include is specified. Set to NO to disable this. + +VERBATIM_HEADERS = YES + +#--------------------------------------------------------------------------- +# configuration options related to the alphabetical class index +#--------------------------------------------------------------------------- + +# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index +# of all compounds will be generated. Enable this if the project +# contains a lot of classes, structs, unions or interfaces. + +ALPHABETICAL_INDEX = YES + +# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then +# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns +# in which this list will be split (can be a number in the range [1..20]) + +COLS_IN_ALPHA_INDEX = 5 + +# In case all classes in a project start with a common prefix, all +# classes will be put under the same header in the alphabetical index. +# The IGNORE_PREFIX tag can be used to specify one or more prefixes that +# should be ignored while generating the index headers. + +IGNORE_PREFIX = + +#--------------------------------------------------------------------------- +# configuration options related to the HTML output +#--------------------------------------------------------------------------- + +# If the GENERATE_HTML tag is set to YES (the default) Doxygen will +# generate HTML output. + +GENERATE_HTML = YES + +# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank `html' will be used as the default path. + +HTML_OUTPUT = html + +# The HTML_FILE_EXTENSION tag can be used to specify the file extension for +# each generated HTML page (for example: .htm,.php,.asp). If it is left blank +# doxygen will generate files with .html extension. + +HTML_FILE_EXTENSION = .html + +# The HTML_HEADER tag can be used to specify a personal HTML header for +# each generated HTML page. If it is left blank doxygen will generate a +# standard header. + +# XXX: aalex commented this out +# HTML_HEADER = header.html + +# The HTML_FOOTER tag can be used to specify a personal HTML footer for +# each generated HTML page. If it is left blank doxygen will generate a +# standard footer. + +# XXX: aalex commented this out +# HTML_FOOTER = footer.html + +# The HTML_STYLESHEET tag can be used to specify a user-defined cascading +# style sheet that is used by each HTML page. It can be used to +# fine-tune the look of the HTML output. If the tag is left blank doxygen +# will generate a default style sheet. Note that doxygen will try to copy +# the style sheet file to the HTML output directory, so don't put your own +# stylesheet in the HTML output directory as well, or it will be erased! + +# XXX: aalex commented this out +# HTML_STYLESHEET = doxygen.css + +# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, +# files or namespaces will be aligned in HTML using tables. If set to +# NO a bullet list will be used. + +HTML_ALIGN_MEMBERS = YES + +# If the GENERATE_HTMLHELP tag is set to YES, additional index files +# will be generated that can be used as input for tools like the +# Microsoft HTML help workshop to generate a compiled HTML help file (.chm) +# of the generated HTML documentation. + +GENERATE_HTMLHELP = NO + +# If the GENERATE_DOCSET tag is set to YES, additional index files +# will be generated that can be used as input for Apple's Xcode 3 +# integrated development environment, introduced with OSX 10.5 (Leopard). +# To create a documentation set, doxygen will generate a Makefile in the +# HTML output directory. Running make will produce the docset in that +# directory and running "make install" will install the docset in +# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find +# it at startup. + +GENERATE_DOCSET = NO + +# When GENERATE_DOCSET tag is set to YES, this tag determines the name of the +# feed. A documentation feed provides an umbrella under which multiple +# documentation sets from a single provider (such as a company or product suite) +# can be grouped. + +DOCSET_FEEDNAME = "Doxygen generated docs" + +# When GENERATE_DOCSET tag is set to YES, this tag specifies a string that +# should uniquely identify the documentation set bundle. This should be a +# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen +# will append .docset to the name. + +DOCSET_BUNDLE_ID = org.doxygen.Project + +# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML +# documentation will contain sections that can be hidden and shown after the +# page has loaded. For this to work a browser that supports +# JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox +# Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari). + +HTML_DYNAMIC_SECTIONS = YES + +# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can +# be used to specify the file name of the resulting .chm file. You +# can add a path in front of the file if the result should not be +# written to the html output directory. + +CHM_FILE = + +# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can +# be used to specify the location (absolute path including file name) of +# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run +# the HTML help compiler on the generated index.hhp. + +HHC_LOCATION = + +# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag +# controls if a separate .chi index file is generated (YES) or that +# it should be included in the master .chm file (NO). + +GENERATE_CHI = NO + +# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag +# controls whether a binary table of contents is generated (YES) or a +# normal table of contents (NO) in the .chm file. + +BINARY_TOC = NO + +# The TOC_EXPAND flag can be set to YES to add extra items for group members +# to the contents of the HTML help documentation and to the tree view. + +TOC_EXPAND = NO + +# The DISABLE_INDEX tag can be used to turn on/off the condensed index at +# top of each HTML page. The value NO (the default) enables the index and +# the value YES disables it. + +DISABLE_INDEX = NO + +# This tag can be used to set the number of enum values (range [1..20]) +# that doxygen will group on one line in the generated HTML documentation. + +ENUM_VALUES_PER_LINE = 4 + +# If the GENERATE_TREEVIEW tag is set to YES, a side panel will be +# generated containing a tree-like index structure (just like the one that +# is generated for HTML Help). For this to work a browser that supports +# JavaScript, DHTML, CSS and frames is required (for instance Mozilla 1.0+, +# Netscape 6.0+, Internet explorer 5.0+, or Konqueror). Windows users are +# probably better off using the HTML help feature. + +GENERATE_TREEVIEW = NO + +# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be +# used to set the initial width (in pixels) of the frame in which the tree +# is shown. + +TREEVIEW_WIDTH = 250 + +#--------------------------------------------------------------------------- +# configuration options related to the LaTeX output +#--------------------------------------------------------------------------- + +# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will +# generate Latex output. + +GENERATE_LATEX = NO + +# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank `latex' will be used as the default path. + +LATEX_OUTPUT = latex + +# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be +# invoked. If left blank `latex' will be used as the default command name. + +LATEX_CMD_NAME = latex + +# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to +# generate index for LaTeX. If left blank `makeindex' will be used as the +# default command name. + +MAKEINDEX_CMD_NAME = makeindex + +# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact +# LaTeX documents. This may be useful for small projects and may help to +# save some trees in general. + +COMPACT_LATEX = NO + +# The PAPER_TYPE tag can be used to set the paper type that is used +# by the printer. Possible values are: a4, a4wide, letter, legal and +# executive. If left blank a4wide will be used. + +PAPER_TYPE = letter + +# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX +# packages that should be included in the LaTeX output. + +EXTRA_PACKAGES = + +# The LATEX_HEADER tag can be used to specify a personal LaTeX header for +# the generated latex document. The header should contain everything until +# the first chapter. If it is left blank doxygen will generate a +# standard header. Notice: only use this tag if you know what you are doing! + +LATEX_HEADER = + +# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated +# is prepared for conversion to pdf (using ps2pdf). The pdf file will +# contain links (just like the HTML output) instead of page references +# This makes the output suitable for online browsing using a pdf viewer. + +PDF_HYPERLINKS = YES + +# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of +# plain latex in the generated Makefile. Set this option to YES to get a +# higher quality PDF documentation. + +USE_PDFLATEX = YES + +# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode. +# command to the generated LaTeX files. This will instruct LaTeX to keep +# running if errors occur, instead of asking the user for help. +# This option is also used when generating formulas in HTML. + +LATEX_BATCHMODE = YES + +# If LATEX_HIDE_INDICES is set to YES then doxygen will not +# include the index chapters (such as File Index, Compound Index, etc.) +# in the output. + +LATEX_HIDE_INDICES = NO + +#--------------------------------------------------------------------------- +# configuration options related to the RTF output +#--------------------------------------------------------------------------- + +# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output +# The RTF output is optimized for Word 97 and may not look very pretty with +# other RTF readers or editors. + +GENERATE_RTF = NO + +# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank `rtf' will be used as the default path. + +RTF_OUTPUT = rtf + +# If the COMPACT_RTF tag is set to YES Doxygen generates more compact +# RTF documents. This may be useful for small projects and may help to +# save some trees in general. + +COMPACT_RTF = YES + +# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated +# will contain hyperlink fields. The RTF file will +# contain links (just like the HTML output) instead of page references. +# This makes the output suitable for online browsing using WORD or other +# programs which support those fields. +# Note: wordpad (write) and others do not support links. + +RTF_HYPERLINKS = YES + +# Load stylesheet definitions from file. Syntax is similar to doxygen's +# config file, i.e. a series of assignments. You only have to provide +# replacements, missing definitions are set to their default value. + +RTF_STYLESHEET_FILE = + +# Set optional variables used in the generation of an rtf document. +# Syntax is similar to doxygen's config file. + +RTF_EXTENSIONS_FILE = + +#--------------------------------------------------------------------------- +# configuration options related to the man page output +#--------------------------------------------------------------------------- + +# If the GENERATE_MAN tag is set to YES (the default) Doxygen will +# generate man pages + +GENERATE_MAN = NO + +# The MAN_OUTPUT tag is used to specify where the man pages will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank `man' will be used as the default path. + +MAN_OUTPUT = man + +# The MAN_EXTENSION tag determines the extension that is added to +# the generated man pages (default is the subroutine's section .3) + +MAN_EXTENSION = .3 + +# If the MAN_LINKS tag is set to YES and Doxygen generates man output, +# then it will generate one additional man file for each entity +# documented in the real man page(s). These additional files +# only source the real man page, but without them the man command +# would be unable to find the correct page. The default is NO. + +MAN_LINKS = NO + +#--------------------------------------------------------------------------- +# configuration options related to the XML output +#--------------------------------------------------------------------------- + +# If the GENERATE_XML tag is set to YES Doxygen will +# generate an XML file that captures the structure of +# the code including all documentation. + +GENERATE_XML = NO + +# The XML_OUTPUT tag is used to specify where the XML pages will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank `xml' will be used as the default path. + +XML_OUTPUT = xml + +# The XML_SCHEMA tag can be used to specify an XML schema, +# which can be used by a validating XML parser to check the +# syntax of the XML files. + +XML_SCHEMA = + +# The XML_DTD tag can be used to specify an XML DTD, +# which can be used by a validating XML parser to check the +# syntax of the XML files. + +XML_DTD = + +# If the XML_PROGRAMLISTING tag is set to YES Doxygen will +# dump the program listings (including syntax highlighting +# and cross-referencing information) to the XML output. Note that +# enabling this will significantly increase the size of the XML output. + +XML_PROGRAMLISTING = YES + +#--------------------------------------------------------------------------- +# configuration options for the AutoGen Definitions output +#--------------------------------------------------------------------------- + +# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will +# generate an AutoGen Definitions (see autogen.sf.net) file +# that captures the structure of the code including all +# documentation. Note that this feature is still experimental +# and incomplete at the moment. + +GENERATE_AUTOGEN_DEF = NO + +#--------------------------------------------------------------------------- +# configuration options related to the Perl module output +#--------------------------------------------------------------------------- + +# If the GENERATE_PERLMOD tag is set to YES Doxygen will +# generate a Perl module file that captures the structure of +# the code including all documentation. Note that this +# feature is still experimental and incomplete at the +# moment. + +GENERATE_PERLMOD = NO + +# If the PERLMOD_LATEX tag is set to YES Doxygen will generate +# the necessary Makefile rules, Perl scripts and LaTeX code to be able +# to generate PDF and DVI output from the Perl module output. + +PERLMOD_LATEX = NO + +# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be +# nicely formatted so it can be parsed by a human reader. This is useful +# if you want to understand what is going on. On the other hand, if this +# tag is set to NO the size of the Perl module output will be much smaller +# and Perl will parse it just the same. + +PERLMOD_PRETTY = YES + +# The names of the make variables in the generated doxyrules.make file +# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. +# This is useful so different doxyrules.make files included by the same +# Makefile don't overwrite each other's variables. + +PERLMOD_MAKEVAR_PREFIX = + +#--------------------------------------------------------------------------- +# Configuration options related to the preprocessor +#--------------------------------------------------------------------------- + +# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will +# evaluate all C-preprocessor directives found in the sources and include +# files. + +ENABLE_PREPROCESSING = YES + +# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro +# names in the source code. If set to NO (the default) only conditional +# compilation will be performed. Macro expansion can be done in a controlled +# way by setting EXPAND_ONLY_PREDEF to YES. + +MACRO_EXPANSION = NO + +# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES +# then the macro expansion is limited to the macros specified with the +# PREDEFINED and EXPAND_AS_DEFINED tags. + +EXPAND_ONLY_PREDEF = NO + +# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files +# in the INCLUDE_PATH (see below) will be search if a #include is found. + +SEARCH_INCLUDES = YES + +# The INCLUDE_PATH tag can be used to specify one or more directories that +# contain include files that are not input files but should be processed by +# the preprocessor. + +INCLUDE_PATH = + +# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard +# patterns (like *.h and *.hpp) to filter out the header-files in the +# directories. If left blank, the patterns specified with FILE_PATTERNS will +# be used. + +INCLUDE_FILE_PATTERNS = + +# The PREDEFINED tag can be used to specify one or more macro names that +# are defined before the preprocessor is started (similar to the -D option of +# gcc). The argument of the tag is a list of macros of the form: name +# or name=definition (no spaces). If the definition and the = are +# omitted =1 is assumed. To prevent a macro definition from being +# undefined via #undef or recursively expanded use the := operator +# instead of the = operator. + +PREDEFINED = + +# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then +# this tag can be used to specify a list of macro names that should be expanded. +# The macro definition that is found in the sources will be used. +# Use the PREDEFINED tag if you want to use a different macro definition. + +EXPAND_AS_DEFINED = + +# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then +# doxygen's preprocessor will remove all function-like macros that are alone +# on a line, have an all uppercase name, and do not end with a semicolon. Such +# function macros are typically used for boiler-plate code, and will confuse +# the parser if not removed. + +SKIP_FUNCTION_MACROS = YES + +#--------------------------------------------------------------------------- +# Configuration::additions related to external references +#--------------------------------------------------------------------------- + +# The TAGFILES option can be used to specify one or more tagfiles. +# Optionally an initial location of the external documentation +# can be added for each tagfile. The format of a tag file without +# this location is as follows: +# TAGFILES = file1 file2 ... +# Adding location for the tag files is done as follows: +# TAGFILES = file1=loc1 "file2 = loc2" ... +# where "loc1" and "loc2" can be relative or absolute paths or +# URLs. If a location is present for each tag, the installdox tool +# does not have to be run to correct the links. +# Note that each tag file must have a unique name +# (where the name does NOT include the path) +# If a tag file is not located in the directory in which doxygen +# is run, you must also specify the path to the tagfile here. + +TAGFILES = + +# When a file name is specified after GENERATE_TAGFILE, doxygen will create +# a tag file that is based on the input files it reads. + +GENERATE_TAGFILE = + +# If the ALLEXTERNALS tag is set to YES all external classes will be listed +# in the class index. If set to NO only the inherited external classes +# will be listed. + +ALLEXTERNALS = NO + +# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed +# in the modules index. If set to NO, only the current project's groups will +# be listed. + +EXTERNAL_GROUPS = YES + +# The PERL_PATH should be the absolute path and name of the perl script +# interpreter (i.e. the result of `which perl'). + +PERL_PATH = /usr/bin/perl + +#--------------------------------------------------------------------------- +# Configuration options related to the dot tool +#--------------------------------------------------------------------------- + +# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will +# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base +# or super classes. Setting the tag to NO turns the diagrams off. Note that +# this option is superseded by the HAVE_DOT option below. This is only a +# fallback. It is recommended to install and use dot, since it yields more +# powerful graphs. + +CLASS_DIAGRAMS = YES + +# You can define message sequence charts within doxygen comments using the \msc +# command. Doxygen will then run the mscgen tool (see +# http://www.mcternan.me.uk/mscgen/) to produce the chart and insert it in the +# documentation. The MSCGEN_PATH tag allows you to specify the directory where +# the mscgen tool resides. If left empty the tool is assumed to be found in the +# default search path. + +MSCGEN_PATH = + +# If set to YES, the inheritance and collaboration graphs will hide +# inheritance and usage relations if the target is undocumented +# or is not a class. + +HIDE_UNDOC_RELATIONS = NO + +# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is +# available from the path. This tool is part of Graphviz, a graph visualization +# toolkit from AT&T and Lucent Bell Labs. The other options in this section +# have no effect if this option is set to NO (the default) + +HAVE_DOT = YES + +# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen +# will generate a graph for each documented class showing the direct and +# indirect inheritance relations. Setting this tag to YES will force the +# the CLASS_DIAGRAMS tag to NO. + +CLASS_GRAPH = YES + +# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen +# will generate a graph for each documented class showing the direct and +# indirect implementation dependencies (inheritance, containment, and +# class references variables) of the class with other documented classes. + +COLLABORATION_GRAPH = YES + +# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen +# will generate a graph for groups, showing the direct groups dependencies + +GROUP_GRAPHS = YES + +# If the UML_LOOK tag is set to YES doxygen will generate inheritance and +# collaboration diagrams in a style similar to the OMG's Unified Modeling +# Language. + +UML_LOOK = YES + +# If set to YES, the inheritance and collaboration graphs will show the +# relations between templates and their instances. + +TEMPLATE_RELATIONS = YES + +# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT +# tags are set to YES then doxygen will generate a graph for each documented +# file showing the direct and indirect include dependencies of the file with +# other documented files. + +INCLUDE_GRAPH = YES + +# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and +# HAVE_DOT tags are set to YES then doxygen will generate a graph for each +# documented header file showing the documented files that directly or +# indirectly include this file. + +INCLUDED_BY_GRAPH = YES + +# If the CALL_GRAPH and HAVE_DOT options are set to YES then +# doxygen will generate a call dependency graph for every global function +# or class method. Note that enabling this option will significantly increase +# the time of a run. So in most cases it will be better to enable call graphs +# for selected functions only using the \callgraph command. + +CALL_GRAPH = YES + +# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then +# doxygen will generate a caller dependency graph for every global function +# or class method. Note that enabling this option will significantly increase +# the time of a run. So in most cases it will be better to enable caller +# graphs for selected functions only using the \callergraph command. + +CALLER_GRAPH = YES + +# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen +# will graphical hierarchy of all classes instead of a textual one. + +GRAPHICAL_HIERARCHY = YES + +# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES +# then doxygen will show the dependencies a directory has on other directories +# in a graphical way. The dependency relations are determined by the #include +# relations between the files in the directories. + +DIRECTORY_GRAPH = YES + +# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images +# generated by dot. Possible values are png, jpg, or gif +# If left blank png will be used. + +DOT_IMAGE_FORMAT = png + +# The tag DOT_PATH can be used to specify the path where the dot tool can be +# found. If left blank, it is assumed the dot tool can be found in the path. + +DOT_PATH = + +# The DOTFILE_DIRS tag can be used to specify one or more directories that +# contain dot files that are included in the documentation (see the +# \dotfile command). + +DOTFILE_DIRS = + +# The MAX_DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of +# nodes that will be shown in the graph. If the number of nodes in a graph +# becomes larger than this value, doxygen will truncate the graph, which is +# visualized by representing a node as a red box. Note that doxygen if the +# number of direct children of the root node in a graph is already larger than +# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note +# that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH. + +DOT_GRAPH_MAX_NODES = 50 + +# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the +# graphs generated by dot. A depth value of 3 means that only nodes reachable +# from the root by following a path via at most 3 edges will be shown. Nodes +# that lay further from the root node will be omitted. Note that setting this +# option to 1 or 2 may greatly reduce the computation time needed for large +# code bases. Also note that the size of a graph can be further restricted by +# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction. + +MAX_DOT_GRAPH_DEPTH = 0 + +# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent +# background. This is enabled by default, which results in a transparent +# background. Warning: Depending on the platform used, enabling this option +# may lead to badly anti-aliased labels on the edges of a graph (i.e. they +# become hard to read). + +DOT_TRANSPARENT = NO + +# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output +# files in one run (i.e. multiple -o and -T options on the command line). This +# makes dot run faster, but since only newer versions of dot (>1.8.10) +# support this, this feature is disabled by default. + +DOT_MULTI_TARGETS = YES + +# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will +# generate a legend page explaining the meaning of the various boxes and +# arrows in the dot generated graphs. + +GENERATE_LEGEND = YES + +# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will +# remove the intermediate dot files that are used to generate +# the various graphs. + +DOT_CLEANUP = YES + +#--------------------------------------------------------------------------- +# Configuration::additions related to the search engine +#--------------------------------------------------------------------------- + +# The SEARCHENGINE tag specifies whether or not a search engine should be +# used. If set to NO the values of all tags below this one will be ignored. + +SEARCHENGINE = NO diff --git a/Mapper.h b/Mapper.h index 02ec5d2..f2ad4f8 100644 --- a/Mapper.h +++ b/Mapper.h @@ -2,6 +2,7 @@ * Mapper.h * * (c) 2013 Sofian Audry -- info(@)sofianaudry(.)com + * (c) 2013 Alexandre Quessy -- alexandre(@)quessy(.)net * * 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 @@ -24,13 +25,19 @@ #include #include #include -#include #include #include #include "Shape.h" #include "Paint.h" #include "Util.h" +/** + * One object in the scene that is a shape with some paint on it. + * + * A Mapping is an area of the rendering window that is drawn with + * either some texture, or any special effect that might animate a + * polygon or a line. + */ class Mapping { protected: @@ -53,6 +60,9 @@ public: Shape::ptr getShape() const { return _shape; } }; +/** + * Object whose paint is an image texture. + */ class TextureMapping : public Mapping { private: @@ -74,6 +84,16 @@ public: Shape::ptr getInputShape() const { return _inputShape; } }; +/** + * A way to draw on some kind of shape. + * + * This is an abstract class for specific ways to draw + * a given paint of a shape. + * + * Each shape x paint combination that is possible in + * this software are implemented using a child of this + * class. + */ class Mapper { protected: @@ -123,6 +143,12 @@ public: // } //}; +/** + * Draws a texture on a quad. + * + * A Quad has four vertices. + * They are in counterclockwise order, just like for all shapes. + */ class QuadTextureMapper : public Mapper { public: diff --git a/MapperGLCanvas.h b/MapperGLCanvas.h index 7142562..a5d3db2 100644 --- a/MapperGLCanvas.h +++ b/MapperGLCanvas.h @@ -29,6 +29,9 @@ #include "Common.h" #include "Shape.h" +/** + * Qt GUI widget that draws a mapper, which is a shape with some paint. + */ class MapperGLCanvas: public QGLWidget { Q_OBJECT diff --git a/Paint.h b/Paint.h index 2e7c213..f8cbd42 100644 --- a/Paint.h +++ b/Paint.h @@ -2,6 +2,7 @@ * Paint.h * * (c) 2013 Sofian Audry -- info(@)sofianaudry(.)com + * (c) 2013 Alexandre Quessy -- alexandre(@)quessy(.)net * * 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 @@ -27,6 +28,13 @@ #include #include +/** + * A Paint is a style that can be applied when drawing potentially any shape. + * + * Defines the way to draw any shape. + * There must be a Mapper that implements this paint for every shape + * so that this shape might be drawn with it. + */ class Paint { protected: @@ -37,6 +45,11 @@ public: virtual void build() {} }; +/** + * Paint that uses an OpenGL texture to paint on potentially any Mapper. + * + * This video texture is actually an OpenGL texture. + */ class Texture : public Paint { protected: @@ -62,6 +75,9 @@ public: virtual int getY() const { return y; } }; +/** + * Paint that is a Texture loaded from an image file. + */ class Image : public Texture { protected: @@ -80,7 +96,6 @@ public: { glGenTextures(1, &textureId); } -// textureId = SOIL_create_OGL_texture ( imageData, width, height, 3, textureId, 0); // TODO: free data? } @@ -90,7 +105,6 @@ public: virtual int getWidth() const { return image.width(); } virtual int getHeight() const { return image.height(); } virtual const uchar* getBits() const { return image.bits(); } - }; #endif /* PAINT_H_ */ diff --git a/Shape.h b/Shape.h index 7541404..5e87a3d 100644 --- a/Shape.h +++ b/Shape.h @@ -23,6 +23,9 @@ #include #include +/** + * Point (or vertex) on the 2-D canvas. + */ struct Point { double x; @@ -30,6 +33,9 @@ struct Point Point(double x_, double y_) : x(x_), y(y_) {} }; +/** + * Series of vertices. (points) + */ class Shape { public: @@ -58,6 +64,9 @@ public: } }; +/** + * Four-vertex shape. + */ class Quad : public Shape { public: diff --git a/Util.cpp b/Util.cpp index f0a00f8..3ae0d73 100644 --- a/Util.cpp +++ b/Util.cpp @@ -45,6 +45,9 @@ float map_float(float value, float istart, float istop, float ostart, float osto return std::max(std::min(ret, ostop), ostart); } +/** + * See map_float + */ int map_int(int value, int istart, int istop, int ostart, int ostop) { float ret = ostart + (ostop - ostart) * ((value - istart) / float(istop - istart)); diff --git a/Util.h b/Util.h index 4e97cfa..bc88453 100644 --- a/Util.h +++ b/Util.h @@ -22,6 +22,9 @@ #include +/** + * @namespace Util Useful functions. + */ namespace Util { void correctGlTexCoord(GLfloat x, GLfloat y); diff --git a/build.sh b/build.sh index c4be26b..c8d7791 100755 --- a/build.sh +++ b/build.sh @@ -1,4 +1,4 @@ #!/bin/bash -# libwxgtk2.8-dev qt4-default qt4-qmake +# qt4-default qt4-qmake qmake-qt4 make diff --git a/index.dox b/index.dox new file mode 100644 index 0000000..21cb9ae --- /dev/null +++ b/index.dox @@ -0,0 +1,28 @@ +/*! \mainpage LibreMapping is a free video mapping software. + * + * \section intro_sec Introduction + * + * With LibreMapping, you can paint shapes in the space. + * + * Authors and contributors: Sofian Audry, Alexandre Quessy, Sylvain Cormier, Mike Latona, Christian Ambaud, Maxime Damecourt. + * + * \section map_sec About video mapping + * + * Projection mapping, also known as video mapping and spatial augmented reality, + * is a projection technology used to turn objects, often irregularly shaped, into + * a display surface for video projection. These objects may be complex industrial + * landscapes, such as buildings. By using specialized software, a two or three + * dimensional object is spatially mapped on the virtual program which mimics the + * real environment it is to be projected on. The software can interact with a + * projector to fit any desired image onto the surface of that object. This + * technique is used by artists and advertisers alike who can add extra dimensions, + * optical illusions, and notions of movement onto previously static objects. The + * video is commonly combined with, or triggered by, audio to create an + * audio-visual narrative. + * + * \section install_sec Installation + * + * qt4-default + * qt4-qmake + * ./build.sh + */ diff --git a/libremapping.pro b/libremapping.pro index f1fcc0e..189f884 100644 --- a/libremapping.pro +++ b/libremapping.pro @@ -3,5 +3,9 @@ TEMPLATE = app HEADERS = Common.h Util.h SourceGLCanvas.h DestinationGLCanvas.h MapperGLCanvas.h Mapper.h Shape.h Paint.h SOURCES = main.cpp Common.cpp Util.cpp Mapper.cpp SourceGLCanvas.cpp DestinationGLCanvas.cpp MapperGLCanvas.cpp QT += gui opengl -LIBS += -lSOIL -lglut -lGLU +LIBS += -lglut -lGLU + +docs.depends = $(HEADERS) $(SOURCES) +docs.commands = (cat Doxyfile; echo "INPUT = $?") | doxygen - +QMAKE_EXTRA_TARGETS += docs diff --git a/sh_build_doc.sh b/sh_build_doc.sh new file mode 100755 index 0000000..e044e4b --- /dev/null +++ b/sh_build_doc.sh @@ -0,0 +1,3 @@ +#!/bin/bash +# doxygen +doxygen Doxyfile