commit 180aad05decc7eefa87e4e45d6747c48f40e5361 Author: Tyler Murphy Date: Mon Apr 17 12:12:01 2023 -0400 save diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..e2806d5 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +saves +target diff --git a/LICENSE b/LICENSE new file mode 100755 index 0000000..3877ae0 --- /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. + + + 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/assets/blocks/blocks.json b/assets/blocks/blocks.json new file mode 100755 index 0000000..aea0c74 --- /dev/null +++ b/assets/blocks/blocks.json @@ -0,0 +1,21 @@ +{ + "0": "grass", + "1": "dirt", + "2": "stone", + "3": "cobblestone", + "4": "mossy_cobblestone", + "5": "stone_bricks", + "6": "mossy_stone_bricks", + "7": "cracked_stone_bricks", + "8": "chiseled_stone_bricks", + "9": "bricks", + "10": "wood", + "11": "plank", + "12": "leaves", + "13": "sand", + "14": "sandstone", + "15": "cactus", + "16": "glass", + "17": "water", + "18": "wool" +} \ No newline at end of file diff --git a/assets/blocks/bricks.json b/assets/blocks/bricks.json new file mode 100755 index 0000000..5d7f506 --- /dev/null +++ b/assets/blocks/bricks.json @@ -0,0 +1,10 @@ +{ + "model": "default", + "texture": "all", + "textures": { + "face": "bricks" + }, + "transparent": false, + "renderNeighbors": false, + "placeable": true +} \ No newline at end of file diff --git a/assets/blocks/cactus.json b/assets/blocks/cactus.json new file mode 100755 index 0000000..2d63367 --- /dev/null +++ b/assets/blocks/cactus.json @@ -0,0 +1,12 @@ +{ + "model": "cactus", + "texture": "side", + "textures": { + "side": "cactus", + "top": "cactus_top", + "bottom": "cactus_top" + }, + "transparent": false, + "renderNeighbors": true, + "placeable": true +} \ No newline at end of file diff --git a/assets/blocks/chiseled_stone_bricks.json b/assets/blocks/chiseled_stone_bricks.json new file mode 100755 index 0000000..a4bdb90 --- /dev/null +++ b/assets/blocks/chiseled_stone_bricks.json @@ -0,0 +1,10 @@ +{ + "model": "default", + "texture": "all", + "textures": { + "face": "chiseled_stone_bricks" + }, + "transparent": false, + "renderNeighbors": false, + "placeable": true +} \ No newline at end of file diff --git a/assets/blocks/cobblestone.json b/assets/blocks/cobblestone.json new file mode 100755 index 0000000..02fb6ae --- /dev/null +++ b/assets/blocks/cobblestone.json @@ -0,0 +1,10 @@ +{ + "model": "default", + "texture": "all", + "textures": { + "face": "cobblestone" + }, + "transparent": false, + "renderNeighbors": false, + "placeable": true +} \ No newline at end of file diff --git a/assets/blocks/cracked_stone_bricks.json b/assets/blocks/cracked_stone_bricks.json new file mode 100755 index 0000000..424c38a --- /dev/null +++ b/assets/blocks/cracked_stone_bricks.json @@ -0,0 +1,10 @@ +{ + "model": "default", + "texture": "all", + "textures": { + "face": "cracked_stone_bricks" + }, + "transparent": false, + "renderNeighbors": false, + "placeable": true +} \ No newline at end of file diff --git a/assets/blocks/dirt.json b/assets/blocks/dirt.json new file mode 100755 index 0000000..0b7f530 --- /dev/null +++ b/assets/blocks/dirt.json @@ -0,0 +1,10 @@ +{ + "model": "default", + "texture": "all", + "textures": { + "face": "dirt" + }, + "transparent": false, + "renderNeighbors": false, + "placeable": true +} \ No newline at end of file diff --git a/assets/blocks/glass.json b/assets/blocks/glass.json new file mode 100755 index 0000000..e34c7c3 --- /dev/null +++ b/assets/blocks/glass.json @@ -0,0 +1,10 @@ +{ + "model": "default", + "texture": "all", + "textures": { + "face": "glass" + }, + "transparent": true, + "renderNeighbors": false, + "placeable": true +} \ No newline at end of file diff --git a/assets/blocks/grass.json b/assets/blocks/grass.json new file mode 100755 index 0000000..f97d0be --- /dev/null +++ b/assets/blocks/grass.json @@ -0,0 +1,12 @@ +{ + "model": "default", + "texture": "side", + "textures": { + "side": "grass_side", + "top": "grass_top", + "bottom": "dirt" + }, + "transparent": false, + "renderNeighbors": false, + "placeable": true +} \ No newline at end of file diff --git a/assets/blocks/leaves.json b/assets/blocks/leaves.json new file mode 100755 index 0000000..4ccde34 --- /dev/null +++ b/assets/blocks/leaves.json @@ -0,0 +1,10 @@ +{ + "model": "default", + "texture": "all", + "textures": { + "face": "leaves" + }, + "transparent": true, + "renderNeighbors": true, + "placeable": true +} \ No newline at end of file diff --git a/assets/blocks/mossy_cobblestone.json b/assets/blocks/mossy_cobblestone.json new file mode 100755 index 0000000..081b40e --- /dev/null +++ b/assets/blocks/mossy_cobblestone.json @@ -0,0 +1,10 @@ +{ + "model": "default", + "texture": "all", + "textures": { + "face": "mossy_cobblestone" + }, + "transparent": false, + "renderNeighbors": false, + "placeable": true +} \ No newline at end of file diff --git a/assets/blocks/mossy_stone_bricks.json b/assets/blocks/mossy_stone_bricks.json new file mode 100755 index 0000000..ed73511 --- /dev/null +++ b/assets/blocks/mossy_stone_bricks.json @@ -0,0 +1,10 @@ +{ + "model": "default", + "texture": "all", + "textures": { + "face": "mossy_stone_bricks" + }, + "transparent": false, + "renderNeighbors": false, + "placeable": true +} \ No newline at end of file diff --git a/assets/blocks/plank.json b/assets/blocks/plank.json new file mode 100755 index 0000000..93e197a --- /dev/null +++ b/assets/blocks/plank.json @@ -0,0 +1,10 @@ +{ + "model": "default", + "texture": "all", + "textures": { + "face": "plank" + }, + "transparent": false, + "renderNeighbors": false, + "placeable": true +} \ No newline at end of file diff --git a/assets/blocks/sand.json b/assets/blocks/sand.json new file mode 100755 index 0000000..e1574c5 --- /dev/null +++ b/assets/blocks/sand.json @@ -0,0 +1,10 @@ +{ + "model": "default", + "texture": "all", + "textures": { + "face": "sand" + }, + "transparent": false, + "renderNeighbors": false, + "placeable": true +} \ No newline at end of file diff --git a/assets/blocks/sandstone.json b/assets/blocks/sandstone.json new file mode 100755 index 0000000..e38fec5 --- /dev/null +++ b/assets/blocks/sandstone.json @@ -0,0 +1,12 @@ +{ + "model": "default", + "texture": "side", + "textures": { + "side": "sandstone_side", + "top": "sandstone_top", + "bottom": "sandstone_bottom" + }, + "transparent": false, + "renderNeighbors": false, + "placeable": true +} \ No newline at end of file diff --git a/assets/blocks/stone.json b/assets/blocks/stone.json new file mode 100755 index 0000000..f3173af --- /dev/null +++ b/assets/blocks/stone.json @@ -0,0 +1,10 @@ +{ + "model": "default", + "texture": "all", + "textures": { + "face": "stone" + }, + "transparent": false, + "renderNeighbors": false, + "placeable": true +} \ No newline at end of file diff --git a/assets/blocks/stone_bricks.json b/assets/blocks/stone_bricks.json new file mode 100755 index 0000000..ab61078 --- /dev/null +++ b/assets/blocks/stone_bricks.json @@ -0,0 +1,10 @@ +{ + "model": "default", + "texture": "all", + "textures": { + "face": "stone_bricks" + }, + "transparent": false, + "renderNeighbors": false, + "placeable": true +} \ No newline at end of file diff --git a/assets/blocks/water.json b/assets/blocks/water.json new file mode 100755 index 0000000..42afe44 --- /dev/null +++ b/assets/blocks/water.json @@ -0,0 +1,10 @@ +{ + "model": "default", + "texture": "all", + "textures": { + "face": "water" + }, + "transparent": true, + "renderNeighbors": false, + "placeable": false +} \ No newline at end of file diff --git a/assets/blocks/wood.json b/assets/blocks/wood.json new file mode 100755 index 0000000..62fc90b --- /dev/null +++ b/assets/blocks/wood.json @@ -0,0 +1,12 @@ +{ + "model": "default", + "texture": "side", + "textures": { + "side": "wood_side", + "top": "wood_top", + "bottom": "wood_top" + }, + "transparent": false, + "renderNeighbors": false, + "placeable": true +} \ No newline at end of file diff --git a/assets/blocks/wool.json b/assets/blocks/wool.json new file mode 100755 index 0000000..ef79773 --- /dev/null +++ b/assets/blocks/wool.json @@ -0,0 +1,10 @@ +{ + "model": "default", + "texture": "all", + "textures": { + "face": "wool" + }, + "transparent": false, + "renderNeighbors": false, + "placeable": true +} \ No newline at end of file diff --git a/assets/font/yugothic.fnt b/assets/font/yugothic.fnt new file mode 100755 index 0000000..b7fc274 --- /dev/null +++ b/assets/font/yugothic.fnt @@ -0,0 +1,101 @@ +info face="Yu Gothic UI Regular" size=75 bold=0 italic=0 charset="" unicode=0 stretchH=100 smooth=1 aa=1 padding=5,5,5,5 spacing=-2,-2 +common lineHeight=108 base=81 scaleW=512 scaleH=512 pages=1 packed=0 +page id=0 file="yugothic.png" +chars count=97 +char id=0 x=55 y=0 width=71 height=83 xoffset=2 yoffset=11 xadvance=83 page=0 chnl=0 +char id=10 x=0 y=0 width=0 height=0 xoffset=-5 yoffset=0 xadvance=8 page=0 chnl=0 +char id=32 x=0 y=0 width=0 height=0 xoffset=-5 yoffset=0 xadvance=29 page=0 chnl=0 +char id=33 x=199 y=220 width=19 height=65 xoffset=1 yoffset=22 xadvance=29 page=0 chnl=0 +char id=34 x=279 y=465 width=29 height=27 xoffset=0 yoffset=22 xadvance=37 page=0 chnl=0 +char id=35 x=349 y=350 width=52 height=59 xoffset=-4 yoffset=22 xadvance=52 page=0 chnl=0 +char id=36 x=126 y=0 width=41 height=78 xoffset=0 yoffset=16 xadvance=48 page=0 chnl=0 +char id=37 x=413 y=154 width=67 height=66 xoffset=-3 yoffset=21 xadvance=69 page=0 chnl=0 +char id=38 x=0 y=220 width=65 height=66 xoffset=-1 yoffset=21 xadvance=68 page=0 chnl=0 +char id=39 x=308 y=465 width=17 height=27 xoffset=0 yoffset=22 xadvance=25 page=0 chnl=0 +char id=40 x=167 y=0 width=27 height=76 xoffset=0 yoffset=22 xadvance=31 page=0 chnl=0 +char id=41 x=194 y=0 width=28 height=76 xoffset=-5 yoffset=22 xadvance=31 page=0 chnl=0 +char id=42 x=176 y=465 width=37 height=38 xoffset=-3 yoffset=22 xadvance=39 page=0 chnl=0 +char id=43 x=86 y=465 width=45 height=46 xoffset=3 yoffset=36 xadvance=59 page=0 chnl=0 +char id=44 x=258 y=465 width=21 height=29 xoffset=-4 yoffset=67 xadvance=24 page=0 chnl=0 +char id=45 x=416 y=465 width=31 height=16 xoffset=0 yoffset=52 xadvance=38 page=0 chnl=0 +char id=46 x=397 y=465 width=19 height=19 xoffset=-1 yoffset=68 xadvance=24 page=0 chnl=0 +char id=47 x=327 y=0 width=42 height=73 xoffset=-6 yoffset=22 xadvance=37 page=0 chnl=0 +char id=48 x=332 y=154 width=45 height=66 xoffset=-2 yoffset=21 xadvance=48 page=0 chnl=0 +char id=49 x=479 y=86 width=29 height=65 xoffset=3 yoffset=21 xadvance=48 page=0 chnl=0 +char id=50 x=115 y=220 width=44 height=65 xoffset=-2 yoffset=21 xadvance=48 page=0 chnl=0 +char id=51 x=158 y=154 width=41 height=66 xoffset=-1 yoffset=21 xadvance=48 page=0 chnl=0 +char id=52 x=155 y=350 width=48 height=64 xoffset=-5 yoffset=22 xadvance=48 page=0 chnl=0 +char id=53 x=159 y=220 width=40 height=65 xoffset=1 yoffset=22 xadvance=48 page=0 chnl=0 +char id=54 x=199 y=154 width=44 height=66 xoffset=-1 yoffset=21 xadvance=48 page=0 chnl=0 +char id=55 x=203 y=350 width=44 height=64 xoffset=-2 yoffset=22 xadvance=48 page=0 chnl=0 +char id=56 x=243 y=154 width=45 height=66 xoffset=-2 yoffset=21 xadvance=48 page=0 chnl=0 +char id=57 x=288 y=154 width=44 height=66 xoffset=-2 yoffset=21 xadvance=48 page=0 chnl=0 +char id=58 x=480 y=350 width=19 height=51 xoffset=-1 yoffset=36 xadvance=24 page=0 chnl=0 +char id=59 x=327 y=350 width=22 height=59 xoffset=-4 yoffset=37 xadvance=24 page=0 chnl=0 +char id=60 x=0 y=465 width=43 height=46 xoffset=4 yoffset=35 xadvance=59 page=0 chnl=0 +char id=61 x=213 y=465 width=45 height=32 xoffset=3 yoffset=43 xadvance=59 page=0 chnl=0 +char id=62 x=43 y=465 width=43 height=46 xoffset=4 yoffset=35 xadvance=59 page=0 chnl=0 +char id=63 x=377 y=154 width=36 height=66 xoffset=-1 yoffset=21 xadvance=42 page=0 chnl=0 +char id=64 x=434 y=0 width=70 height=72 xoffset=1 yoffset=21 xadvance=80 page=0 chnl=0 +char id=65 x=218 y=220 width=58 height=64 xoffset=-5 yoffset=22 xadvance=56 page=0 chnl=0 +char id=66 x=276 y=220 width=44 height=64 xoffset=1 yoffset=22 xadvance=51 page=0 chnl=0 +char id=67 x=429 y=86 width=50 height=66 xoffset=-2 yoffset=21 xadvance=54 page=0 chnl=0 +char id=68 x=320 y=220 width=54 height=64 xoffset=1 yoffset=22 xadvance=61 page=0 chnl=0 +char id=69 x=374 y=220 width=39 height=64 xoffset=1 yoffset=22 xadvance=46 page=0 chnl=0 +char id=70 x=413 y=220 width=38 height=64 xoffset=1 yoffset=22 xadvance=45 page=0 chnl=0 +char id=71 x=0 y=154 width=54 height=66 xoffset=-2 yoffset=21 xadvance=59 page=0 chnl=0 +char id=72 x=451 y=220 width=51 height=64 xoffset=1 yoffset=22 xadvance=61 page=0 chnl=0 +char id=73 x=0 y=286 width=18 height=64 xoffset=1 yoffset=22 xadvance=28 page=0 chnl=0 +char id=74 x=480 y=154 width=31 height=65 xoffset=-5 yoffset=22 xadvance=35 page=0 chnl=0 +char id=75 x=18 y=286 width=48 height=64 xoffset=1 yoffset=22 xadvance=52 page=0 chnl=0 +char id=76 x=66 y=286 width=39 height=64 xoffset=1 yoffset=22 xadvance=43 page=0 chnl=0 +char id=77 x=105 y=286 width=65 height=64 xoffset=1 yoffset=22 xadvance=75 page=0 chnl=0 +char id=78 x=170 y=286 width=54 height=64 xoffset=1 yoffset=22 xadvance=64 page=0 chnl=0 +char id=79 x=54 y=154 width=61 height=66 xoffset=-2 yoffset=21 xadvance=65 page=0 chnl=0 +char id=80 x=224 y=286 width=44 height=64 xoffset=1 yoffset=22 xadvance=50 page=0 chnl=0 +char id=81 x=369 y=0 width=65 height=72 xoffset=-2 yoffset=21 xadvance=65 page=0 chnl=0 +char id=82 x=268 y=286 width=49 height=64 xoffset=1 yoffset=22 xadvance=53 page=0 chnl=0 +char id=83 x=115 y=154 width=43 height=66 xoffset=-1 yoffset=21 xadvance=48 page=0 chnl=0 +char id=84 x=317 y=286 width=47 height=64 xoffset=-4 yoffset=22 xadvance=47 page=0 chnl=0 +char id=85 x=65 y=220 width=50 height=65 xoffset=1 yoffset=22 xadvance=60 page=0 chnl=0 +char id=86 x=364 y=286 width=56 height=64 xoffset=-5 yoffset=22 xadvance=55 page=0 chnl=0 +char id=87 x=420 y=286 width=79 height=64 xoffset=-4 yoffset=22 xadvance=78 page=0 chnl=0 +char id=88 x=0 y=350 width=53 height=64 xoffset=-4 yoffset=22 xadvance=52 page=0 chnl=0 +char id=89 x=53 y=350 width=51 height=64 xoffset=-5 yoffset=22 xadvance=49 page=0 chnl=0 +char id=90 x=104 y=350 width=51 height=64 xoffset=-4 yoffset=22 xadvance=51 page=0 chnl=0 +char id=91 x=222 y=0 width=24 height=76 xoffset=2 yoffset=22 xadvance=31 page=0 chnl=0 +char id=92 x=247 y=350 width=47 height=64 xoffset=-3 yoffset=22 xadvance=48 page=0 chnl=0 +char id=93 x=246 y=0 width=25 height=76 xoffset=-4 yoffset=22 xadvance=31 page=0 chnl=0 +char id=94 x=131 y=465 width=45 height=42 xoffset=3 yoffset=21 xadvance=59 page=0 chnl=0 +char id=95 x=447 y=465 width=42 height=15 xoffset=-5 yoffset=82 xadvance=39 page=0 chnl=0 +char id=96 x=325 y=465 width=25 height=23 xoffset=-2 yoffset=18 xadvance=28 page=0 chnl=0 +char id=97 x=401 y=350 width=40 height=51 xoffset=-2 yoffset=36 xadvance=46 page=0 chnl=0 +char id=98 x=0 y=86 width=45 height=68 xoffset=1 yoffset=19 xadvance=52 page=0 chnl=0 +char id=99 x=441 y=350 width=39 height=51 xoffset=-2 yoffset=36 xadvance=43 page=0 chnl=0 +char id=100 x=45 y=86 width=46 height=68 xoffset=-2 yoffset=19 xadvance=52 page=0 chnl=0 +char id=101 x=0 y=414 width=44 height=51 xoffset=-2 yoffset=36 xadvance=47 page=0 chnl=0 +char id=102 x=91 y=86 width=35 height=68 xoffset=-4 yoffset=18 xadvance=31 page=0 chnl=0 +char id=103 x=126 y=86 width=46 height=68 xoffset=-2 yoffset=36 xadvance=52 page=0 chnl=0 +char id=104 x=172 y=86 width=42 height=67 xoffset=1 yoffset=19 xadvance=50 page=0 chnl=0 +char id=105 x=214 y=86 width=19 height=67 xoffset=0 yoffset=19 xadvance=26 page=0 chnl=0 +char id=106 x=16 y=0 width=39 height=85 xoffset=-13 yoffset=19 xadvance=26 page=0 chnl=0 +char id=107 x=233 y=86 width=42 height=67 xoffset=1 yoffset=19 xadvance=45 page=0 chnl=0 +char id=108 x=275 y=86 width=17 height=67 xoffset=1 yoffset=19 xadvance=26 page=0 chnl=0 +char id=109 x=128 y=414 width=64 height=50 xoffset=1 yoffset=36 xadvance=73 page=0 chnl=0 +char id=110 x=192 y=414 width=42 height=50 xoffset=1 yoffset=36 xadvance=50 page=0 chnl=0 +char id=111 x=44 y=414 width=48 height=51 xoffset=-2 yoffset=36 xadvance=52 page=0 chnl=0 +char id=112 x=292 y=86 width=45 height=67 xoffset=1 yoffset=36 xadvance=52 page=0 chnl=0 +char id=113 x=337 y=86 width=46 height=67 xoffset=-2 yoffset=36 xadvance=52 page=0 chnl=0 +char id=114 x=234 y=414 width=30 height=50 xoffset=1 yoffset=36 xadvance=34 page=0 chnl=0 +char id=115 x=92 y=414 width=36 height=51 xoffset=-2 yoffset=36 xadvance=40 page=0 chnl=0 +char id=116 x=294 y=350 width=33 height=60 xoffset=-4 yoffset=27 xadvance=33 page=0 chnl=0 +char id=117 x=264 y=414 width=42 height=50 xoffset=0 yoffset=37 xadvance=50 page=0 chnl=0 +char id=118 x=306 y=414 width=46 height=49 xoffset=-5 yoffset=37 xadvance=44 page=0 chnl=0 +char id=119 x=352 y=414 width=64 height=49 xoffset=-5 yoffset=37 xadvance=62 page=0 chnl=0 +char id=120 x=416 y=414 width=43 height=49 xoffset=-4 yoffset=37 xadvance=42 page=0 chnl=0 +char id=121 x=383 y=86 width=46 height=67 xoffset=-5 yoffset=37 xadvance=44 page=0 chnl=0 +char id=122 x=459 y=414 width=42 height=49 xoffset=-4 yoffset=37 xadvance=42 page=0 chnl=0 +char id=123 x=271 y=0 width=28 height=76 xoffset=-2 yoffset=22 xadvance=31 page=0 chnl=0 +char id=124 x=0 y=0 width=16 height=86 xoffset=1 yoffset=18 xadvance=26 page=0 chnl=0 +char id=125 x=299 y=0 width=28 height=76 xoffset=-3 yoffset=22 xadvance=31 page=0 chnl=0 +char id=126 x=350 y=465 width=47 height=22 xoffset=2 yoffset=48 xadvance=59 page=0 chnl=0 diff --git a/assets/gen/biome_data.json b/assets/gen/biome_data.json new file mode 100755 index 0000000..e0c530b --- /dev/null +++ b/assets/gen/biome_data.json @@ -0,0 +1,15 @@ +{ + "table": [ + [ "ICE", "TUNDRA", "GRASSLAND", "DESERT", "DESERT", "DESERT" ], + [ "ICE", "TUNDRA", "GRASSLAND", "GRASSLAND", "DESERT", "DESERT" ], + [ "ICE", "TUNDRA", "WOODLAND", "WOODLAND", "SAVANNA", "SAVANNA" ], + [ "ICE", "TUNDRA", "TAIGA", "WOODLAND", "SAVANNA", "SAVANNA" ], + [ "ICE", "TUNDRA", "TAIGA", "FOREST", "JUNGLE", "JUNGLE" ], + [ "ICE", "TUNDRA", "TAIGA", "TAIGA", "JUNGLE", "JUNGLE" ] + ], + + "heat": [0.05, 0.18, 0.4, 0.6, 0.8], + + "moisture": [0.2, 0.3, 0.5, 0.6, 0.7], + +} \ No newline at end of file diff --git a/assets/gen/biomes/beach.json b/assets/gen/biomes/beach.json new file mode 100755 index 0000000..472b955 --- /dev/null +++ b/assets/gen/biomes/beach.json @@ -0,0 +1,8 @@ +{ + "name":"RIVER", + "top_block": 13, + "bottom_block": 13, + "roughness": 0.2, + "scale": 0.8, + "exp": 1.3 +} \ No newline at end of file diff --git a/assets/gen/biomes/desert.json b/assets/gen/biomes/desert.json new file mode 100755 index 0000000..cda9d73 --- /dev/null +++ b/assets/gen/biomes/desert.json @@ -0,0 +1,11 @@ +{ + "name":"DESERT", + "top_block": 13, + "bottom_block": 13, + "roughness": 0.6, + "scale": 0.6, + "exp": 1.2, + "decorations": { + "cactus": "0.005" + } +} \ No newline at end of file diff --git a/assets/gen/biomes/forest.json b/assets/gen/biomes/forest.json new file mode 100755 index 0000000..1eb1371 --- /dev/null +++ b/assets/gen/biomes/forest.json @@ -0,0 +1,11 @@ +{ + "name":"GRASSLAND", + "top_block": 0, + "bottom_block": 1, + "roughness": 1.0, + "scale": 1.0, + "exp": 1.0, + "decorations": { + "tree": "0.009" + } +} \ No newline at end of file diff --git a/assets/gen/biomes/grassland.json b/assets/gen/biomes/grassland.json new file mode 100755 index 0000000..a00412d --- /dev/null +++ b/assets/gen/biomes/grassland.json @@ -0,0 +1,11 @@ +{ + "name":"GRASSLAND", + "top_block": 0, + "bottom_block": 1, + "roughness": 1.0, + "scale": 1.0, + "exp": 1.0, + "decorations": { + "tree": "0.0005" + } +} \ No newline at end of file diff --git a/assets/gen/biomes/ice.json b/assets/gen/biomes/ice.json new file mode 100755 index 0000000..88513d1 --- /dev/null +++ b/assets/gen/biomes/ice.json @@ -0,0 +1,8 @@ +{ + "name":"ICE", + "top_block": 16, + "bottom_block": 16, + "roughness": 1.0, + "scale": 1.0, + "exp": 1.0, +} \ No newline at end of file diff --git a/assets/gen/biomes/jungle.json b/assets/gen/biomes/jungle.json new file mode 100755 index 0000000..c4d4164 --- /dev/null +++ b/assets/gen/biomes/jungle.json @@ -0,0 +1,11 @@ +{ + "name":"JUNGLE", + "top_block": 0, + "bottom_block": 1, + "roughness": 1.0, + "scale": 1.0, + "exp": 1.0, + "decorations": { + "tree": "0.01" + } +} \ No newline at end of file diff --git a/assets/gen/biomes/mountain.json b/assets/gen/biomes/mountain.json new file mode 100755 index 0000000..a5321ac --- /dev/null +++ b/assets/gen/biomes/mountain.json @@ -0,0 +1,8 @@ +{ + "name":"MOUNTAIN", + "top_block": 16, + "bottom_block": 2, + "roughness": 2.0, + "scale": 1.2, + "exp": 1.0, +} \ No newline at end of file diff --git a/assets/gen/biomes/ocean.json b/assets/gen/biomes/ocean.json new file mode 100755 index 0000000..79fb79f --- /dev/null +++ b/assets/gen/biomes/ocean.json @@ -0,0 +1,8 @@ +{ + "name":"OCEAN", + "top_block": 13, + "bottom_block": 13, + "roughness": 1.0, + "scale": 1.0, + "exp": 1.0 +} \ No newline at end of file diff --git a/assets/gen/biomes/rainforest.json b/assets/gen/biomes/rainforest.json new file mode 100755 index 0000000..ec13988 --- /dev/null +++ b/assets/gen/biomes/rainforest.json @@ -0,0 +1,11 @@ +{ + "name":"RAINFOREST", + "top_block": 0, + "bottom_block": 1, + "roughness": 1.0, + "scale": 1.0, + "exp": 1.0, + "decorations": { + "tree": "0.009" + } +} \ No newline at end of file diff --git a/assets/gen/biomes/river.json b/assets/gen/biomes/river.json new file mode 100755 index 0000000..8f612d1 --- /dev/null +++ b/assets/gen/biomes/river.json @@ -0,0 +1,8 @@ +{ + "name":"RIVER", + "top_block": 13, + "bottom_block": 13, + "roughness": 1.0, + "scale": 1.0, + "exp": 1.0 +} \ No newline at end of file diff --git a/assets/gen/biomes/savanna.json b/assets/gen/biomes/savanna.json new file mode 100755 index 0000000..26c5309 --- /dev/null +++ b/assets/gen/biomes/savanna.json @@ -0,0 +1,11 @@ +{ + "name":"SAVANNA", + "top_block": 0, + "bottom_block": 1, + "roughness": 1.0, + "scale": 1.0, + "exp": 1.0, + "decorations": { + "tree": "0.001" + } +} \ No newline at end of file diff --git a/assets/gen/biomes/taiga.json b/assets/gen/biomes/taiga.json new file mode 100755 index 0000000..4efbec1 --- /dev/null +++ b/assets/gen/biomes/taiga.json @@ -0,0 +1,11 @@ +{ + "name":"TAIGA", + "top_block": 18, + "bottom_block": 1, + "roughness": 1.0, + "scale": 1.0, + "exp": 1.0, + "decorations": { + "pine": "0.006" + } +} \ No newline at end of file diff --git a/assets/gen/biomes/tundra.json b/assets/gen/biomes/tundra.json new file mode 100755 index 0000000..2e01b80 --- /dev/null +++ b/assets/gen/biomes/tundra.json @@ -0,0 +1,11 @@ +{ + "name":"TUNDRA", + "top_block": 16, + "bottom_block": 2, + "roughness": 1.0, + "scale": 1.0, + "exp": 1.0, + "decorations": { + "pine": "0.0005" + } +} \ No newline at end of file diff --git a/assets/gen/biomes/woodland.json b/assets/gen/biomes/woodland.json new file mode 100755 index 0000000..11649e0 --- /dev/null +++ b/assets/gen/biomes/woodland.json @@ -0,0 +1,11 @@ +{ + "name":"GRASSLAND", + "top_block": 0, + "bottom_block": 1, + "roughness": 1.0, + "scale": 1.0, + "exp": 1.0, + "decorations": { + "tree": "0.0007" + } +} \ No newline at end of file diff --git a/assets/gen/decorations/cactus.json b/assets/gen/decorations/cactus.json new file mode 100755 index 0000000..c0c629f --- /dev/null +++ b/assets/gen/decorations/cactus.json @@ -0,0 +1,9 @@ +{ + "blocks": { + "15": [ + [0,0,0], + [0,1,0], + [0,2,0], + ], + }, +} \ No newline at end of file diff --git a/assets/gen/decorations/pine.json b/assets/gen/decorations/pine.json new file mode 100755 index 0000000..ff3bd86 --- /dev/null +++ b/assets/gen/decorations/pine.json @@ -0,0 +1,24 @@ +{ + "blocks": { + "10": [ + [0,0,0], + [0,1,0], + [0,2,0], + ], + "12": [ + [-1,2,-1], + [-1,2,0], + [-1,2,1], + [0,2,-1], + [0,2,1], + [1,2,-1], + [1,2,0], + [1,2,1], + [1,3,0], + [-1,3,0], + [0,3,1], + [0,3,-1], + [0,3,0], + ], + }, +} \ No newline at end of file diff --git a/assets/gen/decorations/tree.json b/assets/gen/decorations/tree.json new file mode 100755 index 0000000..ff3bd86 --- /dev/null +++ b/assets/gen/decorations/tree.json @@ -0,0 +1,24 @@ +{ + "blocks": { + "10": [ + [0,0,0], + [0,1,0], + [0,2,0], + ], + "12": [ + [-1,2,-1], + [-1,2,0], + [-1,2,1], + [0,2,-1], + [0,2,1], + [1,2,-1], + [1,2,0], + [1,2,1], + [1,3,0], + [-1,3,0], + [0,3,1], + [0,3,-1], + [0,3,0], + ], + }, +} \ No newline at end of file diff --git a/assets/models/cactus.json b/assets/models/cactus.json new file mode 100755 index 0000000..4eb6b84 --- /dev/null +++ b/assets/models/cactus.json @@ -0,0 +1,55 @@ +{ + "PX_POS":[ + [0.4,0.5,0.4], + [0.4,-0.5,0.4], + [0.4,-0.5,-0.4], + [0.4,-0.5,-0.4], + [0.4,0.5,-0.4], + [0.4,0.5,0.4], + ], + + "NX_POS":[ + [-0.4,0.5,-0.4], + [-0.4,-0.5,-0.4], + [-0.4,-0.5,0.4], + [-0.4,-0.5,0.4], + [-0.4,0.5,0.4], + [-0.4,0.5,-0.4], + ], + + "PY_POS":[ + [0.4,0.5,-0.4], + [-0.4,0.5,-0.4], + [-0.4,0.5,0.4], + [-0.4,0.5,0.4], + [0.4,0.5,0.4], + [0.4,0.5,-0.4], + ], + + "NY_POS":[ + [-0.4,-0.5,0.4], + [-0.4,-0.5,-0.4], + [0.4,-0.5,-0.4], + [0.4,-0.5,-0.4], + [0.4,-0.5,0.4], + [-0.4,-0.5,0.4], + ], + + "PZ_POS":[ + [-0.4,0.5,0.4], + [-0.4,-0.5,0.4], + [0.4,-0.5,0.4], + [0.4,-0.5,0.4], + [0.4,0.5,0.4], + [-0.4,0.5,0.4], + ], + + "NZ_POS":[ + [0.4,0.5,-0.4], + [0.4,-0.5,-0.4], + [-0.4,-0.5,-0.4], + [-0.4,-0.5,-0.4], + [-0.4,0.5,-0.4], + [0.4,0.5,-0.4], + ] +} \ No newline at end of file diff --git a/assets/models/default.json b/assets/models/default.json new file mode 100755 index 0000000..7c7fd56 --- /dev/null +++ b/assets/models/default.json @@ -0,0 +1,55 @@ +{ + "PX_POS":[ + [0.5,0.5,0.5], + [0.5,-0.5,0.5], + [0.5,-0.5,-0.5], + [0.5,-0.5,-0.5], + [0.5,0.5,-0.5], + [0.5,0.5,0.5], + ], + + "NX_POS":[ + [-0.5,0.5,-0.5], + [-0.5,-0.5,-0.5], + [-0.5,-0.5,0.5], + [-0.5,-0.5,0.5], + [-0.5,0.5,0.5], + [-0.5,0.5,-0.5], + ], + + "PY_POS":[ + [0.5,0.5,-0.5], + [-0.5,0.5,-0.5], + [-0.5,0.5,0.5], + [-0.5,0.5,0.5], + [0.5,0.5,0.5], + [0.5,0.5,-0.5], + ], + + "NY_POS":[ + [-0.5,-0.5,0.5], + [-0.5,-0.5,-0.5], + [0.5,-0.5,-0.5], + [0.5,-0.5,-0.5], + [0.5,-0.5,0.5], + [-0.5,-0.5,0.5], + ], + + "PZ_POS":[ + [-0.5,0.5,0.5], + [-0.5,-0.5,0.5], + [0.5,-0.5,0.5], + [0.5,-0.5,0.5], + [0.5,0.5,0.5], + [-0.5,0.5,0.5], + ], + + "NZ_POS":[ + [0.5,0.5,-0.5], + [0.5,-0.5,-0.5], + [-0.5,-0.5,-0.5], + [-0.5,-0.5,-0.5], + [-0.5,0.5,-0.5], + [0.5,0.5,-0.5], + ] +} \ No newline at end of file diff --git a/assets/models/water.json b/assets/models/water.json new file mode 100755 index 0000000..3abd497 --- /dev/null +++ b/assets/models/water.json @@ -0,0 +1,55 @@ +{ + "PX_POS":[ + [0.5,0.4,0.5], + [0.5,-0.5,0.5], + [0.5,-0.5,-0.5], + [0.5,-0.5,-0.5], + [0.5,0.4,-0.5], + [0.5,0.4,0.5], + ], + + "NX_POS":[ + [-0.5,0.4,-0.5], + [-0.5,-0.5,-0.5], + [-0.5,-0.5,0.5], + [-0.5,-0.5,0.5], + [-0.5,0.4,0.5], + [-0.5,0.4,-0.5], + ], + + "PY_POS":[ + [0.5,0.4,-0.5], + [-0.5,0.4,-0.5], + [-0.5,0.4,0.5], + [-0.5,0.4,0.5], + [0.5,0.4,0.5], + [0.5,0.4,-0.5], + ], + + "NY_POS":[ + [-0.5,-0.5,0.5], + [-0.5,-0.5,-0.5], + [0.5,-0.5,-0.5], + [0.5,-0.5,-0.5], + [0.5,-0.5,0.5], + [-0.5,-0.5,0.5], + ], + + "PZ_POS":[ + [-0.5,0.4,0.5], + [-0.5,-0.5,0.5], + [0.5,-0.5,0.5], + [0.5,-0.5,0.5], + [0.5,0.4,0.5], + [-0.5,0.4,0.5], + ], + + "NZ_POS":[ + [0.5,0.4,-0.5], + [0.5,-0.5,-0.5], + [-0.5,-0.5,-0.5], + [-0.5,-0.5,-0.5], + [-0.5,0.4,-0.5], + [0.5,0.4,-0.5], + ] +} \ No newline at end of file diff --git a/assets/shaders/Chunk_FS.glsl b/assets/shaders/Chunk_FS.glsl new file mode 100755 index 0000000..fa1d5f6 --- /dev/null +++ b/assets/shaders/Chunk_FS.glsl @@ -0,0 +1,22 @@ +#version 130 +#extension GL_EXT_texture_array : enable + +in vec2 pass_textureCoordinates; +in float visibility; +in float pass_layer; +in float pass_baseLightingValue; + +out vec4 out_Color; + +uniform sampler2DArray modelTexture; +uniform vec3 tint; +uniform vec3 skyColor; + +void main(void){ + vec4 textureColour = texture2DArray(modelTexture,vec3(pass_textureCoordinates, pass_layer)); + if(textureColour.a<0.5) discard; + out_Color = textureColour; + out_Color.rgb += tint.xyz; + out_Color.rgb *= pass_baseLightingValue; + out_Color = mix(vec4(skyColor.x,skyColor.y,skyColor.z,1.0),out_Color, visibility); +} \ No newline at end of file diff --git a/assets/shaders/Chunk_VS.glsl b/assets/shaders/Chunk_VS.glsl new file mode 100755 index 0000000..6c5e3dc --- /dev/null +++ b/assets/shaders/Chunk_VS.glsl @@ -0,0 +1,35 @@ +#version 130 + +in vec3 position; +in vec2 textureCoordinates; +in float baseLightingValue; +in float layer; + +out vec2 pass_textureCoordinates; +out float pass_baseLightingValue; +out float pass_layer; +out float visibility; + +uniform mat4 transformationMatrix; +uniform mat4 projectionMatrix; +uniform mat4 viewMatrix; +uniform vec3 playerPosition; +uniform int renderDistance; + +const float density = 0.5; +const float gradient = 1.5; + +void main(void){ + vec4 worldPosition = transformationMatrix * vec4(position,1.0); + gl_Position = projectionMatrix * viewMatrix * worldPosition; + pass_textureCoordinates = textureCoordinates; + pass_layer = layer; + pass_baseLightingValue = baseLightingValue; + + float distance = sqrt(pow(worldPosition.x - playerPosition.x, 2)+ pow(worldPosition.z - playerPosition.z,2)); + visibility = 1; + if(distance / 16 > renderDistance-2){ + visibility = 1-(distance - (16*(renderDistance-2)))/16.0; + } + visibility = clamp(visibility,0.0,1.0); +} diff --git a/assets/shaders/Font_FS.glsl b/assets/shaders/Font_FS.glsl new file mode 100755 index 0000000..2b6f33b --- /dev/null +++ b/assets/shaders/Font_FS.glsl @@ -0,0 +1,28 @@ +#version 330 + +in vec2 pass_textureCoords; + +out vec4 out_color; + +uniform vec3 color; +uniform sampler2D fontAtlas; + +const float width = 0.5; +const float edge = 0.1; + +const float borderWidth = 0.0; +const float borderEdge = 0.5; + +const vec2 offset = vec2(0, 0.0); + +const vec3 outlineColour = vec3(1.0,0.0,0.0); + +void main(void){ + float distance = 1.0 - texture(fontAtlas, pass_textureCoords).a; + float alpha = 1.0 - smoothstep(width, width + edge, distance); + float distance2 = 1.0 - texture(fontAtlas, pass_textureCoords + offset).a; + float outlineAlpha = 1.0 - smoothstep(borderWidth, borderWidth + borderEdge, distance2); + float overallAlpha = alpha + (1.0 - alpha) * outlineAlpha; + vec3 overallColor = mix(outlineColour, color, alpha / overallAlpha); + out_color = vec4(overallColor, overallAlpha); +} diff --git a/assets/shaders/Font_VS.glsl b/assets/shaders/Font_VS.glsl new file mode 100755 index 0000000..400061e --- /dev/null +++ b/assets/shaders/Font_VS.glsl @@ -0,0 +1,13 @@ +#version 330 + +in vec2 position; +in vec2 textureCoords; + +out vec2 pass_textureCoords; + +uniform vec2 translation; + +void main(void){ + gl_Position = vec4(position + translation * vec2(2.0, -2.0), 0.0, 1.0); + pass_textureCoords = textureCoords; +} diff --git a/assets/shaders/Gui_FS.glsl b/assets/shaders/Gui_FS.glsl new file mode 100755 index 0000000..a9fc342 --- /dev/null +++ b/assets/shaders/Gui_FS.glsl @@ -0,0 +1,11 @@ +#version 140 + +in vec2 textureCoords; + +out vec4 out_Color; + +uniform sampler2D guiTexture; + +void main(void){ + out_Color = texture(guiTexture,vec2(textureCoords.x, textureCoords.y)); +} diff --git a/assets/shaders/Gui_VS.glsl b/assets/shaders/Gui_VS.glsl new file mode 100755 index 0000000..0bd6d2c --- /dev/null +++ b/assets/shaders/Gui_VS.glsl @@ -0,0 +1,12 @@ +#version 140 + +in vec2 position; + +out vec2 textureCoords; + +uniform mat4 transformationMatrix; + +void main(void){ + gl_Position = transformationMatrix * vec4(position.x , position.y, 0.0, 1.0); + textureCoords = vec2((position.x+1.0)/2.0, 1 - (position.y+1.0)/2.0); +} diff --git a/assets/shaders/Quad_FS.glsl b/assets/shaders/Quad_FS.glsl new file mode 100755 index 0000000..b1f17b3 --- /dev/null +++ b/assets/shaders/Quad_FS.glsl @@ -0,0 +1,11 @@ +#version 140 + +in vec2 textureCoords; + +out vec4 out_Color; + +uniform vec4 color; + +void main(void){ + out_Color = color; +} diff --git a/assets/shaders/Quad_VS.glsl b/assets/shaders/Quad_VS.glsl new file mode 100755 index 0000000..0bd6d2c --- /dev/null +++ b/assets/shaders/Quad_VS.glsl @@ -0,0 +1,12 @@ +#version 140 + +in vec2 position; + +out vec2 textureCoords; + +uniform mat4 transformationMatrix; + +void main(void){ + gl_Position = transformationMatrix * vec4(position.x , position.y, 0.0, 1.0); + textureCoords = vec2((position.x+1.0)/2.0, 1 - (position.y+1.0)/2.0); +} diff --git a/assets/sounds/calm1.ogg b/assets/sounds/calm1.ogg new file mode 100755 index 0000000..e76b317 Binary files /dev/null and b/assets/sounds/calm1.ogg differ diff --git a/assets/sounds/calm2.ogg b/assets/sounds/calm2.ogg new file mode 100755 index 0000000..b02df7b Binary files /dev/null and b/assets/sounds/calm2.ogg differ diff --git a/assets/sounds/calm3.ogg b/assets/sounds/calm3.ogg new file mode 100755 index 0000000..a4cfafe Binary files /dev/null and b/assets/sounds/calm3.ogg differ diff --git a/assets/sounds/hal1.ogg b/assets/sounds/hal1.ogg new file mode 100755 index 0000000..bcbe583 Binary files /dev/null and b/assets/sounds/hal1.ogg differ diff --git a/assets/sounds/hal2.ogg b/assets/sounds/hal2.ogg new file mode 100755 index 0000000..3ea6b6f Binary files /dev/null and b/assets/sounds/hal2.ogg differ diff --git a/assets/sounds/hal3.ogg b/assets/sounds/hal3.ogg new file mode 100755 index 0000000..6f8984f Binary files /dev/null and b/assets/sounds/hal3.ogg differ diff --git a/assets/sounds/hal4.ogg b/assets/sounds/hal4.ogg new file mode 100755 index 0000000..e3f8dbf Binary files /dev/null and b/assets/sounds/hal4.ogg differ diff --git a/assets/sounds/nuance1.ogg b/assets/sounds/nuance1.ogg new file mode 100755 index 0000000..853e890 Binary files /dev/null and b/assets/sounds/nuance1.ogg differ diff --git a/assets/sounds/nuance2.ogg b/assets/sounds/nuance2.ogg new file mode 100755 index 0000000..d4942a1 Binary files /dev/null and b/assets/sounds/nuance2.ogg differ diff --git a/assets/sounds/piano1.ogg b/assets/sounds/piano1.ogg new file mode 100755 index 0000000..4c72549 Binary files /dev/null and b/assets/sounds/piano1.ogg differ diff --git a/assets/sounds/piano2.ogg b/assets/sounds/piano2.ogg new file mode 100755 index 0000000..ce138e7 Binary files /dev/null and b/assets/sounds/piano2.ogg differ diff --git a/assets/sounds/piano3.ogg b/assets/sounds/piano3.ogg new file mode 100755 index 0000000..0b91992 Binary files /dev/null and b/assets/sounds/piano3.ogg differ diff --git a/assets/textures/blocks/bricks.png b/assets/textures/blocks/bricks.png new file mode 100755 index 0000000..12032c7 Binary files /dev/null and b/assets/textures/blocks/bricks.png differ diff --git a/assets/textures/blocks/cactus.png b/assets/textures/blocks/cactus.png new file mode 100755 index 0000000..aacd93d Binary files /dev/null and b/assets/textures/blocks/cactus.png differ diff --git a/assets/textures/blocks/cactus_top.png b/assets/textures/blocks/cactus_top.png new file mode 100755 index 0000000..b80cf44 Binary files /dev/null and b/assets/textures/blocks/cactus_top.png differ diff --git a/assets/textures/blocks/chiseled_stone_bricks.png b/assets/textures/blocks/chiseled_stone_bricks.png new file mode 100755 index 0000000..a4b878d Binary files /dev/null and b/assets/textures/blocks/chiseled_stone_bricks.png differ diff --git a/assets/textures/blocks/cobblestone.png b/assets/textures/blocks/cobblestone.png new file mode 100755 index 0000000..73639bc Binary files /dev/null and b/assets/textures/blocks/cobblestone.png differ diff --git a/assets/textures/blocks/cracked_stone_bricks.png b/assets/textures/blocks/cracked_stone_bricks.png new file mode 100755 index 0000000..58db38a Binary files /dev/null and b/assets/textures/blocks/cracked_stone_bricks.png differ diff --git a/assets/textures/blocks/dirt.png b/assets/textures/blocks/dirt.png new file mode 100755 index 0000000..30e57cd Binary files /dev/null and b/assets/textures/blocks/dirt.png differ diff --git a/assets/textures/blocks/glass.png b/assets/textures/blocks/glass.png new file mode 100755 index 0000000..7446d20 Binary files /dev/null and b/assets/textures/blocks/glass.png differ diff --git a/assets/textures/blocks/grass_side.png b/assets/textures/blocks/grass_side.png new file mode 100755 index 0000000..e90fbac Binary files /dev/null and b/assets/textures/blocks/grass_side.png differ diff --git a/assets/textures/blocks/grass_top.png b/assets/textures/blocks/grass_top.png new file mode 100755 index 0000000..0325b9a Binary files /dev/null and b/assets/textures/blocks/grass_top.png differ diff --git a/assets/textures/blocks/leaves.png b/assets/textures/blocks/leaves.png new file mode 100755 index 0000000..14c4bcf Binary files /dev/null and b/assets/textures/blocks/leaves.png differ diff --git a/assets/textures/blocks/mossy_cobblestone.png b/assets/textures/blocks/mossy_cobblestone.png new file mode 100755 index 0000000..4d7d724 Binary files /dev/null and b/assets/textures/blocks/mossy_cobblestone.png differ diff --git a/assets/textures/blocks/mossy_stone_bricks.png b/assets/textures/blocks/mossy_stone_bricks.png new file mode 100755 index 0000000..c54918c Binary files /dev/null and b/assets/textures/blocks/mossy_stone_bricks.png differ diff --git a/assets/textures/blocks/plank.png b/assets/textures/blocks/plank.png new file mode 100755 index 0000000..b210f04 Binary files /dev/null and b/assets/textures/blocks/plank.png differ diff --git a/assets/textures/blocks/sand.png b/assets/textures/blocks/sand.png new file mode 100755 index 0000000..d840293 Binary files /dev/null and b/assets/textures/blocks/sand.png differ diff --git a/assets/textures/blocks/sandstone_bottom.png b/assets/textures/blocks/sandstone_bottom.png new file mode 100755 index 0000000..8ecf00f Binary files /dev/null and b/assets/textures/blocks/sandstone_bottom.png differ diff --git a/assets/textures/blocks/sandstone_side.png b/assets/textures/blocks/sandstone_side.png new file mode 100755 index 0000000..3b15f65 Binary files /dev/null and b/assets/textures/blocks/sandstone_side.png differ diff --git a/assets/textures/blocks/sandstone_top.png b/assets/textures/blocks/sandstone_top.png new file mode 100755 index 0000000..4ba39eb Binary files /dev/null and b/assets/textures/blocks/sandstone_top.png differ diff --git a/assets/textures/blocks/stone.png b/assets/textures/blocks/stone.png new file mode 100755 index 0000000..c988cfc Binary files /dev/null and b/assets/textures/blocks/stone.png differ diff --git a/assets/textures/blocks/stone_bricks.png b/assets/textures/blocks/stone_bricks.png new file mode 100755 index 0000000..ff1e490 Binary files /dev/null and b/assets/textures/blocks/stone_bricks.png differ diff --git a/assets/textures/blocks/water.png b/assets/textures/blocks/water.png new file mode 100755 index 0000000..1991e7b Binary files /dev/null and b/assets/textures/blocks/water.png differ diff --git a/assets/textures/blocks/wood_side.png b/assets/textures/blocks/wood_side.png new file mode 100755 index 0000000..e2da4c5 Binary files /dev/null and b/assets/textures/blocks/wood_side.png differ diff --git a/assets/textures/blocks/wood_top.png b/assets/textures/blocks/wood_top.png new file mode 100755 index 0000000..0615e1a Binary files /dev/null and b/assets/textures/blocks/wood_top.png differ diff --git a/assets/textures/blocks/wool.png b/assets/textures/blocks/wool.png new file mode 100755 index 0000000..0b65f8b Binary files /dev/null and b/assets/textures/blocks/wool.png differ diff --git a/assets/textures/font/yugothic.png b/assets/textures/font/yugothic.png new file mode 100755 index 0000000..cc142b4 Binary files /dev/null and b/assets/textures/font/yugothic.png differ diff --git a/assets/textures/gui/crosshair.png b/assets/textures/gui/crosshair.png new file mode 100755 index 0000000..d9600f7 Binary files /dev/null and b/assets/textures/gui/crosshair.png differ diff --git a/assets/textures/gui/heart_empty.png b/assets/textures/gui/heart_empty.png new file mode 100755 index 0000000..b7447aa Binary files /dev/null and b/assets/textures/gui/heart_empty.png differ diff --git a/assets/textures/gui/heart_full.png b/assets/textures/gui/heart_full.png new file mode 100755 index 0000000..8fe7734 Binary files /dev/null and b/assets/textures/gui/heart_full.png differ diff --git a/assets/textures/gui/heart_half.png b/assets/textures/gui/heart_half.png new file mode 100755 index 0000000..5534cdd Binary files /dev/null and b/assets/textures/gui/heart_half.png differ diff --git a/assets/textures/gui/icon.png b/assets/textures/gui/icon.png new file mode 100755 index 0000000..a9690b9 Binary files /dev/null and b/assets/textures/gui/icon.png differ diff --git a/pom.xml b/pom.xml new file mode 100755 index 0000000..fa96d59 --- /dev/null +++ b/pom.xml @@ -0,0 +1,128 @@ + + 4.0.0 + net.tylermurphy + Minecraft + 1.0 + + + + org.apache.maven.plugins + maven-compiler-plugin + 2.3.2 + + 1.8 + 1.8 + + + + maven-assembly-plugin + + + + net.tylermurphy.Minecraft.Main + + + + jar-with-dependencies + + + + + make-assembly + package + + single + + + + + + + + + clojars.org + http://clojars.org/repo + + + + 3.2.3 + natives-linux + + + + + org.lwjgl + lwjgl-bom + ${lwjgl.version} + import + pom + + + + + + org.lwjgl + lwjgl + + + org.lwjgl + lwjgl-assimp + + + org.lwjgl + lwjgl-glfw + + + org.lwjgl + lwjgl-openal + + + org.lwjgl + lwjgl-opengl + + + org.lwjgl + lwjgl-stb + + + org.lwjgl + lwjgl + ${lwjgl.natives} + + + org.lwjgl + lwjgl-assimp + ${lwjgl.natives} + + + org.lwjgl + lwjgl-glfw + ${lwjgl.natives} + + + org.lwjgl + lwjgl-openal + ${lwjgl.natives} + + + org.lwjgl + lwjgl-opengl + ${lwjgl.natives} + + + org.lwjgl + lwjgl-stb + ${lwjgl.natives} + + + org.json + json + 20210307 + + + org.joml + joml + 1.10.2 + + + diff --git a/src/main/java/net/tylermurphy/Minecraft/Audio/Sound.java b/src/main/java/net/tylermurphy/Minecraft/Audio/Sound.java new file mode 100755 index 0000000..58852da --- /dev/null +++ b/src/main/java/net/tylermurphy/Minecraft/Audio/Sound.java @@ -0,0 +1,82 @@ +package net.tylermurphy.Minecraft.Audio; + +import org.lwjgl.openal.AL10; +import org.lwjgl.system.*; + +import net.tylermurphy.Minecraft.Util.Constants; + +import java.nio.*; + +import static org.lwjgl.openal.AL10.*; +import static org.lwjgl.stb.STBVorbis.*; +import static org.lwjgl.system.MemoryStack.*; +import static org.lwjgl.system.libc.LibCStdlib.*; + +public class Sound { + + int bufferId; + int sourceId; + + protected Sound(String fileName) { + ShortBuffer rawAudioBuffer; + + int channels; + int sampleRate; + + try (MemoryStack stack = stackPush()) { + IntBuffer channelsBuffer = stack.mallocInt(1); + IntBuffer sampleRateBuffer = stack.mallocInt(1); + rawAudioBuffer = stb_vorbis_decode_filename(Constants.OGG_LOCATION + fileName +".ogg", channelsBuffer, sampleRateBuffer); + channels = channelsBuffer.get(0); + sampleRate = sampleRateBuffer.get(0); + } + + int format = -1; + if (channels == 1) { + format = AL_FORMAT_MONO16; + } else if (channels == 2) { + format = AL_FORMAT_STEREO16; + } + + bufferId = alGenBuffers(); + alBufferData(bufferId, format, rawAudioBuffer, sampleRate); + free(rawAudioBuffer); + sourceId = alGenSources(); + alSourcei(sourceId, AL_BUFFER, bufferId); + } + + public void play() { + stop(); + alSourcePlay(sourceId); + } + + public boolean isPlaying() { + return AL10.alGetSourcei(sourceId, AL10.AL_SOURCE_STATE) == AL10.AL_PLAYING; + } + + public void stop() { + alSourceStop(sourceId); + } + + public void pause() { + alSourcePause(sourceId); + } + + public void resume() { + alSourcePlay(sourceId); + } + + public void setPosition(int x,int y,int z) { + AL10.alSource3f(sourceId, AL10.AL_POSITION, x, y, z); + } + + public void setLooping(boolean loop) { + AL10.alSourcei(sourceId, AL10.AL_LOOPING, loop ? 1 : 0); + } + + protected void cleanUp() { + alDeleteSources(sourceId); + alDeleteBuffers(bufferId); + } + +} diff --git a/src/main/java/net/tylermurphy/Minecraft/Audio/SoundManager.java b/src/main/java/net/tylermurphy/Minecraft/Audio/SoundManager.java new file mode 100755 index 0000000..10b7d6d --- /dev/null +++ b/src/main/java/net/tylermurphy/Minecraft/Audio/SoundManager.java @@ -0,0 +1,45 @@ +package net.tylermurphy.Minecraft.Audio; + +import java.util.ArrayList; + +import java.util.List; + +import org.lwjgl.openal.*; + +public class SoundManager { + + private static long device; + private static long context; + private static List sounds; + + public static void init() { + String defaultDeviceName = ALC10.alcGetString(0, ALC10.ALC_DEFAULT_DEVICE_SPECIFIER); + device = ALC10.alcOpenDevice(defaultDeviceName); + int[] attributes = {0}; + context = ALC10.alcCreateContext(device, attributes); + ALC10.alcMakeContextCurrent(context); + ALCCapabilities alcCapabilities = ALC.createCapabilities(device); + AL.createCapabilities(alcCapabilities); + sounds = new ArrayList<>(); + AL11.alDistanceModel(AL11.AL_LINEAR_DISTANCE_CLAMPED); + } + + public static Sound loadSound(String fileName) { + Sound sound = new Sound(fileName); + sounds.add(sound); + return sound; + } + + public static void cleanUp() { + for(Sound sound : sounds) { + sound.cleanUp(); + } + ALC10.alcDestroyContext(context); + ALC10.alcCloseDevice(device); + } + + public static void setListenerData(float x, float y, float z) { + AL10.alListener3f(AL10.AL_POSITION, x, y, z); + AL10.alListener3f(AL10.AL_VELOCITY, 0, 0, 0); + } +} \ No newline at end of file diff --git a/src/main/java/net/tylermurphy/Minecraft/Chunk/Chunk.java b/src/main/java/net/tylermurphy/Minecraft/Chunk/Chunk.java new file mode 100755 index 0000000..f9979e6 --- /dev/null +++ b/src/main/java/net/tylermurphy/Minecraft/Chunk/Chunk.java @@ -0,0 +1,111 @@ +package net.tylermurphy.Minecraft.Chunk; + +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; + +import net.tylermurphy.Minecraft.Gen.WorldGenerator; +import net.tylermurphy.Minecraft.Scene.Objects.Renderable; +import net.tylermurphy.Minecraft.Scene.World; + +public class Chunk { + + private static final ExecutorService threadpool = Executors.newCachedThreadPool(); + + public final int gridX; + public final int gridZ; + public final int chunk_seed; + + public byte[][][] cubes; + + private Renderable chunkRenderable, transparentRenderable; + + private ChunkMesh chunkMesh, transparentChunkMesh; + + private final boolean generate; + private boolean initialized = false; + private boolean updating = true; + private boolean scheduled = false; + private int pendingUpdates = 0; + + public Chunk(int gridX, int gridZ, boolean generate) { + this.gridX = gridX; + this.gridZ = gridZ; + this.generate = generate; + this.chunk_seed = gridX * World.seed ^ gridZ; + cubes = new byte[16][256][16]; + } + + public boolean isSafe() { + return initialized; + } + + public Renderable renderable() { + return chunkRenderable; + } + + public void deleteRenderable(){ + this.chunkRenderable = null; + } + + public Renderable transparentRenderable(){ + return transparentRenderable; + } + + public void deleteTransparentRenderable(){ + this.transparentRenderable = null; + } + + public void scheduleFutureMeshUpdate(){ + this.scheduled = true; + } + + public boolean isScheduled(){ + return scheduled; + } + + public void updateMesh() { + if(!initialized || updating){ + pendingUpdates++; + return; + } + chunkMesh = new ChunkMesh(); + transparentChunkMesh = new ChunkMesh(); + updating = true; + scheduled = false; + pendingUpdates--; + threadpool.submit(() -> { + chunkMesh.update(this, false); + transparentChunkMesh.update(this, true); + }); + } + + public boolean loadMesh() { + if(!initialized || !updating) return false; + if(chunkMesh.completed && transparentChunkMesh.completed) { + if(chunkRenderable != null && chunkRenderable.getMesh() != null) + chunkRenderable.getMesh().delete(); + chunkRenderable = chunkMesh.createChunkMesh(); + chunkMesh = null; + if(transparentRenderable != null && transparentRenderable.getMesh() != null) + transparentRenderable.getMesh().delete(); + transparentRenderable = transparentChunkMesh.createChunkMesh(); + transparentChunkMesh = null; + updating = false; + if(pendingUpdates > 0) updateMesh(); + return true; + } + return false; + } + + public void initialize() { + chunkMesh = new ChunkMesh(); + transparentChunkMesh = new ChunkMesh(); + threadpool.submit(() -> { + if(generate) WorldGenerator.generate(this); + chunkMesh.update(this, false); + transparentChunkMesh.update(this, true); + initialized = true; + }); + } + +} diff --git a/src/main/java/net/tylermurphy/Minecraft/Chunk/ChunkMesh.java b/src/main/java/net/tylermurphy/Minecraft/Chunk/ChunkMesh.java new file mode 100755 index 0000000..093243a --- /dev/null +++ b/src/main/java/net/tylermurphy/Minecraft/Chunk/ChunkMesh.java @@ -0,0 +1,214 @@ +package net.tylermurphy.Minecraft.Chunk; + +import static net.tylermurphy.Minecraft.Chunk.Cube.*; + +import java.util.ArrayList; +import java.util.List; + +import net.tylermurphy.Minecraft.Scene.Objects.Transform; +import org.json.JSONArray; +import org.json.JSONObject; +import org.joml.Vector2f; +import org.joml.Vector3f; + +import net.tylermurphy.Minecraft.Render.Data.Mesh; +import net.tylermurphy.Minecraft.Scene.World; +import net.tylermurphy.Minecraft.Scene.Objects.Renderable; + +public class ChunkMesh { + + private List verticies; + private List tranaparentVerticies; + private List positionsList; + private List normalsList; + private List tcsList; + private List lightingList; + private List layerList; + + public float[] positions, tcs, normals, lighting, layers; + + private Chunk chunk; + + private boolean transparent; + + public boolean completed = false; + + public void update(Chunk chunk, boolean transparent) { + + this.chunk = chunk; + this.transparent = transparent; + this.completed = false; + + verticies = new ArrayList<>(); + tranaparentVerticies = new ArrayList<>(); + positionsList = new ArrayList<>(); + normalsList = new ArrayList<>(); + tcsList = new ArrayList<>(); + lightingList = new ArrayList<>(); + layerList = new ArrayList<>(); + + buildMesh(); + populateLists(); + + this.completed = true; + } + + private void buildMesh() { + for(int x=0;x<16;x++) { + for(int y=0; y<256; y++) { + for(int z=0; z<16; z++) { + + if(chunk.cubes[x][y][z] == AIR) continue; + + if(getBlock(chunk.cubes[x][y][z]).transparent != transparent) continue; + + boolean px = true, nx = true, py = true, ny = true, pz = true, nz = true; + + if(x<15) px = chunk.cubes[x + 1][y][z] != AIR && transparentCheck(x + 1, y, z, x, y, z); + else px = getCube(chunk.gridX + 1, chunk.gridZ, 0, y, z) != AIR && transparentCheck(getCube(chunk.gridX + 1, chunk.gridZ, 0, y, z), x, y, z); + if(x>0) nx = chunk.cubes[x - 1][y][z] != AIR && transparentCheck(x - 1, y, z, x, y, z); + else nx = getCube(chunk.gridX - 1, chunk.gridZ, 15, y, z) != AIR && transparentCheck(getCube(chunk.gridX - 1, chunk.gridZ, 15, y, z), x, y, z); + if(y<255) py = chunk.cubes[x][y + 1][z] != AIR && transparentCheck(x, y + 1, z, x, y, z); + if(y>0) ny = chunk.cubes[x][y - 1][z] != AIR && transparentCheck(x, y - 1, z, x, y, z); + if(z<15) pz = chunk.cubes[x][y][z + 1] != AIR && transparentCheck(x, y, z + 1, x, y, z); + else pz = getCube(chunk.gridX, chunk.gridZ + 1, x, y, 0) != AIR && transparentCheck(getCube(chunk.gridX, chunk.gridZ + 1, x, y, 0), x, y, z); + if(z>0) nz = chunk.cubes[x][y][z - 1] != AIR && transparentCheck(x, y, z - 1, x, y, z); + else nz = getCube(chunk.gridX, chunk.gridZ - 1, x, y, 15) != AIR && transparentCheck(getCube(chunk.gridX, chunk.gridZ - 1, x, y, 15), x, y, z); + + JSONObject positions = getBlock(chunk.cubes[x][y][z]).positions; + if(chunk.cubes[x][y][z]==17 && ( y==255 || chunk.cubes[x][y+1][z] != 17 )) { + + if(y<255) { + byte xp,xn,zp,zn; + + if(x<15) xp = chunk.cubes[x+1][y+1][z]; + else xp = getCube(chunk.gridX+1,chunk.gridZ,0,y+1,z); + if(x<0) xn = chunk.cubes[x-1][y+1][z]; + else xn = getCube(chunk.gridX-1,chunk.gridZ,15,y+1,z); + if(z<15) zp = chunk.cubes[x][y+1][z+1]; + else zp = getCube(chunk.gridX,chunk.gridZ+1,x,y+1,0); + if(z<0) zn = chunk.cubes[x][y+1][z-1]; + else zn = getCube(chunk.gridX,chunk.gridZ-1,x,y+1,15); + + if(xp != 17 && xn != 17 && zp != 17 && zn != 17) { + positions = models.get("water"); + py = false; + } + } else { + positions = models.get("water"); + py = false; + } + + } + + if(getBlock(chunk.cubes[x][y][z]).transparent && chunk.cubes[x][y][z] != 17 && (y == 0 || chunk.cubes[x][y-1][z] == 17)) { + ny = false; + } + + JSONArray PX_POS = positions.getJSONArray("PX_POS"); + JSONArray NX_POS = positions.getJSONArray("NX_POS"); + JSONArray PY_POS = positions.getJSONArray("PY_POS"); + JSONArray NY_POS = positions.getJSONArray("NY_POS"); + JSONArray PZ_POS = positions.getJSONArray("PZ_POS"); + JSONArray NZ_POS = positions.getJSONArray("NZ_POS"); + + if(!px) { for(int i=0;i<6;i++) { verticies.add(new Vertex(new Vector3f((float) PX_POS.getJSONArray(i).getDouble(0) + x, (float) PX_POS.getJSONArray(i).getDouble(1) + y, (float) PX_POS.getJSONArray(i).getDouble(2) + z), TEXTURE_CORDS[i], NORMALS[i], getBlock(chunk.cubes[x][y][z]).tex_px, .9f)); } } + if(!nx) { for(int i=0;i<6;i++) { verticies.add(new Vertex(new Vector3f((float) NX_POS.getJSONArray(i).getDouble(0) + x, (float) NX_POS.getJSONArray(i).getDouble(1) + y, (float) NX_POS.getJSONArray(i).getDouble(2) + z), TEXTURE_CORDS[i], NORMALS[i], getBlock(chunk.cubes[x][y][z]).tex_nx, .9f)); } } + if(!py) { for(int i=0;i<6;i++) { verticies.add(new Vertex(new Vector3f((float) PY_POS.getJSONArray(i).getDouble(0) + x, (float) PY_POS.getJSONArray(i).getDouble(1) + y, (float) PY_POS.getJSONArray(i).getDouble(2) + z), TEXTURE_CORDS[i], NORMALS[i], getBlock(chunk.cubes[x][y][z]).tex_py, 1f)); } } + if(!ny) { for(int i=0;i<6;i++) { verticies.add(new Vertex(new Vector3f((float) NY_POS.getJSONArray(i).getDouble(0) + x, (float) NY_POS.getJSONArray(i).getDouble(1) + y, (float) NY_POS.getJSONArray(i).getDouble(2) + z), TEXTURE_CORDS[i], NORMALS[i], getBlock(chunk.cubes[x][y][z]).tex_ny, 1f)); } } + if(!pz) { for(int i=0;i<6;i++) { verticies.add(new Vertex(new Vector3f((float) PZ_POS.getJSONArray(i).getDouble(0) + x, (float) PZ_POS.getJSONArray(i).getDouble(1) + y, (float) PZ_POS.getJSONArray(i).getDouble(2) + z), TEXTURE_CORDS[i], NORMALS[i], getBlock(chunk.cubes[x][y][z]).tex_pz, .8f)); } } + if(!nz) { for(int i=0;i<6;i++) { verticies.add(new Vertex(new Vector3f((float) NZ_POS.getJSONArray(i).getDouble(0) + x, (float) NZ_POS.getJSONArray(i).getDouble(1) + y, (float) NZ_POS.getJSONArray(i).getDouble(2) + z), TEXTURE_CORDS[i], NORMALS[i], getBlock(chunk.cubes[x][y][z]).tex_nz, .8f)); } } + } + } + } + } + + private byte getCube(int gx, int gz, int x, int y, int z) { + Chunk c = World.getChunk(gx,gz); + if(c == null) return 0; + return c.cubes[x][y][z]; + } + + private boolean transparentCheck(int x1,int y1,int z1,int x2,int y2,int z2) { + return transparentCheck(chunk.cubes[x1][y1][z1], x2, y2, z2); + } + + private boolean transparentCheck(byte block,int x2,int y2,int z2) { + if(getBlock(block).alwaysRenderNeighbors || getBlock(chunk.cubes[x2][y2][z2]).alwaysRenderNeighbors) + return false; + else if(!getBlock(block).transparent && !getBlock(chunk.cubes[x2][y2][z2]).transparent && block == chunk.cubes[x2][y2][z2]) + return true; + else return getBlock(block).transparent == getBlock(chunk.cubes[x2][y2][z2]).transparent || !getBlock(block).transparent; + } + + static class Vertex{ + Vector3f positions; + Vector2f uvs; + Vector3f normals; + float light; + float layer; + Vertex(Vector3f positions, Vector2f uvs, Vector3f normals, float layer, float light){ + this.positions = positions; + this.uvs = uvs; + this.normals = normals; + this.layer = layer; + this.light = light; + } + } + + private void populateLists() { + for(Vertex vertex : verticies) { + positionsList.add(vertex.positions.x); + positionsList.add(vertex.positions.y); + positionsList.add(vertex.positions.z); + tcsList.add(vertex.uvs.x); + tcsList.add(vertex.uvs.y); + normalsList.add(vertex.normals.x); + normalsList.add(vertex.normals.y); + normalsList.add(vertex.normals.z); + lightingList.add(vertex.light); + layerList.add(vertex.layer); + } + + positions = new float[positionsList.size()]; + tcs = new float[tcsList.size()]; + normals = new float[normalsList.size()]; + lighting = new float[lightingList.size()]; + layers = new float[layerList.size()]; + + for(int i=0;i models = new HashMap<>(); + + public static HashMap textures = new HashMap<>(); + public static HashMap texturePairings = new HashMap<>(); + + public static HashMap blocks = new HashMap<>(); + public static HashMap blockPairings = new HashMap<>(); + + public static Cube getBlock(byte b){ + return blocks.get((int) b); + } + + public static Cube getBlock(String s){ + return blocks.get(blockPairings.get(s)); + } + + private static JSONObject loadJsonFile(File file){ + StringBuilder contentBuilder = new StringBuilder(); + try (Stream stream = Files.lines( Paths.get(file.getPath()), StandardCharsets.UTF_8)){ + stream.forEach(s -> contentBuilder.append(s).append("\n")); + } catch (IOException e) { + e.printStackTrace(); + } + return new JSONObject(contentBuilder.toString()); + } + + private static void loadModels(){ + models = new HashMap<>(); + File dir = new File("assets/models"); + File[] directoryListing = dir.listFiles(); + assert directoryListing != null; + for(File file : directoryListing){ + JSONObject json = loadJsonFile(file); + models.put(file.getName().replaceFirst("[.][^.]+$", ""), json); + } + } + + private static void loadTextures(){ + textures = new HashMap<>(); + texturePairings = new HashMap<>(); + File dir = new File("assets/textures/blocks"); + File[] directoryListing = dir.listFiles(); + int i = 0; + assert directoryListing != null; + for(File file : directoryListing){ + String name = file.getName().replaceFirst("[.][^.]+$", ""); + textures.put(i, Texture.loadRawTextureData("blocks/"+name)); + texturePairings.put(name, i); + i++; + } + TEXTURE = Texture.loadTexture2DArray(textures); + } + + private static void loadBlocks(){ + blocks = new HashMap<>(); + blockPairings = new HashMap<>(); + File file = new File("assets/blocks/blocks.json"); + JSONObject json = loadJsonFile(file); + for(String key : json.keySet()){ + String name = json.getString(key); + int id = Integer.parseInt(key); + blockPairings.put(name, id); + File block_file = new File("assets/blocks/" + name + ".json"); + JSONObject block = loadJsonFile(block_file); + blocks.put(id, createCube(name, block)); + } + } + + private static Cube createCube(String name, JSONObject json){ + Cube cube = new Cube(); + cube.positions = models.get(json.getString("model")); + cube.transparent = json.getBoolean("transparent"); + cube.alwaysRenderNeighbors = json.getBoolean("renderNeighbors"); + cube.placeable = json.getBoolean("placeable"); + cube.name = name; + cube.tick_update_delay = 20; + JSONObject textureList = json.getJSONObject("textures"); + if(json.getString("texture").equals("all")){ + cube.tex_px = texturePairings.get(textureList.getString("face")); + cube.tex_nx = texturePairings.get(textureList.getString("face")); + cube.tex_py = texturePairings.get(textureList.getString("face")); + cube.tex_ny = texturePairings.get(textureList.getString("face")); + cube.tex_pz = texturePairings.get(textureList.getString("face")); + cube.tex_nz = texturePairings.get(textureList.getString("face")); + } else if(json.getString("texture").equals("side")){ + cube.tex_px = texturePairings.get(textureList.getString("side")); + cube.tex_nx = texturePairings.get(textureList.getString("side")); + cube.tex_py = texturePairings.get(textureList.getString("top")); + cube.tex_ny = texturePairings.get(textureList.getString("bottom")); + cube.tex_pz = texturePairings.get(textureList.getString("side")); + cube.tex_nz = texturePairings.get(textureList.getString("side")); + } + return cube; + } + + public static void init() { + + loadModels(); + loadTextures(); + loadBlocks(); + + } + + public static Vector3f[] NORMALS = { + + new Vector3f(0.f, 0.f, 0.f), + new Vector3f(0.f, 0.f, 0.f), + new Vector3f(0.f, 0.f, 0.f), + new Vector3f(0.f, 0.f, 0.f), + new Vector3f(0.f, 0.f, 0.f), + new Vector3f(0.f, 0.f, 0.f) + + }; + + public static Vector2f[] TEXTURE_CORDS = { + + new Vector2f(0.f, 0.f), + new Vector2f(0.f, 1.f), + new Vector2f(1.f, 1.f), + new Vector2f(1.f, 1.f), + new Vector2f(1.f, 0.f), + new Vector2f(0.f, 0.f) + + }; + +} diff --git a/src/main/java/net/tylermurphy/Minecraft/Chunk/Generator.java b/src/main/java/net/tylermurphy/Minecraft/Chunk/Generator.java new file mode 100755 index 0000000..395923e --- /dev/null +++ b/src/main/java/net/tylermurphy/Minecraft/Chunk/Generator.java @@ -0,0 +1,35 @@ +package net.tylermurphy.Minecraft.Chunk; + +import net.tylermurphy.Minecraft.Scene.World; + +public class Generator { + + private static void generateLandscape(Chunk c) { + for(int x=0;x<16;x++) { + for(int z=0;z<16;z++) { + + int biome = (int) (PerlinNoise.getNoise(World.seed, c.gridX*16+x, c.gridZ*16+z, PerlinNoise.NoiseType.Cellular)*3)+3; + biome = Math.max(1, Math.min(6, biome)); + + int height1 = (int) (PerlinNoise.getNoise(World.seed, c.gridX*16+x, c.gridZ*16+z, PerlinNoise.NoiseType.PerlinFractal)*biome)+biome; + int height2 = (int) (PerlinNoise.getNoise(World.seed+1, c.gridX*16+x, c.gridZ*16+z, PerlinNoise.NoiseType.Perlin)*biome)+biome; + int height3 = (int) (PerlinNoise.getNoise(World.seed+2, c.gridX*16+x, c.gridZ*16+z, PerlinNoise.NoiseType.Simplex)*biome)+biome; + + int top = 90 + height1 + height2 - height3; + + for(int y=0;y<256;y++) { + if(y= 0 ? (int) f : (int) f - 1); + } + + + private static int FastRound(float f) { + return (f >= 0) ? (int) (f + (float) 0.5) : (int) (f - (float) 0.5); + } + + + private static float Lerp(float a, float b, float t) { + return a + t * (b - a); + } + + + private static float InterpHermiteFunc(float t) { + return t * t * (3 - 2 * t); + } + + + private static float InterpQuinticFunc(float t) { + return t * t * t * (t * (t * 6 - 15) + 10); + } + + + private static float CubicLerp(float a, float b, float c, float d, float t) { + float p = (d - c) - (a - b); + return t * t * t * p + t * t * ((a - b) - p) + t * (c - a) + b; + } + + private void CalculateFractalBounding() { + float amp = m_gain; + float ampFractal = 1; + for (int i = 1; i < m_octaves; i++) { + ampFractal += amp; + amp *= m_gain; + } + m_fractalBounding = 1 / ampFractal; + } + + // Hashing + private final static int X_PRIME = 1619; + private final static int Y_PRIME = 31337; + private final static int Z_PRIME = 6971; + private final static int W_PRIME = 1013; + + private static int Hash2D(int seed, int x, int y) { + int hash = seed; + hash ^= X_PRIME * x; + hash ^= Y_PRIME * y; + + hash = hash * hash * hash * 60493; + hash = (hash >> 13) ^ hash; + + return hash; + } + + private static int Hash3D(int seed, int x, int y, int z) { + int hash = seed; + hash ^= X_PRIME * x; + hash ^= Y_PRIME * y; + hash ^= Z_PRIME * z; + + hash = hash * hash * hash * 60493; + hash = (hash >> 13) ^ hash; + + return hash; + } + + private static float ValCoord2D(int seed, int x, int y) { + int n = seed; + n ^= X_PRIME * x; + n ^= Y_PRIME * y; + + return (n * n * n * 60493) / (float) 2147483648.0; + } + + private static float ValCoord3D(int seed, int x, int y, int z) { + int n = seed; + n ^= X_PRIME * x; + n ^= Y_PRIME * y; + n ^= Z_PRIME * z; + + return (n * n * n * 60493) / (float) 2147483648.0; + } + + private static float ValCoord4D(int seed, int x, int y, int z, int w) { + int n = seed; + n ^= X_PRIME * x; + n ^= Y_PRIME * y; + n ^= Z_PRIME * z; + n ^= W_PRIME * w; + + return (n * n * n * 60493) / (float) 2147483648.0; + } + + private static float GradCoord2D(int seed, int x, int y, float xd, float yd) { + int hash = seed; + hash ^= X_PRIME * x; + hash ^= Y_PRIME * y; + + hash = hash * hash * hash * 60493; + hash = (hash >> 13) ^ hash; + + Float2 g = GRAD_2D[hash & 7]; + + return xd * g.x + yd * g.y; + } + + private static float GradCoord3D(int seed, int x, int y, int z, float xd, float yd, float zd) { + int hash = seed; + hash ^= X_PRIME * x; + hash ^= Y_PRIME * y; + hash ^= Z_PRIME * z; + + hash = hash * hash * hash * 60493; + hash = (hash >> 13) ^ hash; + + Float3 g = GRAD_3D[hash & 15]; + + return xd * g.x + yd * g.y + zd * g.z; + } + + private static float GradCoord4D(int seed, int x, int y, int z, int w, float xd, float yd, float zd, float wd) { + int hash = seed; + hash ^= X_PRIME * x; + hash ^= Y_PRIME * y; + hash ^= Z_PRIME * z; + hash ^= W_PRIME * w; + + hash = hash * hash * hash * 60493; + hash = (hash >> 13) ^ hash; + + hash &= 31; + float a = yd, b = zd, c = wd; // X,Y,Z + switch (hash >> 3) { // OR, DEPENDING ON HIGH ORDER 2 BITS: + case 1: + a = wd; + b = xd; + c = yd; + break; // W,X,Y + case 2: + a = zd; + b = wd; + c = xd; + break; // Z,W,X + case 3: + a = yd; + b = zd; + c = wd; + break; // Y,Z,W + } + return ((hash & 4) == 0 ? -a : a) + ((hash & 2) == 0 ? -b : b) + ((hash & 1) == 0 ? -c : c); + } + + public float GetNoise(float x, float y, float z) { + x *= m_frequency; + y *= m_frequency; + z *= m_frequency; + + switch (m_noiseType) { + case Value: + return SingleValue(m_seed, x, y, z); + case ValueFractal: + switch (m_fractalType) { + case FBM: + return SingleValueFractalFBM(x, y, z); + case Billow: + return SingleValueFractalBillow(x, y, z); + case RigidMulti: + return SingleValueFractalRigidMulti(x, y, z); + default: + return 0; + } + case Perlin: + return SinglePerlin(m_seed, x, y, z); + case PerlinFractal: + switch (m_fractalType) { + case FBM: + return SinglePerlinFractalFBM(x, y, z); + case Billow: + return SinglePerlinFractalBillow(x, y, z); + case RigidMulti: + return SinglePerlinFractalRigidMulti(x, y, z); + default: + return 0; + } + case Simplex: + return SingleSimplex(m_seed, x, y, z); + case SimplexFractal: + switch (m_fractalType) { + case FBM: + return SingleSimplexFractalFBM(x, y, z); + case Billow: + return SingleSimplexFractalBillow(x, y, z); + case RigidMulti: + return SingleSimplexFractalRigidMulti(x, y, z); + default: + return 0; + } + case Cellular: + switch (m_cellularReturnType) { + case CellValue: + case NoiseLookup: + case Distance: + return SingleCellular(x, y, z); + default: + return SingleCellular2Edge(x, y, z); + } + case WhiteNoise: + return GetWhiteNoise(x, y, z); + case Cubic: + return SingleCubic(m_seed, x, y, z); + case CubicFractal: + switch (m_fractalType) { + case FBM: + return SingleCubicFractalFBM(x, y, z); + case Billow: + return SingleCubicFractalBillow(x, y, z); + case RigidMulti: + return SingleCubicFractalRigidMulti(x, y, z); + default: + return 0; + } + default: + return 0; + } + } + + public float GetNoise(float x, float y) { + x *= m_frequency; + y *= m_frequency; + + switch (m_noiseType) { + case Value: + return SingleValue(m_seed, x, y); + case ValueFractal: + switch (m_fractalType) { + case FBM: + return SingleValueFractalFBM(x, y); + case Billow: + return SingleValueFractalBillow(x, y); + case RigidMulti: + return SingleValueFractalRigidMulti(x, y); + default: + return 0; + } + case Perlin: + return SinglePerlin(m_seed, x, y); + case PerlinFractal: + switch (m_fractalType) { + case FBM: + return SinglePerlinFractalFBM(x, y); + case Billow: + return SinglePerlinFractalBillow(x, y); + case RigidMulti: + return SinglePerlinFractalRigidMulti(x, y); + default: + return 0; + } + case Simplex: + return SingleSimplex(m_seed, x, y); + case SimplexFractal: + switch (m_fractalType) { + case FBM: + return SingleSimplexFractalFBM(x, y); + case Billow: + return SingleSimplexFractalBillow(x, y); + case RigidMulti: + return SingleSimplexFractalRigidMulti(x, y); + default: + return 0; + } + case Cellular: + switch (m_cellularReturnType) { + case CellValue: + case NoiseLookup: + case Distance: + return SingleCellular(x, y); + default: + return SingleCellular2Edge(x, y); + } + case WhiteNoise: + return GetWhiteNoise(x, y); + case Cubic: + return SingleCubic(m_seed, x, y); + case CubicFractal: + switch (m_fractalType) { + case FBM: + return SingleCubicFractalFBM(x, y); + case Billow: + return SingleCubicFractalBillow(x, y); + case RigidMulti: + return SingleCubicFractalRigidMulti(x, y); + default: + return 0; + } + default: + return 0; + } + } + + // White Noise + + private int FloatCast2Int(float f) { + int i = Float.floatToRawIntBits(f); + + return i ^ (i >> 16); + } + + public float GetWhiteNoise(float x, float y, float z, float w) { + int xi = FloatCast2Int(x); + int yi = FloatCast2Int(y); + int zi = FloatCast2Int(z); + int wi = FloatCast2Int(w); + + return ValCoord4D(m_seed, xi, yi, zi, wi); + } + + public float GetWhiteNoise(float x, float y, float z) { + int xi = FloatCast2Int(x); + int yi = FloatCast2Int(y); + int zi = FloatCast2Int(z); + + return ValCoord3D(m_seed, xi, yi, zi); + } + + public float GetWhiteNoise(float x, float y) { + int xi = FloatCast2Int(x); + int yi = FloatCast2Int(y); + + return ValCoord2D(m_seed, xi, yi); + } + + public float GetWhiteNoiseInt(int x, int y, int z, int w) { + return ValCoord4D(m_seed, x, y, z, w); + } + + public float GetWhiteNoiseInt(int x, int y, int z) { + return ValCoord3D(m_seed, x, y, z); + } + + public float GetWhiteNoiseInt(int x, int y) { + return ValCoord2D(m_seed, x, y); + } + + // Value Noise + public float GetValueFractal(float x, float y, float z) { + x *= m_frequency; + y *= m_frequency; + z *= m_frequency; + + switch (m_fractalType) { + case FBM: + return SingleValueFractalFBM(x, y, z); + case Billow: + return SingleValueFractalBillow(x, y, z); + case RigidMulti: + return SingleValueFractalRigidMulti(x, y, z); + default: + return 0; + } + } + + private float SingleValueFractalFBM(float x, float y, float z) { + int seed = m_seed; + float sum = SingleValue(seed, x, y, z); + float amp = 1; + + for (int i = 1; i < m_octaves; i++) { + x *= m_lacunarity; + y *= m_lacunarity; + z *= m_lacunarity; + + amp *= m_gain; + sum += SingleValue(++seed, x, y, z) * amp; + } + + return sum * m_fractalBounding; + } + + private float SingleValueFractalBillow(float x, float y, float z) { + int seed = m_seed; + float sum = Math.abs(SingleValue(seed, x, y, z)) * 2 - 1; + float amp = 1; + + for (int i = 1; i < m_octaves; i++) { + x *= m_lacunarity; + y *= m_lacunarity; + z *= m_lacunarity; + + amp *= m_gain; + sum += (Math.abs(SingleValue(++seed, x, y, z)) * 2 - 1) * amp; + } + + return sum * m_fractalBounding; + } + + private float SingleValueFractalRigidMulti(float x, float y, float z) { + int seed = m_seed; + float sum = 1 - Math.abs(SingleValue(seed, x, y, z)); + float amp = 1; + + for (int i = 1; i < m_octaves; i++) { + x *= m_lacunarity; + y *= m_lacunarity; + z *= m_lacunarity; + + amp *= m_gain; + sum -= (1 - Math.abs(SingleValue(++seed, x, y, z))) * amp; + } + + return sum; + } + + public float GetValue(float x, float y, float z) { + return SingleValue(m_seed, x * m_frequency, y * m_frequency, z * m_frequency); + } + + private float SingleValue(int seed, float x, float y, float z) { + int x0 = FastFloor(x); + int y0 = FastFloor(y); + int z0 = FastFloor(z); + int x1 = x0 + 1; + int y1 = y0 + 1; + int z1 = z0 + 1; + + float xs, ys, zs; + switch (m_interp) { + default: + case Linear: + xs = x - x0; + ys = y - y0; + zs = z - z0; + break; + case Hermite: + xs = InterpHermiteFunc(x - x0); + ys = InterpHermiteFunc(y - y0); + zs = InterpHermiteFunc(z - z0); + break; + case Quintic: + xs = InterpQuinticFunc(x - x0); + ys = InterpQuinticFunc(y - y0); + zs = InterpQuinticFunc(z - z0); + break; + } + + float xf00 = Lerp(ValCoord3D(seed, x0, y0, z0), ValCoord3D(seed, x1, y0, z0), xs); + float xf10 = Lerp(ValCoord3D(seed, x0, y1, z0), ValCoord3D(seed, x1, y1, z0), xs); + float xf01 = Lerp(ValCoord3D(seed, x0, y0, z1), ValCoord3D(seed, x1, y0, z1), xs); + float xf11 = Lerp(ValCoord3D(seed, x0, y1, z1), ValCoord3D(seed, x1, y1, z1), xs); + + float yf0 = Lerp(xf00, xf10, ys); + float yf1 = Lerp(xf01, xf11, ys); + + return Lerp(yf0, yf1, zs); + } + + public float GetValueFractal(float x, float y) { + x *= m_frequency; + y *= m_frequency; + + switch (m_fractalType) { + case FBM: + return SingleValueFractalFBM(x, y); + case Billow: + return SingleValueFractalBillow(x, y); + case RigidMulti: + return SingleValueFractalRigidMulti(x, y); + default: + return 0; + } + } + + private float SingleValueFractalFBM(float x, float y) { + int seed = m_seed; + float sum = SingleValue(seed, x, y); + float amp = 1; + + for (int i = 1; i < m_octaves; i++) { + x *= m_lacunarity; + y *= m_lacunarity; + + amp *= m_gain; + sum += SingleValue(++seed, x, y) * amp; + } + + return sum * m_fractalBounding; + } + + private float SingleValueFractalBillow(float x, float y) { + int seed = m_seed; + float sum = Math.abs(SingleValue(seed, x, y)) * 2 - 1; + float amp = 1; + + for (int i = 1; i < m_octaves; i++) { + x *= m_lacunarity; + y *= m_lacunarity; + amp *= m_gain; + sum += (Math.abs(SingleValue(++seed, x, y)) * 2 - 1) * amp; + } + + return sum * m_fractalBounding; + } + + private float SingleValueFractalRigidMulti(float x, float y) { + int seed = m_seed; + float sum = 1 - Math.abs(SingleValue(seed, x, y)); + float amp = 1; + + for (int i = 1; i < m_octaves; i++) { + x *= m_lacunarity; + y *= m_lacunarity; + + amp *= m_gain; + sum -= (1 - Math.abs(SingleValue(++seed, x, y))) * amp; + } + + return sum; + } + + public float GetValue(float x, float y) { + return SingleValue(m_seed, x * m_frequency, y * m_frequency); + } + + private float SingleValue(int seed, float x, float y) { + int x0 = FastFloor(x); + int y0 = FastFloor(y); + int x1 = x0 + 1; + int y1 = y0 + 1; + + float xs, ys; + switch (m_interp) { + default: + case Linear: + xs = x - x0; + ys = y - y0; + break; + case Hermite: + xs = InterpHermiteFunc(x - x0); + ys = InterpHermiteFunc(y - y0); + break; + case Quintic: + xs = InterpQuinticFunc(x - x0); + ys = InterpQuinticFunc(y - y0); + break; + } + + float xf0 = Lerp(ValCoord2D(seed, x0, y0), ValCoord2D(seed, x1, y0), xs); + float xf1 = Lerp(ValCoord2D(seed, x0, y1), ValCoord2D(seed, x1, y1), xs); + + return Lerp(xf0, xf1, ys); + } + + // Gradient Noise + public float GetPerlinFractal(float x, float y, float z) { + x *= m_frequency; + y *= m_frequency; + z *= m_frequency; + + switch (m_fractalType) { + case FBM: + return SinglePerlinFractalFBM(x, y, z); + case Billow: + return SinglePerlinFractalBillow(x, y, z); + case RigidMulti: + return SinglePerlinFractalRigidMulti(x, y, z); + default: + return 0; + } + } + + private float SinglePerlinFractalFBM(float x, float y, float z) { + int seed = m_seed; + float sum = SinglePerlin(seed, x, y, z); + float amp = 1; + + for (int i = 1; i < m_octaves; i++) { + x *= m_lacunarity; + y *= m_lacunarity; + z *= m_lacunarity; + + amp *= m_gain; + sum += SinglePerlin(++seed, x, y, z) * amp; + } + + return sum * m_fractalBounding; + } + + private float SinglePerlinFractalBillow(float x, float y, float z) { + int seed = m_seed; + float sum = Math.abs(SinglePerlin(seed, x, y, z)) * 2 - 1; + float amp = 1; + + for (int i = 1; i < m_octaves; i++) { + x *= m_lacunarity; + y *= m_lacunarity; + z *= m_lacunarity; + + amp *= m_gain; + sum += (Math.abs(SinglePerlin(++seed, x, y, z)) * 2 - 1) * amp; + } + + return sum * m_fractalBounding; + } + + private float SinglePerlinFractalRigidMulti(float x, float y, float z) { + int seed = m_seed; + float sum = 1 - Math.abs(SinglePerlin(seed, x, y, z)); + float amp = 1; + + for (int i = 1; i < m_octaves; i++) { + x *= m_lacunarity; + y *= m_lacunarity; + z *= m_lacunarity; + + amp *= m_gain; + sum -= (1 - Math.abs(SinglePerlin(++seed, x, y, z))) * amp; + } + + return sum; + } + + public float GetPerlin(float x, float y, float z) { + return SinglePerlin(m_seed, x * m_frequency, y * m_frequency, z * m_frequency); + } + + private float SinglePerlin(int seed, float x, float y, float z) { + int x0 = FastFloor(x); + int y0 = FastFloor(y); + int z0 = FastFloor(z); + int x1 = x0 + 1; + int y1 = y0 + 1; + int z1 = z0 + 1; + + float xs, ys, zs; + switch (m_interp) { + default: + case Linear: + xs = x - x0; + ys = y - y0; + zs = z - z0; + break; + case Hermite: + xs = InterpHermiteFunc(x - x0); + ys = InterpHermiteFunc(y - y0); + zs = InterpHermiteFunc(z - z0); + break; + case Quintic: + xs = InterpQuinticFunc(x - x0); + ys = InterpQuinticFunc(y - y0); + zs = InterpQuinticFunc(z - z0); + break; + } + + float xd0 = x - x0; + float yd0 = y - y0; + float zd0 = z - z0; + float xd1 = xd0 - 1; + float yd1 = yd0 - 1; + float zd1 = zd0 - 1; + + float xf00 = Lerp(GradCoord3D(seed, x0, y0, z0, xd0, yd0, zd0), GradCoord3D(seed, x1, y0, z0, xd1, yd0, zd0), xs); + float xf10 = Lerp(GradCoord3D(seed, x0, y1, z0, xd0, yd1, zd0), GradCoord3D(seed, x1, y1, z0, xd1, yd1, zd0), xs); + float xf01 = Lerp(GradCoord3D(seed, x0, y0, z1, xd0, yd0, zd1), GradCoord3D(seed, x1, y0, z1, xd1, yd0, zd1), xs); + float xf11 = Lerp(GradCoord3D(seed, x0, y1, z1, xd0, yd1, zd1), GradCoord3D(seed, x1, y1, z1, xd1, yd1, zd1), xs); + + float yf0 = Lerp(xf00, xf10, ys); + float yf1 = Lerp(xf01, xf11, ys); + + return Lerp(yf0, yf1, zs); + } + + public float GetPerlinFractal(float x, float y) { + x *= m_frequency; + y *= m_frequency; + + switch (m_fractalType) { + case FBM: + return SinglePerlinFractalFBM(x, y); + case Billow: + return SinglePerlinFractalBillow(x, y); + case RigidMulti: + return SinglePerlinFractalRigidMulti(x, y); + default: + return 0; + } + } + + private float SinglePerlinFractalFBM(float x, float y) { + int seed = m_seed; + float sum = SinglePerlin(seed, x, y); + float amp = 1; + + for (int i = 1; i < m_octaves; i++) { + x *= m_lacunarity; + y *= m_lacunarity; + + amp *= m_gain; + sum += SinglePerlin(++seed, x, y) * amp; + } + + return sum * m_fractalBounding; + } + + private float SinglePerlinFractalBillow(float x, float y) { + int seed = m_seed; + float sum = Math.abs(SinglePerlin(seed, x, y)) * 2 - 1; + float amp = 1; + + for (int i = 1; i < m_octaves; i++) { + x *= m_lacunarity; + y *= m_lacunarity; + + amp *= m_gain; + sum += (Math.abs(SinglePerlin(++seed, x, y)) * 2 - 1) * amp; + } + + return sum * m_fractalBounding; + } + + private float SinglePerlinFractalRigidMulti(float x, float y) { + int seed = m_seed; + float sum = 1 - Math.abs(SinglePerlin(seed, x, y)); + float amp = 1; + + for (int i = 1; i < m_octaves; i++) { + x *= m_lacunarity; + y *= m_lacunarity; + + amp *= m_gain; + sum -= (1 - Math.abs(SinglePerlin(++seed, x, y))) * amp; + } + + return sum; + } + + public float GetPerlin(float x, float y) { + return SinglePerlin(m_seed, x * m_frequency, y * m_frequency); + } + + private float SinglePerlin(int seed, float x, float y) { + int x0 = FastFloor(x); + int y0 = FastFloor(y); + int x1 = x0 + 1; + int y1 = y0 + 1; + + float xs, ys; + switch (m_interp) { + default: + case Linear: + xs = x - x0; + ys = y - y0; + break; + case Hermite: + xs = InterpHermiteFunc(x - x0); + ys = InterpHermiteFunc(y - y0); + break; + case Quintic: + xs = InterpQuinticFunc(x - x0); + ys = InterpQuinticFunc(y - y0); + break; + } + + float xd0 = x - x0; + float yd0 = y - y0; + float xd1 = xd0 - 1; + float yd1 = yd0 - 1; + + float xf0 = Lerp(GradCoord2D(seed, x0, y0, xd0, yd0), GradCoord2D(seed, x1, y0, xd1, yd0), xs); + float xf1 = Lerp(GradCoord2D(seed, x0, y1, xd0, yd1), GradCoord2D(seed, x1, y1, xd1, yd1), xs); + + return Lerp(xf0, xf1, ys); + } + + // Simplex Noise + public float GetSimplexFractal(float x, float y, float z) { + x *= m_frequency; + y *= m_frequency; + z *= m_frequency; + + switch (m_fractalType) { + case FBM: + return SingleSimplexFractalFBM(x, y, z); + case Billow: + return SingleSimplexFractalBillow(x, y, z); + case RigidMulti: + return SingleSimplexFractalRigidMulti(x, y, z); + default: + return 0; + } + } + + private float SingleSimplexFractalFBM(float x, float y, float z) { + int seed = m_seed; + float sum = SingleSimplex(seed, x, y, z); + float amp = 1; + + for (int i = 1; i < m_octaves; i++) { + x *= m_lacunarity; + y *= m_lacunarity; + z *= m_lacunarity; + + amp *= m_gain; + sum += SingleSimplex(++seed, x, y, z) * amp; + } + + return sum * m_fractalBounding; + } + + private float SingleSimplexFractalBillow(float x, float y, float z) { + int seed = m_seed; + float sum = Math.abs(SingleSimplex(seed, x, y, z)) * 2 - 1; + float amp = 1; + + for (int i = 1; i < m_octaves; i++) { + x *= m_lacunarity; + y *= m_lacunarity; + z *= m_lacunarity; + + amp *= m_gain; + sum += (Math.abs(SingleSimplex(++seed, x, y, z)) * 2 - 1) * amp; + } + + return sum * m_fractalBounding; + } + + private float SingleSimplexFractalRigidMulti(float x, float y, float z) { + int seed = m_seed; + float sum = 1 - Math.abs(SingleSimplex(seed, x, y, z)); + float amp = 1; + + for (int i = 1; i < m_octaves; i++) { + x *= m_lacunarity; + y *= m_lacunarity; + z *= m_lacunarity; + + amp *= m_gain; + sum -= (1 - Math.abs(SingleSimplex(++seed, x, y, z))) * amp; + } + + return sum; + } + + public float GetSimplex(float x, float y, float z) { + return SingleSimplex(m_seed, x * m_frequency, y * m_frequency, z * m_frequency); + } + + private final static float F3 = (float) (1.0 / 3.0); + private final static float G3 = (float) (1.0 / 6.0); + private final static float G33 = G3 * 3 - 1; + + private float SingleSimplex(int seed, float x, float y, float z) { + float t = (x + y + z) * F3; + int i = FastFloor(x + t); + int j = FastFloor(y + t); + int k = FastFloor(z + t); + + t = (i + j + k) * G3; + float x0 = x - (i - t); + float y0 = y - (j - t); + float z0 = z - (k - t); + + int i1, j1, k1; + int i2, j2, k2; + + if (x0 >= y0) { + if (y0 >= z0) { + i1 = 1; + j1 = 0; + k1 = 0; + i2 = 1; + j2 = 1; + k2 = 0; + } else if (x0 >= z0) { + i1 = 1; + j1 = 0; + k1 = 0; + i2 = 1; + j2 = 0; + k2 = 1; + } else // x0 < z0 + { + i1 = 0; + j1 = 0; + k1 = 1; + i2 = 1; + j2 = 0; + k2 = 1; + } + } else // x0 < y0 + { + if (y0 < z0) { + i1 = 0; + j1 = 0; + k1 = 1; + i2 = 0; + j2 = 1; + k2 = 1; + } else if (x0 < z0) { + i1 = 0; + j1 = 1; + k1 = 0; + i2 = 0; + j2 = 1; + k2 = 1; + } else // x0 >= z0 + { + i1 = 0; + j1 = 1; + k1 = 0; + i2 = 1; + j2 = 1; + k2 = 0; + } + } + + float x1 = x0 - i1 + G3; + float y1 = y0 - j1 + G3; + float z1 = z0 - k1 + G3; + float x2 = x0 - i2 + F3; + float y2 = y0 - j2 + F3; + float z2 = z0 - k2 + F3; + float x3 = x0 + G33; + float y3 = y0 + G33; + float z3 = z0 + G33; + + float n0, n1, n2, n3; + + t = (float) 0.6 - x0 * x0 - y0 * y0 - z0 * z0; + if (t < 0) n0 = 0; + else { + t *= t; + n0 = t * t * GradCoord3D(seed, i, j, k, x0, y0, z0); + } + + t = (float) 0.6 - x1 * x1 - y1 * y1 - z1 * z1; + if (t < 0) n1 = 0; + else { + t *= t; + n1 = t * t * GradCoord3D(seed, i + i1, j + j1, k + k1, x1, y1, z1); + } + + t = (float) 0.6 - x2 * x2 - y2 * y2 - z2 * z2; + if (t < 0) n2 = 0; + else { + t *= t; + n2 = t * t * GradCoord3D(seed, i + i2, j + j2, k + k2, x2, y2, z2); + } + + t = (float) 0.6 - x3 * x3 - y3 * y3 - z3 * z3; + if (t < 0) n3 = 0; + else { + t *= t; + n3 = t * t * GradCoord3D(seed, i + 1, j + 1, k + 1, x3, y3, z3); + } + + return 32 * (n0 + n1 + n2 + n3); + } + + public float GetSimplexFractal(float x, float y) { + x *= m_frequency; + y *= m_frequency; + + switch (m_fractalType) { + case FBM: + return SingleSimplexFractalFBM(x, y); + case Billow: + return SingleSimplexFractalBillow(x, y); + case RigidMulti: + return SingleSimplexFractalRigidMulti(x, y); + default: + return 0; + } + } + + private float SingleSimplexFractalFBM(float x, float y) { + int seed = m_seed; + float sum = SingleSimplex(seed, x, y); + float amp = 1; + + for (int i = 1; i < m_octaves; i++) { + x *= m_lacunarity; + y *= m_lacunarity; + + amp *= m_gain; + sum += SingleSimplex(++seed, x, y) * amp; + } + + return sum * m_fractalBounding; + } + + private float SingleSimplexFractalBillow(float x, float y) { + int seed = m_seed; + float sum = Math.abs(SingleSimplex(seed, x, y)) * 2 - 1; + float amp = 1; + + for (int i = 1; i < m_octaves; i++) { + x *= m_lacunarity; + y *= m_lacunarity; + + amp *= m_gain; + sum += (Math.abs(SingleSimplex(++seed, x, y)) * 2 - 1) * amp; + } + + return sum * m_fractalBounding; + } + + private float SingleSimplexFractalRigidMulti(float x, float y) { + int seed = m_seed; + float sum = 1 - Math.abs(SingleSimplex(seed, x, y)); + float amp = 1; + + for (int i = 1; i < m_octaves; i++) { + x *= m_lacunarity; + y *= m_lacunarity; + + amp *= m_gain; + sum -= (1 - Math.abs(SingleSimplex(++seed, x, y))) * amp; + } + + return sum; + } + + public float GetSimplex(float x, float y) { + return SingleSimplex(m_seed, x * m_frequency, y * m_frequency); + } + + private final static float F2 = (float) (1.0 / 2.0); + private final static float G2 = (float) (1.0 / 4.0); + + private float SingleSimplex(int seed, float x, float y) { + float t = (x + y) * F2; + int i = FastFloor(x + t); + int j = FastFloor(y + t); + + t = (i + j) * G2; + float X0 = i - t; + float Y0 = j - t; + + float x0 = x - X0; + float y0 = y - Y0; + + int i1, j1; + if (x0 > y0) { + i1 = 1; + j1 = 0; + } else { + i1 = 0; + j1 = 1; + } + + float x1 = x0 - i1 + G2; + float y1 = y0 - j1 + G2; + float x2 = x0 - 1 + F2; + float y2 = y0 - 1 + F2; + + float n0, n1, n2; + + t = (float) 0.5 - x0 * x0 - y0 * y0; + if (t < 0) n0 = 0; + else { + t *= t; + n0 = t * t * GradCoord2D(seed, i, j, x0, y0); + } + + t = (float) 0.5 - x1 * x1 - y1 * y1; + if (t < 0) n1 = 0; + else { + t *= t; + n1 = t * t * GradCoord2D(seed, i + i1, j + j1, x1, y1); + } + + t = (float) 0.5 - x2 * x2 - y2 * y2; + if (t < 0) n2 = 0; + else { + t *= t; + n2 = t * t * GradCoord2D(seed, i + 1, j + 1, x2, y2); + } + + return 50 * (n0 + n1 + n2); + } + + public float GetSimplex(float x, float y, float z, float w) { + return SingleSimplex(m_seed, x * m_frequency, y * m_frequency, z * m_frequency, w * m_frequency); + } + + private static final byte[] SIMPLEX_4D = + { + 0, 1, 2, 3, 0, 1, 3, 2, 0, 0, 0, 0, 0, 2, 3, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 3, 0, + 0, 2, 1, 3, 0, 0, 0, 0, 0, 3, 1, 2, 0, 3, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 3, 2, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 1, 2, 0, 3, 0, 0, 0, 0, 1, 3, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 3, 0, 1, 2, 3, 1, 0, + 1, 0, 2, 3, 1, 0, 3, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 3, 1, 0, 0, 0, 0, 2, 1, 3, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 2, 0, 1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 1, 2, 3, 0, 2, 1, 0, 0, 0, 0, 3, 1, 2, 0, + 2, 1, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 1, 0, 2, 0, 0, 0, 0, 3, 2, 0, 1, 3, 2, 1, 0 + }; + + private final static float F4 = (float) ((2.23606797 - 1.0) / 4.0); + private final static float G4 = (float) ((5.0 - 2.23606797) / 20.0); + + private float SingleSimplex(int seed, float x, float y, float z, float w) { + float n0, n1, n2, n3, n4; + float t = (x + y + z + w) * F4; + int i = FastFloor(x + t); + int j = FastFloor(y + t); + int k = FastFloor(z + t); + int l = FastFloor(w + t); + t = (i + j + k + l) * G4; + float X0 = i - t; + float Y0 = j - t; + float Z0 = k - t; + float W0 = l - t; + float x0 = x - X0; + float y0 = y - Y0; + float z0 = z - Z0; + float w0 = w - W0; + + int c = (x0 > y0) ? 32 : 0; + c += (x0 > z0) ? 16 : 0; + c += (y0 > z0) ? 8 : 0; + c += (x0 > w0) ? 4 : 0; + c += (y0 > w0) ? 2 : 0; + c += (z0 > w0) ? 1 : 0; + c <<= 2; + + int i1 = SIMPLEX_4D[c] >= 3 ? 1 : 0; + int i2 = SIMPLEX_4D[c] >= 2 ? 1 : 0; + int i3 = SIMPLEX_4D[c++] >= 1 ? 1 : 0; + int j1 = SIMPLEX_4D[c] >= 3 ? 1 : 0; + int j2 = SIMPLEX_4D[c] >= 2 ? 1 : 0; + int j3 = SIMPLEX_4D[c++] >= 1 ? 1 : 0; + int k1 = SIMPLEX_4D[c] >= 3 ? 1 : 0; + int k2 = SIMPLEX_4D[c] >= 2 ? 1 : 0; + int k3 = SIMPLEX_4D[c++] >= 1 ? 1 : 0; + int l1 = SIMPLEX_4D[c] >= 3 ? 1 : 0; + int l2 = SIMPLEX_4D[c] >= 2 ? 1 : 0; + int l3 = SIMPLEX_4D[c] >= 1 ? 1 : 0; + + float x1 = x0 - i1 + G4; + float y1 = y0 - j1 + G4; + float z1 = z0 - k1 + G4; + float w1 = w0 - l1 + G4; + float x2 = x0 - i2 + 2 * G4; + float y2 = y0 - j2 + 2 * G4; + float z2 = z0 - k2 + 2 * G4; + float w2 = w0 - l2 + 2 * G4; + float x3 = x0 - i3 + 3 * G4; + float y3 = y0 - j3 + 3 * G4; + float z3 = z0 - k3 + 3 * G4; + float w3 = w0 - l3 + 3 * G4; + float x4 = x0 - 1 + 4 * G4; + float y4 = y0 - 1 + 4 * G4; + float z4 = z0 - 1 + 4 * G4; + float w4 = w0 - 1 + 4 * G4; + + t = (float) 0.6 - x0 * x0 - y0 * y0 - z0 * z0 - w0 * w0; + if (t < 0) n0 = 0; + else { + t *= t; + n0 = t * t * GradCoord4D(seed, i, j, k, l, x0, y0, z0, w0); + } + t = (float) 0.6 - x1 * x1 - y1 * y1 - z1 * z1 - w1 * w1; + if (t < 0) n1 = 0; + else { + t *= t; + n1 = t * t * GradCoord4D(seed, i + i1, j + j1, k + k1, l + l1, x1, y1, z1, w1); + } + t = (float) 0.6 - x2 * x2 - y2 * y2 - z2 * z2 - w2 * w2; + if (t < 0) n2 = 0; + else { + t *= t; + n2 = t * t * GradCoord4D(seed, i + i2, j + j2, k + k2, l + l2, x2, y2, z2, w2); + } + t = (float) 0.6 - x3 * x3 - y3 * y3 - z3 * z3 - w3 * w3; + if (t < 0) n3 = 0; + else { + t *= t; + n3 = t * t * GradCoord4D(seed, i + i3, j + j3, k + k3, l + l3, x3, y3, z3, w3); + } + t = (float) 0.6 - x4 * x4 - y4 * y4 - z4 * z4 - w4 * w4; + if (t < 0) n4 = 0; + else { + t *= t; + n4 = t * t * GradCoord4D(seed, i + 1, j + 1, k + 1, l + 1, x4, y4, z4, w4); + } + + return 27 * (n0 + n1 + n2 + n3 + n4); + } + + // Cubic Noise + public float GetCubicFractal(float x, float y, float z) { + x *= m_frequency; + y *= m_frequency; + z *= m_frequency; + + switch (m_fractalType) { + case FBM: + return SingleCubicFractalFBM(x, y, z); + case Billow: + return SingleCubicFractalBillow(x, y, z); + case RigidMulti: + return SingleCubicFractalRigidMulti(x, y, z); + default: + return 0; + } + } + + private float SingleCubicFractalFBM(float x, float y, float z) { + int seed = m_seed; + float sum = SingleCubic(seed, x, y, z); + float amp = 1; + int i = 0; + + while (++i < m_octaves) { + x *= m_lacunarity; + y *= m_lacunarity; + z *= m_lacunarity; + + amp *= m_gain; + sum += SingleCubic(++seed, x, y, z) * amp; + } + + return sum * m_fractalBounding; + } + + private float SingleCubicFractalBillow(float x, float y, float z) { + int seed = m_seed; + float sum = Math.abs(SingleCubic(seed, x, y, z)) * 2 - 1; + float amp = 1; + int i = 0; + + while (++i < m_octaves) { + x *= m_lacunarity; + y *= m_lacunarity; + z *= m_lacunarity; + + amp *= m_gain; + sum += (Math.abs(SingleCubic(++seed, x, y, z)) * 2 - 1) * amp; + } + + return sum * m_fractalBounding; + } + + private float SingleCubicFractalRigidMulti(float x, float y, float z) { + int seed = m_seed; + float sum = 1 - Math.abs(SingleCubic(seed, x, y, z)); + float amp = 1; + int i = 0; + + while (++i < m_octaves) { + x *= m_lacunarity; + y *= m_lacunarity; + z *= m_lacunarity; + + amp *= m_gain; + sum -= (1 - Math.abs(SingleCubic(++seed, x, y, z))) * amp; + } + + return sum; + } + + public float GetCubic(float x, float y, float z) { + return SingleCubic(m_seed, x * m_frequency, y * m_frequency, z * m_frequency); + } + + private final static float CUBIC_3D_BOUNDING = 1 / (float) (1.5 * 1.5 * 1.5); + + private float SingleCubic(int seed, float x, float y, float z) { + int x1 = FastFloor(x); + int y1 = FastFloor(y); + int z1 = FastFloor(z); + + int x0 = x1 - 1; + int y0 = y1 - 1; + int z0 = z1 - 1; + int x2 = x1 + 1; + int y2 = y1 + 1; + int z2 = z1 + 1; + int x3 = x1 + 2; + int y3 = y1 + 2; + int z3 = z1 + 2; + + float xs = x - (float) x1; + float ys = y - (float) y1; + float zs = z - (float) z1; + + return CubicLerp( + CubicLerp( + CubicLerp(ValCoord3D(seed, x0, y0, z0), ValCoord3D(seed, x1, y0, z0), ValCoord3D(seed, x2, y0, z0), ValCoord3D(seed, x3, y0, z0), xs), + CubicLerp(ValCoord3D(seed, x0, y1, z0), ValCoord3D(seed, x1, y1, z0), ValCoord3D(seed, x2, y1, z0), ValCoord3D(seed, x3, y1, z0), xs), + CubicLerp(ValCoord3D(seed, x0, y2, z0), ValCoord3D(seed, x1, y2, z0), ValCoord3D(seed, x2, y2, z0), ValCoord3D(seed, x3, y2, z0), xs), + CubicLerp(ValCoord3D(seed, x0, y3, z0), ValCoord3D(seed, x1, y3, z0), ValCoord3D(seed, x2, y3, z0), ValCoord3D(seed, x3, y3, z0), xs), + ys), + CubicLerp( + CubicLerp(ValCoord3D(seed, x0, y0, z1), ValCoord3D(seed, x1, y0, z1), ValCoord3D(seed, x2, y0, z1), ValCoord3D(seed, x3, y0, z1), xs), + CubicLerp(ValCoord3D(seed, x0, y1, z1), ValCoord3D(seed, x1, y1, z1), ValCoord3D(seed, x2, y1, z1), ValCoord3D(seed, x3, y1, z1), xs), + CubicLerp(ValCoord3D(seed, x0, y2, z1), ValCoord3D(seed, x1, y2, z1), ValCoord3D(seed, x2, y2, z1), ValCoord3D(seed, x3, y2, z1), xs), + CubicLerp(ValCoord3D(seed, x0, y3, z1), ValCoord3D(seed, x1, y3, z1), ValCoord3D(seed, x2, y3, z1), ValCoord3D(seed, x3, y3, z1), xs), + ys), + CubicLerp( + CubicLerp(ValCoord3D(seed, x0, y0, z2), ValCoord3D(seed, x1, y0, z2), ValCoord3D(seed, x2, y0, z2), ValCoord3D(seed, x3, y0, z2), xs), + CubicLerp(ValCoord3D(seed, x0, y1, z2), ValCoord3D(seed, x1, y1, z2), ValCoord3D(seed, x2, y1, z2), ValCoord3D(seed, x3, y1, z2), xs), + CubicLerp(ValCoord3D(seed, x0, y2, z2), ValCoord3D(seed, x1, y2, z2), ValCoord3D(seed, x2, y2, z2), ValCoord3D(seed, x3, y2, z2), xs), + CubicLerp(ValCoord3D(seed, x0, y3, z2), ValCoord3D(seed, x1, y3, z2), ValCoord3D(seed, x2, y3, z2), ValCoord3D(seed, x3, y3, z2), xs), + ys), + CubicLerp( + CubicLerp(ValCoord3D(seed, x0, y0, z3), ValCoord3D(seed, x1, y0, z3), ValCoord3D(seed, x2, y0, z3), ValCoord3D(seed, x3, y0, z3), xs), + CubicLerp(ValCoord3D(seed, x0, y1, z3), ValCoord3D(seed, x1, y1, z3), ValCoord3D(seed, x2, y1, z3), ValCoord3D(seed, x3, y1, z3), xs), + CubicLerp(ValCoord3D(seed, x0, y2, z3), ValCoord3D(seed, x1, y2, z3), ValCoord3D(seed, x2, y2, z3), ValCoord3D(seed, x3, y2, z3), xs), + CubicLerp(ValCoord3D(seed, x0, y3, z3), ValCoord3D(seed, x1, y3, z3), ValCoord3D(seed, x2, y3, z3), ValCoord3D(seed, x3, y3, z3), xs), + ys), + zs) * CUBIC_3D_BOUNDING; + } + + + public float GetCubicFractal(float x, float y) { + x *= m_frequency; + y *= m_frequency; + + switch (m_fractalType) { + case FBM: + return SingleCubicFractalFBM(x, y); + case Billow: + return SingleCubicFractalBillow(x, y); + case RigidMulti: + return SingleCubicFractalRigidMulti(x, y); + default: + return 0; + } + } + + private float SingleCubicFractalFBM(float x, float y) { + int seed = m_seed; + float sum = SingleCubic(seed, x, y); + float amp = 1; + int i = 0; + + while (++i < m_octaves) { + x *= m_lacunarity; + y *= m_lacunarity; + + amp *= m_gain; + sum += SingleCubic(++seed, x, y) * amp; + } + + return sum * m_fractalBounding; + } + + private float SingleCubicFractalBillow(float x, float y) { + int seed = m_seed; + float sum = Math.abs(SingleCubic(seed, x, y)) * 2 - 1; + float amp = 1; + int i = 0; + + while (++i < m_octaves) { + x *= m_lacunarity; + y *= m_lacunarity; + + amp *= m_gain; + sum += (Math.abs(SingleCubic(++seed, x, y)) * 2 - 1) * amp; + } + + return sum * m_fractalBounding; + } + + private float SingleCubicFractalRigidMulti(float x, float y) { + int seed = m_seed; + float sum = 1 - Math.abs(SingleCubic(seed, x, y)); + float amp = 1; + int i = 0; + + while (++i < m_octaves) { + x *= m_lacunarity; + y *= m_lacunarity; + + amp *= m_gain; + sum -= (1 - Math.abs(SingleCubic(++seed, x, y))) * amp; + } + + return sum; + } + + public float GetCubic(float x, float y) { + x *= m_frequency; + y *= m_frequency; + + return SingleCubic(0, x, y); + } + + private final static float CUBIC_2D_BOUNDING = 1 / (float) (1.5 * 1.5); + + private float SingleCubic(int seed, float x, float y) { + int x1 = FastFloor(x); + int y1 = FastFloor(y); + + int x0 = x1 - 1; + int y0 = y1 - 1; + int x2 = x1 + 1; + int y2 = y1 + 1; + int x3 = x1 + 2; + int y3 = y1 + 2; + + float xs = x - (float) x1; + float ys = y - (float) y1; + + return CubicLerp( + CubicLerp(ValCoord2D(seed, x0, y0), ValCoord2D(seed, x1, y0), ValCoord2D(seed, x2, y0), ValCoord2D(seed, x3, y0), + xs), + CubicLerp(ValCoord2D(seed, x0, y1), ValCoord2D(seed, x1, y1), ValCoord2D(seed, x2, y1), ValCoord2D(seed, x3, y1), + xs), + CubicLerp(ValCoord2D(seed, x0, y2), ValCoord2D(seed, x1, y2), ValCoord2D(seed, x2, y2), ValCoord2D(seed, x3, y2), + xs), + CubicLerp(ValCoord2D(seed, x0, y3), ValCoord2D(seed, x1, y3), ValCoord2D(seed, x2, y3), ValCoord2D(seed, x3, y3), + xs), + ys) * CUBIC_2D_BOUNDING; + } + + // Cellular Noise + public float GetCellular(float x, float y, float z) { + x *= m_frequency; + y *= m_frequency; + z *= m_frequency; + + switch (m_cellularReturnType) { + case CellValue: + case NoiseLookup: + case Distance: + return SingleCellular(x, y, z); + default: + return SingleCellular2Edge(x, y, z); + } + } + + private float SingleCellular(float x, float y, float z) { + int xr = FastRound(x); + int yr = FastRound(y); + int zr = FastRound(z); + + float distance = 999999; + int xc = 0, yc = 0, zc = 0; + + switch (m_cellularDistanceFunction) { + case Euclidean: + for (int xi = xr - 1; xi <= xr + 1; xi++) { + for (int yi = yr - 1; yi <= yr + 1; yi++) { + for (int zi = zr - 1; zi <= zr + 1; zi++) { + Float3 vec = CELL_3D[Hash3D(m_seed, xi, yi, zi) & 255]; + + float vecX = xi - x + vec.x; + float vecY = yi - y + vec.y; + float vecZ = zi - z + vec.z; + + float newDistance = vecX * vecX + vecY * vecY + vecZ * vecZ; + + if (newDistance < distance) { + distance = newDistance; + xc = xi; + yc = yi; + zc = zi; + } + } + } + } + break; + case Manhattan: + for (int xi = xr - 1; xi <= xr + 1; xi++) { + for (int yi = yr - 1; yi <= yr + 1; yi++) { + for (int zi = zr - 1; zi <= zr + 1; zi++) { + Float3 vec = CELL_3D[Hash3D(m_seed, xi, yi, zi) & 255]; + + float vecX = xi - x + vec.x; + float vecY = yi - y + vec.y; + float vecZ = zi - z + vec.z; + + float newDistance = Math.abs(vecX) + Math.abs(vecY) + Math.abs(vecZ); + + if (newDistance < distance) { + distance = newDistance; + xc = xi; + yc = yi; + zc = zi; + } + } + } + } + break; + case Natural: + for (int xi = xr - 1; xi <= xr + 1; xi++) { + for (int yi = yr - 1; yi <= yr + 1; yi++) { + for (int zi = zr - 1; zi <= zr + 1; zi++) { + Float3 vec = CELL_3D[Hash3D(m_seed, xi, yi, zi) & 255]; + + float vecX = xi - x + vec.x; + float vecY = yi - y + vec.y; + float vecZ = zi - z + vec.z; + + float newDistance = (Math.abs(vecX) + Math.abs(vecY) + Math.abs(vecZ)) + (vecX * vecX + vecY * vecY + vecZ * vecZ); + + if (newDistance < distance) { + distance = newDistance; + xc = xi; + yc = yi; + zc = zi; + } + } + } + } + break; + } + + switch (m_cellularReturnType) { + case CellValue: + return ValCoord3D(0, xc, yc, zc); + + case NoiseLookup: + Float3 vec = CELL_3D[Hash3D(m_seed, xc, yc, zc) & 255]; + return m_cellularNoiseLookup.GetNoise(xc + vec.x, yc + vec.y, zc + vec.z); + + case Distance: + return distance - 1; + default: + return 0; + } + } + + private float SingleCellular2Edge(float x, float y, float z) { + int xr = FastRound(x); + int yr = FastRound(y); + int zr = FastRound(z); + + float distance = 999999; + float distance2 = 999999; + + switch (m_cellularDistanceFunction) { + case Euclidean: + for (int xi = xr - 1; xi <= xr + 1; xi++) { + for (int yi = yr - 1; yi <= yr + 1; yi++) { + for (int zi = zr - 1; zi <= zr + 1; zi++) { + Float3 vec = CELL_3D[Hash3D(m_seed, xi, yi, zi) & 255]; + + float vecX = xi - x + vec.x; + float vecY = yi - y + vec.y; + float vecZ = zi - z + vec.z; + + float newDistance = vecX * vecX + vecY * vecY + vecZ * vecZ; + + distance2 = Math.max(Math.min(distance2, newDistance), distance); + distance = Math.min(distance, newDistance); + } + } + } + break; + case Manhattan: + for (int xi = xr - 1; xi <= xr + 1; xi++) { + for (int yi = yr - 1; yi <= yr + 1; yi++) { + for (int zi = zr - 1; zi <= zr + 1; zi++) { + Float3 vec = CELL_3D[Hash3D(m_seed, xi, yi, zi) & 255]; + + float vecX = xi - x + vec.x; + float vecY = yi - y + vec.y; + float vecZ = zi - z + vec.z; + + float newDistance = Math.abs(vecX) + Math.abs(vecY) + Math.abs(vecZ); + + distance2 = Math.max(Math.min(distance2, newDistance), distance); + distance = Math.min(distance, newDistance); + } + } + } + break; + case Natural: + for (int xi = xr - 1; xi <= xr + 1; xi++) { + for (int yi = yr - 1; yi <= yr + 1; yi++) { + for (int zi = zr - 1; zi <= zr + 1; zi++) { + Float3 vec = CELL_3D[Hash3D(m_seed, xi, yi, zi) & 255]; + + float vecX = xi - x + vec.x; + float vecY = yi - y + vec.y; + float vecZ = zi - z + vec.z; + + float newDistance = (Math.abs(vecX) + Math.abs(vecY) + Math.abs(vecZ)) + (vecX * vecX + vecY * vecY + vecZ * vecZ); + + distance2 = Math.max(Math.min(distance2, newDistance), distance); + distance = Math.min(distance, newDistance); + } + } + } + break; + default: + break; + } + + switch (m_cellularReturnType) { + case Distance2: + return distance2 - 1; + case Distance2Add: + return distance2 + distance - 1; + case Distance2Sub: + return distance2 - distance - 1; + case Distance2Mul: + return distance2 * distance - 1; + case Distance2Div: + return distance / distance2 - 1; + default: + return 0; + } + } + + public float GetCellular(float x, float y) { + x *= m_frequency; + y *= m_frequency; + + switch (m_cellularReturnType) { + case CellValue: + case NoiseLookup: + case Distance: + return SingleCellular(x, y); + default: + return SingleCellular2Edge(x, y); + } + } + + private float SingleCellular(float x, float y) { + int xr = FastRound(x); + int yr = FastRound(y); + + float distance = 999999; + int xc = 0, yc = 0; + + switch (m_cellularDistanceFunction) { + default: + case Euclidean: + for (int xi = xr - 1; xi <= xr + 1; xi++) { + for (int yi = yr - 1; yi <= yr + 1; yi++) { + Float2 vec = CELL_2D[Hash2D(m_seed, xi, yi) & 255]; + + float vecX = xi - x + vec.x; + float vecY = yi - y + vec.y; + + float newDistance = vecX * vecX + vecY * vecY; + + if (newDistance < distance) { + distance = newDistance; + xc = xi; + yc = yi; + } + } + } + break; + case Manhattan: + for (int xi = xr - 1; xi <= xr + 1; xi++) { + for (int yi = yr - 1; yi <= yr + 1; yi++) { + Float2 vec = CELL_2D[Hash2D(m_seed, xi, yi) & 255]; + + float vecX = xi - x + vec.x; + float vecY = yi - y + vec.y; + + float newDistance = (Math.abs(vecX) + Math.abs(vecY)); + + if (newDistance < distance) { + distance = newDistance; + xc = xi; + yc = yi; + } + } + } + break; + case Natural: + for (int xi = xr - 1; xi <= xr + 1; xi++) { + for (int yi = yr - 1; yi <= yr + 1; yi++) { + Float2 vec = CELL_2D[Hash2D(m_seed, xi, yi) & 255]; + + float vecX = xi - x + vec.x; + float vecY = yi - y + vec.y; + + float newDistance = (Math.abs(vecX) + Math.abs(vecY)) + (vecX * vecX + vecY * vecY); + + if (newDistance < distance) { + distance = newDistance; + xc = xi; + yc = yi; + } + } + } + break; + } + + switch (m_cellularReturnType) { + case CellValue: + return ValCoord2D(0, xc, yc); + + case NoiseLookup: + Float2 vec = CELL_2D[Hash2D(m_seed, xc, yc) & 255]; + return m_cellularNoiseLookup.GetNoise(xc + vec.x, yc + vec.y); + + case Distance: + return distance - 1; + default: + return 0; + } + } + + private float SingleCellular2Edge(float x, float y) { + int xr = FastRound(x); + int yr = FastRound(y); + + float distance = 999999; + float distance2 = 999999; + + switch (m_cellularDistanceFunction) { + default: + case Euclidean: + for (int xi = xr - 1; xi <= xr + 1; xi++) { + for (int yi = yr - 1; yi <= yr + 1; yi++) { + Float2 vec = CELL_2D[Hash2D(m_seed, xi, yi) & 255]; + + float vecX = xi - x + vec.x; + float vecY = yi - y + vec.y; + + float newDistance = vecX * vecX + vecY * vecY; + + distance2 = Math.max(Math.min(distance2, newDistance), distance); + distance = Math.min(distance, newDistance); + } + } + break; + case Manhattan: + for (int xi = xr - 1; xi <= xr + 1; xi++) { + for (int yi = yr - 1; yi <= yr + 1; yi++) { + Float2 vec = CELL_2D[Hash2D(m_seed, xi, yi) & 255]; + + float vecX = xi - x + vec.x; + float vecY = yi - y + vec.y; + + float newDistance = Math.abs(vecX) + Math.abs(vecY); + + distance2 = Math.max(Math.min(distance2, newDistance), distance); + distance = Math.min(distance, newDistance); + } + } + break; + case Natural: + for (int xi = xr - 1; xi <= xr + 1; xi++) { + for (int yi = yr - 1; yi <= yr + 1; yi++) { + Float2 vec = CELL_2D[Hash2D(m_seed, xi, yi) & 255]; + + float vecX = xi - x + vec.x; + float vecY = yi - y + vec.y; + + float newDistance = (Math.abs(vecX) + Math.abs(vecY)) + (vecX * vecX + vecY * vecY); + + distance2 = Math.max(Math.min(distance2, newDistance), distance); + distance = Math.min(distance, newDistance); + } + } + break; + } + + switch (m_cellularReturnType) { + case Distance2: + return distance2 - 1; + case Distance2Add: + return distance2 + distance - 1; + case Distance2Sub: + return distance2 - distance - 1; + case Distance2Mul: + return distance2 * distance - 1; + case Distance2Div: + return distance / distance2 - 1; + default: + return 0; + } + } + + public void GradientPerturb(Vector3f v3) { + SingleGradientPerturb(m_seed, m_gradientPerturbAmp, m_frequency, v3); + } + + public void GradientPerturbFractal(Vector3f v3) { + int seed = m_seed; + float amp = m_gradientPerturbAmp * m_fractalBounding; + float freq = m_frequency; + + SingleGradientPerturb(seed, amp, m_frequency, v3); + + for (int i = 1; i < m_octaves; i++) { + freq *= m_lacunarity; + amp *= m_gain; + SingleGradientPerturb(++seed, amp, freq, v3); + } + } + + private void SingleGradientPerturb(int seed, float perturbAmp, float frequency, Vector3f v3) { + float xf = v3.x * frequency; + float yf = v3.y * frequency; + float zf = v3.z * frequency; + + int x0 = FastFloor(xf); + int y0 = FastFloor(yf); + int z0 = FastFloor(zf); + int x1 = x0 + 1; + int y1 = y0 + 1; + int z1 = z0 + 1; + + float xs, ys, zs; + switch (m_interp) { + default: + case Linear: + xs = xf - x0; + ys = yf - y0; + zs = zf - z0; + break; + case Hermite: + xs = InterpHermiteFunc(xf - x0); + ys = InterpHermiteFunc(yf - y0); + zs = InterpHermiteFunc(zf - z0); + break; + case Quintic: + xs = InterpQuinticFunc(xf - x0); + ys = InterpQuinticFunc(yf - y0); + zs = InterpQuinticFunc(zf - z0); + break; + } + + Float3 vec0 = CELL_3D[Hash3D(seed, x0, y0, z0) & 255]; + Float3 vec1 = CELL_3D[Hash3D(seed, x1, y0, z0) & 255]; + + float lx0x = Lerp(vec0.x, vec1.x, xs); + float ly0x = Lerp(vec0.y, vec1.y, xs); + float lz0x = Lerp(vec0.z, vec1.z, xs); + + vec0 = CELL_3D[Hash3D(seed, x0, y1, z0) & 255]; + vec1 = CELL_3D[Hash3D(seed, x1, y1, z0) & 255]; + + float lx1x = Lerp(vec0.x, vec1.x, xs); + float ly1x = Lerp(vec0.y, vec1.y, xs); + float lz1x = Lerp(vec0.z, vec1.z, xs); + + float lx0y = Lerp(lx0x, lx1x, ys); + float ly0y = Lerp(ly0x, ly1x, ys); + float lz0y = Lerp(lz0x, lz1x, ys); + + vec0 = CELL_3D[Hash3D(seed, x0, y0, z1) & 255]; + vec1 = CELL_3D[Hash3D(seed, x1, y0, z1) & 255]; + + lx0x = Lerp(vec0.x, vec1.x, xs); + ly0x = Lerp(vec0.y, vec1.y, xs); + lz0x = Lerp(vec0.z, vec1.z, xs); + + vec0 = CELL_3D[Hash3D(seed, x0, y1, z1) & 255]; + vec1 = CELL_3D[Hash3D(seed, x1, y1, z1) & 255]; + + lx1x = Lerp(vec0.x, vec1.x, xs); + ly1x = Lerp(vec0.y, vec1.y, xs); + lz1x = Lerp(vec0.z, vec1.z, xs); + + v3.x += Lerp(lx0y, Lerp(lx0x, lx1x, ys), zs) * perturbAmp; + v3.y += Lerp(ly0y, Lerp(ly0x, ly1x, ys), zs) * perturbAmp; + v3.z += Lerp(lz0y, Lerp(lz0x, lz1x, ys), zs) * perturbAmp; + } + + public void GradientPerturb(Vector2f v2) { + SingleGradientPerturb(m_seed, m_gradientPerturbAmp, m_frequency, v2); + } + + public void GradientPerturbFractal(Vector2f v2) { + int seed = m_seed; + float amp = m_gradientPerturbAmp * m_fractalBounding; + float freq = m_frequency; + + SingleGradientPerturb(seed, amp, m_frequency, v2); + + for (int i = 1; i < m_octaves; i++) { + freq *= m_lacunarity; + amp *= m_gain; + SingleGradientPerturb(++seed, amp, freq, v2); + } + } + + private void SingleGradientPerturb(int seed, float perturbAmp, float frequency, Vector2f v2) { + float xf = v2.x * frequency; + float yf = v2.y * frequency; + + int x0 = FastFloor(xf); + int y0 = FastFloor(yf); + int x1 = x0 + 1; + int y1 = y0 + 1; + + float xs, ys; + switch (m_interp) { + default: + case Linear: + xs = xf - x0; + ys = yf - y0; + break; + case Hermite: + xs = InterpHermiteFunc(xf - x0); + ys = InterpHermiteFunc(yf - y0); + break; + case Quintic: + xs = InterpQuinticFunc(xf - x0); + ys = InterpQuinticFunc(yf - y0); + break; + } + + Float2 vec0 = CELL_2D[Hash2D(seed, x0, y0) & 255]; + Float2 vec1 = CELL_2D[Hash2D(seed, x1, y0) & 255]; + + float lx0x = Lerp(vec0.x, vec1.x, xs); + float ly0x = Lerp(vec0.y, vec1.y, xs); + + vec0 = CELL_2D[Hash2D(seed, x0, y1) & 255]; + vec1 = CELL_2D[Hash2D(seed, x1, y1) & 255]; + + float lx1x = Lerp(vec0.x, vec1.x, xs); + float ly1x = Lerp(vec0.y, vec1.y, xs); + + v2.x += Lerp(lx0x, lx1x, ys) * perturbAmp; + v2.y += Lerp(ly0x, ly1x, ys) * perturbAmp; + } + +} \ No newline at end of file diff --git a/src/main/java/net/tylermurphy/Minecraft/Command/CommandHandler.java b/src/main/java/net/tylermurphy/Minecraft/Command/CommandHandler.java new file mode 100755 index 0000000..c289604 --- /dev/null +++ b/src/main/java/net/tylermurphy/Minecraft/Command/CommandHandler.java @@ -0,0 +1,37 @@ +package net.tylermurphy.Minecraft.Command; + +import net.tylermurphy.Minecraft.Command.Commands.Teleport; + +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.regex.Pattern; + + +public class CommandHandler { + + public final static Map REGISTER = new HashMap<>(); + + public static void registerCommands() { + register(new Teleport()); + } + + private static void register(ICommand command) { + if (!REGISTER.containsKey(command.getInvoke())) { + REGISTER.put(command.getInvoke().toLowerCase(), command); + } + } + + public static void handleCommand(String text) { + final String[] split = text.replaceFirst( + "(?i)" + Pattern.quote("/"), "").split("\\s+"); + final String invoke = split[0].toLowerCase(); + if(REGISTER.containsKey(invoke)) { + ICommand command = REGISTER.get(invoke); + final List args = Arrays.asList(split).subList(1, split.length); + command.invoke(args); + } + } + +} diff --git a/src/main/java/net/tylermurphy/Minecraft/Command/Commands/Teleport.java b/src/main/java/net/tylermurphy/Minecraft/Command/Commands/Teleport.java new file mode 100755 index 0000000..a48955c --- /dev/null +++ b/src/main/java/net/tylermurphy/Minecraft/Command/Commands/Teleport.java @@ -0,0 +1,30 @@ +package net.tylermurphy.Minecraft.Command.Commands; + +import java.util.List; + +import org.joml.Vector3f; + +import net.tylermurphy.Minecraft.Command.ICommand; +import net.tylermurphy.Minecraft.Scene.World; + +public class Teleport implements ICommand { + + public void invoke(List args) { + if(args.size() < 3) return; + float x,y,z; + try { + x = Float.parseFloat(args.get(0)); + y = Float.parseFloat(args.get(1)); + z = Float.parseFloat(args.get(2)); + } catch (Exception e) { + return; + } + + World.player.getTransform().setGlobalPosition(new Vector3f(x,y,z)); + } + + public String getInvoke() { + return "tp"; + } + +} diff --git a/src/main/java/net/tylermurphy/Minecraft/Command/ICommand.java b/src/main/java/net/tylermurphy/Minecraft/Command/ICommand.java new file mode 100755 index 0000000..c3b85d3 --- /dev/null +++ b/src/main/java/net/tylermurphy/Minecraft/Command/ICommand.java @@ -0,0 +1,11 @@ +package net.tylermurphy.Minecraft.Command; + +import java.util.List; + +public interface ICommand { + + public void invoke(List args); + + public String getInvoke(); + +} diff --git a/src/main/java/net/tylermurphy/Minecraft/Gen/WorldGenerator.java b/src/main/java/net/tylermurphy/Minecraft/Gen/WorldGenerator.java new file mode 100755 index 0000000..b912ccd --- /dev/null +++ b/src/main/java/net/tylermurphy/Minecraft/Gen/WorldGenerator.java @@ -0,0 +1,112 @@ +package net.tylermurphy.Minecraft.Gen; + +import net.tylermurphy.Minecraft.Chunk.Chunk; +import net.tylermurphy.Minecraft.Chunk.PerlinNoise; +import net.tylermurphy.Minecraft.Scene.World; + +public class WorldGenerator { + + private static int OCTAVES = 2; + private static int AMPLITUDE = 10; + private static int ROUGHNESS = 3; + + public static int generateHeight(int x, int z) { + float total = 0; + float d = (float) Math.pow(2, OCTAVES-1); + for(int i=0;i2 && top > 90) { + c.cubes[x][top+1][z] = 15; + c.cubes[x][top+2][z] = 15; + c.cubes[x][top+3][z] = 15; + } + } else { + if(n1*n2/n4*n3>2 && top > 90) { + if(x < 1 || x > 14 || z < 1 || z > 14) continue; + c.cubes[x][top+1][z] = 10; + c.cubes[x][top+2][z] = 10; + c.cubes[x][top+3][z] = 10; + + c.cubes[x-1][top+3][z] = 12; + c.cubes[x-1][top+3][z+1] = 12; + c.cubes[x][top+3][z+1] = 12; + c.cubes[x+1][top+3][z+1] = 12; + c.cubes[x+1][top+3][z] = 12; + c.cubes[x+1][top+3][z-1] = 12; + c.cubes[x][top+3][z-1] = 12; + c.cubes[x-1][top+3][z-1] = 12; + + c.cubes[x+1][top+4][z] = 12; + c.cubes[x-1][top+4][z] = 12; + c.cubes[x][top+4][z+1] = 12; + c.cubes[x][top+4][z-1] = 12; + c.cubes[x][top+4][z] = 12; + } + } + } + } + } + + public static void generate(Chunk c) { + generateLandscape(c); + generateNature(c); + } + +} diff --git a/src/main/java/net/tylermurphy/Minecraft/Input/CommandInput.java b/src/main/java/net/tylermurphy/Minecraft/Input/CommandInput.java new file mode 100755 index 0000000..85540ab --- /dev/null +++ b/src/main/java/net/tylermurphy/Minecraft/Input/CommandInput.java @@ -0,0 +1,57 @@ +package net.tylermurphy.Minecraft.Input; + +import org.lwjgl.glfw.GLFW; + +import net.tylermurphy.Minecraft.Command.CommandHandler; +import net.tylermurphy.Minecraft.Scene.World; + +import static net.tylermurphy.Minecraft.UI.UIMaster.*; + +public class CommandInput extends IInput { + + public void keyPressed(int keyCode) { + switch(keyCode) { + case GLFW.GLFW_KEY_ESCAPE: + Input.setEnabled("CommandInput", false); + Input.setEnabled("GameInput", true); + bindUI(3); + setEnabled(false); + getText("commandBar").setText(""); + World.player.isPaused = false; + break; + case GLFW.GLFW_KEY_BACKSPACE: + bindUI(3); + String currentText = getText("commandBar").getTextString(); + if(currentText.length() > 0) + getText("commandBar").setText(currentText.substring(0,currentText.length()-1)); + break; + case GLFW.GLFW_KEY_ENTER: + bindUI(3); + setEnabled(false); + + String command = getText("commandBar").getTextString(); + CommandHandler.handleCommand(command); + + Input.setEnabled("CommandInput", false); + Input.setEnabled("GameInput", true); + getText("commandBar").setText(""); + World.player.isPaused = false; + break; + } + } + + public void keyRelesed(int keyCode) {} + + public void mousePressed(int mouseButton) {} + + public void mouseRelesed(int mouseButton) {} + + public void charAction(char c) { + bindUI(3); + String currentText = getText("commandBar").getTextString(); + + currentText += c; + getText("commandBar").setText(currentText); + } + +} diff --git a/src/main/java/net/tylermurphy/Minecraft/Input/CoreInput.java b/src/main/java/net/tylermurphy/Minecraft/Input/CoreInput.java new file mode 100755 index 0000000..2732805 --- /dev/null +++ b/src/main/java/net/tylermurphy/Minecraft/Input/CoreInput.java @@ -0,0 +1,25 @@ +package net.tylermurphy.Minecraft.Input; + +import org.lwjgl.glfw.GLFW; + +import net.tylermurphy.Minecraft.Render.Data.Display; + +public class CoreInput extends IInput { + + public void keyPressed(int keyCode) { + switch(keyCode) { + case GLFW.GLFW_KEY_F11: + Display.setFullScreen(!Display.fullscreen); + break; + } + } + + public void keyRelesed(int keyCode) {} + + public void mousePressed(int mouseButton) {} + + public void mouseRelesed(int mouseButton) {} + + public void charAction(char c) {} + +} diff --git a/src/main/java/net/tylermurphy/Minecraft/Input/GameInput.java b/src/main/java/net/tylermurphy/Minecraft/Input/GameInput.java new file mode 100755 index 0000000..5da40a6 --- /dev/null +++ b/src/main/java/net/tylermurphy/Minecraft/Input/GameInput.java @@ -0,0 +1,85 @@ +package net.tylermurphy.Minecraft.Input; + +import static net.tylermurphy.Minecraft.UI.UIMaster.*; + +import net.tylermurphy.Minecraft.Scene.Objects.WorldOrigin; +import org.lwjgl.glfw.GLFW; +import org.joml.Vector3f; + +import net.tylermurphy.Minecraft.Chunk.Cube; +import net.tylermurphy.Minecraft.Scene.World; +import net.tylermurphy.Minecraft.Util.Flags; +import net.tylermurphy.Minecraft.Util.MousePicker; + +public class GameInput extends IInput { + + byte blockId = 1; + + public void keyPressed(int keyCode) { + switch(keyCode) { + case GLFW.GLFW_KEY_ESCAPE: + Flags.actionForceClose = true; break; + case GLFW.GLFW_KEY_F3: + bindUI(1); + setEnabled(!isEnabled()); + break; + case GLFW.GLFW_KEY_EQUAL: + do { + blockId++; + if (blockId > (byte) (Cube.blocks.size() - 1)) blockId = 0; + } while (!Cube.getBlock(blockId).placeable); + bindUI(1); + getText("block").setText("Block Selected: minecraft:"+Cube.getBlock(blockId).name); + break; + case GLFW.GLFW_KEY_MINUS: + do { + blockId--; + if (blockId < 0) blockId = (byte) (Cube.blocks.size() - 1); + } while (!Cube.getBlock(blockId).placeable); + bindUI(1); + getText("block").setText("Block Selected: minecraft:"+Cube.getBlock(blockId).name); + break; + case GLFW.GLFW_KEY_F2: + World.player.isFlying = !World.player.isFlying; + break; + case GLFW.GLFW_KEY_K: + if(World.player.isDead) { + World.player.isDead = false; + World.player.health = 20; + World.world_origin = new WorldOrigin(0,0); + World.player.getTransform().setPosition(new Vector3f(0, World.getHighestBlock(0, 0)+1,0)); + bindUI(0); + getText("dead").setEnabled(false); + getImage("crosshair").setEnabled(true); + } + break; + case GLFW.GLFW_KEY_SLASH: + this.enabled = false; + Input.setEnabled("CommandInput", true); + bindUI(3); + setEnabled(true); + World.player.isPaused = true; + break; + } + } + + public void keyRelesed(int keyCode) {} + + public void mousePressed(int mouseButton) { + switch(mouseButton) { + case GLFW.GLFW_MOUSE_BUTTON_1: + if(MousePicker.breakPos!=null) + World.setBlock((int)MousePicker.breakPos.x,(int)MousePicker.breakPos.y,(int)MousePicker.breakPos.z, Cube.AIR); + break; + case GLFW.GLFW_MOUSE_BUTTON_2: + if(MousePicker.placePos!=null && !World.player.collides(MousePicker.placePos.x,MousePicker.placePos.y,MousePicker.placePos.z)) + World.setBlock((int)MousePicker.placePos.x,(int)MousePicker.placePos.y,(int)MousePicker.placePos.z, blockId); + break; + } + } + + public void mouseRelesed(int mouseButton) {} + + public void charAction(char c) {} + +} diff --git a/src/main/java/net/tylermurphy/Minecraft/Input/IInput.java b/src/main/java/net/tylermurphy/Minecraft/Input/IInput.java new file mode 100755 index 0000000..0eb48e7 --- /dev/null +++ b/src/main/java/net/tylermurphy/Minecraft/Input/IInput.java @@ -0,0 +1,12 @@ +package net.tylermurphy.Minecraft.Input; + +public abstract class IInput { + + public boolean enabled = true; + + public abstract void keyPressed(int keyCode); + public abstract void keyRelesed(int keyCode); + public abstract void mousePressed(int mouseButton); + public abstract void mouseRelesed(int mouseButton); + public abstract void charAction(char c); +} \ No newline at end of file diff --git a/src/main/java/net/tylermurphy/Minecraft/Input/Input.java b/src/main/java/net/tylermurphy/Minecraft/Input/Input.java new file mode 100755 index 0000000..86deb12 --- /dev/null +++ b/src/main/java/net/tylermurphy/Minecraft/Input/Input.java @@ -0,0 +1,154 @@ +package net.tylermurphy.Minecraft.Input; + +import java.util.ArrayList; +import java.util.List; + +import org.lwjgl.glfw.GLFW; +import org.lwjgl.glfw.GLFWCursorPosCallback; +import org.lwjgl.glfw.GLFWKeyCallback; +import org.lwjgl.glfw.GLFWMouseButtonCallback; + +import org.lwjgl.glfw.GLFWCharCallback; + +public class Input { + + private static List inputs = new ArrayList(); + + private static boolean[] keys = new boolean[GLFW.GLFW_KEY_LAST]; + private static boolean[] mouseButtons = new boolean[GLFW.GLFW_MOUSE_BUTTON_LAST]; + private static double mouseX, mouseY; + private static double mouseX_last, mouseY_last; + + private static GLFWKeyCallback keyboard; + private static GLFWCursorPosCallback mouseMove; + private static GLFWMouseButtonCallback mouseButton; + private static GLFWCharCallback character; + + public static void init() { + + keyboard = new GLFWKeyCallback() { + public void invoke(long window, int key, int scancode, int action, int mods) { + switch(action) { + case GLFW.GLFW_PRESS: + keys[key] = true; + for(IInput input : inputs) { + if(!input.enabled) continue; + input.keyPressed(key); + } + break; + case GLFW.GLFW_RELEASE: + keys[key] = false; + for(IInput input : inputs) { + if(!input.enabled) continue; + input.keyRelesed(key); + } + break; + } + + } + }; + + mouseMove = new GLFWCursorPosCallback() { + public void invoke(long window, double xPos, double yPos) { + mouseX = xPos; mouseY = yPos; + } + }; + + mouseButton = new GLFWMouseButtonCallback() { + public void invoke(long window, int button, int action, int mods) { + switch(action) { + case GLFW.GLFW_PRESS: + mouseButtons[button] = true; + for(IInput input : inputs) { + if(!input.enabled) continue; + input.mousePressed(button); + } + break; + case GLFW.GLFW_RELEASE: + mouseButtons[button] = false; + for(IInput input : inputs) { + if(!input.enabled) continue; + input.mouseRelesed(button); + } + break; + } + } + }; + + character = new GLFWCharCallback() { + public void invoke(long window, int key) { + for(IInput input : inputs) { + if(!input.enabled) continue; + input.charAction((char)key); + } + } + }; + } + + public static void addInput(IInput input) { + inputs.add(input); + } + + public static void destroy() { + keyboard.free(); + mouseMove.free(); + mouseButton.free(); + character.free(); + } + + public static boolean isKeyDown(int key) { + return keys[key]; + } + + public static boolean isButtonDown(int button) { + return mouseButtons[button]; + } + + public static double getMouseX() { + return mouseX; + } + + public static double getMouseY() { + return mouseY; + } + + public static double getMouseDX() { + double d = -(mouseX_last - mouseX); + mouseX_last = mouseX; + return d; + } + + public static double getMouseDY() { + double d = mouseY_last - mouseY; + mouseY_last = mouseY; + return d; + } + + public static GLFWKeyCallback getKeyboardCallback() { + return keyboard; + } + + public static GLFWCursorPosCallback getMouseMoveCallback() { + return mouseMove; + } + + public static GLFWMouseButtonCallback getMouseButtonCallback() { + return mouseButton; + } + + public static GLFWCharCallback getCharCallback() { + return character; + } + + public static void setEnabled(String className, boolean enabled) { + for(IInput input : inputs) { + String fullName = input.getClass().getTypeName(); + fullName = fullName.substring(fullName.lastIndexOf(".")+1,fullName.length()); + if(className.equals(fullName)) { + input.enabled = enabled; + } + } + } + + +} diff --git a/src/main/java/net/tylermurphy/Minecraft/Main.java b/src/main/java/net/tylermurphy/Minecraft/Main.java new file mode 100755 index 0000000..ea10bd9 --- /dev/null +++ b/src/main/java/net/tylermurphy/Minecraft/Main.java @@ -0,0 +1,95 @@ +package net.tylermurphy.Minecraft; + +import java.util.ArrayList; +import java.util.List; + +import net.tylermurphy.Minecraft.Audio.SoundManager; +import net.tylermurphy.Minecraft.Chunk.Cube; +import net.tylermurphy.Minecraft.Command.CommandHandler; +import net.tylermurphy.Minecraft.Input.*; +import net.tylermurphy.Minecraft.Render.MainRenderer; +import net.tylermurphy.Minecraft.Render.Data.Texture; +import net.tylermurphy.Minecraft.Scripts.*; +import net.tylermurphy.Minecraft.Render.Data.Display; +import net.tylermurphy.Minecraft.Util.Flags; + +public class Main { + + private static long currentTime = System.nanoTime(); + private static long nanoSeconendsPassed; + private static int tps,ticks; + + public static String currentWorld = "test"; + + private static final List