diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | Cargo.lock | 7 | ||||
| -rw-r--r-- | Cargo.toml | 3 | ||||
| -rw-r--r-- | LICENSE.md | 674 | ||||
| -rw-r--r-- | README.md | 15 | ||||
| -rw-r--r-- | scripts/main.el | 210 | ||||
| -rw-r--r-- | scripts/main.scm | 299 | ||||
| -rw-r--r-- | scripts/prompt.scm | 45 | ||||
| -rw-r--r-- | scripts/stage.scm | 0 | ||||
| -rw-r--r-- | scripts/structs.scm | 80 | ||||
| -rw-r--r-- | scripts/utils.scm | 8 | ||||
| -rw-r--r-- | src/extended_environment.rs | 66 | ||||
| -rw-r--r-- | src/main.rs | 48 |
13 files changed, 980 insertions, 476 deletions
@@ -1,2 +1,3 @@ /target /www/slgj-2025.wasm +.aider* @@ -212,6 +212,12 @@ dependencies = [ ] [[package]] +name = "oorandom" +version = "11.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6790f58c7ff633d8771f42965289203411a5e5c68388703c06e14f24770b41e" + +[[package]] name = "png" version = "0.17.16" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -248,6 +254,7 @@ name = "slgj-2025" version = "0.1.0" dependencies = [ "macroquad", + "oorandom", "rust_lisp", ] @@ -5,4 +5,5 @@ edition = "2021" [dependencies] macroquad = "0.4" -rust_lisp = { path = "vendor/rust_lisp" }
\ No newline at end of file +oorandom = "11.1.5" +rust_lisp = { path = "vendor/rust_lisp" } diff --git a/LICENSE.md b/LICENSE.md new file mode 100644 index 0000000..f288702 --- /dev/null +++ b/LICENSE.md @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/> + 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. + + <one line to give the program's name and a brief idea of what it does.> + Copyright (C) <year> <name of author> + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 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 <https://www.gnu.org/licenses/>. + +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: + + <program> Copyright (C) <year> <name of author> + 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 +<https://www.gnu.org/licenses/>. + + 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 +<https://www.gnu.org/licenses/why-not-lgpl.html>. diff --git a/README.md b/README.md new file mode 100644 index 0000000..a40f602 --- /dev/null +++ b/README.md @@ -0,0 +1,15 @@ +# YASG (Yet Another Snake Game) + +This is my submission for Spring Lisp Game Jam 2025. It's literally just a very simple Snake game to test my own little game engine made with Rust `macroquad` and `rust_lisp` library. + +The engine architecture is quite simple: I use `macroquad` for the "engine backend" things (game-loop, render, input), and `rust_lisp` is used as the scripting language, with the `lisp` environment extended to use `macroquad` native functons. My code mostly acts as a glue between `macroquad` and `rust_lisp`, and the game logic is 100% written in the small subset of Lisp that is `rust_lisp`. + +# Compiling the game + +To compile the game, you need Rust installed in your system, and you also need the `wasm32-unknown-unknown` target (`rustup target add wasm32-unknown-unknown`). Then you'll be able to run `make build-wasm` to compile the game to wasm in the "www/" folder. To test the game, you can `cd` into the "www/" folder and run `python ../serve.py`. + +You can also run the game natively in your own system with a simple `cargo run`. + +# License + +The source-code for this game is distributed as GNU General Public License v3.0. diff --git a/scripts/main.el b/scripts/main.el index 2c6c54d..92a50e1 100644 --- a/scripts/main.el +++ b/scripts/main.el @@ -1,3 +1,211 @@ +(defvar key-left 65361) ;; macroquad input code +(defvar key-up 65362) +(defvar key-right 65363) +(defvar key-down 65364) + +(defvar gameover ()) +(defvar tile-size (list 18.0 24.0)) +(defvar subtile-width 5.0) +(defvar subtile-height 7.0) + +(defvar player-direction ()) +(defvar player-body (list (list 3 2))) +(defvar frame-timer-duration 0.3) +(defvar frame-timer 0.0) +(defvar fruit-tile (list 4 5)) + + +(defun is-tile-equal? (pos1 pos2) + (and (== (car pos1) (car pos2)) (== (cadr pos1) (cadr pos2))) + ) + +(defun sum-pos (pos1 pos2) + (list (+ (car pos1) (car pos2)) (+ (cadr pos1) (cadr pos2))) + ) + +(defun tile-to-pos (tile) + (list (* (car tile) (car tile-size)) (* (cadr tile) (cadr tile-size))) + ) + +(defun draw-subtile (tile subtile) + (defvar offset (tile-to-pos tile)) + (mq-draw-rectangle (+ (car offset) (+ (* subtile-width (car subtile)) (car subtile))) (+ (cadr offset) (+ (* subtile-height (cadr subtile)) (cadr subtile))) subtile-width subtile-height) + ) + +(defun draw-fruit (tile) + (draw-subtile tile (list 1 0)) + (draw-subtile tile (list 2 1)) + (draw-subtile tile (list 1 2)) + (draw-subtile tile (list 0 1)) + ) + +(defun draw-horizontal-line (tile) + (draw-subtile tile (list 0 1)) + (draw-subtile tile (list 1 1)) + (draw-subtile tile (list 2 1)) + ) + +(defun draw-vertical-line (tile) + (draw-subtile tile (list 1 0)) + (draw-subtile tile (list 1 1)) + (draw-subtile tile (list 1 2)) + ) + +(defun draw-corner-tl (tile) + (draw-subtile tile (list 1 1)) + (draw-subtile tile (list 2 1)) + (draw-subtile tile (list 1 2)) + ) + +(defun draw-corner-tr (tile) + (draw-subtile tile (list 1 1)) + (draw-subtile tile (list 0 1)) + (draw-subtile tile (list 1 2)) + ) + +(defun draw-corner-bl (tile) + (draw-subtile tile (list 1 1)) + (draw-subtile tile (list 1 0)) + (draw-subtile tile (list 2 1)) + ) + +(defun draw-corner-br (tile) + (draw-subtile tile (list 1 1)) + (draw-subtile tile (list 1 0)) + (draw-subtile tile (list 0 1)) + ) + +(defun draw-snake-tile (tile) + (defvar offset (tile-to-pos tile)) + (mq-draw-rectangle (car offset) (cadr offset) (car tile-size) (cadr tile-size) 0.4) + (draw-subtile tile (list 0 0)) + (draw-subtile tile (list 1 0)) + (draw-subtile tile (list 2 0)) + (draw-subtile tile (list 0 1)) + (draw-subtile tile (list 1 1)) + (draw-subtile tile (list 2 1)) + (draw-subtile tile (list 0 2)) + (draw-subtile tile (list 1 2)) + (draw-subtile tile (list 2 2)) + ) + +(defun process-input () + (if (mq-is-key-pressed key-left) + (setq player-direction key-left)) + (if (mq-is-key-pressed key-right) + (setq player-direction key-right)) + (if (mq-is-key-pressed key-up) + (setq player-direction key-up)) + (if (mq-is-key-pressed key-down) + (setq player-direction key-down)) + ) + +(defun move-player-body (dir) + (setq player-body (move-player-body-aux player-body (sum-pos (car player-body) dir))) + ) + +(defun move-player-body-aux (body pos) + (if (not (null (cdr body))) + (cons pos (move-player-body-aux (cdr body) (car body))) + (cons pos ())) + ) + +(defun push-new-tile () + (setq player-body (push-new-tile-aux player-body)) + ) + +(defun push-new-tile-aux (body) + (if (null (cdr body)) + (list (car body) (car body)) + (cons (car body) (push-new-tile-aux (cdr body))) + )) + +(defun check-collision-self () + (if (null (cdr player-body)) + () + (check-collision-self-aux (cdr player-body) (car player-body))) + ) + +(defun check-collision-self-aux (body pos) + (if (is-tile-equal? (car body) pos) + 1 + (if (null (cdr body)) + () + (check-collision-self-aux (cdr body) pos)) + ) + ) + +(defun process-frame () + ;; Set frame timer to 0 (game is running at 60 FPS) + (setq frame-timer 0.0) + + ;; Move player + (if (== player-direction key-left) + (move-player-body (list -1 0)) + ) + + (if (== player-direction key-up) + (move-player-body (list 0 -1)) + ) + + (if (== player-direction key-right) + (move-player-body (list 1 0)) + ) + + (if (== player-direction key-down) + (move-player-body (list 0 1)) + ) + + ;; Check collision with self + (if (check-collision-self) + (setq gameover 1)) + + + ;; Check collision border + (if (or (<= (car (car player-body)) 2) + (>= (car (car player-body)) 31) + (<= (cadr (car player-body)) 1) + (>= (cadr (car player-body)) 22)) + (setq gameover 1)) + + ;; Check collision with fruit + (if (is-tile-equal? (car player-body) fruit-tile) + (begin + (push-new-tile) + (setq fruit-tile (list (randi-range 3 30) (randi-range 2 21))))) + ) + + +(defun update (dt) + (process-input) + + (setq frame-timer (+ frame-timer dt)) + (if (and (not gameover) (> frame-timer frame-timer-duration)) + (process-frame)) + + + ) + + (defun draw () - (rq-draw-circle 50.0 50.0 40.0) + (mapcar (lambda (tile) + (draw-snake-tile tile)) + player-body) + + (mapcar (lambda (i) + (draw-vertical-line (list 2 i)) + (draw-vertical-line (list 31 i))) + (range 2 22)) + + (mapcar (lambda (i) + (draw-horizontal-line (list i 1)) + (draw-horizontal-line (list i 22))) + (range 3 31)) + + (draw-corner-tl (list 2 1)) + (draw-corner-tr (list 31 1)) + (draw-corner-bl (list 2 22)) + (draw-corner-br (list 31 22)) + + (draw-fruit fruit-tile) ) diff --git a/scripts/main.scm b/scripts/main.scm deleted file mode 100644 index 9db17fc..0000000 --- a/scripts/main.scm +++ /dev/null @@ -1,299 +0,0 @@ -(load "./scripts/structs.scm") -(load "./scripts/utils.scm") -(load "./scripts/prompt.scm") -(load "./scripts/gol.scm") - -(define current-stage-number 0) -(define current-generation 0) -(define current-pressed-key #f) -(define starting-cells (list)) -(define trigger-level-reload #t) -(define overlay-fade-time 0.0) -(define is-advancing #f) - - -(define stages (list (list '(1 . 0) - '(1 . 1) - '(0 . 0) - '(0 . 1)) - (list '(0 . -1) - '(1 . 0) - '(0 . 1) - '(-1 . 0)) - (list '(0 . 0) - '(0 . 1) - '(0 . 2)) - (list '(0 . 0) - '(-1 . 0) - '(0 . -1)) - (list '(1 . 0) - '(0 . 1)) - (list '(2 . 0) - '(1 . 0) - '(1 . 1) - '(0 . 1) - '(0 . 2)) - (list '(-1 . -1) - '(0 . -1) - '(1 . 0) - '(0 . 1) - '(-1 . 1) - '(-2 . 0)) - (list '(-1 . -1) - '(0 . -1) - '(1 . -1) - '(-1 . 0) - '(1 . 0) - '(-1 . 1) - '(0 . 1) - '(1 . 1)) - (list '(0 . -1) - '(0 . 0) - '(0 . 1) - '(1 . -1) - '(1 . 0) - '(1 . 1) - '(2 . 0)) - )) - -(define (update-generation) - (clear-cells) - (set-cells-array starting-cells) - - (let loop ((times 0)) - (if (< times current-generation) - (begin (run-step) - (loop (+ times 1))) - ) - ) - ) - -(define (is-solution? l1) - (define trigger #t) - (for-each (lambda (c) - (if (not (hash-table-ref current-cells c)) - (begin (set! trigger #f))) - ) - (stages current-stage-number)) - (and trigger (eq? (length (stages current-stage-number)) (length (hash-table-keys current-cells)))) - ) - -(define (update-game) - - (set! current-pressed-key (rl-get-key-pressed)) - - (prompt-update) - - (if trigger-level-reload - (begin (set! starting-cells (list)) - (clear-cells) - (set-cells-array starting-cells) - (set! trigger-level-reload #f))) - - (cond ((and (not prompt-active) (not is-advancing)) - (if (eq? current-pressed-key KEY_LEFT) - (cond ((> current-generation 0) - (set! current-generation (- current-generation 1)) - (update-generation))) - ) - - (if (eq? current-pressed-key KEY_RIGHT) - (cond ((< current-generation 1) - (set! current-generation (+ current-generation 1)) - (update-generation))) - ) - - )) - - (if (and (eq? current-generation 1) (not is-advancing)) - (if (is-solution? (stages current-stage-number)) - (begin (set! is-advancing #t) - (set! overlay-fade-time 0.0)) - ) - ) - - (if (and (rl-is-mouse-button-pressed) (eq? current-generation 0)) - (let ((mouse-pos (rl-get-mouse-position))) - (define tile-x (floor ( / (- (mouse-pos 0) 275) 50))) - (define tile-y (floor ( / (- (mouse-pos 1) 200) 50))) - (if (and (>= tile-x -1) - (<= tile-x 1) - (>= tile-y -1) - (<= tile-y 1)) - (begin (toggle-cell `(,tile-x . ,tile-y)) - (set! starting-cells (get-cells-list)))) - )) - - (if is-advancing - (set! overlay-fade-time (+ overlay-fade-time (rl-get-frame-time))) - (set! overlay-fade-time (- overlay-fade-time (rl-get-frame-time))) - ) - - (if (> overlay-fade-time 1.0) - (begin (set! is-advancing #f) - (clear-cells) - (set! starting-cells (list)) - (set! current-generation 0) - (set! current-stage-number (+ current-stage-number 1)) - ) - ) - ) - -(define (update-end) - (if is-advancing - (set! overlay-fade-time (+ overlay-fade-time (rl-get-frame-time))) - (set! overlay-fade-time (- overlay-fade-time (rl-get-frame-time))) - ) - ) - -(define (update) - (if (>= current-stage-number (length stages)) - (update-end) - (update-game) - ) - ) - -(define (draw-game) - (rl-draw-rectangle 0 0 600 450 (make-color 255 255 255 255)) - - (prompt-draw) - - (rl-draw-text (string-append "Level " (number->string current-stage-number)) 75 15 20 (make-color 0 0 0 255)) - - (draw-cells) - - (draw-grid) - - (draw-generation) - - (define lerped-alpha (* 255.0 overlay-fade-time) ) - (if (< lerped-alpha 0.0) - (set! lerped-alpha 0.0)) - - (rl-draw-rectangle 0 0 600 450 (make-color 255 255 255 (floor lerped-alpha))) - ) - -(define (draw-end) - (rl-draw-rectangle 0 0 600 450 (make-color 255 255 255 255)) - - (rl-draw-text "The end! Thank you for playing :)" 38 200 30 (make-color 0 0 0 255)) - - (rl-draw-text "Made with Raylib + S7 Scheme" 146 340 20 (make-color 0 0 0 255)) - - (define lerped-alpha (* 255.0 overlay-fade-time) ) - (if (< lerped-alpha 0.0) - (set! lerped-alpha 0.0)) - - (rl-draw-rectangle 0 0 600 450 (make-color 255 255 255 (floor lerped-alpha))) - ) - -(define (draw-generation) - - (let loop ((times 0)) - (if (< times 2) - (begin - (rl-draw-rectangle (+ 75 (* times 40)) - 410 - 30 - 30 - (make-color 190 190 190 255)) - (if (eq? times current-generation) - (rl-draw-rectangle (+ 80 (* times 40)) - 415 - 20 - 20 - (make-color 0 0 0 255))) - - (loop (+ times 1)) - ))) - - ) - -(define (draw) - (if (>= current-stage-number (length stages)) - (draw-end) - (draw-game) - ) - ) - - -(define (draw-grid) - (define cell-width 50) - (define cell-height 50) - - (let loop ((times 10)) - (if (> times 0) - (begin (rl-draw-line (+ (* times cell-width) (* cell-width 0.5)) - 50 - (+ (* times cell-width) (* cell-width 0.5)) - 400 - (make-color 200 200 200 255)) - (loop (- times 1))) - ) - ) - - (let loop ((times 8)) - (if (> times 0) - (begin (rl-draw-line 75 - (* times cell-height) - 525 - (* times cell-height) - (make-color 200 200 200 255)) - (loop (- times 1))) - ) - ) - - (let loop ((times 4)) - (if (> times 0) - (begin (rl-draw-line (+ (* times cell-width) 175) - 150 - (+ (* times cell-width) 175) - 300 - (make-color 0 0 0 255)) - (loop (- times 1))) - ) - ) - - (let loop ((times 4)) - (if (> times 0) - (begin (rl-draw-line 225 - (+ (* times cell-height) 100) - 375 - (+ (* times cell-height) 100) - (make-color 0 0 0 255)) - (loop (- times 1))) - ) - ) - ) - -(define (draw-cells) - (define cell-width 50) - (define cell-height 50) - (define cell-color (if (eq? current-generation 0) - (make-color 190 100 255 255) - (make-color 255 190 100 255))) - - - (for-each (lambda (cell) - (rl-draw-rectangle - (+ (* (car cell) cell-width) (- 300 (* cell-width 0.5)) ) - (+ (* (cdr cell) cell-height) (- 225 (* cell-height 0.5)) ) - cell-width - cell-height - cell-color) - - ) (hash-table-keys current-cells)) - - - (for-each (lambda (cell) - (rl-draw-rectangle - (+ (* (car cell) 50) 290 ) - (+ (* (cdr cell) 50) 215 ) - 20 - 20 - (make-color 255 190 100 255)) - - ) (stages current-stage-number)) - - - ) diff --git a/scripts/prompt.scm b/scripts/prompt.scm deleted file mode 100644 index e78e5b3..0000000 --- a/scripts/prompt.scm +++ /dev/null @@ -1,45 +0,0 @@ -(define prompt-active #f) -(define prompt-box (make-rect 0 0 800 20)) -(define prompt-text "") - -(define (prompt-update) - (if (eq? current-pressed-key KEY_F1) - (set! prompt-active (not prompt-active)) - ) - - (if prompt-active - (begin - (let ((key (rl-get-char-pressed))) - (cond ((and (>= key 32) (<= key 125)) - (set! prompt-text - (string-append prompt-text (string (integer->char key))))) - )) - - (if (rl-is-key-down KEY_ENTER) - (begin - (eval-string prompt-text) - (set! prompt-text "") - )) - - (if (eq? current-pressed-key KEY_BACKSPACE) - (let ((n (string-length prompt-text))) - (cond ((>= n 1) - (set! prompt-text (substring prompt-text 0 (- n 1)))) - ))) - - )) - - ) - -(define (prompt-draw) - (if prompt-active - (begin - (rl-draw-rectangle - (rect-x prompt-box) - (rect-y prompt-box) - (rect-width prompt-box) - (rect-height prompt-box) - (make-color 190 100 255 255)) - (rl-draw-text prompt-text 0 0 20 (make-color 0 0 0 255)) - )) - ) diff --git a/scripts/stage.scm b/scripts/stage.scm deleted file mode 100644 index e69de29..0000000 --- a/scripts/stage.scm +++ /dev/null diff --git a/scripts/structs.scm b/scripts/structs.scm deleted file mode 100644 index c3fa6ea..0000000 --- a/scripts/structs.scm +++ /dev/null @@ -1,80 +0,0 @@ -;; ============================================================ -;; define defstruct macro -(define-macro (defstruct struct-name . fields) - (let* ((name (if (list? struct-name) (car struct-name) struct-name)) - (sname (if (string? name) name (symbol->string name))) - - (fsname (if (list? struct-name) - (let ((cname (assoc :conc-name (cdr struct-name)))) - (if cname - (symbol->string (cadr cname)) - sname)) - sname)) - - (make-name (if (list? struct-name) - (let ((cname (assoc :constructor (cdr struct-name)))) - (if cname - (cadr cname) - (symbol "make-" sname))) - (symbol "make-" sname))) - - (copy-name (if (list? struct-name) - (let ((cname (assoc :copier (cdr struct-name)))) - (if cname - (cadr cname) - (symbol "copy-" sname))) - (symbol "copy-" sname))) - - (field-names (map (lambda (n) - (symbol->string (if (list? n) (car n) n))) - fields)) - - (field-types (map (lambda (field) - (if (list? field) - (apply (lambda* (val type read-only) type) (cdr field)) - #f)) - fields)) - - (field-read-onlys (map (lambda (field) - (if (list? field) - (apply (lambda* (val type read-only) read-only) (cdr field)) - #f)) - fields))) - - `(begin - (define ,(symbol sname "?") - (lambda (obj) - (and (vector? obj) - (eq? (obj 0) ',(string->symbol sname))))) - - (define* (,make-name - ,@(map (lambda (n) - (if (and (list? n) - (>= (length n) 2)) - (list (car n) (cadr n)) - (list n #f))) - fields)) - (vector ',(string->symbol sname) ,@(map string->symbol field-names))) - - (define ,copy-name copy) - - ,@(map (let ((ctr 1)) - (lambda (n type read-only) - (let ((val (if read-only - `(define ,(symbol fsname "-" n) - (lambda (arg) (arg ,ctr))) - `(define ,(symbol fsname "-" n) - (dilambda - (lambda (arg) (arg ,ctr)) - (lambda (arg val) (set! (arg ,ctr) val))))))) - (set! ctr (+ 1 ctr)) - val))) - field-names field-types field-read-onlys)))) - - -;; ============================================================ -;; Structures - -(defstruct rect (x 0.0) (y 0.0) (width 0.0) (height 0.0)) -(defstruct point (x 0.0) (y 0.0)) -(defstruct stage (width 0) (height 0) (generations 0) (final-state #f)) diff --git a/scripts/utils.scm b/scripts/utils.scm deleted file mode 100644 index 3348075..0000000 --- a/scripts/utils.scm +++ /dev/null @@ -1,8 +0,0 @@ -(define (is-point-inside-rect? point rect) - (cond ((not (point? point)) #f) - ((not (rect? rect)) #f) - (else (and (>= (point-x point) (rect-x rect)) - (>= (point-y point) (rect-y rect)) - (<= (point-x point) (+ (rect-x rect) (rect-width rect))) - (<= (point-y point) (+ (rect-y rect) (rect-height rect)))) - ))) diff --git a/src/extended_environment.rs b/src/extended_environment.rs index d13cc2b..7457e00 100644 --- a/src/extended_environment.rs +++ b/src/extended_environment.rs @@ -1,11 +1,35 @@ +use oorandom; use macroquad::prelude::*; -use std::{cell::RefCell, collections::HashMap, rc::Rc}; -use rust_lisp::model::{Env, FloatType, RuntimeError, Symbol, Value}; +use std::{cell::RefCell, collections::HashMap, rc::Rc, vec::Vec}; +use rust_lisp::model::{Env, FloatType, IntType, RuntimeError, Symbol, Value}; use rust_lisp::utils::{require_arg, require_typed_arg}; pub type HashMapRc = Rc<RefCell<HashMap<Value, Value>>>; -pub fn extend_environment(env: &Rc<RefCell<Env>>) { +pub const BACKGROUND_COLOR : Color = Color::new(0.44, 0.76, 0.27, 1.0); +pub const PAINTED_COLOR : Color = Color::new(0.06, 0.36, 0.20, 1.0); + +static mut RNG_INC: u64 = 0; + +pub fn extend_environment(env: &Rc<RefCell<Env>>) { + env.borrow_mut().define( + Symbol::from("randi-range"), + Value::NativeFunc( + |_env, args| { + let min = require_typed_arg::<IntType>("randi-range", &args, 0).unwrap(); + let max = require_typed_arg::<IntType>("randi-range", &args, 1).unwrap(); + + unsafe { + let mut rng = oorandom::Rand32::new(RNG_INC); + let r = rng.rand_u32(); + let r = r % ((max - min) as u32); + let r = (r as i32) + min; + RNG_INC += 1; + return Ok(Value::Int(r)); + } + }) + ); + env.borrow_mut().define( Symbol::from("mq-draw-circle"), Value::NativeFunc( @@ -13,13 +37,47 @@ pub fn extend_environment(env: &Rc<RefCell<Env>>) { let x = require_typed_arg::<FloatType>("mq-draw-circle", &args, 0).unwrap(); let y = require_typed_arg::<FloatType>("mq-draw-circle", &args, 1).unwrap(); let radius = require_typed_arg::<FloatType>("mq-draw-circle", &args, 2).unwrap(); - let color = GREEN; + let color = PAINTED_COLOR; draw_circle(x, y, radius, color); return Ok(Value::NIL); }) ); + env.borrow_mut().define( + Symbol::from("mq-draw-rectangle"), + Value::NativeFunc( + |_env, args| { + let x = require_typed_arg::<FloatType>("mq-draw-square", &args, 0).unwrap(); + let y = require_typed_arg::<FloatType>("mq-draw-square", &args, 1).unwrap(); + let width = require_typed_arg::<FloatType>("mq-draw-square", &args, 2).unwrap(); + let height = require_typed_arg::<FloatType>("mq-draw-square", &args, 3).unwrap(); + let alpha = require_typed_arg::<FloatType>("mq-draw-square", &args, 4).ok(); + let mut color = PAINTED_COLOR.clone(); + + if let Some(a) = alpha { + color.a = a; + } + + draw_rectangle(x, y, width, height, color); + return Ok(Value::NIL); + }) + ); + + env.borrow_mut().define( + Symbol::from("mq-is-key-pressed"), + Value::NativeFunc(|_env, args| { + let keycode = require_typed_arg::<IntType>("mq-get-key-pressed", &args, 0).unwrap(); + let keys_down : Vec<i32> = get_keys_down().into_iter().map(|e| e as i32).collect(); + + if keys_down.contains(&keycode) { + return Ok(Value::True); + } + + return Ok(Value::False); + }), + ); + // Hashtable functions // TODO: convert to elisp compatible hash table command diff --git a/src/main.rs b/src/main.rs index 62a3562..97f748d 100644 --- a/src/main.rs +++ b/src/main.rs @@ -6,58 +6,30 @@ use rust_lisp::default_env; use rust_lisp::lisp; use rust_lisp::parser::parse; use rust_lisp::interpreter::eval; -use rust_lisp::model::{Symbol, Value}; +use rust_lisp::model::{Value}; mod extended_environment; -#[macroquad::main("BasicShapes")] +#[macroquad::main("Snake")] async fn main() { - // create a base environment + request_new_screen_size(34.0 * 18.0, 24.0 * 24.0); let env = Rc::new(RefCell::new(default_env())); // define new methods extended_environment::extend_environment(&env); - // parse into an iterator of syntax trees (one for each root) - // let mut ast_iter = parse("(+ \"Hello \" \"world!\")"); - // let first_expression = ast_iter.next().unwrap().unwrap(); - - // evaluate - // let evaluation_result = eval(env.clone(), &first_expression).unwrap(); - // let mut ast_iter = parse("(test_draw)"); - // let first_expression = ast_iter.next().unwrap().unwrap(); - - // let first_expression = lisp! {(test_draw)}; - - // let mut inc = parse("(begin (set a 0) (+ a 1))"); - // let mut inc = parse("(begin (define a 0) (set a (+ a 1)))"); - // let inc_exp = inc.next().unwrap().unwrap(); - - // let inc_exp = lisp! { - // (begin (define a 0) (set a (+ a 1))) - // }; - // eval(env.clone(), &inc_exp).unwrap(); - - // let inc_exp = lisp! { - // (set a (+ a 1)) - // }; - - let gol_exp = parse(include_str!("../scripts/main.el")); - for exp in gol_exp { + let main_script = parse(include_str!("../scripts/main.el")); + for exp in main_script { eval(env.clone(), &exp.unwrap()).unwrap(); } - // let mut inc = parse("(set a (+ a 1))"); - // let inc_exp = inc.next().unwrap().unwrap(); - loop { - clear_background(RED); + clear_background(extended_environment::BACKGROUND_COLOR); - draw_line(40.0, 40.0, 100.0, 200.0, 15.0, BLUE); - draw_rectangle(screen_width() / 2.0 - 60.0, 100.0, 120.0, 60.0, GREEN); - eval(env.clone(), &first_expression).unwrap(); - let inc_eval = eval(env.clone(), &inc_exp).unwrap(); - draw_text(&format!("IT WORKS! {}!", &inc_eval), 20.0, 20.0, 30.0, DARKGRAY); + eval(env.clone(), &lisp! { + (update { Value::Float(get_frame_time()) } ) + }).unwrap(); + eval(env.clone(), &lisp! { (draw) }).unwrap(); next_frame().await } |