diff --git a/.gitignore b/.gitignore index 9b13ca9..aab1993 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,7 @@ *.o +.sconf_temp .sconsign.dblite +config.log digbuild tags +media/materials/textures/source diff --git a/COPYING b/COPYING new file mode 100644 index 0000000..f08e511 --- /dev/null +++ b/COPYING @@ -0,0 +1,12 @@ +gpufrac is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..d511905 --- /dev/null +++ b/LICENSE @@ -0,0 +1,339 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 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. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +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 Program or any portion +of it, thus forming a work based on the Program, 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) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +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 Program, 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 Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) 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; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, 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 executable. However, as a +special exception, the source code 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. + +If distribution of executable or 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 counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program 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. + + 5. 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 Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program 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 to +this License. + + 7. 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 Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program 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 Program. + +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. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program 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. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies 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 Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, 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 + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. 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 PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +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 program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, 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. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. diff --git a/README b/README index d566b49..bef4596 100644 --- a/README +++ b/README @@ -1 +1,44 @@ -DigBuild is a simple Minecraft clone. +########################################################################### +# ABOUT +########################################################################### + +Digbuild is an experimental project to create a voxel-based game with many +similarities to Minecraft (and many improvements as well). + +########################################################################### +# DEPENDENCIES +########################################################################### + +The following libraries are required to build Digbuild: + + * Boost + * GMTL (see http://sourceforge.net/projects/ggt) + * SDL + * SDL Image + * GL + * GLU + * GLEW + +########################################################################### +# BUILDING +########################################################################### + +In the top-level Digbuild directory, run 'scons'. Depending on where your +Boost and GMTL header files are installed, you may need to use the following +options: + + --boost_include_dir= + --gmtl_include_dir= + +The following arguments may also be used to configure the build: + + optimize=(1|0) # Build the binary with optimizations. + assert=(1|0) # Build the binary with assertions left in. + release=(1|0) # Strip the binary, etc. + profile=(1|0) # Build gprof profiling information into the binary. + +The following build targets may be useful: + + run # Run the binary (after building it if necessary). + prof # Run the binary and generate profiling output when it exits. + src/tags # Build an exuberant-ctags database file. diff --git a/SConstruct b/SConstruct index 152e11c..84ee6c2 100644 --- a/SConstruct +++ b/SConstruct @@ -1,15 +1,57 @@ -import os, glob +import multiprocessing +import os +import subprocess -SetOption( 'num_jobs', 9 ) # Set this to the number of processors you have. TODO: Automate this. +HEADERS = Glob( 'src/*.h' ) +SOURCES = Glob( 'src/*.cc' ) +BINARY = 'digbuild' +LIBRARY_DEPENDENCIES = [ 'sdl', 'SDL_image', 'gl', 'glew', 'glu' ] +HEADER_DEPENDENCIES = [ 'boost/shared_ptr.hpp', 'gmtl/gmtl.h' ] +INCLUDE_DIRECTORY_NAMES = [ 'boost_include_dir', 'gmtl_include_dir' ] -sources = glob.glob( '*.cc' ) -headers = glob.glob( '*.h' ) +def CheckPackageConfig( context, library ): + context.Message( 'Checking for library %s...' % library ) + if subprocess.call( [ 'pkg-config', '--exists', library ] ) == 0: + context.Result( 'ok' ) + return True + else: + context.Result( 'failed' ) + return False -CCFLAGS = [ - '-isystem/usr/include/gmtl-0.5.2', - '-g', - '-ffast-math', - '-fassociative-math', +AddOption( + '--boost-include-dir', + dest = 'boost_include_dir', + nargs = 1, + type = 'string', + action = 'store', + metavar = 'DIR', + default = '/usr/include', + help = 'Boost header file directory' +) + +AddOption( + '--gmtl-include-dir', + dest = 'gmtl_include_dir', + nargs = 1, + type = 'string', + action = 'store', + metavar = 'DIR', + default = '/usr/include/gmtl-0.5.2', + help = 'GMTL header file directory' +) + +OPTIMIZE_BINARY = ARGUMENTS.get( 'optimize', 1 ) +INCLUDE_ASSERTIONS = not ARGUMENTS.get( 'assert', 0 ) +RELEASE_BUILD = ARGUMENTS.get( 'release', 0 ) +PROFILE_BINARY = ARGUMENTS.get( 'profile', 0 ) + +env = Environment() +env.SetOption( 'num_jobs', multiprocessing.cpu_count() * 2 + 1 ) + +for variable in [ 'PATH', 'TERM', 'HOME', 'DISPLAY' ]: + env.Append( ENV = { variable : os.environ[variable] } ) + +env.Append( CCFLAGS = [ '-Wall', '-W', '-Wshadow', @@ -19,25 +61,53 @@ CCFLAGS = [ '-Wredundant-decls', '-Wno-unused', '-Wno-deprecated' -] +] ) -LINKFLAGS = [] +for name in INCLUDE_DIRECTORY_NAMES: + directory = GetOption( name ) + env.Append( CPPPATH = [ directory ] ) + env.Append( CCFLAGS = [ '-isystem%s' % directory ] ) -CCFLAGS += [ '-O3' ] -CCFLAGS += [ '-DNDEBUG' ] -LINKFLAGS += [ '-Wl,--strip-all' ] +if OPTIMIZE_BINARY: + env.Append( CCFLAGS = [ '-O3', '-ffast-math', '-fassociative-math' ] ) -#CCFLAGS += [ '-pg' ] -#LINKFLAGS += [ '-pg' ] +if INCLUDE_ASSERTIONS: + env.Append( CCFLAGS = [ '-DNDEBUG' ] ) -env = Environment() -env.Append( ENV = {'PATH':os.environ['PATH'], 'TERM':os.environ['TERM'], 'HOME':os.environ['HOME']} ) # Environment variables required by colorgcc. -env.Append( LIBS = [ 'SDL', 'SDL_image', 'GL', 'GLU', 'GLEW', 'rt' ] ) -env.Append( CCFLAGS = CCFLAGS ) -env.Append( LINKFLAGS = LINKFLAGS ) +if RELEASE_BUILD: + env.Append( LINKFLAGS = [ '-Wl,--strip-all' ] ) +else: + env.Append( CCFLAGS = [ '-g' ] ) + +if PROFILE_BINARY: + env.Append( CCFLAGS = [ '-pg' ] ) + env.Append( LINKFLAGS = [ '-pg' ] ) + +conf = Configure( env, custom_tests = { 'CheckPackageConfig' : CheckPackageConfig } ) + +for header in HEADER_DEPENDENCIES: + if not conf.CheckCXXHeader( header ): + print 'Required header file %s could not be found. Aborting.' % header + Exit( 1 ) + +for library in LIBRARY_DEPENDENCIES: + if not conf.CheckPackageConfig( library ): + print '*** Required library %s could not be found. Aborting.' % library + Exit( 1 ) + +env = conf.Finish() + +for library in LIBRARY_DEPENDENCIES: + env.MergeFlags( [ '!pkg-config %s --cflags --libs' % library ] ) + +env.Program( source = SOURCES, target = BINARY ) +env.Command( 'src/tags', SOURCES + HEADERS, 'ctags -o $TARGET $SOURCES' ) -# scons && ./digbuild && gprof digbuild > prof +env.Command( 'prof', BINARY, './%(binary)s && gprof %(binary)s > prof' % { 'binary' : BINARY } ) +env.Clean( 'prof', [ 'prof', 'gmon.out' ] ) +env.AlwaysBuild( 'prof' ) -env.Program( source = sources, target = 'digbuild' ) +env.Command( 'run', BINARY, './' + BINARY ) +env.AlwaysBuild( 'run' ) -env.Command( 'tags', sources + headers, 'ctags -o $TARGET $SOURCES' ) +env.Default( [ BINARY, 'src/tags' ] ) diff --git a/bicubic_patch.cc b/src/bicubic_patch.cc similarity index 100% rename from bicubic_patch.cc rename to src/bicubic_patch.cc diff --git a/bicubic_patch.h b/src/bicubic_patch.h similarity index 100% rename from bicubic_patch.h rename to src/bicubic_patch.h diff --git a/block.cc b/src/block.cc similarity index 100% rename from block.cc rename to src/block.cc diff --git a/block.h b/src/block.h similarity index 100% rename from block.h rename to src/block.h diff --git a/camera.cc b/src/camera.cc similarity index 98% rename from camera.cc rename to src/camera.cc index 8fcc554..d197fe7 100644 --- a/camera.cc +++ b/src/camera.cc @@ -52,7 +52,7 @@ void Camera::handle_mouse_motion( int xrel, int yrel ) else if ( pitch_ < -90.0f ) pitch_ = -90.f; } -Vector3f Camera::get_direction() +Vector3f Camera::get_direction() const { float pitch_radians = pitch_ * gmtl::Math::PI / 180.0f, diff --git a/camera.h b/src/camera.h similarity index 92% rename from camera.h rename to src/camera.h index 3b9c18b..7a5e0a4 100644 --- a/camera.h +++ b/src/camera.h @@ -12,7 +12,9 @@ struct Camera void translate() const; void do_one_step( float step_time ); void handle_mouse_motion( int xrel, int yrel ); - Vector3f get_direction(); + + Vector3f get_direction() const; + Vector3f get_position() const { return position_; } void fast_move_mode( bool m ) { moving_fast_ = m; } void move_forward( bool m ) { moving_forward_ = m; } @@ -22,14 +24,8 @@ struct Camera void move_up( bool m ) { moving_up_ = m; } void move_down( bool m ) { moving_down_ = m; } - Vector3f position_; - - Scalar - mouse_sensitivity_, - pitch_, - yaw_; - private: + void move_forward( Scalar movement_units ); void strafe( Scalar movement_units ); @@ -37,6 +33,13 @@ struct Camera CAMERA_SPEED = 30.0f, CAMERA_FAST_MODE_FACTOR = 5.0f; + Vector3f position_; + + Scalar + mouse_sensitivity_, + pitch_, + yaw_; + bool moving_fast_, moving_forward_, diff --git a/chunk.cc b/src/chunk.cc similarity index 100% rename from chunk.cc rename to src/chunk.cc diff --git a/chunk.h b/src/chunk.h similarity index 100% rename from chunk.h rename to src/chunk.h diff --git a/game_application.cc b/src/game_application.cc similarity index 100% rename from game_application.cc rename to src/game_application.cc diff --git a/game_application.h b/src/game_application.h similarity index 100% rename from game_application.h rename to src/game_application.h diff --git a/log.h b/src/log.h similarity index 100% rename from log.h rename to src/log.h diff --git a/main.cc b/src/main.cc similarity index 100% rename from main.cc rename to src/main.cc diff --git a/math.h b/src/math.h similarity index 100% rename from math.h rename to src/math.h diff --git a/random.h b/src/random.h similarity index 100% rename from random.h rename to src/random.h diff --git a/renderer.cc b/src/renderer.cc similarity index 86% rename from renderer.cc rename to src/renderer.cc index 6cac94f..f9af772 100644 --- a/renderer.cc +++ b/src/renderer.cc @@ -2,11 +2,12 @@ #include +#include + #include #include "renderer.h" - ////////////////////////////////////////////////////////////////////////////////// // Local definitions: ////////////////////////////////////////////////////////////////////////////////// @@ -114,7 +115,12 @@ void ChunkVertexBuffer::render() // Function definitions for ChunkRenderer: ////////////////////////////////////////////////////////////////////////////////// -void ChunkRenderer::render( const Sky& sky, const RendererMaterialV& materials ) +ChunkRenderer::ChunkRenderer( const Vector3f& centroid ) : + centroid_( centroid ) +{ +} + +void ChunkRenderer::render_opaque( const Sky& sky, const RendererMaterialV& materials ) { for ( ChunkVertexBufferMap::iterator it = vbos_.begin(); it != vbos_.end(); ++it ) { @@ -386,8 +392,21 @@ Renderer::Renderer() void Renderer::note_chunk_changes( const Chunk& chunk ) { - ChunkRenderer& chunk_renderer = chunk_renderers_[chunk.get_position()]; - chunk_renderer.rebuild( chunk ); + ChunkRendererMap::iterator chunk_renderer_it = chunk_renderers_.find( chunk.get_position() ); + + if ( chunk_renderer_it == chunk_renderers_.end() ) + { + const Vector3f centroid = vector_cast( chunk.get_position() ) + Vector3f( + Scalar( Chunk::CHUNK_SIZE ) / 2.0f, + Scalar( Chunk::CHUNK_SIZE ) / 2.0f, + Scalar( Chunk::CHUNK_SIZE ) / 2.0f + ); + + chunk_renderer_it = + chunk_renderers_.insert( std::make_pair( chunk.get_position(), ChunkRenderer( centroid ) ) ).first; + } + + chunk_renderer_it->second.rebuild( chunk ); } void Renderer::render( const Camera& camera, const World& world ) @@ -395,7 +414,7 @@ void Renderer::render( const Camera& camera, const World& world ) camera.rotate(); render_sky( world.get_sky() ); camera.translate(); - render_chunks( world.get_sky(), world.get_chunks() ); + render_chunks( camera.get_position(), world.get_sky(), world.get_chunks() ); } void Renderer::render_sky( const Sky& sky ) @@ -403,41 +422,12 @@ void Renderer::render_sky( const Sky& sky ) sky_renderer_.render( sky ); } -void Renderer::render_chunks( const Sky& sky, const ChunkMap& chunks ) +void Renderer::render_chunks( const Vector3f& camera_position, const Sky& sky, const ChunkMap& chunks ) { - // TODO: Abstract out - GLfloat - m_data[16], - p_data[16]; - - glGetFloatv( GL_MODELVIEW_MATRIX, m_data ); - glGetFloatv( GL_PROJECTION_MATRIX, p_data ); - - gmtl::Matrix m; - m.set( m_data ); - - gmtl::Matrix p; - p.set( p_data ); - - gmtl::Frustumf view_frustum( m, p ); - // TODO: Arrange the chunks into some kind of hierarchy and cull based on that. - // TODO: Sort (using an ordering table) the chunks, and render them from front to back. Eventually, - // use an ARB_occlusion_query to avoid rendering fully occluded chunks. - - // TODO: Render the translucent parts of the chunks from back to front. - // TODO: Look into glMultiDrawElements or display lists to reduce the number of OpenGL library calls. - int chunks_rendered = 0; - int chunks_total = 0; - - glEnable( GL_CULL_FACE ); - - glEnable( GL_DEPTH_TEST ); - glDepthFunc( GL_LEQUAL ); - // glEnable( GL_BLEND ); // glBlendFunc( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA ); @@ -451,6 +441,15 @@ void Renderer::render_chunks( const Sky& sky, const ChunkMap& chunks ) // glFogf( GL_FOG_END, 1000.0f ); // glFogi( GL_FOG_COORD_SRC, GL_FRAGMENT_DEPTH ); + gmtl::Frustumf view_frustum( + get_opengl_matrix( GL_MODELVIEW_MATRIX ), + get_opengl_matrix( GL_PROJECTION_MATRIX ) + ); + + typedef std::pair DistanceChunkPair; + typedef std::set ChunkRendererSet; + ChunkRendererSet visible_chunks; + for ( ChunkMap::const_iterator chunk_it = chunks.begin(); chunk_it != chunks.end(); ++chunk_it ) { const Vector3i chunk_position = chunk_it->first; @@ -458,16 +457,18 @@ void Renderer::render_chunks( const Sky& sky, const ChunkMap& chunks ) const Vector3f chunk_max = chunk_min + Vector3f( Chunk::CHUNK_SIZE, Chunk::CHUNK_SIZE, Chunk::CHUNK_SIZE ); const gmtl::AABoxf chunk_box( chunk_min, chunk_max ); - ++chunks_total; - if ( gmtl::isInVolume( view_frustum, chunk_box ) ) { ChunkRendererMap::iterator chunk_renderer_it = chunk_renderers_.find( chunk_position ); if ( chunk_renderer_it != chunk_renderers_.end() ) { - chunk_renderer_it->second.render( sky, materials_ ); - ++chunks_rendered; + const Vector3f camera_to_centroid = + camera_position - chunk_renderer_it->second.get_centroid(); + const Scalar distance_squared = + gmtl::dot( camera_to_centroid, camera_to_centroid ); + + visible_chunks.insert( std::make_pair( distance_squared, &chunk_renderer_it->second ) ); } } } @@ -475,10 +476,41 @@ void Renderer::render_chunks( const Sky& sky, const ChunkMap& chunks ) // TODO: Just for development. // static unsigned c = 0; // if ( ++c % 60 == 0 ) - // std::cout << "Chunks rendered: " << chunks_rendered << " / " << chunks_total << std::endl; + // std::cout << "Visible chunks: " << visible_chunks.size() << " / " << chunks.size() << std::endl; + + glEnable( GL_CULL_FACE ); + glEnable( GL_DEPTH_TEST ); + glDepthFunc( GL_LEQUAL ); + + // Draw the Chunks from nearest to farthest. This will result in many of the farthest + // chunks being fully occluded, and thus their fragments will be rejected without running + // any expensive fragment shaders. + // + // TODO: Use an ARB_occlusion_query to avoid rendering fully occluded chunks. + + for ( ChunkRendererSet::iterator it = visible_chunks.begin(); it != visible_chunks.end(); ++it ) + { + it->second->render_opaque( sky, materials_ ); + } + + // TODO: Render the translucent parts of the chunks from back to front. + + // for ( ChunkRendererSet::reverse_iterator it = visible_chunks.rbegin(); it != visible_chunks.rend(); ++it ) + // { + // it->second->render_translucent( sky, materials_ ); + // } glDisable( GL_DEPTH_TEST ); glDisable( GL_BLEND ); glDisable( GL_CULL_FACE ); } + +gmtl::Matrix44f Renderer::get_opengl_matrix( const GLenum matrix ) +{ + GLfloat m_data[16]; + glGetFloatv( matrix, m_data ); + gmtl::Matrix44f m; + m.set( m_data ); + return m; +} diff --git a/renderer.h b/src/renderer.h similarity index 87% rename from renderer.h rename to src/renderer.h index 0efdad2..73af249 100644 --- a/renderer.h +++ b/src/renderer.h @@ -58,12 +58,17 @@ typedef std::map ChunkVertexBufferMap; struct ChunkRenderer { - void render( const Sky& sky, const RendererMaterialV& materials ); + ChunkRenderer( const Vector3f& centroid = Vector3f() ); + + void render_opaque( const Sky& sky, const RendererMaterialV& materials ); void rebuild( const Chunk& chunk ); + const Vector3f& get_centroid() const { return centroid_; } protected: ChunkVertexBufferMap vbos_; + + Vector3f centroid_; }; struct SkydomeVertexBuffer : public VertexBuffer @@ -118,8 +123,9 @@ struct Renderer protected: - void render_chunks( const Sky& sky, const ChunkMap& chunks ); + void render_chunks( const Vector3f& camera_position, const Sky& sky, const ChunkMap& chunks ); void render_sky( const Sky& sky ); + gmtl::Matrix44f get_opengl_matrix( const GLenum matrix ); typedef std::map > ChunkRendererMap; ChunkRendererMap chunk_renderers_; diff --git a/renderer_material.cc b/src/renderer_material.cc similarity index 100% rename from renderer_material.cc rename to src/renderer_material.cc diff --git a/renderer_material.h b/src/renderer_material.h similarity index 100% rename from renderer_material.h rename to src/renderer_material.h diff --git a/sdl_gl_interface.cc b/src/sdl_gl_interface.cc similarity index 98% rename from sdl_gl_interface.cc rename to src/sdl_gl_interface.cc index ceab926..a350183 100644 --- a/sdl_gl_interface.cc +++ b/src/sdl_gl_interface.cc @@ -78,8 +78,8 @@ void SDL_GL_Window::create_window() SDL_WM_SetCaption( title_.c_str(), NULL ); SDL_FillRect( screen_, NULL, SDL_MapRGBA( screen_->format, 0, 0, 0, 0 ) ); - SDL_ShowCursor( SDL_DISABLE ); - SDL_WM_GrabInput( SDL_GRAB_ON ); + //SDL_ShowCursor( SDL_DISABLE ); + //SDL_WM_GrabInput( SDL_GRAB_ON ); init_GL(); reshape_window(); diff --git a/sdl_gl_interface.h b/src/sdl_gl_interface.h similarity index 100% rename from sdl_gl_interface.h rename to src/sdl_gl_interface.h diff --git a/sdl_utilities.h b/src/sdl_utilities.h similarity index 100% rename from sdl_utilities.h rename to src/sdl_utilities.h diff --git a/shader.cc b/src/shader.cc similarity index 100% rename from shader.cc rename to src/shader.cc diff --git a/shader.h b/src/shader.h similarity index 100% rename from shader.h rename to src/shader.h diff --git a/trilinear_box.cc b/src/trilinear_box.cc similarity index 100% rename from trilinear_box.cc rename to src/trilinear_box.cc diff --git a/trilinear_box.h b/src/trilinear_box.h similarity index 100% rename from trilinear_box.h rename to src/trilinear_box.h diff --git a/world.cc b/src/world.cc similarity index 100% rename from world.cc rename to src/world.cc diff --git a/world.h b/src/world.h similarity index 100% rename from world.h rename to src/world.h diff --git a/world_generator.cc b/src/world_generator.cc similarity index 100% rename from world_generator.cc rename to src/world_generator.cc diff --git a/world_generator.h b/src/world_generator.h similarity index 100% rename from world_generator.h rename to src/world_generator.h