Skip to content

Commit

Permalink
minor cleanup (OTF removed, bilbo font gone)
Browse files Browse the repository at this point in the history
  • Loading branch information
svenevs committed Mar 9, 2018
1 parent 344ee03 commit 77a95c3
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 9 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ build/
...
custom_theme_and_fonts.py
custom_icon_theme_and_fonts.py
theme_buildter.py
theme_builder.py
icons/
icon1.png ...
```
Expand Down
8 changes: 1 addition & 7 deletions cpp/custom_theme.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,6 @@ enum class ThemeChoice {
Fontawesome ///< The 'FontawesomeTheme' class
};


#pragma once

#include <nanogui/theme.h>

/*
The JSON for this class::
Expand Down Expand Up @@ -96,8 +91,7 @@ class CustomTheme : public nanogui::Theme {
mSpiraxFont = nanogui::createFontMem(ctx, "spirax", "Spirax-Regular.ttf");
mMembraFont = nanogui::createFontMem(ctx, "membra", "membra.ttf");

// not forcing failure if mBilboFont is not loaded so that if Freetype was not
// found the application can still run
// -1 means font could not be loaded
if (mSpiraxFont == -1 || mMembraFont == -1)
throw std::runtime_error("Could not load the `spirax` or `membra` fonts!");

Expand Down
2 changes: 1 addition & 1 deletion ext/nanogui
Submodule nanogui updated 1 files
+1 −1 docs/compilation.rst

0 comments on commit 77a95c3

Please sign in to comment.