From 6fdbdea4e65b75ac9ebda91320deb656655d3af5 Mon Sep 17 00:00:00 2001 From: Jon Bergli Heier Date: Wed, 1 Jun 2011 19:31:19 +0200 Subject: A bunch of network-related changes. --- .gitignore | 2 +- .gitmodules | 3 + SConstruct | 4 +- common | 1 + game.cpp | 108 ++ game.h | 32 + main.cpp | 21 +- noiseutils/COPYING.txt | 504 --------- noiseutils/noiseutils.cpp | 1298 ----------------------- noiseutils/noiseutils.h | 2540 --------------------------------------------- noiseutils/readme.txt | 4 - noiseutils/warnings.diff | 56 - terrain.cpp | 107 +- terrain.h | 10 +- terrain_cache.cpp | 57 - terrain_cache.h | 45 - terrain_loader.cpp | 95 -- terrain_loader.h | 25 - vector.cpp | 146 --- vector.h | 49 - 20 files changed, 231 insertions(+), 4876 deletions(-) create mode 100644 .gitmodules create mode 160000 common create mode 100644 game.cpp create mode 100644 game.h delete mode 100644 noiseutils/COPYING.txt delete mode 100644 noiseutils/noiseutils.cpp delete mode 100644 noiseutils/noiseutils.h delete mode 100644 noiseutils/readme.txt delete mode 100644 noiseutils/warnings.diff delete mode 100644 terrain_cache.cpp delete mode 100644 terrain_cache.h delete mode 100644 terrain_loader.cpp delete mode 100644 terrain_loader.h delete mode 100644 vector.cpp delete mode 100644 vector.h diff --git a/.gitignore b/.gitignore index 0097867..fba6749 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ .sconsign.dblite -/foo +/gress *.o .*.swp /textures/unused/ diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..c496c3d --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "common"] + path = common + url = git://git.jvnv.net/gress-common diff --git a/SConstruct b/SConstruct index 487be82..d0b5851 100644 --- a/SConstruct +++ b/SConstruct @@ -8,7 +8,7 @@ AddOption('--release', action = 'store_true') AddOption('--profiling', action = 'store_true') AddOption('--mingw32', action = 'store_true') -env.Append(CPPPATH = ['.']) +env.Append(CPPPATH = ['.', 'common']) # cross-compiling if GetOption('mingw32'): @@ -37,6 +37,6 @@ Export('env') env.SConscript('scripting/SConscript') -env.Program('foo.exe' if GetOption('mingw32') else 'foo', Glob('*.cpp') + ['noiseutils/noiseutils.cpp'] + Glob('widgets/*.cpp') + Glob('scripting/*.cpp')) +env.Program('gress.exe' if GetOption('mingw32') else 'gress', Glob('*.cpp') + Glob('widgets/*.cpp') + Glob('scripting/*.cpp') + Glob('common/*.cpp')) # vim: syn=python diff --git a/common b/common new file mode 160000 index 0000000..1211f63 --- /dev/null +++ b/common @@ -0,0 +1 @@ +Subproject commit 1211f632092db824fb2c880063599f7642c34f30 diff --git a/game.cpp b/game.cpp new file mode 100644 index 0000000..5bc1a8d --- /dev/null +++ b/game.cpp @@ -0,0 +1,108 @@ +#include "game.h" +#include "video.h" +#include "messages.h" + +#include +#include +#include + +Game* Game::game = NULL; + +Game::Game() : socket(io_service) { + scene = new Scene(); +} + +Game::~Game() { + delete scene; +} + +void Game::run(const std::string host, const unsigned int port) { + run(host, boost::lexical_cast(port)); +} + +void Game::run(const std::string host, const std::string port) { + SDL_WarpMouse(video::width/2, video::height/2); + scene->last_time = SDL_GetTicks(); + scene->update(); + + { + boost::asio::ip::tcp::resolver resolver(io_service); + boost::asio::ip::tcp::resolver::query query(host, port); + boost::asio::ip::tcp::resolver::iterator iterator = resolver.resolve(query); + socket.connect(boost::asio::ip::tcp::endpoint(*iterator)); + + message::Hello h(1); + h.send(socket); + } + + async_read(); + + unsigned int last = SDL_GetTicks(); + while(scene->running) { + if(SDL_GetTicks() - last >= 1000) { + message::Pos pos(scene->pos.x, scene->pos.y, scene->pos.z); + pos.send(socket); + last = SDL_GetTicks(); + } + io_service.poll_one(); + scene->events(); + scene->render(); + + SDL_Delay(1); + } +} + +void Game::async_read() { + uint8_t *t = new uint8_t; + boost::asio::async_read(socket, boost::asio::buffer(t, sizeof(uint8_t)), + boost::asio::transfer_all(), + boost::bind(&Game::handle_message, this, boost::asio::placeholders::error, boost::asio::placeholders::bytes_transferred, t)); +} + +void Game::handle_message(const boost::system::error_code& error, std::size_t bytes_transferred, uint8_t *type) { + if(error) { + std::cerr << error << std::endl; + delete type; + scene->running = false; + return; + } + + switch(*type) { + case message::MSG_TYPE_CHUNK: + handle_chunk(); + break; + default: + std::cout << "unknown type: " << (int)*type << std::endl; + } + + delete type; + async_read(); +} + +void Game::handle_chunk() { + message::Chunk m; + + // coords + m.read(socket); + int64_t x, y; + m.get_coords(x, y); + + // data + m.read(socket); + float *data = m.get_data(); + scene->terrain->tc->add_chunk(data, x, y, Terrain::chunk_size_total, Terrain::chunk_size_total); + + Terrain::Chunk *chunk = NULL; + try { + chunk = new Terrain::Chunk(scene->terrain, x, y); + } catch(...) { + } + if(chunk) + scene->terrain->chunks.push_back(chunk); +} + +Game& Game::get_instance() { + if(!game) + game = new Game(); + return *game; +} diff --git a/game.h b/game.h new file mode 100644 index 0000000..f950b64 --- /dev/null +++ b/game.h @@ -0,0 +1,32 @@ +#ifndef GAME_H +#define GAME_H + +#include "scene.h" + +#include + +#include + +class Game { + private: + static Game *game; + Scene *scene; + + boost::asio::io_service io_service; + boost::asio::ip::tcp::socket socket; + + public: + Game(); + ~Game(); + + void run(std::string host, unsigned int port); + void run(std::string host, std::string port); + + void async_read(); + void handle_message(const boost::system::error_code& error, std::size_t bytes_transferred, uint8_t *type); + void handle_chunk(); + + static Game& get_instance(); +}; + +#endif diff --git a/main.cpp b/main.cpp index be24747..f30f67a 100644 --- a/main.cpp +++ b/main.cpp @@ -1,9 +1,10 @@ #include "video.h" -#include "scene.h" +#include "game.h" #include "gl.h" #include +#include bool init_sdl_image() { int real_flags = IMG_Init(IMG_INIT_PNG | IMG_INIT_JPG); @@ -15,6 +16,11 @@ bool init_sdl_image() { } int main(int argc, char **argv) { + if(argc != 3) { + std::cout << (boost::format("Usage: %s HOST PORT") % argv[0]).str() << std::endl; + return 1; + } + if(!init_sdl_image()) return 1; @@ -26,22 +32,13 @@ int main(int argc, char **argv) { win32_gl_init(); #endif - Scene *scene = new Scene(); - SDL_ShowCursor(SDL_DISABLE); SDL_EnableUNICODE(1); - SDL_WarpMouse(video::width/2, video::height/2); - scene->last_time = SDL_GetTicks(); - scene->update(); - while(scene->running) { - scene->events(); - scene->render(); + Game& game = Game::get_instance(); - SDL_Delay(1); - } + game.run(argv[1], argv[2]); - delete scene; video::free(); return 0; diff --git a/noiseutils/COPYING.txt b/noiseutils/COPYING.txt deleted file mode 100644 index cbee875..0000000 --- a/noiseutils/COPYING.txt +++ /dev/null @@ -1,504 +0,0 @@ - GNU LESSER GENERAL PUBLIC LICENSE - Version 2.1, February 1999 - - Copyright (C) 1991, 1999 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 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. - - - Copyright (C) - - 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 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. - - , 1 April 1990 - Ty Coon, President of Vice - -That's all there is to it! - - diff --git a/noiseutils/noiseutils.cpp b/noiseutils/noiseutils.cpp deleted file mode 100644 index ddcac1b..0000000 --- a/noiseutils/noiseutils.cpp +++ /dev/null @@ -1,1298 +0,0 @@ -// noiseutils.cpp -// -// Copyright (C) 2003-2005 Jason Bevins -// -// 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 (COPYING.txt) 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -// -// The developer's email is jlbezigvins@gmzigail.com (for great email, take -// off every 'zig'.) -// - -#include - -#include -#include - -#include "noiseutils.h" - -using namespace noise; -using namespace noise::model; -using namespace noise::module; - -// Bitmap header size. -const int BMP_HEADER_SIZE = 54; - -// Direction of the light source, in compass degrees (0 = north, 90 = east, -// 180 = south, 270 = east) -const double DEFAULT_LIGHT_AZIMUTH = 45.0; - -// Amount of contrast between light and dark areas. -const double DEFAULT_LIGHT_CONTRAST = 1.0; - -// Elevation of the light source above the horizon, in degrees (0 = on -// horizon, 90 = directly overhead) -const double DEFAULT_LIGHT_ELEVATION = 45.0; - -////////////////////////////////////////////////////////////////////////////// -// Miscellaneous functions - -namespace noise -{ - - namespace utils - { - - // Performs linear interpolation between two 8-bit channel values. - inline noise::uint8 BlendChannel (const uint8 channel0, - const uint8 channel1, float alpha) - { - float c0 = (float)channel0 / 255.0; - float c1 = (float)channel1 / 255.0; - return (noise::uint8)(((c1 * alpha) + (c0 * (1.0f - alpha))) * 255.0f); - } - - // Performs linear interpolation between two colors and stores the result - // in out. - inline void LinearInterpColor (const Color& color0, const Color& color1, - float alpha, Color& out) - { - out.alpha = BlendChannel (color0.alpha, color1.alpha, alpha); - out.blue = BlendChannel (color0.blue , color1.blue , alpha); - out.green = BlendChannel (color0.green, color1.green, alpha); - out.red = BlendChannel (color0.red , color1.red , alpha); - } - - // Unpacks a floating-point value into four bytes. This function is - // specific to Intel machines. A portable version will come soon (I - // hope.) - inline noise::uint8* UnpackFloat (noise::uint8* bytes, float value) - { - noise::uint8* pBytes = (noise::uint8*)(&value); - bytes[0] = *pBytes++; - bytes[1] = *pBytes++; - bytes[2] = *pBytes++; - bytes[3] = *pBytes++; - return bytes; - } - - // Unpacks a 16-bit integer value into two bytes in little endian format. - inline noise::uint8* UnpackLittle16 (noise::uint8* bytes, - noise::uint16 integer) - { - bytes[0] = (noise::uint8)((integer & 0x00ff) ); - bytes[1] = (noise::uint8)((integer & 0xff00) >> 8 ); - return bytes; - } - - // Unpacks a 32-bit integer value into four bytes in little endian format. - inline noise::uint8* UnpackLittle32 (noise::uint8* bytes, - noise::uint32 integer) - { - bytes[0] = (noise::uint8)((integer & 0x000000ff) ); - bytes[1] = (noise::uint8)((integer & 0x0000ff00) >> 8 ); - bytes[2] = (noise::uint8)((integer & 0x00ff0000) >> 16); - bytes[3] = (noise::uint8)((integer & 0xff000000) >> 24); - return bytes; - } - - } - -} - -using namespace noise; - -using namespace noise::utils; - -////////////////////////////////////////////////////////////////////////////// -// GradientColor class - -GradientColor::GradientColor () -{ - m_pGradientPoints = NULL; -} - -GradientColor::~GradientColor () -{ - delete[] m_pGradientPoints; -} - -void GradientColor::AddGradientPoint (double gradientPos, - const Color& gradientColor) -{ - // Find the insertion point for the new gradient point and insert the new - // gradient point at that insertion point. The gradient point array will - // remain sorted by gradient position. - int insertionPos = FindInsertionPos (gradientPos); - InsertAtPos (insertionPos, gradientPos, gradientColor); -} - -void GradientColor::Clear () -{ - delete[] m_pGradientPoints; - m_pGradientPoints = NULL; - m_gradientPointCount = 0; -} - -int GradientColor::FindInsertionPos (double gradientPos) -{ - int insertionPos; - for (insertionPos = 0; insertionPos < m_gradientPointCount; - insertionPos++) { - if (gradientPos < m_pGradientPoints[insertionPos].pos) { - // We found the array index in which to insert the new gradient point. - // Exit now. - break; - } else if (gradientPos == m_pGradientPoints[insertionPos].pos) { - // Each gradient point is required to contain a unique gradient - // position, so throw an exception. - throw noise::ExceptionInvalidParam (); - } - } - return insertionPos; -} - -const Color& GradientColor::GetColor (double gradientPos) const -{ - assert (m_gradientPointCount >= 2); - - // Find the first element in the gradient point array that has a gradient - // position larger than the gradient position passed to this method. - int indexPos; - for (indexPos = 0; indexPos < m_gradientPointCount; indexPos++) { - if (gradientPos < m_pGradientPoints[indexPos].pos) { - break; - } - } - - // Find the two nearest gradient points so that we can perform linear - // interpolation on the color. - int index0 = ClampValue (indexPos - 1, 0, m_gradientPointCount - 1); - int index1 = ClampValue (indexPos , 0, m_gradientPointCount - 1); - - // If some gradient points are missing (which occurs if the gradient - // position passed to this method is greater than the largest gradient - // position or less than the smallest gradient position in the array), get - // the corresponding gradient color of the nearest gradient point and exit - // now. - if (index0 == index1) { - m_workingColor = m_pGradientPoints[index1].color; - return m_workingColor; - } - - // Compute the alpha value used for linear interpolation. - double input0 = m_pGradientPoints[index0].pos; - double input1 = m_pGradientPoints[index1].pos; - double alpha = (gradientPos - input0) / (input1 - input0); - - // Now perform the linear interpolation given the alpha value. - const Color& color0 = m_pGradientPoints[index0].color; - const Color& color1 = m_pGradientPoints[index1].color; - LinearInterpColor (color0, color1, (float)alpha, m_workingColor); - return m_workingColor; -} - -void GradientColor::InsertAtPos (int insertionPos, double gradientPos, - const Color& gradientColor) -{ - // Make room for the new gradient point at the specified insertion position - // within the gradient point array. The insertion position is determined by - // the gradient point's position; the gradient points must be sorted by - // gradient position within that array. - GradientPoint* newGradientPoints; - newGradientPoints = new GradientPoint[m_gradientPointCount + 1]; - for (int i = 0; i < m_gradientPointCount; i++) { - if (i < insertionPos) { - newGradientPoints[i] = m_pGradientPoints[i]; - } else { - newGradientPoints[i + 1] = m_pGradientPoints[i]; - } - } - delete[] m_pGradientPoints; - m_pGradientPoints = newGradientPoints; - ++m_gradientPointCount; - - // Now that we've made room for the new gradient point within the array, add - // the new gradient point. - m_pGradientPoints[insertionPos].pos = gradientPos ; - m_pGradientPoints[insertionPos].color = gradientColor; -} - -////////////////////////////////////////////////////////////////////////////// -// NoiseMap class - -NoiseMap::NoiseMap () -{ - InitObj (); -} - -NoiseMap::NoiseMap (int width, int height) -{ - InitObj (); - SetSize (width, height); -} - -NoiseMap::NoiseMap (const NoiseMap& rhs) -{ - InitObj (); - CopyNoiseMap (rhs); -} - -NoiseMap::~NoiseMap () -{ - delete[] m_pNoiseMap; -} - -NoiseMap& NoiseMap::operator= (const NoiseMap& rhs) -{ - CopyNoiseMap (rhs); - - return *this; -} - -void NoiseMap::Clear (float value) -{ - if (m_pNoiseMap != NULL) { - for (int y = 0; y < m_height; y++) { - float* pDest = GetSlabPtr (0, y); - for (int x = 0; x < m_width; x++) { - *pDest++ = value; - } - } - } -} - -void NoiseMap::CopyNoiseMap (const NoiseMap& source) -{ - // Resize the noise map buffer, then copy the slabs from the source noise - // map buffer to this noise map buffer. - SetSize (source.GetWidth (), source.GetHeight ()); - for (int y = 0; y < source.GetHeight (); y++) { - const float* pSource = source.GetConstSlabPtr (0, y); - float* pDest = GetSlabPtr (0, y); - memcpy (pDest, pSource, (size_t)source.GetWidth () * sizeof (float)); - } - - // Copy the border value as well. - m_borderValue = source.m_borderValue; -} - -void NoiseMap::DeleteNoiseMapAndReset () -{ - delete[] m_pNoiseMap; - InitObj (); -} - -float NoiseMap::GetValue (int x, int y) const -{ - if (m_pNoiseMap != NULL) { - if (x >= 0 && x < m_width && y >= 0 && y < m_height) { - return *(GetConstSlabPtr (x, y)); - } - } - // The coordinates specified are outside the noise map. Return the border - // value. - return m_borderValue; -} - -void NoiseMap::InitObj () -{ - m_pNoiseMap = NULL; - m_height = 0; - m_width = 0; - m_stride = 0; - m_memUsed = 0; - m_borderValue = 0.0; -} - -void NoiseMap::ReclaimMem () -{ - size_t newMemUsage = CalcMinMemUsage (m_width, m_height); - if (m_memUsed > newMemUsage) { - // There is wasted memory. Create the smallest buffer that can fit the - // data and copy the data to it. - float* pNewNoiseMap = NULL; - try { - pNewNoiseMap = new float[newMemUsage]; - } - catch (...) { - throw noise::ExceptionOutOfMemory (); - } - memcpy (pNewNoiseMap, m_pNoiseMap, newMemUsage * sizeof (float)); - delete[] m_pNoiseMap; - m_pNoiseMap = pNewNoiseMap; - m_memUsed = newMemUsage; - } -} - -void NoiseMap::SetSize (int width, int height) -{ - if (width < 0 || height < 0 - || width > RASTER_MAX_WIDTH || height > RASTER_MAX_HEIGHT) { - // Invalid width or height. - throw noise::ExceptionInvalidParam (); - } else if (width == 0 || height == 0) { - // An empty noise map was specified. Delete it and zero out the size - // member variables. - DeleteNoiseMapAndReset (); - } else { - // A new noise map size was specified. Allocate a new noise map buffer - // unless the current buffer is large enough for the new noise map (we - // don't want costly reallocations going on.) - size_t newMemUsage = CalcMinMemUsage (width, height); - if (m_memUsed < newMemUsage) { - // The new size is too big for the current noise map buffer. We need to - // reallocate. - DeleteNoiseMapAndReset (); - try { - m_pNoiseMap = new float[newMemUsage]; - } - catch (...) { - throw noise::ExceptionOutOfMemory (); - } - m_memUsed = newMemUsage; - } - m_stride = (int)CalcStride (width); - m_width = width; - m_height = height; - } -} - -void NoiseMap::SetValue (int x, int y, float value) -{ - if (m_pNoiseMap != NULL) { - if (x >= 0 && x < m_width && y >= 0 && y < m_height) { - *(GetSlabPtr (x, y)) = value; - } - } -} - -void NoiseMap::TakeOwnership (NoiseMap& source) -{ - // Copy the values and the noise map buffer from the source noise map to - // this noise map. Now this noise map pwnz the source buffer. - delete[] m_pNoiseMap; - m_memUsed = source.m_memUsed; - m_height = source.m_height; - m_pNoiseMap = source.m_pNoiseMap; - m_stride = source.m_stride; - m_width = source.m_width; - - // Now that the source buffer is assigned to this noise map, reset the - // source noise map object. - source.InitObj (); -} - -////////////////////////////////////////////////////////////////////////////// -// Image class - -Image::Image () -{ - InitObj (); -} - -Image::Image (int width, int height) -{ - InitObj (); - SetSize (width, height); -} - -Image::Image (const Image& rhs) -{ - InitObj (); - CopyImage (rhs); -} - -Image::~Image () -{ - delete[] m_pImage; -} - -Image& Image::operator= (const Image& rhs) -{ - CopyImage (rhs); - - return *this; -} - -void Image::Clear (const Color& value) -{ - if (m_pImage != NULL) { - for (int y = 0; y < m_height; y++) { - Color* pDest = GetSlabPtr (0, y); - for (int x = 0; x < m_width; x++) { - *pDest++ = value; - } - } - } -} - -void Image::CopyImage (const Image& source) -{ - // Resize the image buffer, then copy the slabs from the source image - // buffer to this image buffer. - SetSize (source.GetWidth (), source.GetHeight ()); - for (int y = 0; y < source.GetHeight (); y++) { - const Color* pSource = source.GetConstSlabPtr (0, y); - Color* pDest = GetSlabPtr (0, y); - memcpy (pDest, pSource, (size_t)source.GetWidth () * sizeof (float)); - } - - // Copy the border value as well. - m_borderValue = source.m_borderValue; -} - -void Image::DeleteImageAndReset () -{ - delete[] m_pImage; - InitObj (); -} - -Color Image::GetValue (int x, int y) const -{ - if (m_pImage != NULL) { - if (x >= 0 && x < m_width && y >= 0 && y < m_height) { - return *(GetConstSlabPtr (x, y)); - } - } - // The coordinates specified are outside the image. Return the border - // value. - return m_borderValue; -} - -void Image::InitObj () -{ - m_pImage = NULL; - m_height = 0; - m_width = 0; - m_stride = 0; - m_memUsed = 0; - m_borderValue = Color (0, 0, 0, 0); -} - -void Image::ReclaimMem () -{ - size_t newMemUsage = CalcMinMemUsage (m_width, m_height); - if (m_memUsed > newMemUsage) { - // There is wasted memory. Create the smallest buffer that can fit the - // data and copy the data to it. - Color* pNewImage = NULL; - try { - pNewImage = new Color[newMemUsage]; - } - catch (...) { - throw noise::ExceptionOutOfMemory (); - } - memcpy (pNewImage, m_pImage, newMemUsage * sizeof (float)); - delete[] m_pImage; - m_pImage = pNewImage; - m_memUsed = newMemUsage; - } -} - -void Image::SetSize (int width, int height) -{ - if (width < 0 || height < 0 - || width > RASTER_MAX_WIDTH || height > RASTER_MAX_HEIGHT) { - // Invalid width or height. - throw noise::ExceptionInvalidParam (); - } else if (width == 0 || height == 0) { - // An empty image was specified. Delete it and zero out the size member - // variables. - DeleteImageAndReset (); - } else { - // A new image size was specified. Allocate a new image buffer unless - // the current buffer is large enough for the new image (we don't want - // costly reallocations going on.) - size_t newMemUsage = CalcMinMemUsage (width, height); - if (m_memUsed < newMemUsage) { - // The new size is too big for the current image buffer. We need to - // reallocate. - DeleteImageAndReset (); - try { - m_pImage = new Color[newMemUsage]; - } - catch (...) { - throw noise::ExceptionOutOfMemory (); - } - m_memUsed = newMemUsage; - } - m_stride = (int)CalcStride (width); - m_width = width; - m_height = height; - } -} - -void Image::SetValue (int x, int y, const Color& value) -{ - if (m_pImage != NULL) { - if (x >= 0 && x < m_width && y >= 0 && y < m_height) { - *(GetSlabPtr (x, y)) = value; - } - } -} - -void Image::TakeOwnership (Image& source) -{ - // Copy the values and the image buffer from the source image to this image. - // Now this image pwnz the source buffer. - delete[] m_pImage; - m_memUsed = source.m_memUsed; - m_height = source.m_height; - m_pImage = source.m_pImage; - m_stride = source.m_stride; - m_width = source.m_width; - - // Now that the source buffer is assigned to this image, reset the source - // image object. - source.InitObj (); -} - -///////////////////////////////////////////////////////////////////////////// -// WriterBMP class - -int WriterBMP::CalcWidthByteCount (int width) const -{ - return ((width * 3) + 3) & ~0x03; -} - -void WriterBMP::WriteDestFile () -{ - if (m_pSourceImage == NULL) { - throw noise::ExceptionInvalidParam (); - } - - int width = m_pSourceImage->GetWidth (); - int height = m_pSourceImage->GetHeight (); - - // The width of one line in the file must be aligned on a 4-byte boundary. - int bufferSize = CalcWidthByteCount (width); - int destSize = bufferSize * height; - - // This buffer holds one horizontal line in the destination file. - noise::uint8* pLineBuffer = NULL; - - // File object used to write the file. - std::ofstream os; - os.clear (); - - // Allocate a buffer to hold one horizontal line in the bitmap. - try { - pLineBuffer = new noise::uint8[bufferSize]; - } - catch (...) { - throw noise::ExceptionOutOfMemory (); - } - - // Open the destination file. - os.open (m_destFilename.c_str (), std::ios::out | std::ios::binary); - if (os.fail () || os.bad ()) { - delete[] pLineBuffer; - throw noise::ExceptionUnknown (); - } - - // Build the header. - noise::uint8 d[4]; - os.write ("BM", 2); - os.write ((char*)UnpackLittle32 (d, destSize + BMP_HEADER_SIZE), 4); - os.write ("\0\0\0\0", 4); - os.write ((char*)UnpackLittle32 (d, (noise::uint32)BMP_HEADER_SIZE), 4); - os.write ((char*)UnpackLittle32 (d, 40), 4); // Palette offset - os.write ((char*)UnpackLittle32 (d, (noise::uint32)width ), 4); - os.write ((char*)UnpackLittle32 (d, (noise::uint32)height), 4); - os.write ((char*)UnpackLittle16 (d, 1 ), 2); // Planes per pixel - os.write ((char*)UnpackLittle16 (d, 24), 2); // Bits per plane - os.write ("\0\0\0\0", 4); // Compression (0 = none) - os.write ((char*)UnpackLittle32 (d, (noise::uint32)destSize), 4); - os.write ((char*)UnpackLittle32 (d, 2834), 4); // X pixels per meter - os.write ((char*)UnpackLittle32 (d, 2834), 4); // Y pixels per meter - os.write ("\0\0\0\0", 4); - os.write ("\0\0\0\0", 4); - if (os.fail () || os.bad ()) { - os.clear (); - os.close (); - os.clear (); - delete[] pLineBuffer; - throw noise::ExceptionUnknown (); - } - - // Build and write each horizontal line to the file. - for (int y = 0; y < height; y++) { - memset (pLineBuffer, 0, bufferSize); - Color* pSource = m_pSourceImage->GetSlabPtr (y); - noise::uint8* pDest = pLineBuffer; - for (int x = 0; x < width; x++) { - *pDest++ = pSource->blue ; - *pDest++ = pSource->green; - *pDest++ = pSource->red ; - ++pSource; - } - os.write ((char*)pLineBuffer, (size_t)bufferSize); - if (os.fail () || os.bad ()) { - os.clear (); - os.close (); - os.clear (); - delete[] pLineBuffer; - throw noise::ExceptionUnknown (); - } - } - - os.close (); - os.clear (); - delete[] pLineBuffer; -} - -///////////////////////////////////////////////////////////////////////////// -// WriterTER class - -int WriterTER::CalcWidthByteCount (int width) const -{ - return (width * sizeof (int16)); -} - -void WriterTER::WriteDestFile () -{ - if (m_pSourceNoiseMap == NULL) { - throw noise::ExceptionInvalidParam (); - } - - int width = m_pSourceNoiseMap->GetWidth (); - int height = m_pSourceNoiseMap->GetHeight (); - - int bufferSize = CalcWidthByteCount (width); - - // This buffer holds one horizontal line in the destination file. - noise::uint8* pLineBuffer = NULL; - - // File object used to write the file. - std::ofstream os; - os.clear (); - - // Allocate a buffer to hold one horizontal line in the height map. - try { - pLineBuffer = new noise::uint8[bufferSize]; - } - catch (...) { - throw noise::ExceptionOutOfMemory (); - } - - // Open the destination file. - os.open (m_destFilename.c_str (), std::ios::out | std::ios::binary); - if (os.fail () || os.bad ()) { - os.clear (); - delete[] pLineBuffer; - throw noise::ExceptionUnknown (); - } - - // Build the header. - noise::uint8 d[4]; - int16 heightScale = (int16)(floor (32768.0 / (double)m_metersPerPoint)); - os.write ("TERRAGENTERRAIN ", 16); - os.write ("SIZE", 4); - os.write ((char*)UnpackLittle16 (d, GetMin (width, height) - 1), 2); - os.write ("\0\0", 2); - os.write ("XPTS", 4); - os.write ((char*)UnpackLittle16 (d, width), 2); - os.write ("\0\0", 2); - os.write ("YPTS", 4); - os.write ((char*)UnpackLittle16 (d, height), 2); - os.write ("\0\0", 2); - os.write ("SCAL", 4); - os.write ((char*)UnpackFloat (d, m_metersPerPoint), 4); - os.write ((char*)UnpackFloat (d, m_metersPerPoint), 4); - os.write ((char*)UnpackFloat (d, m_metersPerPoint), 4); - os.write ("ALTW", 4); - os.write ((char*)UnpackLittle16 (d, heightScale), 2); - os.write ("\0\0", 2); - if (os.fail () || os.bad ()) { - os.clear (); - os.close (); - os.clear (); - delete[] pLineBuffer; - throw noise::ExceptionUnknown (); - } - - // Build and write each horizontal line to the file. - for (int y = 0; y < height; y++) { - float* pSource = m_pSourceNoiseMap->GetSlabPtr (y); - noise::uint8* pDest = pLineBuffer; - for (int x = 0; x < width; x++) { - int16 scaledHeight = (int16)(floor (*pSource * 2.0)); - UnpackLittle16 (pDest, scaledHeight); - pDest += 2; - ++pSource; - } - os.write ((char*)pLineBuffer, (size_t)bufferSize); - if (os.fail () || os.bad ()) { - os.clear (); - os.close (); - os.clear (); - delete[] pLineBuffer; - throw noise::ExceptionUnknown (); - } - } - - os.close (); - os.clear (); - delete[] pLineBuffer; -} - -///////////////////////////////////////////////////////////////////////////// -// NoiseMapBuilder class - -NoiseMapBuilder::NoiseMapBuilder (): - m_pCallback (NULL), - m_destHeight (0), - m_destWidth (0), - m_pDestNoiseMap (NULL), - m_pSourceModule (NULL) -{ -} - -void NoiseMapBuilder::SetCallback (NoiseMapCallback pCallback) -{ - m_pCallback = pCallback; -} - -///////////////////////////////////////////////////////////////////////////// -// NoiseMapBuilderCylinder class - -NoiseMapBuilderCylinder::NoiseMapBuilderCylinder (): - m_lowerAngleBound (0.0), - m_lowerHeightBound (0.0), - m_upperAngleBound (0.0), - m_upperHeightBound (0.0) -{ -} - -void NoiseMapBuilderCylinder::Build () -{ - if ( m_upperAngleBound <= m_lowerAngleBound - || m_upperHeightBound <= m_lowerHeightBound - || m_destWidth <= 0 - || m_destHeight <= 0 - || m_pSourceModule == NULL - || m_pDestNoiseMap == NULL) { - throw noise::ExceptionInvalidParam (); - } - - // Resize the destination noise map so that it can store the new output - // values from the source model. - m_pDestNoiseMap->SetSize (m_destWidth, m_destHeight); - - // Create the cylinder model. - model::Cylinder cylinderModel; - cylinderModel.SetModule (*m_pSourceModule); - - double angleExtent = m_upperAngleBound - m_lowerAngleBound ; - double heightExtent = m_upperHeightBound - m_lowerHeightBound; - double xDelta = angleExtent / (double)m_destWidth ; - double yDelta = heightExtent / (double)m_destHeight; - double curAngle = m_lowerAngleBound ; - double curHeight = m_lowerHeightBound; - - // Fill every point in the noise map with the output values from the model. - for (int y = 0; y < m_destHeight; y++) { - float* pDest = m_pDestNoiseMap->GetSlabPtr (y); - curAngle = m_lowerAngleBound; - for (int x = 0; x < m_destWidth; x++) { - float curValue = (float)cylinderModel.GetValue (curAngle, curHeight); - *pDest++ = curValue; - curAngle += xDelta; - } - curHeight += yDelta; - if (m_pCallback != NULL) { - m_pCallback (y); - } - } -} - -///////////////////////////////////////////////////////////////////////////// -// NoiseMapBuilderPlane class - -NoiseMapBuilderPlane::NoiseMapBuilderPlane (): - m_isSeamlessEnabled (false), - m_lowerXBound (0.0), - m_lowerZBound (0.0), - m_upperXBound (0.0), - m_upperZBound (0.0) -{ -} - -void NoiseMapBuilderPlane::Build () -{ - if ( m_upperXBound <= m_lowerXBound - || m_upperZBound <= m_lowerZBound - || m_destWidth <= 0 - || m_destHeight <= 0 - || m_pSourceModule == NULL - || m_pDestNoiseMap == NULL) { - throw noise::ExceptionInvalidParam (); - } - - // Resize the destination noise map so that it can store the new output - // values from the source model. - m_pDestNoiseMap->SetSize (m_destWidth, m_destHeight); - - // Create the plane model. - model::Plane planeModel; - planeModel.SetModule (*m_pSourceModule); - - double xExtent = m_upperXBound - m_lowerXBound; - double zExtent = m_upperZBound - m_lowerZBound; - double xDelta = xExtent / (double)m_destWidth ; - double zDelta = zExtent / (double)m_destHeight; - double xCur = m_lowerXBound; - double zCur = m_lowerZBound; - - // Fill every point in the noise map with the output values from the model. - for (int z = 0; z < m_destHeight; z++) { - float* pDest = m_pDestNoiseMap->GetSlabPtr (z); - xCur = m_lowerXBound; - for (int x = 0; x < m_destWidth; x++) { - float finalValue; - if (!m_isSeamlessEnabled) { - finalValue = planeModel.GetValue (xCur, zCur); - } else { - double swValue, seValue, nwValue, neValue; - swValue = planeModel.GetValue (xCur , zCur ); - seValue = planeModel.GetValue (xCur + xExtent, zCur ); - nwValue = planeModel.GetValue (xCur , zCur + zExtent); - neValue = planeModel.GetValue (xCur + xExtent, zCur + zExtent); - double xBlend = 1.0 - ((xCur - m_lowerXBound) / xExtent); - double zBlend = 1.0 - ((zCur - m_lowerZBound) / zExtent); - double z0 = LinearInterp (swValue, seValue, xBlend); - double z1 = LinearInterp (nwValue, neValue, xBlend); - finalValue = (float)LinearInterp (z0, z1, zBlend); - } - *pDest++ = finalValue; - xCur += xDelta; - } - zCur += zDelta; - if (m_pCallback != NULL) { - m_pCallback (z); - } - } -} - -///////////////////////////////////////////////////////////////////////////// -// NoiseMapBuilderSphere class - -NoiseMapBuilderSphere::NoiseMapBuilderSphere (): - m_eastLonBound (0.0), - m_northLatBound (0.0), - m_southLatBound (0.0), - m_westLonBound (0.0) -{ -} - -void NoiseMapBuilderSphere::Build () -{ - if ( m_eastLonBound <= m_westLonBound - || m_northLatBound <= m_southLatBound - || m_destWidth <= 0 - || m_destHeight <= 0 - || m_pSourceModule == NULL - || m_pDestNoiseMap == NULL) { - throw noise::ExceptionInvalidParam (); - } - - // Resize the destination noise map so that it can store the new output - // values from the source model. - m_pDestNoiseMap->SetSize (m_destWidth, m_destHeight); - - // Create the plane model. - model::Sphere sphereModel; - sphereModel.SetModule (*m_pSourceModule); - - double lonExtent = m_eastLonBound - m_westLonBound ; - double latExtent = m_northLatBound - m_southLatBound; - double xDelta = lonExtent / (double)m_destWidth ; - double yDelta = latExtent / (double)m_destHeight; - double curLon = m_westLonBound ; - double curLat = m_southLatBound; - - // Fill every point in the noise map with the output values from the model. - for (int y = 0; y < m_destHeight; y++) { - float* pDest = m_pDestNoiseMap->GetSlabPtr (y); - curLon = m_westLonBound; - for (int x = 0; x < m_destWidth; x++) { - float curValue = (float)sphereModel.GetValue (curLat, curLon); - *pDest++ = curValue; - curLon += xDelta; - } - curLat += yDelta; - if (m_pCallback != NULL) { - m_pCallback (y); - } - } -} - -////////////////////////////////////////////////////////////////////////////// -// RendererImage class - -RendererImage::RendererImage (): - m_isLightEnabled (false), - m_isWrapEnabled (false), - m_lightAzimuth (45.0), - m_lightBrightness (1.0), - m_lightColor (255, 255, 255, 255), - m_lightContrast (1.0), - m_lightElev (45.0), - m_lightIntensity (1.0), - m_pBackgroundImage (NULL), - m_pDestImage (NULL), - m_pSourceNoiseMap (NULL), - m_recalcLightValues (true) -{ - BuildGrayscaleGradient (); -}; - -void RendererImage::AddGradientPoint (double gradientPos, - const Color& gradientColor) -{ - m_gradient.AddGradientPoint (gradientPos, gradientColor); -} - -void RendererImage::BuildGrayscaleGradient () -{ - ClearGradient (); - m_gradient.AddGradientPoint (-1.0, Color ( 0, 0, 0, 255)); - m_gradient.AddGradientPoint ( 1.0, Color (255, 255, 255, 255)); -} - -void RendererImage::BuildTerrainGradient () -{ - ClearGradient (); - m_gradient.AddGradientPoint (-1.00, C