Moving repo to github

.clang-format

@@ -24,8 +24,8 @@ BraceWrapping:
   AfterEnum: true
   AfterFunction: true
   AfterNamespace: true
-  AfterObjCDeclaration: true
   AfterStruct: true
+  AfterObjCDeclaration: true
   AfterUnion: true
   BeforeCatch: true
   BeforeElse: true

.gitignore

@@ -14,6 +14,7 @@ build
 *.wasm
 *.app
 *.dylib
+*.a
 
 Debug/*
 
@@ -33,11 +34,10 @@ src/graphics/orca_gl31.h
 .vscode/settings.json
 
 __pycache__
-/.cache
 scripts/files
 
 # explicitly abandon old ext dir
 /ext
 src/ext/angle
 
-sketches/*/bin
+sketches/*/bin

FUNDING.yml

@@ -0,0 +1,2 @@
+github: orca-app
+custom: "https://orca-app.dev/sponsor.html"

LICENSE.txt

@@ -1,678 +1,207 @@
-Orca
+                                    Orca
 
-Copyright (C) 2023 Martin Fouilleul and the Orca project contributors
+Copyright (C) 2023 Martin Fouilleul
 
-This program is free software: you can redistribute it and/or modify
+Orca is distributed under the MIT license or the Apache License version 2.0,
-it under the terms of the GNU Affero General Public License as
+at your option.
-published by the Free Software Foundation version 3, with additional
-terms under section 7 of the GNU Affero General Public License version
-3, as published at the end of this document.
-
-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 Affero General Public License for more details.
 
 -------------------------------------------------------------------------------
-                               AGPLv3 LICENSE
+
+                                MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
 -------------------------------------------------------------------------------
 
-                    GNU AFFERO GENERAL PUBLIC LICENSE
+                              Apache License
-                       Version 3, 19 November 2007
+                        Version 2.0, January 2004
-
+                     http://www.apache.org/licenses/
- Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+
- Everyone is permitted to copy and distribute verbatim copies
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
- of this license document, but changing it is not allowed.
+
-
+1. Definitions.
-                            Preamble
+
-
+   "License" shall mean the terms and conditions for use, reproduction,
-  The GNU Affero General Public License is a free, copyleft license for
+   and distribution as defined by Sections 1 through 9 of this document.
-software and other kinds of works, specifically designed to ensure
+
-cooperation with the community in the case of network server software.
+   "Licensor" shall mean the copyright owner or entity authorized by
-
+   the copyright owner that is granting the License.
-  The licenses for most software and other practical works are designed
+
-to take away your freedom to share and change the works.  By contrast,
+   "Legal Entity" shall mean the union of the acting entity and all
-our General Public Licenses are intended to guarantee your freedom to
+   other entities that control, are controlled by, or are under common
-share and change all versions of a program--to make sure it remains free
+   control with that entity. For the purposes of this definition,
-software for all its users.
+   "control" means (i) the power, direct or indirect, to cause the
-
+   direction or management of such entity, whether by contract or
-  When we speak of free software, we are referring to freedom, not
+   otherwise, or (ii) ownership of fifty percent (50%) or more of the
-price.  Our General Public Licenses are designed to make sure that you
+   outstanding shares, or (iii) beneficial ownership of such entity.
-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
+   "You" (or "Your") shall mean an individual or Legal Entity
-want it, that you can change the software or use pieces of it in new
+   exercising permissions granted by this License.
-free programs, and that you know you can do these things.
+
-
+   "Source" form shall mean the preferred form for making modifications,
-  Developers that use our General Public Licenses protect your rights
+   including but not limited to software source code, documentation
-with two steps: (1) assert copyright on the software, and (2) offer
+   source, and configuration files.
-you this License which gives you legal permission to copy, distribute
+
-and/or modify the software.
+   "Object" form shall mean any form resulting from mechanical
-
+   transformation or translation of a Source form, including but
-  A secondary benefit of defending all users' freedom is that
+   not limited to compiled object code, generated documentation,
-improvements made in alternate versions of the program, if they
+   and conversions to other media types.
-receive widespread use, become available for other developers to
+
-incorporate.  Many developers of free software are heartened and
+   "Work" shall mean the work of authorship, whether in Source or
-encouraged by the resulting cooperation.  However, in the case of
+   Object form, made available under the License, as indicated by a
-software used on network servers, this result may fail to come about.
+   copyright notice that is included in or attached to the work
-The GNU General Public License permits making a modified version and
+   (an example is provided in the Appendix below).
-letting the public access it on a server without ever releasing its
+
-source code to the public.
+   "Derivative Works" shall mean any work, whether in Source or Object
-
+   form, that is based on (or derived from) the Work and for which the
-  The GNU Affero General Public License is designed specifically to
+   editorial revisions, annotations, elaborations, or other modifications
-ensure that, in such cases, the modified source code becomes available
+   represent, as a whole, an original work of authorship. For the purposes
-to the community.  It requires the operator of a network server to
+   of this License, Derivative Works shall not include works that remain
-provide the source code of the modified version running there to the
+   separable from, or merely link (or bind by name) to the interfaces of,
-users of that server.  Therefore, public use of a modified version, on
+   the Work and Derivative Works thereof.
-a publicly accessible server, gives the public access to the source
+
-code of the modified version.
+   "Contribution" shall mean any work of authorship, including
-
+   the original version of the Work and any modifications or additions
-  An older license, called the Affero General Public License and
+   to that Work or Derivative Works thereof, that is intentionally
-published by Affero, was designed to accomplish similar goals.  This is
+   submitted to Licensor for inclusion in the Work by the copyright owner
-a different license, not a version of the Affero GPL, but Affero has
+   or by an individual or Legal Entity authorized to submit on behalf of
-released a new version of the Affero GPL which permits relicensing under
+   the copyright owner. For the purposes of this definition, "submitted"
-this license.
+   means any form of electronic, verbal, or written communication sent
-
+   to the Licensor or its representatives, including but not limited to
-  The precise terms and conditions for copying, distribution and
+   communication on electronic mailing lists, source code control systems,
-modification follow.
+   and issue tracking systems that are managed by, or on behalf of, the
-
+   Licensor for the purpose of discussing and improving the Work, but
-                       TERMS AND CONDITIONS
+   excluding communication that is conspicuously marked or otherwise
-
+   designated in writing by the copyright owner as "Not a Contribution."
-  0. Definitions.
+
-
+   "Contributor" shall mean Licensor and any individual or Legal Entity
-  "This License" refers to version 3 of the GNU Affero General Public License.
+   on behalf of whom a Contribution has been received by Licensor and
-
+   subsequently incorporated within the Work.
-  "Copyright" also means copyright-like laws that apply to other kinds of
+
-works, such as semiconductor masks.
+2. Grant of Copyright License. Subject to the terms and conditions of
-
+   this License, each Contributor hereby grants to You a perpetual,
-  "The Program" refers to any copyrightable work licensed under this
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-License.  Each licensee is addressed as "you".  "Licensees" and
+   copyright license to reproduce, prepare Derivative Works of,
-"recipients" may be individuals or organizations.
+   publicly display, publicly perform, sublicense, and distribute the
-
+   Work and such Derivative Works in Source or Object form.
-  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
+3. Grant of Patent License. Subject to the terms and conditions of
-exact copy.  The resulting work is called a "modified version" of the
+   this License, each Contributor hereby grants to You a perpetual,
-earlier work or a work "based on" the earlier work.
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-
+   (except as stated in this section) patent license to make, have made,
-  A "covered work" means either the unmodified Program or a work based
+   use, offer to sell, sell, import, and otherwise transfer the Work,
-on the Program.
+   where such license applies only to those patent claims licensable
-
+   by such Contributor that are necessarily infringed by their
-  To "propagate" a work means to do anything with it that, without
+   Contribution(s) alone or by combination of their Contribution(s)
-permission, would make you directly or secondarily liable for
+   with the Work to which such Contribution(s) was submitted. If You
-infringement under applicable copyright law, except executing it on a
+   institute patent litigation against any entity (including a
-computer or modifying a private copy.  Propagation includes copying,
+   cross-claim or counterclaim in a lawsuit) alleging that the Work
-distribution (with or without modification), making available to the
+   or a Contribution incorporated within the Work constitutes direct
-public, and in some countries other activities as well.
+   or contributory patent infringement, then any patent licenses
-
+   granted to You under this License for that Work shall terminate
-  To "convey" a work means any kind of propagation that enables other
+   as of the date such litigation is filed.
-parties to make or receive copies.  Mere interaction with a user through
+
-a computer network, with no transfer of a copy, is not conveying.
+4. Redistribution. You may reproduce and distribute copies of the
-
+   Work or Derivative Works thereof in any medium, with or without
-  An interactive user interface displays "Appropriate Legal Notices"
+   modifications, and in Source or Object form, provided that You
-to the extent that it includes a convenient and prominently visible
+   meet the following conditions:
-feature that (1) displays an appropriate copyright notice, and (2)
+
-tells the user that there is no warranty for the work (except to the
+   (a) You must give any other recipients of the Work or
-extent that warranties are provided), that licensees may convey the
+       Derivative Works a copy of this License; and
-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
+   (b) You must cause any modified files to carry prominent notices
-menu, a prominent item in the list meets this criterion.
+       stating that You changed the files; and
-
+
-  1. Source Code.
+   (c) You must retain, in the Source form of any Derivative Works
-
+       that You distribute, all copyright, patent, trademark, and
-  The "source code" for a work means the preferred form of the work
+       attribution notices from the Source form of the Work,
-for making modifications to it.  "Object code" means any non-source
+       excluding those notices that do not pertain to any part of
-form of a work.
+       the Derivative Works; and
-
+
-  A "Standard Interface" means an interface that either is an official
+   (d) If the Work includes a "NOTICE" text file as part of its
-standard defined by a recognized standards body, or, in the case of
+       distribution, then any Derivative Works that You distribute must
-interfaces specified for a particular programming language, one that
+       include a readable copy of the attribution notices contained
-is widely used among developers working in that language.
+       within such NOTICE file, excluding those notices that do not
-
+       pertain to any part of the Derivative Works, in at least one
-  The "System Libraries" of an executable work include anything, other
+       of the following places: within a NOTICE text file distributed
-than the work as a whole, that (a) is included in the normal form of
+       as part of the Derivative Works; within the Source form or
-packaging a Major Component, but which is not part of that Major
+       documentation, if provided along with the Derivative Works; or,
-Component, and (b) serves only to enable use of the work with that
+       within a display generated by the Derivative Works, if and
-Major Component, or to implement a Standard Interface for which an
+       wherever such third-party notices normally appear. The contents
-implementation is available to the public in source code form.  A
+       of the NOTICE file are for informational purposes only and
-"Major Component", in this context, means a major essential component
+       do not modify the License. You may add Your own attribution
-(kernel, window system, and so on) of the specific operating system
+       notices within Derivative Works that You distribute, alongside
-(if any) on which the executable work runs, or a compiler used to
+       or as an addendum to the NOTICE text from the Work, provided
-produce the work, or an object code interpreter used to run it.
+       that such additional attribution notices cannot be construed
-
+       as modifying the License.
-  The "Corresponding Source" for a work in object code form means all
+
-the source code needed to generate, install, and (for an executable
+   You may add Your own copyright statement to Your modifications and
-work) run the object code and to modify the work, including scripts to
+   may provide additional or different license terms and conditions
-control those activities.  However, it does not include the work's
+   for use, reproduction, or distribution of Your modifications, or
-System Libraries, or general-purpose tools or generally available free
+   for any such Derivative Works as a whole, provided Your use,
-programs which are used unmodified in performing those activities but
+   reproduction, and distribution of the Work otherwise complies with
-which are not part of the work.  For example, Corresponding Source
+   the conditions stated in this License.
-includes interface definition files associated with source files for
+
-the work, and the source code for shared libraries and dynamically
+5. Submission of Contributions. Unless You explicitly state otherwise,
-linked subprograms that the work is specifically designed to require,
+   any Contribution intentionally submitted for inclusion in the Work
-such as by intimate data communication or control flow between those
+   by You to the Licensor shall be under the terms and conditions of
-subprograms and other parts of the work.
+   this License, without any additional terms or conditions.
-
+   Notwithstanding the above, nothing herein shall supersede or modify
-  The Corresponding Source need not include anything that users
+   the terms of any separate license agreement you may have executed
-can regenerate automatically from other parts of the Corresponding
+   with Licensor regarding such Contributions.
-Source.
+
-
+6. Trademarks. This License does not grant permission to use the trade
-  The Corresponding Source for a work in source code form is that
+   names, trademarks, service marks, or product names of the Licensor,
-same work.
+   except as required for reasonable and customary use in describing the
-
+   origin of the Work and reproducing the content of the NOTICE file.
-  2. Basic Permissions.
+
-
+7. Disclaimer of Warranty. Unless required by applicable law or
-  All rights granted under this License are granted for the term of
+   agreed to in writing, Licensor provides the Work (and each
-copyright on the Program, and are irrevocable provided the stated
+   Contributor provides its Contributions) on an "AS IS" BASIS,
-conditions are met.  This License explicitly affirms your unlimited
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-permission to run the unmodified Program.  The output from running a
+   implied, including, without limitation, any warranties or conditions
-covered work is covered by this License only if the output, given its
+   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-content, constitutes a covered work.  This License acknowledges your
+   PARTICULAR PURPOSE. You are solely responsible for determining the
-rights of fair use or other equivalent, as provided by copyright law.
+   appropriateness of using or redistributing the Work and assume any
-
+   risks associated with Your exercise of permissions under this License.
-  You may make, run and propagate covered works that you do not
+
-convey, without conditions so long as your license otherwise remains
+8. Limitation of Liability. In no event and under no legal theory,
-in force.  You may convey covered works to others for the sole purpose
+   whether in tort (including negligence), contract, or otherwise,
-of having them make modifications exclusively for you, or provide you
+   unless required by applicable law (such as deliberate and grossly
-with facilities for running those works, provided that you comply with
+   negligent acts) or agreed to in writing, shall any Contributor be
-the terms of this License in conveying all material for which you do
+   liable to You for damages, including any direct, indirect, special,
-not control copyright.  Those thus making or running the covered works
+   incidental, or consequential damages of any character arising as a
-for you must do so exclusively on your behalf, under your direction
+   result of this License or out of the use or inability to use the
-and control, on terms that prohibit them from making any copies of
+   Work (including but not limited to damages for loss of goodwill,
-your copyrighted material outside their relationship with you.
+   work stoppage, computer failure or malfunction, or any and all
-
+   other commercial damages or losses), even if such Contributor
-  Conveying under any other circumstances is permitted solely under
+   has been advised of the possibility of such damages.
-the conditions stated below.  Sublicensing is not allowed; section 10
+
-makes it unnecessary.
+9. Accepting Warranty or Additional Liability. While redistributing
-
+   the Work or Derivative Works thereof, You may choose to offer,
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+   and charge a fee for, acceptance of support, warranty, indemnity,
-
+   or other liability obligations and/or rights consistent with this
-  No covered work shall be deemed part of an effective technological
+   License. However, in accepting such obligations, You may act only
-measure under any applicable law fulfilling obligations under article
+   on Your own behalf and on Your sole responsibility, not on behalf
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
+   of any other Contributor, and only if You agree to indemnify,
-similar laws prohibiting or restricting circumvention of such
+   defend, and hold each Contributor harmless for any liability
-measures.
+   incurred by, or claims asserted against, such Contributor by reason
-
+   of your accepting any such warranty or additional liability.
-  When you convey a covered work, you waive any legal power to forbid
+
-circumvention of technological measures to the extent such circumvention
+END OF TERMS AND CONDITIONS
-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. Remote Network Interaction; Use with the GNU General Public License.
-
-  Notwithstanding any other provision of this License, if you modify the
-Program, your modified version must prominently offer all users
-interacting with it remotely through a computer network (if your version
-supports such interaction) an opportunity to receive the Corresponding
-Source of your version by providing access to the Corresponding Source
-from a network server at no charge, through some standard or customary
-means of facilitating copying of software.  This Corresponding Source
-shall include the Corresponding Source for any work covered by version 3
-of the GNU General Public License that is incorporated pursuant to the
-following paragraph.
-
-  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 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 work with which it is combined will remain governed by version
-3 of the GNU General Public License.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU Affero 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 Affero 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 Affero 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 Affero 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
-
---------------------------------------------------------------------------------
-                          ADDITIONAL TERMS
---------------------------------------------------------------------------------
-
-1. Pursuant to section 7(b) of the AGPLv3, we require the preservation of the legal
-notices, copyright notices and author attributions in the program and in its
-documentation and in the Appropriate Legal Notices displayed by works containing
-it.
-
-2. Pursuant to Section 7(c) of the AGPLv3, we require that modified versions of the
-material should be marked in a reasonable way as different from the official
-version.
-
-Any modified material being redistributed must include a prominent and conveniently
-accessible feature for the display of a Modified Material Notice including the statement
-"This program is using a modified version of the Orca Runtime version VERSION_NUMBER
-released on RELEASE_DATE.
-
-The string VERSION_NUMBER should be replaced with the exact version number of
-the Program on which the modified material is based.
-The string RELEASE_DATE should be replaced with the full date of the release of
-the version VERSION_NUMBER of the Program on which the
-modified material is based.
-
-The Modified Material Notice must be clearly visible with size of the fonts
-and icons proportionate to the user interface being used.
-
-The Modified Material Notice must be in the same language of the user interface.
-
-3. Additional permission for WebAssembly modules used by the Program.
-The Program works by loading and running WebAssembly modules written by third parties.
-To make this work, portions of the Program must be compiled into these WebAssembly modules,
-making them covered work under the terms of this license.
-
-As an additional permission, WebAssembly modules including unmodified portions of
-the Program to the sole purpose of being bundled with and run by an unmodified version
-of the Program can be distributed under the terms of their author's choice, without being
-bound by the requirements of this license. This permission does not extend to modifications
-of the Program itself or its development libraries.

Readme.md

@@ -1,146 +1,2 @@
-------
+**This repository is not used anymore. Development of Orca was moved here: [https://github.com/orca-app/orca](https://github.com/orca-app/orca)**
-**DISCLAIMER: This project is very much a Work In Progress. We are making it accessible in this very early state so that participants in the [2023 Wheel Reinvention Jam](https://handmade.network/jam/2023) can try it out and possibly use it as their jamming platform. Expect bugs, missing and/or incomplete features, unstable APIs, and sparse documentation. Some current issues might be a show stopper for you, so make sure you can build and run the sample apps before jumping in.**
 
-**If you do choose to try out Orca anyway, thank you! We'll do our best to answer your questions, and we'd really appreciate your feedback!**
-
-------
-
-# Orca
-
-![Example Orca apps](doc/images/orca-apps-lg.webp)
-
-Orca is a development platform and runtime environment for cross-platform, sandboxed graphical WebAssembly applications. In this early MVP you can:
-
-- Receive mouse and keyboard input.
-- Draw paths, images and text using a 2D vector graphics API.
-- Draw 2D/3D graphics using OpenGL ES 3.1 (minus a few features)
-- Build user interfaces using our UI API and default widgets.
-- Read and write files using a capability-based API.
-
-To learn more about the project and its goals, read the [announcement post](https://orca-app.dev/posts/230607/orca_announcement.html).
-
-## Installing
-
-The Orca command-line tools must be installed to your system in order to use them in your own projects.
-
-**At this early stage, you must build Orca yourself - in the future, there will be fewer dependencies and this installation process will be streamlined.**
-
-### Requirements
-
-- Windows or Mac (Linux is not yet supported)
-- [Python 3.8](https://www.python.org/) or newer (for command line tools)
-- Clang (version 11.0 or newer)
-	- **Windows users:** `clang` can be installed via the Visual Studio installer. Search for "C++ Clang Compiler".
-	- **Mac users:** Apple's built-in `clang` does not support WebAssembly. We recommend installing `clang` via [Homebrew](https://brew.sh/) with `brew install llvm`.
-- MSVC (Visual Studio 2022 17.5 or newer) (Windows only)
-	- This can be installed through the [Visual Studio Community](https://visualstudio.microsoft.com/) installer. Ensure that your Visual Studio installation includes "Desktop development with C++".
-	- Please note the version requirement! Orca requires C11 atomics, which were only added to MSVC in late 2022.
-- Xcode command-line tools (Mac only)
-	- These can be installed with `xcode-select --install`.
-
-### Installation instructions
-
-**Windows users:** You must perform all the following actions from a 64-bit Visual Studio command prompt. We recommend searching for "x64 Native Tools Command Prompt".
-
-Clone the repo, then `cd` into the `orca` directory:
-
-```
-git clone https://git.handmade.network/hmn/orca.git
-cd orca
-```
-
-Build the Orca runtime:
-
-```
-python orca dev build-runtime
-```
-
-Install the Orca dev tools. If on Windows, the tool can automatically add `orca` to your PATH. Otherwise, you must manually add the Orca install directory to your PATH, e.g. by updating `.zshrc` or `.bashrc`.
-
-```
-python orca dev install
-```
-
-Finally, verify that Orca is successfully installed by running the `orca version` command. Note the lack of `./`!
-
-```
-orca version
-```
-
-If you encounter any errors, see the FAQ below.
-
-Once the `orca` tools are installed and on your PATH, you can use them from anywhere.
-
-### Building the sample Orca apps
-
-The `samples` directory contains several sample apps that demonstrate various Orca features. To build one, `cd` to a sample project's directory and run its build script. For example, for the `breakout` sample:
-
-```
-cd samples/breakout
-# Windows
-build.bat
-# Mac
-./build.sh
-```
-
-On Windows this creates a `Breakout` directory in `samples/breakout`. You can launch the app by running `Breakout/bin/Breakout.exe`. On macOS this creates a `Breakout.app` bundle in `samples/breakout` that you can double-click to run.
-
-## Writing an Orca app
-
-Orca apps are WebAssembly modules that use the Orca APIs. The process for creating an Orca application is:
-
-1. Compile a WebAssembly module using your language and toolchain of choice.
-2. Bundle the WebAssembly module into a native executable using the Orca command-line tools.
-
-For a more thorough overview, please read the [Quick Start Guide](./doc/QuickStart.md), which will walk you through building a simple application.
-
-The following additional resources may also help you familiarize yourself with Orca and its APIs:
-
-- The [samples folder](./samples) contains sample applications that show various aspects of the Orca API and core library:
-	- [`breakout`](./samples/breakout) is a small breakout game making use of the vector graphics API.
-	- [`clock`](./samples/clock) is a simple clock showcasing vector graphics and the time API.
-	- [`triangle`](./samples/triangle) shows how to draw a spinning triangle using the GLES API.
-	- [`fluid`](./samples/fluid) is a fluid simulation using a more complex GLES setup.
-	- [`ui`](./samples/ui) showcases the UI API and Orca's default UI widgets.  
-- The [API Cheatsheets](./doc/cheatsheets) provide a list of Orca API functions, grouped by topic.
-
-## FAQ
-
-**What platforms does Orca support?**
-
-We currently support Windows 10 and up, and macOS 10.15 and up. We plan to expand to more platforms in the future.
-
-**What languages can I use with Orca?**
-
-In principle, you can use any language and toolchain that can produce a WebAssembly module and bind to the Orca APIs. However, several important parts of Orca, such as the UI, are provided as part of the core library, which must be compiled to WebAssembly with your app, and is written in C. Therefore, at this early stage, it may be difficult to use any language other than C.
-
-C-style C++ is possible but requires compiling the core library in C as a separate object file, and then adding that object to your compile command when building your app.
-
-We're currently working with contributors to add support for Odin and Zig, and we look forward to expanding the number of officially-supported languages in the future. 
-
-**Which WebAssembly features does Orca support?**
-
-We currently use [wasm3](https://github.com/wasm3/wasm3) for our interpreter. We therefore support whatever features wasm3 supports. In practice this means all WebAssembly 1.0 features, bulk memory operations, and a couple other small features.
-
-**I am getting "unsupported OS" errors when building on Windows.**
-
-You are likely running from the wrong kind of Visual Studio command prompt. Search for "x64 Native Tools Command Prompt" or run `vcvarsall.bat` with `x64` for the architecture.
-
-To verify that you are in the correct type of command prompt, simply run `cl` with no arguments, and verify that you are building for x64.
-
-**I am getting errors about atomics when building the runtime on Windows.**
-
-Please ensure that you have the latest version of Visual Studio and MSVC installed. The Orca runtime requires the use of C11 atomics, which were not added to MSVC until late 2022.
-
-**I am getting errors saying that `orca` is not found.**
-
-Please ensure that you have installed Orca to your system per the installation instructions above. Please also ensure that the Orca install directory is on your PATH. The installation path is printed when running `./orca dev install`.
-
-## License
-
-Orca is distributed under the terms of the GNU Affero General Public License version 3, with additional terms in accordance with section 7 of AGPLv3. These additional terms ensure that:
-
-- Modified versions of Orca must reasonably inform users that they are modified.
-- You can distribute your application's WebAssembly modules under the terms of your choice, and are not required to license them under the terms of the AGPLv3.
-
-Copyright and License details can be found in [LICENSE.txt](./LICENSE.txt)

samples/breakout/build.bat

@@ -15,11 +15,11 @@ if exist "..\..\scripts\sample_build_check.py" (
 set ORCA_DIR=..\..
 set STDLIB_DIR=%ORCA_DIR%\src\libc-shim
 
-:: compile wasm module
+:: common flags to build wasm modules
 set wasmFlags=--target=wasm32^
        --no-standard-libraries ^
        -mbulk-memory ^
-       -g ^
+       -g -O2 ^
        -D__ORCA__ ^
        -Wl,--no-entry ^
        -Wl,--export-dynamic ^
@@ -27,7 +27,13 @@ set wasmFlags=--target=wasm32^
        -I%ORCA_DIR%\src ^
        -I%ORCA_DIR%\src\ext
 
-clang %wasmFlags% -o .\module.wasm %ORCA_DIR%\src\orca.c %STDLIB_DIR%\src\*.c src\main.c
+:: build orca core as wasm module
-if !ERRORLEVEL! neq 0 exit /b !ERRORLEVEL!
+clang %wasmFlags% -Wl,--relocatable -o .\liborca.a %ORCA_DIR%\src\orca.c %ORCA_DIR%\src\libc-shim\src\*.c
+IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
 
+:: build sample as wasm module and link it with the orca module
+clang %wasmFlags% -L . -lorca -o module.wasm src/main.c
+IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
+
+:: create app directory and copy files into it
 orca bundle --orca-dir %ORCA_DIR% --name Breakout --icon icon.png --resource-dir data module.wasm

samples/breakout/build.sh

@@ -15,6 +15,7 @@ fi
 ORCA_DIR=../..
 STDLIB_DIR=$ORCA_DIR/src/libc-shim
 
+# common flags to build wasm modules
 wasmFlags="--target=wasm32 \
   --no-standard-libraries \
   -mbulk-memory \
@@ -26,6 +27,11 @@ wasmFlags="--target=wasm32 \
   -I $ORCA_DIR/src \
   -I $ORCA_DIR/src/ext"
 
-clang $wasmFlags -o ./module.wasm $ORCA_DIR/src/orca.c $STDLIB_DIR/src/*.c src/main.c
+# build orca core as wasm module
+clang $wasmFlags -Wl,--relocatable -o ./liborca.a $ORCA_DIR/src/orca.c $STDLIB_DIR/src/*.c
 
+# build sample as wasm module and link it with the orca module
+clang $wasmFlags -L . -lorca -o module.wasm src/main.c
+
+# create app directory and copy files into it
 orca bundle --orca-dir $ORCA_DIR --name Breakout --icon icon.png --resource-dir data module.wasm

samples/clock/build.bat

@@ -15,7 +15,7 @@ if exist "..\..\scripts\sample_build_check.py" (
 set ORCA_DIR=..\..
 set STDLIB_DIR=%ORCA_DIR%\src\libc-shim
 
-:: compile wasm module
+:: common flags to build wasm modules
 set wasmFlags=--target=wasm32^
        --no-standard-libraries ^
        -mbulk-memory ^
@@ -27,7 +27,13 @@ set wasmFlags=--target=wasm32^
        -I%ORCA_DIR%\src ^
        -I%ORCA_DIR%\src\ext
 
-clang %wasmFlags% -o .\module.wasm %ORCA_DIR%\src\orca.c %STDLIB_DIR%\src\*.c src\main.c
+:: build orca core as wasm module
-if !ERRORLEVEL! neq 0 exit /b !ERRORLEVEL!
+clang %wasmFlags% -Wl,--relocatable -o .\liborca.a %ORCA_DIR%\src\orca.c %ORCA_DIR%\src\libc-shim\src\*.c
+IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
 
+:: build sample as wasm module and link it with the orca module
+clang %wasmFlags% -L . -lorca -o module.wasm src/main.c
+IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
+
+:: create app directory and copy files into it
 orca bundle --orca-dir %ORCA_DIR% --name Clock --icon icon.png --resource-dir data module.wasm

samples/clock/build.sh

@@ -15,6 +15,7 @@ fi
 ORCA_DIR=../..
 STDLIB_DIR=$ORCA_DIR/src/libc-shim
 
+# common flags to build wasm modules
 wasmFlags="--target=wasm32 \
   --no-standard-libraries \
   -mbulk-memory \
@@ -26,6 +27,11 @@ wasmFlags="--target=wasm32 \
   -I $ORCA_DIR/src \
   -I $ORCA_DIR/src/ext"
 
-clang $wasmFlags -o ./module.wasm $ORCA_DIR/src/orca.c $STDLIB_DIR/src/*.c src/main.c
+# build orca core as wasm module
+clang $wasmFlags -Wl,--relocatable -o ./liborca.a $ORCA_DIR/src/orca.c $STDLIB_DIR/src/*.c
 
+# build sample as wasm module and link it with the orca module
+clang $wasmFlags -L . -lorca -o module.wasm src/main.c
+
+# create app directory and copy files into it
 orca bundle --orca-dir $ORCA_DIR --name Clock --icon icon.png --resource-dir data module.wasm

samples/fluid/build.bat

@@ -15,7 +15,7 @@ if exist "..\..\scripts\sample_build_check.py" (
 set ORCA_DIR=..\..
 set STDLIB_DIR=%ORCA_DIR%\src\libc-shim
 
-:: compile wasm module
+:: common flags to build wasm modules
 set wasmFlags=--target=wasm32^
        --no-standard-libraries ^
        -mbulk-memory ^
@@ -27,6 +27,10 @@ set wasmFlags=--target=wasm32^
        -I%ORCA_DIR%\src ^
        -I%ORCA_DIR%\src\ext
 
+:: build orca core as wasm module
+clang %wasmFlags% -Wl,--relocatable -o .\liborca.a %ORCA_DIR%\src\orca.c %ORCA_DIR%\src\libc-shim\src\*.c
+IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
+
 set shaders=src/shaders/advect.glsl^
 	src/shaders/blit_div_fragment.glsl^
 	src/shaders/blit_div_vertex.glsl^
@@ -45,7 +49,9 @@ set shaders=src/shaders/advect.glsl^
 call python ../../scripts/embed_text_files.py --prefix=glsl_ --output src/glsl_shaders.h %shaders%
 if !ERRORLEVEL! neq 0 exit /b !ERRORLEVEL!
 
-clang %wasmFlags% -o .\module.wasm %ORCA_DIR%\src\orca.c %STDLIB_DIR%\src\*.c src\main.c
+:: build sample as wasm module and link it with the orca module
-if !ERRORLEVEL! neq 0 exit /b !ERRORLEVEL!
+clang %wasmFlags% -L . -lorca -o .\module.wasm src\main.c
+IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
 
-orca bundle --orca-dir %ORCA_DIR% --name Fluid --icon icon.png module.wasm
+:: create app directory and copy files into it
+orca bundle --orca-dir %ORCA_DIR% --name Fluid --icon icon.png module.wasm

samples/fluid/build.sh

@@ -17,6 +17,7 @@ STDLIB_DIR=$ORCA_DIR/src/libc-shim
 
 python3 ../../scripts/embed_text_files.py --prefix=glsl_ --output src/glsl_shaders.h src/shaders/*.glsl
 
+# common flags to build wasm modules
 wasmFlags="--target=wasm32 \
   --no-standard-libraries \
   -mbulk-memory \
@@ -28,6 +29,11 @@ wasmFlags="--target=wasm32 \
   -I $ORCA_DIR/src \
   -I $ORCA_DIR/src/ext"
 
-clang $wasmFlags -o ./module.wasm $ORCA_DIR/src/orca.c $STDLIB_DIR/src/*.c src/main.c
+# build orca core as wasm module
+clang $wasmFlags -Wl,--relocatable -o ./liborca.a $ORCA_DIR/src/orca.c $STDLIB_DIR/src/*.c
 
+# build sample as wasm module and link it with the orca module
+clang $wasmFlags -L . -lorca -o module.wasm src/main.c
+
+# create app directory and copy files into it
 orca bundle --orca-dir $ORCA_DIR --name Fluid --icon icon.png module.wasm

samples/fluid/src/main.c

@@ -140,6 +140,7 @@ frame_buffer divBuffer[4];
 GLuint vertexBuffer;
 
 oc_surface surface;
+f64 startTime;
 
 //----------------------------------------------------------------
 //NOTE(martin): initialization
@@ -403,6 +404,7 @@ typedef struct mouse_input
 } mouse_input;
 
 mouse_input mouseInput = { 0 };
+bool mouseWasDown = false;
 
 int frameWidth = 800;
 int frameHeight = 600;
@@ -410,6 +412,7 @@ int frameHeight = 600;
 ORCA_EXPORT void oc_on_mouse_down(int button)
 {
     mouseInput.down = true;
+    mouseWasDown = true;
 }
 
 ORCA_EXPORT void oc_on_mouse_up(int button)
@@ -577,23 +580,56 @@ void multigrid_clear(frame_buffer* error)
 
 void input_splat(float t)
 {
-    //NOTE: apply force and dye
+    bool applySplat = false;
-    if(mouseInput.down && (mouseInput.deltaX || mouseInput.deltaY))
+    float x, y, deltaX, deltaY;
+    static f64 lastFrameTime = 0;
+    if (lastFrameTime == 0)
+    {
+        lastFrameTime = startTime;
+    }
+    f64 now = oc_clock_time(OC_CLOCK_MONOTONIC);
+    float frameDuration = now - lastFrameTime;
+    lastFrameTime = now;
+
+    if (mouseInput.down && (mouseInput.deltaX || mouseInput.deltaY))
     {
         oc_vec2 scaling = oc_surface_contents_scaling(surface);
+        applySplat = true;
+        x = mouseInput.x * scaling.x / frameWidth;
+        y = mouseInput.y * scaling.y / frameHeight;
+        deltaX = 1. / 60 / frameDuration * mouseInput.deltaX * scaling.x / frameWidth;
+        deltaY = 1. / 60 / frameDuration * mouseInput.deltaY * scaling.y / frameHeight;
+        mouseInput.deltaX = 0;
+        mouseInput.deltaY = 0;
+    }
+
+    f64 timeSinceStart = now - startTime;
+    if (!mouseWasDown && timeSinceStart < 1)
+    {
+        applySplat = true;
+        float totalDeltaX = 0.5;
+        x = 0.1 + totalDeltaX * timeSinceStart;
+        y = 0.5;
+        deltaX = totalDeltaX / 180;
+        deltaY = 0;
+    }
+
+    //NOTE: apply force and dye
+    if(applySplat)
+    {
         // account for margin
         float margin = 32;
 
         float offset = margin / texWidth;
         float ratio = 1 - 2 * margin / texWidth;
 
-        float splatPosX = (mouseInput.x * scaling.x / frameWidth) * ratio + offset;
+        float splatPosX = x * ratio + offset;
-        float splatPosY = (1 - mouseInput.y * scaling.y / frameHeight) * ratio + offset;
+        float splatPosY = (1 - y) * ratio + offset;
 
-        float splatVelX = (10000. * DELTA * mouseInput.deltaX * scaling.x / frameWidth) * ratio;
+        float splatVelX = (10000. * DELTA * deltaX) * ratio;
-        float splatVelY = (-10000. * DELTA * mouseInput.deltaY * scaling.y / frameWidth) * ratio;
+        float splatVelY = (-10000. * DELTA * deltaY) * ratio;
 
-        float intensity = 100 * sqrtf(square(ratio * mouseInput.deltaX * scaling.x / frameWidth) + square(ratio * mouseInput.deltaY * scaling.y / frameHeight));
+        float intensity = 100 * sqrtf(square(ratio * deltaX) + square(ratio * deltaY));
 
         float r = intensity * (sinf(2 * M_PI * 0.1 * t) + 1);
         float g = 0.5 * intensity * (cosf(2 * M_PI * 0.1 / M_E * t + 654) + 1);
@@ -602,9 +638,6 @@ void input_splat(float t)
         float radius = 0.005;
 
         apply_splat(splatPosX, splatPosY, radius, splatVelX, splatVelY, r, g, b, false);
-
-        mouseInput.deltaX = 0;
-        mouseInput.deltaY = 0;
     }
 }
 
@@ -677,6 +710,8 @@ ORCA_EXPORT void oc_on_init()
             testDiv[i][j][0] = 0.5 + 0.5 * cosf(j / 100. * 3.14159 + i / 100. * 1.2139);
         }
     }
+
+    startTime = oc_clock_time(OC_CLOCK_MONOTONIC);
 }
 
 ORCA_EXPORT void oc_on_resize(u32 width, u32 height)

samples/triangle/build.bat

@@ -15,7 +15,7 @@ if exist "..\..\scripts\sample_build_check.py" (
 set ORCA_DIR=..\..
 set STDLIB_DIR=%ORCA_DIR%\src\libc-shim
 
-:: compile wasm module
+:: common flags to build wasm modules
 set wasmFlags=--target=wasm32^
        --no-standard-libraries ^
        -mbulk-memory ^
@@ -27,7 +27,13 @@ set wasmFlags=--target=wasm32^
        -I%ORCA_DIR%\src ^
        -I%ORCA_DIR%\src\ext
 
-clang %wasmFlags% -o .\module.wasm %ORCA_DIR%\src\orca.c %STDLIB_DIR%\src\*.c src\main.c
+:: build orca core as wasm module
-if !ERRORLEVEL! neq 0 exit /b !ERRORLEVEL!
+clang %wasmFlags% -Wl,--relocatable -o .\liborca.a %ORCA_DIR%\src\orca.c %ORCA_DIR%\src\libc-shim\src\*.c
+IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
 
-orca bundle --orca-dir %ORCA_DIR% --name Triangle module.wasm
+:: build sample as wasm module and link it with the orca module
+clang %wasmFlags% -L . -lorca -o module.wasm src/main.c
+IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
+
+:: create app directory and copy files into it
+orca bundle --orca-dir %ORCA_DIR% --name Triangle --icon icon.png module.wasm

samples/triangle/build.sh

@@ -15,6 +15,7 @@ fi
 ORCA_DIR=../..
 STDLIB_DIR=$ORCA_DIR/src/libc-shim
 
+# common flags to build wasm modules
 wasmFlags="--target=wasm32 \
   --no-standard-libraries \
   -mbulk-memory \
@@ -26,6 +27,11 @@ wasmFlags="--target=wasm32 \
   -I $ORCA_DIR/src \
   -I $ORCA_DIR/src/ext"
 
-clang $wasmFlags -o ./module.wasm $ORCA_DIR/src/orca.c $STDLIB_DIR/src/*.c src/main.c
+# build orca core as wasm module
+clang $wasmFlags -Wl,--relocatable -o ./liborca.a $ORCA_DIR/src/orca.c $STDLIB_DIR/src/*.c
 
+# build sample as wasm module and link it with the orca module
+clang $wasmFlags -L . -lorca -o module.wasm src/main.c
+
+# create app directory and copy files into it
 orca bundle --orca-dir $ORCA_DIR --name Triangle module.wasm

samples/ui/build.bat

@@ -15,7 +15,7 @@ if exist "..\..\scripts\sample_build_check.py" (
 set ORCA_DIR=..\..
 set STDLIB_DIR=%ORCA_DIR%\src\libc-shim
 
-:: compile wasm module
+:: common flags to build wasm modules
 set wasmFlags=--target=wasm32^
        --no-standard-libraries ^
        -mbulk-memory ^
@@ -27,7 +27,13 @@ set wasmFlags=--target=wasm32^
        -I%ORCA_DIR%\src ^
        -I%ORCA_DIR%\src\ext
 
-clang %wasmFlags% -o .\module.wasm %ORCA_DIR%\src\orca.c %STDLIB_DIR%\src\*.c src\main.c
+:: build orca core as wasm module
-if !ERRORLEVEL! neq 0 exit /b !ERRORLEVEL!
+clang %wasmFlags% -Wl,--relocatable -o .\liborca.a %ORCA_DIR%\src\orca.c %ORCA_DIR%\src\libc-shim\src\*.c
+IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
 
+:: build sample as wasm module and link it with the orca module
+clang %wasmFlags% -L . -lorca -o .\module.wasm src\main.c
+IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
+
+:: create app directory and copy files into it
 orca bundle --orca-dir %ORCA_DIR% --name UI --resource-dir data module.wasm

samples/ui/build.sh

@@ -15,6 +15,7 @@ fi
 ORCA_DIR=../..
 STDLIB_DIR=$ORCA_DIR/src/libc-shim
 
+# common flags to build wasm modules
 wasmFlags="--target=wasm32 \
   --no-standard-libraries \
   -mbulk-memory \
@@ -26,6 +27,11 @@ wasmFlags="--target=wasm32 \
   -I $ORCA_DIR/src \
   -I $ORCA_DIR/src/ext"
 
-clang $wasmFlags -o ./module.wasm $ORCA_DIR/src/orca.c $STDLIB_DIR/src/*.c src/main.c
+# build orca core as wasm module
+clang $wasmFlags -Wl,--relocatable -o ./liborca.a $ORCA_DIR/src/orca.c $STDLIB_DIR/src/*.c
 
+# build sample as wasm module and link it with the orca module
+clang $wasmFlags -L . -lorca -o module.wasm src/main.c
+
+# create app directory and copy files into it
 orca bundle --orca-dir $ORCA_DIR --name UI --resource-dir data module.wasm

scripts/bindgen.py

@@ -5,292 +5,298 @@ import json
 
 
 def needs_arg_ptr_stub(decl):
-	res = (decl['ret']['tag'] == 'S')
+    res = (decl['ret']['tag'] == 'S')
-	for arg in decl['args']:
+    for arg in decl['args']:
-		if arg['type']['tag'] == 'S':
+        if arg['type']['tag'] == 'S':
-			res = True
+            res = True
-	return(res)
+    return(res)
 
 def printError(str):
-	# This prints a string with a red foreground color.
+    # This prints a string with a red foreground color.
-	# See this link for an explanation of console escape codes: https://stackabuse.com/how-to-print-colored-text-in-python/
+    # See this link for an explanation of console escape codes: https://stackabuse.com/how-to-print-colored-text-in-python/
-	print("\x1b[38;5;196m" + "error: " + str + "\033[0;0m")
+    print("\x1b[38;5;196m" + "error: " + str + "\033[0;0m")
 
 
 def bindgen(apiName, spec, **kwargs):
-	guest_stubs_path = kwargs.get("guest_stubs")
+    guest_stubs_path = kwargs.get("guest_stubs")
-	guest_include = kwargs.get("guest_include")
+    guest_include = kwargs.get("guest_include")
-	wasm3_bindings_path = kwargs.get("wasm3_bindings")
+    wasm3_bindings_path = kwargs.get("wasm3_bindings")
 
-	if guest_stubs_path == None:
+    if guest_stubs_path == None:
-		guest_stubs_path = 'bindgen_' + apiName + '_guest_stubs.c'
+        guest_stubs_path = 'bindgen_' + apiName + '_guest_stubs.c'
-	if wasm3_bindings_path == None:
+    if wasm3_bindings_path == None:
-		wasm3_bindings_path = 'bindgen_' + apiName + '_wasm3_bindings.c'
+        wasm3_bindings_path = 'bindgen_' + apiName + '_wasm3_bindings.c'
 
-	host_bindings = open(wasm3_bindings_path, 'w')
+    host_bindings = open(wasm3_bindings_path, 'w')
-	guest_bindings = None
+    guest_bindings = None
 
-	specFile = open(spec, 'r')
+    specFile = open(spec, 'r')
-	data = json.load(specFile)
+    data = json.load(specFile)
 
-	for decl in data:
+    for decl in data:
-		if needs_arg_ptr_stub(decl):
+        if needs_arg_ptr_stub(decl):
-			guest_bindings = open(guest_stubs_path, 'w')
+            guest_bindings = open(guest_stubs_path, 'w')
-			if guest_include != None:
+            if guest_include != None:
-				s = '#include"' + guest_include + '"\n\n'
+                s = '#include"' + guest_include + '"\n\n'
-				print(s, file=guest_bindings)
+                print(s, file=guest_bindings)
-			break
+            break
 
-	for decl in data:
+    for decl in data:
 
-		name = decl['name']
+        name = decl['name']
-		cname = decl.get('cname', name)
+        cname = decl.get('cname', name)
 
-		if needs_arg_ptr_stub(decl):
+        if needs_arg_ptr_stub(decl):
-			argPtrStubName = name + '_argptr_stub'
+            argPtrStubName = name + '_argptr_stub'
-			# pointer arg stub declaration
+            # pointer arg stub declaration
-			s = ''
+            s = ''
-			if decl['ret']['tag'] == 'S':
+            if decl['ret']['tag'] == 'S':
-				s += 'void'
+                s += 'void'
-			else:
+            else:
-				s += decl['ret']['name']
+                s += decl['ret']['name']
 
-			s += ' ORCA_IMPORT(' + argPtrStubName + ') ('
+            s += ' ORCA_IMPORT(' + argPtrStubName + ') ('
 
-			if decl['ret']['tag'] == 'S':
+            if decl['ret']['tag'] == 'S':
-				s += decl['ret']['name'] + '* __retArg'
+                s += decl['ret']['name'] + '* __retArg'
-				if len(decl['args']) > 0:
+                if len(decl['args']) > 0:
-					s += ', '
+                    s += ', '
+            elif len(decl['args']) == 0:
+                s += 'void'
 
-			for i, arg in enumerate(decl['args']):
+            for i, arg in enumerate(decl['args']):
-				s += arg['type']['name']
+                s += arg['type']['name']
-				if arg['type']['tag'] == 'S':
+                if arg['type']['tag'] == 'S':
-					s += '*'
+                    s += '*'
-				s += ' ' + arg['name']
+                s += ' ' + arg['name']
-				if i+1 < len(decl['args']):
+                if i+1 < len(decl['args']):
-					s += ', '
+                    s += ', '
-			s += ');\n\n'
+            s += ');\n\n'
 
-			# forward function to pointer arg stub declaration
+            # forward function to pointer arg stub declaration
-			s += decl['ret']['name'] + ' ' + name + '('
+            s += decl['ret']['name'] + ' ' + name + '('
-			for i, arg in enumerate(decl['args']):
-				s += arg['type']['name'] + ' ' + arg['name']
-				if i+1 < len(decl['args']):
-					s += ', '
-			s += ')\n'
-			s += '{\n'
-			s += '\t'
-			if decl['ret']['tag'] == 'S':
-				s += decl['ret']['name'] + ' __ret;\n\t'
-			elif decl['ret']['tag'] != 'v':
-				s += decl['ret']['name']
-				s += ' __ret = '
-			s += argPtrStubName + '('
 
-			if decl['ret']['tag'] == 'S':
+            if len(decl['args']) == 0:
-				s += '&__ret'
+                s += 'void'
-				if len(decl['args']) > 0:
-					s += ', '
 
-			for i, arg in enumerate(decl['args']):
+            for i, arg in enumerate(decl['args']):
-				if arg['type']['tag'] == 'S':
+                s += arg['type']['name'] + ' ' + arg['name']
-					s += '&'
+                if i+1 < len(decl['args']):
+                    s += ', '
+            s += ')\n'
+            s += '{\n'
+            s += '\t'
+            if decl['ret']['tag'] == 'S':
+                s += decl['ret']['name'] + ' __ret;\n\t'
+            elif decl['ret']['tag'] != 'v':
+                s += decl['ret']['name']
+                s += ' __ret = '
+            s += argPtrStubName + '('
 
-				s += arg['name']
+            if decl['ret']['tag'] == 'S':
-				if i+1 < len(decl['args']):
+                s += '&__ret'
-					s += ', '
+                if len(decl['args']) > 0:
-			s += ');\n'
+                    s += ', '
-			if decl['ret']['tag'] != 'v':
-				s += '\treturn(__ret);\n'
-			s += '}\n\n'
 
-			print(s, file=guest_bindings)
+            for i, arg in enumerate(decl['args']):
+                if arg['type']['tag'] == 'S':
+                    s += '&'
 
-		# host-side stub
+                s += arg['name']
-		s = 'const void* ' + cname + '_stub(IM3Runtime runtime, IM3ImportContext _ctx, uint64_t* _sp, void* _mem)'
+                if i+1 < len(decl['args']):
+                    s += ', '
+            s += ');\n'
+            if decl['ret']['tag'] != 'v':
+                s += '\treturn(__ret);\n'
+            s += '}\n\n'
 
-		gen_stub = decl.get('gen_stub', True)
+            print(s, file=guest_bindings)
-		if gen_stub == False:
+
-			s += ';\n\n'
+        # host-side stub
-		else:
+        s = 'const void* ' + cname + '_stub(IM3Runtime runtime, IM3ImportContext _ctx, uint64_t* _sp, void* _mem)'
-			s += '\n{\n'
+
+        gen_stub = decl.get('gen_stub', True)
+        if gen_stub == False:
+            s += ';\n\n'
+        else:
+            s += '\n{\n'
 
 
-			# NOTE: check and cast arguments
+            # NOTE: check and cast arguments
-			retTag = decl['ret']['tag']
+            retTag = decl['ret']['tag']
 
-			firstArgIndex = 0
+            firstArgIndex = 0
-			if retTag != 'v':
+            if retTag != 'v':
-				firstArgIndex = 1
+                firstArgIndex = 1
 
-				if retTag == 'S':
+                if retTag == 'S':
-					retTypeName = decl['ret']['name']
+                    retTypeName = decl['ret']['name']
-					retTypeCName = decl['ret'].get('cname', retTypeName)
+                    retTypeCName = decl['ret'].get('cname', retTypeName)
-					s += retTypeCName + '* __retPtr = (' + retTypeCName + '*)((char*)_mem + *(i32*)&_sp[0]);\n'
+                    s += retTypeCName + '* __retPtr = (' + retTypeCName + '*)((char*)_mem + *(i32*)&_sp[0]);\n'
 
-					s += '\t{\n'
+                    s += '\t{\n'
-					s += '\t\tOC_ASSERT(((char*)__retPtr >= (char*)_mem) && (((char*)__retPtr - (char*)_mem) < m3_GetMemorySize(runtime)), "return pointer is out of bounds");\n'
+                    s += '\t\tOC_ASSERT(((char*)__retPtr >= (char*)_mem) && (((char*)__retPtr - (char*)_mem) < m3_GetMemorySize(runtime)), "return pointer is out of bounds");\n'
-					s += '\t\tOC_ASSERT((char*)__retPtr + sizeof(' + retTypeCName + ') <= ((char*)_mem + m3_GetMemorySize(runtime)), "return pointer is out of bounds");\n'
+                    s += '\t\tOC_ASSERT((char*)__retPtr + sizeof(' + retTypeCName + ') <= ((char*)_mem + m3_GetMemorySize(runtime)), "return pointer is out of bounds");\n'
-					s += '\t}\n'
+                    s += '\t}\n'
 
-			for argIndex, arg in enumerate(decl['args']):
+            for argIndex, arg in enumerate(decl['args']):
 
-				argName = arg['name']
+                argName = arg['name']
-				typeName = arg['type']['name']
+                typeName = arg['type']['name']
-				typeCName = arg['type'].get('cname', typeName)
+                typeCName = arg['type'].get('cname', typeName)
-				argTag = arg['type']['tag']
+                argTag = arg['type']['tag']
 
-				s += '\t'
+                s += '\t'
 
-				if argTag == 'i':
+                if argTag == 'i':
-					s += typeCName + ' ' + argName + ' = ('+typeCName+')*(i32*)&_sp[' + str(firstArgIndex + argIndex) + '];\n'
+                    s += typeCName + ' ' + argName + ' = ('+typeCName+')*(i32*)&_sp[' + str(firstArgIndex + argIndex) + '];\n'
-				elif argTag == 'I':
+                elif argTag == 'I':
-					s += typeCName + ' ' + argName + ' = ('+typeCName+')*(i64*)&_sp[' + str(firstArgIndex + argIndex) + '];\n'
+                    s += typeCName + ' ' + argName + ' = ('+typeCName+')*(i64*)&_sp[' + str(firstArgIndex + argIndex) + '];\n'
-				elif argTag == 'f':
+                elif argTag == 'f':
-					s += typeCName + ' ' + argName + ' = ('+typeCName+')*(f32*)&_sp[' + str(firstArgIndex + argIndex) + '];\n'
+                    s += typeCName + ' ' + argName + ' = ('+typeCName+')*(f32*)&_sp[' + str(firstArgIndex + argIndex) + '];\n'
-				elif argTag == 'F':
+                elif argTag == 'F':
-					s += typeCName + ' ' + argName + ' = ('+typeCName+')*(f64*)&_sp[' + str(firstArgIndex + argIndex) + '];\n'
+                    s += typeCName + ' ' + argName + ' = ('+typeCName+')*(f64*)&_sp[' + str(firstArgIndex + argIndex) + '];\n'
-				elif argTag == 'p':
+                elif argTag == 'p':
-					s += typeCName + ' ' + argName + ' = ('+ typeCName +')((char*)_mem + *(u32*)&_sp[' + str(firstArgIndex + argIndex) + ']);\n'
+                    s += typeCName + ' ' + argName + ' = ('+ typeCName +')((char*)_mem + *(u32*)&_sp[' + str(firstArgIndex + argIndex) + ']);\n'
-				elif argTag == 'S':
+                elif argTag == 'S':
-					s += typeCName + ' ' + argName + ' = *('+ typeCName +'*)((char*)_mem + *(u32*)&_sp[' + str(firstArgIndex + argIndex) + ']);\n'
+                    s += typeCName + ' ' + argName + ' = *('+ typeCName +'*)((char*)_mem + *(u32*)&_sp[' + str(firstArgIndex + argIndex) + ']);\n'
-				else:
+                else:
-					print('unrecognized type ' + c + ' in procedure signature\n')
+                    print('unrecognized type ' + c + ' in procedure signature\n')
-					break
+                    break
 
-			# check pointer arg length
+            # check pointer arg length
-			for arg in decl['args']:
+            for arg in decl['args']:
 
-				argName = arg['name']
+                argName = arg['name']
-				typeName = arg['type']['name']
+                typeName = arg['type']['name']
-				typeCName = arg['type'].get('cname', typeName)
+                typeCName = arg['type'].get('cname', typeName)
-				argTag = arg['type']['tag']
+                argTag = arg['type']['tag']
-				argLen = arg.get('len')
+                argLen = arg.get('len')
 
-				if argTag == 'p':
+                if argTag == 'p':
-					if argLen == None:
+                    if argLen == None:
-						printError("binding '" + name + "' missing pointer length decoration for param '" + argName + "'")
+                        printError("binding '" + name + "' missing pointer length decoration for param '" + argName + "'")
-					else:
+                    else:
-						s += '\t{\n'
+                        s += '\t{\n'
-						s += '\t\tOC_ASSERT(((char*)'+ argName + ' >= (char*)_mem) && (((char*)'+ argName +' - (char*)_mem) < m3_GetMemorySize(runtime)), "parameter \''+argName+'\' is out of bounds");\n'
+                        s += '\t\tOC_ASSERT(((char*)'+ argName + ' >= (char*)_mem) && (((char*)'+ argName +' - (char*)_mem) < m3_GetMemorySize(runtime)), "parameter \''+argName+'\' is out of bounds");\n'
-						s += '\t\tOC_ASSERT((char*)' + argName + ' + '
+                        s += '\t\tOC_ASSERT((char*)' + argName + ' + '
 
-						proc = argLen.get('proc')
+                        proc = argLen.get('proc')
-						if proc != None:
+                        if proc != None:
-							s += proc + '(runtime, '
+                            s += proc + '(runtime, '
-							lenProcArgs = argLen['args']
+                            lenProcArgs = argLen['args']
-							for i, lenProcArg in enumerate(lenProcArgs):
+                            for i, lenProcArg in enumerate(lenProcArgs):
-								s += lenProcArg
+                                s += lenProcArg
-								if i < len(lenProcArgs)-1:
+                                if i < len(lenProcArgs)-1:
-									s += ', '
+                                    s += ', '
-							s += ')'
+                            s += ')'
-						else:
+                        else:
-							components =  argLen.get('components')
+                            components =  argLen.get('components')
-							countArg = argLen.get('count')
+                            countArg = argLen.get('count')
 
-							if components != None:
+                            if components != None:
-								s += str(components)
+                                s += str(components)
-								if countArg != None:
+                                if countArg != None:
-									s += '*'
+                                    s += '*'
-							if countArg != None:
+                            if countArg != None:
-								s += countArg
+                                s += countArg
 
-						if typeCName.endswith('**') or (typeCName.startswith('void') == False and typeCName.startswith('const void') == False):
+                        if typeCName.endswith('**') or (typeCName.startswith('void') == False and typeCName.startswith('const void') == False):
-							s += '*sizeof('+typeCName[:-1]+')'
+                            s += '*sizeof('+typeCName[:-1]+')'
 
-						s += ' <= ((char*)_mem + m3_GetMemorySize(runtime)), "parameter \''+argName+'\' is out of bounds");\n'
+                        s += ' <= ((char*)_mem + m3_GetMemorySize(runtime)), "parameter \''+argName+'\' is out of bounds");\n'
-						s += '\t}\n'
+                        s += '\t}\n'
 
-			s += '\t'
+            s += '\t'
 
-			if retTag == 'i':
+            if retTag == 'i':
-				s += '*((i32*)&_sp[0]) = (i32)'
+                s += '*((i32*)&_sp[0]) = (i32)'
-			elif retTag == 'I':
+            elif retTag == 'I':
-				s += '*((i64*)&_sp[0]) = (i64)'
+                s += '*((i64*)&_sp[0]) = (i64)'
-			elif retTag == 'f':
+            elif retTag == 'f':
-				s += '*((f32*)&_sp[0]) = (f32)'
+                s += '*((f32*)&_sp[0]) = (f32)'
-			elif retTag == 'F':
+            elif retTag == 'F':
-				s += '*((f64*)&_sp[0]) = (f64)'
+                s += '*((f64*)&_sp[0]) = (f64)'
-			elif retTag == 'S':
+            elif retTag == 'S':
-				s += '*__retPtr = '
+                s += '*__retPtr = '
-			elif retTag == 'p':
+            elif retTag == 'p':
-				print("Warning: " + name + ": pointer return type not supported yet")
+                print("Warning: " + name + ": pointer return type not supported yet")
 
-			s += cname + '('
+            s += cname + '('
 
-			for i, arg in enumerate(decl['args']):
+            for i, arg in enumerate(decl['args']):
-				s += arg['name']
+                s += arg['name']
 
-				if i+1 < len(decl['args']):
+                if i+1 < len(decl['args']):
-					s += ', '
+                    s += ', '
 
-			s += ');\n\treturn(0);\n}\n\n'
+            s += ');\n\treturn(0);\n}\n\n'
 
-		print(s, file=host_bindings)
+        print(s, file=host_bindings)
 
-	# link function
+    # link function
-	s = 'int bindgen_link_' + apiName + '_api(IM3Module module)\n{\n'
+    s = 'int bindgen_link_' + apiName + '_api(IM3Module module)\n{\n'
-	s += '	M3Result res;\n'
+    s += '  M3Result res;\n'
-	s += '	int ret = 0;\n'
+    s += '  int ret = 0;\n'
 
-	for decl in data:
+    for decl in data:
-		name = decl['name']
+        name = decl['name']
-		cname = decl.get('cname', name)
+        cname = decl.get('cname', name)
 
-		if needs_arg_ptr_stub(decl):
+        if needs_arg_ptr_stub(decl):
-			name = name + '_argptr_stub'
+            name = name + '_argptr_stub'
 
-		m3Sig = ''
+        m3Sig = ''
-		if decl['ret']['tag'] == 'S':
+        if decl['ret']['tag'] == 'S':
-			m3Sig += 'v'
+            m3Sig += 'v'
-		else:
+        else:
-			m3Sig += decl['ret']['tag']
+            m3Sig += decl['ret']['tag']
 
-		m3Sig += '('
+        m3Sig += '('
-		if decl['ret']['tag'] == 'S':
+        if decl['ret']['tag'] == 'S':
-			m3Sig += 'i'
+            m3Sig += 'i'
-		for arg in decl['args']:
+        for arg in decl['args']:
-			tag = arg['type']['tag']
+            tag = arg['type']['tag']
-			if tag == 'p' or tag == 'S':
+            if tag == 'p' or tag == 'S':
-				tag = 'i'
+                tag = 'i'
-			m3Sig += tag
+            m3Sig += tag
-		m3Sig += ')'
+        m3Sig += ')'
 
 
-		s += '	res = m3_LinkRawFunction(module, "*", "' + name + '", "' + m3Sig + '", ' + cname + '_stub);\n'
+        s += '  res = m3_LinkRawFunction(module, "*", "' + name + '", "' + m3Sig + '", ' + cname + '_stub);\n'
-		s += '	if(res != m3Err_none && res != m3Err_functionLookupFailed)\n'
+        s += '  if(res != m3Err_none && res != m3Err_functionLookupFailed)\n'
-		s += '	{\n'
+        s += '  {\n'
-		s += '		oc_log_error("Couldn\'t link function ' + name + ' (%s)\\n", res);\n'
+        s += '      oc_log_error("Couldn\'t link function ' + name + ' (%s)\\n", res);\n'
-		s += '		ret = -1;\n'
+        s += '      ret = -1;\n'
-		s += '	}\n\n'
+        s += '  }\n\n'
 
-	s += '\treturn(ret);\n}\n'
+    s += '\treturn(ret);\n}\n'
 
-	print(s, file=host_bindings)
+    print(s, file=host_bindings)
 
 
 if __name__ == "__main__":
-	parser = ArgumentParser(prog='bindgen.py')
+    parser = ArgumentParser(prog='bindgen.py')
-	parser.add_argument('api')
+    parser.add_argument('api')
-	parser.add_argument('spec')
+    parser.add_argument('spec')
-	parser.add_argument('-g', '--guest-stubs')
+    parser.add_argument('-g', '--guest-stubs')
-	parser.add_argument('--guest-include')
+    parser.add_argument('--guest-include')
-	parser.add_argument('--wasm3-bindings')
+    parser.add_argument('--wasm3-bindings')
 
-	args = parser.parse_args()
+    args = parser.parse_args()
 
-	apiName = args.api
+    apiName = args.api
-	spec = args.spec
+    spec = args.spec
-	guest_stubs_path = args.guest_stubs
+    guest_stubs_path = args.guest_stubs
-	if guest_stubs_path == None:
+    if guest_stubs_path == None:
-		guest_stubs_path = 'bindgen_' + apiName + '_guest_stubs.c'
+        guest_stubs_path = 'bindgen_' + apiName + '_guest_stubs.c'
 
-	wasm3_bindings_path = args.wasm3_bindings
+    wasm3_bindings_path = args.wasm3_bindings
-	if wasm3_bindings_path == None:
+    if wasm3_bindings_path == None:
-		wasm3_bindings_path = 'bindgen_' + apiName + '_wasm3_bindings.c'
+        wasm3_bindings_path = 'bindgen_' + apiName + '_wasm3_bindings.c'
 
-	bindgen(apiName, spec,
+    bindgen(apiName, spec,
-		guest_stubs=guest_stubs_path,
+        guest_stubs=guest_stubs_path,
-		guest_include=args.guest_include,
+        guest_include=args.guest_include,
-		wasm3_bindings=wasm3_bindings_path,
+        wasm3_bindings=wasm3_bindings_path,
-	)
+    )

scripts/bundle.py

@@ -7,7 +7,6 @@ import subprocess
 from argparse import ArgumentParser
 
 from .log import *
-from .version import install_dir
 
 
 def attach_bundle_commands(subparsers):

scripts/compile_commands.template.json

@@ -1,74 +0,0 @@
-[
-    {
-        "directory": "{{ORCAROOT}}",
-        "file": "src/orca.c",
-        "arguments": [
-            "src/orca.c",
-            "-g",
-            "-D",
-            "OC_DEBUG",
-            "-D",
-            "OC_LOG_COMPILE_DEBUG",
-            "-c",
-            "-std=c11",
-            "-I",
-            "src",
-            "-I",
-            "src/util",
-            "-I",
-            "src/platform",
-            "-I",
-            "src/ext",
-            "-I",
-            "src/ext/angle/include"
-        ]
-    },
-    {
-        "directory": "{{ORCAROOT}}",
-        "file": "src/orca.m",
-        "arguments": [
-            "-xobjective-c",
-            "src/orca.m",
-            "-g",
-            "-D",
-            "OC_DEBUG",
-            "-D",
-            "OC_LOG_COMPILE_DEBUG",
-            "-c",
-            "-I",
-            "src",
-            "-I",
-            "src/util",
-            "-I",
-            "src/platform",
-            "-I",
-            "src/ext",
-            "-I",
-            "src/ext/angle/include"
-        ]
-    },
-    {
-        "directory": "{{ORCAROOT}}",
-        "file": "src/runtime.c",
-        "arguments": [
-            "src/runtime.c",
-            "-g",
-            "-D",
-            "OC_DEBUG",
-            "-D",
-            "OC_LOG_COMPILE_DEBUG",
-            "-I",
-            "src",
-            "-I",
-            "src/ext",
-            "-I",
-            "src/ext/angle/include",
-            "-I",
-            "src/ext/wasm3/source",
-            "-Lbuild/bin",
-            "-Lbuild/lib",
-            "-lorca",
-            "-lwasm3"
-        ]
-    }
-]

scripts/dev.py

@@ -1,7 +1,7 @@
 import glob
-import json
 import os
 import platform
+import re
 import urllib.request
 import shutil
 import subprocess
@@ -63,8 +63,6 @@ def build_runtime(args):
     ensure_programs()
     ensure_angle()
 
-    plonk_compile_commands()
-
     build_platform_layer("lib", args.release)
     build_wasm3(args.release)
     build_orca(args.release)
@@ -92,14 +90,6 @@ def clean(args):
     yeetdir("scripts/__pycache__")
 
 
-def plonk_compile_commands():
-    os.makedirs("build", exist_ok=True)
-    with open("scripts/compile_commands.template.json") as infile:
-        out = infile.read().replace(r'"{{ORCAROOT}}"', json.dumps(os.getcwd()))
-        with open("build/compile_commands.json", "w") as outfile:
-            outfile.write(out)
-
-
 def build_platform_layer(target, release):
     print("Building Orca platform layer...")
 
@@ -354,7 +344,7 @@ def build_orca_mac(release):
         "-Isrc/ext/wasm3/source"
     ]
     libs = ["-Lbuild/bin", "-Lbuild/lib", "-lorca", "-lwasm3"]
-    debug_flags = ["-O2"] if release else ["-g", "-DOC_DEBUG", "-DOC_LOG_COMPILE_DEBUG"]
+    debug_flags = ["-O2"] if release else ["-g", "-DOC_DEBUG -DOC_LOG_COMPILE_DEBUG"]
     flags = [
         *debug_flags,
         "-mmacos-version-min=10.15.4"]
@@ -386,18 +376,22 @@ def gen_all_bindings():
         "src/wasmbind/gles_api.json",
         "src/graphics/orca_gl31.h"
     )
+
     bindgen("gles", "src/wasmbind/gles_api.json",
         wasm3_bindings="src/wasmbind/gles_api_bind_gen.c",
     )
+
     bindgen("core", "src/wasmbind/core_api.json",
         guest_stubs="src/wasmbind/core_api_stubs.c",
         wasm3_bindings="src/wasmbind/core_api_bind_gen.c",
     )
+
     bindgen("surface", "src/wasmbind/surface_api.json",
         guest_stubs="src/graphics/orca_surface_stubs.c",
         guest_include="graphics/graphics.h",
         wasm3_bindings="src/wasmbind/surface_api_bind_gen.c",
     )
+
     bindgen("clock", "src/wasmbind/clock_api.json",
         guest_include="platform/platform_clock.h",
         wasm3_bindings="src/wasmbind/clock_api_bind_gen.c",
@@ -406,10 +400,6 @@ def gen_all_bindings():
         guest_stubs="src/platform/orca_io_stubs.c",
         wasm3_bindings="src/wasmbind/io_api_bind_gen.c",
     )
-    bindgen("subprocess", "src/wasmbind/subprocess_api.json",
-        guest_stubs="src/wasmbind/subprocess_api_stubs.c",
-        wasm3_bindings="src/wasmbind/subprocess_api_bind_gen.c",
-    )
 
 
 def ensure_programs():
@@ -575,8 +565,6 @@ def install(args):
     dest = install_dir()
     bin_dir = os.path.join(dest, "bin")
     src_dir = os.path.join(dest, "src")
-    runtime_dir = os.path.join(dest, "build", "bin")
-    resources_dir = os.path.join(dest, "resources")
     version_file = os.path.join(dest, ".orcaversion")
 
     version = orca_version()
@@ -599,8 +587,6 @@ def install(args):
 
     yeetdir(bin_dir)
     yeetdir(src_dir)
-    yeetdir(runtime_dir)
-    yeetdir(resources_dir)
     yeetfile(version_file)
 
     # The MS Store version of Python does some really stupid stuff with AppData:
@@ -621,8 +607,6 @@ def install(args):
     shutil.copytree("scripts", os.path.join(bin_dir, "sys_scripts"))
     shutil.copy("orca", bin_dir)
     shutil.copytree("src", src_dir, dirs_exist_ok=True)
-    shutil.copytree(os.path.join("build", "bin"), runtime_dir, dirs_exist_ok=True)
-    shutil.copytree("resources", resources_dir, dirs_exist_ok=True)
     if platform.system() == "Windows":
         shutil.copy("orca.bat", bin_dir)
     with open(version_file, "w") as f:

scripts/source.py

@@ -7,7 +7,7 @@ import shutil
 from .checksum import dirsum
 from .log import *
 from .utils import yeetdir
-from .version import orca_version, install_dir
+from .version import src_dir, orca_version
 
 
 def attach_source_commands(subparsers):
@@ -15,7 +15,7 @@ def attach_source_commands(subparsers):
     source_sub = source_cmd.add_subparsers(required=True, title="commands")
 
     cflags_cmd = source_sub.add_parser("cflags", help="Get help setting up a C or C++ compiler to compile the Orca source.")
-    cflags_cmd.add_argument("srcdir", nargs="?", default=path_in_install("src"), help="the directory containing the Orca source code (defaults to system installation)")
+    cflags_cmd.add_argument("srcdir", nargs="?", default=src_dir(), help="the directory containing the Orca source code (defaults to system installation)")
     cflags_cmd.set_defaults(func=shellish(cflags))
 
     vendor_cmd = source_sub.add_parser("vendor", help="Copy the Orca source code into your project.")
@@ -23,10 +23,6 @@ def attach_source_commands(subparsers):
     vendor_cmd.set_defaults(func=shellish(vendor))
 
 
-def path_in_install(path):
-    return os.path.join(install_dir(), path)
-
-
 def vendor(args):
     # Verify that we are ok to vendor into the requested dir.
     if os.path.exists(args.dir):
@@ -45,19 +41,12 @@ def vendor(args):
                 exit(1)
 
     yeetdir(args.dir)
-
+    shutil.copytree(src_dir(), args.dir)
-    vendor_src = os.path.join(args.dir, "src")
-    vendor_runtime = os.path.join(args.dir, "build", "bin")
-    vendor_resources = os.path.join(args.dir, "resources")
-    shutil.copytree(path_in_install("src"), vendor_src)
-    shutil.copytree(path_in_install("build/bin"), vendor_runtime)
-    shutil.copytree(path_in_install("resources"), vendor_resources)
     with open(vendor_file_path(args.dir), "w") as f:
         json.dump({
             "version": orca_version(),
             "checksum": vendor_checksum(args.dir),
         }, f, indent=2)
-
     print(f"Version {orca_version()} of the Orca source code has been copied to {args.dir}.")
 
 

scripts/version.py

@@ -38,13 +38,20 @@ def is_orca_source():
     return use_source
 
 
-def install_dir():
+def actual_install_dir():
     # The path adjustment in here is technically sort of fragile because it depends
     # on the current location of this actual file. But oh well.
     if is_orca_source():
-        return os.path.normpath(os.path.join(os.path.abspath(__file__), "../.."))
+        raise Exception("actual_install_dir should not be called when using the source version of the Orca tools")
+    return os.path.normpath(os.path.join(os.path.abspath(__file__), "../../.."))
+
+
+def src_dir():
+    # More fragile path adjustments! Yay!
+    if is_orca_source():
+        return os.path.normpath(os.path.join(os.path.abspath(__file__), "../../src"))
     else:
-        return os.path.normpath(os.path.join(os.path.abspath(__file__), "../../.."))
+        return os.path.normpath(os.path.join(os.path.abspath(__file__), "../../../src"))
 
 
 def orca_version():
@@ -61,7 +68,7 @@ def orca_version():
             return f"dev-{version}"
     else:
         try:
-            with open(os.path.join(install_dir(), ".orcaversion"), "r") as f:
+            with open(os.path.join(actual_install_dir(), ".orcaversion"), "r") as f:
                 version = f.read().strip()
                 return version
         except FileNotFoundError:
@@ -85,4 +92,4 @@ def print_orca_version(args):
         sys.stderr.write(f"Source dir: {source_dir}\n")
     else:
         sys.stderr.write(f"Orca is running from a system installation.\n")
-        sys.stderr.write(f"Install dir: {install_dir()}\n")
+        sys.stderr.write(f"Install dir: {actual_install_dir()}\n")

src/app/app.c

@@ -188,7 +188,7 @@ oc_key_code oc_scancode_to_keycode(oc_scan_code scanCode)
     return (oc_appData.keyMap[scanCode]);
 }
 
-#define OC_DEFAULT_KEYMAP_ENTRY(sc, sv, ...) [(int) sc] = (oc_key_code)sc,
+#define OC_DEFAULT_KEYMAP_ENTRY(sc, sv, kc, ...) [(int) sc] = OC_VA_NOPT(sv, ##__VA_ARGS__) __VA_ARGS__,
 
 oc_key_code oc_defaultKeyMap[OC_SCANCODE_COUNT] = {
     OC_KEY_TABLE(OC_DEFAULT_KEYMAP_ENTRY)

src/graphics/graphics.h

@@ -110,8 +110,8 @@ ORCA_API void oc_surface_set_hidden(oc_surface surface, bool hidden);
 
 #else
 
-ORCA_API oc_surface oc_surface_canvas(); //DOC: creates a surface for use with the canvas API
+ORCA_API oc_surface oc_surface_canvas(void); //DOC: creates a surface for use with the canvas API
-ORCA_API oc_surface oc_surface_gles();   //DOC: create a surface for use with GLES API
+ORCA_API oc_surface oc_surface_gles(void);   //DOC: create a surface for use with GLES API
 
 #endif
 

src/orca.c

@@ -20,7 +20,6 @@
     #include "platform/win32_io.c"
     #include "platform/win32_thread.c"
     #include "platform/win32_platform.c"
-    #include "platform/win32_subprocess.c"
 //TODO
 #elif OC_PLATFORM_MACOS
     #include "platform/native_debug.c"
@@ -29,7 +28,6 @@
     #include "platform/posix_io.c"
     #include "platform/posix_thread.c"
     #include "platform/osx_platform.c"
-    #include "platform/osx_subprocess.c"
 
 /*
 	#include"platform/unix_rng.c"
@@ -55,7 +53,6 @@
     #include "platform/orca_io_stubs.c"
     #include "platform/orca_platform.c"
     #include "platform/platform_path.c"
-    #include "platform/orca_subprocess.c"
 #else
     #error "Unsupported platform"
 #endif
@@ -101,7 +98,6 @@
 #elif OC_PLATFORM_ORCA
     #include "app/orca_app.c"
     #include "wasmbind/core_api_stubs.c"
-    #include "wasmbind/subprocess_api_stubs.c"
     #include "graphics/graphics_common.c"
     #include "graphics/orca_surface_stubs.c"
 #else

src/orca.h

@@ -23,7 +23,6 @@
 #include "platform/platform_io.h"
 #include "platform/platform_io_dialog.h"
 #include "platform/platform_path.h"
-#include "platform/platform_subprocess.h"
 
 #if !defined(OC_PLATFORM_ORCA) || !(OC_PLATFORM_ORCA)
     #include "platform/platform_thread.h"

src/platform/orca_subprocess.c

@@ -1,11 +0,0 @@
-/*************************************************************************
-*
-*  Orca
-*  Copyright 2023 Martin Fouilleul and the Orca project contributors
-*  See LICENSE.txt for licensing information
-*
-**************************************************************************/
-#include "platform_subprocess.h"
-#include "util/typedefs.h"
-
-oc_str8 ORCA_IMPORT(oc_run_cmd)(oc_arena* arena, oc_str8 cmd);

