Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

camera crap ported to lua

  • Loading branch information...
commit b103998d83e6433cbc416b45b15cc5d9c62692a2 1 parent 285012a
@iamgreaser authored
View
502 LICENCE-LGPLv2.1.txt
@@ -0,0 +1,502 @@
+ GNU LESSER GENERAL PUBLIC LICENSE
+ Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL. It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+ This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it. You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+ When we speak of free software, we are referring to freedom of use,
+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 this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+ To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights. These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+ For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you. You must make sure that they, too, receive or can get the source
+code. If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it. And you must show them these terms so they know their rights.
+
+ We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+ To protect each distributor, we want to make it very clear that
+there is no warranty for the free library. Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+ Finally, software patents pose a constant threat to the existence of
+any free program. We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder. Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+ Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License. This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License. We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+ When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library. The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom. The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+ We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License. It also provides other free software developers Less
+of an advantage over competing non-free programs. These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries. However, the Lesser license provides advantages in certain
+special circumstances.
+
+ For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard. To achieve this, non-free programs must be
+allowed to use the library. A more frequent case is that a free
+library does the same job as widely used non-free libraries. In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+ In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software. For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+ Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+ The precise terms and conditions for copying, distribution and
+modification follow. Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library". The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+ GNU LESSER GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+ A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+ The "Library", below, refers to any such software library or work
+which has been distributed under these terms. A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language. (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+ "Source code" for a work means the preferred form of the work for
+making modifications to it. For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+ Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it). Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+
+ 1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+ You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+ 2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) The modified work must itself be a software library.
+
+ b) You must cause the files modified to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ c) You must cause the whole of the work to be licensed at no
+ charge to all third parties under the terms of this License.
+
+ d) If a facility in the modified Library refers to a function or a
+ table of data to be supplied by an application program that uses
+ the facility, other than as an argument passed when the facility
+ is invoked, then you must make a good faith effort to ensure that,
+ in the event an application does not supply such function or
+ table, the facility still operates, and performs whatever part of
+ its purpose remains meaningful.
+
+ (For example, a function in a library to compute square roots has
+ a purpose that is entirely well-defined independent of the
+ application. Therefore, Subsection 2d requires that any
+ application-supplied function or table used by this function must
+ be optional: if the application does not supply it, the square
+ root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library. To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License. (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.) Do not make any other change in
+these notices.
+
+ Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+ This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+ 4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+ If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library". Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+ However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library". The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+ When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library. The
+threshold for this to be true is not precisely defined by law.
+
+ If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work. (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+ Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+ 6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+ You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License. You must supply a copy of this License. If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License. Also, you must do one
+of these things:
+
+ a) Accompany the work with the complete corresponding
+ machine-readable source code for the Library including whatever
+ changes were used in the work (which must be distributed under
+ Sections 1 and 2 above); and, if the work is an executable linked
+ with the Library, with the complete machine-readable "work that
+ uses the Library", as object code and/or source code, so that the
+ user can modify the Library and then relink to produce a modified
+ executable containing the modified Library. (It is understood
+ that the user who changes the contents of definitions files in the
+ Library will not necessarily be able to recompile the application
+ to use the modified definitions.)
+
+ b) Use a suitable shared library mechanism for linking with the
+ Library. A suitable mechanism is one that (1) uses at run time a
+ copy of the library already present on the user's computer system,
+ rather than copying library functions into the executable, and (2)
+ will operate properly with a modified version of the library, if
+ the user installs one, as long as the modified version is
+ interface-compatible with the version that the work was made with.
+
+ c) Accompany the work with a written offer, valid for at
+ least three years, to give the same user the materials
+ specified in Subsection 6a, above, for a charge no more
+ than the cost of performing this distribution.
+
+ d) If distribution of the work is made by offering access to copy
+ from a designated place, offer equivalent access to copy the above
+ specified materials from the same place.
+
+ e) Verify that the user has already received a copy of these
+ materials or that you have already sent this user a copy.
+
+ For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it. However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+ It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system. Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+ 7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+ a) Accompany the combined library with a copy of the same work
+ based on the Library, uncombined with any other library
+ facilities. This must be distributed under the terms of the
+ Sections above.
+
+ b) Give prominent notice with the combined library of the fact
+ that part of it is a work based on the Library, and explaining
+ where to find the accompanying uncombined form of the same work.
+
+ 8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License. Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License. However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+ 9. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Library or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+ 10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+ 11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+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
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all. For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded. In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+ 13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser 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 Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation. If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+ 14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission. For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this. Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+ NO WARRANTY
+
+ 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "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
+LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+ 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY 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
+LIBRARY (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 LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Libraries
+
+ If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change. You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+ To apply these terms, attach the following notices to the library. It is
+safest to attach them to the start of each source file to most effectively
+convey 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 library's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ This library 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
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the
+ library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+ <signature of Ty Coon>, 1 April 1990
+ Ty Coon, President of Vice
+
+That's all there is to it!
View
6 README.txt
@@ -3,8 +3,10 @@ This isn't a game yet. But it works to some extent now.
mesa.vxl is by Triplefox, and is currently being used to test load/render.
LICENSING NOTES:
-Buld Then Snip is released under the regular GPL.
-BtS Lua Components (the base mod + libraries) is released under the LGPL.
+Buld Then Snip is licensed under the regular GNU GPL version 3.
+BtS Lua Components is licensed under the LGPL version 3.
+BtS Lua Components contains some content from libSDL,
+ which is licensed under the LGPL version 2.1.
REQUIREMENTS:
- a C compiler that isn't crap (read: not MSVC++)
View
5 common.h
@@ -21,6 +21,8 @@
#include <stdio.h>
#include <errno.h>
+#include <sys/time.h>
+
#include <math.h>
#include <lua.h>
@@ -111,10 +113,13 @@ enum
};
// lua.c
+extern lua_State *lstate_client;
+extern lua_State *lstate_server;
int btslua_init(void);
void btslua_deinit(void);
// main.c
+extern camera_t tcam;
int error_sdl(char *msg);
int error_perror(char *msg);
View
21 docs/modding_lua.txt
@@ -19,13 +19,14 @@ lua base library stuff:
pcall @
error @
print @
+ loadstring @
nothing else yet
(TODO: stop leaking the whole base library)
check http://www.lua.org/manual/5.1/ for more info on these
-common.hook_tick = fn(sec_curtime, sec_delta)->sec_wait
+client/server.hook_tick = fn(sec_curtime, sec_delta)->sec_wait @
sets a hook called every "tick"
returns a number telling it how long it wants to wait for
@@ -34,6 +35,14 @@ common.hook_tick = fn(sec_curtime, sec_delta)->sec_wait
call to the hooked function
setting this to nil will quit your game
+
+ NOTE: DO NOT USE COMMON FOR THIS HOOK!
+ (only client/server is accepted)
+
+client.hook_key = fn(key, state) @
+ sets a hook called every time a key changes
+
+ state is either true or false
success = server.stream_new_map(fname, fmt = "auto")
loads a map, either .vxl or some format we might invent
@@ -50,15 +59,15 @@ success = server.create_new_map(lx, ly, lz)
success = common.save_map(fname, fmt = "bsm")
saves a map to a file
-client.camera_point(dx, dy, dz, zoom = 1.0, pitch = 0.0)
+client.camera_point(dx, dy, dz, zoom = 1.0, roll = 0.0) @
points the camera in a direction with zoom factor "zoom"
- and pitch "pitch" (in radians, sorry)
+ and roll "roll" (in radians, sorry)
-client.camera_move_local(dx, dy, dz)
+client.camera_move_local(dx, dy, dz) @
moves the camera in the camera-local direction (dx,dy,dz)
-client.camera_move_global(dx, dy, dz)
+client.camera_move_global(dx, dy, dz) @
moves the camera in the world direction (dx,dy,dz)
-client.camera_move_to(px, py, pz)
+client.camera_move_to(px, py, pz) @
moves the camera to the world position (px,py,pz)
View
91 lua.c
@@ -18,23 +18,103 @@
#include "common.h"
struct btslua_entry {
- char *name;
int (*fn) (lua_State *L);
+ char *name;
};
lua_State *lstate_client = NULL;
lua_State *lstate_server = NULL;
-int (*lhook_client_tick) (lua_State *L);
-// here's a quick test.
-int btslua_fn_test(lua_State *L)
+// helper functions
+int btslua_assert_stack(lua_State *L, int smin, int smax)
+{
+ int top = lua_gettop(L);
+
+ if(smin != -1 && top < smin)
+ return luaL_error(L, "expected at least %i arguments, got %i\n", smin, top);
+ if(smax != -1 && top > smax)
+ return luaL_error(L, "expected at most %i arguments, got %i\n", smax, top);
+
+ return top;
+}
+
+// common functions
+
+// client functions
+int btslua_fn_client_camera_point(lua_State *L)
+{
+ int top = btslua_assert_stack(L, 3, 5);
+ float dx, dy, dz;
+ float zoom = 1.0f, roll = 0.0f;
+
+ dx = lua_tonumber(L, 1);
+ dy = lua_tonumber(L, 2);
+ dz = lua_tonumber(L, 3);
+ if(top <= 4)
+ zoom = lua_tonumber(L, 4);
+ if(top <= 5)
+ roll = lua_tonumber(L, 5);
+
+ cam_point_dir(&tcam, dx, dy, dz, zoom, roll);
+
+ return 0;
+}
+
+int btslua_fn_client_camera_move_local(lua_State *L)
+{
+ int top = btslua_assert_stack(L, 3, 3);
+ float dx, dy, dz;
+
+ dx = lua_tonumber(L, 1);
+ dy = lua_tonumber(L, 2);
+ dz = lua_tonumber(L, 3);
+
+ tcam.mpx += dx*tcam.mxx+dy*tcam.myx+dz*tcam.mzx;
+ tcam.mpy += dx*tcam.mxy+dy*tcam.myy+dz*tcam.mzy;
+ tcam.mpz += dx*tcam.mxz+dy*tcam.myz+dz*tcam.mzz;
+
+ return 0;
+}
+
+int btslua_fn_client_camera_move_global(lua_State *L)
+{
+ int top = btslua_assert_stack(L, 3, 3);
+ float dx, dy, dz;
+
+ dx = lua_tonumber(L, 1);
+ dy = lua_tonumber(L, 2);
+ dz = lua_tonumber(L, 3);
+
+ tcam.mpx += dx;
+ tcam.mpy += dy;
+ tcam.mpz += dz;
+
+ return 0;
+}
+
+int btslua_fn_client_camera_move_to(lua_State *L)
{
- printf("TEST PASSED (provided it doesn't crash on close)\n");
+ int top = btslua_assert_stack(L, 3, 3);
+ float px, py, pz;
+
+ px = lua_tonumber(L, 1);
+ py = lua_tonumber(L, 2);
+ pz = lua_tonumber(L, 3);
+ tcam.mpx = px;
+ tcam.mpy = py;
+ tcam.mpz = pz;
+
return 0;
}
+// server functions
+
struct btslua_entry btslua_client[] = {
+ {btslua_fn_client_camera_point, "camera_point"},
+ {btslua_fn_client_camera_move_local, "camera_move_local"},
+ {btslua_fn_client_camera_move_global, "camera_move_global"},
+ {btslua_fn_client_camera_move_to, "camera_move_to"},
{NULL, NULL}
};
@@ -43,7 +123,6 @@ struct btslua_entry btslua_server[] = {
};
struct btslua_entry btslua_common[] = {
- {"test", btslua_fn_test},
{NULL, NULL}
};
View
184 main.c
@@ -18,6 +18,8 @@
#include "common.h"
#include "config.h"
+camera_t tcam;
+
SDL_Surface *screen = NULL;
int screen_width = 800;
int screen_height = 600;
@@ -66,11 +68,26 @@ void platform_deinit(void)
SDL_Quit();
}
+int64_t platform_get_time_usec(void)
+{
+ /*
+ struct timeval tv;
+ gettimeofday(&tv, NULL);
+
+ int64_t usec = tv.tv_usec;
+ int64_t sec = tv.tv_sec;
+ usec += sec;
+
+ return usec;
+ */
+ int64_t msec = SDL_GetTicks();
+ return msec*1000;
+}
+
void run_game(void)
{
map_t *map = map_load_aos(fnmap);
- camera_t tcam;
tcam.mpx = 256.5f;
tcam.mpz = 256.5f;
tcam.mpy = map->pillars[((int)tcam.mpz)*map->xlen+((int)tcam.mpy)][4+1]-2.0f;
@@ -87,21 +104,6 @@ void run_game(void)
int i;
- float angy = 0.0f;
- float angx = 0.0f;
-
- int key_left = 0;
- int key_right = 0;
- int key_up = 0;
- int key_down = 0;
-
- int key_w = 0;
- int key_s = 0;
- int key_a = 0;
- int key_d = 0;
- int key_space = 0;
- int key_ctrl = 0;
-
render_vxl_redraw(&tcam, map);
int quitflag = 0;
@@ -110,62 +112,47 @@ void run_game(void)
int frame_now = 0;
int fps = 0;
+ float sec_curtime = 0.0f;
+ float sec_lasttime = 0.0f;
+ float sec_wait = 0.0f;
+ int64_t usec_basetime = platform_get_time_usec();
+
+ float ompx = -M_PI, ompy = -M_PI, ompz = -M_PI;
+
while(!quitflag)
{
- float zoom = 1.0f;
-
- // update angles
- if(key_left)
- angy += 0.02f/zoom;
- if(key_right)
- angy -= 0.02f/zoom;
- if(key_up)
- angx -= 0.02f/zoom;
- if(key_down)
- angx += 0.02f/zoom;
-
- // clamp angle, YOU MUST NOT LOOK DIRECTLY UP OR DOWN!
- if(angx > M_PI*0.499f)
- angx = M_PI*0.499f;
- if(angx < -M_PI*0.499f)
- angx = -M_PI*0.499f;
-
- // set camera direction
- float sya = sinf(angy);
- float cya = cosf(angy);
- float sxa = sinf(angx);
- float cxa = cosf(angx);
- cam_point_dir(&tcam, sya*cxa, sxa, cya*cxa, zoom, 0.0f);
-
- // move along
- float mvx = 0.0f;
- float mvy = 0.0f;
- float mvz = 0.0f;
-
- if(key_w)
- mvz += 1.0f;
- if(key_s)
- mvz -= 1.0f;
- if(key_a)
- mvx += 1.0f;
- if(key_d)
- mvx -= 1.0f;
- if(key_ctrl)
- mvy += 1.0f;
- if(key_space)
- mvy -= 1.0f;
-
- float mvspd = 0.2f/zoom;
- mvx *= mvspd;
- mvy *= mvspd;
- mvz *= mvspd;
-
- tcam.mpx += mvx*tcam.mxx+mvy*tcam.myx+mvz*tcam.mzx;
- tcam.mpy += mvx*tcam.mxy+mvy*tcam.myy+mvz*tcam.mzy;
- tcam.mpz += mvx*tcam.mxz+mvy*tcam.myz+mvz*tcam.mzz;
+ // update Lua client
+ lua_getglobal(lstate_client, "client");
+ lua_getfield(lstate_client, -1, "hook_tick");
+ lua_remove(lstate_client, -2);
+ if(lua_isnil(lstate_client, -1))
+ {
+ lua_pop(lstate_client, 1);
+ quitflag = 1;
+ break;
+ }
+ sec_lasttime = sec_curtime;
+ int64_t usec_curtime = platform_get_time_usec() - usec_basetime;
+ sec_curtime = ((float)usec_curtime)/1000000.0f;
+ lua_pushnumber(lstate_client, sec_curtime);
+ lua_pushnumber(lstate_client, sec_curtime - sec_lasttime);
+ if(lua_pcall(lstate_client, 2, 1, 0) != 0)
+ {
+ printf("Lua Client Error (tick): %s\n", lua_tostring(lstate_client, -1));
+ lua_pop(lstate_client, 1);
+ quitflag = 1;
+ break;
+ }
+ sec_wait += lua_tonumber(lstate_client, -1);
+ lua_pop(lstate_client, 1);
- if(mvx != 0.0f || mvy != 0.0f || mvz != 0.0f)
+ if(tcam.mpx != ompx || tcam.mpy != ompy || tcam.mpz != ompz)
+ {
render_vxl_redraw(&tcam, map);
+ ompx = tcam.mpx;
+ ompy = tcam.mpy;
+ ompz = tcam.mpz;
+ }
frame_now = SDL_GetTicks();
fps++;
@@ -188,7 +175,12 @@ void run_game(void)
SDL_UnlockSurface(screen);
SDL_Flip(screen);
- //SDL_Delay(10);
+ int msec_wait = 10*(int)(sec_wait*100.0f+0.5f);
+ if(msec_wait > 0)
+ {
+ sec_wait -= msec_wait;
+ SDL_Delay(msec_wait);
+ }
SDL_Event ev;
while(SDL_PollEvent(&ev))
@@ -196,45 +188,31 @@ void run_game(void)
{
case SDL_KEYUP:
case SDL_KEYDOWN:
- switch(ev.key.keysym.sym)
- {
- case BTSK_LOOKUP:
- key_up = (ev.type == SDL_KEYDOWN);
- break;
- case BTSK_LOOKDOWN:
- key_down = (ev.type == SDL_KEYDOWN);
- break;
- case BTSK_LOOKLEFT:
- key_left = (ev.type == SDL_KEYDOWN);
+ // inform Lua client
+ lua_getglobal(lstate_client, "client");
+ lua_getfield(lstate_client, -1, "hook_key");
+ lua_remove(lstate_client, -2);
+ if(lua_isnil(lstate_client, -1))
+ {
+ // not hooked? ignore!
+ lua_pop(lstate_client, 1);
break;
- case BTSK_LOOKRIGHT:
- key_right = (ev.type == SDL_KEYDOWN);
+ }
+ lua_pushinteger(lstate_client, ev.key.keysym.sym);
+ lua_pushboolean(lstate_client, (ev.type == SDL_KEYDOWN));
+ if(lua_pcall(lstate_client, 2, 0, 0) != 0)
+ {
+ printf("Lua Client Error (key): %s\n", lua_tostring(lstate_client, -1));
+ lua_pop(lstate_client, 1);
+ quitflag = 1;
break;
- case BTSK_FORWARD:
- key_w = (ev.type == SDL_KEYDOWN);
- break;
- case BTSK_BACK:
- key_s = (ev.type == SDL_KEYDOWN);
- break;
- case BTSK_LEFT:
- key_a = (ev.type == SDL_KEYDOWN);
- break;
- case BTSK_RIGHT:
- key_d = (ev.type == SDL_KEYDOWN);
- break;
- case BTSK_CROUCH:
- key_ctrl = (ev.type == SDL_KEYDOWN);
- break;
- case BTSK_JUMP:
- key_space = (ev.type == SDL_KEYDOWN);
- break;
- default:
- // -Wswitch: SHUT. UP.
- break;
- } break;
+ }
+ break;
case SDL_QUIT:
quitflag = 1;
break;
+ default:
+ break;
}
}
map_free(map);
View
260 pkg/base/lib_sdlkey.lua
@@ -0,0 +1,260 @@
+--[[
+ SDL - Simple DirectMedia Layer
+ Copyright (C) 1997-2009 Sam Lantinga
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ This library 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
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+ Sam Lantinga
+ slouken@libsdl.org
+]]
+
+--[[
+ part of SDL_keysym.h, converted to Lua by GreaseMonkey
+ accurate as of libSDL-1.2.so.0.11.3
+]]
+
+SDLK_UNKNOWN = 0
+SDLK_FIRST = 0
+SDLK_BACKSPACE = 8
+SDLK_TAB = 9
+SDLK_CLEAR = 12
+SDLK_RETURN = 13
+SDLK_PAUSE = 19
+SDLK_ESCAPE = 27
+SDLK_SPACE = 32
+SDLK_EXCLAIM = 33
+SDLK_QUOTEDBL = 34
+SDLK_HASH = 35
+SDLK_DOLLAR = 36
+SDLK_AMPERSAND = 38
+SDLK_QUOTE = 39
+SDLK_LEFTPAREN = 40
+SDLK_RIGHTPAREN = 41
+SDLK_ASTERISK = 42
+SDLK_PLUS = 43
+SDLK_COMMA = 44
+SDLK_MINUS = 45
+SDLK_PERIOD = 46
+SDLK_SLASH = 47
+SDLK_0 = 48
+SDLK_1 = 49
+SDLK_2 = 50
+SDLK_3 = 51
+SDLK_4 = 52
+SDLK_5 = 53
+SDLK_6 = 54
+SDLK_7 = 55
+SDLK_8 = 56
+SDLK_9 = 57
+SDLK_COLON = 58
+SDLK_SEMICOLON = 59
+SDLK_LESS = 60
+SDLK_EQUALS = 61
+SDLK_GREATER = 62
+SDLK_QUESTION = 63
+SDLK_AT = 64
+SDLK_LEFTBRACKET = 91
+SDLK_BACKSLASH = 92
+SDLK_RIGHTBRACKET = 93
+SDLK_CARET = 94
+SDLK_UNDERSCORE = 95
+SDLK_BACKQUOTE = 96
+SDLK_a = 97
+SDLK_b = 98
+SDLK_c = 99
+SDLK_d = 100
+SDLK_e = 101
+SDLK_f = 102
+SDLK_g = 103
+SDLK_h = 104
+SDLK_i = 105
+SDLK_j = 106
+SDLK_k = 107
+SDLK_l = 108
+SDLK_m = 109
+SDLK_n = 110
+SDLK_o = 111
+SDLK_p = 112
+SDLK_q = 113
+SDLK_r = 114
+SDLK_s = 115
+SDLK_t = 116
+SDLK_u = 117
+SDLK_v = 118
+SDLK_w = 119
+SDLK_x = 120
+SDLK_y = 121
+SDLK_z = 122
+SDLK_DELETE = 127
+SDLK_WORLD_0 = 160
+SDLK_WORLD_1 = 161
+SDLK_WORLD_2 = 162
+SDLK_WORLD_3 = 163
+SDLK_WORLD_4 = 164
+SDLK_WORLD_5 = 165
+SDLK_WORLD_6 = 166
+SDLK_WORLD_7 = 167
+SDLK_WORLD_8 = 168
+SDLK_WORLD_9 = 169
+SDLK_WORLD_10 = 170
+SDLK_WORLD_11 = 171
+SDLK_WORLD_12 = 172
+SDLK_WORLD_13 = 173
+SDLK_WORLD_14 = 174
+SDLK_WORLD_15 = 175
+SDLK_WORLD_16 = 176
+SDLK_WORLD_17 = 177
+SDLK_WORLD_18 = 178
+SDLK_WORLD_19 = 179
+SDLK_WORLD_20 = 180
+SDLK_WORLD_21 = 181
+SDLK_WORLD_22 = 182
+SDLK_WORLD_23 = 183
+SDLK_WORLD_24 = 184
+SDLK_WORLD_25 = 185
+SDLK_WORLD_26 = 186
+SDLK_WORLD_27 = 187
+SDLK_WORLD_28 = 188
+SDLK_WORLD_29 = 189
+SDLK_WORLD_30 = 190
+SDLK_WORLD_31 = 191
+SDLK_WORLD_32 = 192
+SDLK_WORLD_33 = 193
+SDLK_WORLD_34 = 194
+SDLK_WORLD_35 = 195
+SDLK_WORLD_36 = 196
+SDLK_WORLD_37 = 197
+SDLK_WORLD_38 = 198
+SDLK_WORLD_39 = 199
+SDLK_WORLD_40 = 200
+SDLK_WORLD_41 = 201
+SDLK_WORLD_42 = 202
+SDLK_WORLD_43 = 203
+SDLK_WORLD_44 = 204
+SDLK_WORLD_45 = 205
+SDLK_WORLD_46 = 206
+SDLK_WORLD_47 = 207
+SDLK_WORLD_48 = 208
+SDLK_WORLD_49 = 209
+SDLK_WORLD_50 = 210
+SDLK_WORLD_51 = 211
+SDLK_WORLD_52 = 212
+SDLK_WORLD_53 = 213
+SDLK_WORLD_54 = 214
+SDLK_WORLD_55 = 215
+SDLK_WORLD_56 = 216
+SDLK_WORLD_57 = 217
+SDLK_WORLD_58 = 218
+SDLK_WORLD_59 = 219
+SDLK_WORLD_60 = 220
+SDLK_WORLD_61 = 221
+SDLK_WORLD_62 = 222
+SDLK_WORLD_63 = 223
+SDLK_WORLD_64 = 224
+SDLK_WORLD_65 = 225
+SDLK_WORLD_66 = 226
+SDLK_WORLD_67 = 227
+SDLK_WORLD_68 = 228
+SDLK_WORLD_69 = 229
+SDLK_WORLD_70 = 230
+SDLK_WORLD_71 = 231
+SDLK_WORLD_72 = 232
+SDLK_WORLD_73 = 233
+SDLK_WORLD_74 = 234
+SDLK_WORLD_75 = 235
+SDLK_WORLD_76 = 236
+SDLK_WORLD_77 = 237
+SDLK_WORLD_78 = 238
+SDLK_WORLD_79 = 239
+SDLK_WORLD_80 = 240
+SDLK_WORLD_81 = 241
+SDLK_WORLD_82 = 242
+SDLK_WORLD_83 = 243
+SDLK_WORLD_84 = 244
+SDLK_WORLD_85 = 245
+SDLK_WORLD_86 = 246
+SDLK_WORLD_87 = 247
+SDLK_WORLD_88 = 248
+SDLK_WORLD_89 = 249
+SDLK_WORLD_90 = 250
+SDLK_WORLD_91 = 251
+SDLK_WORLD_92 = 252
+SDLK_WORLD_93 = 253
+SDLK_WORLD_94 = 254
+SDLK_WORLD_95 = 255
+SDLK_KP0 = 256
+SDLK_KP1 = 257
+SDLK_KP2 = 258
+SDLK_KP3 = 259
+SDLK_KP4 = 260
+SDLK_KP5 = 261
+SDLK_KP6 = 262
+SDLK_KP7 = 263
+SDLK_KP8 = 264
+SDLK_KP9 = 265
+SDLK_KP_PERIOD = 266
+SDLK_KP_DIVIDE = 267
+SDLK_KP_MULTIPLY = 268
+SDLK_KP_MINUS = 269
+SDLK_KP_PLUS = 270
+SDLK_KP_ENTER = 271
+SDLK_KP_EQUALS = 272
+SDLK_UP = 273
+SDLK_DOWN = 274
+SDLK_RIGHT = 275
+SDLK_LEFT = 276
+SDLK_INSERT = 277
+SDLK_HOME = 278
+SDLK_END = 279
+SDLK_PAGEUP = 280
+SDLK_PAGEDOWN = 281
+SDLK_F1 = 282
+SDLK_F2 = 283
+SDLK_F3 = 284
+SDLK_F4 = 285
+SDLK_F5 = 286
+SDLK_F6 = 287
+SDLK_F7 = 288
+SDLK_F8 = 289
+SDLK_F9 = 290
+SDLK_F10 = 291
+SDLK_F11 = 292
+SDLK_F12 = 293
+SDLK_F13 = 294
+SDLK_F14 = 295
+SDLK_F15 = 296
+SDLK_NUMLOCK = 300
+SDLK_CAPSLOCK = 301
+SDLK_SCROLLOCK = 302
+SDLK_RSHIFT = 303
+SDLK_LSHIFT = 304
+SDLK_RCTRL = 305
+SDLK_LCTRL = 306
+SDLK_RALT = 307
+SDLK_LALT = 308
+SDLK_RMETA = 309
+SDLK_LMETA = 310
+SDLK_LSUPER = 311
+SDLK_RSUPER = 312
+SDLK_MODE = 313
+SDLK_COMPOSE = 314
+SDLK_HELP = 315
+SDLK_PRINT = 316
+SDLK_SYSREQ = 317
+SDLK_BREAK = 318
+SDLK_MENU = 319
+SDLK_POWER = 320
+SDLK_EURO = 321
+SDLK_UNDO = 322
View
123 pkg/base/main_client.lua
@@ -17,9 +17,126 @@
print("pkg/base/main_client.lua starting")
-function common.hook_tick(sec_current, sec_delta)
- -- 50 FPS MASTER RACE
- return 0.02
+-- load libs
+dofile("pkg/base/lib_sdlkey.lua")
+
+-- define keys
+BTSK_FORWARD = SDLK_w
+BTSK_BACK = SDLK_s
+BTSK_LEFT = SDLK_a
+BTSK_RIGHT = SDLK_d
+BTSK_JUMP = SDLK_SPACE
+BTSK_CROUCH = SDLK_LCTRL
+
+BTSK_LOOKUP = SDLK_UP
+BTSK_LOOKDOWN = SDLK_DOWN
+BTSK_LOOKLEFT = SDLK_LEFT
+BTSK_LOOKRIGHT = SDLK_RIGHT
+
+-- set stuff
+zoom = 1.0
+angx = 0.0
+angy = 0.0
+
+key_left = false
+key_right = false
+key_up = false
+key_down = false
+
+key_w = false
+key_s = false
+key_a = false
+key_d = false
+key_ctrl = false
+key_space = false
+
+-- set hooks
+function client.hook_tick(sec_current, sec_delta)
+ -- update angles
+ if key_left then
+ angy = angy + math.pi*sec_delta/zoom;
+ end
+ if key_right then
+ angy = angy - math.pi*sec_delta/zoom;
+ end
+ if key_up then
+ angx = angx - math.pi*sec_delta/zoom;
+ end
+ if key_down then
+ angx = angx + math.pi*sec_delta/zoom;
+ end
+
+ -- clamp angle, YOU MUST NOT LOOK DIRECTLY UP OR DOWN!
+ if angx > math.pi*0.499 then
+ angx = math.pi*0.499
+ elseif angx < -math.pi*0.499 then
+ angx = -math.pi*0.499
+ end
+
+ -- set camera direction
+ local sya = math.sin(angy)
+ local cya = math.cos(angy)
+ local sxa = math.sin(angx)
+ local cxa = math.cos(angx)
+ client.camera_point(sya*cxa, sxa, cya*cxa, zoom, 0.0)
+
+ -- move along
+ local mvx = 0.0
+ local mvy = 0.0
+ local mvz = 0.0
+
+ if key_w then
+ mvz = mvz + 1.0
+ end
+ if key_s then
+ mvz = mvz - 1.0
+ end
+ if key_a then
+ mvx = mvx + 1.0
+ end
+ if key_d then
+ mvx = mvx - 1.0
+ end
+ if key_ctrl then
+ mvy = mvy + 1.0
+ end
+ if key_space then
+ mvy = mvy - 1.0
+ end
+
+ local mvspd = 12.0*sec_delta/zoom
+ mvx = mvx * mvspd
+ mvy = mvy * mvspd
+ mvz = mvz * mvspd
+
+ client.camera_move_local(mvx, mvy, mvz)
+
+ -- wait a bit
+ return 0.01
+end
+
+function client.hook_key(key, state)
+ if key == BTSK_LOOKUP then
+ key_up = state
+ elseif key == BTSK_LOOKDOWN then
+ key_down = state
+ elseif key == BTSK_LOOKLEFT then
+ key_left = state
+ elseif key == BTSK_LOOKRIGHT then
+ key_right = state
+ elseif key == BTSK_FORWARD then
+ key_w = state
+ elseif key == BTSK_BACK then
+ key_s = state
+ elseif key == BTSK_LEFT then
+ key_a = state
+ elseif key == BTSK_RIGHT then
+ key_d = state
+ elseif key == BTSK_CROUCH then
+ key_ctrl = state
+ elseif key == BTSK_JUMP then
+ key_space = state
+ end
end
print("pkg/base/main_client.lua loaded.")
Please sign in to comment.
Something went wrong with that request. Please try again.