diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..16e9558 --- /dev/null +++ b/LICENSE @@ -0,0 +1,674 @@ + 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. + + Boulevard Combattant + Copyright (C) 2021 François Autin + + 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) 2021 François Autin + 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/src/engine/Engine.java b/src/engine/Engine.java index c6c3ceb..f6bc7d6 100644 --- a/src/engine/Engine.java +++ b/src/engine/Engine.java @@ -28,6 +28,7 @@ public class Engine { private final int width; private final int height; + private final boolean fullscreen; private float viewXPos; private float viewYPos; @@ -45,7 +46,7 @@ public class Engine { * Initial projection is -1000;1000 in width and -1000*aspectRatio; 1000*aspectRatio * Initial Camera position is (0, 0, -1) //TODO vérifiez */ - public Engine(int width, int height, Vector3f aspectRatio) { + public Engine(int width, int height, boolean fullscreen, Vector3f aspectRatio) { this.running = false; this.objectsGl = new ArrayList<>(); this.uiElements = new ArrayList<>(); @@ -57,6 +58,7 @@ public class Engine { ObjectGl.view = Matrix4f.translate(new Vector3f(0.0f, 0.0f, 1.0f)); this.transformationView = new Vector3f(); this.tracking = null; + this.fullscreen = fullscreen; } /** @@ -79,7 +81,11 @@ public class Engine { int width = this.width; int height = this.height; - this.setWindow(glfwCreateWindow(width, height, "Boulevard Combattant", NULL, NULL)); + if (fullscreen) { + this.setWindow(glfwCreateWindow(width, height, "Boulevard Combattant", glfwGetPrimaryMonitor(), NULL)); + } else { + this.setWindow(glfwCreateWindow(width, height, "Boulevard Combattant", NULL, NULL)); + } assert getWindow() != NULL; // On récupère les informations du moniteur principal diff --git a/src/engine/TestEngine.java b/src/engine/TestEngine.java index 61b98cc..1a41792 100644 --- a/src/engine/TestEngine.java +++ b/src/engine/TestEngine.java @@ -36,7 +36,7 @@ public class TestEngine { /* Engine Init */ - Engine engine = new Engine(1280, 720, new Vector3f(4.0f, 3.0f)); + Engine engine = new Engine(1280, 720, false, new Vector3f(4.0f, 3.0f)); int speed = 10; //vitesse d�placement Object engine.init(); diff --git a/src/gameplay/Characters/Blue/BlueBaseFrames.java b/src/gameplay/Characters/Blue/BlueBaseFrames.java index 40f0ddb..0f45256 100644 --- a/src/gameplay/Characters/Blue/BlueBaseFrames.java +++ b/src/gameplay/Characters/Blue/BlueBaseFrames.java @@ -748,7 +748,7 @@ public class BlueBaseFrames { public static void main(String[] args) { - Engine engine = new Engine(640, 480, new Vector3f(4.0f, 3.0f)); + Engine engine = new Engine(640, 480, false, new Vector3f(4.0f, 3.0f)); engine.init(); Vector3f BLUE = new Vector3f(0f,0f,1f); //passive_hit diff --git a/src/gameplay/Characters/Blue/BlueNormals.java b/src/gameplay/Characters/Blue/BlueNormals.java index c174351..d24b376 100644 --- a/src/gameplay/Characters/Blue/BlueNormals.java +++ b/src/gameplay/Characters/Blue/BlueNormals.java @@ -147,7 +147,7 @@ public class BlueNormals { return(new attackPart(15,0,4,4,8,3,f,false,false,false)); } - public static Attack blueCrouchJab() { + protected static Attack blueCrouchJab() { ButtonIG[][] cmd = {{DOWN,A}}; boolean isSpecial = false; Status rS = Status.NORMAL; @@ -334,14 +334,280 @@ public class BlueNormals { return(new attackPart(90,0,13,29,12,5,f,false,false,false)); } - public static Attack blueCrouchFierce() { + protected static Attack blueCrouchFierce() { ButtonIG[][] cmd = {{DOWN,C}}; boolean isSpecial = false; Status rS = Status.NORMAL; attackPart[] parts = {blueCrouchCstartup(),blueCrouchCactive(),blueCrouchCrecovery()}; return new Attack(isSpecial,rS,cmd,parts); } - + + private static Frame crouchBFrame1() { + //movement data + double moveX = 0.0; + double moveY = 0.0; + + //cancelData + boolean normalC = false; + boolean specialC = false; + boolean jumpC = false; + boolean moveC = false; + boolean dashC = false; + + //hitbox lists + ArrayList ahb = new ArrayList(); + ArrayList athb = new ArrayList(); + ArrayList phb = new ArrayList(); + ArrayList pthb = new ArrayList(); + + //generate hitboxes here and then use ArrayList add method to add them to the correct list + Push_HitBox pB1 = new Push_HitBox(200,-150,160,400); + + Frame f = new Frame(moveY,moveX,phb,ahb,pthb,athb,pB1,normalC,specialC,jumpC,moveC,dashC); + + //set sprite data on sheet + f.setSpriteWrap((138*2),0,138,138); + return f; + } + + private static Frame crouchBFrame2() { + //movement data + double moveX = 8.0; + double moveY = 0.0; + + //cancelData + boolean normalC = false; + boolean specialC = false; + boolean jumpC = false; + boolean moveC = false; + boolean dashC = false; + + //hitbox lists + ArrayList ahb = new ArrayList(); + ArrayList athb = new ArrayList(); + ArrayList phb = new ArrayList(); + ArrayList pthb = new ArrayList(); + + //generate hitboxes here and then use ArrayList add method to add them to the correct list + Push_HitBox pB1 = new Push_HitBox(200,-150,160,400); + + Frame f = new Frame(moveY,moveX,phb,ahb,pthb,athb,pB1,normalC,specialC,jumpC,moveC,dashC); + + //set sprite data on sheet + f.setSpriteWrap((138*4),(138*14),138,138); + return f; + } + + private static Frame crouchBFrame3() { + //movement data + double moveX = 8.0; + double moveY = 0.0; + + //cancelData + boolean normalC = false; + boolean specialC = false; + boolean jumpC = false; + boolean moveC = false; + boolean dashC = false; + + //hitbox lists + ArrayList ahb = new ArrayList(); + ArrayList athb = new ArrayList(); + ArrayList phb = new ArrayList(); + ArrayList pthb = new ArrayList(); + + //generate hitboxes here and then use ArrayList add method to add them to the correct list + Push_HitBox pB1 = new Push_HitBox(200,-150,160,400); + + Frame f = new Frame(moveY,moveX,phb,ahb,pthb,athb,pB1,normalC,specialC,jumpC,moveC,dashC); + + //set sprite data on sheet + f.setSpriteWrap((138*2),0,138,138); + return f; + } + + private static attackPart blueCrouchBstartup() { + Frame[] f = new Frame[3]; + f[0] = crouchBFrame1(); + f[1] = crouchBFrame1(); + f[2] = crouchBFrame1(); + return(new attackPart(f)); + } + + private static attackPart blueCrouchBrecovery() { + Frame[] f = new Frame[4]; + f[0] = crouchBFrame3(); + f[1] = crouchBFrame3(); + f[2] = crouchBFrame3(); + f[3] = crouchBFrame3(); + return(new attackPart(f)); + } + + private static attackPart blueCrouchBactive() { + Frame[] f = new Frame[4]; + f[0] = crouchBFrame2(); + f[1] = crouchBFrame2(); + f[2] = crouchBFrame2(); + f[3] = crouchBFrame2(); + return(new attackPart(15,0,9,8,10,5,f,false,false,false)); + } + + protected static Attack blueCrouchShort() { + ButtonIG[][] cmd = {{DOWN,B}}; + boolean isSpecial = false; + Status rS = Status.NORMAL; + attackPart[] parts = {blueCrouchBstartup(),blueCrouchBactive(),blueCrouchBrecovery()}; + return new Attack(isSpecial,rS,cmd,parts); + } + + private static Frame crouchDFrame1() { + //movement data + double moveX = 0.0; + double moveY = 0.0; + + //cancelData + boolean normalC = false; + boolean specialC = true; + boolean jumpC = false; + boolean moveC = false; + boolean dashC = false; + + //hitbox lists + ArrayList ahb = new ArrayList(); + ArrayList athb = new ArrayList(); + ArrayList phb = new ArrayList(); + ArrayList pthb = new ArrayList(); + + //generate hitboxes here and then use ArrayList add method to add them to the correct list + Push_HitBox pB1 = new Push_HitBox(200,-150,160,400); + + Frame f = new Frame(moveY,moveX,phb,ahb,pthb,athb,pB1,normalC,specialC,jumpC,moveC,dashC); + + //set sprite data on sheet + f.setSpriteWrap((138*7),(138*5),138,138); + return f; + } + + private static Frame crouchDFrame2() { + //movement data + double moveX = 0.0; + double moveY = 0.0; + + //cancelData + boolean normalC = false; + boolean specialC = false; + boolean jumpC = false; + boolean moveC = false; + boolean dashC = false; + + //hitbox lists + ArrayList ahb = new ArrayList(); + ArrayList athb = new ArrayList(); + ArrayList phb = new ArrayList(); + ArrayList pthb = new ArrayList(); + + //generate hitboxes here and then use ArrayList add method to add them to the correct list + Push_HitBox pB1 = new Push_HitBox(200,-150,160,400); + + Frame f = new Frame(moveY,moveX,phb,ahb,pthb,athb,pB1,normalC,specialC,jumpC,moveC,dashC); + + //set sprite data on sheet + f.setSpriteWrap((138*7),(138*6),138,138); + return f; + } + + private static Frame crouchDFrame3() { + //movement data + double moveX = 0.0; + double moveY = 0.0; + + //cancelData + boolean normalC = false; + boolean specialC = false; + boolean jumpC = false; + boolean moveC = false; + boolean dashC = false; + + //hitbox lists + ArrayList ahb = new ArrayList(); + ArrayList athb = new ArrayList(); + ArrayList phb = new ArrayList(); + ArrayList pthb = new ArrayList(); + + //generate hitboxes here and then use ArrayList add method to add them to the correct list + Push_HitBox pB1 = new Push_HitBox(200,-150,160,400); + + Frame f = new Frame(moveY,moveX,phb,ahb,pthb,athb,pB1,normalC,specialC,jumpC,moveC,dashC); + + //set sprite data on sheet + f.setSpriteWrap((138*7),(138*7),138,138); + return f; + } + + private static Frame crouchDFrame4() { + //movement data + double moveX = 0.0; + double moveY = 0.0; + + //cancelData + boolean normalC = false; + boolean specialC = false; + boolean jumpC = false; + boolean moveC = false; + boolean dashC = false; + + //hitbox lists + ArrayList ahb = new ArrayList(); + ArrayList athb = new ArrayList(); + ArrayList phb = new ArrayList(); + ArrayList pthb = new ArrayList(); + + //generate hitboxes here and then use ArrayList add method to add them to the correct list + Push_HitBox pB1 = new Push_HitBox(200,-150,160,400); + + Frame f = new Frame(moveY,moveX,phb,ahb,pthb,athb,pB1,normalC,specialC,jumpC,moveC,dashC); + + //set sprite data on sheet + f.setSpriteWrap((138*7),(138*8),138,138); + return f; + } + + private static attackPart blueCrouchDstartup() { + Frame[] f = new Frame[4]; + f[0] = crouchDFrame1(); + f[1] = crouchDFrame1(); + f[2] = crouchDFrame1(); + f[3] = crouchDFrame1(); + return(new attackPart(f)); + } + + private static attackPart blueCrouchDrecovery() { + Frame[] f = new Frame[25]; + for(int i = 0; i < 15; i++) { + f[i] = crouchDFrame3(); + } + for(int i = 15; i < f.length; i++) { + f[i] = crouchDFrame4(); + } + return(new attackPart(f)); + } + + private static attackPart blueCrouchDactive() { + Frame[] f = new Frame[6]; + for(int i = 0; i < f.length; i++) { + f[i] = crouchAFrame2(); + } + return(new attackPart(120,0,31,10,30,15,f,true,false,true)); + } + + protected static Attack blueCrouchRoundHouse() { + ButtonIG[][] cmd = {{DOWN,D}}; + boolean isSpecial = false; + Status rS = Status.NORMAL; + attackPart[] parts = {blueCrouchDstartup(),blueCrouchDactive(),blueCrouchDrecovery()}; + return new Attack(isSpecial,rS,cmd,parts); + } + protected static Frame standAFrame1(){ /* @@ -469,7 +735,7 @@ public class BlueNormals { return(new attackPart(80,0,4,4,8,3,f,false,false,false)); } - public static Attack blueStandJab() { + protected static Attack blueStandJab() { ButtonIG[][] cmd = {{A}}; boolean isSpecial = false; Status rS = Status.NORMAL; @@ -477,6 +743,153 @@ public class BlueNormals { return new Attack(isSpecial,rS,cmd,parts); } + private static Frame StandCFrame1() { + //movement data + double moveX = 0.0; + double moveY = 0.0; + + //cancelData + boolean normalC = false; + boolean specialC = false; + boolean jumpC = false; + boolean moveC = false; + boolean dashC = false; + + //hitbox lists + ArrayList ahb = new ArrayList(); + ArrayList athb = new ArrayList(); + ArrayList phb = new ArrayList(); + ArrayList pthb = new ArrayList(); + + //generate hitboxes here and then use ArrayList add method to add them to the correct list + Push_HitBox pB1 = new Push_HitBox(200,-150,160,400); + + Frame f = new Frame(moveY,moveX,phb,ahb,pthb,athb,pB1,normalC,specialC,jumpC,moveC,dashC); + + //set sprite data on sheet + f.setSpriteWrap(0,0,138,138); + return f; + } + + private static Frame StandCFrame2() { + //movement data + double moveX = 0.0; + double moveY = 0.0; + + //cancelData + boolean normalC = false; + boolean specialC = true; + boolean jumpC = false; + boolean moveC = false; + boolean dashC = false; + + //hitbox lists + ArrayList ahb = new ArrayList(); + ArrayList athb = new ArrayList(); + ArrayList phb = new ArrayList(); + ArrayList pthb = new ArrayList(); + + //generate hitboxes here and then use ArrayList add method to add them to the correct list + Push_HitBox pB1 = new Push_HitBox(200,-150,160,400); + + Frame f = new Frame(moveY,moveX,phb,ahb,pthb,athb,pB1,normalC,specialC,jumpC,moveC,dashC); + + //set sprite data on sheet + f.setSpriteWrap((138*3),(138*2),138,138); + return f; + } + + private static Frame StandCFrame3() { + //movement data + double moveX = 0.0; + double moveY = 0.0; + + //cancelData + boolean normalC = false; + boolean specialC = false; + boolean jumpC = false; + boolean moveC = false; + boolean dashC = false; + + //hitbox lists + ArrayList ahb = new ArrayList(); + ArrayList athb = new ArrayList(); + ArrayList phb = new ArrayList(); + ArrayList pthb = new ArrayList(); + + //generate hitboxes here and then use ArrayList add method to add them to the correct list + Push_HitBox pB1 = new Push_HitBox(200,-150,160,400); + + Frame f = new Frame(moveY,moveX,phb,ahb,pthb,athb,pB1,normalC,specialC,jumpC,moveC,dashC); + + //set sprite data on sheet + f.setSpriteWrap(138,(138*6),138,138); + return f; + } + + private static Frame StandCFrame4() { + //movement data + double moveX = 0.0; + double moveY = 0.0; + + //cancelData + boolean normalC = true; + boolean specialC = false; + boolean jumpC = false; + boolean moveC = false; + boolean dashC = false; + + //hitbox lists + ArrayList ahb = new ArrayList(); + ArrayList athb = new ArrayList(); + ArrayList phb = new ArrayList(); + ArrayList pthb = new ArrayList(); + + //generate hitboxes here and then use ArrayList add method to add them to the correct list + Push_HitBox pB1 = new Push_HitBox(200,-150,160,400); + + Frame f = new Frame(moveY,moveX,phb,ahb,pthb,athb,pB1,normalC,specialC,jumpC,moveC,dashC); + + //set sprite data on sheet + f.setSpriteWrap(138,(138*7),138,138); + return f; + } + + private static attackPart blueStandCstartup() { + Frame[] f = new Frame[6]; + for(int i = 0; i < 3; i++) { + f[i] = StandCFrame1(); + } + for(int i = 3; i < 6; i++) { + f[i] = StandCFrame2(); + } + return(new attackPart(f)); + } + + private static attackPart blueStandCrecovery() { + Frame[] f = new Frame[22]; + for(int i = 0; i < 22; i++) { + f[i] = StandCFrame4(); + } + return(new attackPart(f)); + } + + private static attackPart blueStandCactive() { + Frame[] f = new Frame[6]; + for(int i = 0; i < f.length; i++) { + f[i] = StandCFrame3(); + } + return(new attackPart(100,0,28,14,10,5,f,false,false,false)); + } + + protected static Attack blueStandFierce() { + ButtonIG[][] cmd = {{C}}; + boolean isSpecial = false; + Status rS = Status.NORMAL; + attackPart[] parts = {blueStandCstartup(),blueStandCactive(),blueStandCrecovery()}; + return new Attack(isSpecial,rS,cmd,parts); + } + protected static Frame standDFrame1(){ /* @@ -643,6 +1056,39 @@ public class BlueNormals { return f; } + private static Frame standDFrame5(){ + + /* + Hitboxes lists creation + */ + ArrayList phb = new ArrayList(); + ArrayList pthb = new ArrayList(); + ArrayList ahb = new ArrayList(); + ArrayList athb = new ArrayList(); + + /* + Individual hitboxes creation + */ + Passive_HitBox phb1 = new Passive_HitBox(70,70,150,500); + Passive_throw_HitBox pthb1 = new Passive_throw_HitBox(70,400,150,100); + Push_HitBox pushB = new Push_HitBox(70,70,150,500); + + /* + adding hitboxes to lists + */ + phb.add(phb1); + pthb.add(pthb1); + + /* + frame creation + */ + Frame f = new Frame(0.0,3.0,phb,ahb,pthb,athb,pushB, + //cancels (in order : normal, special, jump, move, dash) + false,false,false,false,false); + f.setSpriteWrap((138*4),0,138,138); + return f; + } + protected static attackPart blueStandDstartup() { Frame[] f = new Frame[8]; for(int i = 0; i < 5; i++) { @@ -664,20 +1110,142 @@ public class BlueNormals { protected static attackPart blueStandDrecovery() { Frame[] f = new Frame[18]; - for(int i = 0; i < f.length; i++) { + for(int i = 0; i < 10; i++) { f[i] = standDFrame4(); } + for(int i = 10; i < f.length; i++) { + f[i] = standDFrame5(); + } return(new attackPart(f)); } - public static Attack blueStandHeavyKick() { + protected static Attack blueStandHeavyKick() { ButtonIG[][] cmd = {{D}}; boolean isSpecial = false; Status rS = Status.NORMAL; attackPart[] parts = {blueStandDstartup(),blueStandDactive(),blueStandDrecovery()}; return new Attack(isSpecial,rS,cmd,parts); } - protected static Frame ForwardDFrame0() { + + private static Frame StandBFrame1() { + //movement data + double moveX = 3.0; + double moveY = 0.0; + + //cancelData + boolean normalC = true; + boolean specialC = false; + boolean jumpC = false; + boolean moveC = false; + boolean dashC = false; + + //hitbox lists + ArrayList ahb = new ArrayList(); + ArrayList athb = new ArrayList(); + ArrayList phb = new ArrayList(); + ArrayList pthb = new ArrayList(); + + //generate hitboxes here and then use ArrayList add method to add them to the correct list + Push_HitBox bStandPB1 = new Push_HitBox(70,70,150,500); + + Frame f = new Frame(moveY,moveX,phb,ahb,pthb,athb,bStandPB1,normalC,specialC,jumpC,moveC,dashC); + + //set sprite data on sheet + f.setSpriteWrap((138*5),(138*5),138,138); + return f; + } + + private static Frame StandBFrame2() { + //movement data + double moveX = 0.0; + double moveY = 0.0; + + //cancelData + boolean normalC = true; + boolean specialC = false; + boolean jumpC = false; + boolean moveC = false; + boolean dashC = false; + + //hitbox lists + ArrayList ahb = new ArrayList(); + ArrayList athb = new ArrayList(); + ArrayList phb = new ArrayList(); + ArrayList pthb = new ArrayList(); + + //generate hitboxes here and then use ArrayList add method to add them to the correct list + Push_HitBox bStandPB1 = new Push_HitBox(70,70,150,500); + + Frame f = new Frame(moveY,moveX,phb,ahb,pthb,athb,bStandPB1,normalC,specialC,jumpC,moveC,dashC); + + //set sprite data on sheet + f.setSpriteWrap((138*6),(138*5),138,138); + return f; + } + + private static Frame StandBFrame3() { + //movement data + double moveX = 0.0; + double moveY = 0.0; + + //cancelData + boolean normalC = true; + boolean specialC = false; + boolean jumpC = false; + boolean moveC = false; + boolean dashC = false; + + //hitbox lists + ArrayList ahb = new ArrayList(); + ArrayList athb = new ArrayList(); + ArrayList phb = new ArrayList(); + ArrayList pthb = new ArrayList(); + + //generate hitboxes here and then use ArrayList add method to add them to the correct list + Push_HitBox bStandPB1 = new Push_HitBox(70,70,150,500); + + Frame f = new Frame(moveY,moveX,phb,ahb,pthb,athb,bStandPB1,normalC,specialC,jumpC,moveC,dashC); + + //set sprite data on sheet + f.setSpriteWrap((138*7),(138*5),138,138); + return f; + } + + private static attackPart blueStandBstartup() { + Frame[] f = new Frame[6]; + for(int i = 0; i < 6; i++) { + f[i] = StandBFrame1(); + } + return(new attackPart(f)); + } + + private static attackPart blueStandBactive() { + Frame[] f = new Frame[6]; + for(int i = 0; i < f.length; i++) { + f[i] = StandBFrame2(); + } + return(new attackPart(80,0,11,8,8,5,f,false,false,false)); + } + + private static attackPart blueStandBrecovery() { + Frame[] f = new Frame[4]; + for(int i = 0; i < 4; i++) { + f[i] = StandBFrame3(); + } + return(new attackPart(f)); + } + + protected static Attack blueStandShort() { + ButtonIG[][] cmd = {{B}}; + boolean isSpecial = false; + Status rS = Status.NORMAL; + attackPart[] parts = {blueStandBstartup(),blueStandBactive(),blueStandBrecovery()}; + return new Attack(isSpecial,rS,cmd,parts); + } + + + + private static Frame ForwardDFrame0() { //movement data double moveX = 3.0; double moveY = 0.0; @@ -885,7 +1453,7 @@ public class BlueNormals { return(new attackPart(70,0,11,3,8.0,4.0,f,false,true,false)); } - public static Attack blueFordwardRoundHouse() { + protected static Attack blueFordwardRoundHouse() { ButtonIG[][] cmd = {{FORWARD,D}}; boolean isSpecial = false; Status rS = Status.NORMAL; @@ -893,4 +1461,467 @@ public class BlueNormals { return new Attack(isSpecial,rS,cmd,parts); } + private static Frame JumpAFrame1() { + //movement data + double moveX = 0.0; + double moveY = 0.0; + + //cancelData + boolean normalC = false; + boolean specialC = false; + boolean jumpC = false; + boolean moveC = false; + boolean dashC = false; + + //hitbox lists + ArrayList ahb = new ArrayList(); + ArrayList athb = new ArrayList(); + ArrayList phb = new ArrayList(); + ArrayList pthb = new ArrayList(); + + //generate hitboxes here and then use ArrayList add method to add them to the correct list + Push_HitBox bStandPB1 = new Push_HitBox(70,70,150,500); + + Frame f = new Frame(moveY,moveX,phb,ahb,pthb,athb,bStandPB1,normalC,specialC,jumpC,moveC,dashC); + + //set sprite data on sheet + f.setSpriteWrap((138*12),(138*3),138,138); + return f; + } + + private static Frame JumpAFrame2() { + //movement data + double moveX = 0.0; + double moveY = 0.0; + + //cancelData + boolean normalC = false; + boolean specialC = false; + boolean jumpC = false; + boolean moveC = false; + boolean dashC = false; + + //hitbox lists + ArrayList ahb = new ArrayList(); + ArrayList athb = new ArrayList(); + ArrayList phb = new ArrayList(); + ArrayList pthb = new ArrayList(); + + //generate hitboxes here and then use ArrayList add method to add them to the correct list + Push_HitBox bStandPB1 = new Push_HitBox(70,70,150,500); + + Frame f = new Frame(moveY,moveX,phb,ahb,pthb,athb,bStandPB1,normalC,specialC,jumpC,moveC,dashC); + + //set sprite data on sheet + f.setSpriteWrap((138*13),(138*3),138,138); + return f; + } + + private static Frame JumpAFrame3() { + //movement data + double moveX = 0.0; + double moveY = 0.0; + + //cancelData + boolean normalC = false; + boolean specialC = true; + boolean jumpC = false; + boolean moveC = false; + boolean dashC = false; + + //hitbox lists + ArrayList ahb = new ArrayList(); + ArrayList athb = new ArrayList(); + ArrayList phb = new ArrayList(); + ArrayList pthb = new ArrayList(); + + //generate hitboxes here and then use ArrayList add method to add them to the correct list + Push_HitBox bStandPB1 = new Push_HitBox(70,70,150,500); + + Frame f = new Frame(moveY,moveX,phb,ahb,pthb,athb,bStandPB1,normalC,specialC,jumpC,moveC,dashC); + + //set sprite data on sheet + f.setSpriteWrap((138*14),(138*3),138,138); + return f; + } + + private static attackPart blueJumpAstartup() { + Frame[] f = new Frame[3]; + for(int i = 0; i < 3; i++) { + f[i] = JumpAFrame1(); + } + return(new attackPart(f)); + } + + private static attackPart blueJumpAactive() { + Frame[] f = new Frame[4]; + for(int i = 0; i < f.length; i++) { + f[i] = JumpAFrame2(); + } + return(new attackPart(80,0,10,5,8,3,f,false,true,false)); + } + + private static attackPart blueJumpArecovery() { + Frame[] f = new Frame[5]; + for(int i = 0; i < 5; i++) { + f[i] = JumpAFrame3(); + } + return(new attackPart(f)); + } + + protected static Attack blueJumpJab() { + ButtonIG[][] cmd = {{A}}; + boolean isSpecial = false; + Status rS = Status.JUMPING; + attackPart[] parts = {blueJumpAstartup(),blueJumpAactive(),blueJumpArecovery()}; + return new Attack(isSpecial,rS,cmd,parts); + } + + private static Frame JumpCFrame1() { + //movement data + double moveX = 0.0; + double moveY = 0.0; + + //cancelData + boolean normalC = false; + boolean specialC = false; + boolean jumpC = false; + boolean moveC = false; + boolean dashC = false; + + //hitbox lists + ArrayList ahb = new ArrayList(); + ArrayList athb = new ArrayList(); + ArrayList phb = new ArrayList(); + ArrayList pthb = new ArrayList(); + + //generate hitboxes here and then use ArrayList add method to add them to the correct list + Push_HitBox bStandPB1 = new Push_HitBox(70,70,150,500); + + Frame f = new Frame(moveY,moveX,phb,ahb,pthb,athb,bStandPB1,normalC,specialC,jumpC,moveC,dashC); + + //set sprite data on sheet + f.setSpriteWrap((138*12),(138*3),138,138); + return f; + } + + private static Frame JumpCFrame2() { + //movement data + double moveX = 0.0; + double moveY = 0.0; + + //cancelData + boolean normalC = false; + boolean specialC = false; + boolean jumpC = false; + boolean moveC = false; + boolean dashC = false; + + //hitbox lists + ArrayList ahb = new ArrayList(); + ArrayList athb = new ArrayList(); + ArrayList phb = new ArrayList(); + ArrayList pthb = new ArrayList(); + + //generate hitboxes here and then use ArrayList add method to add them to the correct list + Push_HitBox bStandPB1 = new Push_HitBox(70,70,150,500); + + Frame f = new Frame(moveY,moveX,phb,ahb,pthb,athb,bStandPB1,normalC,specialC,jumpC,moveC,dashC); + + //set sprite data on sheet + f.setSpriteWrap((138*13),(138*3),138,138); + return f; + } + + private static Frame JumpCFrame3() { + //movement data + double moveX = 0.0; + double moveY = 0.0; + + //cancelData + boolean normalC = false; + boolean specialC = true; + boolean jumpC = false; + boolean moveC = false; + boolean dashC = false; + + //hitbox lists + ArrayList ahb = new ArrayList(); + ArrayList athb = new ArrayList(); + ArrayList phb = new ArrayList(); + ArrayList pthb = new ArrayList(); + + //generate hitboxes here and then use ArrayList add method to add them to the correct list + Push_HitBox bStandPB1 = new Push_HitBox(70,70,150,500); + + Frame f = new Frame(moveY,moveX,phb,ahb,pthb,athb,bStandPB1,normalC,specialC,jumpC,moveC,dashC); + + //set sprite data on sheet + f.setSpriteWrap((138*14),(138*3),138,138); + return f; + } + + private static attackPart blueJumpCstartup() { + Frame[] f = new Frame[4]; + for(int i = 0; i < f.length; i++) { + f[i] = JumpCFrame1(); + } + return(new attackPart(f)); + } + + private static attackPart blueJumpCactive() { + Frame[] f = new Frame[8]; + for(int i = 0; i < f.length; i++) { + f[i] = JumpCFrame2(); + } + return(new attackPart(115,0,30,5,13,5,f,false,true,false)); + } + + private static attackPart blueJumpCrecovery() { + Frame[] f = new Frame[15]; + for(int i = 0; i < 15; i++) { + f[i] = JumpCFrame3(); + } + return(new attackPart(f)); + } + + protected static Attack blueJumpFierce() { + ButtonIG[][] cmd = {{C}}; + boolean isSpecial = false; + Status rS = Status.JUMPING; + attackPart[] parts = {blueJumpCstartup(),blueJumpCactive(),blueJumpCrecovery()}; + return new Attack(isSpecial,rS,cmd,parts); + } + + private static Frame JumpBFrame1() { + //movement data + double moveX = 0.0; + double moveY = 0.0; + + //cancelData + boolean normalC = false; + boolean specialC = false; + boolean jumpC = false; + boolean moveC = false; + boolean dashC = false; + + //hitbox lists + ArrayList ahb = new ArrayList(); + ArrayList athb = new ArrayList(); + ArrayList phb = new ArrayList(); + ArrayList pthb = new ArrayList(); + + //generate hitboxes here and then use ArrayList add method to add them to the correct list + Push_HitBox bStandPB1 = new Push_HitBox(70,70,150,500); + + Frame f = new Frame(moveY,moveX,phb,ahb,pthb,athb,bStandPB1,normalC,specialC,jumpC,moveC,dashC); + + //set sprite data on sheet + f.setSpriteWrap((138*14),138,138,138); + return f; + } + + private static Frame JumpBFrame2() { + //movement data + double moveX = 0.0; + double moveY = 0.0; + + //cancelData + boolean normalC = false; + boolean specialC = false; + boolean jumpC = false; + boolean moveC = false; + boolean dashC = false; + + //hitbox lists + ArrayList ahb = new ArrayList(); + ArrayList athb = new ArrayList(); + ArrayList phb = new ArrayList(); + ArrayList pthb = new ArrayList(); + + //generate hitboxes here and then use ArrayList add method to add them to the correct list + Push_HitBox bStandPB1 = new Push_HitBox(70,70,150,500); + + Frame f = new Frame(moveY,moveX,phb,ahb,pthb,athb,bStandPB1,normalC,specialC,jumpC,moveC,dashC); + + //set sprite data on sheet + f.setSpriteWrap((138*13),138,138,138); + return f; + } + + private static Frame JumpBFrame3() { + //movement data + double moveX = 0.0; + double moveY = 0.0; + + //cancelData + boolean normalC = false; + boolean specialC = false; + boolean jumpC = false; + boolean moveC = false; + boolean dashC = false; + + //hitbox lists + ArrayList ahb = new ArrayList(); + ArrayList athb = new ArrayList(); + ArrayList phb = new ArrayList(); + ArrayList pthb = new ArrayList(); + + //generate hitboxes here and then use ArrayList add method to add them to the correct list + Push_HitBox bStandPB1 = new Push_HitBox(70,70,150,500); + + Frame f = new Frame(moveY,moveX,phb,ahb,pthb,athb,bStandPB1,normalC,specialC,jumpC,moveC,dashC); + + //set sprite data on sheet + f.setSpriteWrap((138*14),138,138,138); + return f; + } + + private static attackPart blueJumpBstartup() { + Frame[] f = new Frame[3]; + for(int i = 0; i < f.length; i++) { + f[i] = JumpBFrame1(); + } + return(new attackPart(f)); + } + + private static attackPart blueJumpBactive() { + Frame[] f = new Frame[40]; + for(int i = 0; i < f.length; i++) { + f[i] = JumpBFrame2(); + } + return(new attackPart(80,0,30,15,25,10,f,false,true,false)); + } + + private static attackPart blueJumpBrecovery() { + Frame[] f = new Frame[6]; + for(int i = 0; i < f.length; i++) { + f[i] = JumpBFrame3(); + } + return(new attackPart(f)); + } + + protected static Attack blueJumpShort() { + ButtonIG[][] cmd = {{B}}; + boolean isSpecial = false; + Status rS = Status.JUMPING; + attackPart[] parts = {blueJumpBstartup(),blueJumpBactive(),blueJumpBrecovery()}; + return new Attack(isSpecial,rS,cmd,parts); + } + + private static Frame JumpDFrame1() { + //movement data + double moveX = 0.0; + double moveY = 0.0; + + //cancelData + boolean normalC = false; + boolean specialC = true; + boolean jumpC = false; + boolean moveC = false; + boolean dashC = false; + + //hitbox lists + ArrayList ahb = new ArrayList(); + ArrayList athb = new ArrayList(); + ArrayList phb = new ArrayList(); + ArrayList pthb = new ArrayList(); + + //generate hitboxes here and then use ArrayList add method to add them to the correct list + Push_HitBox bStandPB1 = new Push_HitBox(70,70,150,500); + + Frame f = new Frame(moveY,moveX,phb,ahb,pthb,athb,bStandPB1,normalC,specialC,jumpC,moveC,dashC); + + //set sprite data on sheet + f.setSpriteWrap((138*11),(138*6),138,138); + return f; + } + + private static Frame JumpDFrame2() { + //movement data + double moveX = 0.0; + double moveY = 0.0; + + //cancelData + boolean normalC = false; + boolean specialC = false; + boolean jumpC = false; + boolean moveC = false; + boolean dashC = false; + + //hitbox lists + ArrayList ahb = new ArrayList(); + ArrayList athb = new ArrayList(); + ArrayList phb = new ArrayList(); + ArrayList pthb = new ArrayList(); + + //generate hitboxes here and then use ArrayList add method to add them to the correct list + Push_HitBox bStandPB1 = new Push_HitBox(70,70,150,500); + + Frame f = new Frame(moveY,moveX,phb,ahb,pthb,athb,bStandPB1,normalC,specialC,jumpC,moveC,dashC); + + //set sprite data on sheet + f.setSpriteWrap((138*10),(138*6),138,138); + return f; + } + + private static Frame JumpDFrame3() { + //movement data + double moveX = 0.0; + double moveY = 0.0; + + //cancelData + boolean normalC = false; + boolean specialC = true; + boolean jumpC = false; + boolean moveC = false; + boolean dashC = false; + + //hitbox lists + ArrayList ahb = new ArrayList(); + ArrayList athb = new ArrayList(); + ArrayList phb = new ArrayList(); + ArrayList pthb = new ArrayList(); + + //generate hitboxes here and then use ArrayList add method to add them to the correct list + Push_HitBox bStandPB1 = new Push_HitBox(70,70,150,500); + + Frame f = new Frame(moveY,moveX,phb,ahb,pthb,athb,bStandPB1,normalC,specialC,jumpC,moveC,dashC); + + //set sprite data on sheet + f.setSpriteWrap((138*11),(138*6),138,138); + return f; + } + + private static attackPart blueJumpDstartup() { + Frame[] f = new Frame[4]; + for(int i = 0; i < f.length; i++) { + f[i] = JumpDFrame1(); + } + return(new attackPart(f)); + } + + private static attackPart blueJumpDactive() { + Frame[] f = new Frame[8]; + for(int i = 0; i < f.length; i++) { + f[i] = JumpDFrame2(); + } + return(new attackPart(115,0,50,20,45,15,f,false,true,false)); + } + + private static attackPart blueJumpDrecovery() { + Frame[] f = new Frame[36]; + for(int i = 0; i < f.length; i++) { + f[i] = JumpDFrame3(); + } + return(new attackPart(f)); + } + + protected static Attack blueJumpRoundHouse() { + ButtonIG[][] cmd = {{D}}; + boolean isSpecial = false; + Status rS = Status.JUMPING; + attackPart[] parts = {blueJumpDstartup(),blueJumpDactive(),blueJumpDrecovery()}; + return new Attack(isSpecial,rS,cmd,parts); + } } diff --git a/src/gameplay/Characters/Blue/CharacterBlue.java b/src/gameplay/Characters/Blue/CharacterBlue.java index 869003c..2e29df3 100644 --- a/src/gameplay/Characters/Blue/CharacterBlue.java +++ b/src/gameplay/Characters/Blue/CharacterBlue.java @@ -31,7 +31,10 @@ public class CharacterBlue { Jump nJ = new Jump(njcmd,nJumpF); Jump bJ = new Jump(bjcmd,bJumpF); - Attack[] atks = {blueLDP(),blueFordwardRoundHouse(),blueCrouchFierce(),blueCrouchJab(),blueStandHeavyKick(),blueStandJab(),blueFordwardRoundHouse()}; + Attack[] atks = {blueLDP(),blueJumpJab(),blueJumpFierce(),blueJumpShort(),blueJumpRoundHouse(), + blueFordwardRoundHouse(), + blueCrouchFierce(),blueCrouchJab(),blueCrouchShort(),blueCrouchRoundHouse(), + blueStandHeavyKick(),blueStandJab(),blueStandFierce(),blueStandShort()}; Frame shf = BlueMisc.blueStandHit(); Frame chf = BlueMisc.blueCrouchHit(); diff --git a/src/gameplay/match/match.java b/src/gameplay/match/match.java index 5213723..3a5d3d3 100644 --- a/src/gameplay/match/match.java +++ b/src/gameplay/match/match.java @@ -94,8 +94,13 @@ public class match { private static Engine engine; private static Frame f; private static int acCode = 0; - private static int height, width; - private static boolean roundP1=false ; + private static boolean roundP1=false; + + // Settings + private static int height, width, rounds; + private static String character1, character2, stage; + private static boolean fullscreen; + /** * Starts a new round, by placing the timer back at base value, characters back at full hp and such. @@ -154,6 +159,11 @@ public class match { height = Integer.parseInt((String) settings.get("height")); width = Integer.parseInt((String) settings.get("width")); + fullscreen = Boolean.parseBoolean((String) settings.get("fullscreen")); + rounds = Integer.parseInt((String) settings.get("rounds")); + character1 = (String) settings.get("character1"); + character2 = (String) settings.get("character2"); + stage = (String) settings.get("stage"); } catch (ParseException | IOException e) { e.printStackTrace(); } @@ -161,7 +171,7 @@ public class match { public static void main(String[] args) throws Exception { parse(); - engine = new Engine(width, height, new Vector3f(4.0f, 3.0f)); + engine = new Engine(width, height, fullscreen, new Vector3f(4.0f, 3.0f)); engine.init(); boolean Joystick1Present = glfwJoystickPresent(GLFW_JOYSTICK_1); diff --git a/src/launcher/Config.java b/src/launcher/Config.java index 36c336c..055e5b8 100644 --- a/src/launcher/Config.java +++ b/src/launcher/Config.java @@ -71,12 +71,19 @@ public class Config { System.out.println("button for up is : " + up); */ } catch (FileNotFoundException e) { - e.printStackTrace(); + File f = new File("game.set"); + try { + f.createNewFile(); + } catch (IOException e1) { + // TODO Auto-generated catch block + e1.printStackTrace(); + System.exit(1); + } + parse(); } catch (IOException e) { e.printStackTrace(); } catch (ParseException e) { - e.printStackTrace(); - + System.out.println("Empty config file"); } } diff --git a/src/launcher/Launcher.java b/src/launcher/Launcher.java index aad7b73..7c10e50 100644 --- a/src/launcher/Launcher.java +++ b/src/launcher/Launcher.java @@ -16,6 +16,9 @@ import javafx.collections.ObservableList; import javafx.scene.Parent; import javafx.scene.Scene; import javafx.scene.control.ChoiceBox; +import javafx.scene.image.Image; +import javafx.scene.image.ImageView; +import javafx.scene.layout.VBox; import javafx.scene.control.CheckBox; import javafx.stage.Stage; import javafx.stage.StageStyle; @@ -23,6 +26,7 @@ import javafx.fxml.*; import java.util.HashMap; import java.util.Map; +@SuppressWarnings("unchecked") public class Launcher extends Application { public static Launcher pointer; @@ -45,7 +49,6 @@ public class Launcher extends Application { * Start method is used by Launcher as an implementation of the Application class to create a JavaFX thread to display the GUI window */ - @SuppressWarnings("unchecked") public void start(Stage primaryStage) throws Exception { FXMLLoader loader = new FXMLLoader(getClass().getResource("launcher.fxml")); @@ -72,7 +75,21 @@ public class Launcher extends Application { fs.setSelected(false); } + VBox v1 = (VBox) namespace.get("p1"); + ChoiceBox b1 = (ChoiceBox) v1.getChildren().get(1); + VBox v2 = (VBox) namespace.get("p2"); + ChoiceBox b2 = (ChoiceBox) v2.getChildren().get(1); + ObservableList availablechar = FXCollections.observableArrayList("Blue"); + b1.setItems(availablechar); + b2.setItems(availablechar); + if(setter.getChar1().equals("blue")) { + b1.setValue("Blue"); + } + + if(setter.getChar2().equals("blue")) { + b2.setValue("Blue"); + } primaryStage.initStyle(StageStyle.UNDECORATED); primaryStage.setTitle("Boulevard Combattant"); @@ -81,12 +98,10 @@ public class Launcher extends Application { } - @SuppressWarnings("unchecked") @FXML public void runGame() { try { int width, height; - System.out.println(namespace.size()); ChoiceBox cb = (ChoiceBox) namespace.get("resolution"); switch (cb.getValue()) { case "640x480": @@ -127,8 +142,15 @@ public class Launcher extends Application { CheckBox fs = (CheckBox) namespace.get("fullscreen"); pointer.arraysettings.put("fullscreen", fs.isSelected()); pointer.arraysettings.put("rounds", 3); - pointer.arraysettings.put("character1", "default"); - pointer.arraysettings.put("character2", "default"); + + VBox vp1 = (VBox) namespace.get("p1"); + ChoiceBox p1 = (ChoiceBox) vp1.getChildren().get(1); + pointer.arraysettings.put("character1", p1.getValue().toLowerCase()); + + VBox vp2 = (VBox) namespace.get("p2"); + ChoiceBox p2 = (ChoiceBox) vp2.getChildren().get(1); + pointer.arraysettings.put("character2", p2.getValue().toLowerCase()); + pointer.arraysettings.put("stage", "default"); setter.setSettings(); match.main(null); @@ -153,6 +175,36 @@ public class Launcher extends Application { public void website() { getHostServices().showDocument("https://gitlab.istic.univ-rennes1.fr/fautin/jeu-de-combat"); } + + @FXML + public void chp1() { + VBox v1 = (VBox) namespace.get("p1"); + ImageView iv1 = (ImageView) v1.getChildren().get(0); + ChoiceBox b1 = (ChoiceBox) v1.getChildren().get(1); + switch (b1.getValue()) { + case "Blue": + iv1.setImage(new Image("/launcher/charfaces/blue.png")); + break; + default: + iv1.setImage(new Image("/launcher/default.png")); + break; + } + } + + @FXML + public void chp2() { + VBox v1 = (VBox) namespace.get("p2"); + ImageView iv1 = (ImageView) v1.getChildren().get(0); + ChoiceBox b1 = (ChoiceBox) v1.getChildren().get(1); + switch (b1.getValue()) { + case "Blue": + iv1.setImage(new Image("/launcher/charfaces/blue.png")); + break; + default: + iv1.setImage(new Image("/launcher/default.png")); + break; + } + } public HashMap getArraysettings() { return arraysettings; diff --git a/src/launcher/Settings.java b/src/launcher/Settings.java index c243a90..8c706d7 100644 --- a/src/launcher/Settings.java +++ b/src/launcher/Settings.java @@ -27,7 +27,7 @@ public class Settings { String stage = (String) set.get("stage"); config.write(width, height, rounds, fullscreen, character1, character2, stage); } catch (Exception e) { - config.write(800, 600, 3, false, "default", "default", "default"); + config.write(800, 600, 3, false, "blue", "blue", "default"); System.out.println("Incorrect config file"); } } @@ -39,5 +39,13 @@ public class Settings { public boolean getFullscreen() { return config.fullscreen; } + + public String getChar1() { + return config.p1; + } + + public String getChar2() { + return config.p2; + } } diff --git a/src/launcher/charfaces/blue.png b/src/launcher/charfaces/blue.png new file mode 100644 index 0000000..53a4a90 Binary files /dev/null and b/src/launcher/charfaces/blue.png differ diff --git a/src/launcher/default.png b/src/launcher/default.png new file mode 100644 index 0000000..e7bdbef Binary files /dev/null and b/src/launcher/default.png differ diff --git a/src/launcher/launcher.fxml b/src/launcher/launcher.fxml index c980793..afd9403 100644 --- a/src/launcher/launcher.fxml +++ b/src/launcher/launcher.fxml @@ -19,7 +19,7 @@ + minWidth="280" prefHeight="1280"> @@ -61,18 +61,24 @@ - + - - - + + + + + + - + - - - + + + + + + diff --git a/src/launcher/style.css b/src/launcher/style.css index 4016a3d..762e5be 100644 --- a/src/launcher/style.css +++ b/src/launcher/style.css @@ -1,5 +1,6 @@ #window { -fx-background-color: #131320; + -fx-font-size: 1.25em; } Text, Label { @@ -19,7 +20,7 @@ Text, Label { /* Logo */ .title { -fx-font-weight: bold; - -fx-font-size: 1.35em; + -fx-font-size: 1.5em; -fx-padding: 1; } @@ -47,7 +48,7 @@ Text, Label { /* Settings */ -.res_box Label { +ChoiceBox Label { -fx-fill: #000000; -fx-text-fill: #000000; } @@ -65,4 +66,16 @@ Text, Label { /* Link to project */ Hyperlink:visited { -fx-text-fill: #0095c8; +} + +/**********/ +/* Picker */ +/**********/ + +#picker { + -fx-alignment: top-center; +} + +#picker VBox { + -fx-alignment: top-center; } \ No newline at end of file