From 2b81894272ade16dbe3f71514e8eb25b2962bf9e Mon Sep 17 00:00:00 2001 From: hgn Date: Fri, 29 Apr 2022 16:00:18 +0100 Subject: [PATCH] first windows distributions --- .gitignore | 3 + COPYING | 6 + LICENSE | 674 ++++++++++++++++++++++++++++++++++++++++++++++++++++ __init__.py | 365 ++++++++++++++++++---------- build.sh | 6 +- cxr/cxr.c | 6 - cxr/cxr.h | 21 +- makedist.sh | 11 +- platform.py | 1 + 9 files changed, 956 insertions(+), 137 deletions(-) create mode 100644 COPYING create mode 100644 LICENSE delete mode 100644 cxr/cxr.c create mode 100644 platform.py diff --git a/.gitignore b/.gitignore index 0af4364..ef8cee0 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,6 @@ !*.h !*.cpp !*.py + +!LICENSE +!COPYING diff --git a/COPYING b/COPYING new file mode 100644 index 0000000..c77ab14 --- /dev/null +++ b/COPYING @@ -0,0 +1,6 @@ +Convexer uses the GNU General Public License Version 3.0 + +Please read the full 'LICENSE' file. + +Copyright (C) 2022 Harry Godden (hgn) +hgodden00@gmail.com diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..f288702 --- /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/__init__.py b/__init__.py index 7ba2584..6b6185c 100644 --- a/__init__.py +++ b/__init__.py @@ -1,4 +1,12 @@ -# Copyright (C) 2022 Harry Godden (hgn) +# CONVEXER v0.95 +# +# A GNU/Linux-first Source1 Hammer replacement +# built with Blender, for mapmakers +# +# Copyright (C) 2022 Harry Godden (hgn) +# +# LICENSE: GPLv3.0, please see COPYING and LICENSE for more information +# bl_info = { "name":"Convexer", @@ -20,6 +28,16 @@ from ctypes import * from gpu_extras.batch import batch_for_shader from bpy.app.handlers import persistent +# Setup platform dependent variables + +exec(open(F'{os.path.dirname(__file__)}/platform.py').read()) +if CXR_GNU_LINUX==1: + CXR_SHARED_EXT=".so" + CXR_EXE_EXT="" +else: + CXR_SHARED_EXT=".dll" + CXR_EXE_EXT=".exe" + # GPU and viewport drawing # ------------------------------------------------------------------------------ @@ -32,6 +50,7 @@ cxr_view_lines = None cxr_view_mesh = None cxr_jobs_batch = None cxr_jobs_inf = [] +cxr_error_inf = None # Shaders cxr_view_shader = gpu.shader.from_builtin('3D_SMOOTH_COLOR') @@ -62,13 +81,35 @@ void main() # Render functions # def cxr_ui(_,context): - global cxr_jobs_batch, cxr_ui_shader, cxr_jobs_inf + global cxr_jobs_batch, cxr_ui_shader, cxr_jobs_inf, cxr_error_inf w = gpu.state.viewport_get()[2] cxr_ui_shader.bind() cxr_ui_shader.uniform_float( "scale", w ) - if cxr_jobs_batch != None: + if cxr_error_inf != None: + err_begin = 50 + + if isinstance(cxr_error_inf[1],list): + err_begin += 20*(len(cxr_error_inf[1])-1) + + blf.position(0,2,err_begin,0) + blf.size(0,50,48) + blf.color(0, 1.0,0.2,0.2,0.9) + blf.draw(0,cxr_error_inf[0]) + + blf.size(0,50,24) + blf.color(0, 1.0,1.0,1.0,1.0) + + if isinstance(cxr_error_inf[1],list): + for i,inf in enumerate(cxr_error_inf[1]): + blf.position(0,2,err_begin-30-i*20,0) + blf.draw(0,inf) + else: + blf.position(0,2,err_begin-30,0) + blf.draw(0,cxr_error_inf[1]) + + elif cxr_jobs_batch != None: gpu.state.blend_set('ALPHA') cxr_jobs_batch.draw(cxr_ui_shader) @@ -89,12 +130,6 @@ def cxr_ui(_,context): blf.draw(0,ln[:-1]) py += 16 - #if CXR_PREVIEW_OPERATOR.LASTERR != None: - # blf.position(0,2,80,0) - # blf.size(0,50,48) - # blf.color(0,1.0,0.2,0.2,0.9) - # blf.draw(0,"Invalid geometry") - # Something is off with TIMER, # this forces the viewport to redraw before we can continue with our # compilation stuff. @@ -186,10 +221,11 @@ def scene_redraw(): # Shared libraries # ------------------------------------------------------------------------------ -# dlclose for reloading modules manually -libc_dlclose = None -libc_dlclose = cdll.LoadLibrary(None).dlclose -libc_dlclose.argtypes = [c_void_p] +if CXR_GNU_LINUX==1: + # dlclose for reloading modules manually + libc_dlclose = None + libc_dlclose = cdll.LoadLibrary(None).dlclose + libc_dlclose.argtypes = [c_void_p] # wrapper for ctypes binding class extern(): @@ -472,6 +508,18 @@ def libcxr_line_callback( p0,p1,colour ): cxr_line_colours += [(colour[0],colour[1],colour[2],colour[3])] cxr_line_colours += [(colour[0],colour[1],colour[2],colour[3])] +def cxr_reset_all(): + global cxr_jobs_inf, cxr_jobs_batch, cxr_error_inf, cxr_view_mesh + cxr_jobs_inf = None + cxr_jobs_batch = None + cxr_error_inf = None + + cxr_reset_lines() + cxr_batch_lines() + cxr_view_mesh = None + + scene_redraw() + # libnbvtf # ------------------------------------------------------------------------------ @@ -503,12 +551,15 @@ def shared_reload(): # Unload libraries if existing def _reload( lib, path ): - if lib != None: - _handle = lib._handle - for i in range(10): libc_dlclose( _handle ) - lib = None - del lib - return cdll.LoadLibrary( F'{os.path.dirname(__file__)}/{path}.so' ) + if CXR_GNU_LINUX==1: + if lib != None: + _handle = lib._handle + for i in range(10): libc_dlclose( _handle ) + lib = None + del lib + + libpath = F'{os.path.dirname(__file__)}/{path}{CXR_SHARED_EXT}' + return cdll.LoadLibrary( libpath ) libnbvtf = _reload( libnbvtf, "libnbvtf" ) libcxr = _reload( libcxr, "libcxr" ) @@ -760,9 +811,85 @@ def asset_full_path(sdir,asset): return F"{bpy.context.scene.cxr_data.subdir}/"+\ F"{asset_path(sdir,asset_uid(asset))}" +# Decomposes mesh, and sets global error information if failed. +# - returns None on fail +# - returns world on success +def cxr_decompose_globalerr( mesh_src ): + global cxr_error_inf + + err = c_int32(0) + world = libcxr_decompose.call( mesh_src, pointer(err) ) + + if world == None: + cxr_view_mesh = None + cxr_batch_lines() + + cxr_error_inf = [\ + ("No Error", "There is no error?"),\ + ("Bad input", "Non manifold geometry is present in the input mesh"),\ + ("Bad result","An invalid manifold was generated, try to simplify"),\ + ("Bad result","Make sure there is a clear starting point"),\ + ("Bad result","Implicit vertex was invalid, try to simplify"),\ + ("Bad input","Non coplanar vertices are in the source mesh"),\ + ("Bad input","Non convex polygon is in the source mesh"),\ + ("Bad result","Undefined failure"),\ + ("Invalid Input", "Undefined failure"),\ + ][err.value] + + scene_redraw() + + return world + # Entity functions / infos # ------------------------ +def cxr_collection_purpose(collection): + if collection.name.startswith('.'): return None + if collection.hide_render: return None + if collection.name.startswith('mdl_'): return 'model' + return 'group' + +def cxr_object_purpose(obj): + objpurpose = None + group = None + + def _search(collection): + nonlocal objpurpose, group, obj + + purpose = cxr_collection_purpose( collection ) + if purpose == None: return + if purpose == 'model': + for o in collection.objects: + if o == obj: + if o.type != 'EMPTY': + objpurpose = 'model' + group = collection + return + return + for o in collection.objects: + if o == obj: + classname = cxr_classname(o) + if classname != None: + objpurpose = 'entity' + if o.type == 'MESH': + objpurpose = 'brush_entity' + group = collection + else: + if o.type == 'MESH': + objpurpose = 'brush' + group = collection + return + for c in collection.children: + _search(c) + + if 'main' in bpy.data.collections: + _search( bpy.data.collections['main'] ) + + if objpurpose == None and 'skybox' in bpy.data.collections: + _search( bpy.data.collections['skybox'] ) + + return (group,objpurpose) + def cxr_intrinsic_classname(obj): if obj.type == 'LIGHT': return { @@ -968,11 +1095,10 @@ def cxr_scene_collect(): def _collect(collection,transform): nonlocal sceneinfo - - if collection.name.startswith('.'): return - if collection.hide_render: return - - if collection.name.startswith('mdl_'): + + purpose = cxr_collection_purpose( collection ) + if purpose == None: return + if purpose == 'model': sceneinfo['entities'] += [{ "object": collection, "classname": "prop_static", @@ -1066,7 +1192,7 @@ def cxr_export_vmf(sceneinfo, output_vmf): print( F"{vmfinfo.brush_count} :: {cmd['object'].name}" ) baked = mesh_cxr_format( cmd['object'] ) - world = libcxr_decompose.call( baked, None ) + world = cxr_decompose_globalerr( baked ) if world == None: return False @@ -1429,6 +1555,15 @@ class CXR_RELOAD(bpy.types.Operator): shared_reload() return {'FINISHED'} +# Reset all debugging/ui information +# +class CXR_RESET(bpy.types.Operator): + bl_idname="convexer.reset" + bl_label="Reset Convexer" + def execute(_,context): + cxr_reset_all() + return {'FINISHED'} + # Used for exporting data to use with ASAN builds # class CXR_DEV_OPERATOR(bpy.types.Operator): @@ -1447,60 +1582,21 @@ class CXR_PREVIEW_OPERATOR(bpy.types.Operator): bl_idname="convexer.preview" bl_label="Preview Brushes" - LASTERR = None RUNNING = False def execute(_,context): - return {'FINISHED'} - - def modal(_,context,event): global cxr_view_mesh - static = _.__class__ - - if event.type == 'ESC': - cxr_reset_lines() - cxr_batch_lines() - cxr_view_mesh = None - static.RUNNING = False - - scene_redraw() - return {'FINISHED'} - - return {'PASS_THROUGH'} + global cxr_view_shader, cxr_view_mesh, cxr_error_inf + + cxr_reset_all() - def invoke(_,context,event): - global cxr_view_shader, cxr_view_mesh static = _.__class__ - static.LASTERR = None - - cxr_reset_lines() mesh_src = mesh_cxr_format(context.active_object) - - err = c_int32(0) - world = libcxr_decompose.call( mesh_src, pointer(err) ) + world = cxr_decompose_globalerr( mesh_src ) if world == None: - cxr_view_mesh = None - cxr_batch_lines() - scene_redraw() - - static.LASTERR = ["There is no error", \ - "Non-Manifold",\ - "Bad-Manifold",\ - "No-Candidate",\ - "Internal-Fail",\ - "Non-Coplanar",\ - "Non-Convex Polygon",\ - "Bad Result",\ - "Invalid-Input"]\ - [err.value] - - if static.RUNNING: - return {'CANCELLED'} - else: - context.window_manager.modal_handler_add(_) - return {'RUNNING_MODAL'} + return {'FINISHED'} # Generate preview using cxr # @@ -1527,15 +1623,8 @@ class CXR_PREVIEW_OPERATOR(bpy.types.Operator): libcxr_free_world.call( world ) cxr_batch_lines() scene_redraw() - - # Allow user to spam the operator - if static.RUNNING: - return {'CANCELLED'} - - if not static.RUNNING: - static.RUNNING = True - context.window_manager.modal_handler_add(_) - return {'RUNNING_MODAL'} + + return {'FINISHED'} # Search for VMF compiler executables in subdirectory # @@ -1563,8 +1652,21 @@ def cxr_compiler_path( compiler ): if os.path.exists( path ): return path else: return None +# Compatibility layer +# +def cxr_temp_file( fn ): + if CXR_GNU_LINUX == 1: + return F"/tmp/fn" + else: + filepath = bpy.data.filepath + directory = os.path.dirname(filepath) + return F"{directory}/{fn}.txt" + def cxr_winepath( path ): - return 'z:'+path.replace('/','\\') + if CXR_GNU_LINUX == 1: + return 'z:'+path.replace('/','\\') + else: + return path # Main compile function # @@ -1586,7 +1688,7 @@ class CXR_COMPILER_CHAIN(bpy.types.Operator): JOBSYS = None def cancel(_,context): - global cxr_jobs_batch + #global cxr_jobs_batch static = _.__class__ wm = context.window_manager @@ -1600,7 +1702,7 @@ class CXR_COMPILER_CHAIN(bpy.types.Operator): static.FILE.close() - cxr_jobs_batch = None + #cxr_jobs_batch = None scene_redraw() return {'FINISHED'} @@ -1608,7 +1710,7 @@ class CXR_COMPILER_CHAIN(bpy.types.Operator): static = _.__class__ if ev.type == 'TIMER': - global cxr_jobs_batch + global cxr_jobs_batch, cxr_error_inf if static.WAIT_REDRAW: scene_redraw() @@ -1622,15 +1724,16 @@ class CXR_COMPILER_CHAIN(bpy.types.Operator): if static.SUBPROC != None: # Deal with async modes status = static.SUBPROC.poll() - if status == None: - # Cannot redirect STDOUT through here without causing - # undefined behaviour due to the Blender Python specification. - # - # Have to write it out to a file and read it back in. - # - with open("/tmp/convexer_compile_log.txt","r") as log: - static.LOG = log.readlines() + # Cannot redirect STDOUT through here without causing + # undefined behaviour due to the Blender Python specification. + # + # Have to write it out to a file and read it back in. + # + + with open(cxr_temp_file("convexer_compile_log.txt"),"r") as log: + static.LOG = log.readlines() + if status == None: return {'PASS_THROUGH'} else: #for l in static.SUBPROC.stdout: @@ -1639,6 +1742,10 @@ class CXR_COMPILER_CHAIN(bpy.types.Operator): if status != 0: print(F'Compiler () error: {status}') + + jobn = static.JOBSYS['jobs'][static.JOBID] + cxr_error_inf = ( F"{static.JOBSYS['title']} error {status}", jobn ) + return _.cancel(context) static.JOBSYS['jobs'][static.JOBID] = None @@ -1675,9 +1782,8 @@ class CXR_COMPILER_CHAIN(bpy.types.Operator): # All completed print( "All jobs completed!" ) - cxr_jobs_batch = None - - scene_redraw() + #cxr_jobs_batch = None + #scene_redraw() return _.cancel(context) return {'PASS_THROUGH'} @@ -1692,6 +1798,7 @@ class CXR_COMPILER_CHAIN(bpy.types.Operator): return {'RUNNING_MODAL'} print("Launching compiler toolchain") + cxr_reset_all() # Run static compilation units now (collect, vmt..) filepath = bpy.data.filepath @@ -1712,7 +1819,7 @@ class CXR_COMPILER_CHAIN(bpy.types.Operator): os.makedirs( material_dir, exist_ok=True ) os.makedirs( model_dir, exist_ok=True ) - static.FILE = open(F"/tmp/convexer_compile_log.txt","w") + static.FILE = open(cxr_temp_file("convexer_compile_log.txt"),"w") static.LOG = [] sceneinfo = cxr_scene_collect() @@ -1823,7 +1930,7 @@ class CXR_COMPILER_CHAIN(bpy.types.Operator): static.JOBINFO += [{ "title": "Convexer", "w": 20, - "colour": (1.0,0.3,0.1,1.0), + "colour": (0.863, 0.078, 0.235,1.0), "exec": cxr_export_vmf, "jobs": [(sceneinfo,output_vmf)] }] @@ -1833,7 +1940,7 @@ class CXR_COMPILER_CHAIN(bpy.types.Operator): static.JOBINFO += [{ "title": "Textures", "w": 40, - "colour": (0.1,1.0,0.3,1.0), + "colour": (1.000, 0.271, 0.000,1.0), "exec": compile_image, "jobs": image_jobs }] @@ -1849,7 +1956,7 @@ class CXR_COMPILER_CHAIN(bpy.types.Operator): static.JOBINFO += [{ "title": "Batches", "w": 25, - "colour": (0.5,0.5,1.0,1.0), + "colour": (1.000, 0.647, 0.000,1.0), "exec": cxr_export_modelsrc, "jobs": model_jobs }] @@ -1858,7 +1965,7 @@ class CXR_COMPILER_CHAIN(bpy.types.Operator): static.JOBINFO += [{ "title": "StudioMDL", "w": 20, - "colour": (0.8,0.1,0.1,1.0), + "colour": (1.000, 0.843, 0.000, 1.0), "exec": "studiomdl", "jobs": [[settings[F'exe_studiomdl']] + [\ '-nop4', '-game', game, qc] for qc in qc_jobs], @@ -1872,7 +1979,7 @@ class CXR_COMPILER_CHAIN(bpy.types.Operator): static.JOBINFO += [{ "title": "VBSP", "w": 25, - "colour": (0.1,0.2,1.0,1.0), + "colour": (0.678, 1.000, 0.184,1.0), "exec": "vbsp", "jobs": [[settings[F'exe_vbsp']] + vbsp_opt + args], "cwd": directory @@ -1883,7 +1990,7 @@ class CXR_COMPILER_CHAIN(bpy.types.Operator): static.JOBINFO += [{ "title": "VVIS", "w": 25, - "colour": (0.9,0.5,0.5,1.0), + "colour": (0.000, 1.000, 0.498,1.0), "exec": "vvis", "jobs": [[settings[F'exe_vvis']] + vvis_opt + args ], "cwd": directory @@ -1894,7 +2001,7 @@ class CXR_COMPILER_CHAIN(bpy.types.Operator): static.JOBINFO += [{ "title": "VRAD", "w": 25, - "colour": (0.9,0.2,0.3,1.0), + "colour": (0.125, 0.698, 0.667,1.0), "exec": "vrad", "jobs": [[settings[F'exe_vrad']] + vrad_opt + args ], "cwd": directory @@ -1903,7 +2010,7 @@ class CXR_COMPILER_CHAIN(bpy.types.Operator): static.JOBINFO += [{ "title": "CXR", "w": 5, - "colour": (0.0,1.0,0.4,1.0), + "colour": (0.118, 0.565, 1.000,1.0), "exec": cxr_patchmap, "jobs": [(bsp_local,bsp_remote)] }] @@ -1912,7 +2019,7 @@ class CXR_COMPILER_CHAIN(bpy.types.Operator): static.JOBINFO += [{ "title": "Pack", "w": 5, - "colour": (0.2,0.2,0.2,1.0), + "colour": (0.541, 0.169, 0.886,1.0), "exec": "bspzip", "jobs": [[cxr_compiler_path("bspzip"), '-addlist', \ cxr_winepath(bsp_remote), @@ -1993,19 +2100,34 @@ class CXR_VIEW3D( bpy.types.Panel ): bl_region_type = 'UI' bl_category = "Convexer" - @classmethod - def poll(cls, context): - return (context.object is not None) - def draw(_, context): layout = _.layout + + active_object = context.object + if active_object == None: return + + purpose = cxr_object_purpose( active_object ) + + if purpose[0] == None or purpose[1] == None: + usage_str = "No purpose" + else: + if purpose[1] == 'model': + usage_str = F'mesh in {asset_name( purpose[0] )}.mdl' + else: + usage_str = F'{purpose[1]} in {purpose[0].name}' + + layout.label(text=F"Currently editing:") + box = layout.box() + box.label(text=usage_str) + + if purpose[1] == 'brush' or purpose[1] == 'brush_entity': + row = layout.row() + row.scale_y = 2 + row.operator("convexer.preview") + row = layout.row() row.scale_y = 2 - row.operator("convexer.preview") - - if CXR_PREVIEW_OPERATOR.LASTERR != None: - box = layout.box() - box.label(text=CXR_PREVIEW_OPERATOR.LASTERR, icon='ERROR') + row.operator("convexer.reset") # Main scene properties interface, where all the settings go # @@ -2017,14 +2139,13 @@ class CXR_INTERFACE(bpy.types.Panel): bl_context="scene" def draw(_,context): - _.layout.operator("convexer.reload") - _.layout.operator("convexer.dev_test") - _.layout.operator("convexer.preview") - _.layout.operator("convexer.hash_reset") + if CXR_GNU_LINUX==1: + _.layout.operator("convexer.reload") + _.layout.operator("convexer.dev_test") + _.layout.operator("convexer.hash_reset") settings = context.scene.cxr_data - _.layout.prop(settings, "debug") _.layout.prop(settings, "scale_factor") _.layout.prop(settings, "skybox_scale_factor") _.layout.prop(settings, "skyname" ) @@ -2062,6 +2183,11 @@ class CXR_INTERFACE(bpy.types.Panel): row.scale_y = 3 row.operator("convexer.chain", text=text) + row = box.row() + row.scale_y = 2 + row.operator("convexer.reset") + if CXR_COMPILER_CHAIN.TIMER != None: + row.enabled = False class CXR_MATERIAL_PANEL(bpy.types.Panel): bl_label="VMT Properties" @@ -2379,7 +2505,7 @@ class CXR_MODEL_SETTINGS(bpy.types.PropertyGroup): class CXR_SCENE_SETTINGS(bpy.types.PropertyGroup): project_name: bpy.props.StringProperty( name="Project Name" ) - subdir: bpy.props.StringProperty( name="Subdirectory" ) + subdir: bpy.props.StringProperty( name="../csgo/ folder" ) exe_studiomdl: bpy.props.StringProperty( name="studiomdl" ) exe_vbsp: bpy.props.StringProperty( name="vbsp" ) @@ -2390,7 +2516,6 @@ class CXR_SCENE_SETTINGS(bpy.types.PropertyGroup): opt_vrad: bpy.props.StringProperty( name="args", \ default="-reflectivityScale 0.35 -aoscale 1.4 -final -textureshadows -hdr -StaticPropLighting -StaticPropPolys" ) - debug: bpy.props.BoolProperty(name="Debug",default=False) scale_factor: bpy.props.FloatProperty( name="VMF Scale factor", \ default=32.0,min=1.0) skybox_scale_factor: bpy.props.FloatProperty( name="Sky Scale factor", \ @@ -2417,7 +2542,7 @@ classes = [ CXR_RELOAD, CXR_DEV_OPERATOR, CXR_INTERFACE, \ CXR_LIGHT_SETTINGS, CXR_SCENE_SETTINGS, CXR_DETECT_COMPILERS,\ CXR_ENTITY_PANEL, CXR_LIGHT_PANEL, CXR_PREVIEW_OPERATOR,\ CXR_VIEW3D, CXR_COMPILER_CHAIN, CXR_RESET_HASHES,\ - CXR_COMPILE_MATERIAL, CXR_COLLECTION_PANEL ] + CXR_COMPILE_MATERIAL, CXR_COLLECTION_PANEL, CXR_RESET ] vmt_param_dynamic_class = None diff --git a/build.sh b/build.sh index cee4b10..6cf104c 100755 --- a/build.sh +++ b/build.sh @@ -16,8 +16,10 @@ fi target_os_windows(){ exe_ext=".exe" lib_ext=".dll" - compiler_prefix="i686-w64-mingw32-" + compiler_prefix="x86_64-w64-mingw32-" asan="" + + echo "CXR_GNU_LINUX=0" > platform.py } target_os_gnu_linux(){ @@ -26,6 +28,8 @@ target_os_gnu_linux(){ compiler_prefix="" asan="-fsanitize=address" + + echo "CXR_GNU_LINUX=1" > platform.py } compile(){ diff --git a/cxr/cxr.c b/cxr/cxr.c deleted file mode 100644 index fa7b54c..0000000 --- a/cxr/cxr.c +++ /dev/null @@ -1,6 +0,0 @@ -/* This file is purely to get CMake to shut up - * - * I don't know how to emulate gcc -xc behaviour - * - */ -#include "cxr.h" diff --git a/cxr/cxr.h b/cxr/cxr.h index 1f1c649..0585f1a 100644 --- a/cxr/cxr.h +++ b/cxr/cxr.h @@ -1,11 +1,13 @@ /* - CONVEXER v0.91 + CONVEXER v0.95 A GNU/Linux-first Source1 Hammer replacement built with Blender, for mapmakers Copyright (C) 2022 Harry Godden (hgn) +LICENSE: GPLv3.0, please see COPYING and LICENSE for more information + Features: - Brush decomposition into convex pieces for well defined geometry - Freely form displacements without limits @@ -303,6 +305,13 @@ enum cxr_soliderr const char *cxr_build_time = __DATE__ " @" __TIME__; #endif +#if _WIN32 || _WIN64 +#if _WIN64 +#else +#warning 32 bit is not supported in blender 3.0 +#endif +#endif + static void (*cxr_log_func)(const char *str); static void (*cxr_line_func)( v3f p0, v3f p1, v4f colour ); @@ -2970,6 +2979,8 @@ static int cxr_write_disp( cxr_mesh *mesh, cxr_world *world, if( !newvert ) { + free( graph ); + free( vertinfo ); return 0; } } @@ -3032,9 +3043,6 @@ static int cxr_write_disp( cxr_mesh *mesh, cxr_world *world, } } -#ifdef CXR_DEBUG - cxr_log( "Broken displacement!\n" ); -#endif free( graph ); free( vertinfo ); return 0; @@ -3336,7 +3344,10 @@ CXR_API void cxr_push_world_vmf( cxr_world *world, cxr_vmf_context *ctx, if( solid->displacement ) { - cxr_write_disp( solid->pmesh, world, ctx, output ); + if( !cxr_write_disp( solid->pmesh, world, ctx, output ) ) + { + cxr_log( "Warning: Invalid displacement\n" ); + } continue; } diff --git a/makedist.sh b/makedist.sh index 3779646..16266fe 100755 --- a/makedist.sh +++ b/makedist.sh @@ -1,5 +1,6 @@ -mkdir win32_dist -cp *.dll win32_dist/ -cp *.py win32_dist/ -zip -r convexer-win32.zip win32_dist/ -rm -r win32_dist +rm convexer-win64.zip +mkdir convexer_win64 +cp *.dll convexer_win64 +cp *.py convexer_win64 +zip -r convexer-win64.zip convexer_win64/ +rm -r convexer_win64 diff --git a/platform.py b/platform.py new file mode 100644 index 0000000..0bc5e2c --- /dev/null +++ b/platform.py @@ -0,0 +1 @@ +CXR_GNU_LINUX=0 -- 2.25.1