Compare commits
No commits in common. "cd480daccce9741fe9fef540b3e456cdc63d4de2" and "2325587c8c56bfbff0b5e5f4c4c2c612063d085a" have entirely different histories.
cd480daccc
...
2325587c8c
22 changed files with 113 additions and 1403 deletions
662
LICENSE
662
LICENSE
|
|
@ -1,662 +0,0 @@
|
||||||
GNU AFFERO GENERAL PUBLIC LICENSE
|
|
||||||
Version 3, 19 November 2007
|
|
||||||
|
|
||||||
Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
|
|
||||||
Everyone is permitted to copy and distribute verbatim copies
|
|
||||||
of this license document, but changing it is not allowed.
|
|
||||||
|
|
||||||
Preamble
|
|
||||||
|
|
||||||
The GNU Affero General Public License is a free, copyleft license for
|
|
||||||
software and other kinds of works, specifically designed to ensure
|
|
||||||
cooperation with the community in the case of network server software.
|
|
||||||
|
|
||||||
The licenses for most software and other practical works are designed
|
|
||||||
to take away your freedom to share and change the works. By contrast,
|
|
||||||
our General Public Licenses are intended to guarantee your freedom to
|
|
||||||
share and change all versions of a program--to make sure it remains free
|
|
||||||
software for all its users.
|
|
||||||
|
|
||||||
When we speak of free software, we are referring to freedom, not
|
|
||||||
price. Our General Public Licenses are designed to make sure that you
|
|
||||||
have the freedom to distribute copies of free software (and charge for
|
|
||||||
them if you wish), that you receive source code or can get it if you
|
|
||||||
want it, that you can change the software or use pieces of it in new
|
|
||||||
free programs, and that you know you can do these things.
|
|
||||||
|
|
||||||
Developers that use our General Public Licenses protect your rights
|
|
||||||
with two steps: (1) assert copyright on the software, and (2) offer
|
|
||||||
you this License which gives you legal permission to copy, distribute
|
|
||||||
and/or modify the software.
|
|
||||||
|
|
||||||
A secondary benefit of defending all users' freedom is that
|
|
||||||
improvements made in alternate versions of the program, if they
|
|
||||||
receive widespread use, become available for other developers to
|
|
||||||
incorporate. Many developers of free software are heartened and
|
|
||||||
encouraged by the resulting cooperation. However, in the case of
|
|
||||||
software used on network servers, this result may fail to come about.
|
|
||||||
The GNU General Public License permits making a modified version and
|
|
||||||
letting the public access it on a server without ever releasing its
|
|
||||||
source code to the public.
|
|
||||||
|
|
||||||
The GNU Affero General Public License is designed specifically to
|
|
||||||
ensure that, in such cases, the modified source code becomes available
|
|
||||||
to the community. It requires the operator of a network server to
|
|
||||||
provide the source code of the modified version running there to the
|
|
||||||
users of that server. Therefore, public use of a modified version, on
|
|
||||||
a publicly accessible server, gives the public access to the source
|
|
||||||
code of the modified version.
|
|
||||||
|
|
||||||
An older license, called the Affero General Public License and
|
|
||||||
published by Affero, was designed to accomplish similar goals. This is
|
|
||||||
a different license, not a version of the Affero GPL, but Affero has
|
|
||||||
released a new version of the Affero GPL which permits relicensing under
|
|
||||||
this license.
|
|
||||||
|
|
||||||
The precise terms and conditions for copying, distribution and
|
|
||||||
modification follow.
|
|
||||||
|
|
||||||
TERMS AND CONDITIONS
|
|
||||||
|
|
||||||
0. Definitions.
|
|
||||||
|
|
||||||
"This License" refers to version 3 of the GNU Affero General Public License.
|
|
||||||
|
|
||||||
"Copyright" also means copyright-like laws that apply to other kinds of
|
|
||||||
works, such as semiconductor masks.
|
|
||||||
|
|
||||||
"The Program" refers to any copyrightable work licensed under this
|
|
||||||
License. Each licensee is addressed as "you". "Licensees" and
|
|
||||||
"recipients" may be individuals or organizations.
|
|
||||||
|
|
||||||
To "modify" a work means to copy from or adapt all or part of the work
|
|
||||||
in a fashion requiring copyright permission, other than the making of an
|
|
||||||
exact copy. The resulting work is called a "modified version" of the
|
|
||||||
earlier work or a work "based on" the earlier work.
|
|
||||||
|
|
||||||
A "covered work" means either the unmodified Program or a work based
|
|
||||||
on the Program.
|
|
||||||
|
|
||||||
To "propagate" a work means to do anything with it that, without
|
|
||||||
permission, would make you directly or secondarily liable for
|
|
||||||
infringement under applicable copyright law, except executing it on a
|
|
||||||
computer or modifying a private copy. Propagation includes copying,
|
|
||||||
distribution (with or without modification), making available to the
|
|
||||||
public, and in some countries other activities as well.
|
|
||||||
|
|
||||||
To "convey" a work means any kind of propagation that enables other
|
|
||||||
parties to make or receive copies. Mere interaction with a user through
|
|
||||||
a computer network, with no transfer of a copy, is not conveying.
|
|
||||||
|
|
||||||
An interactive user interface displays "Appropriate Legal Notices"
|
|
||||||
to the extent that it includes a convenient and prominently visible
|
|
||||||
feature that (1) displays an appropriate copyright notice, and (2)
|
|
||||||
tells the user that there is no warranty for the work (except to the
|
|
||||||
extent that warranties are provided), that licensees may convey the
|
|
||||||
work under this License, and how to view a copy of this License. If
|
|
||||||
the interface presents a list of user commands or options, such as a
|
|
||||||
menu, a prominent item in the list meets this criterion.
|
|
||||||
|
|
||||||
1. Source Code.
|
|
||||||
|
|
||||||
The "source code" for a work means the preferred form of the work
|
|
||||||
for making modifications to it. "Object code" means any non-source
|
|
||||||
form of a work.
|
|
||||||
|
|
||||||
A "Standard Interface" means an interface that either is an official
|
|
||||||
standard defined by a recognized standards body, or, in the case of
|
|
||||||
interfaces specified for a particular programming language, one that
|
|
||||||
is widely used among developers working in that language.
|
|
||||||
|
|
||||||
The "System Libraries" of an executable work include anything, other
|
|
||||||
than the work as a whole, that (a) is included in the normal form of
|
|
||||||
packaging a Major Component, but which is not part of that Major
|
|
||||||
Component, and (b) serves only to enable use of the work with that
|
|
||||||
Major Component, or to implement a Standard Interface for which an
|
|
||||||
implementation is available to the public in source code form. A
|
|
||||||
"Major Component", in this context, means a major essential component
|
|
||||||
(kernel, window system, and so on) of the specific operating system
|
|
||||||
(if any) on which the executable work runs, or a compiler used to
|
|
||||||
produce the work, or an object code interpreter used to run it.
|
|
||||||
|
|
||||||
The "Corresponding Source" for a work in object code form means all
|
|
||||||
the source code needed to generate, install, and (for an executable
|
|
||||||
work) run the object code and to modify the work, including scripts to
|
|
||||||
control those activities. However, it does not include the work's
|
|
||||||
System Libraries, or general-purpose tools or generally available free
|
|
||||||
programs which are used unmodified in performing those activities but
|
|
||||||
which are not part of the work. For example, Corresponding Source
|
|
||||||
includes interface definition files associated with source files for
|
|
||||||
the work, and the source code for shared libraries and dynamically
|
|
||||||
linked subprograms that the work is specifically designed to require,
|
|
||||||
such as by intimate data communication or control flow between those
|
|
||||||
subprograms and other parts of the work.
|
|
||||||
|
|
||||||
The Corresponding Source need not include anything that users
|
|
||||||
can regenerate automatically from other parts of the Corresponding
|
|
||||||
Source.
|
|
||||||
|
|
||||||
The Corresponding Source for a work in source code form is that
|
|
||||||
same work.
|
|
||||||
|
|
||||||
2. Basic Permissions.
|
|
||||||
|
|
||||||
All rights granted under this License are granted for the term of
|
|
||||||
copyright on the Program, and are irrevocable provided the stated
|
|
||||||
conditions are met. This License explicitly affirms your unlimited
|
|
||||||
permission to run the unmodified Program. The output from running a
|
|
||||||
covered work is covered by this License only if the output, given its
|
|
||||||
content, constitutes a covered work. This License acknowledges your
|
|
||||||
rights of fair use or other equivalent, as provided by copyright law.
|
|
||||||
|
|
||||||
You may make, run and propagate covered works that you do not
|
|
||||||
convey, without conditions so long as your license otherwise remains
|
|
||||||
in force. You may convey covered works to others for the sole purpose
|
|
||||||
of having them make modifications exclusively for you, or provide you
|
|
||||||
with facilities for running those works, provided that you comply with
|
|
||||||
the terms of this License in conveying all material for which you do
|
|
||||||
not control copyright. Those thus making or running the covered works
|
|
||||||
for you must do so exclusively on your behalf, under your direction
|
|
||||||
and control, on terms that prohibit them from making any copies of
|
|
||||||
your copyrighted material outside their relationship with you.
|
|
||||||
|
|
||||||
Conveying under any other circumstances is permitted solely under
|
|
||||||
the conditions stated below. Sublicensing is not allowed; section 10
|
|
||||||
makes it unnecessary.
|
|
||||||
|
|
||||||
3. Protecting Users' Legal Rights From Anti-Circumvention Law.
|
|
||||||
|
|
||||||
No covered work shall be deemed part of an effective technological
|
|
||||||
measure under any applicable law fulfilling obligations under article
|
|
||||||
11 of the WIPO copyright treaty adopted on 20 December 1996, or
|
|
||||||
similar laws prohibiting or restricting circumvention of such
|
|
||||||
measures.
|
|
||||||
|
|
||||||
When you convey a covered work, you waive any legal power to forbid
|
|
||||||
circumvention of technological measures to the extent such circumvention
|
|
||||||
is effected by exercising rights under this License with respect to
|
|
||||||
the covered work, and you disclaim any intention to limit operation or
|
|
||||||
modification of the work as a means of enforcing, against the work's
|
|
||||||
users, your or third parties' legal rights to forbid circumvention of
|
|
||||||
technological measures.
|
|
||||||
|
|
||||||
4. Conveying Verbatim Copies.
|
|
||||||
|
|
||||||
You may convey verbatim copies of the Program's source code as you
|
|
||||||
receive it, in any medium, provided that you conspicuously and
|
|
||||||
appropriately publish on each copy an appropriate copyright notice;
|
|
||||||
keep intact all notices stating that this License and any
|
|
||||||
non-permissive terms added in accord with section 7 apply to the code;
|
|
||||||
keep intact all notices of the absence of any warranty; and give all
|
|
||||||
recipients a copy of this License along with the Program.
|
|
||||||
|
|
||||||
You may charge any price or no price for each copy that you convey,
|
|
||||||
and you may offer support or warranty protection for a fee.
|
|
||||||
|
|
||||||
5. Conveying Modified Source Versions.
|
|
||||||
|
|
||||||
You may convey a work based on the Program, or the modifications to
|
|
||||||
produce it from the Program, in the form of source code under the
|
|
||||||
terms of section 4, provided that you also meet all of these conditions:
|
|
||||||
|
|
||||||
a) The work must carry prominent notices stating that you modified
|
|
||||||
it, and giving a relevant date.
|
|
||||||
|
|
||||||
b) The work must carry prominent notices stating that it is
|
|
||||||
released under this License and any conditions added under section
|
|
||||||
7. This requirement modifies the requirement in section 4 to
|
|
||||||
"keep intact all notices".
|
|
||||||
|
|
||||||
c) You must license the entire work, as a whole, under this
|
|
||||||
License to anyone who comes into possession of a copy. This
|
|
||||||
License will therefore apply, along with any applicable section 7
|
|
||||||
additional terms, to the whole of the work, and all its parts,
|
|
||||||
regardless of how they are packaged. This License gives no
|
|
||||||
permission to license the work in any other way, but it does not
|
|
||||||
invalidate such permission if you have separately received it.
|
|
||||||
|
|
||||||
d) If the work has interactive user interfaces, each must display
|
|
||||||
Appropriate Legal Notices; however, if the Program has interactive
|
|
||||||
interfaces that do not display Appropriate Legal Notices, your
|
|
||||||
work need not make them do so.
|
|
||||||
|
|
||||||
A compilation of a covered work with other separate and independent
|
|
||||||
works, which are not by their nature extensions of the covered work,
|
|
||||||
and which are not combined with it such as to form a larger program,
|
|
||||||
in or on a volume of a storage or distribution medium, is called an
|
|
||||||
"aggregate" if the compilation and its resulting copyright are not
|
|
||||||
used to limit the access or legal rights of the compilation's users
|
|
||||||
beyond what the individual works permit. Inclusion of a covered work
|
|
||||||
in an aggregate does not cause this License to apply to the other
|
|
||||||
parts of the aggregate.
|
|
||||||
|
|
||||||
6. Conveying Non-Source Forms.
|
|
||||||
|
|
||||||
You may convey a covered work in object code form under the terms
|
|
||||||
of sections 4 and 5, provided that you also convey the
|
|
||||||
machine-readable Corresponding Source under the terms of this License,
|
|
||||||
in one of these ways:
|
|
||||||
|
|
||||||
a) Convey the object code in, or embodied in, a physical product
|
|
||||||
(including a physical distribution medium), accompanied by the
|
|
||||||
Corresponding Source fixed on a durable physical medium
|
|
||||||
customarily used for software interchange.
|
|
||||||
|
|
||||||
b) Convey the object code in, or embodied in, a physical product
|
|
||||||
(including a physical distribution medium), accompanied by a
|
|
||||||
written offer, valid for at least three years and valid for as
|
|
||||||
long as you offer spare parts or customer support for that product
|
|
||||||
model, to give anyone who possesses the object code either (1) a
|
|
||||||
copy of the Corresponding Source for all the software in the
|
|
||||||
product that is covered by this License, on a durable physical
|
|
||||||
medium customarily used for software interchange, for a price no
|
|
||||||
more than your reasonable cost of physically performing this
|
|
||||||
conveying of source, or (2) access to copy the
|
|
||||||
Corresponding Source from a network server at no charge.
|
|
||||||
|
|
||||||
c) Convey individual copies of the object code with a copy of the
|
|
||||||
written offer to provide the Corresponding Source. This
|
|
||||||
alternative is allowed only occasionally and noncommercially, and
|
|
||||||
only if you received the object code with such an offer, in accord
|
|
||||||
with subsection 6b.
|
|
||||||
|
|
||||||
d) Convey the object code by offering access from a designated
|
|
||||||
place (gratis or for a charge), and offer equivalent access to the
|
|
||||||
Corresponding Source in the same way through the same place at no
|
|
||||||
further charge. You need not require recipients to copy the
|
|
||||||
Corresponding Source along with the object code. If the place to
|
|
||||||
copy the object code is a network server, the Corresponding Source
|
|
||||||
may be on a different server (operated by you or a third party)
|
|
||||||
that supports equivalent copying facilities, provided you maintain
|
|
||||||
clear directions next to the object code saying where to find the
|
|
||||||
Corresponding Source. Regardless of what server hosts the
|
|
||||||
Corresponding Source, you remain obligated to ensure that it is
|
|
||||||
available for as long as needed to satisfy these requirements.
|
|
||||||
|
|
||||||
e) Convey the object code using peer-to-peer transmission, provided
|
|
||||||
you inform other peers where the object code and Corresponding
|
|
||||||
Source of the work are being offered to the general public at no
|
|
||||||
charge under subsection 6d.
|
|
||||||
|
|
||||||
A separable portion of the object code, whose source code is excluded
|
|
||||||
from the Corresponding Source as a System Library, need not be
|
|
||||||
included in conveying the object code work.
|
|
||||||
|
|
||||||
A "User Product" is either (1) a "consumer product", which means any
|
|
||||||
tangible personal property which is normally used for personal, family,
|
|
||||||
or household purposes, or (2) anything designed or sold for incorporation
|
|
||||||
into a dwelling. In determining whether a product is a consumer product,
|
|
||||||
doubtful cases shall be resolved in favor of coverage. For a particular
|
|
||||||
product received by a particular user, "normally used" refers to a
|
|
||||||
typical or common use of that class of product, regardless of the status
|
|
||||||
of the particular user or of the way in which the particular user
|
|
||||||
actually uses, or expects or is expected to use, the product. A product
|
|
||||||
is a consumer product regardless of whether the product has substantial
|
|
||||||
commercial, industrial or non-consumer uses, unless such uses represent
|
|
||||||
the only significant mode of use of the product.
|
|
||||||
|
|
||||||
"Installation Information" for a User Product means any methods,
|
|
||||||
procedures, authorization keys, or other information required to install
|
|
||||||
and execute modified versions of a covered work in that User Product from
|
|
||||||
a modified version of its Corresponding Source. The information must
|
|
||||||
suffice to ensure that the continued functioning of the modified object
|
|
||||||
code is in no case prevented or interfered with solely because
|
|
||||||
modification has been made.
|
|
||||||
|
|
||||||
If you convey an object code work under this section in, or with, or
|
|
||||||
specifically for use in, a User Product, and the conveying occurs as
|
|
||||||
part of a transaction in which the right of possession and use of the
|
|
||||||
User Product is transferred to the recipient in perpetuity or for a
|
|
||||||
fixed term (regardless of how the transaction is characterized), the
|
|
||||||
Corresponding Source conveyed under this section must be accompanied
|
|
||||||
by the Installation Information. But this requirement does not apply
|
|
||||||
if neither you nor any third party retains the ability to install
|
|
||||||
modified object code on the User Product (for example, the work has
|
|
||||||
been installed in ROM).
|
|
||||||
|
|
||||||
The requirement to provide Installation Information does not include a
|
|
||||||
requirement to continue to provide support service, warranty, or updates
|
|
||||||
for a work that has been modified or installed by the recipient, or for
|
|
||||||
the User Product in which it has been modified or installed. Access to a
|
|
||||||
network may be denied when the modification itself materially and
|
|
||||||
adversely affects the operation of the network or violates the rules and
|
|
||||||
protocols for communication across the network.
|
|
||||||
|
|
||||||
Corresponding Source conveyed, and Installation Information provided,
|
|
||||||
in accord with this section must be in a format that is publicly
|
|
||||||
documented (and with an implementation available to the public in
|
|
||||||
source code form), and must require no special password or key for
|
|
||||||
unpacking, reading or copying.
|
|
||||||
|
|
||||||
7. Additional Terms.
|
|
||||||
|
|
||||||
"Additional permissions" are terms that supplement the terms of this
|
|
||||||
License by making exceptions from one or more of its conditions.
|
|
||||||
Additional permissions that are applicable to the entire Program shall
|
|
||||||
be treated as though they were included in this License, to the extent
|
|
||||||
that they are valid under applicable law. If additional permissions
|
|
||||||
apply only to part of the Program, that part may be used separately
|
|
||||||
under those permissions, but the entire Program remains governed by
|
|
||||||
this License without regard to the additional permissions.
|
|
||||||
|
|
||||||
When you convey a copy of a covered work, you may at your option
|
|
||||||
remove any additional permissions from that copy, or from any part of
|
|
||||||
it. (Additional permissions may be written to require their own
|
|
||||||
removal in certain cases when you modify the work.) You may place
|
|
||||||
additional permissions on material, added by you to a covered work,
|
|
||||||
for which you have or can give appropriate copyright permission.
|
|
||||||
|
|
||||||
Notwithstanding any other provision of this License, for material you
|
|
||||||
add to a covered work, you may (if authorized by the copyright holders of
|
|
||||||
that material) supplement the terms of this License with terms:
|
|
||||||
|
|
||||||
a) Disclaiming warranty or limiting liability differently from the
|
|
||||||
terms of sections 15 and 16 of this License; or
|
|
||||||
|
|
||||||
b) Requiring preservation of specified reasonable legal notices or
|
|
||||||
author attributions in that material or in the Appropriate Legal
|
|
||||||
Notices displayed by works containing it; or
|
|
||||||
|
|
||||||
c) Prohibiting misrepresentation of the origin of that material, or
|
|
||||||
requiring that modified versions of such material be marked in
|
|
||||||
reasonable ways as different from the original version; or
|
|
||||||
|
|
||||||
d) Limiting the use for publicity purposes of names of licensors or
|
|
||||||
authors of the material; or
|
|
||||||
|
|
||||||
e) Declining to grant rights under trademark law for use of some
|
|
||||||
trade names, trademarks, or service marks; or
|
|
||||||
|
|
||||||
f) Requiring indemnification of licensors and authors of that
|
|
||||||
material by anyone who conveys the material (or modified versions of
|
|
||||||
it) with contractual assumptions of liability to the recipient, for
|
|
||||||
any liability that these contractual assumptions directly impose on
|
|
||||||
those licensors and authors.
|
|
||||||
|
|
||||||
All other non-permissive additional terms are considered "further
|
|
||||||
restrictions" within the meaning of section 10. If the Program as you
|
|
||||||
received it, or any part of it, contains a notice stating that it is
|
|
||||||
governed by this License along with a term that is a further
|
|
||||||
restriction, you may remove that term. If a license document contains
|
|
||||||
a further restriction but permits relicensing or conveying under this
|
|
||||||
License, you may add to a covered work material governed by the terms
|
|
||||||
of that license document, provided that the further restriction does
|
|
||||||
not survive such relicensing or conveying.
|
|
||||||
|
|
||||||
If you add terms to a covered work in accord with this section, you
|
|
||||||
must place, in the relevant source files, a statement of the
|
|
||||||
additional terms that apply to those files, or a notice indicating
|
|
||||||
where to find the applicable terms.
|
|
||||||
|
|
||||||
Additional terms, permissive or non-permissive, may be stated in the
|
|
||||||
form of a separately written license, or stated as exceptions;
|
|
||||||
the above requirements apply either way.
|
|
||||||
|
|
||||||
8. Termination.
|
|
||||||
|
|
||||||
You may not propagate or modify a covered work except as expressly
|
|
||||||
provided under this License. Any attempt otherwise to propagate or
|
|
||||||
modify it is void, and will automatically terminate your rights under
|
|
||||||
this License (including any patent licenses granted under the third
|
|
||||||
paragraph of section 11).
|
|
||||||
|
|
||||||
However, if you cease all violation of this License, then your
|
|
||||||
license from a particular copyright holder is reinstated (a)
|
|
||||||
provisionally, unless and until the copyright holder explicitly and
|
|
||||||
finally terminates your license, and (b) permanently, if the copyright
|
|
||||||
holder fails to notify you of the violation by some reasonable means
|
|
||||||
prior to 60 days after the cessation.
|
|
||||||
|
|
||||||
Moreover, your license from a particular copyright holder is
|
|
||||||
reinstated permanently if the copyright holder notifies you of the
|
|
||||||
violation by some reasonable means, this is the first time you have
|
|
||||||
received notice of violation of this License (for any work) from that
|
|
||||||
copyright holder, and you cure the violation prior to 30 days after
|
|
||||||
your receipt of the notice.
|
|
||||||
|
|
||||||
Termination of your rights under this section does not terminate the
|
|
||||||
licenses of parties who have received copies or rights from you under
|
|
||||||
this License. If your rights have been terminated and not permanently
|
|
||||||
reinstated, you do not qualify to receive new licenses for the same
|
|
||||||
material under section 10.
|
|
||||||
|
|
||||||
9. Acceptance Not Required for Having Copies.
|
|
||||||
|
|
||||||
You are not required to accept this License in order to receive or
|
|
||||||
run a copy of the Program. Ancillary propagation of a covered work
|
|
||||||
occurring solely as a consequence of using peer-to-peer transmission
|
|
||||||
to receive a copy likewise does not require acceptance. However,
|
|
||||||
nothing other than this License grants you permission to propagate or
|
|
||||||
modify any covered work. These actions infringe copyright if you do
|
|
||||||
not accept this License. Therefore, by modifying or propagating a
|
|
||||||
covered work, you indicate your acceptance of this License to do so.
|
|
||||||
|
|
||||||
10. Automatic Licensing of Downstream Recipients.
|
|
||||||
|
|
||||||
Each time you convey a covered work, the recipient automatically
|
|
||||||
receives a license from the original licensors, to run, modify and
|
|
||||||
propagate that work, subject to this License. You are not responsible
|
|
||||||
for enforcing compliance by third parties with this License.
|
|
||||||
|
|
||||||
An "entity transaction" is a transaction transferring control of an
|
|
||||||
organization, or substantially all assets of one, or subdividing an
|
|
||||||
organization, or merging organizations. If propagation of a covered
|
|
||||||
work results from an entity transaction, each party to that
|
|
||||||
transaction who receives a copy of the work also receives whatever
|
|
||||||
licenses to the work the party's predecessor in interest had or could
|
|
||||||
give under the previous paragraph, plus a right to possession of the
|
|
||||||
Corresponding Source of the work from the predecessor in interest, if
|
|
||||||
the predecessor has it or can get it with reasonable efforts.
|
|
||||||
|
|
||||||
You may not impose any further restrictions on the exercise of the
|
|
||||||
rights granted or affirmed under this License. For example, you may
|
|
||||||
not impose a license fee, royalty, or other charge for exercise of
|
|
||||||
rights granted under this License, and you may not initiate litigation
|
|
||||||
(including a cross-claim or counterclaim in a lawsuit) alleging that
|
|
||||||
any patent claim is infringed by making, using, selling, offering for
|
|
||||||
sale, or importing the Program or any portion of it.
|
|
||||||
|
|
||||||
11. Patents.
|
|
||||||
|
|
||||||
A "contributor" is a copyright holder who authorizes use under this
|
|
||||||
License of the Program or a work on which the Program is based. The
|
|
||||||
work thus licensed is called the contributor's "contributor version".
|
|
||||||
|
|
||||||
A contributor's "essential patent claims" are all patent claims
|
|
||||||
owned or controlled by the contributor, whether already acquired or
|
|
||||||
hereafter acquired, that would be infringed by some manner, permitted
|
|
||||||
by this License, of making, using, or selling its contributor version,
|
|
||||||
but do not include claims that would be infringed only as a
|
|
||||||
consequence of further modification of the contributor version. For
|
|
||||||
purposes of this definition, "control" includes the right to grant
|
|
||||||
patent sublicenses in a manner consistent with the requirements of
|
|
||||||
this License.
|
|
||||||
|
|
||||||
Each contributor grants you a non-exclusive, worldwide, royalty-free
|
|
||||||
patent license under the contributor's essential patent claims, to
|
|
||||||
make, use, sell, offer for sale, import and otherwise run, modify and
|
|
||||||
propagate the contents of its contributor version.
|
|
||||||
|
|
||||||
In the following three paragraphs, a "patent license" is any express
|
|
||||||
agreement or commitment, however denominated, not to enforce a patent
|
|
||||||
(such as an express permission to practice a patent or covenant not to
|
|
||||||
sue for patent infringement). To "grant" such a patent license to a
|
|
||||||
party means to make such an agreement or commitment not to enforce a
|
|
||||||
patent against the party.
|
|
||||||
|
|
||||||
If you convey a covered work, knowingly relying on a patent license,
|
|
||||||
and the Corresponding Source of the work is not available for anyone
|
|
||||||
to copy, free of charge and under the terms of this License, through a
|
|
||||||
publicly available network server or other readily accessible means,
|
|
||||||
then you must either (1) cause the Corresponding Source to be so
|
|
||||||
available, or (2) arrange to deprive yourself of the benefit of the
|
|
||||||
patent license for this particular work, or (3) arrange, in a manner
|
|
||||||
consistent with the requirements of this License, to extend the patent
|
|
||||||
license to downstream recipients. "Knowingly relying" means you have
|
|
||||||
actual knowledge that, but for the patent license, your conveying the
|
|
||||||
covered work in a country, or your recipient's use of the covered work
|
|
||||||
in a country, would infringe one or more identifiable patents in that
|
|
||||||
country that you have reason to believe are valid.
|
|
||||||
|
|
||||||
If, pursuant to or in connection with a single transaction or
|
|
||||||
arrangement, you convey, or propagate by procuring conveyance of, a
|
|
||||||
covered work, and grant a patent license to some of the parties
|
|
||||||
receiving the covered work authorizing them to use, propagate, modify
|
|
||||||
or convey a specific copy of the covered work, then the patent license
|
|
||||||
you grant is automatically extended to all recipients of the covered
|
|
||||||
work and works based on it.
|
|
||||||
|
|
||||||
A patent license is "discriminatory" if it does not include within
|
|
||||||
the scope of its coverage, prohibits the exercise of, or is
|
|
||||||
conditioned on the non-exercise of one or more of the rights that are
|
|
||||||
specifically granted under this License. You may not convey a covered
|
|
||||||
work if you are a party to an arrangement with a third party that is
|
|
||||||
in the business of distributing software, under which you make payment
|
|
||||||
to the third party based on the extent of your activity of conveying
|
|
||||||
the work, and under which the third party grants, to any of the
|
|
||||||
parties who would receive the covered work from you, a discriminatory
|
|
||||||
patent license (a) in connection with copies of the covered work
|
|
||||||
conveyed by you (or copies made from those copies), or (b) primarily
|
|
||||||
for and in connection with specific products or compilations that
|
|
||||||
contain the covered work, unless you entered into that arrangement,
|
|
||||||
or that patent license was granted, prior to 28 March 2007.
|
|
||||||
|
|
||||||
Nothing in this License shall be construed as excluding or limiting
|
|
||||||
any implied license or other defenses to infringement that may
|
|
||||||
otherwise be available to you under applicable patent law.
|
|
||||||
|
|
||||||
12. No Surrender of Others' Freedom.
|
|
||||||
|
|
||||||
If conditions are imposed on you (whether by court order, agreement or
|
|
||||||
otherwise) that contradict the conditions of this License, they do not
|
|
||||||
excuse you from the conditions of this License. If you cannot convey a
|
|
||||||
covered work so as to satisfy simultaneously your obligations under this
|
|
||||||
License and any other pertinent obligations, then as a consequence you may
|
|
||||||
not convey it at all. For example, if you agree to terms that obligate you
|
|
||||||
to collect a royalty for further conveying from those to whom you convey
|
|
||||||
the Program, the only way you could satisfy both those terms and this
|
|
||||||
License would be to refrain entirely from conveying the Program.
|
|
||||||
|
|
||||||
13. 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
|
|
||||||
|
|
||||||
How to Apply These Terms to Your New Programs
|
|
||||||
|
|
||||||
If you develop a new program, and you want it to be of the greatest
|
|
||||||
possible use to the public, the best way to achieve this is to make it
|
|
||||||
free software which everyone can redistribute and change under these terms.
|
|
||||||
|
|
||||||
To do so, attach the following notices to the program. It is safest
|
|
||||||
to attach them to the start of each source file to most effectively
|
|
||||||
state the exclusion of warranty; and each file should have at least
|
|
||||||
the "copyright" line and a pointer to where the full notice is found.
|
|
||||||
|
|
||||||
<one line to give the program's name and a brief idea of what it does.>
|
|
||||||
|
|
||||||
Copyright (C) {{ year }} {{ organization }}
|
|
||||||
|
|
||||||
This program is free software: you can redistribute it and/or modify
|
|
||||||
it under the terms of the GNU Affero General Public License as published by
|
|
||||||
the Free Software Foundation, either version 3 of the License, or
|
|
||||||
(at your option) any later version.
|
|
||||||
|
|
||||||
This program is distributed in the hope that it will be useful,
|
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
GNU Affero General Public License for more details.
|
|
||||||
|
|
||||||
You should have received a copy of the GNU Affero General Public License
|
|
||||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
|
|
||||||
Also add information on how to contact you by electronic and paper mail.
|
|
||||||
|
|
||||||
If your software can interact with users remotely through a computer
|
|
||||||
network, you should also make sure that it provides a way for users to
|
|
||||||
get its source. For example, if your program is a web application, its
|
|
||||||
interface could display a "Source" link that leads users to an archive
|
|
||||||
of the code. There are many ways you could offer source, and different
|
|
||||||
solutions will be better for different programs; see section 13 for the
|
|
||||||
specific requirements.
|
|
||||||
|
|
||||||
You should also get your employer (if you work as a programmer) or school,
|
|
||||||
if any, to sign a "copyright disclaimer" for the program, if necessary.
|
|
||||||
For more information on this, and how to apply and follow the GNU AGPL, see
|
|
||||||
<http://www.gnu.org/licenses/>.
|
|
||||||
|
|
@ -7,10 +7,9 @@ Download/run the binaries for your platform in the releases section.<br>
|
||||||
Developers can run it via [Lua](https://lua.org), [LÖVR](https://lovr.org) or [LÖVE2D](https://love2d.org)
|
Developers can run it via [Lua](https://lua.org), [LÖVR](https://lovr.org) or [LÖVE2D](https://love2d.org)
|
||||||
|
|
||||||
```
|
```
|
||||||
$ cd xurfer
|
$ love xurfer <url> [..] # if you have LÖVE2D installed (>v12)
|
||||||
$ love . <url_or_file> [..] # if you have LÖVE2D installed (>v12)
|
$ lovr xurfer <url> [..] # if you have LÖVR installed
|
||||||
$ lovr . <url_or_file> [..] # if you have LÖVR installed
|
$ lua xurfer/main.lua <url> [..] # if you have lua installed
|
||||||
$ lua main.lua <url_or_file> [..] # if you have lua installed
|
|
||||||
```
|
```
|
||||||
|
|
||||||
**Example**: lovr xurfer <a href="https://snips.sh/f/_U5-XctEVE?r=1">https://snips.sh/f/_U5-XctEVE?r=1</a>
|
**Example**: lovr xurfer <a href="https://snips.sh/f/_U5-XctEVE?r=1">https://snips.sh/f/_U5-XctEVE?r=1</a>
|
||||||
|
|
|
||||||
|
|
@ -11,4 +11,5 @@ package.path = package.path .. ';' ..
|
||||||
arg[0] .. '/' .. runtime .. '/?/init.lua;' ..
|
arg[0] .. '/' .. runtime .. '/?/init.lua;' ..
|
||||||
arg[0] .. '/lib/?.lua'
|
arg[0] .. '/lib/?.lua'
|
||||||
|
|
||||||
|
|
||||||
require( runtime .. "/conf")
|
require( runtime .. "/conf")
|
||||||
|
|
|
||||||
|
|
@ -7,16 +7,8 @@ ecs.init = function()
|
||||||
baseEntify.updatethread = true
|
baseEntify.updatethread = true
|
||||||
function baseEntify:onAdd(obj)
|
function baseEntify:onAdd(obj)
|
||||||
obj.commit = api.util.commit( api.world, obj, api )
|
obj.commit = api.util.commit( api.world, obj, api )
|
||||||
api.world.commit = api.util.commit( api.world, false, api)
|
|
||||||
end
|
end
|
||||||
ecs.addSystem( api.world, baseEntify )
|
ecs.addSystem( api.world, baseEntify )
|
||||||
end
|
end
|
||||||
|
|
||||||
ecs.clear = function()
|
|
||||||
api.ext.exec("onClear")
|
|
||||||
api.ecs.clearEntities( api.world )
|
|
||||||
api.ecs.update( api.world )
|
|
||||||
api.world.commit()
|
|
||||||
end
|
|
||||||
|
|
||||||
return ecs
|
return ecs
|
||||||
|
|
|
||||||
|
|
@ -6,26 +6,16 @@ return {
|
||||||
enabled = true,
|
enabled = true,
|
||||||
|
|
||||||
onURI = function(obj)
|
onURI = function(obj)
|
||||||
if( obj.URL ~= nil and (obj.URLResponse ~= nil or obj.URL.protocol == 'file') and
|
if( obj.URL ~= nil and obj.URLResponse ~= nil and
|
||||||
(obj.URL.extension == 'GLB' or
|
(obj.URL.extension == 'GLB' or
|
||||||
obj.URL.extension == 'GLTF' or
|
obj.URL.extension == 'GLTF' or
|
||||||
obj.URL.extension == 'OBJ')) then
|
obj.URL.extension == 'OBJ')) then
|
||||||
if obj.URLResponse.ok or obj.URL.protocol == 'file' then
|
if obj.URLResponse.ok then
|
||||||
obj.root = false
|
|
||||||
if obj.URI.target == '_top' then
|
|
||||||
obj.root = true
|
|
||||||
api.ext.URI.current = obj.URL -- set current url
|
|
||||||
end
|
|
||||||
obj.x = obj.x or 0
|
|
||||||
obj.y = obj.y or 0
|
|
||||||
obj.z = obj.z or 0
|
|
||||||
obj.scale = obj.scale or 1
|
|
||||||
if obj.URL.protocol == 'file' then
|
|
||||||
obj.model = api.graphics.newModel( obj.URL.string )
|
|
||||||
else
|
|
||||||
obj.model = api.graphics.newModel( api.data.newBlob( obj.URLResponse.data) )
|
obj.model = api.graphics.newModel( api.data.newBlob( obj.URLResponse.data) )
|
||||||
end
|
obj.root = (obj.URI.target == '_top')
|
||||||
api.ecs.add( api.world, obj )
|
if obj.x == nil then obj.x = 0 end
|
||||||
|
if obj.y == nil then obj.y = 0 end
|
||||||
|
if obj.z == nil then obj.z = 0 end
|
||||||
obj.commit('on3DFile') -- notify systems
|
obj.commit('on3DFile') -- notify systems
|
||||||
else
|
else
|
||||||
print("[3DFile] error: could not load " .. obj.URL.string )
|
print("[3DFile] error: could not load " .. obj.URL.string )
|
||||||
|
|
|
||||||
|
|
@ -1,34 +0,0 @@
|
||||||
local api = ...
|
|
||||||
local ecs = api.ecs
|
|
||||||
|
|
||||||
return {
|
|
||||||
name = "AudioFile",
|
|
||||||
enabled = true,
|
|
||||||
|
|
||||||
onURI = function(obj)
|
|
||||||
if( obj.URL ~= nil and (obj.URLResponse ~= nil or obj.URL.protocol == 'file') and
|
|
||||||
(obj.URL.extension == 'OGG' or
|
|
||||||
obj.URL.extension == 'WAV' or
|
|
||||||
obj.URL.extension == 'MP3')) then
|
|
||||||
if obj.URLResponse.ok or obj.URL.protocol == 'file' then
|
|
||||||
obj.x = obj.x or 0
|
|
||||||
obj.y = obj.y or 0
|
|
||||||
obj.z = obj.z or 0
|
|
||||||
local opts = {
|
|
||||||
spatial = obj.x == 0 and obj.y == 0 and obj.z == 0
|
|
||||||
}
|
|
||||||
if obj.URL.protocol == 'file' then
|
|
||||||
obj.audio = api.audio.newSource( obj.URL.file, opts)
|
|
||||||
else
|
|
||||||
obj.audio = api.audio.newSource( api.data.newBlob( obj.URLResponse.data), opts )
|
|
||||||
end
|
|
||||||
api.ecs.add( api.world, obj )
|
|
||||||
obj.commit('onAudioFile') -- notify systems
|
|
||||||
obj.audio:play()
|
|
||||||
else
|
|
||||||
print("[AudioFile] error: could not load " .. obj.URL.string )
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
@ -4,7 +4,6 @@ local ecs = api.ecs
|
||||||
return {
|
return {
|
||||||
name = "URI",
|
name = "URI",
|
||||||
enabled = true,
|
enabled = true,
|
||||||
current = {}, -- will hold the most recent (_top) URL object
|
|
||||||
|
|
||||||
init = function()
|
init = function()
|
||||||
local urlListener
|
local urlListener
|
||||||
|
|
@ -20,27 +19,23 @@ return {
|
||||||
|
|
||||||
to = function(URI,refererer, obj)
|
to = function(URI,refererer, obj)
|
||||||
obj = obj or {}
|
obj = obj or {}
|
||||||
print("[i] loading URL: " .. URI.url)
|
local msg = "[i] loading"
|
||||||
|
print("[i] loading " .. URI.url)
|
||||||
obj.URL = api.url.parse(URI.url)
|
obj.URL = api.url.parse(URI.url)
|
||||||
obj.URLResponse = {}
|
obj.URLResponse = {}
|
||||||
local protocol = "file"
|
|
||||||
foreach( api.protocol, function(name, p)
|
foreach( api.protocol, function(name, p)
|
||||||
if obj.URL.protocol:match("^"..name) then
|
if obj.URL.protocol:match("^"..name) then
|
||||||
protocol = p
|
protocol = p
|
||||||
end
|
end
|
||||||
end)
|
end)
|
||||||
if protocol then
|
if protocol then
|
||||||
if obj.URL.protocol == 'file' then
|
|
||||||
return obj.commit('onURI')
|
|
||||||
end
|
|
||||||
local status, data, headers = protocol.request(URI.url)
|
local status, data, headers = protocol.request(URI.url)
|
||||||
obj.URLResponse = {
|
obj.URLResponse = {
|
||||||
ok = (status ~= nil and status >= 200 and status < 300),
|
ok = (status >= 200 and status < 300),
|
||||||
status = status,
|
status = status,
|
||||||
data = data,
|
data = data,
|
||||||
headers = headers
|
headers = headers
|
||||||
}
|
}
|
||||||
api.ecs.add( api.world, obj )
|
|
||||||
obj.commit('onURI')
|
obj.commit('onURI')
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -4,7 +4,7 @@ local sample
|
||||||
|
|
||||||
return {
|
return {
|
||||||
name = "kitchensink",
|
name = "kitchensink",
|
||||||
enabled = false, --(lovr ~= nil),
|
enabled = (lover ~= nil),
|
||||||
|
|
||||||
init = function()
|
init = function()
|
||||||
sample = require "sample"
|
sample = require "sample"
|
||||||
|
|
|
||||||
|
|
@ -1,10 +1,13 @@
|
||||||
local api = ...
|
local api = ...
|
||||||
local envTex
|
local envTex
|
||||||
|
local skybox
|
||||||
|
local environmentMap
|
||||||
|
local sphericalHarmonics
|
||||||
local shader
|
local shader
|
||||||
|
|
||||||
return {
|
return {
|
||||||
name = "startupscene",
|
name = "startupscene",
|
||||||
enabled = (lovr ~= nil),
|
enabled = true,
|
||||||
|
|
||||||
init = function() end,
|
init = function() end,
|
||||||
|
|
||||||
|
|
@ -16,8 +19,8 @@ return {
|
||||||
|
|
||||||
load = function()
|
load = function()
|
||||||
--if api.iui.idiom == "vr" then
|
--if api.iui.idiom == "vr" then
|
||||||
envTex = api.graphics.newTexture("lovr/assets/img/env.png", {})
|
envTex = lovr.graphics.newTexture("lovr/assets/img/env.png", {})
|
||||||
api.world.skybox = api.graphics.newTexture({
|
skybox = lovr.graphics.newTexture({
|
||||||
px = 'ext/startupscene/skybox/Dayright.jpg', -- 'px.png',
|
px = 'ext/startupscene/skybox/Dayright.jpg', -- 'px.png',
|
||||||
nx = 'ext/startupscene/skybox/Dayleft.jpg', -- 'nx.png',
|
nx = 'ext/startupscene/skybox/Dayleft.jpg', -- 'nx.png',
|
||||||
py = 'ext/startupscene/skybox/Daytop.jpg', -- 'py.png',
|
py = 'ext/startupscene/skybox/Daytop.jpg', -- 'py.png',
|
||||||
|
|
@ -25,9 +28,9 @@ return {
|
||||||
pz = 'ext/startupscene/skybox/Dayfront.jpg', -- 'pz.png',
|
pz = 'ext/startupscene/skybox/Dayfront.jpg', -- 'pz.png',
|
||||||
nz = 'ext/startupscene/skybox/Dayback.jpg' -- 'nz.png'
|
nz = 'ext/startupscene/skybox/Dayback.jpg' -- 'nz.png'
|
||||||
})
|
})
|
||||||
api.world.environmentMap = lovr.graphics.newTexture('ext/startupscene/skybox/ibl.ktx')
|
environmentMap = lovr.graphics.newTexture('ext/startupscene/skybox/ibl.ktx')
|
||||||
|
|
||||||
api.world.sphericalHarmonics = lovr.graphics.newBuffer({ 'vec3', layout = 'std140' }, {
|
sphericalHarmonics = lovr.graphics.newBuffer({ 'vec3', layout = 'std140' }, {
|
||||||
{ 0.611764907836914, 0.599504590034485, 0.479980736970901 },
|
{ 0.611764907836914, 0.599504590034485, 0.479980736970901 },
|
||||||
{ 0.659514904022217, 0.665349841117859, 0.567680120468140 },
|
{ 0.659514904022217, 0.665349841117859, 0.567680120468140 },
|
||||||
{ 0.451633930206299, 0.450751245021820, 0.355226665735245 },
|
{ 0.451633930206299, 0.450751245021820, 0.355226665735245 },
|
||||||
|
|
@ -38,6 +41,36 @@ return {
|
||||||
{ -0.179465517401695, -0.181243389844894, -0.141314014792442 },
|
{ -0.179465517401695, -0.181243389844894, -0.141314014792442 },
|
||||||
{ -0.144527092576027, -0.143508568406105, -0.122757166624069 }
|
{ -0.144527092576027, -0.143508568406105, -0.122757166624069 }
|
||||||
})
|
})
|
||||||
|
shader = lovr.graphics.newShader([[
|
||||||
|
vec4 lovrmain() {
|
||||||
|
return DefaultPosition;
|
||||||
|
}
|
||||||
|
]], [[
|
||||||
|
uniform textureCube cubemap;
|
||||||
|
uniform sphericalHarmonics { vec3 sh[9]; };
|
||||||
|
|
||||||
|
vec4 lovrmain() {
|
||||||
|
Surface surface;
|
||||||
|
initSurface(surface);
|
||||||
|
|
||||||
|
vec3 color = vec3(0);
|
||||||
|
vec3 lightDirection = vec3(-1, -1, -1);
|
||||||
|
vec4 lightColorAndBrightness = vec4(1, 1, 1, 3);
|
||||||
|
float visibility = 1.;
|
||||||
|
color += getLighting(surface, lightDirection, lightColorAndBrightness, visibility);
|
||||||
|
color += getIndirectLighting(surface, cubemap, sh);
|
||||||
|
|
||||||
|
return vec4(color, 1);
|
||||||
|
}
|
||||||
|
]], {
|
||||||
|
flags = {
|
||||||
|
glow = true,
|
||||||
|
normalMap = true,
|
||||||
|
vertexTangents = false, -- DamagedHelmet doesn't have vertex tangents
|
||||||
|
tonemap = true
|
||||||
|
}
|
||||||
|
})
|
||||||
|
--end
|
||||||
end,
|
end,
|
||||||
|
|
||||||
draw = function(pass)
|
draw = function(pass)
|
||||||
|
|
@ -45,7 +78,7 @@ return {
|
||||||
-- skybox
|
-- skybox
|
||||||
pass:setCullMode('back')
|
pass:setCullMode('back')
|
||||||
pass:setBlendMode()
|
pass:setBlendMode()
|
||||||
pass:skybox(api.world.skybox)
|
pass:skybox(skybox)
|
||||||
|
|
||||||
pass:setColor(1, 1, 1)
|
pass:setColor(1, 1, 1)
|
||||||
pass:setMaterial(envTex)
|
pass:setMaterial(envTex)
|
||||||
|
|
@ -61,9 +94,9 @@ return {
|
||||||
pass:setColor( 0, 0, 0, 0.75 )
|
pass:setColor( 0, 0, 0, 0.75 )
|
||||||
pass:plane(0, 0.01, 0, 500, 500, math.pi * 0.5, 1, 0, 0, "line", 100, 100)
|
pass:plane(0, 0.01, 0, 500, 500, math.pi * 0.5, 1, 0, 0, "line", 100, 100)
|
||||||
|
|
||||||
pass:setShader( lovr.shader.pbr )
|
pass:setShader(shader)
|
||||||
pass:send('cubemap', api.world.environmentMap)
|
pass:send('cubemap', environmentMap)
|
||||||
pass:send('sphericalHarmonics', api.world.sphericalHarmonics)
|
pass:send('sphericalHarmonics', sphericalHarmonics)
|
||||||
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -1,33 +0,0 @@
|
||||||
local api = ...
|
|
||||||
|
|
||||||
return {
|
|
||||||
enabled = false,
|
|
||||||
|
|
||||||
init = function()
|
|
||||||
local tweenUpdater = api.ecs.processingSystem({
|
|
||||||
updatethread = true,
|
|
||||||
filter = api.ecs.requireAll('tween'),
|
|
||||||
nocache = true,
|
|
||||||
process = function( self, obj, dt)
|
|
||||||
print("JAAA")
|
|
||||||
foreach( obj.tween, function(k,t)
|
|
||||||
print("TWEENING!")
|
|
||||||
if t:update(dt) == true then
|
|
||||||
obj.tween[k] = nil -- delete tween
|
|
||||||
if count(obj.tween) == 0 then
|
|
||||||
obj.tween = nil
|
|
||||||
print("deleted tweens")
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end)
|
|
||||||
end
|
|
||||||
})
|
|
||||||
api.ecs.addSystem( api.world, tweenUpdater )
|
|
||||||
end
|
|
||||||
|
|
||||||
---- visualize click
|
|
||||||
--onClick
|
|
||||||
--obj.scale = 0.66
|
|
||||||
--obj.tween = obj.tween or {}
|
|
||||||
--obj.tween['scale'] = tween.new(0.5, obj, {scale = 1})
|
|
||||||
}
|
|
||||||
|
|
@ -1,367 +0,0 @@
|
||||||
local tween = {
|
|
||||||
_VERSION = 'tween 2.1.1',
|
|
||||||
_DESCRIPTION = 'tweening for lua',
|
|
||||||
_URL = 'https://github.com/kikito/tween.lua',
|
|
||||||
_LICENSE = [[
|
|
||||||
MIT LICENSE
|
|
||||||
|
|
||||||
Copyright (c) 2014 Enrique García Cota, Yuichi Tateno, Emmanuel Oga
|
|
||||||
|
|
||||||
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.
|
|
||||||
]]
|
|
||||||
}
|
|
||||||
|
|
||||||
-- easing
|
|
||||||
|
|
||||||
-- Adapted from https://github.com/EmmanuelOga/easing. See LICENSE.txt for credits.
|
|
||||||
-- For all easing functions:
|
|
||||||
-- t = time == how much time has to pass for the tweening to complete
|
|
||||||
-- b = begin == starting property value
|
|
||||||
-- c = change == ending - beginning
|
|
||||||
-- d = duration == running time. How much time has passed *right now*
|
|
||||||
|
|
||||||
local pow, sin, cos, pi, sqrt, abs, asin = math.pow, math.sin, math.cos, math.pi, math.sqrt, math.abs, math.asin
|
|
||||||
|
|
||||||
-- linear
|
|
||||||
local function linear(t, b, c, d) return c * t / d + b end
|
|
||||||
|
|
||||||
-- quad
|
|
||||||
local function inQuad(t, b, c, d) return c * pow(t / d, 2) + b end
|
|
||||||
local function outQuad(t, b, c, d)
|
|
||||||
t = t / d
|
|
||||||
return -c * t * (t - 2) + b
|
|
||||||
end
|
|
||||||
local function inOutQuad(t, b, c, d)
|
|
||||||
t = t / d * 2
|
|
||||||
if t < 1 then return c / 2 * pow(t, 2) + b end
|
|
||||||
return -c / 2 * ((t - 1) * (t - 3) - 1) + b
|
|
||||||
end
|
|
||||||
local function outInQuad(t, b, c, d)
|
|
||||||
if t < d / 2 then return outQuad(t * 2, b, c / 2, d) end
|
|
||||||
return inQuad((t * 2) - d, b + c / 2, c / 2, d)
|
|
||||||
end
|
|
||||||
|
|
||||||
-- cubic
|
|
||||||
local function inCubic (t, b, c, d) return c * pow(t / d, 3) + b end
|
|
||||||
local function outCubic(t, b, c, d) return c * (pow(t / d - 1, 3) + 1) + b end
|
|
||||||
local function inOutCubic(t, b, c, d)
|
|
||||||
t = t / d * 2
|
|
||||||
if t < 1 then return c / 2 * t * t * t + b end
|
|
||||||
t = t - 2
|
|
||||||
return c / 2 * (t * t * t + 2) + b
|
|
||||||
end
|
|
||||||
local function outInCubic(t, b, c, d)
|
|
||||||
if t < d / 2 then return outCubic(t * 2, b, c / 2, d) end
|
|
||||||
return inCubic((t * 2) - d, b + c / 2, c / 2, d)
|
|
||||||
end
|
|
||||||
|
|
||||||
-- quart
|
|
||||||
local function inQuart(t, b, c, d) return c * pow(t / d, 4) + b end
|
|
||||||
local function outQuart(t, b, c, d) return -c * (pow(t / d - 1, 4) - 1) + b end
|
|
||||||
local function inOutQuart(t, b, c, d)
|
|
||||||
t = t / d * 2
|
|
||||||
if t < 1 then return c / 2 * pow(t, 4) + b end
|
|
||||||
return -c / 2 * (pow(t - 2, 4) - 2) + b
|
|
||||||
end
|
|
||||||
local function outInQuart(t, b, c, d)
|
|
||||||
if t < d / 2 then return outQuart(t * 2, b, c / 2, d) end
|
|
||||||
return inQuart((t * 2) - d, b + c / 2, c / 2, d)
|
|
||||||
end
|
|
||||||
|
|
||||||
-- quint
|
|
||||||
local function inQuint(t, b, c, d) return c * pow(t / d, 5) + b end
|
|
||||||
local function outQuint(t, b, c, d) return c * (pow(t / d - 1, 5) + 1) + b end
|
|
||||||
local function inOutQuint(t, b, c, d)
|
|
||||||
t = t / d * 2
|
|
||||||
if t < 1 then return c / 2 * pow(t, 5) + b end
|
|
||||||
return c / 2 * (pow(t - 2, 5) + 2) + b
|
|
||||||
end
|
|
||||||
local function outInQuint(t, b, c, d)
|
|
||||||
if t < d / 2 then return outQuint(t * 2, b, c / 2, d) end
|
|
||||||
return inQuint((t * 2) - d, b + c / 2, c / 2, d)
|
|
||||||
end
|
|
||||||
|
|
||||||
-- sine
|
|
||||||
local function inSine(t, b, c, d) return -c * cos(t / d * (pi / 2)) + c + b end
|
|
||||||
local function outSine(t, b, c, d) return c * sin(t / d * (pi / 2)) + b end
|
|
||||||
local function inOutSine(t, b, c, d) return -c / 2 * (cos(pi * t / d) - 1) + b end
|
|
||||||
local function outInSine(t, b, c, d)
|
|
||||||
if t < d / 2 then return outSine(t * 2, b, c / 2, d) end
|
|
||||||
return inSine((t * 2) -d, b + c / 2, c / 2, d)
|
|
||||||
end
|
|
||||||
|
|
||||||
-- expo
|
|
||||||
local function inExpo(t, b, c, d)
|
|
||||||
if t == 0 then return b end
|
|
||||||
return c * pow(2, 10 * (t / d - 1)) + b - c * 0.001
|
|
||||||
end
|
|
||||||
local function outExpo(t, b, c, d)
|
|
||||||
if t == d then return b + c end
|
|
||||||
return c * 1.001 * (-pow(2, -10 * t / d) + 1) + b
|
|
||||||
end
|
|
||||||
local function inOutExpo(t, b, c, d)
|
|
||||||
if t == 0 then return b end
|
|
||||||
if t == d then return b + c end
|
|
||||||
t = t / d * 2
|
|
||||||
if t < 1 then return c / 2 * pow(2, 10 * (t - 1)) + b - c * 0.0005 end
|
|
||||||
return c / 2 * 1.0005 * (-pow(2, -10 * (t - 1)) + 2) + b
|
|
||||||
end
|
|
||||||
local function outInExpo(t, b, c, d)
|
|
||||||
if t < d / 2 then return outExpo(t * 2, b, c / 2, d) end
|
|
||||||
return inExpo((t * 2) - d, b + c / 2, c / 2, d)
|
|
||||||
end
|
|
||||||
|
|
||||||
-- circ
|
|
||||||
local function inCirc(t, b, c, d) return(-c * (sqrt(1 - pow(t / d, 2)) - 1) + b) end
|
|
||||||
local function outCirc(t, b, c, d) return(c * sqrt(1 - pow(t / d - 1, 2)) + b) end
|
|
||||||
local function inOutCirc(t, b, c, d)
|
|
||||||
t = t / d * 2
|
|
||||||
if t < 1 then return -c / 2 * (sqrt(1 - t * t) - 1) + b end
|
|
||||||
t = t - 2
|
|
||||||
return c / 2 * (sqrt(1 - t * t) + 1) + b
|
|
||||||
end
|
|
||||||
local function outInCirc(t, b, c, d)
|
|
||||||
if t < d / 2 then return outCirc(t * 2, b, c / 2, d) end
|
|
||||||
return inCirc((t * 2) - d, b + c / 2, c / 2, d)
|
|
||||||
end
|
|
||||||
|
|
||||||
-- elastic
|
|
||||||
local function calculatePAS(p,a,c,d)
|
|
||||||
p, a = p or d * 0.3, a or 0
|
|
||||||
if a < abs(c) then return p, c, p / 4 end -- p, a, s
|
|
||||||
return p, a, p / (2 * pi) * asin(c/a) -- p,a,s
|
|
||||||
end
|
|
||||||
local function inElastic(t, b, c, d, a, p)
|
|
||||||
local s
|
|
||||||
if t == 0 then return b end
|
|
||||||
t = t / d
|
|
||||||
if t == 1 then return b + c end
|
|
||||||
p,a,s = calculatePAS(p,a,c,d)
|
|
||||||
t = t - 1
|
|
||||||
return -(a * pow(2, 10 * t) * sin((t * d - s) * (2 * pi) / p)) + b
|
|
||||||
end
|
|
||||||
local function outElastic(t, b, c, d, a, p)
|
|
||||||
local s
|
|
||||||
if t == 0 then return b end
|
|
||||||
t = t / d
|
|
||||||
if t == 1 then return b + c end
|
|
||||||
p,a,s = calculatePAS(p,a,c,d)
|
|
||||||
return a * pow(2, -10 * t) * sin((t * d - s) * (2 * pi) / p) + c + b
|
|
||||||
end
|
|
||||||
local function inOutElastic(t, b, c, d, a, p)
|
|
||||||
local s
|
|
||||||
if t == 0 then return b end
|
|
||||||
t = t / d * 2
|
|
||||||
if t == 2 then return b + c end
|
|
||||||
p,a,s = calculatePAS(p,a,c,d)
|
|
||||||
t = t - 1
|
|
||||||
if t < 0 then return -0.5 * (a * pow(2, 10 * t) * sin((t * d - s) * (2 * pi) / p)) + b end
|
|
||||||
return a * pow(2, -10 * t) * sin((t * d - s) * (2 * pi) / p ) * 0.5 + c + b
|
|
||||||
end
|
|
||||||
local function outInElastic(t, b, c, d, a, p)
|
|
||||||
if t < d / 2 then return outElastic(t * 2, b, c / 2, d, a, p) end
|
|
||||||
return inElastic((t * 2) - d, b + c / 2, c / 2, d, a, p)
|
|
||||||
end
|
|
||||||
|
|
||||||
-- back
|
|
||||||
local function inBack(t, b, c, d, s)
|
|
||||||
s = s or 1.70158
|
|
||||||
t = t / d
|
|
||||||
return c * t * t * ((s + 1) * t - s) + b
|
|
||||||
end
|
|
||||||
local function outBack(t, b, c, d, s)
|
|
||||||
s = s or 1.70158
|
|
||||||
t = t / d - 1
|
|
||||||
return c * (t * t * ((s + 1) * t + s) + 1) + b
|
|
||||||
end
|
|
||||||
local function inOutBack(t, b, c, d, s)
|
|
||||||
s = (s or 1.70158) * 1.525
|
|
||||||
t = t / d * 2
|
|
||||||
if t < 1 then return c / 2 * (t * t * ((s + 1) * t - s)) + b end
|
|
||||||
t = t - 2
|
|
||||||
return c / 2 * (t * t * ((s + 1) * t + s) + 2) + b
|
|
||||||
end
|
|
||||||
local function outInBack(t, b, c, d, s)
|
|
||||||
if t < d / 2 then return outBack(t * 2, b, c / 2, d, s) end
|
|
||||||
return inBack((t * 2) - d, b + c / 2, c / 2, d, s)
|
|
||||||
end
|
|
||||||
|
|
||||||
-- bounce
|
|
||||||
local function outBounce(t, b, c, d)
|
|
||||||
t = t / d
|
|
||||||
if t < 1 / 2.75 then return c * (7.5625 * t * t) + b end
|
|
||||||
if t < 2 / 2.75 then
|
|
||||||
t = t - (1.5 / 2.75)
|
|
||||||
return c * (7.5625 * t * t + 0.75) + b
|
|
||||||
elseif t < 2.5 / 2.75 then
|
|
||||||
t = t - (2.25 / 2.75)
|
|
||||||
return c * (7.5625 * t * t + 0.9375) + b
|
|
||||||
end
|
|
||||||
t = t - (2.625 / 2.75)
|
|
||||||
return c * (7.5625 * t * t + 0.984375) + b
|
|
||||||
end
|
|
||||||
local function inBounce(t, b, c, d) return c - outBounce(d - t, 0, c, d) + b end
|
|
||||||
local function inOutBounce(t, b, c, d)
|
|
||||||
if t < d / 2 then return inBounce(t * 2, 0, c, d) * 0.5 + b end
|
|
||||||
return outBounce(t * 2 - d, 0, c, d) * 0.5 + c * .5 + b
|
|
||||||
end
|
|
||||||
local function outInBounce(t, b, c, d)
|
|
||||||
if t < d / 2 then return outBounce(t * 2, b, c / 2, d) end
|
|
||||||
return inBounce((t * 2) - d, b + c / 2, c / 2, d)
|
|
||||||
end
|
|
||||||
|
|
||||||
tween.easing = {
|
|
||||||
linear = linear,
|
|
||||||
inQuad = inQuad, outQuad = outQuad, inOutQuad = inOutQuad, outInQuad = outInQuad,
|
|
||||||
inCubic = inCubic, outCubic = outCubic, inOutCubic = inOutCubic, outInCubic = outInCubic,
|
|
||||||
inQuart = inQuart, outQuart = outQuart, inOutQuart = inOutQuart, outInQuart = outInQuart,
|
|
||||||
inQuint = inQuint, outQuint = outQuint, inOutQuint = inOutQuint, outInQuint = outInQuint,
|
|
||||||
inSine = inSine, outSine = outSine, inOutSine = inOutSine, outInSine = outInSine,
|
|
||||||
inExpo = inExpo, outExpo = outExpo, inOutExpo = inOutExpo, outInExpo = outInExpo,
|
|
||||||
inCirc = inCirc, outCirc = outCirc, inOutCirc = inOutCirc, outInCirc = outInCirc,
|
|
||||||
inElastic = inElastic, outElastic = outElastic, inOutElastic = inOutElastic, outInElastic = outInElastic,
|
|
||||||
inBack = inBack, outBack = outBack, inOutBack = inOutBack, outInBack = outInBack,
|
|
||||||
inBounce = inBounce, outBounce = outBounce, inOutBounce = inOutBounce, outInBounce = outInBounce
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
-- private stuff
|
|
||||||
|
|
||||||
local function copyTables(destination, keysTable, valuesTable)
|
|
||||||
valuesTable = valuesTable or keysTable
|
|
||||||
local mt = getmetatable(keysTable)
|
|
||||||
if mt and getmetatable(destination) == nil then
|
|
||||||
setmetatable(destination, mt)
|
|
||||||
end
|
|
||||||
for k,v in pairs(keysTable) do
|
|
||||||
if type(v) == 'table' then
|
|
||||||
destination[k] = copyTables({}, v, valuesTable[k])
|
|
||||||
else
|
|
||||||
destination[k] = valuesTable[k]
|
|
||||||
end
|
|
||||||
end
|
|
||||||
return destination
|
|
||||||
end
|
|
||||||
|
|
||||||
local function checkSubjectAndTargetRecursively(subject, target, path)
|
|
||||||
path = path or {}
|
|
||||||
local targetType, newPath
|
|
||||||
for k,targetValue in pairs(target) do
|
|
||||||
targetType, newPath = type(targetValue), copyTables({}, path)
|
|
||||||
table.insert(newPath, tostring(k))
|
|
||||||
if targetType == 'number' then
|
|
||||||
assert(type(subject[k]) == 'number', "Parameter '" .. table.concat(newPath,'/') .. "' is missing from subject or isn't a number")
|
|
||||||
elseif targetType == 'table' then
|
|
||||||
checkSubjectAndTargetRecursively(subject[k], targetValue, newPath)
|
|
||||||
else
|
|
||||||
assert(targetType == 'number', "Parameter '" .. table.concat(newPath,'/') .. "' must be a number or table of numbers")
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
local function checkNewParams(duration, subject, target, easing)
|
|
||||||
assert(type(duration) == 'number' and duration > 0, "duration must be a positive number. Was " .. tostring(duration))
|
|
||||||
local tsubject = type(subject)
|
|
||||||
assert(tsubject == 'table' or tsubject == 'userdata', "subject must be a table or userdata. Was " .. tostring(subject))
|
|
||||||
assert(type(target)== 'table', "target must be a table. Was " .. tostring(target))
|
|
||||||
assert(type(easing)=='function', "easing must be a function. Was " .. tostring(easing))
|
|
||||||
checkSubjectAndTargetRecursively(subject, target)
|
|
||||||
end
|
|
||||||
|
|
||||||
local function getEasingFunction(easing)
|
|
||||||
easing = easing or "linear"
|
|
||||||
if type(easing) == 'string' then
|
|
||||||
local name = easing
|
|
||||||
easing = tween.easing[name]
|
|
||||||
if type(easing) ~= 'function' then
|
|
||||||
error("The easing function name '" .. name .. "' is invalid")
|
|
||||||
end
|
|
||||||
end
|
|
||||||
return easing
|
|
||||||
end
|
|
||||||
|
|
||||||
local function performEasingOnSubject(subject, target, initial, clock, duration, easing)
|
|
||||||
local t,b,c,d
|
|
||||||
for k,v in pairs(target) do
|
|
||||||
if type(v) == 'table' then
|
|
||||||
performEasingOnSubject(subject[k], v, initial[k], clock, duration, easing)
|
|
||||||
else
|
|
||||||
t,b,c,d = clock, initial[k], v - initial[k], duration
|
|
||||||
subject[k] = easing(t,b,c,d)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
-- Tween methods
|
|
||||||
|
|
||||||
local Tween = {}
|
|
||||||
local Tween_mt = {__index = Tween}
|
|
||||||
|
|
||||||
function Tween:set(clock)
|
|
||||||
assert(type(clock) == 'number', "clock must be a positive number or 0")
|
|
||||||
|
|
||||||
self.initial = self.initial or copyTables({}, self.target, self.subject)
|
|
||||||
self.clock = clock
|
|
||||||
|
|
||||||
if self.clock <= 0 then
|
|
||||||
|
|
||||||
self.clock = 0
|
|
||||||
copyTables(self.subject, self.initial)
|
|
||||||
|
|
||||||
elseif self.clock >= self.duration then -- the tween has expired
|
|
||||||
|
|
||||||
self.clock = self.duration
|
|
||||||
copyTables(self.subject, self.target)
|
|
||||||
|
|
||||||
else
|
|
||||||
|
|
||||||
performEasingOnSubject(self.subject, self.target, self.initial, self.clock, self.duration, self.easing)
|
|
||||||
|
|
||||||
end
|
|
||||||
|
|
||||||
return self.clock >= self.duration
|
|
||||||
end
|
|
||||||
|
|
||||||
function Tween:reset()
|
|
||||||
return self:set(0)
|
|
||||||
end
|
|
||||||
|
|
||||||
function Tween:update(dt)
|
|
||||||
assert(type(dt) == 'number', "dt must be a number")
|
|
||||||
return self:set(self.clock + dt)
|
|
||||||
end
|
|
||||||
|
|
||||||
|
|
||||||
-- Public interface
|
|
||||||
|
|
||||||
function tween.new(duration, subject, target, easing)
|
|
||||||
easing = getEasingFunction(easing)
|
|
||||||
checkNewParams(duration, subject, target, easing)
|
|
||||||
return setmetatable({
|
|
||||||
duration = duration,
|
|
||||||
subject = subject,
|
|
||||||
target = target,
|
|
||||||
easing = easing,
|
|
||||||
clock = 0
|
|
||||||
}, Tween_mt)
|
|
||||||
end
|
|
||||||
|
|
||||||
return tween
|
|
||||||
|
|
@ -1,16 +0,0 @@
|
||||||
local api = ...
|
|
||||||
local xrf = require("ext/xrfragments/lovr-xrf")
|
|
||||||
local url = require("url")
|
|
||||||
|
|
||||||
return {
|
|
||||||
|
|
||||||
load = function( href, obj, refererURL, cb )
|
|
||||||
if xrf.isExternalHref( href ) and not xrf.isImport( href ) then
|
|
||||||
if type(refererURL) ~= 'table' then refererURL = url.parse(refererURL) end
|
|
||||||
local URL = url.getAbsolute( href, refererURL.string )
|
|
||||||
cb( URL.string, obj)
|
|
||||||
return true
|
|
||||||
end
|
|
||||||
return false
|
|
||||||
end
|
|
||||||
}
|
|
||||||
|
|
@ -1,15 +0,0 @@
|
||||||
local xrf = require("ext/xrfragments/lovr-xrf")
|
|
||||||
local url = require("url")
|
|
||||||
|
|
||||||
return {
|
|
||||||
|
|
||||||
import = function( href, obj, refererURL, cb ) -- imports object
|
|
||||||
if xrf.isImport( href ) then
|
|
||||||
if type(refererURL) ~= 'table' then refererURL = url.parse(refererURL) end
|
|
||||||
local URL = url.getAbsolute( href, refererURL )
|
|
||||||
cb( URL.string, obj )
|
|
||||||
return true
|
|
||||||
end
|
|
||||||
return false
|
|
||||||
end
|
|
||||||
}
|
|
||||||
|
|
@ -25,7 +25,6 @@
|
||||||
-- or implied, of
|
-- or implied, of
|
||||||
|
|
||||||
local json = require("json")
|
local json = require("json")
|
||||||
local url = require("url")
|
|
||||||
local xrf = {}
|
local xrf = {}
|
||||||
|
|
||||||
xrf.traverseNodesContaining = function(key,obj,cb)
|
xrf.traverseNodesContaining = function(key,obj,cb)
|
||||||
|
|
@ -37,17 +36,14 @@ xrf.traverseNodesContaining = function(key,obj,cb)
|
||||||
for k, tkey in pairs(keys) do
|
for k, tkey in pairs(keys) do
|
||||||
local i = 1
|
local i = 1
|
||||||
local tree = metadata[tkey]
|
local tree = metadata[tkey]
|
||||||
local foundhrefs = false
|
|
||||||
xrf.traverse( tree, function(node)
|
xrf.traverse( tree, function(node)
|
||||||
if node['extras'] ~= nil then
|
if node['extras'] ~= nil then
|
||||||
if node['extras'][key] ~= nil then
|
if node['extras'][key] ~= nil then
|
||||||
foundhrefs = true
|
|
||||||
cb(node,obj, i, metadata)
|
cb(node,obj, i, metadata)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
i = i + 1
|
i = i + 1
|
||||||
end)
|
end)
|
||||||
if foundhrefs then break end -- blender puts duplicate (undo?) data in 'meshes' sometimes?
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
@ -90,6 +86,7 @@ xrf.makeClickable = function( physicsWorld, cb)
|
||||||
local model = obj['model']
|
local model = obj['model']
|
||||||
local node = node_or_mesh
|
local node = node_or_mesh
|
||||||
if node['mesh'] == nil then node = xrf.getNodeFromMesh(node_or_mesh, metadata, i) end
|
if node['mesh'] == nil then node = xrf.getNodeFromMesh(node_or_mesh, metadata, i) end
|
||||||
|
print("making node " .. node['name'] .. " clickable")
|
||||||
local meshindex = 1 + node['mesh']
|
local meshindex = 1 + node['mesh']
|
||||||
local mesh = model:getMesh( meshindex )
|
local mesh = model:getMesh( meshindex )
|
||||||
local minx, maxx, miny, maxy, minz, maxz = mesh:getBoundingBox()
|
local minx, maxx, miny, maxy, minz, maxz = mesh:getBoundingBox()
|
||||||
|
|
@ -106,7 +103,6 @@ xrf.makeClickable = function( physicsWorld, cb)
|
||||||
scale[2] * (h + 0.01), -- in case of
|
scale[2] * (h + 0.01), -- in case of
|
||||||
scale[3] * (d + 0.01) -- planes e.g.
|
scale[3] * (d + 0.01) -- planes e.g.
|
||||||
)
|
)
|
||||||
print("making node " .. node['name'] .. " clickable: " .. node.extras.href )
|
|
||||||
collider:setUserData( {name = node['name'], node = node, onclick = cb })
|
collider:setUserData( {name = node['name'], node = node, onclick = cb })
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
@ -126,18 +122,4 @@ xrf.traverse = function(arr, cb, key)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
xrf.isImport = function(href)
|
|
||||||
local URL = href
|
|
||||||
if type(URL) ~= 'table' then URL = url.parse(href) end
|
|
||||||
return URL.string:find("#!")
|
|
||||||
end
|
|
||||||
|
|
||||||
xrf.isExternalHref = function(href)
|
|
||||||
local URL = href
|
|
||||||
if type(URL) ~= 'table' then URL = url.parse(href) end
|
|
||||||
return (URL.protocol == 'file') and
|
|
||||||
(URL.string:sub(1,1) ~= '#') and
|
|
||||||
not xrf.isImport(URL)
|
|
||||||
end
|
|
||||||
|
|
||||||
return xrf
|
return xrf
|
||||||
|
|
|
||||||
|
|
@ -1,12 +1,9 @@
|
||||||
local api = ...
|
local api = ...
|
||||||
local url = require('url')
|
|
||||||
local tween = require('tween')
|
|
||||||
local ecs = api.ecs
|
local ecs = api.ecs
|
||||||
local xrf = require("ext/xrfragments/lovr-xrf")
|
local xrf = require("ext/xrfragments/lovr-xrf")
|
||||||
xrf.level2 = api.util.addModuleHooks( require("ext/xrfragments/level2") )
|
local xrfsystem
|
||||||
xrf.level4 = api.util.addModuleHooks( require("ext/xrfragments/level4") )
|
|
||||||
|
|
||||||
xrfimpl = {
|
return {
|
||||||
enabled = true,
|
enabled = true,
|
||||||
|
|
||||||
init = function() end,
|
init = function() end,
|
||||||
|
|
@ -16,41 +13,12 @@ xrfimpl = {
|
||||||
xrf.traverseNodesContaining('href', obj,
|
xrf.traverseNodesContaining('href', obj,
|
||||||
xrf.makeClickable( api.ecs.worldPhysics,
|
xrf.makeClickable( api.ecs.worldPhysics,
|
||||||
function(obj, collider)
|
function(obj, collider)
|
||||||
local href = obj.node.extras.href
|
print("\nhref was clicked: " .. obj.node.extras.href)
|
||||||
trace("\n[xrf] href was clicked: " .. href)
|
print_r(obj)
|
||||||
|
|
||||||
local ok = xrf.level2.load( href, obj, api.ext.URI.current, xrfimpl.onLoad)
|
|
||||||
or
|
|
||||||
xrf.level4.import( href, obj, api.ext.URI.current, xrfimpl.onImport)
|
|
||||||
|
|
||||||
end
|
end
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
end
|
end
|
||||||
end,
|
|
||||||
|
|
||||||
onAudioFile = function(obj)
|
|
||||||
-- see https://xrfragment.org/#%F0%9F%93%9C%20level3%3A%20Media%20Fragments
|
|
||||||
if obj.audio ~= nil and obj.URL.fragment.t ~= nil then
|
|
||||||
trace("[xrf.level3] seeking to " .. obj.URL.fragment.t .. " seconds in audio")
|
|
||||||
obj.audio:seek( tonumber(obj.URL.fragment.t) )
|
|
||||||
obj.audio:setLooping( obj.URL.fragment.loop or false )
|
|
||||||
end
|
|
||||||
end,
|
|
||||||
|
|
||||||
onLoad = function(absoluteHref,obj)
|
|
||||||
trace("[xrf.level2] explicit (external) href hyperlink found")
|
|
||||||
api.ecs.clear()
|
|
||||||
api.ecs.add( api.world, {
|
|
||||||
URI = { url = absoluteHref, method = 'GET', target = '_top' }
|
|
||||||
})
|
|
||||||
end,
|
|
||||||
|
|
||||||
onImport = function(absoluteHref,obj)
|
|
||||||
trace("[xrf.level4] ! (import) operator found")
|
|
||||||
api.ecs.add( api.world, { URI = { url = absoluteHref, method = 'GET', target = obj } })
|
|
||||||
end
|
end
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return xrfimpl
|
|
||||||
|
|
|
||||||
|
|
@ -57,9 +57,7 @@ local function parseArgs(fragment)
|
||||||
for _, item in ipairs(items) do
|
for _, item in ipairs(items) do
|
||||||
local key_value = split(item, "=")
|
local key_value = split(item, "=")
|
||||||
if #key_value > 1 then
|
if #key_value > 1 then
|
||||||
local k = key_value[1]
|
ARG[key_value[1]] = guess_type(key_value[2])
|
||||||
ARG[k] = guess_type(key_value[2]) -- xr fragment operators preserved
|
|
||||||
ARG[k:gsub("[^%w]","") ] = guess_type(key_value[2]) -- alphanumeric only
|
|
||||||
elseif #key_value == 1 then
|
elseif #key_value == 1 then
|
||||||
ARG[key_value[1]] = ""
|
ARG[key_value[1]] = ""
|
||||||
end
|
end
|
||||||
|
|
@ -69,7 +67,6 @@ end
|
||||||
|
|
||||||
-- Main URL Parser function attached to the module object
|
-- Main URL Parser function attached to the module object
|
||||||
function url.parse(url_string)
|
function url.parse(url_string)
|
||||||
if type(url_string) == 'table' then return url_string end -- already parsed
|
|
||||||
-- Setup initial URI table structure
|
-- Setup initial URI table structure
|
||||||
local URI = {
|
local URI = {
|
||||||
domain = "",
|
domain = "",
|
||||||
|
|
@ -89,8 +86,6 @@ function url.parse(url_string)
|
||||||
if protocol then
|
if protocol then
|
||||||
URI.protocol = protocol:gsub("://", "")
|
URI.protocol = protocol:gsub("://", "")
|
||||||
remaining = remaining:sub(#protocol + 1)
|
remaining = remaining:sub(#protocol + 1)
|
||||||
else
|
|
||||||
URI.protocol = "file"
|
|
||||||
end
|
end
|
||||||
local hash = string.match(remaining, "(#.*)$") -- fragment
|
local hash = string.match(remaining, "(#.*)$") -- fragment
|
||||||
if hash then
|
if hash then
|
||||||
|
|
@ -145,17 +140,5 @@ function url.parse(url_string)
|
||||||
return URI
|
return URI
|
||||||
end
|
end
|
||||||
|
|
||||||
url.getAbsolute = function(href,referer)
|
|
||||||
local URL = url.parse(href)
|
|
||||||
local URLref = url.parse(referer)
|
|
||||||
if referer ~= nil and URL.protocol == 'file' and URLref.protocol ~= 'file' then
|
|
||||||
URL.protocol = URLref.protocol
|
|
||||||
URL.domain = URLref.domain
|
|
||||||
URL.string = URLref.protocol .. '://' .. URLref.domain .. '/' .. URL.path .. URL.hash
|
|
||||||
URL.URN = URL.string:gsub("#.*", "")
|
|
||||||
end
|
|
||||||
return URL
|
|
||||||
end
|
|
||||||
|
|
||||||
-- Return the module table so it can be assigned via require()
|
-- Return the module table so it can be assigned via require()
|
||||||
return url
|
return url
|
||||||
|
|
|
||||||
|
|
@ -656,10 +656,8 @@ function tiny_manageEntities(world)
|
||||||
elseif index then
|
elseif index then
|
||||||
system.modified = true
|
system.modified = true
|
||||||
local tmpEntity = ses[#ses]
|
local tmpEntity = ses[#ses]
|
||||||
if tmpEntity ~= nil then
|
|
||||||
ses[index] = tmpEntity
|
ses[index] = tmpEntity
|
||||||
seis[tmpEntity] = index
|
seis[tmpEntity] = index
|
||||||
end
|
|
||||||
seis[entity] = nil
|
seis[entity] = nil
|
||||||
ses[#ses] = nil
|
ses[#ses] = nil
|
||||||
local onRemove = system.onRemove
|
local onRemove = system.onRemove
|
||||||
|
|
|
||||||
|
|
@ -22,6 +22,7 @@ ecs.filterUpdate = ecs.requireAll('updatethread')
|
||||||
|
|
||||||
-- ecs systems
|
-- ecs systems
|
||||||
local interactionsUpdater
|
local interactionsUpdater
|
||||||
|
local renderer
|
||||||
|
|
||||||
--- @type Texture
|
--- @type Texture
|
||||||
local envTex
|
local envTex
|
||||||
|
|
@ -119,7 +120,7 @@ end
|
||||||
if launch.mode == "desktop" then
|
if launch.mode == "desktop" then
|
||||||
function lovr.mousemoved(x, y, dx, dy)
|
function lovr.mousemoved(x, y, dx, dy)
|
||||||
backend.mousemoved(x, y, dx, dy)
|
backend.mousemoved(x, y, dx, dy)
|
||||||
interactionsUpdater.mouse.moved = {x=x, y=y}
|
interactionsUpdater.mouse.moved = {x=x, y=y, button=button}
|
||||||
end
|
end
|
||||||
|
|
||||||
function lovr.mousepressed(x, y, button)
|
function lovr.mousepressed(x, y, button)
|
||||||
|
|
@ -145,7 +146,7 @@ if launch.mode == "desktop" then
|
||||||
|
|
||||||
function lovr.keyreleased(key, scancode)
|
function lovr.keyreleased(key, scancode)
|
||||||
backend.keyreleased(key, scancode)
|
backend.keyreleased(key, scancode)
|
||||||
interactionsUpdater.key.released = {key=key,scancode=scancode}
|
interactionsUpdater.key.released = {key=key,scancode=scancode,isRepeat=isRepeat}
|
||||||
end
|
end
|
||||||
|
|
||||||
function lovr.textinput(text)
|
function lovr.textinput(text)
|
||||||
|
|
@ -154,6 +155,27 @@ if launch.mode == "desktop" then
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
local initECS = function(ecs)
|
||||||
|
-- lovr.draw => ecs.draw (render-logic thread)
|
||||||
|
renderer = ecs.processingSystem()
|
||||||
|
renderer.filter = ecs.requireAll('model')
|
||||||
|
renderer.drawthread = true
|
||||||
|
function renderer:process(obj, pass)
|
||||||
|
if obj.model ~= nil and obj.root ~= nil then
|
||||||
|
pass:setMaterial()
|
||||||
|
pass:setCullMode('none')
|
||||||
|
pass:draw(
|
||||||
|
obj['model'],
|
||||||
|
obj['x'],
|
||||||
|
obj['y'],
|
||||||
|
obj['z'],
|
||||||
|
1, 0, 1, 0, 0, 1)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
ecs.addSystem( api.world, renderer )
|
||||||
|
|
||||||
|
end
|
||||||
|
|
||||||
function initInteractions(ecs)
|
function initInteractions(ecs)
|
||||||
|
|
||||||
ecs.worldPhysics = lovr.physics.newWorld(0, 0, 0)
|
ecs.worldPhysics = lovr.physics.newWorld(0, 0, 0)
|
||||||
|
|
@ -176,7 +198,6 @@ function initInteractions(ecs)
|
||||||
local collider, shape, x, y, z = ecs.worldPhysics:raycast(ox, oy, oz, ox + dx, oy + dy, oz + dz)
|
local collider, shape, x, y, z = ecs.worldPhysics:raycast(ox, oy, oz, ox + dx, oy + dy, oz + dz)
|
||||||
|
|
||||||
if collider then
|
if collider then
|
||||||
for i, hand in ipairs(lovr.headset.getHands()) do
|
|
||||||
if lovr.headset.isDown(hand, 'trigger') then
|
if lovr.headset.isDown(hand, 'trigger') then
|
||||||
print("buttondown")
|
print("buttondown")
|
||||||
end
|
end
|
||||||
|
|
@ -187,7 +208,6 @@ function initInteractions(ecs)
|
||||||
if node.onclick ~= nil then node.onclick(node,collider) end
|
if node.onclick ~= nil then node.onclick(node,collider) end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
|
||||||
-- reset stuff
|
-- reset stuff
|
||||||
interactionsUpdater.clear( interactionsUpdater.mouse )
|
interactionsUpdater.clear( interactionsUpdater.mouse )
|
||||||
interactionsUpdater.clear( interactionsUpdater.key )
|
interactionsUpdater.clear( interactionsUpdater.key )
|
||||||
|
|
@ -196,21 +216,5 @@ function initInteractions(ecs)
|
||||||
ecs.addSystem( api.world, interactionsUpdater )
|
ecs.addSystem( api.world, interactionsUpdater )
|
||||||
end
|
end
|
||||||
|
|
||||||
function initCleanups(ecs)
|
initECS(api.ecs)
|
||||||
local navigateListener = ecs.processingSystem({
|
|
||||||
updatethread = true,
|
|
||||||
filter = ecs.requireAll('URI', ecs.rejectAll('URLResponse') ),
|
|
||||||
onAdd = function(self,obj)
|
|
||||||
-- clear colliders if needed
|
|
||||||
if obj.URI.target ~= nil and obj.URI.target == '_top' then
|
|
||||||
ecs.worldPhysics:destroy()
|
|
||||||
ecs.worldPhysics = lovr.physics.newWorld(0, 0, 0)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
})
|
|
||||||
ecs.addSystem( api.world, navigateListener )
|
|
||||||
end
|
|
||||||
|
|
||||||
initInteractions(api.ecs)
|
initInteractions(api.ecs)
|
||||||
initCleanups(api.ecs)
|
|
||||||
require("render/model").init(api)
|
|
||||||
|
|
|
||||||
|
|
@ -1,75 +0,0 @@
|
||||||
local api = ...
|
|
||||||
local modelRenderer
|
|
||||||
|
|
||||||
modelRenderer = {
|
|
||||||
|
|
||||||
-- lovr.draw => ecs.draw (render-logic thread)
|
|
||||||
init = function(api)
|
|
||||||
local ecs = api.ecs
|
|
||||||
api.world.shader = { pbr = false }
|
|
||||||
lovr.shader = lovr.shader or {}
|
|
||||||
lovr.shader['pbr'] = modelRenderer.initShaderPBR()
|
|
||||||
|
|
||||||
renderer = ecs.processingSystem()
|
|
||||||
renderer.filter = ecs.requireAll('model')
|
|
||||||
renderer.drawthread = true -- important
|
|
||||||
function renderer:process(obj, pass)
|
|
||||||
if obj.model ~= nil and obj.root ~= nil then
|
|
||||||
pass:setMaterial()
|
|
||||||
pass:setBlendMode()
|
|
||||||
pass:setFaceCull('none') -- supposed to be defined per-mesh in GLB
|
|
||||||
pass:setCullMode('none')
|
|
||||||
pass:setShader( lovr.shader.pbr )
|
|
||||||
if api.world.environmentMap ~= nil then
|
|
||||||
pass:send('cubemap', api.world.environmentMap)
|
|
||||||
end
|
|
||||||
if api.world.sphericalHarmonics ~= nil then
|
|
||||||
pass:send('sphericalHarmonics', api.world.sphericalHarmonics)
|
|
||||||
end
|
|
||||||
pass:draw(
|
|
||||||
obj['model'],
|
|
||||||
obj.x or 0,
|
|
||||||
obj.y or 0,
|
|
||||||
obj.z or 0,
|
|
||||||
obj.scale or 1,
|
|
||||||
0, 1, 0, 0, 1)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
ecs.addSystem( api.world, renderer )
|
|
||||||
end,
|
|
||||||
|
|
||||||
initShaderPBR = function()
|
|
||||||
return lovr.graphics.newShader([[
|
|
||||||
vec4 lovrmain() {
|
|
||||||
return DefaultPosition;
|
|
||||||
}
|
|
||||||
]], [[
|
|
||||||
uniform textureCube cubemap;
|
|
||||||
uniform sphericalHarmonics { vec3 sh[9]; };
|
|
||||||
|
|
||||||
vec4 lovrmain() {
|
|
||||||
Surface surface;
|
|
||||||
initSurface(surface);
|
|
||||||
|
|
||||||
vec3 color = vec3(0);
|
|
||||||
vec3 lightDirection = vec3(-1, -1, -1);
|
|
||||||
vec4 lightColorAndBrightness = vec4(1, 1, 1, 3);
|
|
||||||
float visibility = 1.;
|
|
||||||
color += getLighting(surface, lightDirection, lightColorAndBrightness, visibility);
|
|
||||||
color += getIndirectLighting(surface, cubemap, sh);
|
|
||||||
|
|
||||||
return vec4(color, 1);
|
|
||||||
}
|
|
||||||
]], {
|
|
||||||
flags = {
|
|
||||||
glow = true,
|
|
||||||
normalMap = true,
|
|
||||||
vertexTangents = false, -- DamagedHelmet doesn't have vertex tangents
|
|
||||||
tonemap = true
|
|
||||||
}
|
|
||||||
})
|
|
||||||
end
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
return modelRenderer
|
|
||||||
|
|
@ -9,14 +9,6 @@
|
||||||
-- ./lovr xurfer https://snips.sh/f/rHFLg-cewi?r=1' -- cube
|
-- ./lovr xurfer https://snips.sh/f/rHFLg-cewi?r=1' -- cube
|
||||||
-- ./lovr xurfer https://snips.sh/f/_U5-XctEVE?r=1' -- cube, monkey, scene
|
-- ./lovr xurfer https://snips.sh/f/_U5-XctEVE?r=1' -- cube, monkey, scene
|
||||||
|
|
||||||
local runtime = nil
|
|
||||||
|
|
||||||
if lovr ~= nil then
|
|
||||||
runtime = { path = "lovr", api = lovr }
|
|
||||||
elseif love ~= nil then
|
|
||||||
runtime = { path = "love", api = love };
|
|
||||||
end
|
|
||||||
|
|
||||||
if runtime == nil then
|
if runtime == nil then
|
||||||
package.path = package.path .. ';' .. 'xurfer/?.lua'
|
package.path = package.path .. ';' .. 'xurfer/?.lua'
|
||||||
require('conf')
|
require('conf')
|
||||||
|
|
@ -40,7 +32,13 @@ api = {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
api = util.merge( api, runtime.api ) -- overlay api onto lovr/love-compatible runtime api
|
local runtime
|
||||||
|
local runtimepath
|
||||||
|
|
||||||
|
if lovr ~= nil then runtime = { path = "lovr", api = lovr } end
|
||||||
|
if love ~= nil then runtime = { path = "love", api = love } end
|
||||||
|
|
||||||
|
api = util.merge( api, runtime.api )
|
||||||
|
|
||||||
require( runtime.path .. "/main")
|
require( runtime.path .. "/main")
|
||||||
|
|
||||||
|
|
@ -51,7 +49,9 @@ api.ext.exec('init')
|
||||||
|
|
||||||
-- load urls passed on the cli
|
-- load urls passed on the cli
|
||||||
foreach( arg, function(k,uri)
|
foreach( arg, function(k,uri)
|
||||||
if uri:find(".") and k ~= 0 and k ~= -1 then
|
foreach( api.protocol, function(name, p)
|
||||||
|
if uri:match("^"..name) then
|
||||||
api.ecs.add( api.world, { URI = { url = uri, method = 'GET', target = '_top' } })
|
api.ecs.add( api.world, { URI = { url = uri, method = 'GET', target = '_top' } })
|
||||||
end
|
end
|
||||||
end)
|
end)
|
||||||
|
end)
|
||||||
|
|
|
||||||
BIN
xurfer/test.glb
BIN
xurfer/test.glb
Binary file not shown.
|
|
@ -69,10 +69,6 @@ function util.dump(value, indent, seen)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
-- error on undefined variable access
|
|
||||||
local function err(t,k,v) error("Accessed an undefined variable: " .. tostring(k)) end
|
|
||||||
setmetatable(_G, { __index = err })
|
|
||||||
|
|
||||||
function util.count(self)
|
function util.count(self)
|
||||||
local i = 0
|
local i = 0
|
||||||
if self == nil then return i end
|
if self == nil then return i end
|
||||||
|
|
@ -145,16 +141,6 @@ function when(k,v,cb)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
function trace(o)
|
|
||||||
if os.getenv('DEBUG') then
|
|
||||||
if type(o) == 'table' then
|
|
||||||
print_r(o)
|
|
||||||
else
|
|
||||||
print(o)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
|
|
||||||
function util.merge(t1,t2)
|
function util.merge(t1,t2)
|
||||||
local t3 = {}
|
local t3 = {}
|
||||||
|
|
@ -194,23 +180,4 @@ util.commit = function(world, obj, api)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
util.addHooks = function(fn, cb )
|
|
||||||
return function(...)
|
|
||||||
fn = (fn:gsub("^%l", string.upper)) -- uppercase first char
|
|
||||||
trace("api.ext.exec('before" .. fn .. "')")
|
|
||||||
api.ext.exec( "before" .. fn, ... )
|
|
||||||
local result = cb(...)
|
|
||||||
trace("api.ext.exec('after" .. fn .. "')")
|
|
||||||
api.ext.exec( "after" .. fn, ... )
|
|
||||||
return result
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
util.addModuleHooks = function(mod)
|
|
||||||
foreach( mod, function(k,v)
|
|
||||||
mod[k] = util.addHooks(k, v )
|
|
||||||
end)
|
|
||||||
return mod
|
|
||||||
end
|
|
||||||
|
|
||||||
return util
|
return util
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue