curioustorvald/Terrarum
1
0
Fork 0
mirror of https://github.com/curioustorvald/Terrarum.git synced 2026-03-07 12:21:52 +09:00
Code Issues Packages Projects Releases Wiki Activity

generalised things so that they would work outside of ingame.world; title screen wip

Browse Source
This commit is contained in:
minjaesong
2017-07-21 19:59:51 +09:00
parent 78b09b2790
commit c67c79ed85
68 changed files with 1141 additions and 328 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
COPYING.md
View File

@@ -1,4 +1,4 @@
*Terrarum* by Minjaesong (Torvald) *Terrarum*
Copyright (C) 2013-2017 Minjaesong (Torvald) Copyright (C) 2013-2017 Minjaesong (Torvald)
@@ -23,14 +23,7 @@ Released as public domain
---- ----
*Joise* modular noise library *Joise*
Copyright (C) 2013 Jason Taylor.
Released as open-source under the Apache License, Version 2.0.
============================================================================
| Joise
============================================================================
Copyright (C) 2013 Jason Taylor Copyright (C) 2013 Jason Taylor
@@ -46,12 +39,10 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
============================================================================ *Accidental Noise Library*
| Accidental Noise Library
| -------------------------------------------------------------------------- Joise is a derivative work based on Josua Tippetts' C++ library:
| Joise is a derivative work based on Josua Tippetts' C++ library: http://accidentalnoise.sourceforge.net/index.html
| http://accidentalnoise.sourceforge.net/index.html
============================================================================
Copyright (C) 2011 Joshua Tippetts Copyright (C) 2011 Joshua Tippetts
@@ -73,7 +64,7 @@ Copyright (C) 2011 Joshua Tippetts
---- ----
*Vector2* from Dyn4j *Vector2*
Copyright (c) 2010-2015 William Bittle http://www.dyn4j.org/ Copyright (c) 2010-2015 William Bittle http://www.dyn4j.org/
All rights reserved. All rights reserved.
@@ -102,7 +93,7 @@ All rights reserved.
---- ----
Amazing ambient sound recordings: Ambient sound recordings:
ambient_forest_01.ogg ambient_forest_01.ogg
ambient_meadow_01.ogg ambient_meadow_01.ogg
@@ -111,7 +102,7 @@ Amazing ambient sound recordings:
crickets_01.ogg crickets_01.ogg
crickets_02.ogg crickets_02.ogg
Copyright (C) 2012, 2013, 2015, 2016 Klankbeeld Copyright (C) 2012, 2013, 2015, 2016, 2017 Klankbeeld
Sound from http://www.freesound.org/people/klankbeeld/ Sound from http://www.freesound.org/people/klankbeeld/
---- ----

674
GPL3 Normal file
View File

@@ -0,0 +1,674 @@
GNU GENERAL PUBLIC LICENSE
Version 3, 29 June 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 General Public License is a free, copyleft license for
software and other kinds of works.
The licenses for most software and other practical works are designed
to take away your freedom to share and change the works. By contrast,
the GNU General Public License is intended to guarantee your freedom to
share and change all versions of a program--to make sure it remains free
software for all its users. We, the Free Software Foundation, use the
GNU General Public License for most of our software; it applies also to
any other work released this way by its authors. You can apply it to
your programs, too.
When we speak of free software, we are referring to freedom, not
price. Our General Public Licenses are designed to make sure that you
have the freedom to distribute copies of free software (and charge for
them if you wish), that you receive source code or can get it if you
want it, that you can change the software or use pieces of it in new
free programs, and that you know you can do these things.
To protect your rights, we need to prevent others from denying you
these rights or asking you to surrender the rights. Therefore, you have
certain responsibilities if you distribute copies of the software, or if
you modify it: responsibilities to respect the freedom of others.
For example, if you distribute copies of such a program, whether
gratis or for a fee, you must pass on to the recipients the same
freedoms that you received. You must make sure that they, too, receive
or can get the source code. And you must show them these terms so they
know their rights.
Developers that use the GNU GPL protect your rights with two steps:
(1) assert copyright on the software, and (2) offer you this License
giving you legal permission to copy, distribute and/or modify it.
For the developers' and authors' protection, the GPL clearly explains
that there is no warranty for this free software. For both users' and
authors' sake, the GPL requires that modified versions be marked as
changed, so that their problems will not be attributed erroneously to
authors of previous versions.
Some devices are designed to deny users access to install or run
modified versions of the software inside them, although the manufacturer
can do so. This is fundamentally incompatible with the aim of
protecting users' freedom to change the software. The systematic
pattern of such abuse occurs in the area of products for individuals to
use, which is precisely where it is most unacceptable. Therefore, we
have designed this version of the GPL to prohibit the practice for those
products. If such problems arise substantially in other domains, we
stand ready to extend this provision to those domains in future versions
of the GPL, as needed to protect the freedom of users.
Finally, every program is threatened constantly by software patents.
States should not allow patents to restrict development and use of
software on general-purpose computers, but in those that do, we wish to
avoid the special danger that patents applied to a free program could
make it effectively proprietary. To prevent this, the GPL assures that
patents cannot be used to render the program non-free.
The precise terms and conditions for copying, distribution and
modification follow.
TERMS AND CONDITIONS
0. Definitions.
"This License" refers to version 3 of the GNU General Public License.
"Copyright" also means copyright-like laws that apply to other kinds of
works, such as semiconductor masks.
"The Program" refers to any copyrightable work licensed under this
License. Each licensee is addressed as "you". "Licensees" and
"recipients" may be individuals or organizations.
To "modify" a work means to copy from or adapt all or part of the work
in a fashion requiring copyright permission, other than the making of an
exact copy. The resulting work is called a "modified version" of the
earlier work or a work "based on" the earlier work.
A "covered work" means either the unmodified Program or a work based
on the Program.
To "propagate" a work means to do anything with it that, without
permission, would make you directly or secondarily liable for
infringement under applicable copyright law, except executing it on a
computer or modifying a private copy. Propagation includes copying,
distribution (with or without modification), making available to the
public, and in some countries other activities as well.
To "convey" a work means any kind of propagation that enables other
parties to make or receive copies. Mere interaction with a user through
a computer network, with no transfer of a copy, is not conveying.
An interactive user interface displays "Appropriate Legal Notices"
to the extent that it includes a convenient and prominently visible
feature that (1) displays an appropriate copyright notice, and (2)
tells the user that there is no warranty for the work (except to the
extent that warranties are provided), that licensees may convey the
work under this License, and how to view a copy of this License. If
the interface presents a list of user commands or options, such as a
menu, a prominent item in the list meets this criterion.
1. Source Code.
The "source code" for a work means the preferred form of the work
for making modifications to it. "Object code" means any non-source
form of a work.
A "Standard Interface" means an interface that either is an official
standard defined by a recognized standards body, or, in the case of
interfaces specified for a particular programming language, one that
is widely used among developers working in that language.
The "System Libraries" of an executable work include anything, other
than the work as a whole, that (a) is included in the normal form of
packaging a Major Component, but which is not part of that Major
Component, and (b) serves only to enable use of the work with that
Major Component, or to implement a Standard Interface for which an
implementation is available to the public in source code form. A
"Major Component", in this context, means a major essential component
(kernel, window system, and so on) of the specific operating system
(if any) on which the executable work runs, or a compiler used to
produce the work, or an object code interpreter used to run it.
The "Corresponding Source" for a work in object code form means all
the source code needed to generate, install, and (for an executable
work) run the object code and to modify the work, including scripts to
control those activities. However, it does not include the work's
System Libraries, or general-purpose tools or generally available free
programs which are used unmodified in performing those activities but
which are not part of the work. For example, Corresponding Source
includes interface definition files associated with source files for
the work, and the source code for shared libraries and dynamically
linked subprograms that the work is specifically designed to require,
such as by intimate data communication or control flow between those
subprograms and other parts of the work.
The Corresponding Source need not include anything that users
can regenerate automatically from other parts of the Corresponding
Source.
The Corresponding Source for a work in source code form is that
same work.
2. Basic Permissions.
All rights granted under this License are granted for the term of
copyright on the Program, and are irrevocable provided the stated
conditions are met. This License explicitly affirms your unlimited
permission to run the unmodified Program. The output from running a
covered work is covered by this License only if the output, given its
content, constitutes a covered work. This License acknowledges your
rights of fair use or other equivalent, as provided by copyright law.
You may make, run and propagate covered works that you do not
convey, without conditions so long as your license otherwise remains
in force. You may convey covered works to others for the sole purpose
of having them make modifications exclusively for you, or provide you
with facilities for running those works, provided that you comply with
the terms of this License in conveying all material for which you do
not control copyright. Those thus making or running the covered works
for you must do so exclusively on your behalf, under your direction
and control, on terms that prohibit them from making any copies of
your copyrighted material outside their relationship with you.
Conveying under any other circumstances is permitted solely under
the conditions stated below. Sublicensing is not allowed; section 10
makes it unnecessary.
3. Protecting Users' Legal Rights From Anti-Circumvention Law.
No covered work shall be deemed part of an effective technological
measure under any applicable law fulfilling obligations under article
11 of the WIPO copyright treaty adopted on 20 December 1996, or
similar laws prohibiting or restricting circumvention of such
measures.
When you convey a covered work, you waive any legal power to forbid
circumvention of technological measures to the extent such circumvention
is effected by exercising rights under this License with respect to
the covered work, and you disclaim any intention to limit operation or
modification of the work as a means of enforcing, against the work's
users, your or third parties' legal rights to forbid circumvention of
technological measures.
4. Conveying Verbatim Copies.
You may convey verbatim copies of the Program's source code as you
receive it, in any medium, provided that you conspicuously and
appropriately publish on each copy an appropriate copyright notice;
keep intact all notices stating that this License and any
non-permissive terms added in accord with section 7 apply to the code;
keep intact all notices of the absence of any warranty; and give all
recipients a copy of this License along with the Program.
You may charge any price or no price for each copy that you convey,
and you may offer support or warranty protection for a fee.
5. Conveying Modified Source Versions.
You may convey a work based on the Program, or the modifications to
produce it from the Program, in the form of source code under the
terms of section 4, provided that you also meet all of these conditions:
a) The work must carry prominent notices stating that you modified
it, and giving a relevant date.
b) The work must carry prominent notices stating that it is
released under this License and any conditions added under section
7. This requirement modifies the requirement in section 4 to
"keep intact all notices".
c) You must license the entire work, as a whole, under this
License to anyone who comes into possession of a copy. This
License will therefore apply, along with any applicable section 7
additional terms, to the whole of the work, and all its parts,
regardless of how they are packaged. This License gives no
permission to license the work in any other way, but it does not
invalidate such permission if you have separately received it.
d) If the work has interactive user interfaces, each must display
Appropriate Legal Notices; however, if the Program has interactive
interfaces that do not display Appropriate Legal Notices, your
work need not make them do so.
A compilation of a covered work with other separate and independent
works, which are not by their nature extensions of the covered work,
and which are not combined with it such as to form a larger program,
in or on a volume of a storage or distribution medium, is called an
"aggregate" if the compilation and its resulting copyright are not
used to limit the access or legal rights of the compilation's users
beyond what the individual works permit. Inclusion of a covered work
in an aggregate does not cause this License to apply to the other
parts of the aggregate.
6. Conveying Non-Source Forms.
You may convey a covered work in object code form under the terms
of sections 4 and 5, provided that you also convey the
machine-readable Corresponding Source under the terms of this License,
in one of these ways:
a) Convey the object code in, or embodied in, a physical product
(including a physical distribution medium), accompanied by the
Corresponding Source fixed on a durable physical medium
customarily used for software interchange.
b) Convey the object code in, or embodied in, a physical product
(including a physical distribution medium), accompanied by a
written offer, valid for at least three years and valid for as
long as you offer spare parts or customer support for that product
model, to give anyone who possesses the object code either (1) a
copy of the Corresponding Source for all the software in the
product that is covered by this License, on a durable physical
medium customarily used for software interchange, for a price no
more than your reasonable cost of physically performing this
conveying of source, or (2) access to copy the
Corresponding Source from a network server at no charge.
c) Convey individual copies of the object code with a copy of the
written offer to provide the Corresponding Source. This
alternative is allowed only occasionally and noncommercially, and
only if you received the object code with such an offer, in accord
with subsection 6b.
d) Convey the object code by offering access from a designated
place (gratis or for a charge), and offer equivalent access to the
Corresponding Source in the same way through the same place at no
further charge. You need not require recipients to copy the
Corresponding Source along with the object code. If the place to
copy the object code is a network server, the Corresponding Source
may be on a different server (operated by you or a third party)
that supports equivalent copying facilities, provided you maintain
clear directions next to the object code saying where to find the
Corresponding Source. Regardless of what server hosts the
Corresponding Source, you remain obligated to ensure that it is
available for as long as needed to satisfy these requirements.
e) Convey the object code using peer-to-peer transmission, provided
you inform other peers where the object code and Corresponding
Source of the work are being offered to the general public at no
charge under subsection 6d.
A separable portion of the object code, whose source code is excluded
from the Corresponding Source as a System Library, need not be
included in conveying the object code work.
A "User Product" is either (1) a "consumer product", which means any
tangible personal property which is normally used for personal, family,
or household purposes, or (2) anything designed or sold for incorporation
into a dwelling. In determining whether a product is a consumer product,
doubtful cases shall be resolved in favor of coverage. For a particular
product received by a particular user, "normally used" refers to a
typical or common use of that class of product, regardless of the status
of the particular user or of the way in which the particular user
actually uses, or expects or is expected to use, the product. A product
is a consumer product regardless of whether the product has substantial
commercial, industrial or non-consumer uses, unless such uses represent
the only significant mode of use of the product.
"Installation Information" for a User Product means any methods,
procedures, authorization keys, or other information required to install
and execute modified versions of a covered work in that User Product from
a modified version of its Corresponding Source. The information must
suffice to ensure that the continued functioning of the modified object
code is in no case prevented or interfered with solely because
modification has been made.
If you convey an object code work under this section in, or with, or
specifically for use in, a User Product, and the conveying occurs as
part of a transaction in which the right of possession and use of the
User Product is transferred to the recipient in perpetuity or for a
fixed term (regardless of how the transaction is characterized), the
Corresponding Source conveyed under this section must be accompanied
by the Installation Information. But this requirement does not apply
if neither you nor any third party retains the ability to install
modified object code on the User Product (for example, the work has
been installed in ROM).
The requirement to provide Installation Information does not include a
requirement to continue to provide support service, warranty, or updates
for a work that has been modified or installed by the recipient, or for
the User Product in which it has been modified or installed. Access to a
network may be denied when the modification itself materially and
adversely affects the operation of the network or violates the rules and
protocols for communication across the network.
Corresponding Source conveyed, and Installation Information provided,
in accord with this section must be in a format that is publicly
documented (and with an implementation available to the public in
source code form), and must require no special password or key for
unpacking, reading or copying.
7. Additional Terms.
"Additional permissions" are terms that supplement the terms of this
License by making exceptions from one or more of its conditions.
Additional permissions that are applicable to the entire Program shall
be treated as though they were included in this License, to the extent
that they are valid under applicable law. If additional permissions
apply only to part of the Program, that part may be used separately
under those permissions, but the entire Program remains governed by
this License without regard to the additional permissions.
When you convey a copy of a covered work, you may at your option
remove any additional permissions from that copy, or from any part of
it. (Additional permissions may be written to require their own
removal in certain cases when you modify the work.) You may place
additional permissions on material, added by you to a covered work,
for which you have or can give appropriate copyright permission.
Notwithstanding any other provision of this License, for material you
add to a covered work, you may (if authorized by the copyright holders of
that material) supplement the terms of this License with terms:
a) Disclaiming warranty or limiting liability differently from the
terms of sections 15 and 16 of this License; or
b) Requiring preservation of specified reasonable legal notices or
author attributions in that material or in the Appropriate Legal
Notices displayed by works containing it; or
c) Prohibiting misrepresentation of the origin of that material, or
requiring that modified versions of such material be marked in
reasonable ways as different from the original version; or
d) Limiting the use for publicity purposes of names of licensors or
authors of the material; or
e) Declining to grant rights under trademark law for use of some
trade names, trademarks, or service marks; or
f) Requiring indemnification of licensors and authors of that
material by anyone who conveys the material (or modified versions of
it) with contractual assumptions of liability to the recipient, for
any liability that these contractual assumptions directly impose on
those licensors and authors.
All other non-permissive additional terms are considered "further
restrictions" within the meaning of section 10. If the Program as you
received it, or any part of it, contains a notice stating that it is
governed by this License along with a term that is a further
restriction, you may remove that term. If a license document contains
a further restriction but permits relicensing or conveying under this
License, you may add to a covered work material governed by the terms
of that license document, provided that the further restriction does
not survive such relicensing or conveying.
If you add terms to a covered work in accord with this section, you
must place, in the relevant source files, a statement of the
additional terms that apply to those files, or a notice indicating
where to find the applicable terms.
Additional terms, permissive or non-permissive, may be stated in the
form of a separately written license, or stated as exceptions;
the above requirements apply either way.
8. Termination.
You may not propagate or modify a covered work except as expressly
provided under this License. Any attempt otherwise to propagate or
modify it is void, and will automatically terminate your rights under
this License (including any patent licenses granted under the third
paragraph of section 11).
However, if you cease all violation of this License, then your
license from a particular copyright holder is reinstated (a)
provisionally, unless and until the copyright holder explicitly and
finally terminates your license, and (b) permanently, if the copyright
holder fails to notify you of the violation by some reasonable means
prior to 60 days after the cessation.
Moreover, your license from a particular copyright holder is
reinstated permanently if the copyright holder notifies you of the
violation by some reasonable means, this is the first time you have
received notice of violation of this License (for any work) from that
copyright holder, and you cure the violation prior to 30 days after
your receipt of the notice.
Termination of your rights under this section does not terminate the
licenses of parties who have received copies or rights from you under
this License. If your rights have been terminated and not permanently
reinstated, you do not qualify to receive new licenses for the same
material under section 10.
9. Acceptance Not Required for Having Copies.
You are not required to accept this License in order to receive or
run a copy of the Program. Ancillary propagation of a covered work
occurring solely as a consequence of using peer-to-peer transmission
to receive a copy likewise does not require acceptance. However,
nothing other than this License grants you permission to propagate or
modify any covered work. These actions infringe copyright if you do
not accept this License. Therefore, by modifying or propagating a
covered work, you indicate your acceptance of this License to do so.
10. Automatic Licensing of Downstream Recipients.
Each time you convey a covered work, the recipient automatically
receives a license from the original licensors, to run, modify and
propagate that work, subject to this License. You are not responsible
for enforcing compliance by third parties with this License.
An "entity transaction" is a transaction transferring control of an
organization, or substantially all assets of one, or subdividing an
organization, or merging organizations. If propagation of a covered
work results from an entity transaction, each party to that
transaction who receives a copy of the work also receives whatever
licenses to the work the party's predecessor in interest had or could
give under the previous paragraph, plus a right to possession of the
Corresponding Source of the work from the predecessor in interest, if
the predecessor has it or can get it with reasonable efforts.
You may not impose any further restrictions on the exercise of the
rights granted or affirmed under this License. For example, you may
not impose a license fee, royalty, or other charge for exercise of
rights granted under this License, and you may not initiate litigation
(including a cross-claim or counterclaim in a lawsuit) alleging that
any patent claim is infringed by making, using, selling, offering for
sale, or importing the Program or any portion of it.
11. Patents.
A "contributor" is a copyright holder who authorizes use under this
License of the Program or a work on which the Program is based. The
work thus licensed is called the contributor's "contributor version".
A contributor's "essential patent claims" are all patent claims
owned or controlled by the contributor, whether already acquired or
hereafter acquired, that would be infringed by some manner, permitted
by this License, of making, using, or selling its contributor version,
but do not include claims that would be infringed only as a
consequence of further modification of the contributor version. For
purposes of this definition, "control" includes the right to grant
patent sublicenses in a manner consistent with the requirements of
this License.
Each contributor grants you a non-exclusive, worldwide, royalty-free
patent license under the contributor's essential patent claims, to
make, use, sell, offer for sale, import and otherwise run, modify and
propagate the contents of its contributor version.
In the following three paragraphs, a "patent license" is any express
agreement or commitment, however denominated, not to enforce a patent
(such as an express permission to practice a patent or covenant not to
sue for patent infringement). To "grant" such a patent license to a
party means to make such an agreement or commitment not to enforce a
patent against the party.
If you convey a covered work, knowingly relying on a patent license,
and the Corresponding Source of the work is not available for anyone
to copy, free of charge and under the terms of this License, through a
publicly available network server or other readily accessible means,
then you must either (1) cause the Corresponding Source to be so
available, or (2) arrange to deprive yourself of the benefit of the
patent license for this particular work, or (3) arrange, in a manner
consistent with the requirements of this License, to extend the patent
license to downstream recipients. "Knowingly relying" means you have
actual knowledge that, but for the patent license, your conveying the
covered work in a country, or your recipient's use of the covered work
in a country, would infringe one or more identifiable patents in that
country that you have reason to believe are valid.
If, pursuant to or in connection with a single transaction or
arrangement, you convey, or propagate by procuring conveyance of, a
covered work, and grant a patent license to some of the parties
receiving the covered work authorizing them to use, propagate, modify
or convey a specific copy of the covered work, then the patent license
you grant is automatically extended to all recipients of the covered
work and works based on it.
A patent license is "discriminatory" if it does not include within
the scope of its coverage, prohibits the exercise of, or is
conditioned on the non-exercise of one or more of the rights that are
specifically granted under this License. You may not convey a covered
work if you are a party to an arrangement with a third party that is
in the business of distributing software, under which you make payment
to the third party based on the extent of your activity of conveying
the work, and under which the third party grants, to any of the
parties who would receive the covered work from you, a discriminatory
patent license (a) in connection with copies of the covered work
conveyed by you (or copies made from those copies), or (b) primarily
for and in connection with specific products or compilations that
contain the covered work, unless you entered into that arrangement,
or that patent license was granted, prior to 28 March 2007.
Nothing in this License shall be construed as excluding or limiting
any implied license or other defenses to infringement that may
otherwise be available to you under applicable patent law.
12. No Surrender of Others' Freedom.
If conditions are imposed on you (whether by court order, agreement or
otherwise) that contradict the conditions of this License, they do not
excuse you from the conditions of this License. If you cannot convey a
covered work so as to satisfy simultaneously your obligations under this
License and any other pertinent obligations, then as a consequence you may
not convey it at all. For example, if you agree to terms that obligate you
to collect a royalty for further conveying from those to whom you convey
the Program, the only way you could satisfy both those terms and this
License would be to refrain entirely from conveying the Program.
13. Use with the GNU Affero General Public License.
Notwithstanding any other provision of this License, you have
permission to link or combine any covered work with a work licensed
under version 3 of the GNU Affero General Public License into a single
combined work, and to convey the resulting work. The terms of this
License will continue to apply to the part which is the covered work,
but the special requirements of the GNU Affero General Public License,
section 13, concerning interaction through a network will apply to the
combination as such.
14. Revised Versions of this License.
The Free Software Foundation may publish revised and/or new versions of
the GNU General Public License from time to time. Such new versions will
be similar in spirit to the present version, but may differ in detail to
address new problems or concerns.
Each version is given a distinguishing version number. If the
Program specifies that a certain numbered version of the GNU General
Public License "or any later version" applies to it, you have the
option of following the terms and conditions either of that numbered
version or of any later version published by the Free Software
Foundation. If the Program does not specify a version number of the
GNU General Public License, you may choose any version ever published
by the Free Software Foundation.
If the Program specifies that a proxy can decide which future
versions of the GNU General Public License can be used, that proxy's
public statement of acceptance of a version permanently authorizes you
to choose that version for the Program.
Later license versions may give you additional or different
permissions. However, no additional obligations are imposed on any
author or copyright holder as a result of your choosing to follow a
later version.
15. Disclaimer of Warranty.
THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
16. Limitation of Liability.
IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
SUCH DAMAGES.
17. Interpretation of Sections 15 and 16.
If the disclaimer of warranty and limitation of liability provided
above cannot be given local legal effect according to their terms,
reviewing courts shall apply local law that most closely approximates
an absolute waiver of all civil liability in connection with the
Program, unless a warranty or assumption of liability accompanies a
copy of the Program in return for a fee.
END OF TERMS AND CONDITIONS
How to Apply These Terms to Your New Programs
If you develop a new program, and you want it to be of the greatest
possible use to the public, the best way to achieve this is to make it
free software which everyone can redistribute and change under these terms.
To do so, attach the following notices to the program. It is safest
to attach them to the start of each source file to most effectively
state the exclusion of warranty; and each file should have at least
the "copyright" line and a pointer to where the full notice is found.
<one line to give the program's name and a brief idea of what it does.>
Copyright (C) <year> <name of author>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
Also add information on how to contact you by electronic and paper mail.
If the program does terminal interaction, make it output a short
notice like this when it starts in an interactive mode:
<program> Copyright (C) <year> <name of author>
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details.
The hypothetical commands `show w' and `show c' should show the appropriate
parts of the General Public License. Of course, your program's commands
might be different; for a GUI interface, you would use an "about box".
You should also get your employer (if you work as a programmer) or school,
if any, to sign a "copyright disclaimer" for the program, if necessary.
For more information on this, and how to apply and follow the GNU GPL, see
<http://www.gnu.org/licenses/>.
The GNU General Public License does not permit incorporating your program
into proprietary programs. If your program is a subroutine library, you
may consider it more useful to permit linking proprietary applications with
the library. If this is what you want to do, use the GNU Lesser General
Public License instead of this License. But first, please read
<http://www.gnu.org/philosophy/why-not-lgpl.html>.

120
src/net/torvald/terrarum/CreditSingleton.kt Normal file
View File

@@ -0,0 +1,120 @@
package net.torvald.terrarum
object CreditSingleton {
val contents = """Terrarum
Copyright (C) 2013-2017 Minjaesong (Torvald)
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*Simplex Noise Generator*, version 2012-03-09 by Stefan Gustavson
Released as public domain
Joise
opyright (C) 2013 Jason Taylor
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
Accidental Noise Library
Joise is a derivative work based on Josua Tippetts' C++ library:
http://accidentalnoise.sourceforge.net/index.html
Copyright (C) 2011 Joshua Tippetts
This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
arising from the use of this software.
Permission is granted to anyone to use this software for any purpose,
including commercial applications, and to alter it and redistribute it
freely, subject to the following restrictions:
1. The origin of this software must not be misrepresented; you must not
claim that you wrote the original software. If you use this software
in a product, an acknowledgment in the product documentation would be
appreciated but is not required.
2. Altered source versions must be plainly marked as such, and must not be
misrepresented as being the original software.
3. This notice may not be removed or altered from any source distribution.
Vector2
Copyright (c) 2010-2015 William Bittle http://www.dyn4j.org/
All rights reserved.
Redistribution and use in source and binary forms, with or without modification, are permitted
provided that the following conditions are met:
* Redistributions of source code must retain the above copyright notice, this list of conditions
and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright notice, this list of conditions
and the following disclaimer in the documentation and/or other materials provided with the
distribution.
* Neither the name of dyn4j nor the names of its contributors may be used to endorse or
promote products derived from this software without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
Kotlin translated and modified code Copyright (C) 2016 Minjaesong (Torvald)
Ambient sound recordings:
ambient_forest_01.ogg
ambient_meadow_01.ogg
ambient_windy_01.ogg
ambient_woods_01.ogg
crickets_01.ogg
crickets_02.ogg
Copyright (C) 2012, 2013, 2015, 2016, 2017 Klankbeeld
Sound from http://www.freesound.org/people/klankbeeld/
""" }

28
src/net/torvald/terrarum/Ingame.kt
View File

