mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-03-27 03:40:24 +00:00
Code Issues Releases Wiki Activity

Load fonts

Browse source
This commit is contained in:
Andrei Kortunov 2022-07-07 19:34:18 +04:00
parent 7c442926f8
commit dd04bfccfb
23 changed files with 430 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CMakeLists.txt
View file

@ -921,7 +921,6 @@ elseif(NOT APPLE)
INSTALL(FILES "${OpenMW_SOURCE_DIR}/CHANGELOG.md" DESTINATION "." RENAME "CHANGELOG.txt") INSTALL(FILES "${OpenMW_SOURCE_DIR}/CHANGELOG.md" DESTINATION "." RENAME "CHANGELOG.txt")
INSTALL(FILES "${OpenMW_SOURCE_DIR}/README.md" DESTINATION "." RENAME "README.txt") INSTALL(FILES "${OpenMW_SOURCE_DIR}/README.md" DESTINATION "." RENAME "README.txt")
INSTALL(FILES "${OpenMW_SOURCE_DIR}/LICENSE" DESTINATION "." RENAME "LICENSE.txt") INSTALL(FILES "${OpenMW_SOURCE_DIR}/LICENSE" DESTINATION "." RENAME "LICENSE.txt")
INSTALL(FILES "${OpenMW_SOURCE_DIR}/files/mygui/DejaVuFontLicense.txt" DESTINATION ".")
INSTALL(FILES "${INSTALL_SOURCE}/defaults.bin" DESTINATION ".") INSTALL(FILES "${INSTALL_SOURCE}/defaults.bin" DESTINATION ".")
INSTALL(FILES "${INSTALL_SOURCE}/gamecontrollerdb.txt" DESTINATION ".") INSTALL(FILES "${INSTALL_SOURCE}/gamecontrollerdb.txt" DESTINATION ".")
@ -1023,9 +1022,6 @@ elseif(NOT APPLE)
INSTALL(PROGRAMS "${INSTALL_SOURCE}/openmw-bulletobjecttool" DESTINATION "${BINDIR}" ) INSTALL(PROGRAMS "${INSTALL_SOURCE}/openmw-bulletobjecttool" DESTINATION "${BINDIR}" )
ENDIF(BUILD_BULLETOBJECTTOOL) ENDIF(BUILD_BULLETOBJECTTOOL)
# Install licenses
INSTALL(FILES "files/mygui/DejaVuFontLicense.txt" DESTINATION "${LICDIR}" )
# Install icon and desktop file # Install icon and desktop file
INSTALL(FILES "${OpenMW_BINARY_DIR}/org.openmw.launcher.desktop" DESTINATION "${DATAROOTDIR}/applications" COMPONENT "openmw") INSTALL(FILES "${OpenMW_BINARY_DIR}/org.openmw.launcher.desktop" DESTINATION "${DATAROOTDIR}/applications" COMPONENT "openmw")
INSTALL(FILES "${OpenMW_SOURCE_DIR}/files/launcher/images/openmw.png" DESTINATION "${ICONDIR}" COMPONENT "openmw") INSTALL(FILES "${OpenMW_SOURCE_DIR}/files/launcher/images/openmw.png" DESTINATION "${ICONDIR}" COMPONENT "openmw")

4
README.md
View file

