mirror of
https://github.com/OpenSpace/OpenSpace.git
synced 2026-05-20 02:58:31 -05:00
OS X compile fixes
This commit is contained in:
@@ -40,7 +40,7 @@ public:
|
||||
virtual void preRender();
|
||||
virtual void postRender();
|
||||
|
||||
virtual std::string settings();
|
||||
std::vector<fragmentData> pixelData();
|
||||
protected:
|
||||
virtual bool reinitializeInternal();
|
||||
|
||||
|
||||
@@ -60,8 +60,8 @@ void ABufferFramebuffer::postRender() {
|
||||
|
||||
}
|
||||
|
||||
std::string ABufferFramebuffer::settings() {
|
||||
return R"()";
|
||||
std::vector<ABuffer::fragmentData> ABufferFramebuffer::pixelData() {
|
||||
return std::vector<ABuffer::fragmentData>();
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -222,6 +222,10 @@ void OpenSpaceEngine::loadFonts() {
|
||||
std::string font;
|
||||
fonts.getValue(key, font);
|
||||
font = absPath(font);
|
||||
if(!FileSys.fileExists(font)) {
|
||||
LERROR("Could not find font '" << font << "'");
|
||||
continue;
|
||||
}
|
||||
|
||||
LINFO("Registering font '" << font << "' with key '" << key << "'");
|
||||
sgct_text::FontManager::instance()->addFont(key, font, local);
|
||||
|
||||
Reference in New Issue
Block a user