@@ -269,7 +269,7 @@ class Ingame(val batch: SpriteBatch) : Screen {
// add new player and put it to actorContainer // add new player and put it to actorContainer
//playableActorDelegate = PlayableActorDelegate(PlayerBuilderSigrid()) //playableActorDelegate = PlayableActorDelegate(PlayerBuilderSigrid())
//playableActorDelegate = PlayableActorDelegate(PlayerBuilderTestSubject1()) //playableActorDelegate = PlayableActorDelegate(PlayerBuilderTestSubject1())
//addNewActor(player!!) //addNewActor(player)
// test actor // test actor
@@ -399,7 +399,7 @@ class Ingame(val batch: SpriteBatch) : Screen {
private class ThreadIngameUpdate(val ingame: Ingame): Runnable { private class ThreadIngameUpdate(val ingame: Ingame): Runnable {
override fun run() { override fun run() {
while (ingame.updateDeltaCounter >= ingame.updateRate) { while (ingame.updateDeltaCounter >= ingame.updateRate) {
ingame.updateGame(Gdx.graphics.deltaTime) ingame.updateGame(Terrarum.deltaTime)
ingame.updateDeltaCounter -= ingame.updateRate ingame.updateDeltaCounter -= ingame.updateRate
} }
} }
@@ -541,12 +541,10 @@ class Ingame(val batch: SpriteBatch) : Screen {
// Post-update; ones that needs everything is completed //
// update lightmap on every other frames, OR full-frame if the option is true // update lightmap on every other frames, OR full-frame if the option is true
if (Terrarum.getConfigBoolean("fullframelightupdate") or (Terrarum.GLOBAL_RENDER_TIMER % 2 == 1)) { // if (Terrarum.getConfigBoolean("fullframelightupdate") or (Terrarum.GLOBAL_RENDER_TIMER % 2 == 1)) {
LightmapRenderer.fireRecalculateEvent() // LightmapRenderer.fireRecalculateEvent()
} // }
// end of post-update /
@@ -590,7 +588,7 @@ class Ingame(val batch: SpriteBatch) : Screen {
///////////////// /////////////////
actorsRenderMiddle.forEach { it.drawBody(batch) } actorsRenderMiddle.forEach { it.drawBody(batch) }
actorsRenderMidTop.forEach { it.drawBody(batch) } actorsRenderMidTop.forEach { it.drawBody(batch) }
player?.drawBody(batch) player.drawBody(batch)
actorsRenderFront.forEach { it.drawBody(batch) } actorsRenderFront.forEach { it.drawBody(batch) }
// --> Change of blend mode <-- introduced by childs of ActorWithBody // // --> Change of blend mode <-- introduced by childs of ActorWithBody //
@@ -668,7 +666,7 @@ class Ingame(val batch: SpriteBatch) : Screen {
particlesContainer.forEach { it.drawGlow(batch) } particlesContainer.forEach { it.drawGlow(batch) }
actorsRenderMiddle.forEach { it.drawGlow(batch) } actorsRenderMiddle.forEach { it.drawGlow(batch) }
actorsRenderMidTop.forEach { it.drawGlow(batch) } actorsRenderMidTop.forEach { it.drawGlow(batch) }
player?.drawGlow(batch) player.drawGlow(batch)
actorsRenderFront.forEach { it.drawGlow(batch) } actorsRenderFront.forEach { it.drawGlow(batch) }
// --> blendNormal() <-- introduced by childs of ActorWithBody // // --> blendNormal() <-- introduced by childs of ActorWithBody //
@@ -891,7 +889,7 @@ class Ingame(val batch: SpriteBatch) : Screen {
///////////////// /////////////////
actorsRenderMiddle.forEach { it.drawBody(batch) } actorsRenderMiddle.forEach { it.drawBody(batch) }
actorsRenderMidTop.forEach { it.drawBody(batch) } actorsRenderMidTop.forEach { it.drawBody(batch) }
player?.drawBody(batch) player.drawBody(batch)
actorsRenderFront.forEach { it.drawBody(batch) } actorsRenderFront.forEach { it.drawBody(batch) }
// --> Change of blend mode <-- introduced by childs of ActorWithBody // // --> Change of blend mode <-- introduced by childs of ActorWithBody //
@@ -918,7 +916,7 @@ class Ingame(val batch: SpriteBatch) : Screen {
////////////////////// //////////////////////
actorsRenderMiddle.forEach { it.drawGlow(batch) } actorsRenderMiddle.forEach { it.drawGlow(batch) }
actorsRenderMidTop.forEach { it.drawGlow(batch) } actorsRenderMidTop.forEach { it.drawGlow(batch) }
player?.drawGlow(batch) player.drawGlow(batch)
actorsRenderFront.forEach { it.drawGlow(batch) } actorsRenderFront.forEach { it.drawGlow(batch) }
// --> blendLightenOnly() <-- introduced by childs of ActorWithBody // // --> blendLightenOnly() <-- introduced by childs of ActorWithBody //
@@ -1133,7 +1131,7 @@ class Ingame(val batch: SpriteBatch) : Screen {
} }
playableActorDelegate = newActor playableActorDelegate = newActor
WorldSimulator(player, Gdx.graphics.deltaTime) WorldSimulator(player, Terrarum.deltaTime)
} }
private fun changePossession(refid: Int) { private fun changePossession(refid: Int) {
@@ -1150,7 +1148,7 @@ class Ingame(val batch: SpriteBatch) : Screen {
// accept new delegate // accept new delegate
playableActorDelegate = PlayableActorDelegate(getActorByID(refid) as ActorHumanoid) playableActorDelegate = PlayableActorDelegate(getActorByID(refid) as ActorHumanoid)
playableActorDelegate!!.actor.collisionType = ActorWithPhysics.COLLISION_KINEMATIC playableActorDelegate!!.actor.collisionType = ActorWithPhysics.COLLISION_KINEMATIC
WorldSimulator(player, Gdx.graphics.deltaTime) WorldSimulator(player, Terrarum.deltaTime)
} }
/** Send message to notifier UI and toggle the UI as opened. */ /** Send message to notifier UI and toggle the UI as opened. */
@@ -1242,7 +1240,7 @@ class Ingame(val batch: SpriteBatch) : Screen {
} }
} }
playableActorDelegate?.update(delta) playableActorDelegate?.update(delta)
//AmmoMeterProxy(player!!, uiVitalItem.UI as UIVitalMetre) //AmmoMeterProxy(player, uiVitalItem.UI as UIVitalMetre)
} }
} }
@@ -1314,7 +1312,7 @@ class Ingame(val batch: SpriteBatch) : Screen {
* This is how remove function of [java.util.ArrayList] is defined. * This is how remove function of [java.util.ArrayList] is defined.
*/ */
fun removeActor(actor: Actor) { fun removeActor(actor: Actor) {
if (actor.referenceID == player?.referenceID || actor.referenceID == 0x51621D) // do not delete this magic if (actor.referenceID == player.referenceID || actor.referenceID == 0x51621D) // do not delete this magic
throw RuntimeException("Attempted to remove player.") throw RuntimeException("Attempted to remove player.")
val indexToDelete = actorContainer.binarySearch(actor.referenceID) val indexToDelete = actorContainer.binarySearch(actor.referenceID)
if (indexToDelete >= 0) { if (indexToDelete >= 0) {

23
src/net/torvald/terrarum/Terrarum.kt
View File

@@ -13,6 +13,7 @@ import com.badlogic.gdx.graphics.glutils.ShaderProgram
import com.badlogic.gdx.graphics.glutils.ShapeRenderer import com.badlogic.gdx.graphics.glutils.ShapeRenderer
import com.google.gson.JsonArray import com.google.gson.JsonArray
import com.google.gson.JsonPrimitive import com.google.gson.JsonPrimitive
import net.torvald.random.HQRNG
import net.torvald.terrarum.Terrarum.RENDER_FPS import net.torvald.terrarum.Terrarum.RENDER_FPS
import net.torvald.terrarum.gameactors.floorInt import net.torvald.terrarum.gameactors.floorInt
import net.torvald.terrarum.gamecontroller.IngameController import net.torvald.terrarum.gamecontroller.IngameController
@@ -92,6 +93,9 @@ object Terrarum : Game() {
val HEIGHT: Int val HEIGHT: Int
get() = if (screenH!! % 2 == 0) screenH!! else screenH!! + 1 get() = if (screenH!! % 2 == 0) screenH!! else screenH!! + 1
val WIDTH_MIN = 800
val HEIGHT_MIN = 600
inline val HALFW: Int inline val HALFW: Int
get() = WIDTH.ushr(1) get() = WIDTH.ushr(1)
inline val HALFH: Int inline val HALFH: Int
@@ -265,6 +269,8 @@ object Terrarum : Game() {
lateinit var fullscreenQuad: Mesh; private set lateinit var fullscreenQuad: Mesh; private set
val deltaTime: Float; get() = Gdx.graphics.rawDeltaTime
init { init {
println("$NAME version $VERSION_STRING") println("$NAME version $VERSION_STRING")
@@ -423,7 +429,7 @@ object Terrarum : Game() {
} }
override fun render() { override fun render() {
super.screen.render(Gdx.graphics.deltaTime) super.screen.render(deltaTime)
GLOBAL_RENDER_TIMER += 1 GLOBAL_RENDER_TIMER += 1
} }
@@ -452,6 +458,12 @@ object Terrarum : Game() {
} }
override fun resize(width: Int, height: Int) { override fun resize(width: Int, height: Int) {
var width = maxOf(width, WIDTH_MIN)
var height = maxOf(height, HEIGHT_MIN)
if (width % 2 == 1) width += 1
if (height % 2 == 1) height += 1
screenW = width screenW = width
screenH = height screenH = height
@@ -466,7 +478,10 @@ object Terrarum : Game() {
fullscreenQuad.setIndices(shortArrayOf(0, 1, 2, 2, 3, 0)) fullscreenQuad.setIndices(shortArrayOf(0, 1, 2, 2, 3, 0))
super.screen.resize(WIDTH, HEIGHT) super.resize(width, height)
//Gdx.graphics.setWindowedMode(width, height)
println("newsize: ${Gdx.graphics.width}x${Gdx.graphics.height}")
} }
@@ -658,10 +673,6 @@ object Terrarum : Game() {
get() = Gdx.input.x get() = Gdx.input.x
inline val mouseScreenY: Int inline val mouseScreenY: Int
get() = Gdx.input.y get() = Gdx.input.y
} }
inline fun SpriteBatch.inUse(action: (SpriteBatch) -> Unit) { inline fun SpriteBatch.inUse(action: (SpriteBatch) -> Unit) {

53
src/net/torvald/terrarum/TitleScreen.kt
View File

@@ -8,8 +8,8 @@ import com.badlogic.gdx.graphics.*
import com.badlogic.gdx.graphics.g2d.SpriteBatch import com.badlogic.gdx.graphics.g2d.SpriteBatch
import com.badlogic.gdx.graphics.g2d.TextureRegion import com.badlogic.gdx.graphics.g2d.TextureRegion
import com.badlogic.gdx.graphics.glutils.FrameBuffer import com.badlogic.gdx.graphics.glutils.FrameBuffer
import net.torvald.terrarum.gameactors.ActorWithBody import net.torvald.terrarum.gameactors.*
import net.torvald.terrarum.gameactors.Hitbox import net.torvald.terrarum.gameactors.ai.ActorAI
import net.torvald.terrarum.gamecontroller.KeyToggler import net.torvald.terrarum.gamecontroller.KeyToggler
import net.torvald.terrarum.gameworld.GameWorld import net.torvald.terrarum.gameworld.GameWorld
import net.torvald.terrarum.langpack.Lang import net.torvald.terrarum.langpack.Lang
@@ -47,17 +47,14 @@ class TitleScreen(val batch: SpriteBatch) : Screen {
private var loadDone = false private var loadDone = false
private lateinit var demoWorld: GameWorld private lateinit var demoWorld: GameWorld
private val cameraPlayer = object : ActorWithBody(RenderOrder.BEHIND) { private val cameraAI = object : ActorAI {
override fun drawBody(batch: SpriteBatch) { } override fun update(actor: HumanoidNPC, delta: Float) {
override fun drawGlow(batch: SpriteBatch) { } // pan camera
override fun dispose() { } //actor.moveRight() // why no work?
override fun onActorValueChange(key: String, value: Any?) { } actor.controllerMoveDelta!!.x = 0.5
override fun run() { }
override fun update(delta: Float) {
// camera walk?
} }
} }
private lateinit var cameraPlayer: HumanoidNPC
private val gradWhiteTop = Color(0xf8f8f8ff.toInt()) private val gradWhiteTop = Color(0xf8f8f8ff.toInt())
private val gradWhiteBottom = Color(0xd8d8d8ff.toInt()) private val gradWhiteBottom = Color(0xd8d8d8ff.toInt())
@@ -74,11 +71,18 @@ class TitleScreen(val batch: SpriteBatch) : Screen {
private fun loadThingsWhileIntroIsVisible() { private fun loadThingsWhileIntroIsVisible() {
demoWorld = ReadLayerData(FileInputStream(ModMgr.getFile("basegame", "demoworld"))) demoWorld = ReadLayerData(FileInputStream(ModMgr.getFile("basegame", "demoworld")))
cameraPlayer.hitbox.setPosition(
demoWorld.spawnX * FeaturesDrawer.TILE_SIZE.toDouble(), cameraPlayer = object : HumanoidNPC(demoWorld, cameraAI, GameDate(1, 1), usePhysics = false) {
demoWorld.spawnY * FeaturesDrawer.TILE_SIZE.toDouble() init {
) setHitboxDimension(2, 2, 0, 0)
cameraPlayer.hitbox.setDimension(2.0, 2.0) hitbox.setPosition(
demoWorld.spawnX * FeaturesDrawer.TILE_SIZE.toDouble(),
(demoWorld.height / 3) * 0.75 * FeaturesDrawer.TILE_SIZE.toDouble()//demoWorld.spawnY * FeaturesDrawer.TILE_SIZE.toDouble()
)
actorValue[AVKey.SPEED] = 1.0
actorValue[AVKey.ACCEL] = 1.0
}
}
demoWorld.time.timeDelta = 60 demoWorld.time.timeDelta = 60
@@ -146,14 +150,6 @@ class TitleScreen(val batch: SpriteBatch) : Screen {
} }
} }
else { else {
//if (Terrarum.GLOBAL_RENDER_TIMER % 2 == 1) {
LightmapRenderer.fireRecalculateEvent()
//}
cameraPlayer.hitbox.setPosition(1024 * 16.0, 340 * 16.0)
demoWorld.updateWorldTime(delta) demoWorld.updateWorldTime(delta)
WeatherMixer.update(delta, cameraPlayer) WeatherMixer.update(delta, cameraPlayer)
cameraPlayer.update(delta) cameraPlayer.update(delta)
@@ -165,11 +161,19 @@ class TitleScreen(val batch: SpriteBatch) : Screen {
uiContainer.forEach { it.update(delta) } uiContainer.forEach { it.update(delta) }
if (Terrarum.GLOBAL_RENDER_TIMER % 2 == 1) {
LightmapRenderer.fireRecalculateEvent()
}
// render and blur lightmap // render and blur lightmap
//processBlur(LightmapRenderer.DRAW_FOR_RGB) //processBlur(LightmapRenderer.DRAW_FOR_RGB)
Gdx.gl.glActiveTexture(GL20.GL_TEXTURE)
// render world // render world
batch.inUse { batch.inUse {
setCameraPosition(0f, 0f)
batch.color = Color.WHITE
batch.shader = null batch.shader = null
camera.position.set(WorldCamera.gdxCamX, WorldCamera.gdxCamY, 0f) // make camara work camera.position.set(WorldCamera.gdxCamX, WorldCamera.gdxCamY, 0f) // make camara work
camera.update() camera.update()
@@ -215,6 +219,7 @@ class TitleScreen(val batch: SpriteBatch) : Screen {
BlocksDrawer.renderTerrain(batch) BlocksDrawer.renderTerrain(batch)
BlocksDrawer.renderFront(batch, false) BlocksDrawer.renderFront(batch, false)
FeaturesDrawer.drawEnvOverlay(batch) FeaturesDrawer.drawEnvOverlay(batch)
} }
private fun renderMenus() { private fun renderMenus() {

8
src/net/torvald/terrarum/UIItemInventoryElem.kt
View File

@@ -129,7 +129,7 @@ class UIItemInventoryElem(
override fun keyDown(keycode: Int): Boolean { override fun keyDown(keycode: Int): Boolean {
if (item != null && Terrarum.ingame != null && keycode in Input.Keys.NUM_1..Input.Keys.NUM_0) { if (item != null && Terrarum.ingame != null && keycode in Input.Keys.NUM_1..Input.Keys.NUM_0) {
val inventory = Terrarum.ingame!!.player?.inventory val inventory = Terrarum.ingame!!.player.inventory
val slot = if (keycode == Input.Keys.NUM_0) 9 else keycode - Input.Keys.NUM_1 val slot = if (keycode == Input.Keys.NUM_0) 9 else keycode - Input.Keys.NUM_1
val currentSlotItem = inventory?.getQuickBar(slot) val currentSlotItem = inventory?.getQuickBar(slot)
@@ -161,11 +161,11 @@ class UIItemInventoryElem(
val itemEquipSlot = item!!.equipPosition val itemEquipSlot = item!!.equipPosition
val player = Terrarum.ingame!!.player val player = Terrarum.ingame!!.player
if (item != player?.inventory?.itemEquipped?.get(itemEquipSlot)) { // if this item is unequipped, equip it if (item != player.inventory?.itemEquipped?.get(itemEquipSlot)) { // if this item is unequipped, equip it
player?.equipItem(item!!) player.equipItem(item!!)
} }
else { // if not, unequip it else { // if not, unequip it
player?.unequipItem(item!!) player.unequipItem(item!!)
} }
} }

6
src/net/torvald/terrarum/blockproperties/BlockPropUtil.kt
View File

@@ -63,9 +63,9 @@ object BlockPropUtil {
internal fun dynamicLumFuncTickClock() { internal fun dynamicLumFuncTickClock() {
// FPS-time compensation // FPS-time compensation
if (Gdx.graphics.framesPerSecond > 0) { if (Gdx.graphics.framesPerSecond > 0) {
flickerFuncX += Gdx.graphics.deltaTime * 1000f flickerFuncX += Terrarum.deltaTime * 1000f
breathFuncX += Gdx.graphics.deltaTime * 1000f breathFuncX += Terrarum.deltaTime * 1000f
pulsateFuncX += Gdx.graphics.deltaTime * 1000f pulsateFuncX += Terrarum.deltaTime * 1000f
} }
// flicker-related vars // flicker-related vars

4
src/net/torvald/terrarum/blockstats/BlockStats.kt
View File

@@ -33,9 +33,9 @@ object BlockStats {
val renderHeight = FastMath.ceil(Terrarum.HEIGHT.toFloat()) val renderHeight = FastMath.ceil(Terrarum.HEIGHT.toFloat())
val noZoomCameraX = Math.round(FastMath.clamp( val noZoomCameraX = Math.round(FastMath.clamp(
(player?.hitbox?.centeredX?.toFloat() ?: 0f) - renderWidth / 2, TSIZE.toFloat(), map.width * TSIZE - renderWidth - TSIZE.toFloat())) (player.hitbox?.centeredX?.toFloat() ?: 0f) - renderWidth / 2, TSIZE.toFloat(), map.width * TSIZE - renderWidth - TSIZE.toFloat()))
val noZoomCameraY = Math.round(FastMath.clamp( val noZoomCameraY = Math.round(FastMath.clamp(
(player?.hitbox?.centeredY?.toFloat() ?: 0f) - renderHeight / 2, TSIZE.toFloat(), map.width * TSIZE - renderHeight - TSIZE.toFloat())) (player.hitbox?.centeredY?.toFloat() ?: 0f) - renderHeight / 2, TSIZE.toFloat(), map.width * TSIZE - renderHeight - TSIZE.toFloat()))
val for_x_start = noZoomCameraX / TSIZE val for_x_start = noZoomCameraX / TSIZE
val for_y_start = noZoomCameraY / TSIZE val for_y_start = noZoomCameraY / TSIZE

2
src/net/torvald/terrarum/console/ExportAV.kt
View File

@@ -13,7 +13,7 @@ internal object ExportAV : ConsoleCommand {
if (args.size == 2) { if (args.size == 2) {
try { try {
JsonWriter.writeToFile( JsonWriter.writeToFile(
Terrarum.ingame!!.player!!.actorValue, Terrarum.ingame!!.player.actorValue,
Terrarum.defaultDir + "/Exports/" + args[1] + ".json") Terrarum.defaultDir + "/Exports/" + args[1] + ".json")
Echo("ExportAV: exported to " + args[1] + ".json") Echo("ExportAV: exported to " + args[1] + ".json")

10
src/net/torvald/terrarum/console/GetAV.kt
View File

@@ -12,7 +12,7 @@ internal object GetAV : ConsoleCommand {
try { try {
if (args.size == 1 && Terrarum.ingame!!.player != null) { if (args.size == 1 && Terrarum.ingame!!.player != null) {
// print all actorvalue of player // print all actorvalue of player
val av = Terrarum.ingame!!.player!!.actorValue val av = Terrarum.ingame!!.player.actorValue
val keyset = av.keySet val keyset = av.keySet
Echo("$ccW== ActorValue list for ${ccY}player $ccW==") Echo("$ccW== ActorValue list for ${ccY}player $ccW==")
@@ -30,14 +30,14 @@ internal object GetAV : ConsoleCommand {
if (!args[1].isNum()) { // args[1] is ActorValue name if (!args[1].isNum()) { // args[1] is ActorValue name
Echo("${ccW}player.$ccM${args[1]} $ccW= " + Echo("${ccW}player.$ccM${args[1]} $ccW= " +
ccG + ccG +
Terrarum.ingame!!.player!!.actorValue[args[1]] + Terrarum.ingame!!.player.actorValue[args[1]] +
" $ccO" + " $ccO" +
Terrarum.ingame!!.player!!.actorValue[args[1]]!!.javaClass.simpleName Terrarum.ingame!!.player.actorValue[args[1]]!!.javaClass.simpleName
) )
println("[GetAV] player.${args[1]} = " + println("[GetAV] player.${args[1]} = " +
Terrarum.ingame!!.player!!.actorValue[args[1]] + Terrarum.ingame!!.player.actorValue[args[1]] +
" " + " " +
Terrarum.ingame!!.player!!.actorValue[args[1]]!!.javaClass.simpleName Terrarum.ingame!!.player.actorValue[args[1]]!!.javaClass.simpleName
) )
} }
else { else {

2
src/net/torvald/terrarum/console/SetAV.kt
View File

@@ -59,7 +59,7 @@ internal object SetAV : ConsoleCommand {
return return
} }
Terrarum.ingame!!.player!!.actorValue[args[1]] = newValue Terrarum.ingame!!.player.actorValue[args[1]] = newValue
Echo("${ccW}Set $ccM${args[1]} ${ccW}for ${ccY}player ${ccW}to $ccG$newValue") Echo("${ccW}Set $ccM${args[1]} ${ccW}for ${ccY}player ${ccW}to $ccG$newValue")
println("[SetAV] set ActorValue '${args[1]}' for player to '$newValue'.") println("[SetAV] set ActorValue '${args[1]}' for player to '$newValue'.")
} }

2
src/net/torvald/terrarum/console/SetScale.kt
View File

@@ -10,7 +10,7 @@ internal object SetScale : ConsoleCommand {
override fun execute(args: Array<String>) { override fun execute(args: Array<String>) {
if (args.size == 2 || args.size == 3) { if (args.size == 2 || args.size == 3) {
try { try {
val targetID = if (args.size == 3) args[1].toInt() else Terrarum.ingame!!.player!!.referenceID val targetID = if (args.size == 3) args[1].toInt() else Terrarum.ingame!!.player.referenceID
val scale = args[if (args.size == 3) 2 else 1].toDouble() val scale = args[if (args.size == 3) 2 else 1].toDouble()
val target = Terrarum.ingame!!.getActorByID(targetID) val target = Terrarum.ingame!!.getActorByID(targetID)

4
src/net/torvald/terrarum/console/SpawnPhysTestBall.kt
View File

@@ -20,7 +20,7 @@ internal object SpawnPhysTestBall : ConsoleCommand {
val xvel = args[2].toDouble() val xvel = args[2].toDouble()
val yvel = if (args.size >= 4) args[3].toDouble() else 0.0 val yvel = if (args.size >= 4) args[3].toDouble() else 0.0
val ball = PhysTestBall() val ball = PhysTestBall(Terrarum.ingame!!.world)
ball.setPosition( ball.setPosition(
(mouseX + WorldCamera.x).toDouble(), (mouseX + WorldCamera.x).toDouble(),
(mouseY + WorldCamera.y).toDouble() (mouseY + WorldCamera.y).toDouble()
@@ -33,7 +33,7 @@ internal object SpawnPhysTestBall : ConsoleCommand {
else if (args.size == 2) { else if (args.size == 2) {
val elasticity = args[1].toDouble() val elasticity = args[1].toDouble()
val ball = PhysTestBall() val ball = PhysTestBall(Terrarum.ingame!!.world)
ball.setPosition( ball.setPosition(
(mouseX + WorldCamera.x).toDouble(), (mouseX + WorldCamera.x).toDouble(),
(mouseY + WorldCamera.y).toDouble() (mouseY + WorldCamera.y).toDouble()

2
src/net/torvald/terrarum/console/SpawnTikiTorch.kt
View File

@@ -8,7 +8,7 @@ import net.torvald.terrarum.gameactors.FixtureTikiTorch
*/ */
internal object SpawnTikiTorch : ConsoleCommand { internal object SpawnTikiTorch : ConsoleCommand {
override fun execute(args: Array<String>) { override fun execute(args: Array<String>) {
val torch = FixtureTikiTorch() val torch = FixtureTikiTorch(Terrarum.ingame!!.world)
torch.setPosition(Terrarum.mouseX, Terrarum.mouseY) torch.setPosition(Terrarum.mouseX, Terrarum.mouseY)
Terrarum.ingame!!.addNewActor(torch) Terrarum.ingame!!.addNewActor(torch)

4
src/net/torvald/terrarum/console/Teleport.kt
View File

@@ -23,7 +23,7 @@ internal object Teleport : ConsoleCommand {
return return
} }
Terrarum.ingame!!.player!!.setPosition(x.toDouble(), y.toDouble()) Terrarum.ingame!!.player.setPosition(x.toDouble(), y.toDouble())
} }
else if (args.size == 4) { else if (args.size == 4) {
if (args[2].toLowerCase() != "to") { if (args[2].toLowerCase() != "to") {
@@ -35,7 +35,7 @@ internal object Teleport : ConsoleCommand {
try { try {
val fromActorID = args[1].toInt() val fromActorID = args[1].toInt()
val targetActorID = if (args[3].toLowerCase() == "player") val targetActorID = if (args[3].toLowerCase() == "player")
Terrarum.ingame!!.player!!.referenceID Terrarum.ingame!!.player.referenceID
else else
args[3].toInt() args[3].toInt()

4
src/net/torvald/terrarum/console/ToggleNoClip.kt
View File

@@ -7,9 +7,9 @@ import net.torvald.terrarum.Terrarum
*/ */
internal object ToggleNoClip : ConsoleCommand { internal object ToggleNoClip : ConsoleCommand {
override fun execute(args: Array<String>) { override fun execute(args: Array<String>) {
val status = Terrarum.ingame!!.player!!.isNoClip() val status = Terrarum.ingame!!.player.isNoClip()
Terrarum.ingame!!.player!!.setNoClip(!status) Terrarum.ingame!!.player.setNoClip(!status)
Echo("Set no-clip status to " + (!status).toString()) Echo("Set no-clip status to " + (!status).toString())
} }

25
src/net/torvald/terrarum/gameactors/ActorHumanoid.kt
View File

@@ -5,6 +5,7 @@ import com.badlogic.gdx.graphics.Color
import com.jme3.math.FastMath import com.jme3.math.FastMath
import net.torvald.terrarum.Terrarum import net.torvald.terrarum.Terrarum
import net.torvald.terrarum.gameactors.faction.Faction import net.torvald.terrarum.gameactors.faction.Faction
import net.torvald.terrarum.gameworld.GameWorld
import net.torvald.terrarum.itemproperties.GameItem import net.torvald.terrarum.itemproperties.GameItem
import net.torvald.terrarum.itemproperties.Material import net.torvald.terrarum.itemproperties.Material
import net.torvald.terrarum.realestate.LandUtil import net.torvald.terrarum.realestate.LandUtil
@@ -18,8 +19,14 @@ import java.util.*
* *
* Created by minjaesong on 16-10-24. * Created by minjaesong on 16-10-24.
*/ */
open class ActorHumanoid(birth: GameDate, death: GameDate? = null) open class ActorHumanoid(
: HistoricalFigure(birth, death), Controllable, Pocketed, Factionable, Luminous, LandHolder { world: GameWorld,
birth: GameDate,
death: GameDate? = null,
usePhysics: Boolean = true
) : HistoricalFigure(world, birth, death, usePhysics = usePhysics), Controllable, Pocketed, Factionable, Luminous, LandHolder {
var vehicleRiding: Controllable? = null // usually player only var vehicleRiding: Controllable? = null // usually player only
@@ -38,11 +45,11 @@ open class ActorHumanoid(birth: GameDate, death: GameDate? = null)
override var houseDesignation: ArrayList<Long>? = ArrayList() override var houseDesignation: ArrayList<Long>? = ArrayList()
override fun addHouseTile(x: Int, y: Int) { override fun addHouseTile(x: Int, y: Int) {
if (houseDesignation != null) houseDesignation!!.add(LandUtil.getBlockAddr(x, y)) if (houseDesignation != null) houseDesignation!!.add(LandUtil.getBlockAddr(world, x, y))
} }
override fun removeHouseTile(x: Int, y: Int) { override fun removeHouseTile(x: Int, y: Int) {
if (houseDesignation != null) houseDesignation!!.remove(LandUtil.getBlockAddr(x, y)) if (houseDesignation != null) houseDesignation!!.remove(LandUtil.getBlockAddr(world, x, y))
} }
override fun clearHouseDesignation() { override fun clearHouseDesignation() {
@@ -135,7 +142,7 @@ open class ActorHumanoid(birth: GameDate, death: GameDate? = null)
protected var isRightDown = false protected var isRightDown = false
protected var isJumpDown = false protected var isJumpDown = false
protected inline val isGamer: Boolean protected inline val isGamer: Boolean
get() = this == Terrarum.ingame!!.player get() = if (Terrarum.ingame == null) false else this == Terrarum.ingame!!.player
private val nullItem = object : GameItem() { private val nullItem = object : GameItem() {
@@ -164,6 +171,8 @@ open class ActorHumanoid(birth: GameDate, death: GameDate? = null)
// don't put this into keyPressed; execution order is important! // don't put this into keyPressed; execution order is important!
updateGamerControlBox() updateGamerControlBox()
processInput(delta)
updateSprite(delta) updateSprite(delta)
if (noClip) { if (noClip) {
@@ -224,7 +233,7 @@ open class ActorHumanoid(birth: GameDate, death: GameDate? = null)
get() = if (isGamer) Terrarum.controller != null get() = if (isGamer) Terrarum.controller != null
else true else true
override fun processInput(delta: Float) { private fun processInput(delta: Float) {
/** /**
* L-R stop * L-R stop
@@ -538,11 +547,11 @@ open class ActorHumanoid(birth: GameDate, death: GameDate? = null)
// flipping the sprite // flipping the sprite
if (walkHeading == LEFT) { if (walkHeading == LEFT) {
sprite!!.flip(true, false) sprite?.flip(true, false)
spriteGlow?.flip(true, false) spriteGlow?.flip(true, false)
} }
else { else {
sprite!!.flip(false, false) sprite?.flip(false, false)
spriteGlow?.flip(false, false) spriteGlow?.flip(false, false)
} }
} }

2
src/net/torvald/terrarum/gameactors/ActorInventory.kt
View File

@@ -202,7 +202,7 @@ class ActorInventory(val actor: Pocketed, var maxCapacity: Int, var capacityMode
actor.avStrength / 1000.0 actor.avStrength / 1000.0
else else
1.0 // TODO variable: scale, strength 1.0 // TODO variable: scale, strength
val swingDmgToFrameDmg = Gdx.graphics.deltaTime.toDouble() / actor.actorValue.getAsDouble(AVKey.ACTION_INTERVAL)!! val swingDmgToFrameDmg = Terrarum.deltaTime.toDouble() / actor.actorValue.getAsDouble(AVKey.ACTION_INTERVAL)!!
// damage the item // damage the item
newItem.durability -= (baseDamagePerSwing * swingDmgToFrameDmg).toFloat() newItem.durability -= (baseDamagePerSwing * swingDmgToFrameDmg).toFloat()

37
src/net/torvald/terrarum/gameactors/ActorWithPhysics.kt
View File

@@ -1,6 +1,5 @@
package net.torvald.terrarum.gameactors package net.torvald.terrarum.gameactors
import com.badlogic.gdx.Gdx
import com.badlogic.gdx.graphics.g2d.SpriteBatch import com.badlogic.gdx.graphics.g2d.SpriteBatch
import com.jme3.math.FastMath import com.jme3.math.FastMath
import net.torvald.point.Point2d import net.torvald.point.Point2d
@@ -23,15 +22,15 @@ typealias Second = Float
/** /**
* Base class for every actor that has animated sprites. This includes furnishings, paintings, gadgets, etc. * Base class for every actor that has animated sprites. This includes furnishings, paintings, gadgets, etc.
* Also has all the physics * Also has all the usePhysics
* *
* @param renderOrder Rendering order (BEHIND, MIDDLE, MIDTOP, FRONT) * @param renderOrder Rendering order (BEHIND, MIDDLE, MIDTOP, FRONT)
* @param immobileBody use realistic air friction (1/1000 of "unrealistic" canonical setup) * @param immobileBody use realistic air friction (1/1000 of "unrealistic" canonical setup)
* @param physics use physics simulation * @param usePhysics use usePhysics simulation
* *
* Created by minjaesong on 16-01-13. * Created by minjaesong on 16-01-13.
*/ */
open class ActorWithPhysics(renderOrder: RenderOrder, val immobileBody: Boolean = false, physics: Boolean = true) : open class ActorWithPhysics(val world: GameWorld, renderOrder: RenderOrder, val immobileBody: Boolean = false, var usePhysics: Boolean = true) :
ActorWithBody(renderOrder) { ActorWithBody(renderOrder) {
@@ -45,8 +44,6 @@ open class ActorWithPhysics(renderOrder: RenderOrder, val immobileBody: Boolean
var drawMode = BlendMode.NORMAL var drawMode = BlendMode.NORMAL
@Transient private val world: GameWorld = Terrarum.ingame!!.world
var hitboxTranslateX: Int = 0// relative to spritePosX var hitboxTranslateX: Int = 0// relative to spritePosX
protected set protected set
var hitboxTranslateY: Int = 0// relative to spritePosY var hitboxTranslateY: Int = 0// relative to spritePosY
@@ -133,7 +130,7 @@ open class ActorWithPhysics(renderOrder: RenderOrder, val immobileBody: Boolean
@Transient private val ELASTICITY_MAX = 1.0//0.993 // No perpetual motion! @Transient private val ELASTICITY_MAX = 1.0//0.993 // No perpetual motion!
/** /**
* what pretty much every physics engine has, instead of my 'elasticity' * what pretty much every usePhysics engine has, instead of my 'elasticity'
* *
* This is just a simple macro for 'elasticity'. * This is just a simple macro for 'elasticity'.
* *
@@ -164,7 +161,7 @@ open class ActorWithPhysics(renderOrder: RenderOrder, val immobileBody: Boolean
/** Default to 'true' */ /** Default to 'true' */
var isVisible = true var isVisible = true
/** Default to 'true' */ /** Default to 'true' */
var isUpdate = physics var isUpdate = true
var isNoSubjectToGrav = false var isNoSubjectToGrav = false
var isNoCollideWorld = false var isNoCollideWorld = false
var isNoSubjectToFluidResistance = false var isNoSubjectToFluidResistance = false
@@ -239,7 +236,7 @@ open class ActorWithPhysics(renderOrder: RenderOrder, val immobileBody: Boolean
internal var colliding = false internal var colliding = false
protected inline val updateDelta: Float protected inline val updateDelta: Float
get() = Gdx.graphics.deltaTime get() = Terrarum.deltaTime
var isWalkingH = false var isWalkingH = false
@@ -336,6 +333,12 @@ open class ActorWithPhysics(renderOrder: RenderOrder, val immobileBody: Boolean
isNoSubjectToFluidResistance = isPlayerNoClip isNoSubjectToFluidResistance = isPlayerNoClip
} }
if (!usePhysics) {
isNoCollideWorld = true
isNoSubjectToFluidResistance = true
isNoSubjectToGrav = true
}
//////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////
// Codes that modifies velocity (moveDelta and externalForce) // // Codes that modifies velocity (moveDelta and externalForce) //
@@ -366,7 +369,7 @@ open class ActorWithPhysics(renderOrder: RenderOrder, val immobileBody: Boolean
* If and only if: * If and only if:
* This body is NON-STATIC and the other body is STATIC * This body is NON-STATIC and the other body is STATIC
*/ */
if (!isPlayerNoClip) { if (!isNoCollideWorld) {
// // HOW IT SHOULD WORK // // // // HOW IT SHOULD WORK // //
// //////////////////////// // ////////////////////////
// combineVeloToMoveDelta now // combineVeloToMoveDelta now
@@ -428,7 +431,7 @@ open class ActorWithPhysics(renderOrder: RenderOrder, val immobileBody: Boolean
walledTop = isWalled(hitbox, COLLIDING_TOP) walledTop = isWalled(hitbox, COLLIDING_TOP)
walledBottom = isWalled(hitbox, COLLIDING_BOTTOM) walledBottom = isWalled(hitbox, COLLIDING_BOTTOM)
colliding = isColliding(hitbox) colliding = isColliding(hitbox)
if (isPlayerNoClip) { if (isNoCollideWorld) {
walledLeft = false walledLeft = false
walledRight = false walledRight = false
walledTop = false walledTop = false
@@ -586,7 +589,7 @@ open class ActorWithPhysics(renderOrder: RenderOrder, val immobileBody: Boolean
val stepBox = sixteenStep[step] val stepBox = sixteenStep[step]
forEachOccupyingTilePos(stepBox) { forEachOccupyingTilePos(stepBox) {
val tileCoord = LandUtil.resolveBlockAddr(it) val tileCoord = LandUtil.resolveBlockAddr(this.world, it)
val tileProp = BlockCodex.getOrNull(world.getTileFromTerrain(tileCoord.first, tileCoord.second)) val tileProp = BlockCodex.getOrNull(world.getTileFromTerrain(tileCoord.first, tileCoord.second))
if (tileProp == null || tileProp.isSolid) { if (tileProp == null || tileProp.isSolid) {
@@ -632,7 +635,7 @@ open class ActorWithPhysics(renderOrder: RenderOrder, val immobileBody: Boolean
debug1("Collision type: $selfCollisionStatus") debug1("Collision type: $selfCollisionStatus")
affectingTiles.forEach { affectingTiles.forEach {
val tileCoord = LandUtil.resolveBlockAddr(it) val tileCoord = LandUtil.resolveBlockAddr(this.world, it)
debug2("affectign tile: ${tileCoord.first}, ${tileCoord.second}") debug2("affectign tile: ${tileCoord.first}, ${tileCoord.second}")
} }
@@ -1265,7 +1268,7 @@ open class ActorWithPhysics(renderOrder: RenderOrder, val immobileBody: Boolean
private fun assertInit() { private fun assertInit() {
// errors // errors
if (baseHitboxW == 0 || baseHitboxH == 0) if (baseHitboxW == 0 || baseHitboxH == 0)
throw Error("Hitbox dimension was not set.") throw Error("Hitbox dimension was not set. (don't modify hitbox directly -- use 'setHitboxDimension()')")
// warnings // warnings
if (sprite == null && isVisible) if (sprite == null && isVisible)
@@ -1315,7 +1318,7 @@ open class ActorWithPhysics(renderOrder: RenderOrder, val immobileBody: Boolean
val tilePosList = ArrayList<BlockAddress>() val tilePosList = ArrayList<BlockAddress>()
for (y in newTilewiseHitbox.startY.toInt()..newTilewiseHitbox.endY.toInt()) { for (y in newTilewiseHitbox.startY.toInt()..newTilewiseHitbox.endY.toInt()) {
for (x in newTilewiseHitbox.startX.toInt()..newTilewiseHitbox.endX.toInt()) { for (x in newTilewiseHitbox.startX.toInt()..newTilewiseHitbox.endX.toInt()) {
tilePosList.add(LandUtil.getBlockAddr(x, y)) tilePosList.add(LandUtil.getBlockAddr(this.world, x, y))
} }
} }
@@ -1437,12 +1440,12 @@ open class ActorWithPhysics(renderOrder: RenderOrder, val immobileBody: Boolean
} }
internal val avAcceleration: Double internal val avAcceleration: Double
get() = actorValue.getAsDouble(AVKey.ACCEL)!! * get() = actorValue.getAsDouble(AVKey.ACCEL)!! *
actorValue.getAsDouble(AVKey.ACCELBUFF)!! * (actorValue.getAsDouble(AVKey.ACCELBUFF) ?: 1.0) *
accelMultMovement * accelMultMovement *
scale.sqrt() scale.sqrt()
internal val avSpeedCap: Double internal val avSpeedCap: Double
get() = actorValue.getAsDouble(AVKey.SPEED)!! * get() = actorValue.getAsDouble(AVKey.SPEED)!! *
actorValue.getAsDouble(AVKey.SPEEDBUFF)!! * (actorValue.getAsDouble(AVKey.SPEEDBUFF) ?: 1.0) *
speedMultByTile * speedMultByTile *
scale.sqrt() scale.sqrt()

2
src/net/torvald/terrarum/gameactors/Controllable.kt
View File

@@ -7,8 +7,6 @@ package net.torvald.terrarum.gameactors
* Created by minjaesong on 15-12-31. * Created by minjaesong on 15-12-31.
*/ */
interface Controllable { interface Controllable {
fun processInput(delta: Float)
fun keyDown(keycode: Int): Boolean fun keyDown(keycode: Int): Boolean
} }

6
src/net/torvald/terrarum/gameactors/CreatureBuilder.kt
View File

@@ -1,5 +1,7 @@
package net.torvald.terrarum.gameactors package net.torvald.terrarum.gameactors
import net.torvald.terrarum.gameworld.GameWorld
/** /**
* Created by minjaesong on 16-02-05. * Created by minjaesong on 16-02-05.
@@ -10,8 +12,8 @@ object CreatureBuilder {
/** /**
* @Param jsonFileName with extension * @Param jsonFileName with extension
*/ */
operator fun invoke(module: String, jsonFileName: String): ActorWithPhysics { operator fun invoke(world: GameWorld, module: String, jsonFileName: String): ActorWithPhysics {
val actor = ActorWithPhysics(Actor.RenderOrder.MIDDLE) val actor = ActorWithPhysics(world, Actor.RenderOrder.MIDDLE)
InjectCreatureRaw(actor.actorValue, module, jsonFileName) InjectCreatureRaw(actor.actorValue, module, jsonFileName)

3
src/net/torvald/terrarum/gameactors/DecodeTapestry.kt
View File

@@ -2,6 +2,7 @@ package net.torvald.terrarum.gameactors
import com.badlogic.gdx.graphics.Color import com.badlogic.gdx.graphics.Color
import com.badlogic.gdx.graphics.Pixmap import com.badlogic.gdx.graphics.Pixmap
import net.torvald.terrarum.Terrarum
import net.torvald.terrarum.gameworld.toUint import net.torvald.terrarum.gameworld.toUint
import java.io.File import java.io.File
import java.nio.charset.Charset import java.nio.charset.Charset
@@ -171,6 +172,6 @@ object DecodeTapestry {
readCounter++ readCounter++
} }
return TapestryObject(outImageData, artName, authorName) return TapestryObject(Terrarum.ingame!!.world, outImageData, artName, authorName)
} }
} }

3
src/net/torvald/terrarum/gameactors/DroppedItem.kt
View File

@@ -4,11 +4,12 @@ import com.badlogic.gdx.graphics.g2d.SpriteBatch
import net.torvald.terrarum.itemproperties.GameItem import net.torvald.terrarum.itemproperties.GameItem
import net.torvald.terrarum.itemproperties.ItemCodex import net.torvald.terrarum.itemproperties.ItemCodex
import net.torvald.terrarum.blockproperties.BlockCodex import net.torvald.terrarum.blockproperties.BlockCodex
import net.torvald.terrarum.gameworld.GameWorld
/** /**
* Created by minjaesong on 16-03-15. * Created by minjaesong on 16-03-15.
*/ */
open class DroppedItem(private val item: GameItem) : ActorWithPhysics(Actor.RenderOrder.MIDTOP) { open class DroppedItem(world: GameWorld, private val item: GameItem) : ActorWithPhysics(world, Actor.RenderOrder.MIDTOP) {
init { init {
if (item.dynamicID >= ItemCodex.ACTORID_MIN) if (item.dynamicID >= ItemCodex.ACTORID_MIN)

6
src/net/torvald/terrarum/gameactors/FixtureBase.kt
View File

@@ -1,12 +1,12 @@
package net.torvald.terrarum.gameactors package net.torvald.terrarum.gameactors
import net.torvald.spriteanimation.SpriteAnimation import net.torvald.terrarum.gameworld.GameWorld
/** /**
* Created by minjaesong on 16-06-17. * Created by minjaesong on 16-06-17.
*/ */
open class FixtureBase(physics: Boolean = true) : open class FixtureBase(world: GameWorld, physics: Boolean = true) :
ActorWithPhysics(Actor.RenderOrder.BEHIND, immobileBody = true, physics = physics) { ActorWithPhysics(world, Actor.RenderOrder.BEHIND, immobileBody = true, usePhysics = physics) {
/** /**
* 0: Open * 0: Open
* 1: Blocked * 1: Blocked

3
src/net/torvald/terrarum/gameactors/FixtureTikiTorch.kt
View File

@@ -4,13 +4,14 @@ import com.badlogic.gdx.graphics.Color
import net.torvald.terrarum.ModMgr import net.torvald.terrarum.ModMgr
import net.torvald.terrarum.blockproperties.Block import net.torvald.terrarum.blockproperties.Block
import net.torvald.terrarum.blockproperties.BlockCodex import net.torvald.terrarum.blockproperties.BlockCodex
import net.torvald.terrarum.gameworld.GameWorld
import net.torvald.terrarumsansbitmap.gdx.TextureRegionPack import net.torvald.terrarumsansbitmap.gdx.TextureRegionPack
import java.util.* import java.util.*
/** /**
* Created by minjaesong on 16-06-17. * Created by minjaesong on 16-06-17.
*/ */
internal class FixtureTikiTorch : FixtureBase(), Luminous { internal class FixtureTikiTorch(world: GameWorld) : FixtureBase(world), Luminous {
override var color: Color override var color: Color
get() = BlockCodex[Block.TORCH].luminosity get() = BlockCodex[Block.TORCH].luminosity

7
src/net/torvald/terrarum/gameactors/HistoricalFigure.kt
View File

@@ -2,6 +2,7 @@ package net.torvald.terrarum.gameactors
import net.torvald.random.HQRNG import net.torvald.random.HQRNG
import net.torvald.terrarum.Terrarum import net.torvald.terrarum.Terrarum
import net.torvald.terrarum.gameworld.GameWorld
import net.torvald.terrarum.gameworld.WorldTime import net.torvald.terrarum.gameworld.WorldTime
typealias AnyPlayer = HistoricalFigure typealias AnyPlayer = HistoricalFigure
@@ -15,10 +16,12 @@ typealias AnyPlayer = HistoricalFigure
* Created by minjaesong on 16-10-10. * Created by minjaesong on 16-10-10.
*/ */
open class HistoricalFigure( open class HistoricalFigure(
world: GameWorld,
val born: GameDate, val born: GameDate,
val dead: GameDate? = null, val dead: GameDate? = null,
realAirFriction: Boolean = false realAirFriction: Boolean = false,
) : ActorWithPhysics(Actor.RenderOrder.MIDDLE, realAirFriction) { usePhysics: Boolean = true
) : ActorWithPhysics(world, Actor.RenderOrder.MIDDLE, realAirFriction, usePhysics) {
var historicalFigureIdentifier: Int = generateHistoricalFigureIdentifier() var historicalFigureIdentifier: Int = generateHistoricalFigureIdentifier()
internal set internal set

11
src/net/torvald/terrarum/gameactors/HumanoidNPC.kt
View File

@@ -3,6 +3,7 @@ package net.torvald.terrarum.gameactors
import net.torvald.terrarum.Terrarum import net.torvald.terrarum.Terrarum
import net.torvald.terrarum.gameactors.ai.ActorAI import net.torvald.terrarum.gameactors.ai.ActorAI
import net.torvald.terrarum.gameactors.ai.LuaAIWrapper import net.torvald.terrarum.gameactors.ai.LuaAIWrapper
import net.torvald.terrarum.gameworld.GameWorld
import net.torvald.terrarum.itemproperties.GameItem import net.torvald.terrarum.itemproperties.GameItem
import net.torvald.terrarum.itemproperties.Material import net.torvald.terrarum.itemproperties.Material
@@ -12,11 +13,13 @@ import net.torvald.terrarum.itemproperties.Material
* Created by minjaesong on 16-01-31. * Created by minjaesong on 16-01-31.
*/ */
open class HumanoidNPC( open class HumanoidNPC(
world: GameWorld,
override val ai: ActorAI, // it's there for written-in-Kotlin, "hard-wired" AIs override val ai: ActorAI, // it's there for written-in-Kotlin, "hard-wired" AIs
born: GameDate born: GameDate,
) : ActorHumanoid(born), AIControlled, CanBeAnItem { usePhysics: Boolean = true
) : ActorHumanoid(world, born, usePhysics = usePhysics), AIControlled, CanBeAnItem {
constructor(luaAi: LuaAIWrapper, born: GameDate) : this(luaAi as ActorAI, born) { constructor(world: GameWorld, luaAi: LuaAIWrapper, born: GameDate) : this(world, luaAi as ActorAI, born) {
luaAi.attachActor(this) luaAi.attachActor(this)
} }
@@ -78,8 +81,8 @@ open class HumanoidNPC(
} }
override fun update(delta: Float) { override fun update(delta: Float) {
ai.update(this, delta)
super.update(delta) super.update(delta)
ai.update(delta)
} }
override fun moveLeft(amount: Float) { // hit the buttons on the controller box override fun moveLeft(amount: Float) { // hit the buttons on the controller box

2
src/net/torvald/terrarum/gameactors/ParticleBase.kt
View File

@@ -20,7 +20,7 @@ open class ParticleBase(renderOrder: Actor.RenderOrder, maxLifeTime: Second? = n
/** Will NOT actually delete from the CircularArray */ /** Will NOT actually delete from the CircularArray */
@Volatile var flagDespawn = false @Volatile var flagDespawn = false
override fun run() = update(Gdx.graphics.deltaTime) override fun run() = update(Terrarum.deltaTime)
var isNoSubjectToGrav = false var isNoSubjectToGrav = false
var dragCoefficient = 3.0 var dragCoefficient = 3.0

3
src/net/torvald/terrarum/gameactors/PhysTestBall.kt
View File

@@ -3,12 +3,13 @@ package net.torvald.terrarum.gameactors
import com.badlogic.gdx.graphics.Color import com.badlogic.gdx.graphics.Color
import com.badlogic.gdx.graphics.g2d.SpriteBatch import com.badlogic.gdx.graphics.g2d.SpriteBatch
import net.torvald.terrarum.Terrarum import net.torvald.terrarum.Terrarum
import net.torvald.terrarum.gameworld.GameWorld
import net.torvald.terrarum.worldgenerator.RoguelikeRandomiser import net.torvald.terrarum.worldgenerator.RoguelikeRandomiser
/** /**
* Created by minjaesong on 16-03-05. * Created by minjaesong on 16-03-05.
*/ */
class PhysTestBall : ActorWithPhysics(Actor.RenderOrder.MIDDLE, immobileBody = true) { class PhysTestBall(world: GameWorld) : ActorWithPhysics(world, Actor.RenderOrder.MIDDLE, immobileBody = true) {
private var color = Color.GOLD private var color = Color.GOLD

4
src/net/torvald/terrarum/gameactors/Player.kt
View File

@@ -1,5 +1,7 @@
package net.torvald.terrarum.gameactors package net.torvald.terrarum.gameactors
import net.torvald.terrarum.gameworld.GameWorld
/** /**
* Game player (YOU!) * Game player (YOU!)
@@ -7,7 +9,7 @@ package net.torvald.terrarum.gameactors
* Created by minjaesong on 15-12-31. * Created by minjaesong on 15-12-31.
*/ */
class Player(born: GameDate) : ActorHumanoid(born) { class Player(world: GameWorld, born: GameDate) : ActorHumanoid(world, born) {
companion object { companion object {
@Transient const val PLAYER_REF_ID: Int = 0x91A7E2 @Transient const val PLAYER_REF_ID: Int = 0x91A7E2

2
src/net/torvald/terrarum/gameactors/PlayerBuilder.kt
View File

@@ -8,7 +8,7 @@ import net.torvald.terrarum.Terrarum
object PlayerBuilder { object PlayerBuilder {
operator fun invoke(): Actor { operator fun invoke(): Actor {
val p: Actor = Player(Terrarum.ingame!!.world.time.currentTimeAsGameDate) val p: Actor = Player(Terrarum.ingame!!.world, Terrarum.ingame!!.world.time.currentTimeAsGameDate)
InjectCreatureRaw(p.actorValue, "basegame", "CreatureHuman.json") InjectCreatureRaw(p.actorValue, "basegame", "CreatureHuman.json")
// attach sprite // attach sprite

2
src/net/torvald/terrarum/gameactors/PlayerBuilderCynthia.kt
View File

@@ -1,6 +1,7 @@
package net.torvald.terrarum.gameactors package net.torvald.terrarum.gameactors
import net.torvald.terrarum.ModMgr import net.torvald.terrarum.ModMgr
import net.torvald.terrarum.Terrarum
import net.torvald.terrarum.gameactors.ai.LuaAIWrapper import net.torvald.terrarum.gameactors.ai.LuaAIWrapper
import net.torvald.terrarum.worlddrawer.FeaturesDrawer import net.torvald.terrarum.worlddrawer.FeaturesDrawer
import net.torvald.terrarumsansbitmap.gdx.TextureRegionPack import net.torvald.terrarumsansbitmap.gdx.TextureRegionPack
@@ -13,6 +14,7 @@ object PlayerBuilderCynthia {
operator fun invoke(): ActorWithPhysics { operator fun invoke(): ActorWithPhysics {
//val p: Player = Player(GameDate(100, 143)) // random value thrown //val p: Player = Player(GameDate(100, 143)) // random value thrown
val p: HumanoidNPC = HumanoidNPC( val p: HumanoidNPC = HumanoidNPC(
Terrarum.ingame!!.world,
LuaAIWrapper("/net/torvald/terrarum/gameactors/ai/scripts/PokemonNPCAI.lua"), LuaAIWrapper("/net/torvald/terrarum/gameactors/ai/scripts/PokemonNPCAI.lua"),
GameDate(100, 143)) // random value thrown GameDate(100, 143)) // random value thrown
InjectCreatureRaw(p.actorValue, "basegame", "CreatureHuman.json") InjectCreatureRaw(p.actorValue, "basegame", "CreatureHuman.json")

3
src/net/torvald/terrarum/gameactors/PlayerBuilderSigrid.kt
View File

@@ -1,6 +1,7 @@
package net.torvald.terrarum.gameactors package net.torvald.terrarum.gameactors
import net.torvald.terrarum.ModMgr import net.torvald.terrarum.ModMgr
import net.torvald.terrarum.Terrarum
import net.torvald.terrarum.gameactors.faction.FactionFactory import net.torvald.terrarum.gameactors.faction.FactionFactory
import net.torvald.terrarum.itemproperties.ItemCodex import net.torvald.terrarum.itemproperties.ItemCodex
import net.torvald.terrarum.worlddrawer.FeaturesDrawer import net.torvald.terrarum.worlddrawer.FeaturesDrawer
@@ -14,7 +15,7 @@ import net.torvald.terrarumsansbitmap.gdx.TextureRegionPack
object PlayerBuilderSigrid { object PlayerBuilderSigrid {
operator fun invoke(): Player { operator fun invoke(): Player {
val p = Player(GameDate(-2147483648, 0)) // XD val p = Player(Terrarum.ingame!!.world, GameDate(-2147483648, 0)) // XD
p.referenceID = 0x51621D // the only constant of this procedural universe p.referenceID = 0x51621D // the only constant of this procedural universe
p.historicalFigureIdentifier = 0x51621D // the only constant of this procedural universe p.historicalFigureIdentifier = 0x51621D // the only constant of this procedural universe

3
src/net/torvald/terrarum/gameactors/PlayerBuilderTestSubject1.kt
View File

@@ -1,6 +1,7 @@
package net.torvald.terrarum.gameactors package net.torvald.terrarum.gameactors
import net.torvald.terrarum.ModMgr import net.torvald.terrarum.ModMgr
import net.torvald.terrarum.Terrarum
import net.torvald.terrarum.worlddrawer.FeaturesDrawer import net.torvald.terrarum.worlddrawer.FeaturesDrawer
import net.torvald.terrarumsansbitmap.gdx.TextureRegionPack import net.torvald.terrarumsansbitmap.gdx.TextureRegionPack
@@ -9,7 +10,7 @@ import net.torvald.terrarumsansbitmap.gdx.TextureRegionPack
*/ */
object PlayerBuilderTestSubject1 { object PlayerBuilderTestSubject1 {
operator fun invoke(): Player { operator fun invoke(): Player {
val p: Player = Player(GameDate(100, 143)) // random value thrown val p: Player = Player(Terrarum.ingame!!.world, GameDate(100, 143)) // random value thrown
InjectCreatureRaw(p.actorValue, "basegame", "CreatureHuman.json") InjectCreatureRaw(p.actorValue, "basegame", "CreatureHuman.json")

9
src/net/torvald/terrarum/gameactors/Pocketed.kt
View File

@@ -1,6 +1,7 @@
package net.torvald.terrarum.gameactors package net.torvald.terrarum.gameactors
import com.badlogic.gdx.Gdx import com.badlogic.gdx.Gdx
import net.torvald.terrarum.Terrarum
import net.torvald.terrarum.itemproperties.GameItem import net.torvald.terrarum.itemproperties.GameItem
import net.torvald.terrarum.itemproperties.ItemCodex import net.torvald.terrarum.itemproperties.ItemCodex
@@ -27,7 +28,7 @@ interface Pocketed {
} }
inventory.itemEquipped[item.equipPosition] = null inventory.itemEquipped[item.equipPosition] = null
item.effectOnUnequip(Gdx.graphics.deltaTime) item.effectOnUnequip(Terrarum.deltaTime)
} }
// no need for equipSlot(Int) // no need for equipSlot(Int)
@@ -49,7 +50,7 @@ interface Pocketed {
if (item.equipPosition >= 0) { if (item.equipPosition >= 0) {
inventory.itemEquipped[item.equipPosition] = item inventory.itemEquipped[item.equipPosition] = item
item.effectWhenEquipped(Gdx.graphics.deltaTime) item.effectWhenEquipped(Terrarum.deltaTime)
} }
// else do nothing // else do nothing
} }
@@ -68,13 +69,13 @@ interface Pocketed {
fun consumePrimary(item: GameItem) { fun consumePrimary(item: GameItem) {
if (item.primaryUse(Gdx.graphics.deltaTime)) { if (item.primaryUse(Terrarum.deltaTime)) {
inventory.consumeItem(this as Actor, item) // consume on successful inventory.consumeItem(this as Actor, item) // consume on successful
} }
} }
fun consumeSecondary(item: GameItem) { fun consumeSecondary(item: GameItem) {
if (item.secondaryUse(Gdx.graphics.deltaTime)) if (item.secondaryUse(Terrarum.deltaTime))
inventory.consumeItem(this as Actor, item) // consume on successful inventory.consumeItem(this as Actor, item) // consume on successful
} }
} }

4
src/net/torvald/terrarum/gameactors/ProjectileHoming.kt
View File

@@ -1,15 +1,17 @@
package net.torvald.terrarum.gameactors package net.torvald.terrarum.gameactors
import net.torvald.terrarum.gameworld.GameWorld
import org.dyn4j.geometry.Vector2 import org.dyn4j.geometry.Vector2
/** /**
* Created by minjaesong on 16-08-29. * Created by minjaesong on 16-08-29.
*/ */
class ProjectileHoming( class ProjectileHoming(
world: GameWorld,
type: Int, type: Int,
fromPoint: Vector2, // projected coord fromPoint: Vector2, // projected coord
toPoint: Vector2 // arriving coord toPoint: Vector2 // arriving coord
) : ProjectileSimple(type, fromPoint, toPoint) { ) : ProjectileSimple(world, type, fromPoint, toPoint) {

4
src/net/torvald/terrarum/gameactors/ProjectileSimple.kt
View File

@@ -6,6 +6,7 @@ import net.torvald.point.Point2d
import net.torvald.terrarum.Terrarum import net.torvald.terrarum.Terrarum
import net.torvald.terrarum.blockproperties.Block import net.torvald.terrarum.blockproperties.Block
import net.torvald.terrarum.blockproperties.BlockCodex import net.torvald.terrarum.blockproperties.BlockCodex
import net.torvald.terrarum.gameworld.GameWorld
import org.dyn4j.geometry.Vector2 import org.dyn4j.geometry.Vector2
import java.util.* import java.util.*
@@ -17,10 +18,11 @@ import java.util.*
// TODO simplified, lightweight physics (does not call PhysicsSolver) // TODO simplified, lightweight physics (does not call PhysicsSolver)
open class ProjectileSimple( open class ProjectileSimple(
world: GameWorld,
private val type: Int, private val type: Int,
fromPoint: Vector2, // projected coord fromPoint: Vector2, // projected coord
toPoint: Vector2 // arriving coord toPoint: Vector2 // arriving coord
) : ActorWithPhysics(Actor.RenderOrder.MIDTOP), Luminous, Projectile { ) : ActorWithPhysics(world, Actor.RenderOrder.MIDTOP), Luminous, Projectile {
val damage: Int val damage: Int
val displayColour: Color val displayColour: Color

3
src/net/torvald/terrarum/gameactors/TapestryObject.kt
View File

@@ -4,12 +4,13 @@ import com.badlogic.gdx.graphics.Pixmap
import com.badlogic.gdx.graphics.Texture import com.badlogic.gdx.graphics.Texture
import com.badlogic.gdx.graphics.g2d.SpriteBatch import com.badlogic.gdx.graphics.g2d.SpriteBatch
import net.torvald.terrarum.Terrarum import net.torvald.terrarum.Terrarum
import net.torvald.terrarum.gameworld.GameWorld
import net.torvald.terrarumsansbitmap.gdx.TextureRegionPack import net.torvald.terrarumsansbitmap.gdx.TextureRegionPack
/** /**
* Created by minjaesong on 2017-01-07. * Created by minjaesong on 2017-01-07.
*/ */
class TapestryObject(pixmap: Pixmap, val artName: String, val artAuthor: String) : FixtureBase(physics = false) { class TapestryObject(world: GameWorld, pixmap: Pixmap, val artName: String, val artAuthor: String) : FixtureBase(world, physics = false) {
// physics = false only speeds up for ~2 frames with 50 tapestries // physics = false only speeds up for ~2 frames with 50 tapestries

6
src/net/torvald/terrarum/gameactors/ThreadActorUpdate.kt
View File

@@ -10,13 +10,13 @@ class ThreadActorUpdate(val startIndex: Int, val endIndex: Int) : Runnable {
override fun run() { override fun run() {
for (i in startIndex..endIndex) { for (i in startIndex..endIndex) {
val it = Terrarum.ingame!!.actorContainer[i] val it = Terrarum.ingame!!.actorContainer[i]
it.update(Gdx.graphics.deltaTime) it.update(Terrarum.deltaTime)
if (it is Pocketed) { if (it is Pocketed) {
it.inventory.forEach { inventoryEntry -> it.inventory.forEach { inventoryEntry ->
inventoryEntry.item.effectWhileInPocket(Gdx.graphics.deltaTime) inventoryEntry.item.effectWhileInPocket(Terrarum.deltaTime)
if (it.equipped(inventoryEntry.item)) { if (it.equipped(inventoryEntry.item)) {
inventoryEntry.item.effectWhenEquipped(Gdx.graphics.deltaTime) inventoryEntry.item.effectWhenEquipped(Terrarum.deltaTime)
} }
} }
} }

3
src/net/torvald/terrarum/gameactors/WeaponSwung.kt
View File

@@ -1,11 +1,12 @@
package net.torvald.terrarum.gameactors package net.torvald.terrarum.gameactors
import com.badlogic.gdx.graphics.Color import com.badlogic.gdx.graphics.Color
import net.torvald.terrarum.gameworld.GameWorld
/** /**
* Created by minjaesong on 16-04-26. * Created by minjaesong on 16-04-26.
*/ */
class WeaponSwung(val itemID: Int) : ActorWithPhysics(Actor.RenderOrder.MIDTOP), Luminous { class WeaponSwung(world: GameWorld, val itemID: Int) : ActorWithPhysics(world, Actor.RenderOrder.MIDTOP), Luminous {
// just let the solver use AABB; it's cheap but works just enough // just let the solver use AABB; it's cheap but works just enough
/** /**

4
src/net/torvald/terrarum/gameactors/ai/ActorAI.kt
View File

@@ -1,8 +1,10 @@
package net.torvald.terrarum.gameactors.ai package net.torvald.terrarum.gameactors.ai
import net.torvald.terrarum.gameactors.HumanoidNPC
/** /**
* Created by minjaesong on 16-03-02. * Created by minjaesong on 16-03-02.
*/ */
interface ActorAI { interface ActorAI {
fun update(delta: Float) fun update(actor: HumanoidNPC, delta: Float)
} }

4
src/net/torvald/terrarum/gameactors/ai/LuaAIWrapper.kt
View File

@@ -1,7 +1,9 @@
package net.torvald.terrarum.gameactors.ai package net.torvald.terrarum.gameactors.ai
import net.torvald.terrarum.gameactors.Actor import net.torvald.terrarum.gameactors.Actor
import net.torvald.terrarum.gameactors.ActorHumanoid
import net.torvald.terrarum.gameactors.ActorWithPhysics import net.torvald.terrarum.gameactors.ActorWithPhysics
import net.torvald.terrarum.gameactors.HumanoidNPC
import org.luaj.vm2.Globals import org.luaj.vm2.Globals
import org.luaj.vm2.LuaError import org.luaj.vm2.LuaError
import org.luaj.vm2.LuaInteger import org.luaj.vm2.LuaInteger
@@ -45,7 +47,7 @@ class LuaAIWrapper(private val scriptPath: String) : ActorAI {
luaInstance.call() luaInstance.call()
} }
override fun update(delta: Float) { override fun update(actor: HumanoidNPC, delta: Float) {
// run "update()" function in the script // run "update()" function in the script
luag.get("update").call(delta.toLua()) luag.get("update").call(delta.toLua())
} }

21
src/net/torvald/terrarum/gamecontroller/IngameController.kt
View File

@@ -33,23 +33,6 @@ class IngameController(val ingame: Ingame) : InputAdapter() {
get() = (mouseY / FeaturesDrawer.TILE_SIZE).floorInt() get() = (mouseY / FeaturesDrawer.TILE_SIZE).floorInt()
fun update(delta: Float) { fun update(delta: Float) {
// actor process input
if (!ingame.consoleHandler.isTakingControl) {
if (ingame.canPlayerControl) {
ingame.actorContainer.forEach {
if (it is Controllable) {
// disable control of actor if the actor is riding something?
if ((it as ActorHumanoid).vehicleRiding != null) {
it.vehicleRiding!!.processInput(delta)
}
else {
it.processInput(delta)
}
}
}
}
}
/////////////////// ///////////////////
// MOUSE CONTROL // // MOUSE CONTROL //
@@ -133,10 +116,10 @@ class IngameController(val ingame: Ingame) : InputAdapter() {
if (itemOnGrip != null) { if (itemOnGrip != null) {
if (button == Terrarum.getConfigInt("mouseprimary")) { if (button == Terrarum.getConfigInt("mouseprimary")) {
itemOnGrip.endPrimaryUse(Gdx.graphics.deltaTime) itemOnGrip.endPrimaryUse(Terrarum.deltaTime)
} }
if (button == Terrarum.getConfigInt("mousesecondary")) { if (button == Terrarum.getConfigInt("mousesecondary")) {
itemOnGrip.endSecondaryUse(Gdx.graphics.deltaTime) itemOnGrip.endSecondaryUse(Terrarum.deltaTime)
} }
} }
} }

12
src/net/torvald/terrarum/gameworld/GameWorld.kt
View File

@@ -158,13 +158,13 @@ class GameWorld(val width: Int, val height: Int) {
fun setTileWall(x: Int, y: Int, tile: Byte, damage: Int) { fun setTileWall(x: Int, y: Int, tile: Byte, damage: Int) {
layerWall.setTile(x fmod width, y, tile) layerWall.setTile(x fmod width, y, tile)
layerWallLowBits.setData(x fmod width, y, damage) layerWallLowBits.setData(x fmod width, y, damage)
wallDamages.remove(LandUtil.getBlockAddr(x, y)) wallDamages.remove(LandUtil.getBlockAddr(this, x, y))
} }
fun setTileTerrain(x: Int, y: Int, tile: Byte, damage: Int) { fun setTileTerrain(x: Int, y: Int, tile: Byte, damage: Int) {
layerTerrain.setTile(x fmod width, y, tile) layerTerrain.setTile(x fmod width, y, tile)
layerTerrainLowBits.setData(x fmod width, y, damage) layerTerrainLowBits.setData(x fmod width, y, damage)
terrainDamages.remove(LandUtil.getBlockAddr(x, y)) terrainDamages.remove(LandUtil.getBlockAddr(this, x, y))
} }
fun setTileWire(x: Int, y: Int, tile: Byte) { fun setTileWire(x: Int, y: Int, tile: Byte) {
@@ -235,7 +235,7 @@ class GameWorld(val width: Int, val height: Int) {
*/ */
fun inflictTerrainDamage(x: Int, y: Int, damage: Double): Boolean { fun inflictTerrainDamage(x: Int, y: Int, damage: Double): Boolean {
val damage = damage.toFloat() val damage = damage.toFloat()
val addr = LandUtil.getBlockAddr(x, y) val addr = LandUtil.getBlockAddr(this, x, y)
//println("[GameWorld] ($x, $y) Damage: $damage") //println("[GameWorld] ($x, $y) Damage: $damage")
@@ -260,14 +260,14 @@ class GameWorld(val width: Int, val height: Int) {
return false return false
} }
fun getTerrainDamage(x: Int, y: Int): Float = fun getTerrainDamage(x: Int, y: Int): Float =
terrainDamages[LandUtil.getBlockAddr(x, y)] ?: 0f terrainDamages[LandUtil.getBlockAddr(this, x, y)] ?: 0f
/** /**
* @return true if block is broken * @return true if block is broken
*/ */
fun inflictWallDamage(x: Int, y: Int, damage: Double): Boolean { fun inflictWallDamage(x: Int, y: Int, damage: Double): Boolean {
val damage = damage.toFloat() val damage = damage.toFloat()
val addr = LandUtil.getBlockAddr(x, y) val addr = LandUtil.getBlockAddr(this, x, y)
if (wallDamages[addr] == null) { // add new if (wallDamages[addr] == null) { // add new
wallDamages[addr] = damage wallDamages[addr] = damage
@@ -288,7 +288,7 @@ class GameWorld(val width: Int, val height: Int) {
return false return false
} }
fun getWallDamage(x: Int, y: Int): Float = fun getWallDamage(x: Int, y: Int): Float =
wallDamages[LandUtil.getBlockAddr(x, y)] ?: 0f wallDamages[LandUtil.getBlockAddr(this, x, y)] ?: 0f
fun getTemperature(worldTileX: Int, worldTileY: Int): Float? { fun getTemperature(worldTileX: Int, worldTileY: Int): Float? {

6
src/net/torvald/terrarum/itemproperties/ItemCodex.kt
View File

@@ -130,7 +130,7 @@ object ItemCodex {
override fun primaryUse(delta: Float): Boolean { override fun primaryUse(delta: Float): Boolean {
val mousePoint = Point2d(Terrarum.mouseTileX.toDouble(), Terrarum.mouseTileY.toDouble()) val mousePoint = Point2d(Terrarum.mouseTileX.toDouble(), Terrarum.mouseTileY.toDouble())
val actorvalue = Terrarum.ingame!!.player!!.actorValue val actorvalue = Terrarum.ingame!!.player.actorValue
using = true using = true
@@ -153,7 +153,7 @@ object ItemCodex {
Terrarum.ingame!!.world.inflictTerrainDamage( Terrarum.ingame!!.world.inflictTerrainDamage(
Terrarum.mouseTileX, Terrarum.mouseTileX,
Terrarum.mouseTileY, Terrarum.mouseTileY,
Calculate.pickaxePower(Terrarum.ingame!!.player!!, material) * swingDmgToFrameDmg Calculate.pickaxePower(Terrarum.ingame!!.player, material) * swingDmgToFrameDmg
) )
return true return true
} }
@@ -161,7 +161,7 @@ object ItemCodex {
override fun endPrimaryUse(delta: Float): Boolean { override fun endPrimaryUse(delta: Float): Boolean {
using = false using = false
// reset action timer to zero // reset action timer to zero
Terrarum.ingame!!.player!!.actorValue[AVKey.__ACTION_TIMER] = 0.0 Terrarum.ingame!!.player.actorValue[AVKey.__ACTION_TIMER] = 0.0
return true return true
} }
}*/ }*/

6
src/net/torvald/terrarum/modulebasegame/items/PickaxeGeneric.kt
View File

@@ -37,7 +37,7 @@ class PickaxeGeneric(override val originalID: ItemID) : GameItem() {
val mouseTileY = Terrarum.mouseTileY val mouseTileY = Terrarum.mouseTileY
val mousePoint = Point2d(mouseTileX.toDouble(), mouseTileY.toDouble()) val mousePoint = Point2d(mouseTileX.toDouble(), mouseTileY.toDouble())
val actorvalue = Terrarum.ingame!!.player!!.actorValue val actorvalue = Terrarum.ingame!!.player.actorValue
using = true using = true
@@ -57,7 +57,7 @@ class PickaxeGeneric(override val originalID: ItemID) : GameItem() {
Terrarum.ingame!!.world.inflictTerrainDamage( Terrarum.ingame!!.world.inflictTerrainDamage(
mouseTileX, mouseTileY, mouseTileX, mouseTileY,
Calculate.pickaxePower(Terrarum.ingame!!.player!!, material) * swingDmgToFrameDmg Calculate.pickaxePower(Terrarum.ingame!!.player, material) * swingDmgToFrameDmg
) )
return true return true
@@ -66,7 +66,7 @@ class PickaxeGeneric(override val originalID: ItemID) : GameItem() {
override fun endPrimaryUse(delta: Float): Boolean { override fun endPrimaryUse(delta: Float): Boolean {
using = false using = false
// reset action timer to zero // reset action timer to zero
Terrarum.ingame!!.player!!.actorValue.set(AVKey.__ACTION_TIMER, 0.0) Terrarum.ingame!!.player.actorValue.set(AVKey.__ACTION_TIMER, 0.0)
return true return true
} }
} }

9
src/net/torvald/terrarum/realestate/LandUtil.kt
View File

@@ -3,16 +3,17 @@ package net.torvald.terrarum.realestate
import net.torvald.terrarum.Terrarum import net.torvald.terrarum.Terrarum
import net.torvald.terrarum.gameactors.faction.FactionCodex import net.torvald.terrarum.gameactors.faction.FactionCodex
import net.torvald.terrarum.gameworld.BlockAddress import net.torvald.terrarum.gameworld.BlockAddress
import net.torvald.terrarum.gameworld.GameWorld
/** /**
* Created by minjaesong on 16-03-27. * Created by minjaesong on 16-03-27.
*/ */
object LandUtil { object LandUtil {
fun getBlockAddr(x: Int, y: Int): BlockAddress = fun getBlockAddr(world: GameWorld, x: Int, y: Int): BlockAddress =
(Terrarum.ingame!!.world.width * y).toLong() + x (world.width * y).toLong() + x
fun resolveBlockAddr(t: BlockAddress): Pair<Int, Int> = fun resolveBlockAddr(world: GameWorld, t: BlockAddress): Pair<Int, Int> =
Pair((t % Terrarum.ingame!!.world.width).toInt(), (t / Terrarum.ingame!!.world.width).toInt()) Pair((t % world.width).toInt(), (t / world.width).toInt())
/** /**
* Get owner ID as an Actor/Faction * Get owner ID as an Actor/Faction

13
src/net/torvald/terrarum/realestate/RealEstateCodex.kt
View File

@@ -1,5 +1,6 @@
package net.torvald.terrarum.realestate package net.torvald.terrarum.realestate
import net.torvald.terrarum.gameworld.GameWorld
import java.util.* import java.util.*
/** /**
@@ -13,14 +14,14 @@ object RealEstateCodex {
*/ */
private var ownershipRegistry: HashMap<Long, Int> = HashMap() private var ownershipRegistry: HashMap<Long, Int> = HashMap()
fun setOwner(tileX: Int, tileY: Int, refID: Int) { fun setOwner(world: GameWorld, tileX: Int, tileY: Int, refID: Int) {
ownershipRegistry[LandUtil.getBlockAddr(tileX, tileY)] = refID ownershipRegistry[LandUtil.getBlockAddr(world, tileX, tileY)] = refID
} }
fun removeOwner(tileX: Int, tileY: Int) { fun removeOwner(world: GameWorld, tileX: Int, tileY: Int) {
ownershipRegistry.remove(LandUtil.getBlockAddr(tileX, tileY)) ownershipRegistry.remove(LandUtil.getBlockAddr(world, tileX, tileY))
} }
fun getOwner(tileX: Int, tileY: Int): Int? = fun getOwner(world: GameWorld, tileX: Int, tileY: Int): Int? =
ownershipRegistry[LandUtil.getBlockAddr(tileX, tileY)] ownershipRegistry[LandUtil.getBlockAddr(world, tileX, tileY)]
} }

18
src/net/torvald/terrarum/ui/BasicDebugInfoWindow.kt
View File

@@ -19,8 +19,6 @@ class BasicDebugInfoWindow : UICanvas() {
override var openCloseTime: Float = 0f override var openCloseTime: Float = 0f
override var handler: UIHandler? = null
private var prevPlayerX = 0.0 private var prevPlayerX = 0.0
private var prevPlayerY = 0.0 private var prevPlayerY = 0.0
@@ -30,7 +28,7 @@ class BasicDebugInfoWindow : UICanvas() {
override fun update(delta: Float) { override fun update(delta: Float) {
val player = Terrarum.ingame!!.player!! val player = Terrarum.ingame!!.player
val hitbox = player.hitbox val hitbox = player.hitbox
xdelta = hitbox.canonicalX - prevPlayerX xdelta = hitbox.canonicalX - prevPlayerX
@@ -49,7 +47,7 @@ class BasicDebugInfoWindow : UICanvas() {
batch.color = Color(0xFFEE88FF.toInt()) batch.color = Color(0xFFEE88FF.toInt())
val hitbox = player?.hitbox val hitbox = player.hitbox
/** /**
* First column * First column
@@ -80,11 +78,11 @@ class BasicDebugInfoWindow : UICanvas() {
+ "${(hitbox?.endY?.div(FeaturesDrawer.TILE_SIZE))?.toInt()}" + "${(hitbox?.endY?.div(FeaturesDrawer.TILE_SIZE))?.toInt()}"
+ ")") + ")")
printLine(batch, 3, "veloX reported $ccG${player?.externalForce?.x}") printLine(batch, 3, "veloX reported $ccG${player.externalForce?.x}")
printLine(batch, 4, "veloY reported $ccG${player?.externalForce?.y}") printLine(batch, 4, "veloY reported $ccG${player.externalForce?.y}")
printLine(batch, 5, "p_WalkX $ccG${player?.controllerMoveDelta?.x}") printLine(batch, 5, "p_WalkX $ccG${player.controllerMoveDelta?.x}")
printLine(batch, 6, "p_WalkY $ccG${player?.controllerMoveDelta?.y}") printLine(batch, 6, "p_WalkY $ccG${player.controllerMoveDelta?.y}")
printLineColumn(batch, 2, 3, "veloX measured $ccG${xdelta}") printLineColumn(batch, 2, 3, "veloX measured $ccG${xdelta}")
printLineColumn(batch, 2, 4, "veloY measured $ccG${ydelta}") printLineColumn(batch, 2, 4, "veloY measured $ccG${ydelta}")
@@ -130,9 +128,9 @@ class BasicDebugInfoWindow : UICanvas() {
printLineColumn(batch, 2, 5, "Time $ccG${Terrarum.ingame!!.world.time.todaySeconds.toString().padStart(5, '0')}" + printLineColumn(batch, 2, 5, "Time $ccG${Terrarum.ingame!!.world.time.todaySeconds.toString().padStart(5, '0')}" +
" (${Terrarum.ingame!!.world.time.getFormattedTime()})") " (${Terrarum.ingame!!.world.time.getFormattedTime()})")
printLineColumn(batch, 2, 6, "Mass $ccG${player?.mass}") printLineColumn(batch, 2, 6, "Mass $ccG${player.mass}")
printLineColumn(batch, 2, 7, "noClip $ccG${player?.noClip}") printLineColumn(batch, 2, 7, "noClip $ccG${player.noClip}")
drawHistogram(batch, LightmapRenderer.histogram, drawHistogram(batch, LightmapRenderer.histogram,

2
src/net/torvald/terrarum/ui/ConsoleWindow.kt
View File

@@ -40,8 +40,6 @@ class ConsoleWindow : UICanvas() {
private var drawOffY: Float = -height.toFloat() private var drawOffY: Float = -height.toFloat()
private var openingTimeCounter = 0f private var openingTimeCounter = 0f
override var handler: UIHandler? = null
private var historyIndex = -1 private var historyIndex = -1
init { init {

2
src/net/torvald/terrarum/ui/MessageWindow.kt
View File

@@ -23,8 +23,6 @@ class MessageWindow(override var width: Int, isBlackVariant: Boolean) : UICanvas
override var openCloseTime: Second = OPEN_CLOSE_TIME override var openCloseTime: Second = OPEN_CLOSE_TIME
override var handler: UIHandler? = null
private val LRmargin = 0f // there's "base value" of 8 px for LR (width of segment tile) private val LRmargin = 0f // there's "base value" of 8 px for LR (width of segment tile)

12
src/net/torvald/terrarum/ui/Notification.kt
View File

@@ -26,14 +26,12 @@ class Notification : UICanvas() {
override var openCloseTime: Second = MessageWindow.OPEN_CLOSE_TIME override var openCloseTime: Second = MessageWindow.OPEN_CLOSE_TIME
override var handler: UIHandler? = null
override fun update(delta: Float) { override fun update(delta: Float) {
if (handler!!.isOpened) if (handler.isOpened)
displayTimer += delta displayTimer += delta
if (displayTimer >= visibleTime) { if (displayTimer >= visibleTime) {
handler!!.setAsClose() handler.setAsClose()
displayTimer = 0f displayTimer = 0f
} }
} }
@@ -61,9 +59,9 @@ class Notification : UICanvas() {
fun sendNotification(message: Array<String>) { fun sendNotification(message: Array<String>) {
this.message = message this.message = message
msgUI.setMessage(this.message) msgUI.setMessage(this.message)
handler!!.openCloseCounter = 0f handler.openCloseCounter = 0f
handler!!.opacity = 0f handler.opacity = 0f
handler!!.setAsOpen() handler.setAsOpen()
} }
override fun dispose() { override fun dispose() {

1
src/net/torvald/terrarum/ui/NullUI.kt
View File

@@ -8,7 +8,6 @@ import com.badlogic.gdx.graphics.g2d.SpriteBatch
class NullUI : UICanvas() { class NullUI : UICanvas() {
override var width: Int = 0 override var width: Int = 0
override var height: Int = 0 override var height: Int = 0
override var handler: UIHandler? = null
override var openCloseTime = 0f override var openCloseTime = 0f
override fun update(delta: Float) { override fun update(delta: Float) {

1
src/net/torvald/terrarum/ui/UIBasicNotifier.kt
View File

@@ -18,7 +18,6 @@ import net.torvald.terrarumsansbitmap.gdx.TextureRegionPack
class UIBasicNotifier(private val player: ActorHumanoid?) : UICanvas() { class UIBasicNotifier(private val player: ActorHumanoid?) : UICanvas() {
override var width = 116 override var width = 116
override var height = 24 override var height = 24
override var handler: UIHandler? = null
override var openCloseTime: Second = 0f override var openCloseTime: Second = 0f
private var ELuptimer = 10f // to make the light turned off by default private var ELuptimer = 10f // to make the light turned off by default

70
src/net/torvald/terrarum/ui/UICanvas.kt
View File

@@ -20,7 +20,7 @@ abstract class UICanvas {
/** /**
* Usage: (in StateInGame:) uiHandlerField.ui.handler = uiHandlerField * Usage: (in StateInGame:) uiHandlerField.ui.handler = uiHandlerField
*/ */
abstract var handler: UIHandler? open lateinit var handler: UIHandler
/** /**
* In milliseconds * In milliseconds
@@ -34,9 +34,9 @@ abstract class UICanvas {
val relativeMouseX: Int val relativeMouseX: Int
get() = (Terrarum.mouseScreenX - (handler?.posX ?: 0)) get() = Terrarum.mouseScreenX - handler.posX
val relativeMouseY: Int val relativeMouseY: Int
get() = (Terrarum.mouseScreenY - (handler?.posY ?: 0)) get() = Terrarum.mouseScreenY - handler.posY
/** If mouse is hovering over it */ /** If mouse is hovering over it */
val mouseUp: Boolean val mouseUp: Boolean
@@ -51,22 +51,22 @@ abstract class UICanvas {
abstract fun render(batch: SpriteBatch) abstract fun render(batch: SpriteBatch)
/** /**
* Do not modify handler!!.openCloseCounter here. * Do not modify handler.openCloseCounter here.
*/ */
abstract fun doOpening(delta: Float) abstract fun doOpening(delta: Float)
/** /**
* Do not modify handler!!.openCloseCounter here. * Do not modify handler.openCloseCounter here.
*/ */
abstract fun doClosing(delta: Float) abstract fun doClosing(delta: Float)
/** /**
* Do not modify handler!!.openCloseCounter here. * Do not modify handler.openCloseCounter here.
*/ */
abstract fun endOpening(delta: Float) abstract fun endOpening(delta: Float)
/** /**
* Do not modify handler!!.openCloseCounter here. * Do not modify handler.openCloseCounter here.
*/ */
abstract fun endClosing(delta: Float) abstract fun endClosing(delta: Float)
@@ -118,82 +118,82 @@ abstract class UICanvas {
companion object { companion object {
const val OPENCLOSE_GENERIC = 0.2f const val OPENCLOSE_GENERIC = 0.2f
fun doOpeningFade(handler: UIHandler?, openCloseTime: Second) { fun doOpeningFade(handler: UIHandler, openCloseTime: Second) {
handler!!.opacity = handler.openCloseCounter / openCloseTime handler.opacity = handler.openCloseCounter / openCloseTime
} }
fun doClosingFade(handler: UIHandler?, openCloseTime: Second) { fun doClosingFade(handler: UIHandler, openCloseTime: Second) {
handler!!.opacity = (openCloseTime - handler.openCloseCounter) / openCloseTime handler.opacity = (openCloseTime - handler.openCloseCounter) / openCloseTime
} }
fun endOpeningFade(handler: UIHandler?) { fun endOpeningFade(handler: UIHandler) {
handler!!.opacity = 1f handler.opacity = 1f
} }
fun endClosingFade(handler: UIHandler?) { fun endClosingFade(handler: UIHandler) {
handler!!.opacity = 0f handler.opacity = 0f
} }
fun doOpeningPopOut(handler: UIHandler?, openCloseTime: Second, position: Position) { fun doOpeningPopOut(handler: UIHandler, openCloseTime: Second, position: Position) {
when (position) { when (position) {
Position.LEFT -> handler!!.posX = Movement.fastPullOut( Position.LEFT -> handler.posX = Movement.fastPullOut(
handler.openCloseCounter / openCloseTime, handler.openCloseCounter / openCloseTime,
-handler.UI.width.toFloat(), -handler.UI.width.toFloat(),
0f 0f
).roundInt() ).roundInt()
Position.TOP -> handler!!.posY = Movement.fastPullOut( Position.TOP -> handler.posY = Movement.fastPullOut(
handler.openCloseCounter / openCloseTime, handler.openCloseCounter / openCloseTime,
-handler.UI.height.toFloat(), -handler.UI.height.toFloat(),
0f 0f
).roundInt() ).roundInt()
Position.RIGHT -> handler!!.posX = Movement.fastPullOut( Position.RIGHT -> handler.posX = Movement.fastPullOut(
handler.openCloseCounter / openCloseTime, handler.openCloseCounter / openCloseTime,
Terrarum.WIDTH.toFloat(), Terrarum.WIDTH.toFloat(),
Terrarum.WIDTH - handler.UI.width.toFloat() Terrarum.WIDTH - handler.UI.width.toFloat()
).roundInt() ).roundInt()
Position.BOTTOM -> handler!!.posY = Movement.fastPullOut( Position.BOTTOM -> handler.posY = Movement.fastPullOut(
handler.openCloseCounter / openCloseTime, handler.openCloseCounter / openCloseTime,
Terrarum.HEIGHT.toFloat(), Terrarum.HEIGHT.toFloat(),
Terrarum.HEIGHT - handler.UI.height.toFloat() Terrarum.HEIGHT - handler.UI.height.toFloat()
).roundInt() ).roundInt()
} }
} }
fun doClosingPopOut(handler: UIHandler?, openCloseTime: Second, position: Position) { fun doClosingPopOut(handler: UIHandler, openCloseTime: Second, position: Position) {
when (position) { when (position) {
Position.LEFT -> handler!!.posX = Movement.fastPullOut( Position.LEFT -> handler.posX = Movement.fastPullOut(
handler.openCloseCounter / openCloseTime, handler.openCloseCounter / openCloseTime,
0f, 0f,
-handler.UI.width.toFloat() -handler.UI.width.toFloat()
).roundInt() ).roundInt()
Position.TOP -> handler!!.posY = Movement.fastPullOut( Position.TOP -> handler.posY = Movement.fastPullOut(
handler.openCloseCounter / openCloseTime, handler.openCloseCounter / openCloseTime,
0f, 0f,
-handler.UI.height.toFloat() -handler.UI.height.toFloat()
).roundInt() ).roundInt()
Position.RIGHT -> handler!!.posX = Movement.fastPullOut( Position.RIGHT -> handler.posX = Movement.fastPullOut(
handler.openCloseCounter / openCloseTime, handler.openCloseCounter / openCloseTime,
Terrarum.WIDTH - handler.UI.width.toFloat(), Terrarum.WIDTH - handler.UI.width.toFloat(),
Terrarum.WIDTH.toFloat() Terrarum.WIDTH.toFloat()
).roundInt() ).roundInt()
Position.BOTTOM -> handler!!.posY = Movement.fastPullOut( Position.BOTTOM -> handler.posY = Movement.fastPullOut(
handler.openCloseCounter / openCloseTime, handler.openCloseCounter / openCloseTime,
Terrarum.HEIGHT - handler.UI.height.toFloat(), Terrarum.HEIGHT - handler.UI.height.toFloat(),
Terrarum.HEIGHT.toFloat() Terrarum.HEIGHT.toFloat()
).roundInt() ).roundInt()
} }
} }
fun endOpeningPopOut(handler: UIHandler?, position: Position) { fun endOpeningPopOut(handler: UIHandler, position: Position) {
when (position) { when (position) {
Position.LEFT -> handler!!.posX = 0 Position.LEFT -> handler.posX = 0
Position.TOP -> handler!!.posY = 0 Position.TOP -> handler.posY = 0
Position.RIGHT -> handler!!.posX = Terrarum.WIDTH - handler.UI.width Position.RIGHT -> handler.posX = Terrarum.WIDTH - handler.UI.width
Position.BOTTOM -> handler!!.posY = Terrarum.HEIGHT - handler.UI.height Position.BOTTOM -> handler.posY = Terrarum.HEIGHT - handler.UI.height
} }
} }
fun endClosingPopOut(handler: UIHandler?, position: Position) { fun endClosingPopOut(handler: UIHandler, position: Position) {
when (position) { when (position) {
Position.LEFT -> handler!!.posX = -handler.UI.width Position.LEFT -> handler.posX = -handler.UI.width
Position.TOP -> handler!!.posY = -handler.UI.height Position.TOP -> handler.posY = -handler.UI.height
Position.RIGHT -> handler!!.posX = Terrarum.WIDTH Position.RIGHT -> handler.posX = Terrarum.WIDTH
Position.BOTTOM -> handler!!.posY = Terrarum.HEIGHT Position.BOTTOM -> handler.posY = Terrarum.HEIGHT
} }
} }

3
src/net/torvald/terrarum/ui/UIInventory.kt
View File

@@ -31,7 +31,6 @@ class UIInventory(
//val actorValue: ActorValue //val actorValue: ActorValue
// get() = (actor as Actor).actorValue // get() = (actor as Actor).actorValue
override var handler: UIHandler? = null
override var openCloseTime: Second = 0.12f override var openCloseTime: Second = 0.12f
val catButtonsToCatIdent = HashMap<String, String>() val catButtonsToCatIdent = HashMap<String, String>()
@@ -204,7 +203,7 @@ class UIInventory(
// monitor and check if category selection has been changed // monitor and check if category selection has been changed
// OR UI is being opened from closed state // OR UI is being opened from closed state
if (oldCatSelect != catButtons.selectedIndex || if (oldCatSelect != catButtons.selectedIndex ||
!rebuildList && handler!!.openFired) { !rebuildList && handler.openFired) {
rebuildList = true rebuildList = true
} }

35
src/net/torvald/terrarum/ui/UIPieMenu.kt
View File

@@ -19,11 +19,10 @@ class UIPieMenu : UICanvas() {
private val slotCount = UIQuickBar.SLOT_COUNT private val slotCount = UIQuickBar.SLOT_COUNT
private val slotDistanceFromCentre: Double private val slotDistanceFromCentre: Double
get() = cellSize * 2.7 * handler!!.scale get() = cellSize * 2.8 * handler.scale
override var width: Int = cellSize * 7 override var width: Int = cellSize * 7
override var height: Int = width override var height: Int = width
override var handler: UIHandler? = null
/** /**
* In milliseconds * In milliseconds
@@ -35,16 +34,14 @@ class UIPieMenu : UICanvas() {
var selection: Int = -1 var selection: Int = -1
override fun update(delta: Float) { override fun update(delta: Float) {
if (Terrarum.ingame!!.player != null) { if (selection >= 0)
if (selection >= 0) Terrarum.ingame!!.player.actorValue[AVKey.__PLAYER_QUICKSLOTSEL] =
Terrarum.ingame!!.player!!.actorValue[AVKey.__PLAYER_QUICKSLOTSEL] = selection % slotCount
selection % slotCount
}
// update controls // update controls
if (handler!!.isOpened || handler!!.isOpening) { if (handler.isOpened || handler.isOpening) {
val cursorPos = Vector2(Terrarum.mouseX, Terrarum.mouseY) val cursorPos = Vector2(Terrarum.mouseScreenX.toDouble(), Terrarum.mouseScreenY.toDouble())
val centre = Vector2(Terrarum.HALFW.toDouble(), Terrarum.HALFH.toDouble()) val centre = Vector2(Terrarum.HALFW.toDouble(), Terrarum.HALFH.toDouble())
val deg = -(centre - cursorPos).direction.toFloat() val deg = -(centre - cursorPos).direction.toFloat()
@@ -60,7 +57,7 @@ class UIPieMenu : UICanvas() {
for (i in 0..slotCount - 1) { for (i in 0..slotCount - 1) {
// set position // set position
val angle = Math.PI * 2.0 * (i.toDouble() / slotCount) + Math.PI // 180 deg monitor-wise val angle = Math.PI * 2.0 * (i.toDouble() / slotCount) + Math.PI // 180 deg monitor-wise
val slotCentrePoint = Vector2(0.0, slotDistanceFromCentre).setDirection(-angle)// + centrePoint val slotCentrePoint = Vector2(0.0, slotDistanceFromCentre).setDirection(-angle) // NOTE: NOT a center of circle!
// draw cells // draw cells
val image = if (i == selection) val image = if (i == selection)
@@ -70,10 +67,10 @@ class UIPieMenu : UICanvas() {
val slotSize = image.width val slotSize = image.width
val slotX = slotCentrePoint.x.toFloat() - (slotSize / 2) + Terrarum.HALFW val slotX = slotCentrePoint.x.toFloat() - (slotSize / 2)
val slotY = slotCentrePoint.y.toFloat() - (slotSize / 2) + Terrarum.HALFH val slotY = slotCentrePoint.y.toFloat() - (slotSize / 2)
batch.color = Color(1f, 1f, 1f, handler!!.opacity * UIQuickBar.finalOpacity) batch.color = Color(1f, 1f, 1f, handler.opacity * UIQuickBar.finalOpacity)
batch.draw( batch.draw(
image, image,
slotX, slotX,
@@ -82,14 +79,14 @@ class UIPieMenu : UICanvas() {
// draw item // draw item
val itemPair = Terrarum.ingame!!.player!!.inventory.getQuickBar(i) val itemPair = Terrarum.ingame!!.player.inventory.getQuickBar(i)
if (itemPair != null) { if (itemPair != null) {
val itemImage = ItemCodex.getItemImage(itemPair.item) val itemImage = ItemCodex.getItemImage(itemPair.item)
val itemW = itemImage.regionWidth val itemW = itemImage.regionWidth
val itemH = itemImage.regionHeight val itemH = itemImage.regionHeight
batch.color = Color(1f, 1f, 1f, handler!!.opacity) batch.color = Color(1f, 1f, 1f, handler.opacity)
batch.draw( batch.draw(
itemImage, // using fixed CELL_SIZE for reasons itemImage, // using fixed CELL_SIZE for reasons
slotX + (CELL_SIZE - itemW) / 2f, slotX + (CELL_SIZE - itemW) / 2f,
@@ -101,22 +98,22 @@ class UIPieMenu : UICanvas() {
override fun doOpening(delta: Float) { override fun doOpening(delta: Float) {
UICanvas.doOpeningFade(handler, openCloseTime) UICanvas.doOpeningFade(handler, openCloseTime)
handler!!.scale = smallenSize + (1f.minus(smallenSize) * handler!!.opacity) handler.scale = smallenSize + (1f.minus(smallenSize) * handler.opacity)
} }
override fun doClosing(delta: Float) { override fun doClosing(delta: Float) {
UICanvas.doClosingFade(handler, openCloseTime) UICanvas.doClosingFade(handler, openCloseTime)
handler!!.scale = smallenSize + (1f.minus(smallenSize) * handler!!.opacity) handler.scale = smallenSize + (1f.minus(smallenSize) * handler.opacity)
} }
override fun endOpening(delta: Float) { override fun endOpening(delta: Float) {
UICanvas.endOpeningFade(handler) UICanvas.endOpeningFade(handler)
handler!!.scale = 1f handler.scale = 1f
} }
override fun endClosing(delta: Float) { override fun endClosing(delta: Float) {
UICanvas.endClosingFade(handler) UICanvas.endClosingFade(handler)
handler!!.scale = 1f handler.scale = 1f
} }
override fun dispose() { override fun dispose() {

42
src/net/torvald/terrarum/ui/UIQuickBar.kt
View File

@@ -1,5 +1,6 @@
package net.torvald.terrarum.ui package net.torvald.terrarum.ui
import com.badlogic.gdx.Input
import com.badlogic.gdx.graphics.Color import com.badlogic.gdx.graphics.Color
import com.badlogic.gdx.graphics.g2d.SpriteBatch import com.badlogic.gdx.graphics.g2d.SpriteBatch
import net.torvald.terrarum.Terrarum import net.torvald.terrarum.Terrarum
@@ -23,12 +24,9 @@ class UIQuickBar : UICanvas() {
private val startPointX = ItemSlotImageBuilder.slotLarge.width / 2 private val startPointX = ItemSlotImageBuilder.slotLarge.width / 2
private val startPointY = ItemSlotImageBuilder.slotLarge.height / 2 private val startPointY = ItemSlotImageBuilder.slotLarge.height / 2
override var handler: UIHandler? = null
private var selection: Int private var selection: Int
get() = Terrarum.ingame!!.player?.actorValue?.getAsInt(AVKey.__PLAYER_QUICKSLOTSEL) ?: 0 get() = Terrarum.ingame!!.player.actorValue.getAsInt(AVKey.__PLAYER_QUICKSLOTSEL) ?: 0
set(value) { Terrarum.ingame!!.player?.actorValue?.set(AVKey.__PLAYER_QUICKSLOTSEL, value.fmod(SLOT_COUNT)) } set(value) { Terrarum.ingame!!.player.actorValue.set(AVKey.__PLAYER_QUICKSLOTSEL, value.fmod(SLOT_COUNT)) }
override fun update(delta: Float) { override fun update(delta: Float) {
} }
@@ -45,7 +43,7 @@ class UIQuickBar : UICanvas() {
val slotY = startPointY.toFloat() val slotY = startPointY.toFloat()
// draw slots // draw slots
batch.color = Color(1f, 1f, 1f, handler!!.opacity * finalOpacity) batch.color = Color(1f, 1f, 1f, handler.opacity * finalOpacity)
batch.draw( batch.draw(
image, image,
slotX, slotX,
@@ -53,14 +51,14 @@ class UIQuickBar : UICanvas() {
) )
// draw item // draw item
val itemPair = Terrarum.ingame!!.player!!.inventory.getQuickBar(i) val itemPair = Terrarum.ingame!!.player.inventory.getQuickBar(i)
if (itemPair != null) { if (itemPair != null) {
val itemImage = ItemCodex.getItemImage(itemPair.item) val itemImage = ItemCodex.getItemImage(itemPair.item)
val itemW = itemImage.regionWidth val itemW = itemImage.regionWidth
val itemH = itemImage.regionHeight val itemH = itemImage.regionHeight
batch.color = Color(1f, 1f, 1f, handler!!.opacity) batch.color = Color(1f, 1f, 1f, handler.opacity)
batch.draw( batch.draw(
itemImage, // using fixed CELL_SIZE for reasons itemImage, // using fixed CELL_SIZE for reasons
slotX + (CELL_SIZE - itemW) / 2f, slotX + (CELL_SIZE - itemW) / 2f,
@@ -72,29 +70,47 @@ class UIQuickBar : UICanvas() {
override fun doOpening(delta: Float) { override fun doOpening(delta: Float) {
handler!!.opacity = handler!!.openCloseCounter.toFloat() / openCloseTime handler.opacity = handler.openCloseCounter.toFloat() / openCloseTime
} }
override fun doClosing(delta: Float) { override fun doClosing(delta: Float) {
handler!!.opacity = (openCloseTime - handler!!.openCloseCounter.toFloat()) / openCloseTime handler.opacity = (openCloseTime - handler.openCloseCounter.toFloat()) / openCloseTime
} }
override fun endOpening(delta: Float) { override fun endOpening(delta: Float) {
handler!!.opacity = 1f handler.opacity = 1f
} }
override fun endClosing(delta: Float) { override fun endClosing(delta: Float) {
handler!!.opacity = 0f handler.opacity = 0f
} }
override fun scrolled(amount: Int): Boolean { override fun scrolled(amount: Int): Boolean {
super.scrolled(amount) // super.scrolled(amount) // no UIItems here
selection = selection.plus(if (amount > 1) 1 else if (amount < -1) -1 else 0).fmod(SLOT_COUNT) selection = selection.plus(if (amount > 1) 1 else if (amount < -1) -1 else 0).fmod(SLOT_COUNT)
return true return true
} }
override fun keyDown(keycode: Int): Boolean {
selection = when (keycode) {
Input.Keys.NUM_1 -> 0
Input.Keys.NUM_2 -> 1
Input.Keys.NUM_3 -> 2
Input.Keys.NUM_4 -> 3
Input.Keys.NUM_5 -> 4
Input.Keys.NUM_6 -> 5
Input.Keys.NUM_7 -> 6
Input.Keys.NUM_8 -> 7
Input.Keys.NUM_9 -> 8
Input.Keys.NUM_0 -> 9
else -> return false
}
return true
}
override fun dispose() { override fun dispose() {
} }

6
src/net/torvald/terrarum/ui/UIStartMenu.kt
View File

@@ -13,7 +13,8 @@ class UIStartMenu : UICanvas() {
"MENU_OPTIONS", "MENU_OPTIONS",
"MENU_MODULES", "MENU_MODULES",
"MENU_LABEL_LANGUAGE", "MENU_LABEL_LANGUAGE",
"MENU_LABEL_EXIT" "MENU_LABEL_CREDITS",
"MENU_LABEL_QUIT"
) )
val menubarOffY: Int; get() = Terrarum.HEIGHT / 2 - (Terrarum.fontGame.lineHeight * 1.5).toInt() val menubarOffY: Int; get() = Terrarum.HEIGHT / 2 - (Terrarum.fontGame.lineHeight * 1.5).toInt()
@@ -23,7 +24,6 @@ class UIStartMenu : UICanvas() {
override var width: Int = 240 override var width: Int = 240
override var height: Int = 40 * menuLabels.size.plus(1) override var height: Int = 40 * menuLabels.size.plus(1)
override var handler: UIHandler? = null
override var openCloseTime = 0f override var openCloseTime = 0f
@@ -45,7 +45,7 @@ class UIStartMenu : UICanvas() {
// attach listeners // attach listeners
menubar.buttons[menuLabels.indexOf("MENU_LABEL_EXIT")].clickOnceListener = { _, _, _ -> System.exit(0) } menubar.buttons[menuLabels.indexOf("MENU_LABEL_QUIT")].clickOnceListener = { _, _, _ -> System.exit(0) }
} }
override fun update(delta: Float) { override fun update(delta: Float) {

1
src/net/torvald/terrarum/ui/UITierOneWatch.kt
View File

@@ -20,7 +20,6 @@ import net.torvald.terrarumsansbitmap.gdx.TextureRegionPack
class UITierOneWatch(private val player: ActorHumanoid?) : UICanvas() { class UITierOneWatch(private val player: ActorHumanoid?) : UICanvas() {
override var width = 85 override var width = 85
override var height = 52 override var height = 52
override var handler: UIHandler? = null
override var openCloseTime: Second = 0f override var openCloseTime: Second = 0f
private var ELuptimer = 10f // to make the light turned off by default private var ELuptimer = 10f // to make the light turned off by default

23
src/net/torvald/terrarum/ui/UIVitalMetre.kt
View File

@@ -12,7 +12,7 @@ import net.torvald.terrarum.gameactors.Second
* Created by SKYHi14 on 2017-03-03. * Created by SKYHi14 on 2017-03-03.
*/ */
class UIVitalMetre( class UIVitalMetre(
var player: ActorHumanoid?, var player: ActorHumanoid,
var vitalGetterVal: () -> Float?, var vitalGetterVal: () -> Float?,
var vitalGetterMax: () -> Float?, var vitalGetterMax: () -> Float?,
var color: Color?, var color: Color?,
@@ -28,20 +28,13 @@ class UIVitalMetre(
private val gap = 4f private val gap = 4f
override var width: Int = 80 + 2 * margin; set(value) { throw Error("operation not permitted") } override var width: Int = 80 + 2 * margin; set(value) { throw Error("operation not permitted") }
override var height: Int; get() = player?.baseHitboxH ?: 0 * 3 + margin; set(value) { throw Error("operation not permitted") } override var height: Int; get() = player.baseHitboxH ?: 0 * 3 + margin; set(value) { throw Error("operation not permitted") }
override var handler: UIHandler? = null
set(value) {
// override customPositioning to be true
if (value != null) {
value.customPositioning = true
}
field = value
}
override var openCloseTime: Second = 0.05f override var openCloseTime: Second = 0.05f
//private val relativePX = width / 2f //private val relativePX = width / 2f
private val offsetY: Float; get() = (player?.baseHitboxH ?: 0) * 1.5f private val offsetY: Float; get() = (player.baseHitboxH ?: 0) * 1.5f
private val circleRadius: Float; get() = (player?.baseHitboxH ?: 0) * 3f private val circleRadius: Float; get() = (player.baseHitboxH ?: 0) * 3f
private val theta = 33f private val theta = 33f
private val halfTheta = theta / 2f private val halfTheta = theta / 2f
@@ -54,7 +47,7 @@ class UIVitalMetre(
} }
override fun update(delta: Float) { override fun update(delta: Float) {
handler!!.setPosition( handler.setPosition(
Terrarum.HALFW, Terrarum.HALFW,
Terrarum.HALFH Terrarum.HALFH
) )
@@ -68,8 +61,8 @@ class UIVitalMetre(
/*if (vitalGetterVal() != null && vitalGetterMax() != null && player != null) { /*if (vitalGetterVal() != null && vitalGetterMax() != null && player != null) {
g.translate( g.translate(
Terrarum.ingame!!.screenZoom * (player!!.centrePosPoint.x.toFloat() - (WorldCamera.x)), Terrarum.ingame!!.screenZoom * (player.centrePosPoint.x.toFloat() - (WorldCamera.x)),
Terrarum.ingame!!.screenZoom * (player!!.centrePosPoint.y.toFloat() - (WorldCamera.y)) Terrarum.ingame!!.screenZoom * (player.centrePosPoint.y.toFloat() - (WorldCamera.y))
) )

2
src/net/torvald/terrarum/virtualcomputer/peripheral/PeripheralVideoCard.kt
View File

@@ -155,7 +155,7 @@ import org.luaj.vm2.lib.*
private val spriteBuffer = ImageBuffer(VSprite.width * 2, VSprite.height) private val spriteBuffer = ImageBuffer(VSprite.width * 2, VSprite.height)
fun render(g: Graphics) { fun render(g: Graphics) {
cursorBlinkTimer += Gdx.graphics.deltaTime cursorBlinkTimer += Terrarum.deltaTime
if (cursorBlinkTimer > cursorBlinkTime) { if (cursorBlinkTimer > cursorBlinkTime) {
cursorBlinkTimer -= cursorBlinkTime cursorBlinkTimer -= cursorBlinkTime
cursorBlinkOn = !cursorBlinkOn cursorBlinkOn = !cursorBlinkOn

3
src/net/torvald/terrarum/virtualcomputer/worldobject/FixtureBasicTerminal.kt
View File

@@ -3,6 +3,7 @@ package net.torvald.terrarum.virtualcomputer.worldobject
import com.badlogic.gdx.graphics.Color import com.badlogic.gdx.graphics.Color
import net.torvald.terrarum.gameactors.AVKey import net.torvald.terrarum.gameactors.AVKey
import net.torvald.terrarum.gameactors.FixtureBase import net.torvald.terrarum.gameactors.FixtureBase
import net.torvald.terrarum.gameworld.GameWorld
import net.torvald.terrarum.virtualcomputer.computer.TerrarumComputer import net.torvald.terrarum.virtualcomputer.computer.TerrarumComputer
import net.torvald.terrarum.virtualcomputer.terminal.Terminal import net.torvald.terrarum.virtualcomputer.terminal.Terminal
import net.torvald.terrarum.virtualcomputer.worldobject.ui.UITextTerminal import net.torvald.terrarum.virtualcomputer.worldobject.ui.UITextTerminal
@@ -11,7 +12,7 @@ import java.util.*
/** /**
* Created by minjaesong on 16-09-08. * Created by minjaesong on 16-09-08.
*/ */
class FixtureBasicTerminal(phosphor: Color) : FixtureBase() { class FixtureBasicTerminal(world: GameWorld, phosphor: Color) : FixtureBase(world) {
/*val computer = TerrarumComputer(8) /*val computer = TerrarumComputer(8)
val vt: Terminal = SimpleTextTerminal(phosphor, 80, 25, computer) val vt: Terminal = SimpleTextTerminal(phosphor, 80, 25, computer)

3
src/net/torvald/terrarum/virtualcomputer/worldobject/FixtureComputerBase.kt
View File

@@ -1,6 +1,7 @@
package net.torvald.terrarum.virtualcomputer.worldobject package net.torvald.terrarum.virtualcomputer.worldobject
import net.torvald.terrarum.gameactors.FixtureBase import net.torvald.terrarum.gameactors.FixtureBase
import net.torvald.terrarum.gameworld.GameWorld
import net.torvald.terrarum.virtualcomputer.computer.TerrarumComputer import net.torvald.terrarum.virtualcomputer.computer.TerrarumComputer
import net.torvald.terrarum.virtualcomputer.terminal.Terminal import net.torvald.terrarum.virtualcomputer.terminal.Terminal
import java.io.PrintStream import java.io.PrintStream
@@ -10,7 +11,7 @@ import java.util.*
/** /**
* Created by minjaesong on 16-09-08. * Created by minjaesong on 16-09-08.
*/ */
open class FixtureComputerBase() : FixtureBase() { open class FixtureComputerBase(world: GameWorld) : FixtureBase(world) {
/** Connected terminal */ /** Connected terminal */
var terminal: FixtureBasicTerminal? = null var terminal: FixtureBasicTerminal? = null

13
src/net/torvald/terrarum/virtualcomputer/worldobject/ui/UITextTerminal.kt
View File

@@ -17,11 +17,6 @@ class UITextTerminal(val terminal: Terminal) : UICanvas() {
/**
* Usage: (in StateInGame:) uiHandlerField.ui.handler = uiHandlerField
*/
override var handler: UIHandler? = null
/** /**
* In milliseconds * In milliseconds
* *
@@ -38,25 +33,25 @@ class UITextTerminal(val terminal: Terminal) : UICanvas() {
} }
/** /**
* Do not modify handler!!.openCloseCounter here. * Do not modify handler.openCloseCounter here.
*/ */
override fun doOpening(delta: Float) { override fun doOpening(delta: Float) {
} }
/** /**
* Do not modify handler!!.openCloseCounter here. * Do not modify handler.openCloseCounter here.
*/ */
override fun doClosing(delta: Float) { override fun doClosing(delta: Float) {
} }
/** /**
* Do not modify handler!!.openCloseCounter here. * Do not modify handler.openCloseCounter here.
*/ */
override fun endOpening(delta: Float) { override fun endOpening(delta: Float) {
} }
/** /**
* Do not modify handler!!.openCloseCounter here. * Do not modify handler.openCloseCounter here.
*/ */
override fun endClosing(delta: Float) { override fun endClosing(delta: Float) {
} }

4
src/net/torvald/terrarum/weather/WeatherMixer.kt
View File

@@ -94,10 +94,12 @@ object WeatherMixer {
} }
private val parallaxZeroPos = WorldGenerator.TERRAIN_AVERAGE_HEIGHT// + WorldGenerator.TERRAIN_UNDULATION.div(2) //private val parallaxZeroPos = WorldGenerator.TERRAIN_AVERAGE_HEIGHT * 0.75f // just an arb multiplier (266.66666 -> 200)
private val parallaxDomainSize = WorldGenerator.TERRAIN_UNDULATION / 2f private val parallaxDomainSize = WorldGenerator.TERRAIN_UNDULATION / 2f
fun render(camera: Camera, world: GameWorld) { fun render(camera: Camera, world: GameWorld) {
val parallaxZeroPos = (world.height / 3) * 0.75f // just an arb multiplier (266.66666 -> 200)
// we will not care for nextSkybox for now // we will not care for nextSkybox for now
val timeNow = world.time.todaySeconds val timeNow = world.time.todaySeconds

27
src/net/torvald/terrarum/worlddrawer/WorldCamera.kt
View File

@@ -33,24 +33,21 @@ object WorldCamera {
get() = y + height.ushr(1) get() = y + height.ushr(1)
fun update(world: GameWorld, player: ActorWithBody) { fun update(world: GameWorld, player: ActorWithBody) {
if (Terrarum.ingame != null) { width = FastMath.ceil(Terrarum.WIDTH / (Terrarum.ingame?.screenZoom ?: 1f)) // div, not mul
height = FastMath.ceil(Terrarum.HEIGHT / (Terrarum.ingame?.screenZoom ?: 1f))
width = FastMath.ceil(Terrarum.WIDTH / (Terrarum.ingame?.screenZoom ?: 1f)) // div, not mul // position - (WH / 2)
height = FastMath.ceil(Terrarum.HEIGHT / (Terrarum.ingame?.screenZoom ?: 1f)) x = (// X only: ROUNDWORLD implementation
player.hitbox.centeredX.toFloat() - width / 2).floorInt()
// position - (WH / 2) y = (FastMath.clamp(
x = (// X only: ROUNDWORLD implementation player.hitbox.centeredY.toFloat() - height / 2,
player.hitbox.centeredX.toFloat() - width / 2).floorInt() TILE_SIZE.toFloat(),
y = (FastMath.clamp( world.height * TILE_SIZE - height - TILE_SIZE.toFloat()
player.hitbox.centeredY.toFloat() - height / 2, )).floorInt().clampCameraY(world)
TILE_SIZE.toFloat(),
world.height * TILE_SIZE - height - TILE_SIZE.toFloat()
)).floorInt().clampCameraY(world)
gdxCamX = x + (width / 2f).floor() gdxCamX = x + (width / 2f).floor()
gdxCamY = y + (height / 2f).floor() gdxCamY = y + (height / 2f).floor()
}
} }
private fun Int.clampCameraY(world: GameWorld): Int { private fun Int.clampCameraY(world: GameWorld): Int {