@ -13,7 +13,9 @@ OpenMW also comes with OpenMW-CS, a replacement for Bethesda's Construction Set.
Font Licenses: Font Licenses:
* DejaVuLGCSansMono.ttf: custom (see [files/mygui/DejaVuFontLicense.txt](https://gitlab.com/OpenMW/openmw/-/raw/master/files/mygui/DejaVuFontLicense.txt) for more information) * DejaVuLGCSansMono.ttf: custom (see [files/data/fonts/DejaVuFontLicense.txt](https://gitlab.com/OpenMW/openmw/-/raw/master/files/data/fonts/DejaVuFontLicense.txt) for more information)
* OMWAyembedt.ttf: SIL Open Font License (see [files/data/fonts/OMWAyembedtFontLicense.txt](https://gitlab.com/OpenMW/openmw/-/raw/master/files/data/fonts/OMWAyembedtFontLicense.txt) for more information)
* Pelagiad.ttf: SIL Open Font License (see [files/data/fonts/PelagiadFontLicense.txt](https://gitlab.com/OpenMW/openmw/-/raw/master/files/data/fonts/PelagiadFontLicense.txt) for more information)
Current Status Current Status
-------------- --------------

4
apps/openmw/engine.cpp
View file

@ -1037,13 +1037,13 @@ void OMW::Engine::go()
} }
// Setup profiler // Setup profiler
osg::ref_ptr<Resource::Profiler> statshandler = new Resource::Profiler(stats.is_open()); osg::ref_ptr<Resource::Profiler> statshandler = new Resource::Profiler(stats.is_open(), mVFS.get());
initStatsHandler(*statshandler); initStatsHandler(*statshandler);
mViewer->addEventHandler(statshandler); mViewer->addEventHandler(statshandler);
osg::ref_ptr<Resource::StatsHandler> resourceshandler = new Resource::StatsHandler(stats.is_open()); osg::ref_ptr<Resource::StatsHandler> resourceshandler = new Resource::StatsHandler(stats.is_open(), mVFS.get());
mViewer->addEventHandler(resourceshandler); mViewer->addEventHandler(resourceshandler);
if (stats.is_open()) if (stats.is_open())

2
apps/openmw/mwgui/windowmanagerimp.cpp
View file

@ -195,7 +195,7 @@ namespace MWGui
{ {
mScalingFactor = std::clamp(Settings::Manager::getFloat("scaling factor", "GUI"), 0.5f, 8.f); mScalingFactor = std::clamp(Settings::Manager::getFloat("scaling factor", "GUI"), 0.5f, 8.f);
mGuiPlatform = new osgMyGUI::Platform(viewer, guiRoot, resourceSystem->getImageManager(), mScalingFactor); mGuiPlatform = new osgMyGUI::Platform(viewer, guiRoot, resourceSystem->getImageManager(), mScalingFactor);
mGuiPlatform->initialise(resourcePath, (std::filesystem::path(logpath) / "MyGUI.log").generic_string()); mGuiPlatform->initialise(resourceSystem->getVFS(), resourcePath, (std::filesystem::path(logpath) / "MyGUI.log").generic_string());
mGui = new MyGUI::Gui; mGui = new MyGUI::Gui;
mGui->initialise(""); mGui->initialise("");

16
components/fontloader/fontloader.cpp
View file

@ -214,17 +214,17 @@ namespace Gui
return; return;
} }
const std::string cfg = dataManager->getDataPath(""); dataManager->setUseVfs(true);
const std::string fontFile = mUserDataPath + "/" + "Fonts" + "/" + "openmw_font.xml";
if (!std::filesystem::exists(fontFile))
return;
dataManager->setResourcePath(mUserDataPath + "/" + "Fonts"); for (const auto& name : mVFS->getRecursiveDirectoryIterator("Fonts/"))
MyGUI::ResourceManager::getInstance().load("openmw_font.xml"); {
dataManager->setResourcePath(cfg); if (Misc::getFileExtension(name) == "omwfont")
MyGUI::ResourceManager::getInstance().load(name);
}
dataManager->setUseVfs(false);
} }
typedef struct typedef struct
{ {
float x; float x;

27
components/myguiplatform/myguidatamanager.cpp
View file

@ -18,8 +18,25 @@ void DataManager::setResourcePath(const std::string &path)
mResourcePath = path; mResourcePath = path;
} }
void DataManager::setUseVfs(bool useVfs)
{
mUseVfs = useVfs;
}
MyGUI::IDataStream *DataManager::getData(const std::string &name) const MyGUI::IDataStream *DataManager::getData(const std::string &name) const
{ {
if (mUseVfs)
{
// Note: MyGUI is supposed to read/free input steam itself,
// so copy data from VFS stream to the string stream and pass it to MyGUI.
Files::IStreamPtr streamPtr = mVfs->get(name);
std::istream* fileStream = streamPtr.get();
std::unique_ptr<std::stringstream> dataStream;
dataStream.reset(new std::stringstream);
*dataStream << fileStream->rdbuf();
return new MyGUI::DataStream(dataStream.release());
}
std::string fullpath = getDataPath(name); std::string fullpath = getDataPath(name);
auto stream = std::make_unique<std::ifstream>(); auto stream = std::make_unique<std::ifstream>();
stream->open(fullpath, std::ios::binary); stream->open(fullpath, std::ios::binary);
@ -38,10 +55,17 @@ void DataManager::freeData(MyGUI::IDataStream *data)
bool DataManager::isDataExist(const std::string &name) const bool DataManager::isDataExist(const std::string &name) const
{ {
if (mUseVfs) return mVfs->exists(name);
std::string fullpath = mResourcePath + "/" + name; std::string fullpath = mResourcePath + "/" + name;
return std::filesystem::exists(fullpath); return std::filesystem::exists(fullpath);
} }
void DataManager::setVfs(const VFS::Manager* vfs)
{
mVfs = vfs;
}
const MyGUI::VectorString &DataManager::getDataListNames(const std::string &pattern) const const MyGUI::VectorString &DataManager::getDataListNames(const std::string &pattern) const
{ {
// TODO: pattern matching (unused?) // TODO: pattern matching (unused?)
@ -53,6 +77,9 @@ const MyGUI::VectorString &DataManager::getDataListNames(const std::string &patt
const std::string &DataManager::getDataPath(const std::string &name) const const std::string &DataManager::getDataPath(const std::string &name) const
{ {
// FIXME: in theory, we should use the VFS here too, but it does not provide the real path to data files.
// In some cases there is no real path at all (when the requested MyGUI file is in BSA archive, for example).
// Currently it should not matter since we use this virtual function only to setup fonts for profilers.
static std::string result; static std::string result;
result.clear(); result.clear();
if (!isDataExist(name)) if (!isDataExist(name))

10
components/myguiplatform/myguidatamanager.hpp
View file

@ -5,6 +5,8 @@
#include <string> #include <string>
#include <components/vfs/manager.hpp>
namespace osgMyGUI namespace osgMyGUI
{ {
@ -16,6 +18,10 @@ public:
void setResourcePath(const std::string& path); void setResourcePath(const std::string& path);
void setUseVfs(bool useVfs);
void setVfs(const VFS::Manager* vfs);
/** Get data stream from specified resource name. /** Get data stream from specified resource name.
@param _name Resource name (usually file name). @param _name Resource name (usually file name).
*/ */
@ -44,6 +50,10 @@ public:
private: private:
std::string mResourcePath; std::string mResourcePath;
const VFS::Manager* mVfs;
bool mUseVfs{false};
}; };
} }

3
components/myguiplatform/myguiplatform.cpp
View file

@ -30,7 +30,7 @@ Platform::~Platform()
mLogFacility = nullptr; mLogFacility = nullptr;
} }
void Platform::initialise(const std::string &resourcePath, const std::string &_logName) void Platform::initialise(const VFS::Manager* vfs, const std::string &resourcePath, const std::string &_logName)
{ {
if (!_logName.empty() && !mLogFacility) if (!_logName.empty() && !mLogFacility)
{ {
@ -39,6 +39,7 @@ void Platform::initialise(const std::string &resourcePath, const std::string &_l
} }
mDataManager->setResourcePath(resourcePath); mDataManager->setResourcePath(resourcePath);
mDataManager->setVfs(vfs);
mRenderManager->initialise(); mRenderManager->initialise();
mDataManager->initialise(); mDataManager->initialise();

4
components/myguiplatform/myguiplatform.hpp
View file

@ -3,6 +3,8 @@
#include <string> #include <string>
#include <components/vfs/manager.hpp>
namespace osgViewer namespace osgViewer
{ {
class Viewer; class Viewer;
@ -34,7 +36,7 @@ namespace osgMyGUI
~Platform(); ~Platform();
void initialise(const std::string& resourcePath, const std::string& _logName = "MyGUI.log"); void initialise(const VFS::Manager* vfs, const std::string& resourcePath, const std::string& _logName = "MyGUI.log");
void shutdown(); void shutdown();

20
components/resource/stats.cpp
View file

@ -15,6 +15,8 @@
#include <components/myguiplatform/myguidatamanager.hpp> #include <components/myguiplatform/myguidatamanager.hpp>
#include <components/vfs/manager.hpp>
namespace Resource namespace Resource
{ {
@ -28,6 +30,8 @@ static bool collectStatFrameRate = false;
static bool collectStatUpdate = false; static bool collectStatUpdate = false;
static bool collectStatEngine = false; static bool collectStatEngine = false;
inline static std::string sFontName = "Fonts\\DejaVuLGCSansMono.ttf";
static void setupStatCollection() static void setupStatCollection()
{ {
const char* envList = getenv("OPENMW_OSG_STATS_LIST"); const char* envList = getenv("OPENMW_OSG_STATS_LIST");
@ -79,7 +83,7 @@ static void setupStatCollection()
} }
} }
StatsHandler::StatsHandler(bool offlineCollect): StatsHandler::StatsHandler(bool offlineCollect, VFS::Manager* vfs):
_key(osgGA::GUIEventAdapter::KEY_F4), _key(osgGA::GUIEventAdapter::KEY_F4),
_initialized(false), _initialized(false),
_statsType(false), _statsType(false),
@ -96,15 +100,19 @@ StatsHandler::StatsHandler(bool offlineCollect):
_resourceStatsChildNum = 0; _resourceStatsChildNum = 0;
if (osgDB::Registry::instance()->getReaderWriterForExtension("ttf")) if (osgDB::Registry::instance()->getReaderWriterForExtension("ttf") && vfs->exists(sFontName))
_font = osgMyGUI::DataManager::getInstance().getDataPath("DejaVuLGCSansMono.ttf"); {
_font = vfs->getAbsoluteFileName(sFontName);
}
} }
Profiler::Profiler(bool offlineCollect): Profiler::Profiler(bool offlineCollect, VFS::Manager* vfs):
_offlineCollect(offlineCollect) _offlineCollect(offlineCollect)
{ {
if (osgDB::Registry::instance()->getReaderWriterForExtension("ttf")) if (osgDB::Registry::instance()->getReaderWriterForExtension("ttf") && vfs->exists(sFontName))
_font = osgMyGUI::DataManager::getInstance().getDataPath("DejaVuLGCSansMono.ttf"); {
_font = vfs->getAbsoluteFileName(sFontName);
}
else else
_font.clear(); _font.clear();

9
components/resource/stats.hpp
View file

@ -13,12 +13,17 @@ namespace osg
class Switch; class Switch;
} }
namespace VFS
{
class Manager;
}
namespace Resource namespace Resource
{ {
class Profiler : public osgViewer::StatsHandler class Profiler : public osgViewer::StatsHandler
{ {
public: public:
Profiler(bool offlineCollect); Profiler(bool offlineCollect, VFS::Manager* vfs);
bool handle(const osgGA::GUIEventAdapter& ea, osgGA::GUIActionAdapter& aa) override; bool handle(const osgGA::GUIEventAdapter& ea, osgGA::GUIActionAdapter& aa) override;
private: private:
@ -28,7 +33,7 @@ namespace Resource
class StatsHandler : public osgGA::GUIEventHandler class StatsHandler : public osgGA::GUIEventHandler
{ {
public: public:
StatsHandler(bool offlineCollect); StatsHandler(bool offlineCollect, VFS::Manager* vfs);
void setKey(int key) { _key = key; } void setKey(int key) { _key = key; }
int getKey() const { return _key; } int getKey() const { return _key; }

10
files/data/CMakeLists.txt
View file

@ -10,6 +10,16 @@ set(BUILTIN_DATA_FILES
textures/omw_menu_scroll_center_h.dds textures/omw_menu_scroll_center_h.dds
textures/omw_menu_scroll_center_v.dds textures/omw_menu_scroll_center_v.dds
fonts/DejaVuFontLicense.txt
fonts/DejaVuLGCSansMono.ttf
fonts/DejaVuLGCSansMono.omwfont
fonts/OMWAyembedt.ttf
fonts/OMWAyembedt.omwfont
fonts/OMWAyembedtFontLicense.txt
fonts/Pelagiad.ttf
fonts/Pelagiad.omwfont
fonts/PelagiadFontLicense.txt
l10n/Calendar/en.yaml l10n/Calendar/en.yaml
l10n/Calendar/ru.yaml l10n/Calendar/ru.yaml
l10n/DebugMenu/en.yaml l10n/DebugMenu/en.yaml

99
files/data/fonts/DejaVuFontLicense.txt Normal file
View file

@ -0,0 +1,99 @@
Fonts are (c) Bitstream (see below). DejaVu changes are in public domain.
Glyphs imported from Arev fonts are (c) Tavmjong Bah (see below)
Bitstream Vera Fonts Copyright
------------------------------
Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Bitstream Vera is
a trademark of Bitstream, Inc.
Permission is hereby granted, free of charge, to any person obtaining a copy
of the fonts accompanying this license ("Fonts") and associated
documentation files (the "Font Software"), to reproduce and distribute the
Font Software, including without limitation the rights to use, copy, merge,
publish, distribute, and/or sell copies of the Font Software, and to permit
persons to whom the Font Software is furnished to do so, subject to the
following conditions:
The above copyright and trademark notices and this permission notice shall
be included in all copies of one or more of the Font Software typefaces.
The Font Software may be modified, altered, or added to, and in particular
the designs of glyphs or characters in the Fonts may be modified and
additional glyphs or characters may be added to the Fonts, only if the fonts
are renamed to names not containing either the words "Bitstream" or the word
"Vera".
This License becomes null and void to the extent applicable to Fonts or Font
Software that has been modified and is distributed under the "Bitstream
Vera" names.
The Font Software may be sold as part of a larger software package but no
copy of one or more of the Font Software typefaces may be sold by itself.
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 BITSTREAM OR THE GNOME
FOUNDATION 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.
Except as contained in this notice, the names of Gnome, the Gnome
Foundation, and Bitstream Inc., shall not be used in advertising or
otherwise to promote the sale, use or other dealings in this Font Software
without prior written authorization from the Gnome Foundation or Bitstream
Inc., respectively. For further information, contact: fonts at gnome dot
org.
Arev Fonts Copyright
------------------------------
Copyright (c) 2006 by Tavmjong Bah. All Rights Reserved.
Permission is hereby granted, free of charge, to any person obtaining
a copy of the fonts accompanying this license ("Fonts") and
associated documentation files (the "Font Software"), to reproduce
and distribute the modifications to the Bitstream Vera Font Software,
including without limitation the rights to use, copy, merge, publish,
distribute, and/or sell copies of the Font Software, and to permit
persons to whom the Font Software is furnished to do so, subject to
the following conditions:
The above copyright and trademark notices and this permission notice
shall be included in all copies of one or more of the Font Software
typefaces.
The Font Software may be modified, altered, or added to, and in
particular the designs of glyphs or characters in the Fonts may be
modified and additional glyphs or characters may be added to the
Fonts, only if the fonts are renamed to names not containing either
the words "Tavmjong Bah" or the word "Arev".
This License becomes null and void to the extent applicable to Fonts
or Font Software that has been modified and is distributed under the
"Tavmjong Bah Arev" names.
The Font Software may be sold as part of a larger software package but
no copy of one or more of the Font Software typefaces may be sold by
itself.
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
TAVMJONG BAH 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.
Except as contained in this notice, the name of Tavmjong Bah shall not
be used in advertising or otherwise to promote the sale, use or other
dealings in this Font Software without prior written authorization
from Tavmjong Bah. For further information, contact: tavmjong @ free
. fr.
$Id: LICENSE 2133 2007-11-28 02:46:28Z lechimp $

2
files/mygui/openmw_font.xml → files/data/fonts/DejaVuLGCSansMono.omwfont
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<MyGUI type="Resource" version="1.1"> <MyGUI type="Resource" version="1.1">
<Resource type="ResourceTrueTypeFont" name="MonoFont"> <Resource type="ResourceTrueTypeFont" name="MonoFont">
<Property key="Source" value="DejaVuLGCSansMono.ttf"/> <Property key="Source" value="Fonts/DejaVuLGCSansMono.ttf"/>
<Property key="Antialias" value="false"/> <Property key="Antialias" value="false"/>
<Property key="TabWidth" value="8"/> <Property key="TabWidth" value="8"/>
<Property key="OffsetHeight" value="0"/> <Property key="OffsetHeight" value="0"/>

0
files/mygui/DejaVuLGCSansMono.ttf → files/data/fonts/DejaVuLGCSansMono.ttf
View file

12
files/data/fonts/OMWAyembedt.omwfont Normal file
View file

@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<MyGUI type="Resource" version="1.1">
<Resource type="ResourceTrueTypeFont" name="Daedric">
<Property key="Source" value="Fonts/OMWAyembedt.ttf"/>
<Property key="Antialias" value="false"/>
<Property key="TabWidth" value="8"/>
<Property key="OffsetHeight" value="0"/>
<Codes>
<Code range="32 126"/>
</Codes>
</Resource>
</MyGUI>

BIN
files/data/fonts/OMWAyembedt.ttf Normal file
View file

Binary file not shown.

94
files/data/fonts/OMWAyembedtFontLicense.txt Normal file
View file

@ -0,0 +1,94 @@
Copyright (c) 2014, Georg Duffner (https://github.com/georgd/OpenMW-Fonts),
with Reserved Font Name "OMWAyembedt.ttf".
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.

43
files/data/fonts/Pelagiad.omwfont Normal file
View file

@ -0,0 +1,43 @@
<?xml version="1.0" encoding="UTF-8"?>
<MyGUI type="Resource" version="1.1">
<Resource type="ResourceTrueTypeFont" name="Magic Cards">
<Property key="Source" value="Fonts/Pelagiad.ttf"/>
<Property key="Antialias" value="false"/>
<Property key="TabWidth" value="8"/>
<Property key="OffsetHeight" value="0"/>
<Codes>
<Code range="33 126"/>
<Code range="161"/>
<Code range="173"/>
<Code range="180"/>
<Code range="191 255"/>
<Code range="260 263"/>
<Code range="268 271"/>
<Code range="280 283"/>
<Code range="305"/>
<Code range="321 324"/>
<Code range="327 328"/>
<Code range="339"/>
<Code range="344 347"/>
<Code range="352 353"/>
<Code range="356 357"/>
<Code range="366 367"/>
<Code range="377 382"/>
<Code range="1025"/>
<Code range="1040 1103"/>
<Code range="1105"/>
<Code range="8208 8212"/>
<Code range="8216 8217"/>
<Code range="8220 8221"/>
<Code range="8228 8230"/>
<Code hide="198"/>
<Code hide="208"/>
<Code hide="215 216"/>
<Code hide="222"/>
<Code hide="230"/>
<Code hide="240"/>
<Code hide="247 248"/>
<Code hide="254"/>
</Codes>
</Resource>
</MyGUI>

BIN
files/data/fonts/Pelagiad.ttf Normal file
View file

Binary file not shown.

94
files/data/fonts/PelagiadFontLicense.txt Normal file
View file

@ -0,0 +1,94 @@
Copyright (c) 2015, Isak Larborn (isaskar.github.io/Pelagiad|Isaskar@users.noreply.github.com),
with Reserved Font Name "Pelagiad.ttf".
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.

2
files/mygui/CMakeLists.txt
View file

@ -32,7 +32,6 @@ set(MYGUI_FILES
openmw_dialogue_window.layout openmw_dialogue_window.layout
openmw_dialogue_window.skin.xml openmw_dialogue_window.skin.xml
openmw_edit.skin.xml openmw_edit.skin.xml
openmw_font.xml
openmw_hud_box.skin.xml openmw_hud_box.skin.xml
openmw_hud_energybar.skin.xml openmw_hud_energybar.skin.xml
openmw_hud.layout openmw_hud.layout
@ -93,7 +92,6 @@ set(MYGUI_FILES
openmw_postprocessor_hud.layout openmw_postprocessor_hud.layout
openmw_postprocessor_hud.skin.xml openmw_postprocessor_hud.skin.xml
openmw_jail_screen.layout openmw_jail_screen.layout
DejaVuLGCSansMono.ttf
../launcher/images/openmw.png ../launcher/images/openmw.png
OpenMWResourcePlugin.xml OpenMWResourcePlugin.xml
skins.xml skins.xml

1
files/mygui/skins.xml
View file

@ -3,7 +3,6 @@
<MyGUI type="List"> <MyGUI type="List">
<List file="core.skin"/> <List file="core.skin"/>
<List file="openmw_resources.xml"/> <List file="openmw_resources.xml"/>
<List file="openmw_font.xml"/>
<List file="openmw_text.skin.xml"/> <List file="openmw_text.skin.xml"/>
<List file="openmw_windows.skin.xml"/> <List file="openmw_windows.skin.xml"/>
<List file="openmw_button.skin.xml"/> <List file="openmw_button.skin.xml"/>