src/platform/osx_subprocess.c

@@ -1,60 +0,0 @@
-/*************************************************************************
-*
-*  Orca
-*  Copyright 2023 Martin Fouilleul and the Orca project contributors
-*  See LICENSE.txt for licensing information
-*
-**************************************************************************/
-#include "platform_subprocess.h"
-
-#include <stdio.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-oc_str8 oc_run_cmd(oc_arena* arena, oc_str8 cmd)
-{
-    const char* cmdC = oc_str8_to_cstring(arena, cmd);
-    FILE* p = popen(cmdC, "r+");
-    if(!p)
-    {
-        oc_log_error("failed to launch process");
-        return OC_STR8("");
-    }
-
-    oc_str8_list chunks = { 0 };
-    char buffer[1024];
-    while(true)
-    {
-        ssize_t nRead = read(fileno(p), buffer, sizeof(buffer));
-        if(nRead < 0)
-        {
-            oc_log_error("failed to read from process's stdout\n");
-            return OC_STR8("");
-        }
-        if(nRead == 0)
-        {
-            break;
-        }
-
-        oc_str8 chunk = oc_str8_from_buffer(nRead, buffer);
-        oc_str8_list_push(arena, &chunks, oc_str8_push_copy(arena, chunk));
-    }
-
-    int status = pclose(p);
-    if(status == -1)
-    {
-        oc_log_warning("failed to close subprocess\n");
-    }
-    else if(!WIFEXITED(status))
-    {
-        oc_log_warning("subprocess did not exit correctly\n");
-    }
-
-    return oc_str8_list_join(arena, chunks);
-}
-
-#ifdef __cplusplus
-} // extern "C"
-#endif

