diff --git a/CMakeLists.txt b/CMakeLists.txt index 028bbd3188..e339747def 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -929,6 +929,8 @@ if (BUILD_CLIENT) # Generate GLSL include files. daemon_embed_files("EngineShaders" "${GLSL_EMBED_DIR}" "${GLSL_EMBED_LIST}" "TEXT" "client-objects") + + daemon_embed_files(ConsoleFont "${CMAKE_CURRENT_SOURCE_DIR}/libs/unifont" unifont.otf BINARY client-objects) endif() if (BUILD_SERVER) diff --git a/libs/unifont/LICENSE.txt b/libs/unifont/LICENSE.txt new file mode 100644 index 0000000000..60be3b6623 --- /dev/null +++ b/libs/unifont/LICENSE.txt @@ -0,0 +1,476 @@ +LICENSE +------- +The source code for everything except the compiled fonts in this current +release is licensed as follows: + + License for this current distribution of program source + files (i.e., everything except the fonts) is released under + the terms of the GNU General Public License version 2, + or (at your option) a later version. + + See the section below for a copy of the GNU General Public License + version 2. + +The license for the compiled fonts is covered by the SIL Open Font License +version 1.1 and by the above GPL terms with the GNU font embedding exception, +as follows: + + As a special exception, if you create a document which uses this font, + and embed this font or unaltered portions of this font into the document, + this font does not by itself cause the resulting document to be covered + by the GNU General Public License. This exception does not however + invalidate any other reasons why the document might be covered by the + GNU General Public License. If you modify this font, you may extend + this exception to your version of the font, but you are not obligated + to do so. If you do not wish to do so, delete this exception statement + from your version. + +See "http://www.gnu.org/licenses/gpl-faq.html#FontException" and +"https://scripts.sil.org/OFL" for more details. + + +GPL VERSION 2 +------------- + + 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. + + + +SIL Open Font License version 1.1 +--------------------------------- +Copyright (c) , (), +with Reserved Font Name . +Copyright (c) , (), +with Reserved Font Name . +Copyright (c) , (). + +This Font Software is licensed under the SIL Open Font License, Version 1.1. +This license is copied below, and is also available with a FAQ at: +http://scripts.sil.org/OFL + + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. + diff --git a/libs/unifont/unifont.otf b/libs/unifont/unifont.otf new file mode 100644 index 0000000000..9140053975 Binary files /dev/null and b/libs/unifont/unifont.otf differ diff --git a/pkg/daemon_src.dpkdir/gfx/2d/bigchars.png b/pkg/daemon_src.dpkdir/gfx/2d/bigchars.png deleted file mode 100644 index 3f75c39661..0000000000 Binary files a/pkg/daemon_src.dpkdir/gfx/2d/bigchars.png and /dev/null differ diff --git a/pkg/daemon_src.dpkdir/scripts/engine.shader b/pkg/daemon_src.dpkdir/scripts/engine.shader index 045c8961e2..526dce597d 100644 --- a/pkg/daemon_src.dpkdir/scripts/engine.shader +++ b/pkg/daemon_src.dpkdir/scripts/engine.shader @@ -7,15 +7,3 @@ white rgbgen vertex } } - -// console font fallback -gfx/2d/bigchars -{ - nopicmip - nomipmaps - { - map gfx/2d/bigchars - blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA - rgbgen vertex - } -} diff --git a/src/engine/client/cl_main.cpp b/src/engine/client/cl_main.cpp index 037dec1f87..e50d447cc9 100644 --- a/src/engine/client/cl_main.cpp +++ b/src/engine/client/cl_main.cpp @@ -2093,50 +2093,47 @@ bool CL_InitRenderer() return false; } - fileHandle_t f; - // this sets up the renderer and calls R_Init if ( !re.BeginRegistration( &cls.windowConfig ) ) { return false; } - cl_consoleFont = Cvar_Get( "cl_consoleFont", "fonts/unifont.ttf", CVAR_LATCH ); + cl_consoleFont = Cvar_Get( "cl_consoleFont", "", CVAR_LATCH ); cl_consoleFontSize = Cvar_Get( "cl_consoleFontSize", "16", CVAR_LATCH ); cl_consoleFontScaling = Cvar_Get( "cl_consoleFontScaling", "1", CVAR_LATCH ); - // load character sets - cls.charSetShader = re.RegisterShader( "gfx/2d/bigchars", RSF_2D ); - cls.useLegacyConsoleFont = cls.useLegacyConsoleFace = true; + // Register console font specified by cl_consoleFont. Empty string means use the embbed Unifont + + int fontSize = cl_consoleFontSize->integer; - // Register console font specified by cl_consoleFont, if any - // filehandle is unused but forces FS_FOpenFileRead() to heed purecheck because it does not when filehandle is nullptr - if ( cl_consoleFont->string[0] ) + if ( cl_consoleFontScaling->integer ) { - if ( FS_FOpenFileRead( cl_consoleFont->string, &f ) >= 0 ) - { - if ( cl_consoleFontScaling->value == 0 ) - { - cls.consoleFont = re.RegisterFont( cl_consoleFont->string, cl_consoleFontSize->integer ); - } - else - { - // This gets 12px on 1920×1080 screen, which is libRocket default for 1em - int fontScale = std::min(cls.windowConfig.vidWidth, cls.windowConfig.vidHeight) / 90; + // This gets 12px on 1920×1080 screen, which is libRocket default for 1em + int fontScale = std::min(cls.windowConfig.vidWidth, cls.windowConfig.vidHeight) / 90; - // fontScale / 12px gets 1px on 1920×1080 screen - cls.consoleFont = re.RegisterFont( cl_consoleFont->string, cl_consoleFontSize->integer * fontScale / 12 ); - } + // fontScale / 12px gets 1px on 1920×1080 screen + fontSize = cl_consoleFontSize->integer * fontScale / 12; + } - if ( cls.consoleFont != nullptr ) - cls.useLegacyConsoleFont = false; - } - else + if ( cl_consoleFont->string[ 0 ] ) + { + cls.consoleFont = re.RegisterFont( cl_consoleFont->string, fontSize ); + if ( cls.consoleFont == nullptr ) { - Log::Warn("Font file '%s' not found", cl_consoleFont->string); + Log::Warn( "Couldn't load font file '%s', falling back to default console font", + cl_consoleFont->string ); } + } - FS_FCloseFile( f ); + if ( cls.consoleFont == nullptr ) + { + cls.consoleFont = re.RegisterFont( "", fontSize ); + + if ( cls.consoleFont == nullptr ) + { + Sys::Error( "Failed to load built-in console font" ); + } } cls.whiteShader = re.RegisterShader( "white", RSF_NOMIP ); diff --git a/src/engine/client/cl_scrn.cpp b/src/engine/client/cl_scrn.cpp index b969bbd14b..ad51083863 100644 --- a/src/engine/client/cl_scrn.cpp +++ b/src/engine/client/cl_scrn.cpp @@ -107,12 +107,6 @@ static glyphInfo_t *Glyph( int ch ) void SCR_DrawConsoleFontUnichar( float x, float y, int ch ) { - if ( cls.useLegacyConsoleFont ) - { - SCR_DrawSmallUnichar( ( int ) x, ( int ) y, ch ); - return; - } - if ( ch != ' ' ) { glyphInfo_t *glyph = Glyph( ch ); @@ -126,53 +120,6 @@ void SCR_DrawConsoleFontUnichar( float x, float y, int ch ) } } -/* -** SCR_DrawSmallUnichar -** small chars are drawn at native screen resolution -*/ -void SCR_DrawSmallUnichar( int x, int y, int ch ) -{ - int row, col; - float frow, fcol; - float size; - - if ( ch < 0x100 || cls.useLegacyConsoleFont ) - { - if ( ch == ' ' ) { - return; - } - - if ( y < -SMALLCHAR_HEIGHT ) { - return; - } - - if ( ch >= 0x100 ) { ch = 0; } - - row = ch>>4; - col = ch&15; - - frow = row*0.0625; - fcol = col*0.0625; - size = 0.0625; - - // adjust for baseline - re.DrawStretchPic( x, y - (int)( SMALLCHAR_HEIGHT / ( CONSOLE_FONT_VPADDING + 1 ) ), - SMALLCHAR_WIDTH, SMALLCHAR_HEIGHT, - fcol, frow, - fcol + size, frow + size, - cls.charSetShader ); - } else { - glyphInfo_t *glyph = Glyph( ch ); - - re.DrawStretchPic( x, y, SMALLCHAR_WIDTH, glyph->imageHeight, - glyph->s, - glyph->t, - glyph->s2, - glyph->t2, - glyph->glyph ); - } -} - /* ================== SCR_DrawSmallString[Color] @@ -335,9 +282,7 @@ void SCR_UpdateScreen() float SCR_ConsoleFontUnicharWidth( int ch ) { - return cls.useLegacyConsoleFont - ? SMALLCHAR_WIDTH - : Glyph( ch )->xSkip + cl_consoleFontKerning->value; + return Glyph( ch )->xSkip + cl_consoleFontKerning->value; } float SCR_ConsoleFontCharWidth( const char *s ) @@ -347,44 +292,18 @@ float SCR_ConsoleFontCharWidth( const char *s ) float SCR_ConsoleFontCharHeight() { - return cls.useLegacyConsoleFont - ? SMALLCHAR_HEIGHT - : cls.consoleFont->glyphBlock[0][(unsigned)'I'].imageHeight + CONSOLE_FONT_VPADDING * cl_consoleFontSize->value; + return cls.consoleFont->glyphBlock[0][(unsigned)'I'].imageHeight + CONSOLE_FONT_VPADDING * cl_consoleFontSize->value; } float SCR_ConsoleFontCharVPadding() { - return cls.useLegacyConsoleFont - ? 0 - : std::max( 0, -cls.consoleFont->glyphBlock[0][(unsigned)'g'].bottom >> 6); + return std::max( 0, -cls.consoleFont->glyphBlock[0][(unsigned)'g'].bottom >> 6); } float SCR_ConsoleFontStringWidth( const char* s, int len ) { float width = 0; - if( cls.useLegacyConsoleFont ) - { - if( cls.useLegacyConsoleFace ) - { - return len * SMALLCHAR_WIDTH; - } - else - { - int l = 0; - const char *str = s; - - while( *str && len > 0 ) - { - l++; - str += Q_UTF8_Width( str ); - len--; - } - - return l * SMALLCHAR_WIDTH; - } - } - while( *s && len > 0 ) { width += SCR_ConsoleFontCharWidth( s ); diff --git a/src/engine/client/client.h b/src/engine/client/client.h index 3c64e4e7cc..43c678e0a4 100644 --- a/src/engine/client/client.h +++ b/src/engine/client/client.h @@ -315,10 +315,7 @@ struct clientStatic_t // rendering info WindowConfig windowConfig; - qhandle_t charSetShader; qhandle_t whiteShader; - bool useLegacyConsoleFont; - bool useLegacyConsoleFace; fontInfo_t *consoleFont; // www downloading @@ -650,7 +647,6 @@ void SCR_AdjustFrom640( float *x, float *y, float *w, float *h ); void SCR_FillRect( float x, float y, float width, float height, const Color::Color& color ); void SCR_DrawSmallStringExt( int x, int y, const char *string, const Color::Color& setColor, bool forceColor, bool noColorEscape ); -void SCR_DrawSmallUnichar( int x, int y, int ch ); void SCR_DrawConsoleFontUnichar( float x, float y, int ch ); float SCR_ConsoleFontCharWidth( const char *s ); float SCR_ConsoleFontUnicharWidth( int ch ); diff --git a/src/engine/null/null_renderer.cpp b/src/engine/null/null_renderer.cpp index 4313dcdf83..ff4fd99d16 100644 --- a/src/engine/null/null_renderer.cpp +++ b/src/engine/null/null_renderer.cpp @@ -52,7 +52,11 @@ qhandle_t RE_RegisterShader( const char *, int ) } fontInfo_t* RE_RegisterFont( const char *, int ) { - return nullptr; + return new fontInfo_t{}; +} +void RE_UnregisterFont( fontInfo_t* p ) +{ + delete p; } void RE_GlyphChar( fontInfo_t *, int, glyphInfo_t *glyph ) { @@ -70,7 +74,6 @@ void RE_GlyphChar( fontInfo_t *, int, glyphInfo_t *glyph ) glyph->glyph = 1; glyph->shaderName[0] = '\0'; } -void RE_UnregisterFont( fontInfo_t* ) { } void RE_LoadWorldMap( const char * ) { } void RE_SetWorldVisData( const byte * ) { } void RE_EndRegistration() { } diff --git a/src/engine/renderer/tr_font.cpp b/src/engine/renderer/tr_font.cpp index db14b98ad9..54a7536c7e 100644 --- a/src/engine/renderer/tr_font.cpp +++ b/src/engine/renderer/tr_font.cpp @@ -39,6 +39,8 @@ Maryland 20850 USA. #include "qcommon/qcommon.h" #include "qcommon/q_unicode.h" +#include "DaemonEmbeddedFiles/ConsoleFont.h" + #include #include FT_FREETYPE_H #include FT_ERRORS_H @@ -417,28 +419,46 @@ void RE_RenderChunk( fontInfo_t *font, const int chunk ) static int RE_LoadFontFile( const char *name, void **buffer ) { - void *tmp; - int length = ri.FS_ReadFile( name, &tmp ); + if ( !*name ) + { + *buffer = (void *)( ConsoleFont::unifont_otf.data ); + return ConsoleFont::unifont_otf.size; + } + + std::string tmp; + + try + { + tmp = FS::HomePath::OpenRead( name ).ReadAll(); + } + catch ( const std::system_error &exc ) + { + Log::Warn( "Failed to read font file: %s", exc.what() ); + return 0; + } - if ( length <= 0 ) + if ( tmp.size() > 1000 * 1000 * 1000 ) { return 0; } - void *data = Z_AllocUninit( length ); + void *data = Z_AllocUninit( tmp.size() ); *buffer = data; - memcpy( data, tmp, length ); - ri.FS_FreeFile( tmp ); + memcpy( data, tmp.data(), tmp.size() ); - return length; + return tmp.size(); } static void RE_FreeFontFile( void *data ) { - Z_Free( data ); + if ( data != ConsoleFont::unifont_otf.data ) + { + Z_Free( data ); + } } +// If name is the empty string, load the embedded Unifont fontInfo_t* RE_RegisterFont( const char *fontName, int pointSize ) { FT_Face face;