From 1318be4fc0675df9cc887113d5b0e7a3cde96698 Mon Sep 17 00:00:00 2001 From: kts Date: Fri, 6 Mar 2015 05:53:09 -0800 Subject: [PATCH] SDL_ttf now required. Added basic Font class and default TTF font (Amaranth). --- build/vs/vs.vcxproj | 6 +++- build/vs/vs.vcxproj.filters | 6 ++++ data/.CACHE | 10 ------ data/fonts/README.txt | 11 +++++++ data/fonts/SIL Open Font License.txt | 44 +++++++++++++++++++++++++++ data/fonts/default.ttf | Bin 0 -> 39140 bytes src/Core.cpp | 32 +++++++++++++++++++ src/Core.hpp | 6 +++- src/Font.cpp | 17 +++++++++++ src/Font.hpp | 19 ++++++++++++ src/Texture.cpp | 35 +++++++++++++++++++-- src/Texture.hpp | 2 ++ src/fio.cpp | 12 +++++--- src/states/TestState.cpp | 8 +++-- 14 files changed, 187 insertions(+), 21 deletions(-) delete mode 100644 data/.CACHE create mode 100644 data/fonts/README.txt create mode 100644 data/fonts/SIL Open Font License.txt create mode 100644 data/fonts/default.ttf create mode 100644 src/Font.cpp create mode 100644 src/Font.hpp diff --git a/build/vs/vs.vcxproj b/build/vs/vs.vcxproj index c00d915..2da252e 100644 --- a/build/vs/vs.vcxproj +++ b/build/vs/vs.vcxproj @@ -52,7 +52,7 @@ true - SDL2.lib;SDL2main.lib;opengl32.lib;glew32.lib;SDL2_image.lib;%(AdditionalDependencies) + SDL2.lib;SDL2main.lib;opengl32.lib;glew32.lib;SDL2_image.lib;SDL2_ttf.lib;%(AdditionalDependencies) Console @@ -60,6 +60,8 @@ xcopy /d /y "..\..\..\..\Dev\SDL2-2.0.3\lib\x86\SDL2.dll" "$(OutDir)" xcopy /d /y "..\..\..\..\Dev\SDL2-2.0.3\lib\x86\SDL2_image.dll" "$(OutDir)" xcopy /d /y "..\..\..\..\Dev\SDL2-2.0.3\lib\x86\libpng16-16.dll" "$(OutDir)" +xcopy /d /y "..\..\..\..\Dev\SDL2-2.0.3\lib\x86\SDL2_ttf.dll" "$(OutDir)" +xcopy /d /y "..\..\..\..\Dev\SDL2-2.0.3\lib\x86\libfreetype-6.dll" "$(OutDir)" xcopy /s /e /d /y "..\..\data" "$(OutDir)data\" @@ -84,6 +86,7 @@ xcopy /s /e /d /y "..\..\data" "$(OutDir)data\" + @@ -130,6 +133,7 @@ xcopy /s /e /d /y "..\..\data" "$(OutDir)data\" + diff --git a/build/vs/vs.vcxproj.filters b/build/vs/vs.vcxproj.filters index b07c9d1..b59eced 100644 --- a/build/vs/vs.vcxproj.filters +++ b/build/vs/vs.vcxproj.filters @@ -111,6 +111,9 @@ Classes\Gui + + Classes + @@ -220,5 +223,8 @@ Classes\Gui + + Classes + \ No newline at end of file diff --git a/data/.CACHE b/data/.CACHE deleted file mode 100644 index 1d13bf0..0000000 --- a/data/.CACHE +++ /dev/null @@ -1,10 +0,0 @@ -data/shaders/fb_fs.100.glsl 0 259 -data/models/cube.obj 825768822 432 -data/shaders/fb_vs.100.glsl 0 177 -data/shaders/default_fs.100.glsl 0 244 -data/shaders/default_vs.100.glsl 0 334 -data/shaders/fb_fs.glsl 3713587946 233 -data/shaders/fb_vs.glsl 2722618720 177 -data/shaders/default_fs.glsl 1466891365 218 -data/shaders/default_vs.glsl 685822220 336 -data/models/chest.obj 870013261 4806 diff --git a/data/fonts/README.txt b/data/fonts/README.txt new file mode 100644 index 0000000..aed0ba1 --- /dev/null +++ b/data/fonts/README.txt @@ -0,0 +1,11 @@ +This directory contains a default font to be used by the program. + +To make replacement easier, the following default names are assumed: + default.ttf + defaultb.ttf + defaultbi.ttf + defaulti.ttf + +In the current distribution, the SIL licensed "Amaranth" font is used per-default with the following renaming: + + Amaranth-Regular.ttf -> default.ttf \ No newline at end of file diff --git a/data/fonts/SIL Open Font License.txt b/data/fonts/SIL Open Font License.txt new file mode 100644 index 0000000..87b92c4 --- /dev/null +++ b/data/fonts/SIL Open Font License.txt @@ -0,0 +1,44 @@ +Copyright (c) 2011, Gesine Todt (hallo@gesine-todt.de), +with Reserved Font Name Amaranth. + +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. \ No newline at end of file diff --git a/data/fonts/default.ttf b/data/fonts/default.ttf new file mode 100644 index 0000000000000000000000000000000000000000..efdcb25850503de2fda759da9cd8c334ab56adba GIT binary patch literal 39140 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 literal 0 HcmV?d00001 diff --git a/src/Core.cpp b/src/Core.cpp index 1e93d08..a03935c 100644 --- a/src/Core.cpp +++ b/src/Core.cpp @@ -10,6 +10,7 @@ Core is somewhat like a service locator, but with larger engine capabilities - i #include "State.hpp" #include "MenuState.hpp" #include "TestState.hpp" +#include // includes for getting "user" directory #if defined(__APPLE__) && !defined(__IPHONEOS__) #include @@ -119,6 +120,11 @@ int Core::initSystem() { #else shader_version = "120"; #endif + // Okay, let's load up TTF + if (TTF_Init() == -1) { + LOG(LOG_ERROR) << FUNC_NAME << ": TTF_Init(): " << TTF_GetError(); + return 1; + } asset_manager = new AssetManager(); // TODO: load APP cache as first cache (using ApkAssetCache in the case of Android) @@ -168,18 +174,26 @@ int Core::initSystem() { // Create our main RenderView (which simply wraps around v_fbo, v_width, and v_height) window_rview = new RenderView(v_fbo, v_width, v_height); // Create our resource management stuff + // Texture Management Asset *asset = asset_manager->loadFile("textures/null.png"); null_texture = new Texture("textures/null.png", asset->getData(), asset->getDataLength()); null_texture->buildTexture(); texture_table = new HashTable(256); texture_table->setnull(null_texture); asset->unloadData(); + // Mesh Management asset = asset_manager->loadFile("models/null.obj"); null_mesh = new Mesh(asset->getData(), asset->getDataLength()); null_mesh->buildMesh(); mesh_table = new HashTable(64); mesh_table->setnull(null_mesh); asset->unloadData(); + // Font Management + asset = asset_manager->loadFile("fonts/default.ttf"); + default_font = new Font("fonts/default.ttf", 16, asset->getData(), asset->getDataLength()); + font_table = new HashTable(8); + font_table->setnull(default_font); + //asset->unloadData(); // Create our basic RenderScene scene = new RenderScene(); @@ -209,6 +223,7 @@ int Core::closeSystem() { // delete window RenderView delete window_rview; + TTF_Quit(); SDL_GL_DeleteContext(v_context); SDL_DestroyWindow(v_window); SDL_Quit(); @@ -353,3 +368,20 @@ Mesh* Core::getMesh(const char *mesh_name) { } return mesh; } +Font* Core::getFont(const char *font_name) { + Font *font = font_table->get(font_name); + // FIXME: we'll always attempt to load a new font if default is chosen.. + if (font == default_font) { + // Either the texture isn't loaded or it doesn't exist - we assume the former first + Asset *asset_font = asset_manager->loadFile(font_name); + if (!(asset_font->flags & Asset::IS_NULL)) { + // Asset was not null, that means we probably have a good texture! + font = new Font(font_name, 16, asset_font->getData(), asset_font->getDataLength()); + // NOTE: we _DO NOT_ unload font data, as that destroys the font's data as well + // FIXME: this obviously leads to a memory leak :S + //asset_font->unloadData(); + font_table->set(font_name, font); + } + } + return font; +} \ No newline at end of file diff --git a/src/Core.hpp b/src/Core.hpp index c822f69..2e859c9 100644 --- a/src/Core.hpp +++ b/src/Core.hpp @@ -12,6 +12,7 @@ Core is somewhat like a service locator, but with larger engine capabilities - i #include "State.hpp" #include "HashTable.hpp" #include "Texture.hpp" +#include "Font.hpp" #include class Core { public: @@ -38,7 +39,10 @@ class Core { Mesh *getMesh(const char *mesh_name); HashTable *mesh_table; Mesh *null_mesh; - //Mesh *null_mesh; + // + Font* getFont(const char *ttf_name); + HashTable *font_table; + Font *default_font; // int pushState(State *state); int popState(); diff --git a/src/Font.cpp b/src/Font.cpp new file mode 100644 index 0000000..5262b5c --- /dev/null +++ b/src/Font.cpp @@ -0,0 +1,17 @@ +#include "Font.hpp" +#include "Log.hpp" +#include + +/* ======== Constructors/Destructor ======== */ +Font::Font(std::string name_, int ptsize, const char *buffer, size_t buffer_size) { + // TODO: copy buffer to new buffer and have SDL_RWFromMem reference that. This will allow us to free the Asset without worry + name.assign(name_); + point_size = ptsize; + if ((font = TTF_OpenFontRW(SDL_RWFromMem((void*)buffer, buffer_size), 1, point_size)) == NULL) { + LOG(LOG_ERROR) << FUNC_NAME << ": Could not load TTF from buffer: " << TTF_GetError(); + return; + } +} +Font::~Font() { + TTF_CloseFont(font); +} \ No newline at end of file diff --git a/src/Font.hpp b/src/Font.hpp new file mode 100644 index 0000000..69b71d6 --- /dev/null +++ b/src/Font.hpp @@ -0,0 +1,19 @@ +/* ================================================================ +Font +---------------- +Font.cpp/Font.hpp provide the Font class. This class is similar to Mesh/Texture +================================================================ */ +#ifndef FONT_HPP +#define FONT_HPP +#include +#include +class Font { + public: + Font(std::string name_, int ptsize, const char *buffer, size_t buffer_size); + ~Font(); + TTF_Font *font; + private: + std::string name; + int point_size; +}; +#endif \ No newline at end of file diff --git a/src/Texture.cpp b/src/Texture.cpp index 86b874a..8c23148 100644 --- a/src/Texture.cpp +++ b/src/Texture.cpp @@ -19,7 +19,16 @@ Texture::Texture(std::string name_, RenderView *view) { w = view->getWidth(); h = view->getHeight(); } +Texture::Texture(std::string name_, SDL_Surface *surface) { + name.assign(name_); + texture = 0; + flags = 0; + w = h = 0; + image = NULL; + loadSurface(surface); +} Texture::~Texture() { + unloadImg(); destroyTexture(); } /* ======== Image/Surface loading/unloading ======== */ @@ -53,6 +62,19 @@ int Texture::unloadImg() { } return 1; } +int Texture::loadSurface(SDL_Surface *surface) { + if (surface == NULL) return 1; + if (flags & LOADED) { + LOG(LOG_WARNING) << FUNC_NAME << ": surface already loaded - unloading and replacing"; + unloadImg(); + } + // NOTE: we assume the surface as our's - is this bad? + image = surface; + flags |= LOADED; + w = surface->w; + h = surface->h; + return 0; +} /* ======== Texture generation/destruction ======== */ /* buildTexture This function generates the OpenGL texture is an image is loaded. If the texture is already built, it is destroyed and recreated. @@ -77,10 +99,19 @@ GLuint Texture::buildTexture() { LOG(LOG_WARNING) << FUNC_NAME << ": failed to generate texture!"; return 0; } + int mode; + if (image->format->BytesPerPixel == 3) { // RGB 24bit + mode = GL_RGB; + } else if (image->format->BytesPerPixel == 4) { // RGBA 32bit + mode = GL_RGBA; + } else { + // TODO: actually handle others - upconvert? + mode = GL_RGB; + } #ifdef __APPLE__ - glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, image->w, image->h, 0, GL_BGRA, GL_UNSIGNED_BYTE, image->pixels); + glTexImage2D(GL_TEXTURE_2D, 0, mode, image->w, image->h, 0, GL_BGRA, GL_UNSIGNED_BYTE, image->pixels); #else - glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, image->w, image->h, 0, GL_RGBA, GL_UNSIGNED_BYTE, image->pixels); + glTexImage2D(GL_TEXTURE_2D, 0, mode, image->w, image->h, 0, GL_RGBA, GL_UNSIGNED_BYTE, image->pixels); #endif /*glGenerateMipmap(GL_TEXTURE_2D); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST_MIPMAP_LINEAR); diff --git a/src/Texture.hpp b/src/Texture.hpp index de06071..adb55ce 100644 --- a/src/Texture.hpp +++ b/src/Texture.hpp @@ -12,11 +12,13 @@ class Texture { public: Texture(std::string name_, const char *buffer, size_t buffer_size); Texture(std::string name_, RenderView *view); + Texture(std::string name_, SDL_Surface *surface); ~Texture(); enum Flags { LOADED = (1 << 1), BUILT = (1 << 2) }; + int loadSurface(SDL_Surface *surface); int loadImg(const char *buffer, size_t buffer_size); int unloadImg(); GLuint buildTexture(); diff --git a/src/fio.cpp b/src/fio.cpp index 97900d5..03bd474 100644 --- a/src/fio.cpp +++ b/src/fio.cpp @@ -13,7 +13,8 @@ size_t fileToMem(const char *filename, char **buffer) { char chunk[1024]; #if _WIN32 // _fsopen is used as we pass a FILE ptr back - fopen_s does not allow this - FILE *file = _fsopen(filename, "rb", _SH_DENYNO); + FILE* file; + fopen_s(&file, filename, "rb"); #else FILE *file = fopen(filename, "rb"); #endif @@ -22,7 +23,7 @@ size_t fileToMem(const char *filename, char **buffer) { return 0; } fseek(file, 0, SEEK_END); - size_t size = ftell(file)+1; + size_t size = ftell(file); fseek(file, 0, SEEK_SET); *buffer = (char*)malloc(size*sizeof(char)); @@ -32,12 +33,13 @@ size_t fileToMem(const char *filename, char **buffer) { } int n = 0; size_t offset = 0; - while ((n = fread(chunk, 1, 1024, file))) { + /*while ((n = fread(chunk, 1, 1024, file))) { memcpy((*buffer)+offset, chunk, n); offset += n; - } + }*/ + fread(*buffer, size, 1, file); fclose(file); - return offset; + return size; } /* ======== Asset data access ======== */ // Assets are files that may exist in an external storage directory (iOS/Android), a user data directory(all), or in the application itself (iOS/Android/OSX). diff --git a/src/states/TestState.cpp b/src/states/TestState.cpp index e412766..a0aeaf5 100644 --- a/src/states/TestState.cpp +++ b/src/states/TestState.cpp @@ -181,9 +181,13 @@ int TestState::onInit() { scene->addSet(sert); // GUI testing - GuiElement *element = new GuiButton("test", core.getTexture("ui/icon_perscube.png")); + //GuiElement *element = new GuiButton("test", core.getTexture("ui/icon_perscube.png")); + SDL_Color color = {0, 0, 0}; + Texture *text_texture = new Texture("text", TTF_RenderUTF8_Blended(core.default_font->font, "Test", color)); + text_texture->buildTexture(); + GuiElement *element = new GuiButton("test", text_texture); element->setPFlags(GuiElement::TOP|GuiElement::RIGHT); - element->setGeometry(0.0f, 0.0f, 128.0f, 128.0f); + element->setGeometry(0.0f, 0.0f, text_texture->w, text_texture->h); GuiList *element_list = new GuiList("list1"); element_list->addChild(element);