src/platform/platform_debug.c

@@ -50,7 +50,7 @@ void oc_log_ext(oc_log_level level,
     {
         va_list ap;
         va_start(ap, fmt);
-        platform_log_push(__logConfig.output, level, file, function, line, fmt, ap);
+        platform_log_push(__logConfig.output, level, function, file, line, fmt, ap);
         va_end(ap);
     }
 }

src/platform/platform_subprocess.h

@@ -1,24 +0,0 @@
-/*************************************************************************
-*
-*  Orca
-*  Copyright 2023 Martin Fouilleul and the Orca project contributors
-*  See LICENSE.txt for licensing information
-*
-**************************************************************************/
-#ifndef __PLATFORM_SUBPROCESS_H
-#define __PLATFORM_SUBPROCESS_H
-
-#include "platform.h"
-#include "util/strings.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-ORCA_API oc_str8 oc_run_cmd(oc_arena* arena, oc_str8 cmd);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
-
-#endif // __PLATFORM_SUBPROCESS_H

src/platform/win32_subprocess.c

@@ -1,136 +0,0 @@
-/*************************************************************************
-*
-*  Orca
-*  Copyright 2023 Martin Fouilleul and the Orca project contributors
-*  See LICENSE.txt for licensing information
-*
-**************************************************************************/
-#include "platform_subprocess.h"
-
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#include <tchar.h>
-#include <stdio.h>
-#include <strsafe.h>
-
-oc_str8 oc_run_cmd(oc_arena* arena, oc_str8 cmd)
-{
-    oc_arena_scope scratch = oc_scratch_begin();
-    oc_str8 out = { 0 };
-
-    HANDLE childStdinRd = NULL;
-    HANDLE childStdinWr = NULL;
-    HANDLE childStdoutRd = NULL;
-    HANDLE childStdoutWr = NULL;
-
-    // Create child process's stdin and stdout pipes
-    SECURITY_ATTRIBUTES saAttr;
-    saAttr.nLength = sizeof(SECURITY_ATTRIBUTES);
-    saAttr.lpSecurityDescriptor = NULL;
-    saAttr.bInheritHandle = TRUE;
-
-    if(!CreatePipe(&childStdinRd, &childStdinWr,
-                   &saAttr, 0)
-       || !SetHandleInformation(childStdinWr, HANDLE_FLAG_INHERIT, 0))
-    {
-        oc_log_error("failed to create child stdin\n");
-        goto error;
-    }
-    if(!CreatePipe(&childStdoutRd, &childStdoutWr,
-                   &saAttr, 0)
-       || !SetHandleInformation(childStdoutRd, HANDLE_FLAG_INHERIT, 0))
-    {
-        oc_log_error("failed to create child stdout\n");
-        goto error;
-    }
-
-    // Create child process
-    char* cmdStr = oc_str8_to_cstring(scratch.arena, cmd);
-    PROCESS_INFORMATION procInfo;
-    STARTUPINFO startInfo;
-
-    memset(&procInfo, 0, sizeof(PROCESS_INFORMATION));
-    memset(&startInfo, 0, sizeof(STARTUPINFO));
-
-    startInfo.cb = sizeof(STARTUPINFO);
-    startInfo.hStdInput = childStdinRd;
-    startInfo.hStdOutput = childStdoutWr;
-    startInfo.hStdError = childStdoutWr;
-    startInfo.dwFlags |= STARTF_USESTDHANDLES;
-
-    BOOL success = CreateProcess(
-        NULL,
-        cmdStr,
-        NULL,
-        NULL,
-        TRUE,
-        0,
-        NULL,
-        NULL,
-        &startInfo,
-        &procInfo);
-    if(!success)
-    {
-        oc_log_error("failed to create child process\n");
-        goto error;
-    }
-    CloseHandle(procInfo.hProcess);
-    CloseHandle(procInfo.hThread);
-    CloseHandle(childStdinRd); // the parent does not need these ends of the pipes
-    CloseHandle(childStdoutWr);
-
-    // TODO: Optionally write to the child's stdin
-    if(!CloseHandle(childStdinWr))
-    {
-        oc_log_error("failed to close child's stdin");
-        goto error;
-    }
-
-    // Read child's combined stdout/stderr
-    u64 outputLen = 0;
-    char* outputBuf = NULL;
-    while(true)
-    {
-// TODO: apply smartness to this number
-#define CHUNK_SIZE 1024
-        char chunkBuf[CHUNK_SIZE];
-        DWORD nRead;
-        BOOL success = ReadFile(childStdoutRd, chunkBuf, CHUNK_SIZE, &nRead, NULL);
-        if(!success || nRead == 0)
-        {
-            break;
-        }
-
-        char* dst = oc_arena_push(arena, nRead);
-        if(!outputBuf)
-        {
-            outputBuf = dst;
-        }
-        memcpy(dst, chunkBuf, nRead);
-        outputLen += nRead;
-    }
-
-    out = oc_str8_from_buffer(outputLen, outputBuf);
-    CloseHandle(childStdinWr);
-    CloseHandle(childStdoutRd);
-    goto cleanup;
-
-error:
-    LPVOID msgBuf;
-    DWORD dw = GetLastError();
-
-    FormatMessage(
-        FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
-        NULL,
-        dw,
-        MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
-        (LPTSTR)&msgBuf,
-        0, NULL);
-    oc_log_error("%s\n", msgBuf);
-
-    LocalFree(msgBuf);
-cleanup:
-    oc_scratch_end(scratch);
-
-    return out;
-}

