From eaa4dc99d723ad5acc0a5d22b1dcc3f631cbfa43 Mon Sep 17 00:00:00 2001 From: Elias Fleckenstein Date: Sat, 1 May 2021 16:52:16 +0200 Subject: [PATCH 01/44] Initial import --- LICENSE | 674 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ README.md | 4 + init.lua | 109 +++++++++ mod.conf | 3 + 4 files changed, 790 insertions(+) create mode 100644 LICENSE create mode 100644 README.md create mode 100644 init.lua create mode 100644 mod.conf diff --git a/LICENSE b/LICENSE new file mode 100644 index 000000000..f288702d2 --- /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/README.md b/README.md new file mode 100644 index 000000000..9b3293dda --- /dev/null +++ b/README.md @@ -0,0 +1,4 @@ +# tga_encoder +A TGA Encoder written in Lua without the use of external Libraries. + +May be used as a Minetest mod. diff --git a/init.lua b/init.lua new file mode 100644 index 000000000..45b9e85a2 --- /dev/null +++ b/init.lua @@ -0,0 +1,109 @@ +tga_encoder = {} + +local LUA_ARGS_LIMIT = 1000 + +local image = setmetatable({}, { + __call = function(self, ...) + local t = setmetatable({}, {__index = self}) + t:constructor(...) + return t + end, +}) + +function image:constructor(pixels) + self.bytes = {} + self.chunks = {self.bytes} + self.pixels = pixels + self.width = #pixels[1] + self.height = #pixels + + self:encode() +end + +function image:insert(byte) + table.insert(self.bytes, byte) + if #self.bytes == LUA_ARGS_LIMIT then + self.bytes = {} + table.insert(self.chunks, self.bytes) + end +end + +function image:littleendian(size, value) + for i = 1, size do + local byte = value % 256 + value = value - byte + value = value / 256 + self:insert(byte) + end +end + +function image:encode_colormap_spec() + -- first entry index + self:littleendian(2, 0) + -- number of entries + self:littleendian(2, 0) + -- number of bits per pixel + self:insert(0) +end + +function image:encode_image_spec() + -- X- and Y- origin + self:littleendian(2, 0) + self:littleendian(2, 0) + -- width and height + self:littleendian(2, self.width) + self:littleendian(2, self.height) + -- pixel depth + self:insert(24) + -- image descriptor + self:insert(0) +end + +function image:encode_header() + -- id length + self:insert(0) -- no image id info + -- color map type + self:insert(0) -- no color map + -- image type + self:insert(2) -- uncompressed true-color image + -- color map specification + self:encode_colormap_spec() + -- image specification + self:encode_image_spec() +end + +function image:encode_data() + for _, row in ipairs(self.pixels) do + for _, pixel in ipairs(row) do + self:insert(pixel[3]) + self:insert(pixel[2]) + self:insert(pixel[1]) + end + end +end + +function image:encode() + -- encode header + self:encode_header() + -- no color map and image id data + -- encode data + self:encode_data() + -- no extension area +end + +function image:get_data() + local data = "" + for _, bytes in ipairs(self.chunks) do + data = data .. string.char(unpack(bytes)) + end + return data .. string.char(0, 0, 0, 0) .. string.char(0, 0, 0, 0) .. "TRUEVISION-XFILE." .. string.char(0) +end + +function image:save(filename) + self.data = self.data or self:get_data() + local f = assert(io.open(filename, "w")) + f:write(self.data) + f:close() +end + +tga_encoder.image = image diff --git a/mod.conf b/mod.conf new file mode 100644 index 000000000..e4bfac898 --- /dev/null +++ b/mod.conf @@ -0,0 +1,3 @@ +name = tga_encoder +author = Fleckenstein +description = A TGA Encoder written in Lua without the use of external Libraries. From b88579b52e8ed66beca2b97871db3853d5260dd7 Mon Sep 17 00:00:00 2001 From: Elias Fleckenstein Date: Sun, 2 May 2021 17:47:46 +0200 Subject: [PATCH 02/44] Add updated tga_encoder --- init.lua | 97 +++++++++++++++++++------------------------------------- 1 file changed, 33 insertions(+), 64 deletions(-) diff --git a/init.lua b/init.lua index 45b9e85a2..96afda5e1 100644 --- a/init.lua +++ b/init.lua @@ -1,7 +1,5 @@ tga_encoder = {} -local LUA_ARGS_LIMIT = 1000 - local image = setmetatable({}, { __call = function(self, ...) local t = setmetatable({}, {__index = self}) @@ -11,8 +9,7 @@ local image = setmetatable({}, { }) function image:constructor(pixels) - self.bytes = {} - self.chunks = {self.bytes} + self.data = "" self.pixels = pixels self.width = #pixels[1] self.height = #pixels @@ -20,87 +17,59 @@ function image:constructor(pixels) self:encode() end -function image:insert(byte) - table.insert(self.bytes, byte) - if #self.bytes == LUA_ARGS_LIMIT then - self.bytes = {} - table.insert(self.chunks, self.bytes) - end -end - -function image:littleendian(size, value) - for i = 1, size do - local byte = value % 256 - value = value - byte - value = value / 256 - self:insert(byte) - end -end - function image:encode_colormap_spec() - -- first entry index - self:littleendian(2, 0) - -- number of entries - self:littleendian(2, 0) - -- number of bits per pixel - self:insert(0) + self.data = self.data + .. string.char(0, 0) -- first entry index + .. string.char(0, 0) -- number of entries + .. string.char(0) -- bits per pixel end function image:encode_image_spec() - -- X- and Y- origin - self:littleendian(2, 0) - self:littleendian(2, 0) - -- width and height - self:littleendian(2, self.width) - self:littleendian(2, self.height) - -- pixel depth - self:insert(24) - -- image descriptor - self:insert(0) + self.data = self.data + .. string.char(0, 0) -- X-origin + .. string.char(0, 0) -- Y-origin + .. string.char(self.width % 256, math.floor(self.width / 256)) -- width + .. string.char(self.height % 256, math.floor(self.height / 256)) -- height + .. string.char(24) -- pixel depth (RGB = 3 bytes = 24 bits) + .. string.char(0) -- image descriptor end function image:encode_header() - -- id length - self:insert(0) -- no image id info - -- color map type - self:insert(0) -- no color map - -- image type - self:insert(2) -- uncompressed true-color image - -- color map specification - self:encode_colormap_spec() - -- image specification - self:encode_image_spec() + self.data = self.data + .. string.char(0) -- image id + .. string.char(0) -- color map type + .. string.char(2) -- image type (uncompressed true-color image = 2) + self:encode_colormap_spec() -- color map specification + self:encode_image_spec() -- image specification end function image:encode_data() for _, row in ipairs(self.pixels) do for _, pixel in ipairs(row) do - self:insert(pixel[3]) - self:insert(pixel[2]) - self:insert(pixel[1]) + self.data = self.data + .. string.char(pixel[3], pixel[2], pixel[1]) end end end -function image:encode() - -- encode header - self:encode_header() - -- no color map and image id data - -- encode data - self:encode_data() - -- no extension area +function image:encode_footer() + self.data = self.data + .. string.char(0, 0, 0, 0) -- extension area offset + .. string.char(0, 0, 0, 0) -- developer area offset + .. "TRUEVISION-XFILE" + .. "." + .. string.char(0) end -function image:get_data() - local data = "" - for _, bytes in ipairs(self.chunks) do - data = data .. string.char(unpack(bytes)) - end - return data .. string.char(0, 0, 0, 0) .. string.char(0, 0, 0, 0) .. "TRUEVISION-XFILE." .. string.char(0) +function image:encode() + self:encode_header() -- header + -- no color map and image id data + self:encode_data() -- encode data + -- no extension or developer area + self:encode_footer() -- footer end function image:save(filename) - self.data = self.data or self:get_data() local f = assert(io.open(filename, "w")) f:write(self.data) f:close() From 52e5c955f0f9d745a23b057de5e48a8e2ad456e8 Mon Sep 17 00:00:00 2001 From: Nils Dagsson Moskopp Date: Thu, 4 Nov 2021 01:53:58 +0100 Subject: [PATCH 03/44] Use RLE compression in tga_encoder --- init.lua | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/init.lua b/init.lua index 96afda5e1..973e44855 100644 --- a/init.lua +++ b/init.lua @@ -38,18 +38,31 @@ function image:encode_header() self.data = self.data .. string.char(0) -- image id .. string.char(0) -- color map type - .. string.char(2) -- image type (uncompressed true-color image = 2) + .. string.char(10) -- image type (RLE RGB = 10) self:encode_colormap_spec() -- color map specification self:encode_image_spec() -- image specification end function image:encode_data() + local current_pixel = '' + local previous_pixel = '' + local count = 1 + local encoded = '' + local rle_packet = '' for _, row in ipairs(self.pixels) do for _, pixel in ipairs(row) do - self.data = self.data - .. string.char(pixel[3], pixel[2], pixel[1]) + current_pixel = string.char(pixel[3], pixel[2], pixel[1]) + if current_pixel ~= previous_pixel or count == 128 then + encoded = encoded .. rle_packet + count = 1 + previous_pixel = current_pixel + else + count = count + 1 + end + rle_packet = string.char(128 + count - 1) .. current_pixel end end + self.data = self.data .. encoded .. rle_packet end function image:encode_footer() From 3f60b5baa67934674edebd9add85e474f122e32b Mon Sep 17 00:00:00 2001 From: Nils Dagsson Moskopp Date: Thu, 4 Nov 2021 15:15:28 +0100 Subject: [PATCH 04/44] Speed up TGA encoding by creating fewer strings --- init.lua | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/init.lua b/init.lua index 973e44855..39309c9c9 100644 --- a/init.lua +++ b/init.lua @@ -47,13 +47,13 @@ function image:encode_data() local current_pixel = '' local previous_pixel = '' local count = 1 - local encoded = '' + local packets = {} local rle_packet = '' for _, row in ipairs(self.pixels) do for _, pixel in ipairs(row) do current_pixel = string.char(pixel[3], pixel[2], pixel[1]) if current_pixel ~= previous_pixel or count == 128 then - encoded = encoded .. rle_packet + packets[#packets +1] = rle_packet count = 1 previous_pixel = current_pixel else @@ -62,7 +62,8 @@ function image:encode_data() rle_packet = string.char(128 + count - 1) .. current_pixel end end - self.data = self.data .. encoded .. rle_packet + packets[#packets +1] = rle_packet + self.data = self.data .. table.concat(packets) end function image:encode_footer() From adb8e45d6728a955f33bc99c05abdc8b488fe05c Mon Sep 17 00:00:00 2001 From: Nils Dagsson Moskopp Date: Sun, 30 Jan 2022 20:33:06 +0100 Subject: [PATCH 05/44] Fix TGA file writing on Windows Before this patch, the tga_encoder mod would write corrupted TGA files on Windows: Bytes that looked like newlines were replaced by a carriage return and a newline. --- init.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/init.lua b/init.lua index 39309c9c9..24ec502e1 100644 --- a/init.lua +++ b/init.lua @@ -84,7 +84,7 @@ function image:encode() end function image:save(filename) - local f = assert(io.open(filename, "w")) + local f = assert(io.open(filename, "wb")) f:write(self.data) f:close() end From c00b0d50c6575fb41234edb687dd6a1b83d38dca Mon Sep 17 00:00:00 2001 From: Nils Dagsson Moskopp Date: Sat, 14 May 2022 19:56:02 +0200 Subject: [PATCH 06/44] Add usage examples --- README.md | 2 ++ examples.lua | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+) create mode 100644 examples.lua diff --git a/README.md b/README.md index 9b3293dda..dc7f2ab69 100644 --- a/README.md +++ b/README.md @@ -2,3 +2,5 @@ A TGA Encoder written in Lua without the use of external Libraries. May be used as a Minetest mod. + +See `examples.lua` for example code and usage hints. diff --git a/examples.lua b/examples.lua new file mode 100644 index 000000000..b832dddaa --- /dev/null +++ b/examples.lua @@ -0,0 +1,49 @@ +dofile("init.lua") + +-- encode a bitmap +local _ = { 0, 0, 0 } +local R = { 255, 127, 127 } +local pixels = { + { _, _, _, _, _, _, _ }, + { _, _, _, R, _, _, _ }, + { _, _, R, R, R, _, _ }, + { _, R, R, R, R, R, _ }, + { _, R, R, R, R, R, _ }, + { _, _, R, _, R, _, _ }, + { _, _, _, _, _, _, _ }, +} +tga_encoder.image(pixels):save("bitmap_small.tga") + +-- change a single pixel, then rescale the bitmap +local pixels_orig = pixels +pixels_orig[4][4] = { 255, 255, 255 } +local pixels = {} +for x = 1,56,1 do + local x_orig = math.ceil(x/8) + for z = 1,56,1 do + local z_orig = math.ceil(z/8) + local color = pixels_orig[z_orig][x_orig] + pixels[z] = pixels[z] or {} + pixels[z][x] = color + end +end +tga_encoder.image(pixels):save("bitmap_large.tga") + +local pixels = {} +for x = 1,16,1 do -- left to right + for z = 1,16,1 do -- bottom to top + local r = math.min(x * 32 - 1, 255) + local g = math.min(z * 32 - 1, 255) + local b = 0 + -- blue rectangle in top right corner + if x > 8 and z > 8 then + r = 0 + g = 0 + b = math.min(z * 16 - 1, 255) + end + local color = { r, g, b } + pixels[z] = pixels[z] or {} + pixels[z][x] = color + end +end +tga_encoder.image(pixels):save("gradients.tga") From 4f6ea5d03509076c5a0774838420243d3f3fce7e Mon Sep 17 00:00:00 2001 From: Nils Dagsson Moskopp Date: Sat, 14 May 2022 20:02:55 +0200 Subject: [PATCH 07/44] Add credits to README --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index dc7f2ab69..195cb8df5 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,8 @@ # tga_encoder A TGA Encoder written in Lua without the use of external Libraries. +Created by fleckenstein for MineClone2, then improved by erlehmann. + May be used as a Minetest mod. See `examples.lua` for example code and usage hints. From 13552f16f20ca34817ea0c2ad4e0e292312d009c Mon Sep 17 00:00:00 2001 From: Nils Dagsson Moskopp Date: Fri, 5 Nov 2021 18:58:01 +0100 Subject: [PATCH 08/44] Reduce TGA filesize by 25% by using 16-bit colors --- init.lua | 34 ++++++++++++++++++++++++++-------- 1 file changed, 26 insertions(+), 8 deletions(-) diff --git a/init.lua b/init.lua index 24ec502e1..8e467eb6b 100644 --- a/init.lua +++ b/init.lua @@ -30,7 +30,7 @@ function image:encode_image_spec() .. string.char(0, 0) -- Y-origin .. string.char(self.width % 256, math.floor(self.width / 256)) -- width .. string.char(self.height % 256, math.floor(self.height / 256)) -- height - .. string.char(24) -- pixel depth (RGB = 3 bytes = 24 bits) + .. string.char(16) -- pixel depth (ARRRRRGGGGGBBBBB = 2 bytes = 16 bits) .. string.char(0) -- image descriptor end @@ -44,24 +44,42 @@ function image:encode_header() end function image:encode_data() - local current_pixel = '' - local previous_pixel = '' + local colorword = nil + local previous_r = nil + local previous_g = nil + local previous_b = nil local count = 1 local packets = {} local rle_packet = '' + -- Sample depth rescaling is done according to the algorithm presented in: + -- + local max_sample_in = math.pow(2, 8) - 1 + local max_sample_out = math.pow(2, 5) - 1 for _, row in ipairs(self.pixels) do for _, pixel in ipairs(row) do - current_pixel = string.char(pixel[3], pixel[2], pixel[1]) - if current_pixel ~= previous_pixel or count == 128 then - packets[#packets +1] = rle_packet + if pixel[1] ~= previous_r or pixel[2] ~= previous_g or pixel[3] ~= previous_b or count == 128 then + if nil ~= previous_r then + colorword = 32768 + + ((math.floor((previous_r * max_sample_out / max_sample_in) + 0.5)) * 1024) + + ((math.floor((previous_g * max_sample_out / max_sample_in) + 0.5)) * 32) + + ((math.floor((previous_b * max_sample_out / max_sample_in) + 0.5)) * 1) + rle_packet = string.char(128 + count - 1, colorword % 256, math.floor(colorword / 256)) + packets[#packets +1] = rle_packet + end count = 1 - previous_pixel = current_pixel + previous_r = pixel[1] + previous_g = pixel[2] + previous_b = pixel[3] else count = count + 1 end - rle_packet = string.char(128 + count - 1) .. current_pixel end end + colorword = 32768 + + ((math.floor((previous_r * max_sample_out / max_sample_in) + 0.5)) * 1024) + + ((math.floor((previous_g * max_sample_out / max_sample_in) + 0.5)) * 32) + + ((math.floor((previous_b * max_sample_out / max_sample_in) + 0.5)) * 1) + rle_packet = string.char(128 + count - 1, colorword % 256, math.floor(colorword / 256)) packets[#packets +1] = rle_packet self.data = self.data .. table.concat(packets) end From 1b48c3f53949f5785b244b3647def5a4c58a17c8 Mon Sep 17 00:00:00 2001 From: Nils Dagsson Moskopp Date: Wed, 9 Feb 2022 13:40:47 +0100 Subject: [PATCH 09/44] Use raw packets in RLE compression in tga_encoder --- init.lua | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 53 insertions(+), 5 deletions(-) diff --git a/init.lua b/init.lua index 8e467eb6b..a6972843e 100644 --- a/init.lua +++ b/init.lua @@ -48,8 +48,11 @@ function image:encode_data() local previous_r = nil local previous_g = nil local previous_b = nil + local raw_pixel = '' + local raw_pixels = {} local count = 1 local packets = {} + local raw_packet = '' local rle_packet = '' -- Sample depth rescaling is done according to the algorithm presented in: -- @@ -58,13 +61,37 @@ function image:encode_data() for _, row in ipairs(self.pixels) do for _, pixel in ipairs(row) do if pixel[1] ~= previous_r or pixel[2] ~= previous_g or pixel[3] ~= previous_b or count == 128 then - if nil ~= previous_r then + if nil ~= previous_r then colorword = 32768 + ((math.floor((previous_r * max_sample_out / max_sample_in) + 0.5)) * 1024) + ((math.floor((previous_g * max_sample_out / max_sample_in) + 0.5)) * 32) + ((math.floor((previous_b * max_sample_out / max_sample_in) + 0.5)) * 1) - rle_packet = string.char(128 + count - 1, colorword % 256, math.floor(colorword / 256)) - packets[#packets +1] = rle_packet + if 1 == count then + -- remember pixel verbatim for raw encoding + raw_pixel = string.char(colorword % 256, math.floor(colorword / 256)) + raw_pixels[#raw_pixels + 1] = raw_pixel + if 128 == #raw_pixels then + raw_packet = string.char(#raw_pixels - 1) + packets[#packets + 1] = raw_packet + for i=1, #raw_pixels do + packets[#packets +1] = raw_pixels[i] + end + raw_pixels = {} + end + else + -- encode raw pixels, if any + if #raw_pixels > 0 then + raw_packet = string.char(#raw_pixels - 1) + packets[#packets + 1] = raw_packet + for i=1, #raw_pixels do + packets[#packets +1] = raw_pixels[i] + end + raw_pixels = {} + end + -- RLE encoding + rle_packet = string.char(128 + count - 1, colorword % 256, math.floor(colorword / 256)) + packets[#packets +1] = rle_packet + end end count = 1 previous_r = pixel[1] @@ -79,8 +106,29 @@ function image:encode_data() ((math.floor((previous_r * max_sample_out / max_sample_in) + 0.5)) * 1024) + ((math.floor((previous_g * max_sample_out / max_sample_in) + 0.5)) * 32) + ((math.floor((previous_b * max_sample_out / max_sample_in) + 0.5)) * 1) - rle_packet = string.char(128 + count - 1, colorword % 256, math.floor(colorword / 256)) - packets[#packets +1] = rle_packet + if 1 == count then + raw_pixel = string.char(colorword % 256, math.floor(colorword / 256)) + raw_pixels[#raw_pixels + 1] = raw_pixel + raw_packet = string.char(#raw_pixels - 1) + packets[#packets + 1] = raw_packet + for i=1, #raw_pixels do + packets[#packets +1] = raw_pixels[i] + end + raw_pixels = {} + else + -- encode raw pixels, if any + if #raw_pixels > 0 then + raw_packet = string.char(#raw_pixels - 1) + packets[#packets + 1] = raw_packet + for i=1, #raw_pixels do + packets[#packets +1] = raw_pixels[i] + end + raw_pixels = {} + end + -- RLE encoding + rle_packet = string.char(128 + count - 1, colorword % 256, math.floor(colorword / 256)) + packets[#packets +1] = rle_packet + end self.data = self.data .. table.concat(packets) end From 9af0719df8dc5895633e5ce2ee107f78eb7a1bd0 Mon Sep 17 00:00:00 2001 From: Nils Dagsson Moskopp Date: Sat, 14 May 2022 20:44:12 +0200 Subject: [PATCH 10/44] Allow encoding RGB images as B8G8R8 --- examples.lua | 3 +- init.lua | 111 ++++++++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 103 insertions(+), 11 deletions(-) diff --git a/examples.lua b/examples.lua index b832dddaa..5e16722f3 100644 --- a/examples.lua +++ b/examples.lua @@ -46,4 +46,5 @@ for x = 1,16,1 do -- left to right pixels[z][x] = color end end -tga_encoder.image(pixels):save("gradients.tga") +tga_encoder.image(pixels, {pixel_depth=16}):save("gradients_16bpp.tga") +tga_encoder.image(pixels, {pixel_depth=24}):save("gradients_24bpp.tga") diff --git a/init.lua b/init.lua index a6972843e..d8a044244 100644 --- a/init.lua +++ b/init.lua @@ -8,13 +8,16 @@ local image = setmetatable({}, { end, }) -function image:constructor(pixels) +function image:constructor(pixels, properties) + local properties = properties or {} + local pixel_depth = properties.pixel_depth or 16 + self.data = "" self.pixels = pixels self.width = #pixels[1] self.height = #pixels - self:encode() + self:encode(pixel_depth) end function image:encode_colormap_spec() @@ -24,26 +27,38 @@ function image:encode_colormap_spec() .. string.char(0) -- bits per pixel end -function image:encode_image_spec() +function image:encode_image_spec(pixel_depth) + assert( + 16 == pixel_depth or -- (A1R5G5B5 = 2 bytes = 16 bits) + 24 == pixel_depth -- (B8G8R8 = 3 bytes = 24 bits) + ) self.data = self.data .. string.char(0, 0) -- X-origin .. string.char(0, 0) -- Y-origin .. string.char(self.width % 256, math.floor(self.width / 256)) -- width .. string.char(self.height % 256, math.floor(self.height / 256)) -- height - .. string.char(16) -- pixel depth (ARRRRRGGGGGBBBBB = 2 bytes = 16 bits) + .. string.char(pixel_depth) .. string.char(0) -- image descriptor end -function image:encode_header() +function image:encode_header(pixel_depth) self.data = self.data .. string.char(0) -- image id .. string.char(0) -- color map type .. string.char(10) -- image type (RLE RGB = 10) self:encode_colormap_spec() -- color map specification - self:encode_image_spec() -- image specification + self:encode_image_spec(pixel_depth) -- image specification end -function image:encode_data() +function image:encode_data(pixel_depth) + if 16 == pixel_depth then + self:encode_data_a1r5g5b5_rle() + elseif 24 == pixel_depth then + self:encode_data_r8g8b8_rle() + end +end + +function image:encode_data_a1r5g5b5_rle() local colorword = nil local previous_r = nil local previous_g = nil @@ -132,6 +147,82 @@ function image:encode_data() self.data = self.data .. table.concat(packets) end +function image:encode_data_r8g8b8_rle() + local previous_r = nil + local previous_g = nil + local previous_b = nil + local raw_pixel = '' + local raw_pixels = {} + local count = 1 + local packets = {} + local raw_packet = '' + local rle_packet = '' + for _, row in ipairs(self.pixels) do + for _, pixel in ipairs(row) do + if pixel[1] ~= previous_r or pixel[2] ~= previous_g or pixel[3] ~= previous_b or count == 128 then + if nil ~= previous_r then + if 1 == count then + -- remember pixel verbatim for raw encoding + raw_pixel = string.char(previous_b, previous_g, previous_r) + raw_pixels[#raw_pixels + 1] = raw_pixel + if 128 == #raw_pixels then + raw_packet = string.char(#raw_pixels - 1) + packets[#packets + 1] = raw_packet + for i=1, #raw_pixels do + packets[#packets +1] = raw_pixels[i] + end + raw_pixels = {} + end + else + -- encode raw pixels, if any + if #raw_pixels > 0 then + raw_packet = string.char(#raw_pixels - 1) + packets[#packets + 1] = raw_packet + for i=1, #raw_pixels do + packets[#packets +1] = raw_pixels[i] + end + raw_pixels = {} + end + -- RLE encoding + rle_packet = string.char(128 + count - 1, previous_b, previous_g, previous_r) + packets[#packets +1] = rle_packet + end + end + count = 1 + previous_r = pixel[1] + previous_g = pixel[2] + previous_b = pixel[3] + else + count = count + 1 + end + end + end + if 1 == count then + raw_pixel = string.char(previous_b, previous_g, previous_r) + raw_pixels[#raw_pixels + 1] = raw_pixel + raw_packet = string.char(#raw_pixels - 1) + packets[#packets + 1] = raw_packet + for i=1, #raw_pixels do + packets[#packets +1] = raw_pixels[i] + end + raw_pixels = {} + else + -- encode raw pixels, if any + if #raw_pixels > 0 then + raw_packet = string.char(#raw_pixels - 1) + packets[#packets + 1] = raw_packet + for i=1, #raw_pixels do + packets[#packets +1] = raw_pixels[i] + end + raw_pixels = {} + end + -- RLE encoding + rle_packet = string.char(128 + count - 1, previous_b, previous_g, previous_r) + packets[#packets +1] = rle_packet + end + self.data = self.data .. table.concat(packets) +end + function image:encode_footer() self.data = self.data .. string.char(0, 0, 0, 0) -- extension area offset @@ -141,10 +232,10 @@ function image:encode_footer() .. string.char(0) end -function image:encode() - self:encode_header() -- header +function image:encode(pixel_depth) + self:encode_header(pixel_depth) -- header -- no color map and image id data - self:encode_data() -- encode data + self:encode_data(pixel_depth) -- encode data -- no extension or developer area self:encode_footer() -- footer end From 25b7b30945241cb22529bb60fdb44248a64c19a6 Mon Sep 17 00:00:00 2001 From: Nils Dagsson Moskopp Date: Sat, 14 May 2022 22:41:52 +0200 Subject: [PATCH 11/44] Allow encoding grayscale images as BW8 --- examples.lua | 16 +++++++++++++-- init.lua | 58 +++++++++++++++++++++++++++++++++++++++------------- 2 files changed, 58 insertions(+), 16 deletions(-) diff --git a/examples.lua b/examples.lua index 5e16722f3..e21e4db95 100644 --- a/examples.lua +++ b/examples.lua @@ -29,6 +29,18 @@ for x = 1,56,1 do end tga_encoder.image(pixels):save("bitmap_large.tga") +-- note that the uncompressed grayscale TGA file written in this +-- example is 80 bytes – but an optimized PNG file is 81 bytes … +local pixels = {} +for x = 1,6,1 do -- left to right + for z = 1,6,1 do -- bottom to top + local color = { math.min(x * z * 4 - 1, 255) } + pixels[z] = pixels[z] or {} + pixels[z][x] = color + end +end +tga_encoder.image(pixels, {colors="BW", pixel_depth=8}):save("gradients_8bpp.tga") + local pixels = {} for x = 1,16,1 do -- left to right for z = 1,16,1 do -- bottom to top @@ -46,5 +58,5 @@ for x = 1,16,1 do -- left to right pixels[z][x] = color end end -tga_encoder.image(pixels, {pixel_depth=16}):save("gradients_16bpp.tga") -tga_encoder.image(pixels, {pixel_depth=24}):save("gradients_24bpp.tga") +tga_encoder.image(pixels, {colors="RGB", pixel_depth=16}):save("gradients_16bpp.tga") +tga_encoder.image(pixels, {colors="RGB", pixel_depth=24}):save("gradients_24bpp.tga") diff --git a/init.lua b/init.lua index d8a044244..aad7f2cac 100644 --- a/init.lua +++ b/init.lua @@ -10,14 +10,15 @@ local image = setmetatable({}, { function image:constructor(pixels, properties) local properties = properties or {} - local pixel_depth = properties.pixel_depth or 16 + properties.colors = properties.colors or "RGB" + properties.pixel_depth = properties.pixel_depth or 16 self.data = "" self.pixels = pixels self.width = #pixels[1] self.height = #pixels - self:encode(pixel_depth) + self:encode(properties) end function image:encode_colormap_spec() @@ -27,10 +28,13 @@ function image:encode_colormap_spec() .. string.char(0) -- bits per pixel end -function image:encode_image_spec(pixel_depth) +function image:encode_image_spec(properties) + local colors = properties.colors + local pixel_depth = properties.pixel_depth assert( - 16 == pixel_depth or -- (A1R5G5B5 = 2 bytes = 16 bits) - 24 == pixel_depth -- (B8G8R8 = 3 bytes = 24 bits) + "BW" == colors and 8 == pixel_depth or -- (8 bit grayscale = 1 byte = 8 bits) + "RGB" == colors and 16 == pixel_depth or -- (A1R5G5B5 = 2 bytes = 16 bits) + "RGB" == colors and 24 == pixel_depth -- (B8G8R8 = 3 bytes = 24 bits) ) self.data = self.data .. string.char(0, 0) -- X-origin @@ -41,23 +45,49 @@ function image:encode_image_spec(pixel_depth) .. string.char(0) -- image descriptor end -function image:encode_header(pixel_depth) +function image:encode_header(properties) + local colors = properties.colors + local pixel_depth = properties.pixel_depth + local image_type + if "BW" == colors and 8 == pixel_depth then + image_type = 3 -- grayscale + elseif ( + "RGB" == colors and 16 == pixel_depth or + "RGB" == colors and 24 == pixel_depth + ) then + image_type = 10 -- RLE RGB + end self.data = self.data .. string.char(0) -- image id .. string.char(0) -- color map type - .. string.char(10) -- image type (RLE RGB = 10) + .. string.char(image_type) self:encode_colormap_spec() -- color map specification - self:encode_image_spec(pixel_depth) -- image specification + self:encode_image_spec(properties) -- image specification end -function image:encode_data(pixel_depth) - if 16 == pixel_depth then +function image:encode_data(properties) + local colors = properties.colors + local pixel_depth = properties.pixel_depth + if "BW" == colors and 8 == pixel_depth then + self:encode_data_bw8() + elseif "RGB" == colors and 16 == pixel_depth then self:encode_data_a1r5g5b5_rle() - elseif 24 == pixel_depth then + elseif "RGB" == colors and 24 == pixel_depth then self:encode_data_r8g8b8_rle() end end +function image:encode_data_bw8() + local raw_pixels = {} + for _, row in ipairs(self.pixels) do + for _, pixel in ipairs(row) do + local raw_pixel = string.char(pixel[1]) + raw_pixels[#raw_pixels + 1] = raw_pixel + end + end + self.data = self.data .. table.concat(raw_pixels) +end + function image:encode_data_a1r5g5b5_rle() local colorword = nil local previous_r = nil @@ -232,10 +262,10 @@ function image:encode_footer() .. string.char(0) end -function image:encode(pixel_depth) - self:encode_header(pixel_depth) -- header +function image:encode(properties) + self:encode_header(properties) -- header -- no color map and image id data - self:encode_data(pixel_depth) -- encode data + self:encode_data(properties) -- encode data -- no extension or developer area self:encode_footer() -- footer end From 5640e19c946c6742a8fd767b41690e57e91f1f1e Mon Sep 17 00:00:00 2001 From: Nils Dagsson Moskopp Date: Sun, 15 May 2022 03:10:53 +0200 Subject: [PATCH 12/44] Add fractal example --- examples.lua | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/examples.lua b/examples.lua index e21e4db95..0b5b55609 100644 --- a/examples.lua +++ b/examples.lua @@ -60,3 +60,25 @@ for x = 1,16,1 do -- left to right end tga_encoder.image(pixels, {colors="RGB", pixel_depth=16}):save("gradients_16bpp.tga") tga_encoder.image(pixels, {colors="RGB", pixel_depth=24}):save("gradients_24bpp.tga") + +local pixels = {} +for x = 1,512,1 do -- left to right + for z = 1,512,1 do -- bottom to top + local oz = (z - 256) / 256 + 0.75 + local ox = (x - 256) / 256 + local px, pz, i = 0, 0, 0 + while (px * px) + (pz * pz) <= 4 and i < 128 do + px = (px * px) - (pz * pz) + oz + pz = (2 * px * pz) + ox + i = i + 1 + end + local color = { + math.max(0, math.min(255, math.floor(px * 64))), + math.max(0, math.min(255, math.floor(pz * 64))), + math.max(0, math.min(255, math.floor(i))), + } + pixels[z] = pixels[z] or {} + pixels[z][x] = color + end +end +tga_encoder.image(pixels, {colors="RGB", pixel_depth=24}):save("fractal_24bpp.tga") From 9bd1702d60c63636db4ec93611b623dbb6648171 Mon Sep 17 00:00:00 2001 From: Nils Dagsson Moskopp Date: Sun, 15 May 2022 14:54:28 +0200 Subject: [PATCH 13/44] Encode image only when saving it to a file --- examples.lua | 9 +++++---- init.lua | 18 +++++++++--------- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/examples.lua b/examples.lua index 0b5b55609..4d04e6e8a 100644 --- a/examples.lua +++ b/examples.lua @@ -39,7 +39,7 @@ for x = 1,6,1 do -- left to right pixels[z][x] = color end end -tga_encoder.image(pixels, {colors="BW", pixel_depth=8}):save("gradients_8bpp.tga") +tga_encoder.image(pixels):save("gradients_8bpp.tga", {colors="BW", pixel_depth=8}) local pixels = {} for x = 1,16,1 do -- left to right @@ -58,8 +58,9 @@ for x = 1,16,1 do -- left to right pixels[z][x] = color end end -tga_encoder.image(pixels, {colors="RGB", pixel_depth=16}):save("gradients_16bpp.tga") -tga_encoder.image(pixels, {colors="RGB", pixel_depth=24}):save("gradients_24bpp.tga") +local gradients = tga_encoder.image(pixels) +gradients:save("gradients_16bpp.tga", {colors="RGB", pixel_depth=16}) +gradients:save("gradients_24bpp.tga", {colors="RGB", pixel_depth=24}) local pixels = {} for x = 1,512,1 do -- left to right @@ -81,4 +82,4 @@ for x = 1,512,1 do -- left to right pixels[z][x] = color end end -tga_encoder.image(pixels, {colors="RGB", pixel_depth=24}):save("fractal_24bpp.tga") +tga_encoder.image(pixels):save("fractal_24bpp.tga", {colors="RGB", pixel_depth=24}) diff --git a/init.lua b/init.lua index aad7f2cac..a79a32920 100644 --- a/init.lua +++ b/init.lua @@ -8,17 +8,10 @@ local image = setmetatable({}, { end, }) -function image:constructor(pixels, properties) - local properties = properties or {} - properties.colors = properties.colors or "RGB" - properties.pixel_depth = properties.pixel_depth or 16 - - self.data = "" +function image:constructor(pixels) self.pixels = pixels self.width = #pixels[1] self.height = #pixels - - self:encode(properties) end function image:encode_colormap_spec() @@ -263,6 +256,7 @@ function image:encode_footer() end function image:encode(properties) + self.data = "" self:encode_header(properties) -- header -- no color map and image id data self:encode_data(properties) -- encode data @@ -270,7 +264,13 @@ function image:encode(properties) self:encode_footer() -- footer end -function image:save(filename) +function image:save(filename, properties) + local properties = properties or {} + properties.colors = properties.colors or "RGB" + properties.pixel_depth = properties.pixel_depth or 16 + + self:encode(properties) + local f = assert(io.open(filename, "wb")) f:write(self.data) f:close() From 376b6404b2e9a0a1d3ca6535b9c4a455ef283111 Mon Sep 17 00:00:00 2001 From: Nils Dagsson Moskopp Date: Sun, 15 May 2022 15:42:48 +0200 Subject: [PATCH 14/44] Allow RAW or RLE encoding for true-color images --- examples.lua | 8 +++++--- init.lua | 56 +++++++++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 56 insertions(+), 8 deletions(-) diff --git a/examples.lua b/examples.lua index 4d04e6e8a..b2d9de605 100644 --- a/examples.lua +++ b/examples.lua @@ -39,7 +39,7 @@ for x = 1,6,1 do -- left to right pixels[z][x] = color end end -tga_encoder.image(pixels):save("gradients_8bpp.tga", {colors="BW", pixel_depth=8}) +tga_encoder.image(pixels):save("gradients_8bpp_raw.tga", {colors="BW", compression="RAW", pixel_depth=8}) local pixels = {} for x = 1,16,1 do -- left to right @@ -59,8 +59,10 @@ for x = 1,16,1 do -- left to right end end local gradients = tga_encoder.image(pixels) -gradients:save("gradients_16bpp.tga", {colors="RGB", pixel_depth=16}) -gradients:save("gradients_24bpp.tga", {colors="RGB", pixel_depth=24}) +gradients:save("gradients_16bpp_raw.tga", {colors="RGB", compression="RAW", pixel_depth=16}) +gradients:save("gradients_16bpp_rle.tga", {colors="RGB", compression="RLE", pixel_depth=16}) +gradients:save("gradients_24bpp_raw.tga", {colors="RGB", compression="RAW", pixel_depth=24}) +gradients:save("gradients_24bpp_rle.tga", {colors="RGB", compression="RLE", pixel_depth=24}) local pixels = {} for x = 1,512,1 do -- left to right diff --git a/init.lua b/init.lua index a79a32920..c044cdac9 100644 --- a/init.lua +++ b/init.lua @@ -40,15 +40,20 @@ end function image:encode_header(properties) local colors = properties.colors + local compression = properties.compression local pixel_depth = properties.pixel_depth local image_type - if "BW" == colors and 8 == pixel_depth then + if "BW" == colors and "RAW" == compression and 8 == pixel_depth then image_type = 3 -- grayscale elseif ( "RGB" == colors and 16 == pixel_depth or "RGB" == colors and 24 == pixel_depth ) then - image_type = 10 -- RLE RGB + if "RAW" == compression then + image_type = 2 -- RAW RGB + elseif "RLE" == compression then + image_type = 10 -- RLE RGB + end end self.data = self.data .. string.char(0) -- image id @@ -60,13 +65,23 @@ end function image:encode_data(properties) local colors = properties.colors + local compression = properties.compression local pixel_depth = properties.pixel_depth - if "BW" == colors and 8 == pixel_depth then + + if "BW" == colors and "RAW" == compression and 8 == pixel_depth then self:encode_data_bw8() elseif "RGB" == colors and 16 == pixel_depth then - self:encode_data_a1r5g5b5_rle() + if "RAW" == compression then + self:encode_data_a1r5g5b5_raw() + elseif "RLE" == compression then + self:encode_data_a1r5g5b5_rle() + end elseif "RGB" == colors and 24 == pixel_depth then - self:encode_data_r8g8b8_rle() + if "RAW" == compression then + self:encode_data_r8g8b8_raw() + elseif "RLE" == compression then + self:encode_data_r8g8b8_rle() + end end end @@ -81,6 +96,25 @@ function image:encode_data_bw8() self.data = self.data .. table.concat(raw_pixels) end +function image:encode_data_a1r5g5b5_raw() + local raw_pixels = {} + -- Sample depth rescaling is done according to the algorithm presented in: + -- + local max_sample_in = math.pow(2, 8) - 1 + local max_sample_out = math.pow(2, 5) - 1 + for _, row in ipairs(self.pixels) do + for _, pixel in ipairs(row) do + local colorword = 32768 + + ((math.floor((pixel[1] * max_sample_out / max_sample_in) + 0.5)) * 1024) + + ((math.floor((pixel[2] * max_sample_out / max_sample_in) + 0.5)) * 32) + + ((math.floor((pixel[3] * max_sample_out / max_sample_in) + 0.5)) * 1) + local raw_pixel = string.char(colorword % 256, math.floor(colorword / 256)) + raw_pixels[#raw_pixels + 1] = raw_pixel + end + end + self.data = self.data .. table.concat(raw_pixels) +end + function image:encode_data_a1r5g5b5_rle() local colorword = nil local previous_r = nil @@ -170,6 +204,17 @@ function image:encode_data_a1r5g5b5_rle() self.data = self.data .. table.concat(packets) end +function image:encode_data_r8g8b8_raw() + local raw_pixels = {} + for _, row in ipairs(self.pixels) do + for _, pixel in ipairs(row) do + local raw_pixel = string.char(pixel[3], pixel[2], pixel[1]) + raw_pixels[#raw_pixels + 1] = raw_pixel + end + end + self.data = self.data .. table.concat(raw_pixels) +end + function image:encode_data_r8g8b8_rle() local previous_r = nil local previous_g = nil @@ -267,6 +312,7 @@ end function image:save(filename, properties) local properties = properties or {} properties.colors = properties.colors or "RGB" + properties.compression = properties.compression or "RLE" properties.pixel_depth = properties.pixel_depth or 16 self:encode(properties) From 759b0a188f9445940ffad6b47032560b5d56c057 Mon Sep 17 00:00:00 2001 From: Nils Dagsson Moskopp Date: Sun, 15 May 2022 19:22:56 +0200 Subject: [PATCH 15/44] Allow saving R8G8B8 images as BW8 --- examples.lua | 5 ++++- init.lua | 32 ++++++++++++++++++++++++++++++-- 2 files changed, 34 insertions(+), 3 deletions(-) diff --git a/examples.lua b/examples.lua index b2d9de605..c6513553a 100644 --- a/examples.lua +++ b/examples.lua @@ -39,7 +39,7 @@ for x = 1,6,1 do -- left to right pixels[z][x] = color end end -tga_encoder.image(pixels):save("gradients_8bpp_raw.tga", {colors="BW", compression="RAW", pixel_depth=8}) +tga_encoder.image(pixels):save("gradient_8bpp_raw.tga", {colors="BW", compression="RAW", pixel_depth=8}) local pixels = {} for x = 1,16,1 do -- left to right @@ -59,6 +59,7 @@ for x = 1,16,1 do -- left to right end end local gradients = tga_encoder.image(pixels) +gradients:save("gradients_8bpp_raw.tga", {colors="BW", compression="RAW", pixel_depth=8}) gradients:save("gradients_16bpp_raw.tga", {colors="RGB", compression="RAW", pixel_depth=16}) gradients:save("gradients_16bpp_rle.tga", {colors="RGB", compression="RLE", pixel_depth=16}) gradients:save("gradients_24bpp_raw.tga", {colors="RGB", compression="RAW", pixel_depth=24}) @@ -84,4 +85,6 @@ for x = 1,512,1 do -- left to right pixels[z][x] = color end end +tga_encoder.image(pixels):save("fractal_8bpp.tga", {colors="BW", pixel_depth=8}) +tga_encoder.image(pixels):save("fractal_16bpp.tga", {colors="RGB", pixel_depth=16}) tga_encoder.image(pixels):save("fractal_24bpp.tga", {colors="RGB", pixel_depth=24}) diff --git a/init.lua b/init.lua index c044cdac9..0c604afbd 100644 --- a/init.lua +++ b/init.lua @@ -12,6 +12,7 @@ function image:constructor(pixels) self.pixels = pixels self.width = #pixels[1] self.height = #pixels + self.pixel_depth = #pixels[1][1] end function image:encode_colormap_spec() @@ -69,7 +70,11 @@ function image:encode_data(properties) local pixel_depth = properties.pixel_depth if "BW" == colors and "RAW" == compression and 8 == pixel_depth then - self:encode_data_bw8() + if 1 == self.pixel_depth then + self:encode_data_bw8_to_bw8_raw() + elseif 3 == self.pixel_depth then + self:encode_data_r8g8b8_to_bw8_raw() + end elseif "RGB" == colors and 16 == pixel_depth then if "RAW" == compression then self:encode_data_a1r5g5b5_raw() @@ -85,7 +90,8 @@ function image:encode_data(properties) end end -function image:encode_data_bw8() +function image:encode_data_bw8_to_bw8_raw() + assert(1 == self.pixel_depth) local raw_pixels = {} for _, row in ipairs(self.pixels) do for _, pixel in ipairs(row) do @@ -96,7 +102,26 @@ function image:encode_data_bw8() self.data = self.data .. table.concat(raw_pixels) end +function image:encode_data_r8g8b8_to_bw8_raw() + assert(3 == self.pixel_depth) + local raw_pixels = {} + for _, row in ipairs(self.pixels) do + for _, pixel in ipairs(row) do + -- see + local gray = math.floor( + 0.299 * pixel[1] + + 0.587 * pixel[2] + + 0.114 * pixel[3] + ) + local raw_pixel = string.char(gray) + raw_pixels[#raw_pixels + 1] = raw_pixel + end + end + self.data = self.data .. table.concat(raw_pixels) +end + function image:encode_data_a1r5g5b5_raw() + assert(3 == self.pixel_depth) local raw_pixels = {} -- Sample depth rescaling is done according to the algorithm presented in: -- @@ -116,6 +141,7 @@ function image:encode_data_a1r5g5b5_raw() end function image:encode_data_a1r5g5b5_rle() + assert(3 == self.pixel_depth) local colorword = nil local previous_r = nil local previous_g = nil @@ -205,6 +231,7 @@ function image:encode_data_a1r5g5b5_rle() end function image:encode_data_r8g8b8_raw() + assert(3 == self.pixel_depth) local raw_pixels = {} for _, row in ipairs(self.pixels) do for _, pixel in ipairs(row) do @@ -216,6 +243,7 @@ function image:encode_data_r8g8b8_raw() end function image:encode_data_r8g8b8_rle() + assert(3 == self.pixel_depth) local previous_r = nil local previous_g = nil local previous_b = nil From 5b79bc6fb7c409b631d7c2c88bfbbadc78269081 Mon Sep 17 00:00:00 2001 From: Nils Dagsson Moskopp Date: Sun, 15 May 2022 19:29:05 +0200 Subject: [PATCH 16/44] Set default encoding to R8G8B8 RAW This the most trivial RGB encoding the encoder supports. Setting it prevents a crash related to BW8 only supporting RAW encoding. --- init.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/init.lua b/init.lua index 0c604afbd..3aaedbe71 100644 --- a/init.lua +++ b/init.lua @@ -340,8 +340,8 @@ end function image:save(filename, properties) local properties = properties or {} properties.colors = properties.colors or "RGB" - properties.compression = properties.compression or "RLE" - properties.pixel_depth = properties.pixel_depth or 16 + properties.compression = properties.compression or "RAW" + properties.pixel_depth = properties.pixel_depth or 24 self:encode(properties) From 2112637fafb256b92e46c3b13e0fe1f44774a7e9 Mon Sep 17 00:00:00 2001 From: Nils Dagsson Moskopp Date: Sun, 15 May 2022 19:54:53 +0200 Subject: [PATCH 17/44] Use HSP for RGB-to-BW8 conversion --- init.lua | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/init.lua b/init.lua index 3aaedbe71..90d8e3c5f 100644 --- a/init.lua +++ b/init.lua @@ -107,11 +107,15 @@ function image:encode_data_r8g8b8_to_bw8_raw() local raw_pixels = {} for _, row in ipairs(self.pixels) do for _, pixel in ipairs(row) do - -- see + -- the HSP RGB to brightness formula is + -- sqrt( 0.299 r² + .587 g² + .114 b² ) + -- see local gray = math.floor( - 0.299 * pixel[1] + - 0.587 * pixel[2] + - 0.114 * pixel[3] + math.sqrt( + 0.299 * pixel[1]^2 + + 0.587 * pixel[2]^2 + + 0.114 * pixel[3]^2 + ) + 0.5 ) local raw_pixel = string.char(gray) raw_pixels[#raw_pixels + 1] = raw_pixel From 36ee45ebe35ddfc198821ed394be689bd945f327 Mon Sep 17 00:00:00 2001 From: Nils Dagsson Moskopp Date: Mon, 16 May 2022 01:39:33 +0200 Subject: [PATCH 18/44] Add RGBA support (only RAW encoding) --- examples.lua | 9 +++++++++ init.lua | 26 ++++++++++++++++++++++---- 2 files changed, 31 insertions(+), 4 deletions(-) diff --git a/examples.lua b/examples.lua index c6513553a..95665c6e8 100644 --- a/examples.lua +++ b/examples.lua @@ -65,6 +65,15 @@ gradients:save("gradients_16bpp_rle.tga", {colors="RGB", compression="RLE", pixe gradients:save("gradients_24bpp_raw.tga", {colors="RGB", compression="RAW", pixel_depth=24}) gradients:save("gradients_24bpp_rle.tga", {colors="RGB", compression="RLE", pixel_depth=24}) +for x = 1,16,1 do -- left to right + for z = 1,16,1 do -- bottom to top + local color = pixels[z][x] + color[#color+1] = ((x * x) + (z * z)) % 256 + pixels[z][x] = color + end +end +gradients:save("gradients_32bpp_raw.tga", {colors="RGBA", compression="RAW", pixel_depth=32}) + local pixels = {} for x = 1,512,1 do -- left to right for z = 1,512,1 do -- bottom to top diff --git a/init.lua b/init.lua index 90d8e3c5f..00fee2158 100644 --- a/init.lua +++ b/init.lua @@ -12,7 +12,6 @@ function image:constructor(pixels) self.pixels = pixels self.width = #pixels[1] self.height = #pixels - self.pixel_depth = #pixels[1][1] end function image:encode_colormap_spec() @@ -28,7 +27,8 @@ function image:encode_image_spec(properties) assert( "BW" == colors and 8 == pixel_depth or -- (8 bit grayscale = 1 byte = 8 bits) "RGB" == colors and 16 == pixel_depth or -- (A1R5G5B5 = 2 bytes = 16 bits) - "RGB" == colors and 24 == pixel_depth -- (B8G8R8 = 3 bytes = 24 bits) + "RGB" == colors and 24 == pixel_depth or -- (B8G8R8 = 3 bytes = 24 bits) + "RGBA" == colors and 32 == pixel_depth -- (B8G8R8A8 = 4 bytes = 32 bits) ) self.data = self.data .. string.char(0, 0) -- X-origin @@ -48,10 +48,11 @@ function image:encode_header(properties) image_type = 3 -- grayscale elseif ( "RGB" == colors and 16 == pixel_depth or - "RGB" == colors and 24 == pixel_depth + "RGB" == colors and 24 == pixel_depth or + "RGBA" == colors and 32 == pixel_depth ) then if "RAW" == compression then - image_type = 2 -- RAW RGB + image_type = 2 -- RAW RGB(A) elseif "RLE" == compression then image_type = 10 -- RLE RGB end @@ -68,6 +69,7 @@ function image:encode_data(properties) local colors = properties.colors local compression = properties.compression local pixel_depth = properties.pixel_depth + self.pixel_depth = #self.pixels[1][1] if "BW" == colors and "RAW" == compression and 8 == pixel_depth then if 1 == self.pixel_depth then @@ -87,6 +89,10 @@ function image:encode_data(properties) elseif "RLE" == compression then self:encode_data_r8g8b8_rle() end + elseif "RGBA" == colors and 32 == pixel_depth then + if "RAW" == compression then + self:encode_data_r8g8b8a8_raw() + end end end @@ -323,6 +329,18 @@ function image:encode_data_r8g8b8_rle() self.data = self.data .. table.concat(packets) end +function image:encode_data_r8g8b8a8_raw() + assert(4 == self.pixel_depth) + local raw_pixels = {} + for _, row in ipairs(self.pixels) do + for _, pixel in ipairs(row) do + local raw_pixel = string.char(pixel[3], pixel[2], pixel[1], pixel[4]) + raw_pixels[#raw_pixels + 1] = raw_pixel + end + end + self.data = self.data .. table.concat(raw_pixels) +end + function image:encode_footer() self.data = self.data .. string.char(0, 0, 0, 0) -- extension area offset From fa23775bf933f17965f859b6c97c7c702ebabc22 Mon Sep 17 00:00:00 2001 From: Nils Dagsson Moskopp Date: Mon, 16 May 2022 01:54:21 +0200 Subject: [PATCH 19/44] Measure pixel_depth in bits everywhere --- init.lua | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/init.lua b/init.lua index 00fee2158..be713129d 100644 --- a/init.lua +++ b/init.lua @@ -69,12 +69,12 @@ function image:encode_data(properties) local colors = properties.colors local compression = properties.compression local pixel_depth = properties.pixel_depth - self.pixel_depth = #self.pixels[1][1] + self.pixel_depth = #self.pixels[1][1] * 8 if "BW" == colors and "RAW" == compression and 8 == pixel_depth then - if 1 == self.pixel_depth then + if 8 == self.pixel_depth then self:encode_data_bw8_to_bw8_raw() - elseif 3 == self.pixel_depth then + elseif 24 == self.pixel_depth then self:encode_data_r8g8b8_to_bw8_raw() end elseif "RGB" == colors and 16 == pixel_depth then @@ -97,7 +97,7 @@ function image:encode_data(properties) end function image:encode_data_bw8_to_bw8_raw() - assert(1 == self.pixel_depth) + assert(8 == self.pixel_depth) local raw_pixels = {} for _, row in ipairs(self.pixels) do for _, pixel in ipairs(row) do @@ -109,7 +109,7 @@ function image:encode_data_bw8_to_bw8_raw() end function image:encode_data_r8g8b8_to_bw8_raw() - assert(3 == self.pixel_depth) + assert(24 == self.pixel_depth) local raw_pixels = {} for _, row in ipairs(self.pixels) do for _, pixel in ipairs(row) do @@ -131,7 +131,7 @@ function image:encode_data_r8g8b8_to_bw8_raw() end function image:encode_data_a1r5g5b5_raw() - assert(3 == self.pixel_depth) + assert(24 == self.pixel_depth) local raw_pixels = {} -- Sample depth rescaling is done according to the algorithm presented in: -- @@ -151,7 +151,7 @@ function image:encode_data_a1r5g5b5_raw() end function image:encode_data_a1r5g5b5_rle() - assert(3 == self.pixel_depth) + assert(24 == self.pixel_depth) local colorword = nil local previous_r = nil local previous_g = nil @@ -241,7 +241,7 @@ function image:encode_data_a1r5g5b5_rle() end function image:encode_data_r8g8b8_raw() - assert(3 == self.pixel_depth) + assert(24 == self.pixel_depth) local raw_pixels = {} for _, row in ipairs(self.pixels) do for _, pixel in ipairs(row) do @@ -253,7 +253,7 @@ function image:encode_data_r8g8b8_raw() end function image:encode_data_r8g8b8_rle() - assert(3 == self.pixel_depth) + assert(24 == self.pixel_depth) local previous_r = nil local previous_g = nil local previous_b = nil @@ -330,7 +330,7 @@ function image:encode_data_r8g8b8_rle() end function image:encode_data_r8g8b8a8_raw() - assert(4 == self.pixel_depth) + assert(32 == self.pixel_depth) local raw_pixels = {} for _, row in ipairs(self.pixels) do for _, pixel in ipairs(row) do From 7b94fc026d10cc0c56aa0e5d50be61cac49b8278 Mon Sep 17 00:00:00 2001 From: Nils Dagsson Moskopp Date: Mon, 16 May 2022 02:48:51 +0200 Subject: [PATCH 20/44] Allow to specify color format --- examples.lua | 20 ++++++------- init.lua | 85 ++++++++++++++++++++++++++++++---------------------- 2 files changed, 60 insertions(+), 45 deletions(-) diff --git a/examples.lua b/examples.lua index 95665c6e8..559d36ac2 100644 --- a/examples.lua +++ b/examples.lua @@ -39,7 +39,7 @@ for x = 1,6,1 do -- left to right pixels[z][x] = color end end -tga_encoder.image(pixels):save("gradient_8bpp_raw.tga", {colors="BW", compression="RAW", pixel_depth=8}) +tga_encoder.image(pixels):save("gradient_8bpp_raw.tga", {color_format="Y8", compression="RAW"}) local pixels = {} for x = 1,16,1 do -- left to right @@ -59,11 +59,11 @@ for x = 1,16,1 do -- left to right end end local gradients = tga_encoder.image(pixels) -gradients:save("gradients_8bpp_raw.tga", {colors="BW", compression="RAW", pixel_depth=8}) -gradients:save("gradients_16bpp_raw.tga", {colors="RGB", compression="RAW", pixel_depth=16}) -gradients:save("gradients_16bpp_rle.tga", {colors="RGB", compression="RLE", pixel_depth=16}) -gradients:save("gradients_24bpp_raw.tga", {colors="RGB", compression="RAW", pixel_depth=24}) -gradients:save("gradients_24bpp_rle.tga", {colors="RGB", compression="RLE", pixel_depth=24}) +gradients:save("gradients_8bpp_raw.tga", {color_format="Y8", compression="RAW"}) +gradients:save("gradients_16bpp_raw.tga", {color_format="A1R5G5B5", compression="RAW"}) +gradients:save("gradients_16bpp_rle.tga", {color_format="A1R5G5B5", compression="RLE"}) +gradients:save("gradients_24bpp_raw.tga", {color_format="B8G8R8", compression="RAW"}) +gradients:save("gradients_24bpp_rle.tga", {color_format="B8G8R8", compression="RLE"}) for x = 1,16,1 do -- left to right for z = 1,16,1 do -- bottom to top @@ -72,7 +72,7 @@ for x = 1,16,1 do -- left to right pixels[z][x] = color end end -gradients:save("gradients_32bpp_raw.tga", {colors="RGBA", compression="RAW", pixel_depth=32}) +gradients:save("gradients_32bpp_raw.tga", {color_format="B8G8R8A8", compression="RAW"}) local pixels = {} for x = 1,512,1 do -- left to right @@ -94,6 +94,6 @@ for x = 1,512,1 do -- left to right pixels[z][x] = color end end -tga_encoder.image(pixels):save("fractal_8bpp.tga", {colors="BW", pixel_depth=8}) -tga_encoder.image(pixels):save("fractal_16bpp.tga", {colors="RGB", pixel_depth=16}) -tga_encoder.image(pixels):save("fractal_24bpp.tga", {colors="RGB", pixel_depth=24}) +tga_encoder.image(pixels):save("fractal_8bpp.tga", {color_format="Y8"}) +tga_encoder.image(pixels):save("fractal_16bpp.tga", {color_format="A1R5G5B5"}) +tga_encoder.image(pixels):save("fractal_24bpp.tga", {color_format="B8G8R8"}) diff --git a/init.lua b/init.lua index be713129d..07e1ebde3 100644 --- a/init.lua +++ b/init.lua @@ -22,14 +22,21 @@ function image:encode_colormap_spec() end function image:encode_image_spec(properties) - local colors = properties.colors - local pixel_depth = properties.pixel_depth + local color_format = properties.color_format assert( - "BW" == colors and 8 == pixel_depth or -- (8 bit grayscale = 1 byte = 8 bits) - "RGB" == colors and 16 == pixel_depth or -- (A1R5G5B5 = 2 bytes = 16 bits) - "RGB" == colors and 24 == pixel_depth or -- (B8G8R8 = 3 bytes = 24 bits) - "RGBA" == colors and 32 == pixel_depth -- (B8G8R8A8 = 4 bytes = 32 bits) + "Y8" == color_format or -- (8 bit grayscale = 1 byte = 8 bits) + "A1R5G5B5" == color_format or -- (A1R5G5B5 = 2 bytes = 16 bits) + "B8G8R8" == color_format or -- (B8G8R8 = 3 bytes = 24 bits) + "B8G8R8A8" == color_format -- (B8G8R8A8 = 4 bytes = 32 bits) ) + pixel_depth_by_color_format = { + ["Y8"] = 8, + ["A1R5G5B5"] = 16, + ["B8G8R8"] = 24, + ["B8G8R8A8"] = 32, + } + local pixel_depth = pixel_depth_by_color_format[color_format] + assert( nil ~= pixel_depth) self.data = self.data .. string.char(0, 0) -- X-origin .. string.char(0, 0) -- Y-origin @@ -40,16 +47,15 @@ function image:encode_image_spec(properties) end function image:encode_header(properties) - local colors = properties.colors + local color_format = properties.color_format local compression = properties.compression - local pixel_depth = properties.pixel_depth local image_type - if "BW" == colors and "RAW" == compression and 8 == pixel_depth then + if "Y8" == color_format and "RAW" == compression then image_type = 3 -- grayscale elseif ( - "RGB" == colors and 16 == pixel_depth or - "RGB" == colors and 24 == pixel_depth or - "RGBA" == colors and 32 == pixel_depth + "A1R5G5B5" == color_format or + "B8G8R8" == color_format or + "B8G8R8A8" == color_format ) then if "RAW" == compression then image_type = 2 -- RAW RGB(A) @@ -57,6 +63,7 @@ function image:encode_header(properties) image_type = 10 -- RLE RGB end end + assert( nil ~= image_type ) self.data = self.data .. string.char(0) -- image id .. string.char(0) -- color map type @@ -66,37 +73,35 @@ function image:encode_header(properties) end function image:encode_data(properties) - local colors = properties.colors + local color_format = properties.color_format local compression = properties.compression - local pixel_depth = properties.pixel_depth - self.pixel_depth = #self.pixels[1][1] * 8 - if "BW" == colors and "RAW" == compression and 8 == pixel_depth then + if "Y8" == color_format and "RAW" == compression then if 8 == self.pixel_depth then - self:encode_data_bw8_to_bw8_raw() + self:encode_data_Y8_as_Y8_raw() elseif 24 == self.pixel_depth then - self:encode_data_r8g8b8_to_bw8_raw() + self:encode_data_R8G8B8_as_Y8_raw() end - elseif "RGB" == colors and 16 == pixel_depth then + elseif "A1R5G5B5" == color_format then if "RAW" == compression then - self:encode_data_a1r5g5b5_raw() + self:encode_data_R8G8B8_as_A1R5G5B5_raw() elseif "RLE" == compression then - self:encode_data_a1r5g5b5_rle() + self:encode_data_R8G8B8_as_A1R5G5B5_rle() end - elseif "RGB" == colors and 24 == pixel_depth then + elseif "B8G8R8" == color_format then if "RAW" == compression then - self:encode_data_r8g8b8_raw() + self:encode_data_R8G8B8_as_B8G8R8_raw() elseif "RLE" == compression then - self:encode_data_r8g8b8_rle() + self:encode_data_R8G8B8_as_B8G8R8_rle() end - elseif "RGBA" == colors and 32 == pixel_depth then + elseif "B8G8R8A8" == color_format then if "RAW" == compression then - self:encode_data_r8g8b8a8_raw() + self:encode_data_R8G8B8A8_as_B8G8R8A8_raw() end end end -function image:encode_data_bw8_to_bw8_raw() +function image:encode_data_Y8_as_Y8_raw() assert(8 == self.pixel_depth) local raw_pixels = {} for _, row in ipairs(self.pixels) do @@ -108,7 +113,7 @@ function image:encode_data_bw8_to_bw8_raw() self.data = self.data .. table.concat(raw_pixels) end -function image:encode_data_r8g8b8_to_bw8_raw() +function image:encode_data_R8G8B8_as_Y8_raw() assert(24 == self.pixel_depth) local raw_pixels = {} for _, row in ipairs(self.pixels) do @@ -130,7 +135,7 @@ function image:encode_data_r8g8b8_to_bw8_raw() self.data = self.data .. table.concat(raw_pixels) end -function image:encode_data_a1r5g5b5_raw() +function image:encode_data_R8G8B8_as_A1R5G5B5_raw() assert(24 == self.pixel_depth) local raw_pixels = {} -- Sample depth rescaling is done according to the algorithm presented in: @@ -150,7 +155,7 @@ function image:encode_data_a1r5g5b5_raw() self.data = self.data .. table.concat(raw_pixels) end -function image:encode_data_a1r5g5b5_rle() +function image:encode_data_R8G8B8_as_A1R5G5B5_rle() assert(24 == self.pixel_depth) local colorword = nil local previous_r = nil @@ -240,7 +245,7 @@ function image:encode_data_a1r5g5b5_rle() self.data = self.data .. table.concat(packets) end -function image:encode_data_r8g8b8_raw() +function image:encode_data_R8G8B8_as_B8G8R8_raw() assert(24 == self.pixel_depth) local raw_pixels = {} for _, row in ipairs(self.pixels) do @@ -252,7 +257,7 @@ function image:encode_data_r8g8b8_raw() self.data = self.data .. table.concat(raw_pixels) end -function image:encode_data_r8g8b8_rle() +function image:encode_data_R8G8B8_as_B8G8R8_rle() assert(24 == self.pixel_depth) local previous_r = nil local previous_g = nil @@ -329,7 +334,7 @@ function image:encode_data_r8g8b8_rle() self.data = self.data .. table.concat(packets) end -function image:encode_data_r8g8b8a8_raw() +function image:encode_data_R8G8B8A8_as_B8G8R8A8_raw() assert(32 == self.pixel_depth) local raw_pixels = {} for _, row in ipairs(self.pixels) do @@ -361,9 +366,19 @@ end function image:save(filename, properties) local properties = properties or {} - properties.colors = properties.colors or "RGB" properties.compression = properties.compression or "RAW" - properties.pixel_depth = properties.pixel_depth or 24 + + self.pixel_depth = #self.pixels[1][1] * 8 + if nil == properties.color_format then + if 8 == self.pixel_depth then + properties.color_format = "Y8" + elseif 24 == self.pixel_depth then + properties.color_format = "B8G8R8" + elseif 32 == self.pixel_depth then + properties.color_format = "B8G8R8A8" + end + end + assert( nil ~= properties.color_format ) self:encode(properties) From 1f9c446a98c9082ac1083532f8419966773a8f1e Mon Sep 17 00:00:00 2001 From: Nils Dagsson Moskopp Date: Mon, 16 May 2022 03:21:52 +0200 Subject: [PATCH 21/44] Assert that pixel data is encoded --- init.lua | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/init.lua b/init.lua index 07e1ebde3..e8cc8942a 100644 --- a/init.lua +++ b/init.lua @@ -76,6 +76,7 @@ function image:encode_data(properties) local color_format = properties.color_format local compression = properties.compression + local data_length_before = #self.data if "Y8" == color_format and "RAW" == compression then if 8 == self.pixel_depth then self:encode_data_Y8_as_Y8_raw() @@ -99,6 +100,11 @@ function image:encode_data(properties) self:encode_data_R8G8B8A8_as_B8G8R8A8_raw() end end + local data_length_after = #self.data + assert( + data_length_after ~= data_length_before, + "No data encoded for color format: " .. color_format + ) end function image:encode_data_Y8_as_Y8_raw() From ed061e68ffb9eb80ac816f74eaeb1c4513511253 Mon Sep 17 00:00:00 2001 From: Nils Dagsson Moskopp Date: Mon, 16 May 2022 13:16:23 +0200 Subject: [PATCH 22/44] Allow RLE encoding for RGBA images --- examples.lua | 3 ++ init.lua | 81 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 84 insertions(+) diff --git a/examples.lua b/examples.lua index 559d36ac2..6255cf539 100644 --- a/examples.lua +++ b/examples.lua @@ -73,6 +73,9 @@ for x = 1,16,1 do -- left to right end end gradients:save("gradients_32bpp_raw.tga", {color_format="B8G8R8A8", compression="RAW"}) +-- the RLE-compressed file is larger than just dumping pixels because +-- the gradients in this picture can not be compressed well using RLE +gradients:save("gradients_32bpp_rle.tga", {color_format="B8G8R8A8", compression="RLE"}) local pixels = {} for x = 1,512,1 do -- left to right diff --git a/init.lua b/init.lua index e8cc8942a..562d1e1f1 100644 --- a/init.lua +++ b/init.lua @@ -98,6 +98,8 @@ function image:encode_data(properties) elseif "B8G8R8A8" == color_format then if "RAW" == compression then self:encode_data_R8G8B8A8_as_B8G8R8A8_raw() + elseif "RLE" == compression then + self:encode_data_R8G8B8A8_as_B8G8R8A8_rle() end end local data_length_after = #self.data @@ -352,6 +354,85 @@ function image:encode_data_R8G8B8A8_as_B8G8R8A8_raw() self.data = self.data .. table.concat(raw_pixels) end +function image:encode_data_R8G8B8A8_as_B8G8R8A8_rle() + assert(32 == self.pixel_depth) + local previous_r = nil + local previous_g = nil + local previous_b = nil + local previous_a = nil + local raw_pixel = '' + local raw_pixels = {} + local count = 1 + local packets = {} + local raw_packet = '' + local rle_packet = '' + for _, row in ipairs(self.pixels) do + for _, pixel in ipairs(row) do + if pixel[1] ~= previous_r or pixel[2] ~= previous_g or pixel[3] ~= previous_b or pixel[4] ~= previous_a or count == 128 then + if nil ~= previous_r then + if 1 == count then + -- remember pixel verbatim for raw encoding + raw_pixel = string.char(previous_b, previous_g, previous_r, previous_a) + raw_pixels[#raw_pixels + 1] = raw_pixel + if 128 == #raw_pixels then + raw_packet = string.char(#raw_pixels - 1) + packets[#packets + 1] = raw_packet + for i=1, #raw_pixels do + packets[#packets +1] = raw_pixels[i] + end + raw_pixels = {} + end + else + -- encode raw pixels, if any + if #raw_pixels > 0 then + raw_packet = string.char(#raw_pixels - 1) + packets[#packets + 1] = raw_packet + for i=1, #raw_pixels do + packets[#packets +1] = raw_pixels[i] + end + raw_pixels = {} + end + -- RLE encoding + rle_packet = string.char(128 + count - 1, previous_b, previous_g, previous_r, previous_a) + packets[#packets +1] = rle_packet + end + end + count = 1 + previous_r = pixel[1] + previous_g = pixel[2] + previous_b = pixel[3] + previous_a = pixel[4] + else + count = count + 1 + end + end + end + if 1 == count then + raw_pixel = string.char(previous_b, previous_g, previous_r, previous_a) + raw_pixels[#raw_pixels + 1] = raw_pixel + raw_packet = string.char(#raw_pixels - 1) + packets[#packets + 1] = raw_packet + for i=1, #raw_pixels do + packets[#packets +1] = raw_pixels[i] + end + raw_pixels = {} + else + -- encode raw pixels, if any + if #raw_pixels > 0 then + raw_packet = string.char(#raw_pixels - 1) + packets[#packets + 1] = raw_packet + for i=1, #raw_pixels do + packets[#packets +1] = raw_pixels[i] + end + raw_pixels = {} + end + -- RLE encoding + rle_packet = string.char(128 + count - 1, previous_b, previous_g, previous_r, previous_a) + packets[#packets +1] = rle_packet + end + self.data = self.data .. table.concat(packets) +end + function image:encode_footer() self.data = self.data .. string.char(0, 0, 0, 0) -- extension area offset From 9f9b78eed96eccac2cf6123ee0e54d36f1318d09 Mon Sep 17 00:00:00 2001 From: Nils Dagsson Moskopp Date: Mon, 16 May 2022 17:01:38 +0200 Subject: [PATCH 23/44] Allow color-mapped encoding for RGB images --- examples.lua | 26 +++++++++++++ init.lua | 104 +++++++++++++++++++++++++++++++++++++++++---------- 2 files changed, 111 insertions(+), 19 deletions(-) diff --git a/examples.lua b/examples.lua index 6255cf539..f80663d0e 100644 --- a/examples.lua +++ b/examples.lua @@ -100,3 +100,29 @@ end tga_encoder.image(pixels):save("fractal_8bpp.tga", {color_format="Y8"}) tga_encoder.image(pixels):save("fractal_16bpp.tga", {color_format="A1R5G5B5"}) tga_encoder.image(pixels):save("fractal_24bpp.tga", {color_format="B8G8R8"}) + +-- encode a colormapped bitmap +local K = { 0 } +local B = { 1 } +local R = { 2 } +local G = { 3 } +local W = { 4 } +local colormap = { + { 1, 2, 3 }, -- K + { 0, 0, 255 }, -- B + { 255, 0, 0 }, -- R + { 0, 255, 0 }, -- G + { 253, 254, 255 }, -- W +} +local pixels = { + { W, K, W, K, W, K, W }, + { R, G, B, R, G, B, K }, + { K, W, K, W, K, W, K }, + { G, B, R, G, B, R, W }, + { W, W, W, K, K, K, W }, + { B, R, G, B, R, G, K }, + { B, R, G, B, R, G, W }, +} +-- note that the uncompressed colormapped TGA file written in this +-- example is 108 bytes – but an optimized PNG file is 121 bytes … +tga_encoder.image(pixels):save("colormapped_8bpp.tga", {colormap=colormap}) diff --git a/init.lua b/init.lua index 562d1e1f1..49a2d44ce 100644 --- a/init.lua +++ b/init.lua @@ -14,11 +14,21 @@ function image:constructor(pixels) self.height = #pixels end -function image:encode_colormap_spec() - self.data = self.data - .. string.char(0, 0) -- first entry index - .. string.char(0, 0) -- number of entries - .. string.char(0) -- bits per pixel +function image:encode_colormap_spec(properties) + local colormap_spec + if nil ~= properties.colormap then + local color_count = #properties.colormap + colormap_spec = + string.char(0, 0) .. -- first entry index + string.char(color_count % 256, math.floor(color_count / 256)) .. -- number of entries + string.char(#properties.colormap[1] * 8) -- bits per pixel + else -- no colormap + colormap_spec = + string.char(0, 0) .. -- first entry index + string.char(0, 0) .. -- number of entries + string.char(0) -- bits per pixel + end + self.data = self.data .. colormap_spec end function image:encode_image_spec(properties) @@ -35,7 +45,12 @@ function image:encode_image_spec(properties) ["B8G8R8"] = 24, ["B8G8R8A8"] = 32, } - local pixel_depth = pixel_depth_by_color_format[color_format] + local pixel_depth + if nil ~= properties.colormap then + pixel_depth = self.pixel_depth + else + pixel_depth = pixel_depth_by_color_format[color_format] + end assert( nil ~= pixel_depth) self.data = self.data .. string.char(0, 0) -- X-origin @@ -46,8 +61,31 @@ function image:encode_image_spec(properties) .. string.char(0) -- image descriptor end +function image:encode_colormap(properties) + local colormap = properties.colormap + if nil == colormap then + return + end + local colormap_pixel_depth = #colormap[1] * 8 + assert( 24 == colormap_pixel_depth ) + local colors = {} + if 24 == colormap_pixel_depth then + for i = 1,#colormap,1 do + local color = colormap[i] + local color_bytes = string.char( + color[3], -- B + color[2], -- G + color[1] -- R + ) + colors[#colors + 1] = color_bytes + end + end + self.data = self.data .. table.concat(colors) +end + function image:encode_header(properties) local color_format = properties.color_format + local colormap = properties.colormap local compression = properties.compression local image_type if "Y8" == color_format and "RAW" == compression then @@ -58,22 +96,32 @@ function image:encode_header(properties) "B8G8R8A8" == color_format ) then if "RAW" == compression then - image_type = 2 -- RAW RGB(A) + if nil ~= colormap then + image_type = 1 -- colormapped RGB(A) + else + image_type = 2 -- RAW RGB(A) + end elseif "RLE" == compression then image_type = 10 -- RLE RGB end end assert( nil ~= image_type ) + local colormap_type = 0 + if nil ~= colormap then + colormap_type = 1 + end self.data = self.data .. string.char(0) -- image id - .. string.char(0) -- color map type + .. string.char(colormap_type) .. string.char(image_type) - self:encode_colormap_spec() -- color map specification + self:encode_colormap_spec(properties) -- color map specification self:encode_image_spec(properties) -- image specification + self:encode_colormap(properties) end function image:encode_data(properties) local color_format = properties.color_format + local colormap = properties.colormap local compression = properties.compression local data_length_before = #self.data @@ -90,10 +138,18 @@ function image:encode_data(properties) self:encode_data_R8G8B8_as_A1R5G5B5_rle() end elseif "B8G8R8" == color_format then - if "RAW" == compression then - self:encode_data_R8G8B8_as_B8G8R8_raw() - elseif "RLE" == compression then - self:encode_data_R8G8B8_as_B8G8R8_rle() + if nil ~= colormap then + if "RAW" == compression then + if 8 == self.pixel_depth then + self:encode_data_Y8_as_Y8_raw() + end + end + else + if "RAW" == compression then + self:encode_data_R8G8B8_as_B8G8R8_raw() + elseif "RLE" == compression then + self:encode_data_R8G8B8_as_B8G8R8_rle() + end end elseif "B8G8R8A8" == color_format then if "RAW" == compression then @@ -456,13 +512,23 @@ function image:save(filename, properties) properties.compression = properties.compression or "RAW" self.pixel_depth = #self.pixels[1][1] * 8 + + local color_format_defaults_by_pixel_depth = { + [8] = "Y8", + [24] = "B8G8R8", + [32] = "B8G8R8A8", + } if nil == properties.color_format then - if 8 == self.pixel_depth then - properties.color_format = "Y8" - elseif 24 == self.pixel_depth then - properties.color_format = "B8G8R8" - elseif 32 == self.pixel_depth then - properties.color_format = "B8G8R8A8" + if nil ~= properties.colormap then + properties.color_format = + color_format_defaults_by_pixel_depth[ + #properties.colormap[1] * 8 + ] + else + properties.color_format = + color_format_defaults_by_pixel_depth[ + self.pixel_depth + ] end end assert( nil ~= properties.color_format ) From e83894fcfabd229e4d5e7b9f538ed30fb3f00cdd Mon Sep 17 00:00:00 2001 From: Nils Dagsson Moskopp Date: Mon, 16 May 2022 17:56:53 +0200 Subject: [PATCH 24/44] Treat empty colormap as no colormap --- init.lua | 41 ++++++++++++++++++++--------------------- 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/init.lua b/init.lua index 49a2d44ce..bfe049166 100644 --- a/init.lua +++ b/init.lua @@ -15,19 +15,15 @@ function image:constructor(pixels) end function image:encode_colormap_spec(properties) - local colormap_spec - if nil ~= properties.colormap then - local color_count = #properties.colormap - colormap_spec = - string.char(0, 0) .. -- first entry index - string.char(color_count % 256, math.floor(color_count / 256)) .. -- number of entries - string.char(#properties.colormap[1] * 8) -- bits per pixel - else -- no colormap - colormap_spec = - string.char(0, 0) .. -- first entry index - string.char(0, 0) .. -- number of entries - string.char(0) -- bits per pixel + local colormap = properties.colormap + local colormap_pixel_depth = 0 + if 0 ~= #colormap then + colormap_pixel_depth = #colormap[1] * 8 end + local colormap_spec = + string.char(0, 0) .. -- first entry index + string.char(#colormap % 256, math.floor(#colormap / 256)) .. -- number of entries + string.char(colormap_pixel_depth) -- bits per pixel self.data = self.data .. colormap_spec end @@ -46,7 +42,7 @@ function image:encode_image_spec(properties) ["B8G8R8A8"] = 32, } local pixel_depth - if nil ~= properties.colormap then + if 0 ~= #properties.colormap then pixel_depth = self.pixel_depth else pixel_depth = pixel_depth_by_color_format[color_format] @@ -63,7 +59,7 @@ end function image:encode_colormap(properties) local colormap = properties.colormap - if nil == colormap then + if 0 == #colormap then return end local colormap_pixel_depth = #colormap[1] * 8 @@ -87,8 +83,10 @@ function image:encode_header(properties) local color_format = properties.color_format local colormap = properties.colormap local compression = properties.compression + local colormap_type local image_type if "Y8" == color_format and "RAW" == compression then + colormap_type = 0 image_type = 3 -- grayscale elseif ( "A1R5G5B5" == color_format or @@ -96,20 +94,20 @@ function image:encode_header(properties) "B8G8R8A8" == color_format ) then if "RAW" == compression then - if nil ~= colormap then + if 0 ~= #colormap then + colormap_type = 1 image_type = 1 -- colormapped RGB(A) else + colormap_type = 0 image_type = 2 -- RAW RGB(A) end elseif "RLE" == compression then + colormap_type = 0 image_type = 10 -- RLE RGB end end + assert( nil ~= colormap_type ) assert( nil ~= image_type ) - local colormap_type = 0 - if nil ~= colormap then - colormap_type = 1 - end self.data = self.data .. string.char(0) -- image id .. string.char(colormap_type) @@ -138,7 +136,7 @@ function image:encode_data(properties) self:encode_data_R8G8B8_as_A1R5G5B5_rle() end elseif "B8G8R8" == color_format then - if nil ~= colormap then + if 0 ~= #colormap then if "RAW" == compression then if 8 == self.pixel_depth then self:encode_data_Y8_as_Y8_raw() @@ -509,6 +507,7 @@ end function image:save(filename, properties) local properties = properties or {} + properties.colormap = properties.colormap or {} properties.compression = properties.compression or "RAW" self.pixel_depth = #self.pixels[1][1] * 8 @@ -519,7 +518,7 @@ function image:save(filename, properties) [32] = "B8G8R8A8", } if nil == properties.color_format then - if nil ~= properties.colormap then + if 0 ~= #properties.colormap then properties.color_format = color_format_defaults_by_pixel_depth[ #properties.colormap[1] * 8 From 45e405982a820c3fb81c11b65350ca7cae2a53e4 Mon Sep 17 00:00:00 2001 From: Nils Dagsson Moskopp Date: Mon, 16 May 2022 18:41:19 +0200 Subject: [PATCH 25/44] Allow encoding with A1R5G5B5 colormap --- examples.lua | 4 +++- init.lua | 60 ++++++++++++++++++++++++++++++++++++++++------------ 2 files changed, 49 insertions(+), 15 deletions(-) diff --git a/examples.lua b/examples.lua index f80663d0e..9ac530cbf 100644 --- a/examples.lua +++ b/examples.lua @@ -125,4 +125,6 @@ local pixels = { } -- note that the uncompressed colormapped TGA file written in this -- example is 108 bytes – but an optimized PNG file is 121 bytes … -tga_encoder.image(pixels):save("colormapped_8bpp.tga", {colormap=colormap}) +tga_encoder.image(pixels):save("colormapped_B8G8R8.tga", {colormap=colormap}) +-- encoding as A1R5G5B5 saves 1 byte per palette entry → 103 bytes +tga_encoder.image(pixels):save("colormapped_A1R5G5B5.tga", {colormap=colormap, color_format="A1R5G5B5"}) diff --git a/init.lua b/init.lua index bfe049166..f77b93a07 100644 --- a/init.lua +++ b/init.lua @@ -14,11 +14,20 @@ function image:constructor(pixels) self.height = #pixels end +local pixel_depth_by_color_format = { + ["Y8"] = 8, + ["A1R5G5B5"] = 16, + ["B8G8R8"] = 24, + ["B8G8R8A8"] = 32, +} + function image:encode_colormap_spec(properties) local colormap = properties.colormap local colormap_pixel_depth = 0 if 0 ~= #colormap then - colormap_pixel_depth = #colormap[1] * 8 + colormap_pixel_depth = pixel_depth_by_color_format[ + properties.color_format + ] end local colormap_spec = string.char(0, 0) .. -- first entry index @@ -35,12 +44,6 @@ function image:encode_image_spec(properties) "B8G8R8" == color_format or -- (B8G8R8 = 3 bytes = 24 bits) "B8G8R8A8" == color_format -- (B8G8R8A8 = 4 bytes = 32 bits) ) - pixel_depth_by_color_format = { - ["Y8"] = 8, - ["A1R5G5B5"] = 16, - ["B8G8R8"] = 24, - ["B8G8R8A8"] = 32, - } local pixel_depth if 0 ~= #properties.colormap then pixel_depth = self.pixel_depth @@ -62,10 +65,30 @@ function image:encode_colormap(properties) if 0 == #colormap then return end - local colormap_pixel_depth = #colormap[1] * 8 - assert( 24 == colormap_pixel_depth ) + local color_format = properties.color_format + assert ( + "A1R5G5B5" == color_format or + "B8G8R8" == color_format + ) local colors = {} - if 24 == colormap_pixel_depth then + if "A1R5G5B5" == color_format then + -- Sample depth rescaling is done according to the algorithm presented in: + -- + local max_sample_in = math.pow(2, 8) - 1 + local max_sample_out = math.pow(2, 5) - 1 + for i = 1,#colormap,1 do + local color = colormap[i] + local colorword = 32768 + + ((math.floor((color[1] * max_sample_out / max_sample_in) + 0.5)) * 1024) + + ((math.floor((color[2] * max_sample_out / max_sample_in) + 0.5)) * 32) + + ((math.floor((color[3] * max_sample_out / max_sample_in) + 0.5)) * 1) + local color_bytes = string.char( + colorword % 256, + math.floor(colorword / 256) + ) + colors[#colors + 1] = color_bytes + end + elseif "B8G8R8" == color_format then for i = 1,#colormap,1 do local color = colormap[i] local color_bytes = string.char( @@ -76,6 +99,7 @@ function image:encode_colormap(properties) colors[#colors + 1] = color_bytes end end + assert( 0 ~= #colors ) self.data = self.data .. table.concat(colors) end @@ -130,10 +154,18 @@ function image:encode_data(properties) self:encode_data_R8G8B8_as_Y8_raw() end elseif "A1R5G5B5" == color_format then - if "RAW" == compression then - self:encode_data_R8G8B8_as_A1R5G5B5_raw() - elseif "RLE" == compression then - self:encode_data_R8G8B8_as_A1R5G5B5_rle() + if 0 ~= #colormap then + if "RAW" == compression then + if 8 == self.pixel_depth then + self:encode_data_Y8_as_Y8_raw() + end + end + else + if "RAW" == compression then + self:encode_data_R8G8B8_as_A1R5G5B5_raw() + elseif "RLE" == compression then + self:encode_data_R8G8B8_as_A1R5G5B5_rle() + end end elseif "B8G8R8" == color_format then if 0 ~= #colormap then From 83348bf3ac49adb2e142cffde1accd3b620f727c Mon Sep 17 00:00:00 2001 From: Nils Dagsson Moskopp Date: Mon, 16 May 2022 20:34:33 +0200 Subject: [PATCH 26/44] Document use cases, image type support, plans --- README.md | 79 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+) diff --git a/README.md b/README.md index 195cb8df5..555cefd59 100644 --- a/README.md +++ b/README.md @@ -6,3 +6,82 @@ Created by fleckenstein for MineClone2, then improved by erlehmann. May be used as a Minetest mod. See `examples.lua` for example code and usage hints. + +## Use Cases for `tga_encoder` + +### Encoding Textures for Editing + +TGA images of types 1/2/3 consist of header data followed by a pixel array. + +This makes it trivial to parse TGA files – and even edit pixels in-place. + +No checksums need to be updated on any kind of in-place texture editing. + +**Tip**: When storing an editable image in item meta, use zlib compression. + +### Legacy Minetest Texture Encoding + +Minetest 5.4 did not include `minetest.encode_png()` (or any equvivalent). + +Since `tga_encoder` is written in pure Lua, it does not need engine support. + +**Tip:** Look at `examples.lua` and the Minetest mod `mcl_maps` for guidance. + +### Advanced Texture Format Control + +The function `minetest.encode_png()` always encodes images as 32bpp RGBA. + +`tga_encoder` allows saving images as grayscale, 16bpp RGBA and 24bpp RGB. + +For generating maps from terrain, color-mapped formats can be more useful. + +### Encoding Very Small Textures + +Images of size 8×8 or below are often smaller than an equivalent PNG file. + +Note that on many filesystems files use at least 4096 bytes (i.e. 64×64). + +Therefore, saving bytes on files up to a few 100 bytes is often useless. + +### Encoding Reference Textures + +TGA is a simple format, which makes it easy to create reference textures. + +Using a hex editor, one can trivially see how all the pixels are stored. + +## Supported Image Types + +For all types, images are encoded in a fast single pass (i.e. append-only). + +### Color-Mapped Images (Type 1) + +These images contain a palette, followed by pixel data. + +* `A1R5G5B5` (8bpp RGB) +* `B8G8R8` (8bpp RGB) + +### True-Color Images (Type 2) + +These images contain uncompressed RGB(A) pixel data. + +* `A1R5G5B5` (16bpp RGBA) +* `B8G8R8` (24bpp RGB) +* `B8G8R8A8` (32bpp RGBA) + +### Grayscale Images (Type 3) + +* `Y8` (8bpp grayscale) + +### Run-Length Encoded (RLE), True-Color Images (Type 10) + +These images contain compressed RGB(A) pixel data. + +* `A1R5G5B5` (16bpp RGBA) +* `B8G8R8` (24bpp RGB) +* `B8G8R8A8` (32bpp RGBA) + +## TODO + +* Support Type 1 `B8G8R8A8` output (color-mapped 8bpp RGBA) +* Actually support `R8G8B8A8` input for `A1R5G5B5` output +* Add both zoomable and explorable maps to `mcl_maps`. From 7446a275b5424cc56c8a0b2670ab22cf95593086 Mon Sep 17 00:00:00 2001 From: Nils Dagsson Moskopp Date: Mon, 16 May 2022 22:17:52 +0200 Subject: [PATCH 27/44] Remove author from mod.conf ContentDB sets this field automatically --- mod.conf | 1 - 1 file changed, 1 deletion(-) diff --git a/mod.conf b/mod.conf index e4bfac898..d65aca884 100644 --- a/mod.conf +++ b/mod.conf @@ -1,3 +1,2 @@ name = tga_encoder -author = Fleckenstein description = A TGA Encoder written in Lua without the use of external Libraries. From 685bdcb379d07d0d0e4d80b3c4325759907024a3 Mon Sep 17 00:00:00 2001 From: Nils Dagsson Moskopp Date: Thu, 19 May 2022 18:26:41 +0200 Subject: [PATCH 28/44] Allow encoding with B8G8R8A8 colormap --- README.md | 2 +- examples.lua | 20 ++++++++++++++++++++ init.lua | 30 +++++++++++++++++++++++++----- 3 files changed, 46 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 555cefd59..1ad978a22 100644 --- a/README.md +++ b/README.md @@ -59,6 +59,7 @@ These images contain a palette, followed by pixel data. * `A1R5G5B5` (8bpp RGB) * `B8G8R8` (8bpp RGB) +* `B8G8R8A8` (8bpp RGBA) ### True-Color Images (Type 2) @@ -82,6 +83,5 @@ These images contain compressed RGB(A) pixel data. ## TODO -* Support Type 1 `B8G8R8A8` output (color-mapped 8bpp RGBA) * Actually support `R8G8B8A8` input for `A1R5G5B5` output * Add both zoomable and explorable maps to `mcl_maps`. diff --git a/examples.lua b/examples.lua index 9ac530cbf..7642281aa 100644 --- a/examples.lua +++ b/examples.lua @@ -128,3 +128,23 @@ local pixels = { tga_encoder.image(pixels):save("colormapped_B8G8R8.tga", {colormap=colormap}) -- encoding as A1R5G5B5 saves 1 byte per palette entry → 103 bytes tga_encoder.image(pixels):save("colormapped_A1R5G5B5.tga", {colormap=colormap, color_format="A1R5G5B5"}) + +-- encode a colormapped bitmap with transparency +local _ = { 0 } +local K = { 1 } +local W = { 2 } +local colormap = { + { 0, 0, 0, 0 }, + { 0, 0, 0, 255 }, + { 255, 255, 255, 255 }, +} +local pixels = { + { _, K, K, K, K, K, _ }, + { _, K, W, W, W, K, _ }, + { K, K, W, W, W, K, K }, + { K, W, W, W, W, W, K }, + { _, K, W, W, W, K, _ }, + { _, _, K, W, K, _, _ }, + { _, _, _, K, _, _, _ }, +} +tga_encoder.image(pixels):save("colormapped_B8G8R8A8.tga", {colormap=colormap}) diff --git a/init.lua b/init.lua index f77b93a07..ed387eec0 100644 --- a/init.lua +++ b/init.lua @@ -68,7 +68,8 @@ function image:encode_colormap(properties) local color_format = properties.color_format assert ( "A1R5G5B5" == color_format or - "B8G8R8" == color_format + "B8G8R8" == color_format or + "B8G8R8A8" == color_format ) local colors = {} if "A1R5G5B5" == color_format then @@ -98,6 +99,17 @@ function image:encode_colormap(properties) ) colors[#colors + 1] = color_bytes end + elseif "B8G8R8A8" == color_format then + for i = 1,#colormap,1 do + local color = colormap[i] + local color_bytes = string.char( + color[3], -- B + color[2], -- G + color[1], -- R + color[4] -- A + ) + colors[#colors + 1] = color_bytes + end end assert( 0 ~= #colors ) self.data = self.data .. table.concat(colors) @@ -182,10 +194,18 @@ function image:encode_data(properties) end end elseif "B8G8R8A8" == color_format then - if "RAW" == compression then - self:encode_data_R8G8B8A8_as_B8G8R8A8_raw() - elseif "RLE" == compression then - self:encode_data_R8G8B8A8_as_B8G8R8A8_rle() + if 0 ~= #colormap then + if "RAW" == compression then + if 8 == self.pixel_depth then + self:encode_data_Y8_as_Y8_raw() + end + end + else + if "RAW" == compression then + self:encode_data_R8G8B8A8_as_B8G8R8A8_raw() + elseif "RLE" == compression then + self:encode_data_R8G8B8A8_as_B8G8R8A8_rle() + end end end local data_length_after = #self.data From e9862f5f24c3f9e375b4c43e70bf6c5dfcc2e8bf Mon Sep 17 00:00:00 2001 From: Nils Dagsson Moskopp Date: Sun, 31 Jul 2022 00:24:15 +0200 Subject: [PATCH 29/44] Add example code for node colormap generation --- colormap_generator.lua | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 colormap_generator.lua diff --git a/colormap_generator.lua b/colormap_generator.lua new file mode 100644 index 000000000..cc6c6a31e --- /dev/null +++ b/colormap_generator.lua @@ -0,0 +1,32 @@ +dofile("init.lua") + +-- This generates images necessary to colorize 16 Minetest nodes in 4096 colors. +-- It serves as a demonstration of what you can achieve using colormapped nodes. +-- It is be useful for grass or beam or glass nodes that need to blend smoothly. + +-- Sample depth rescaling is done according to the algorithm presented in: +-- +local max_sample_in = math.pow(2, 4) - 1 +local max_sample_out = math.pow(2, 8) - 1 + +for r = 0,15 do + local pixels = {} + for g = 0,15 do + if nil == pixels[g + 1] then + pixels[g + 1] = {} + end + for b = 0,15 do + local color = { + math.floor((r * max_sample_out / max_sample_in) + 0.5), + math.floor((g * max_sample_out / max_sample_in) + 0.5), + math.floor((b * max_sample_out / max_sample_in) + 0.5), + } + pixels[g + 1][b + 1] = color + end + end + local filename = "colormap_" .. tostring(r) .. ".tga" + tga_encoder.image(pixels):save( + filename, + { color_format="A1R5G5B5" } -- waste less bits + ) +end From 5bf0e79c6f8e05fd40d0ecd0b3ca41b4c27aea36 Mon Sep 17 00:00:00 2001 From: Nils Dagsson Moskopp Date: Sun, 27 Aug 2023 15:10:31 +0200 Subject: [PATCH 30/44] Add example code to generate TGA logo MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The tiny logo is a 12×12 TGA image. The huge logo is a 1200×1200 TGA image. --- logo.lua | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 logo.lua diff --git a/logo.lua b/logo.lua new file mode 100644 index 000000000..49bec0571 --- /dev/null +++ b/logo.lua @@ -0,0 +1,51 @@ +dofile("init.lua") + +local colormap = { + { 0, 0, 0 }, -- black + { 255, 255, 255 }, -- white + { 255, 0, 0 }, -- red + { 0, 255, 0 }, -- green + { 0, 0, 255 }, -- blue +} + +local _ = { 0 } +local W = { 1 } +local R = { 2 } +local G = { 3 } +local B = { 4 } + +local pixels_tiny = { + { W, W, W, W, W, W, W, W, W, W, W, W, }, + { W, _, _, _, _, _, _, _, _, _, _, W, }, + { W, _, _, _, _, _, _, B, _, B, _, W, }, + { W, _, _, _, _, _, _, B, B, B, _, W, }, + { W, _, _, _, G, G, G, B, _, B, _, W, }, + { W, _, _, _, G, _, G, B, B, B, _, W, }, + { W, _, _, R, G, _, _, _, _, _, _, W, }, + { W, _, _, R, G, G, G, _, _, _, _, W, }, + { W, _, _, R, _, _, _, _, _, _, _, W, }, + { W, _, R, R, R, _, _, _, _, _, _, W, }, + { W, _, _, _, _, _, _, _, _, _, _, W, }, + { W, W, W, W, W, W, W, W, W, W, W, W, }, +} + +local pixels_huge = {} + +local size_tiny = #pixels_tiny +local size_huge = 1200 +local scale = size_huge / size_tiny + +for x_huge = 1,size_huge,1 do + local x_tiny = math.ceil( x_huge / scale ) + for z_huge = 1,size_huge,1 do + local z_tiny = math.ceil( z_huge / scale ) + if nil == pixels_huge[z_huge] then + pixels_huge[z_huge] = {} + end + pixels_huge[z_huge][x_huge] = pixels_tiny[z_tiny][x_tiny] + end +end + +tga_encoder.image(pixels_tiny):save("logo_tiny.tga", {colormap=colormap}) +tga_encoder.image(pixels_huge):save("logo_huge.tga", {colormap=colormap}) + From 3029147ed7366d2684993f1e965964e76f62f6c7 Mon Sep 17 00:00:00 2001 From: Nils Dagsson Moskopp Date: Mon, 18 Sep 2023 15:20:21 +0200 Subject: [PATCH 31/44] Add example code for rendering a 3D shape using a Z-buffer --- donut.lua | 93 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 93 insertions(+) create mode 100644 donut.lua diff --git a/donut.lua b/donut.lua new file mode 100644 index 000000000..51402ef3d --- /dev/null +++ b/donut.lua @@ -0,0 +1,93 @@ +#!/usr/bin/env lua5.1 +-- -*- coding: utf-8 -*- + +-- 3D “donut” shape rendering using floating-point math +-- see + +-- cargo-culted by erle 2023-09-18 + +local theta_spacing = 0.1 -- 0.07 +local phi_spacing = 0.002 -- 0.02 + +local R1 = 1 +local R2 = 2 +local K2 = 5 + +local screen_height = 256 +local screen_width = 256 + +local K1 = screen_width * K2 * 3 / ( 8 * ( R1 + R2 ) ) + +local output = {} +local zbuffer = {} + +local grey = { 120, 120, 120 } +local gray = { 136, 136, 136 } + +for y = 1,screen_height,1 do + output[y] = {} + zbuffer[y] = {} + for x = 1,screen_width,1 do + local hori = math.floor( ( (y - 1) / 32 ) % 2 ) + local vert = math.floor( ( (x - 1) / 32 ) % 2 ) + output[y][x] = hori ~= vert and grey or gray + zbuffer[y][x] = 0 + end +end + +function render_frame(A, B) + -- precompute sines and cosines of A and B + local cosA = math.cos(A) + local sinA = math.sin(A) + local cosB = math.cos(B) + local sinB = math.sin(B) + + -- theta goas around the cross-sectional circle of a torus + for theta=0, 2*math.pi, theta_spacing do + -- precompute sines and cosines of theta + local costheta = math.cos(theta) + local sintheta = math.sin(theta) + + -- phi goes around the center of revolution of a torus + for phi=0, 2*math.pi, phi_spacing do + -- precompute sines and cosines of phi + local cosphi = math.cos(phi) + local sinphi = math.sin(phi) + + -- 2D (x, y) coordinates of the circle, before revolving + local circlex = R2 + R1*costheta + local circley = R1*sintheta + + -- 3D (x, y, z) coordinates after rotation + local x = circlex*(cosB*cosphi + sinA*sinB*sinphi) - circley*cosA*sinB + local y = circlex*(sinB*cosphi - sinA*cosB*sinphi) + circley*cosA*cosB + local z = K2 + cosA*circlex*sinphi + circley*sinA + + local ooz = 1/z + + -- x and y projection + local xp = math.floor(screen_width/2 + K1*ooz*x) + local yp = math.floor(screen_height/2 + K1*ooz*y) + + -- calculate luminance + local L = cosphi*costheta*sinB - cosA*costheta*sinphi - sinA*sintheta + cosB*( cosA*sintheta - costheta*sinA*sinphi ) + -- if (L > 0) then + if (true) then + if (ooz > zbuffer[yp][xp]) then + zbuffer[yp][xp] = ooz + local luminance = math.max( math.ceil( L * 180 ), 0 ) + -- luminance is now in the range 0 to 255 + r = math.ceil( (luminance + xp) / 2 ) + g = math.ceil( (luminance + yp) / 2 ) + b = math.ceil( (luminance + xp + yp) / 3 ) + output[yp][xp] = { r, g, b } + end + end + end + end +end + +dofile('init.lua') + +render_frame(-0.7, 0.7) +tga_encoder.image(output):save("donut.tga") From 4dd3833f3bf3dfc40e31e80e4068adac695a2dd8 Mon Sep 17 00:00:00 2001 From: Nils Dagsson Moskopp Date: Mon, 18 Sep 2023 16:45:31 +0200 Subject: [PATCH 32/44] Move encoding format heuristics from image:save() to image:encode() --- examples.lua | 16 ++++++++++++++++ init.lua | 18 +++++++++--------- 2 files changed, 25 insertions(+), 9 deletions(-) diff --git a/examples.lua b/examples.lua index 7642281aa..0dd61090c 100644 --- a/examples.lua +++ b/examples.lua @@ -14,6 +14,22 @@ local pixels = { } tga_encoder.image(pixels):save("bitmap_small.tga") +-- test that image can be encoded +local bitmap_small_0 = tga_encoder.image(pixels) +bitmap_small_0:encode() +assert(191 == #bitmap_small_0.data) + +-- test that imbage can be encoded with parameters +local bitmap_small_1 = tga_encoder.image(pixels) +bitmap_small_1:encode( + { + colormap = {}, + color_format = "B8G8R8", + compression = "RAW", + } +) +assert(191 == #bitmap_small_1.data) + -- change a single pixel, then rescale the bitmap local pixels_orig = pixels pixels_orig[4][4] = { 255, 255, 255 } diff --git a/init.lua b/init.lua index ed387eec0..ec7b3b8d3 100644 --- a/init.lua +++ b/init.lua @@ -549,15 +549,6 @@ function image:encode_footer() end function image:encode(properties) - self.data = "" - self:encode_header(properties) -- header - -- no color map and image id data - self:encode_data(properties) -- encode data - -- no extension or developer area - self:encode_footer() -- footer -end - -function image:save(filename, properties) local properties = properties or {} properties.colormap = properties.colormap or {} properties.compression = properties.compression or "RAW" @@ -584,6 +575,15 @@ function image:save(filename, properties) end assert( nil ~= properties.color_format ) + self.data = "" + self:encode_header(properties) -- header + -- no color map and image id data + self:encode_data(properties) -- encode data + -- no extension or developer area + self:encode_footer() -- footer +end + +function image:save(filename, properties) self:encode(properties) local f = assert(io.open(filename, "wb")) From bb68ceb38d5509e69f7d348f74afc0eca77f062c Mon Sep 17 00:00:00 2001 From: Nils Dagsson Moskopp Date: Fri, 22 Sep 2023 20:05:27 +0200 Subject: [PATCH 33/44] Do not encode images with illegal colormap indexes --- examples.lua | 15 +++++++++++++++ init.lua | 12 ++++++++++++ 2 files changed, 27 insertions(+) diff --git a/examples.lua b/examples.lua index 0dd61090c..f304998db 100644 --- a/examples.lua +++ b/examples.lua @@ -164,3 +164,18 @@ local pixels = { { _, _, _, K, _, _, _ }, } tga_encoder.image(pixels):save("colormapped_B8G8R8A8.tga", {colormap=colormap}) + +-- encoding a colormapped image with illegal colormap indexes should error out +local colormap = { + { 0, 0, 0, 0 }, + { 0, 0, 0, 255 }, +} +local status, message = pcall( + function () + tga_encoder.image(pixels):encode({colormap=colormap}) + end +) +assert( + false == status and + "init.lua:36: colormap index 2 not in colormap of size 2" == message +) diff --git a/init.lua b/init.lua index ec7b3b8d3..7a3169ca5 100644 --- a/init.lua +++ b/init.lua @@ -28,6 +28,18 @@ function image:encode_colormap_spec(properties) colormap_pixel_depth = pixel_depth_by_color_format[ properties.color_format ] + -- ensure that each pixel references a legal colormap entry + for _, row in ipairs(self.pixels) do + for _, pixel in ipairs(row) do + local colormap_index = pixel[1] + if colormap_index >= #colormap then + error( + "colormap index " .. colormap_index .. + " not in colormap of size " .. #colormap + ) + end + end + end end local colormap_spec = string.char(0, 0) .. -- first entry index From e87a8fc332c7f33a3b6bd7fc24370284182c29a3 Mon Sep 17 00:00:00 2001 From: Nils Dagsson Moskopp Date: Sun, 15 Oct 2023 17:02:19 +0200 Subject: [PATCH 34/44] Add script to generate TGA test textures --- tools/generate_test_textures.lua | 64 ++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) create mode 100755 tools/generate_test_textures.lua diff --git a/tools/generate_test_textures.lua b/tools/generate_test_textures.lua new file mode 100755 index 000000000..a74396d2d --- /dev/null +++ b/tools/generate_test_textures.lua @@ -0,0 +1,64 @@ +dofile("../init.lua") + +local _ = { 0, 0, 0, 128 } +local R = { 255, 0, 0, 255 } +local G = { 0, 255, 0, 255 } +local B = { 0, 0, 255, 255 } + +local pixels_rgba = { + { _, _, _, _, _, B, _, B, }, + { _, _, _, _, _, B, B, B, }, + { _, _, G, G, G, B, _, B, }, + { _, _, G, _, G, B, B, B, }, + { _, R, G, _, _, _, _, _, }, + { _, R, G, G, G, _, _, _, }, + { _, R, _, _, _, _, _, _, }, + { R, R, R, _, _, _, _, _, }, +} + +image_rgba = tga_encoder.image(pixels_rgba) + +image_rgba:save( + "type2_32bpp_bt_raw.tga", + { color_format="B8G8R8A8", compression="RAW" } +) +image_rgba:save( + "type2_32bpp_bt_rle.tga", + { color_format="B8G8R8A8", compression="RLE" } +) + +local _ = { 0, 0, 0 } +local R = { 255, 0, 0 } +local G = { 0, 255, 0 } +local B = { 0, 0, 255 } + +local pixels_rgb = { + { _, _, _, _, _, B, _, B, }, + { _, _, _, _, _, B, B, B, }, + { _, _, G, G, G, B, _, B, }, + { _, _, G, _, G, B, B, B, }, + { _, R, G, _, _, _, _, _, }, + { _, R, G, G, G, _, _, _, }, + { _, R, _, _, _, _, _, _, }, + { R, R, R, _, _, _, _, _, }, +} + +image_rgb = tga_encoder.image(pixels_rgb) + +image_rgb:save( + "type2_24bpp_bt_raw.tga", + { color_format="B8G8R8", compression="RAW" } +) +image_rgb:save( + "type2_24bpp_bt_rle.tga", + { color_format="B8G8R8", compression="RLE" } +) + +image_rgb:save( + "type2_16bpp_bt_raw.tga", + { color_format="A1R5G5B5", compression="RAW" } +) +image_rgb:save( + "type2_16bpp_bt_rle.tga", + { color_format="A1R5G5B5", compression="RLE" } +) From 4064333b069a09cd7cf7a6252bc9a652acd62c7e Mon Sep 17 00:00:00 2001 From: Nils Dagsson Moskopp Date: Sun, 15 Oct 2023 20:11:28 +0200 Subject: [PATCH 35/44] Adjust TGA test texture file names --- tools/generate_test_textures.lua | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/generate_test_textures.lua b/tools/generate_test_textures.lua index a74396d2d..aace83ec3 100755 --- a/tools/generate_test_textures.lua +++ b/tools/generate_test_textures.lua @@ -19,11 +19,11 @@ local pixels_rgba = { image_rgba = tga_encoder.image(pixels_rgba) image_rgba:save( - "type2_32bpp_bt_raw.tga", + "type2_32bpp_bt.tga", { color_format="B8G8R8A8", compression="RAW" } ) image_rgba:save( - "type2_32bpp_bt_rle.tga", + "type10_32bpp_bt.tga", { color_format="B8G8R8A8", compression="RLE" } ) @@ -46,19 +46,19 @@ local pixels_rgb = { image_rgb = tga_encoder.image(pixels_rgb) image_rgb:save( - "type2_24bpp_bt_raw.tga", + "type2_24bpp_bt.tga", { color_format="B8G8R8", compression="RAW" } ) image_rgb:save( - "type2_24bpp_bt_rle.tga", + "type10_24bpp_bt.tga", { color_format="B8G8R8", compression="RLE" } ) image_rgb:save( - "type2_16bpp_bt_raw.tga", + "type2_16bpp_bt.tga", { color_format="A1R5G5B5", compression="RAW" } ) image_rgb:save( - "type2_16bpp_bt_rle.tga", + "type10_16bpp_bt.tga", { color_format="A1R5G5B5", compression="RLE" } ) From 4d57ba62bf4e499ecadfbd50916e16484a26f86d Mon Sep 17 00:00:00 2001 From: Nils Dagsson Moskopp Date: Sun, 15 Oct 2023 20:49:11 +0200 Subject: [PATCH 36/44] Add code to generate TGA type 1 test textures --- tools/generate_test_textures.lua | 44 ++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/tools/generate_test_textures.lua b/tools/generate_test_textures.lua index aace83ec3..2478aac83 100755 --- a/tools/generate_test_textures.lua +++ b/tools/generate_test_textures.lua @@ -1,5 +1,49 @@ dofile("../init.lua") +local _ = { 0 } +local R = { 1 } +local G = { 2 } +local B = { 3 } + +local pixels_colormapped = { + { _, _, _, _, _, B, _, B, }, + { _, _, _, _, _, B, B, B, }, + { _, _, G, G, G, B, _, B, }, + { _, _, G, _, G, B, B, B, }, + { _, R, G, _, _, _, _, _, }, + { _, R, G, G, G, _, _, _, }, + { _, R, _, _, _, _, _, _, }, + { R, R, R, _, _, _, _, _, }, +} + +image_colormapped = tga_encoder.image(pixels_colormapped) + +colormap_32bpp = { + { 0, 0, 0, 128 }, + { 255, 0, 0, 255 }, + { 0, 255, 0, 255 }, + { 0, 0, 255, 255 }, +} +image_colormapped:save( + "type1_32bpp_bt.tga", + { colormap = colormap_32bpp, color_format = "B8G8R8A8" } +) +image_colormapped:save( + "type1_16bpp_bt.tga", + { colormap = colormap_32bpp, color_format = "A1R5G5B5" } +) + +colormap_24bpp = { + { 0, 0, 0 }, + { 255, 0, 0 }, + { 0, 255, 0 }, + { 0, 0, 255 }, +} +image_colormapped:save( + "type1_24bpp_bt.tga", + { colormap = colormap_32bpp, color_format = "B8G8R8" } +) + local _ = { 0, 0, 0, 128 } local R = { 255, 0, 0, 255 } local G = { 0, 255, 0, 255 } From ef65de54c025c28ee8a0ce14c8f845738857fff8 Mon Sep 17 00:00:00 2001 From: Nils Dagsson Moskopp Date: Mon, 16 Oct 2023 19:05:44 +0200 Subject: [PATCH 37/44] Make 3D rendered donut appear solid --- donut.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/donut.lua b/donut.lua index 51402ef3d..a07792a3e 100644 --- a/donut.lua +++ b/donut.lua @@ -6,7 +6,7 @@ -- cargo-culted by erle 2023-09-18 -local theta_spacing = 0.1 -- 0.07 +local theta_spacing = 0.01 -- 0.07 local phi_spacing = 0.002 -- 0.02 local R1 = 1 From 0c6d9a4d85dccabaa7d3614562f9fd0c9f2d9fab Mon Sep 17 00:00:00 2001 From: Nils Dagsson Moskopp Date: Mon, 16 Oct 2023 19:08:14 +0200 Subject: [PATCH 38/44] Partially slice 3D rendered donut along its torodial direction --- donut.lua | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/donut.lua b/donut.lua index a07792a3e..96afe0b2c 100644 --- a/donut.lua +++ b/donut.lua @@ -43,7 +43,13 @@ function render_frame(A, B) local sinB = math.sin(B) -- theta goas around the cross-sectional circle of a torus - for theta=0, 2*math.pi, theta_spacing do + local theta = 0 + while theta <= 2*math.pi do + if ( theta < 2*math.pi * 1/8 ) or ( theta > 2*math.pi * 7/8 ) then + theta = theta + (theta_spacing * 16) + else + theta = theta + theta_spacing + end -- precompute sines and cosines of theta local costheta = math.cos(theta) local sintheta = math.sin(theta) From 5dcf714cd187f21c2e32e709cbe5507ea4fd10c4 Mon Sep 17 00:00:00 2001 From: Nils Dagsson Moskopp Date: Mon, 16 Oct 2023 19:20:30 +0200 Subject: [PATCH 39/44] Partially slice 3D rendered donut along its polodial direction --- donut.lua | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/donut.lua b/donut.lua index 96afe0b2c..8567f8aed 100644 --- a/donut.lua +++ b/donut.lua @@ -55,7 +55,13 @@ function render_frame(A, B) local sintheta = math.sin(theta) -- phi goes around the center of revolution of a torus - for phi=0, 2*math.pi, phi_spacing do + local phi = 0 + while phi <= 2*math.pi do + if ( phi > 2*math.pi * 3/8 ) and ( phi < 2*math.pi * 5/8 ) then + phi = phi + (phi_spacing * 128) + else + phi = phi + phi_spacing + end -- precompute sines and cosines of phi local cosphi = math.cos(phi) local sinphi = math.sin(phi) From 12a33e458f475c051be6698b351ffdc6b2d54f1e Mon Sep 17 00:00:00 2001 From: Nils Dagsson Moskopp Date: Mon, 16 Oct 2023 20:34:47 +0200 Subject: [PATCH 40/44] Add hashbang to script to generate TGA test textures --- tools/generate_test_textures.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/generate_test_textures.lua b/tools/generate_test_textures.lua index 2478aac83..aaf687adc 100755 --- a/tools/generate_test_textures.lua +++ b/tools/generate_test_textures.lua @@ -1,3 +1,4 @@ +#!/usr/bin/env lua5.1 dofile("../init.lua") local _ = { 0 } From 01bcbbf9272b39cd998f0daefc3b915ffa7d8300 Mon Sep 17 00:00:00 2001 From: Nils Dagsson Moskopp Date: Mon, 16 Oct 2023 20:43:31 +0200 Subject: [PATCH 41/44] Allow encoding with top-bottom scanline order --- init.lua | 36 +++++++++++++++++++++++++++++------- 1 file changed, 29 insertions(+), 7 deletions(-) diff --git a/init.lua b/init.lua index 7a3169ca5..1a0bd4738 100644 --- a/init.lua +++ b/init.lua @@ -56,6 +56,11 @@ function image:encode_image_spec(properties) "B8G8R8" == color_format or -- (B8G8R8 = 3 bytes = 24 bits) "B8G8R8A8" == color_format -- (B8G8R8A8 = 4 bytes = 32 bits) ) + local scanline_order = properties.scanline_order + assert ( + "bottom-top" == scanline_order or + "top-bottom" == scanline_order + ) local pixel_depth if 0 ~= #properties.colormap then pixel_depth = self.pixel_depth @@ -63,13 +68,29 @@ function image:encode_image_spec(properties) pixel_depth = pixel_depth_by_color_format[color_format] end assert( nil ~= pixel_depth) - self.data = self.data - .. string.char(0, 0) -- X-origin - .. string.char(0, 0) -- Y-origin - .. string.char(self.width % 256, math.floor(self.width / 256)) -- width - .. string.char(self.height % 256, math.floor(self.height / 256)) -- height - .. string.char(pixel_depth) - .. string.char(0) -- image descriptor + -- the origin is the bottom left corner of the image (always) + local x_origin_lo = 0 + local x_origin_hi = 0 + local y_origin_lo = 0 + local y_origin_hi = 0 + local image_descriptor = 0 -- equal to bottom-top scanline order + local width_lo = self.width % 256 + local width_hi = math.floor(self.width / 256) + local height_lo = self.height % 256 + local height_hi = math.floor(self.height / 256) + if "top-bottom" == scanline_order then + image_descriptor = 32 + y_origin_lo = height_lo + y_origin_hi = height_hi + end + self.data = self.data .. string.char ( + x_origin_lo, x_origin_hi, + y_origin_lo, y_origin_hi, + width_lo, width_hi, + height_lo, height_hi, + pixel_depth, + image_descriptor + ) end function image:encode_colormap(properties) @@ -564,6 +585,7 @@ function image:encode(properties) local properties = properties or {} properties.colormap = properties.colormap or {} properties.compression = properties.compression or "RAW" + properties.scanline_order = properties.scanline_order or "bottom-top" self.pixel_depth = #self.pixels[1][1] * 8 From 10022c93ef13c9d92af3b06482e06de08728d1f2 Mon Sep 17 00:00:00 2001 From: Nils Dagsson Moskopp Date: Mon, 16 Oct 2023 20:57:00 +0200 Subject: [PATCH 42/44] Explicitly state scanline order in test texture script --- tools/generate_test_textures.lua | 48 ++++++++++++++++---------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/tools/generate_test_textures.lua b/tools/generate_test_textures.lua index aaf687adc..01349f3d6 100755 --- a/tools/generate_test_textures.lua +++ b/tools/generate_test_textures.lua @@ -6,7 +6,7 @@ local R = { 1 } local G = { 2 } local B = { 3 } -local pixels_colormapped = { +local pixels_colormapped_bt = { { _, _, _, _, _, B, _, B, }, { _, _, _, _, _, B, B, B, }, { _, _, G, G, G, B, _, B, }, @@ -17,7 +17,7 @@ local pixels_colormapped = { { R, R, R, _, _, _, _, _, }, } -image_colormapped = tga_encoder.image(pixels_colormapped) +image_colormapped_bt = tga_encoder.image(pixels_colormapped_bt) colormap_32bpp = { { 0, 0, 0, 128 }, @@ -25,13 +25,13 @@ colormap_32bpp = { { 0, 255, 0, 255 }, { 0, 0, 255, 255 }, } -image_colormapped:save( +image_colormapped_bt:save( "type1_32bpp_bt.tga", - { colormap = colormap_32bpp, color_format = "B8G8R8A8" } + { colormap = colormap_32bpp, color_format = "B8G8R8A8", scanline_order = "bottom-top" } ) -image_colormapped:save( +image_colormapped_bt:save( "type1_16bpp_bt.tga", - { colormap = colormap_32bpp, color_format = "A1R5G5B5" } + { colormap = colormap_32bpp, color_format = "A1R5G5B5", scanline_order = "bottom-top" } ) colormap_24bpp = { @@ -40,9 +40,9 @@ colormap_24bpp = { { 0, 255, 0 }, { 0, 0, 255 }, } -image_colormapped:save( +image_colormapped_bt:save( "type1_24bpp_bt.tga", - { colormap = colormap_32bpp, color_format = "B8G8R8" } + { colormap = colormap_32bpp, color_format = "B8G8R8", scanline_order = "bottom-top" } ) local _ = { 0, 0, 0, 128 } @@ -50,7 +50,7 @@ local R = { 255, 0, 0, 255 } local G = { 0, 255, 0, 255 } local B = { 0, 0, 255, 255 } -local pixels_rgba = { +local pixels_rgba_bt = { { _, _, _, _, _, B, _, B, }, { _, _, _, _, _, B, B, B, }, { _, _, G, G, G, B, _, B, }, @@ -61,15 +61,15 @@ local pixels_rgba = { { R, R, R, _, _, _, _, _, }, } -image_rgba = tga_encoder.image(pixels_rgba) +image_rgba_bt = tga_encoder.image(pixels_rgba_bt) -image_rgba:save( +image_rgba_bt:save( "type2_32bpp_bt.tga", - { color_format="B8G8R8A8", compression="RAW" } + { color_format="B8G8R8A8", compression="RAW", scanline_order = "bottom-top" } ) -image_rgba:save( +image_rgba_bt:save( "type10_32bpp_bt.tga", - { color_format="B8G8R8A8", compression="RLE" } + { color_format="B8G8R8A8", compression="RLE", scanline_order = "bottom-top" } ) local _ = { 0, 0, 0 } @@ -77,7 +77,7 @@ local R = { 255, 0, 0 } local G = { 0, 255, 0 } local B = { 0, 0, 255 } -local pixels_rgb = { +local pixels_rgb_bt = { { _, _, _, _, _, B, _, B, }, { _, _, _, _, _, B, B, B, }, { _, _, G, G, G, B, _, B, }, @@ -88,22 +88,22 @@ local pixels_rgb = { { R, R, R, _, _, _, _, _, }, } -image_rgb = tga_encoder.image(pixels_rgb) +image_rgb_bt = tga_encoder.image(pixels_rgb_bt) -image_rgb:save( +image_rgb_bt:save( "type2_24bpp_bt.tga", - { color_format="B8G8R8", compression="RAW" } + { color_format="B8G8R8", compression="RAW", scanline_order = "bottom-top" } ) -image_rgb:save( +image_rgb_bt:save( "type10_24bpp_bt.tga", - { color_format="B8G8R8", compression="RLE" } + { color_format="B8G8R8", compression="RLE", scanline_order = "bottom-top" } ) -image_rgb:save( +image_rgb_bt:save( "type2_16bpp_bt.tga", - { color_format="A1R5G5B5", compression="RAW" } + { color_format="A1R5G5B5", compression="RAW", scanline_order = "bottom-top" } ) -image_rgb:save( +image_rgb_bt:save( "type10_16bpp_bt.tga", - { color_format="A1R5G5B5", compression="RLE" } + { color_format="A1R5G5B5", compression="RLE", scanline_order = "bottom-top" } ) From aad231f5e406a7c1eaafe6595a64b9c55f230692 Mon Sep 17 00:00:00 2001 From: Nils Dagsson Moskopp Date: Mon, 16 Oct 2023 21:37:02 +0200 Subject: [PATCH 43/44] =?UTF-8?q?Generate=20test=20textures=20with=20scanl?= =?UTF-8?q?ine=20order=20=E2=80=9Ctop-bottom=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tools/generate_test_textures.lua | 73 +++++++++++++++++++++++++++++++- 1 file changed, 72 insertions(+), 1 deletion(-) diff --git a/tools/generate_test_textures.lua b/tools/generate_test_textures.lua index 01349f3d6..24e4b3278 100755 --- a/tools/generate_test_textures.lua +++ b/tools/generate_test_textures.lua @@ -17,7 +17,19 @@ local pixels_colormapped_bt = { { R, R, R, _, _, _, _, _, }, } +local pixels_colormapped_tb = { + { R, R, R, _, _, _, _, _, }, + { _, R, _, _, _, _, _, _, }, + { _, R, G, G, G, _, _, _, }, + { _, R, G, _, _, _, _, _, }, + { _, _, G, _, G, B, B, B, }, + { _, _, G, G, G, B, _, B, }, + { _, _, _, _, _, B, B, B, }, + { _, _, _, _, _, B, _, B, }, +} + image_colormapped_bt = tga_encoder.image(pixels_colormapped_bt) +image_colormapped_tb = tga_encoder.image(pixels_colormapped_tb) colormap_32bpp = { { 0, 0, 0, 128 }, @@ -29,10 +41,18 @@ image_colormapped_bt:save( "type1_32bpp_bt.tga", { colormap = colormap_32bpp, color_format = "B8G8R8A8", scanline_order = "bottom-top" } ) +image_colormapped_tb:save( + "type1_32bpp_tb.tga", + { colormap = colormap_32bpp, color_format = "B8G8R8A8", scanline_order = "top-bottom" } +) image_colormapped_bt:save( "type1_16bpp_bt.tga", { colormap = colormap_32bpp, color_format = "A1R5G5B5", scanline_order = "bottom-top" } ) +image_colormapped_tb:save( + "type1_16bpp_tb.tga", + { colormap = colormap_32bpp, color_format = "A1R5G5B5", scanline_order = "top-bottom" } +) colormap_24bpp = { { 0, 0, 0 }, @@ -44,6 +64,10 @@ image_colormapped_bt:save( "type1_24bpp_bt.tga", { colormap = colormap_32bpp, color_format = "B8G8R8", scanline_order = "bottom-top" } ) +image_colormapped_tb:save( + "type1_24bpp_tb.tga", + { colormap = colormap_32bpp, color_format = "B8G8R8", scanline_order = "top-bottom" } +) local _ = { 0, 0, 0, 128 } local R = { 255, 0, 0, 255 } @@ -61,16 +85,36 @@ local pixels_rgba_bt = { { R, R, R, _, _, _, _, _, }, } +local pixels_rgba_tb = { + { R, R, R, _, _, _, _, _, }, + { _, R, _, _, _, _, _, _, }, + { _, R, G, G, G, _, _, _, }, + { _, R, G, _, _, _, _, _, }, + { _, _, G, _, G, B, B, B, }, + { _, _, G, G, G, B, _, B, }, + { _, _, _, _, _, B, B, B, }, + { _, _, _, _, _, B, _, B, }, +} + image_rgba_bt = tga_encoder.image(pixels_rgba_bt) +image_rgba_tb = tga_encoder.image(pixels_rgba_tb) image_rgba_bt:save( "type2_32bpp_bt.tga", { color_format="B8G8R8A8", compression="RAW", scanline_order = "bottom-top" } ) +image_rgba_tb:save( + "type2_32bpp_tb.tga", + { color_format="B8G8R8A8", compression="RAW", scanline_order = "top-bottom" } +) image_rgba_bt:save( "type10_32bpp_bt.tga", { color_format="B8G8R8A8", compression="RLE", scanline_order = "bottom-top" } ) +image_rgba_tb:save( + "type10_32bpp_tb.tga", + { color_format="B8G8R8A8", compression="RLE", scanline_order = "top-bottom" } +) local _ = { 0, 0, 0 } local R = { 255, 0, 0 } @@ -88,22 +132,49 @@ local pixels_rgb_bt = { { R, R, R, _, _, _, _, _, }, } +local pixels_rgb_tb = { + { R, R, R, _, _, _, _, _, }, + { _, R, _, _, _, _, _, _, }, + { _, R, G, G, G, _, _, _, }, + { _, R, G, _, _, _, _, _, }, + { _, _, G, _, G, B, B, B, }, + { _, _, G, G, G, B, _, B, }, + { _, _, _, _, _, B, B, B, }, + { _, _, _, _, _, B, _, B, }, +} + image_rgb_bt = tga_encoder.image(pixels_rgb_bt) +image_rgb_tb = tga_encoder.image(pixels_rgb_tb) image_rgb_bt:save( "type2_24bpp_bt.tga", { color_format="B8G8R8", compression="RAW", scanline_order = "bottom-top" } ) +image_rgb_tb:save( + "type2_24bpp_tb.tga", + { color_format="B8G8R8", compression="RAW", scanline_order = "top-bottom" } +) image_rgb_bt:save( "type10_24bpp_bt.tga", { color_format="B8G8R8", compression="RLE", scanline_order = "bottom-top" } ) - +image_rgb_tb:save( + "type10_24bpp_tb.tga", + { color_format="B8G8R8", compression="RLE", scanline_order = "top-bottom" } +) image_rgb_bt:save( "type2_16bpp_bt.tga", { color_format="A1R5G5B5", compression="RAW", scanline_order = "bottom-top" } ) +image_rgb_tb:save( + "type2_16bpp_tb.tga", + { color_format="A1R5G5B5", compression="RAW", scanline_order = "top-bottom" } +) image_rgb_bt:save( "type10_16bpp_bt.tga", { color_format="A1R5G5B5", compression="RLE", scanline_order = "bottom-top" } ) +image_rgb_tb:save( + "type10_16bpp_tb.tga", + { color_format="A1R5G5B5", compression="RLE", scanline_order = "top-bottom" } +) From a5740f8edf894395605ce936272452cb84f1cd7f Mon Sep 17 00:00:00 2001 From: the-real-herowl Date: Tue, 19 Mar 2024 19:27:12 +0100 Subject: [PATCH 44/44] Remove old tga_encoder --- mods/CORE/tga_encoder/README.md | 4 -- mods/CORE/tga_encoder/init.lua | 92 --------------------------------- mods/CORE/tga_encoder/mod.conf | 3 -- 3 files changed, 99 deletions(-) delete mode 100644 mods/CORE/tga_encoder/README.md delete mode 100644 mods/CORE/tga_encoder/init.lua delete mode 100644 mods/CORE/tga_encoder/mod.conf diff --git a/mods/CORE/tga_encoder/README.md b/mods/CORE/tga_encoder/README.md deleted file mode 100644 index 9b3293dda..000000000 --- a/mods/CORE/tga_encoder/README.md +++ /dev/null @@ -1,4 +0,0 @@ -# tga_encoder -A TGA Encoder written in Lua without the use of external Libraries. - -May be used as a Minetest mod. diff --git a/mods/CORE/tga_encoder/init.lua b/mods/CORE/tga_encoder/init.lua deleted file mode 100644 index 24ec502e1..000000000 --- a/mods/CORE/tga_encoder/init.lua +++ /dev/null @@ -1,92 +0,0 @@ -tga_encoder = {} - -local image = setmetatable({}, { - __call = function(self, ...) - local t = setmetatable({}, {__index = self}) - t:constructor(...) - return t - end, -}) - -function image:constructor(pixels) - self.data = "" - self.pixels = pixels - self.width = #pixels[1] - self.height = #pixels - - self:encode() -end - -function image:encode_colormap_spec() - self.data = self.data - .. string.char(0, 0) -- first entry index - .. string.char(0, 0) -- number of entries - .. string.char(0) -- bits per pixel -end - -function image:encode_image_spec() - self.data = self.data - .. string.char(0, 0) -- X-origin - .. string.char(0, 0) -- Y-origin - .. string.char(self.width % 256, math.floor(self.width / 256)) -- width - .. string.char(self.height % 256, math.floor(self.height / 256)) -- height - .. string.char(24) -- pixel depth (RGB = 3 bytes = 24 bits) - .. string.char(0) -- image descriptor -end - -function image:encode_header() - self.data = self.data - .. string.char(0) -- image id - .. string.char(0) -- color map type - .. string.char(10) -- image type (RLE RGB = 10) - self:encode_colormap_spec() -- color map specification - self:encode_image_spec() -- image specification -end - -function image:encode_data() - local current_pixel = '' - local previous_pixel = '' - local count = 1 - local packets = {} - local rle_packet = '' - for _, row in ipairs(self.pixels) do - for _, pixel in ipairs(row) do - current_pixel = string.char(pixel[3], pixel[2], pixel[1]) - if current_pixel ~= previous_pixel or count == 128 then - packets[#packets +1] = rle_packet - count = 1 - previous_pixel = current_pixel - else - count = count + 1 - end - rle_packet = string.char(128 + count - 1) .. current_pixel - end - end - packets[#packets +1] = rle_packet - self.data = self.data .. table.concat(packets) -end - -function image:encode_footer() - self.data = self.data - .. string.char(0, 0, 0, 0) -- extension area offset - .. string.char(0, 0, 0, 0) -- developer area offset - .. "TRUEVISION-XFILE" - .. "." - .. string.char(0) -end - -function image:encode() - self:encode_header() -- header - -- no color map and image id data - self:encode_data() -- encode data - -- no extension or developer area - self:encode_footer() -- footer -end - -function image:save(filename) - local f = assert(io.open(filename, "wb")) - f:write(self.data) - f:close() -end - -tga_encoder.image = image diff --git a/mods/CORE/tga_encoder/mod.conf b/mods/CORE/tga_encoder/mod.conf deleted file mode 100644 index e4bfac898..000000000 --- a/mods/CORE/tga_encoder/mod.conf +++ /dev/null @@ -1,3 +0,0 @@ -name = tga_encoder -author = Fleckenstein -description = A TGA Encoder written in Lua without the use of external Libraries.