src/runtime.c

@@ -15,7 +15,6 @@
 
 #include "runtime.h"
 #include "runtime_clipboard.c"
-#include "runtime_subprocess.c"
 #include "runtime_io.c"
 #include "runtime_memory.c"
 
@@ -217,12 +216,6 @@ void oc_bridge_request_quit(void)
     __orcaApp.quit = true;
 }
 
-// TODO: wait why do I have this bridge
-oc_wasm_str8 oc_bridge_run_cmd(oc_wasm_addr wasmArena, oc_wasm_str8 cmd)
-{
-    return oc_runtime_run_cmd(wasmArena, cmd);
-}
-
 typedef struct orca_surface_create_data
 {
     oc_window window;
@@ -363,8 +356,8 @@ void log_entry_ui(oc_debug_overlay* overlay, log_entry* entry)
 
             oc_str8 loc = oc_str8_pushf(scratch.arena,
                                         "%.*s() in %.*s:%i:",
-                                        oc_str8_ip(entry->file),
                                         oc_str8_ip(entry->function),
+                                        oc_str8_ip(entry->file),
                                         entry->line);
             oc_ui_label_str8(loc);
         }
@@ -410,7 +403,6 @@ void oc_wasm_env_init(oc_wasm_env* runtime)
 #include "wasmbind/io_api_bind_gen.c"
 #include "wasmbind/surface_api_bind_manual.c"
 #include "wasmbind/surface_api_bind_gen.c"
-#include "wasmbind/subprocess_api_bind_gen.c"
 
 i32 orca_runloop(void* user)
 {
@@ -439,7 +431,7 @@ i32 orca_runloop(void* user)
     fread(app->env.wasmBytecode.ptr, 1, app->env.wasmBytecode.len, file);
     fclose(file);
 
-    u32 stackSize = 65536 * 20; // MOAR STACK
+    u32 stackSize = 65536;
     app->env.m3Env = m3_NewEnvironment();
 
     app->env.m3Runtime = m3_NewRuntime(app->env.m3Env, stackSize, NULL);
@@ -469,7 +461,6 @@ i32 orca_runloop(void* user)
         err |= bindgen_link_clock_api(app->env.m3Module);
         err |= bindgen_link_io_api(app->env.m3Module);
         err |= bindgen_link_gles_api(app->env.m3Module);
-        err |= bindgen_link_subprocess_api(app->env.m3Module);
         err |= manual_link_gles_api(app->env.m3Module);
 
         if(err)

src/runtime.h

@@ -11,7 +11,6 @@
 #include "platform/platform_io_internal.h"
 #include "runtime_memory.h"
 #include "runtime_clipboard.h"
-#include "runtime_subprocess.h"
 
 #include "m3_compile.h"
 #include "m3_env.h"

src/runtime_subprocess.c

@@ -1,29 +0,0 @@
-/*************************************************************************
-*
-*  Orca
-*  Copyright 2023 Martin Fouilleul and the Orca project contributors
-*  See LICENSE.txt for licensing information
-*
-**************************************************************************/
-
-#include "runtime_subprocess.h"
-// #include "memory.h"
-
-oc_arena cmdArena;
-
-oc_wasm_str8 oc_runtime_run_cmd(oc_wasm_addr wasmArena, oc_wasm_str8 cmd)
-{
-    if(!cmdArena.currentChunk)
-    {
-        oc_arena_init(&cmdArena);
-    }
-
-    oc_arena_clear(&cmdArena);
-    oc_str8 nativeCmd = oc_wasm_str8_to_native(cmd);
-    oc_str8 out = oc_run_cmd(&cmdArena, nativeCmd);
-    oc_wasm_addr outAddr = oc_wasm_arena_push(wasmArena, out.len);
-    char* outPtr = (char*)oc_wasm_address_to_ptr(outAddr, out.len);
-    memcpy(outPtr, out.ptr, out.len);
-    return (oc_wasm_str8){ .ptr = outAddr,
-                           .len = out.len };
-}

src/runtime_subprocess.h

@@ -1,15 +0,0 @@
-/*************************************************************************
-*
-*  Orca
-*  Copyright 2023 Martin Fouilleul and the Orca project contributors
-*  See LICENSE.txt for licensing information
-*
-**************************************************************************/
-#ifndef __RUNTIME_SUBPROCESS_H_
-#define __RUNTIME_SUBPROCESS_H_
-
-#include "runtime_memory.h"
-
-oc_wasm_str8 oc_runtime_run_cmd(oc_wasm_addr wasmArena, oc_wasm_str8 cmd);
-
-#endif // __RUNTIME_SUBPROCESS_H

src/util/memory.c

@@ -13,27 +13,27 @@
 #if OC_PLATFORM_ORCA
 enum
 {
-    OC_ARENA_DEFAULT_RESERVE_SIZE = 1 << 20
+    OC_ARENA_DEFAULT_RESERVE_SIZE = 1 << 20,
 };
 #else
 enum
 {
-    OC_ARENA_DEFAULT_RESERVE_SIZE = 1 << 30
+    OC_ARENA_DEFAULT_RESERVE_SIZE = 1 << 30,
 };
 #endif
 
 enum
 {
-    OC_ARENA_COMMIT_ALIGNMENT = 4 << 10
+    OC_ARENA_COMMIT_ALIGNMENT = 4 << 10,
 };
 
 //--------------------------------------------------------------------------------
 //NOTE(martin): memory arena
 //--------------------------------------------------------------------------------
 
-oc_arena_chunk* oc_arena_chunk_alloc(oc_arena* arena, u64 reserveSize)
+oc_arena_chunk* oc_arena_chunk_alloc(oc_arena* arena, u64 chunkMinSize)
 {
-    reserveSize = oc_align_up_pow2(reserveSize, OC_ARENA_COMMIT_ALIGNMENT);
+    u64 reserveSize = oc_align_up_pow2(chunkMinSize + sizeof(oc_arena_chunk), OC_ARENA_COMMIT_ALIGNMENT);
     u64 commitSize = oc_align_up_pow2(sizeof(oc_arena_chunk), OC_ARENA_COMMIT_ALIGNMENT);
 
     char* mem = oc_base_reserve(arena->base, reserveSize);
@@ -77,18 +77,25 @@ void oc_arena_cleanup(oc_arena* arena)
 }
 
 void* oc_arena_push(oc_arena* arena, u64 size)
+{
+    return oc_arena_push_aligned(arena, size, 1);
+}
+
+void* oc_arena_push_aligned(oc_arena* arena, u64 size, u32 alignment)
 {
     oc_arena_chunk* chunk = arena->currentChunk;
     OC_ASSERT(chunk);
 
-    u64 nextOffset = chunk->offset + size;
+    u64 alignedOffset = oc_align_up_pow2(chunk->offset, alignment);
+    u64 nextOffset = alignedOffset + size;
     u64 lastCap = chunk->cap;
     while(nextOffset > chunk->cap)
     {
         chunk = oc_list_next_entry(arena->chunks, chunk, oc_arena_chunk, listElt);
         if(chunk)
         {
-            nextOffset = chunk->offset + size;
+            alignedOffset = oc_align_up_pow2(chunk->offset, alignment);
+            nextOffset = alignedOffset + size;
             lastCap = chunk->cap;
         }
         else
@@ -98,10 +105,11 @@ void* oc_arena_push(oc_arena* arena, u64 size)
     }
     if(!chunk)
     {
-        u64 reserveSize = oc_max(lastCap * 1.5, size);
+        u64 chunkMinSize = oc_max(lastCap * 1.5, size + alignment);
 
-        chunk = oc_arena_chunk_alloc(arena, reserveSize);
+        chunk = oc_arena_chunk_alloc(arena, chunkMinSize);
-        nextOffset = chunk->offset + size;
+        alignedOffset = oc_align_up_pow2(chunk->offset, alignment);
+        nextOffset = alignedOffset + size;
     }
     OC_ASSERT(nextOffset <= chunk->cap);
 
@@ -115,8 +123,8 @@ void* oc_arena_push(oc_arena* arena, u64 size)
         oc_base_commit(arena->base, chunk->ptr + chunk->committed, commitSize);
         chunk->committed = nextCommitted;
     }
-    char* p = chunk->ptr + chunk->offset;
+    char* p = chunk->ptr + alignedOffset;
-    chunk->offset += size;
+    chunk->offset = nextOffset;
 
     return (p);
 }

src/util/memory.h

@@ -55,13 +55,14 @@ ORCA_API void oc_arena_init_with_options(oc_arena* arena, oc_arena_options* opti
 ORCA_API void oc_arena_cleanup(oc_arena* arena);
 
 ORCA_API void* oc_arena_push(oc_arena* arena, u64 size);
+ORCA_API void* oc_arena_push_aligned(oc_arena* arena, u64 size, u32 alignment);
 ORCA_API void oc_arena_clear(oc_arena* arena);
 
 ORCA_API oc_arena_scope oc_arena_scope_begin(oc_arena* arena);
 ORCA_API void oc_arena_scope_end(oc_arena_scope scope);
 
-#define oc_arena_push_type(arena, type) ((type*)oc_arena_push(arena, sizeof(type)))
+#define oc_arena_push_type(arena, type) ((type*)oc_arena_push_aligned(arena, sizeof(type), _Alignof(type)))
-#define oc_arena_push_array(arena, type, count) ((type*)oc_arena_push(arena, sizeof(type) * (count)))
+#define oc_arena_push_array(arena, type, count) ((type*)oc_arena_push_aligned(arena, sizeof(type) * (count), _Alignof(type)))
 
 //--------------------------------------------------------------------------------
 //NOTE(martin): memory pool

src/util/strings.c

@@ -196,16 +196,23 @@ oc_str8_list oc_str8_split(oc_arena* arena, oc_str8 str, oc_str8_list separators
         }
         if(foundSep)
         {
-            oc_str8 sub = oc_str8_from_buffer(ptr - subStart, subStart);
+            //NOTE(martin): we found a separator. If the start of the current substring is != ptr,
-            oc_str8_list_push(arena, &list, sub);
+            //              the current substring is not empty and we emit the substring
-
+            if(ptr != subStart)
+            {
+                oc_str8 sub = oc_str8_from_buffer(ptr - subStart, subStart);
+                oc_str8_list_push(arena, &list, sub);
+            }
             ptr += foundSep->len - 1; //NOTE(martin): ptr is incremented at the end of the loop
             subStart = ptr + 1;
         }
     }
     //NOTE(martin): emit the last substring
-    oc_str8 sub = oc_str8_from_buffer(ptr - subStart, subStart);
+    if(ptr != subStart)
-    oc_str8_list_push(arena, &list, sub);
+    {
+        oc_str8 sub = oc_str8_from_buffer(ptr - subStart, subStart);
+        oc_str8_list_push(arena, &list, sub);
+    }
     return (list);
 }
 

src/wasmbind/core_api.json

@@ -1,326 +1,128 @@
 [
-	{
+{
-		"name": "oc_bridge_log",
+	"name": "oc_bridge_log",
-		"cname": "oc_bridge_log",
+	"cname": "oc_bridge_log",
-		"ret": {
+	"ret": {"name": "void", "tag": "v"},
-			"name": "void",
+	"args": [ {"name": "level",
-			"tag": "v"
+			   "type": {"name": "oc_log_level", "tag": "i"}},
-		},
+			  {"name": "functionLen",
-		"args": [
+			   "type": {"name": "int", "tag": "i"}},
-			{
+			  {"name": "function",
-				"name": "level",
+			   "type": {"name": "char*", "tag": "p"},
-				"type": {
+				"len": {"count": "functionLen"}},
-					"name": "oc_log_level",
+              {"name": "fileLen",
-					"tag": "i"
+			   "type": {"name": "int", "tag": "i"}},
-				}
+			  {"name": "file",
-			},
+			   "type": {"name": "char*", "tag": "p"},
-			{
+				"len": {"count": "fileLen"}},
-				"name": "functionLen",
+			  {"name": "line",
-				"type": {
+			   "type": {"name": "int", "tag": "i"}},
-					"name": "int",
+			  {"name": "msgLen",
-					"tag": "i"
+			   "type": {"name": "int", "tag": "i"}},
-				}
+			  {"name": "msg",
-			},
+			   "type": {"name": "char*", "tag": "p"},
-			{
+				"len": {"count": "msgLen"}}
-				"name": "function",
+			]
-				"type": {
+},
-					"name": "char*",
+{
-					"tag": "p"
+	"name": "oc_mem_grow",
-				},
+	"cname": "oc_mem_grow",
-				"len": {
+	"ret": {"name": "int", "tag": "i"},
-					"count": "functionLen"
+	"args": [ {"name": "size",
-				}
+			   "type": {"name": "u64", "tag": "I"}}]
-			},
+},
-			{
+{
-				"name": "fileLen",
+	"name": "oc_bridge_assert_fail",
-				"type": {
+	"cname": "oc_assert_fail",
-					"name": "int",
+	"ret": {"name": "void", "tag": "v"},
-					"tag": "i"
+	"args": [ {"name": "file",
-				}
+			   "type": {"name": "const char*", "tag": "p"},
-			},
+				"len": {"proc": "orca_check_cstring", "args": ["file"]}},
-			{
+			  {"name": "function",
-				"name": "file",
+			   "type": {"name": "const char*", "tag": "p"},
-				"type": {
+				"len": {"proc": "orca_check_cstring", "args": ["function"]}},
-					"name": "char*",
+			  {"name": "line",
-					"tag": "p"
+			   "type": {"name": "int", "tag": "i"}},
-				},
+			  {"name": "src",
-				"len": {
+			   "type": {"name": "const char*", "tag": "p"},
-					"count": "fileLen"
+				"len": {"proc": "orca_check_cstring", "args": ["src"]}},
-				}
+			  {"name": "note",
-			},
+			   "type": {"name": "const char*", "tag": "p"},
-			{
+				"len": {"proc": "orca_check_cstring", "args": ["note"]}}
-				"name": "line",
+			]
-				"type": {
+},
-					"name": "int",
+{
-					"tag": "i"
+	"name": "oc_bridge_abort_ext",
-				}
+	"cname": "oc_abort_ext",
-			},
+	"ret": {"name": "void", "tag": "v"},
-			{
+	"args": [ {"name": "file",
-				"name": "msgLen",
+			   "type": {"name": "const char*", "tag": "p"},
-				"type": {
+				"len": {"proc": "orca_check_cstring", "args": ["file"]}},
-					"name": "int",
+			  {"name": "function",
-					"tag": "i"
+			   "type": {"name": "const char*", "tag": "p"},
-				}
+				"len": {"proc": "orca_check_cstring", "args": ["function"]}},
-			},
+			  {"name": "line",
-			{
+			   "type": {"name": "int", "tag": "i"}},
-				"name": "msg",
+			  {"name": "note",
-				"type": {
+			   "type": {"name": "const char*", "tag": "p"},
-					"name": "char*",
+				"len": {"proc": "orca_check_cstring", "args": ["note"]}}
-					"tag": "p"
+			]
-				},
+},
-				"len": {
+{
-					"count": "msgLen"
+	"name": "oc_get_host_platform",
-				}
+	"cname": "oc_get_host_platform",
-			}
+	"ret": {"name": "int", "tag": "i"},
-		]
+	"args": []
-	},
+},
-	{
+{
-		"name": "oc_mem_grow",
+	"name": "oc_request_quit",
-		"cname": "oc_mem_grow",
+	"cname": "oc_bridge_request_quit",
-		"ret": {
+	"ret": {"name": "void", "tag": "v"},
-			"name": "int",
+	"args": []
-			"tag": "i"
+},
-		},
+{
-		"args": [
+	"name": "oc_window_set_title",
-			{
+	"cname": "oc_bridge_window_set_title",
-				"name": "size",
+	"ret": {"name": "void", "tag": "v"},
-				"type": {
+	"args": [
-					"name": "u64",
+		{ "name": "title",
-					"tag": "I"
+		  "type": {"name": "oc_str8", "cname": "oc_wasm_str8", "tag": "S"}}
-				}
+	]
-			}
+},
-		]
+{
-	},
+	"name": "oc_window_set_size",
-	{
+	"cname": "oc_bridge_window_set_size",
-		"name": "oc_bridge_assert_fail",
+	"ret": {"name": "void", "tag": "v"},
-		"cname": "oc_assert_fail",
+	"args": [
-		"ret": {
+		{ "name": "size",
-			"name": "void",
+		  "type": {"name": "oc_vec2", "tag": "S"}}
-			"tag": "v"
+	]
-		},
+},
-		"args": [
+{
-			{
+    "name": "oc_scancode_to_keycode",
-				"name": "file",
+    "cname": "oc_scancode_to_keycode",
-				"type": {
+    "ret": { "name": "oc_key_code", "tag": "i"},
-					"name": "const char*",
+    "args": [
-					"tag": "p"
+        { "name": "scanCode",
-				},
+          "type": {"name": "oc_scan_code", "tag": "i"}}
-				"len": {
+    ]
-					"proc": "orca_check_cstring",
+},
-					"args": [
+{
-						"file"
+	"name": "oc_clipboard_get_string",
-					]
+	"cname": "oc_bridge_clipboard_get_string",
-				}
+	"ret": { "name": "oc_str8", "cname": "oc_wasm_str8", "tag": "S"},
-			},
+	"args": [
-			{
+        {"name": "arena",
-				"name": "function",
+         "type": {"name": "oc_arena*", "cname": "i32", "tag": "i"}}
-				"type": {
+     ]
-					"name": "const char*",
+},
-					"tag": "p"
+{
-				},
+	"name": "oc_clipboard_set_string",
-				"len": {
+	"cname": "oc_bridge_clipboard_set_string",
-					"proc": "orca_check_cstring",
+	"ret": {"name": "void", "tag": "v"},
-					"args": [
+	"args": [
-						"function"
+		{ "name": "value",
-					]
+		  "type": {"name": "oc_str8", "cname": "oc_wasm_str8", "tag": "S"}}
-				}
+	]
-			},
+}
-			{
+]
-				"name": "line",
-				"type": {
-					"name": "int",
-					"tag": "i"
-				}
-			},
-			{
-				"name": "src",
-				"type": {
-					"name": "const char*",
-					"tag": "p"
-				},
-				"len": {
-					"proc": "orca_check_cstring",
-					"args": [
-						"src"
-					]
-				}
-			},
-			{
-				"name": "note",
-				"type": {
-					"name": "const char*",
-					"tag": "p"
-				},
-				"len": {
-					"proc": "orca_check_cstring",
-					"args": [
-						"note"
-					]
-				}
-			}
-		]
-	},
-	{
-		"name": "oc_bridge_abort_ext",
-		"cname": "oc_abort_ext",
-		"ret": {
-			"name": "void",
-			"tag": "v"
-		},
-		"args": [
-			{
-				"name": "file",
-				"type": {
-					"name": "const char*",
-					"tag": "p"
-				},
-				"len": {
-					"proc": "orca_check_cstring",
-					"args": [
-						"file"
-					]
-				}
-			},
-			{
-				"name": "function",
-				"type": {
-					"name": "const char*",
-					"tag": "p"
-				},
-				"len": {
-					"proc": "orca_check_cstring",
-					"args": [
-						"function"
-					]
-				}
-			},
-			{
-				"name": "line",
-				"type": {
-					"name": "int",
-					"tag": "i"
-				}
-			},
-			{
-				"name": "note",
-				"type": {
-					"name": "const char*",
-					"tag": "p"
-				},
-				"len": {
-					"proc": "orca_check_cstring",
-					"args": [
-						"note"
-					]
-				}
-			}
-		]
-	},
-	{
-		"name": "oc_get_host_platform",
-		"cname": "oc_get_host_platform",
-		"ret": {
-			"name": "int",
-			"tag": "i"
-		},
-		"args": []
-	},
-	{
-		"name": "oc_request_quit",
-		"cname": "oc_bridge_request_quit",
-		"ret": {
-			"name": "void",
-			"tag": "v"
-		},
-		"args": []
-	},
-	{
-		"name": "oc_window_set_title",
-		"cname": "oc_bridge_window_set_title",
-		"ret": {
-			"name": "void",
-			"tag": "v"
-		},
-		"args": [
-			{
-				"name": "title",
-				"type": {
-					"name": "oc_str8",
-					"cname": "oc_wasm_str8",
-					"tag": "S"
-				}
-			}
-		]
-	},
-	{
-		"name": "oc_window_set_size",
-		"cname": "oc_bridge_window_set_size",
-		"ret": {
-			"name": "void",
-			"tag": "v"
-		},
-		"args": [
-			{
-				"name": "size",
-				"type": {
-					"name": "oc_vec2",
-					"tag": "S"
-				}
-			}
-		]
-	},
-	{
-		"name": "oc_scancode_to_keycode",
-		"cname": "oc_scancode_to_keycode",
-		"ret": {
-			"name": "oc_key_code",
-			"tag": "i"
-		},
-		"args": [
-			{
-				"name": "scanCode",
-				"type": {
-					"name": "oc_scan_code",
-					"tag": "i"
-				}
-			}
-		]
-	},
-	{
-		"name": "oc_clipboard_get_string",
-		"cname": "oc_bridge_clipboard_get_string",
-		"ret": {
-			"name": "oc_str8",
-			"cname": "oc_wasm_str8",
-			"tag": "S"
-		},
-		"args": [
-			{
-				"name": "arena",
-				"type": {
-					"name": "oc_arena*",
-					"cname": "i32",
-					"tag": "i"
-				}
-			}
-		]
-	},
-	{
-		"name": "oc_clipboard_set_string",
-		"cname": "oc_bridge_clipboard_set_string",
-		"ret": {
-			"name": "void",
-			"tag": "v"
-		},
-		"args": [
-			{
-				"name": "value",
-				"type": {
-					"name": "oc_str8",
-					"cname": "oc_wasm_str8",
-					"tag": "S"
-				}
-			}
-		]
-	}
-]

src/wasmbind/subprocess_api.json

@@ -1,29 +0,0 @@
-[
-    {
-        "name": "oc_run_cmd",
-        "cname": "oc_bridge_run_cmd",
-        "ret": {
-            "name": "oc_str8",
-            "cname": "oc_wasm_str8",
-            "tag": "S"
-        },
-        "args": [
-            {
-                "name": "arena",
-                "type": {
-                    "name": "oc_arena*",
-                    "cname": "i32",
-                    "tag": "i"
-                }
-            },
-            {
-                "name": "cmd",
-                "type": {
-                    "name": "oc_str8",
-                    "cname": "oc_wasm_str8",
-                    "tag": "S"
-                }
-            }
-        ]
-    }
-]