changes after rebase
This commit is contained in:
@@ -136,5 +136,6 @@ SetGlmDefines(openVulkanoCpp)
|
||||
LinkAssimp(openVulkanoCpp)
|
||||
LinkLibArchive(openVulkanoCpp)
|
||||
LinkLibJpegTurbo(openVulkanoCpp)
|
||||
LinkMsdf(openVulkanoCpp)
|
||||
|
||||
set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT openVulkanoCpp)
|
||||
|
||||
@@ -10,6 +10,7 @@
|
||||
#include "ExampleApps/MovingCubeApp.hpp"
|
||||
#include "ExampleApps/TexturedCubeExampleApp.hpp"
|
||||
#include "ExampleApps/BillboardExampleApp.hpp"
|
||||
#include "ExampleApps/TextExampleApp.hpp"
|
||||
#include <vector>
|
||||
|
||||
namespace OpenVulkano
|
||||
@@ -18,6 +19,7 @@ namespace OpenVulkano
|
||||
{ "Cubes Example App", &CubesExampleApp::Create },
|
||||
{ "Moving Cube Example App", &MovingCubeApp::Create },
|
||||
{ "Textured Cube Example App", &TexturedCubeExampleApp::Create },
|
||||
{ "Billboard Example App", &BillboardExampleApp::Create }
|
||||
{ "Billboard Example App", &BillboardExampleApp::Create },
|
||||
{ "Text Example App", &TextExampleApp::Create }
|
||||
};
|
||||
}
|
||||
|
||||
@@ -66,14 +66,13 @@ namespace OpenVulkano
|
||||
m_nodesPool.resize(N);
|
||||
m_drawablesPool.resize(N);
|
||||
|
||||
#ifdef MSDFGEN_AVAILABLE
|
||||
Charset charset = Charset::ASCII;
|
||||
for (unicode_t c = 0x0410; c <= 0x041F; c++)
|
||||
{
|
||||
// some unicode values
|
||||
charset.add(c);
|
||||
}
|
||||
|
||||
#ifdef MSDFGEN_AVAILABLE
|
||||
m_atlasGenerator.GenerateAtlas(fontPath, charset, "roboto-regular-atlas.png");
|
||||
#endif
|
||||
|
||||
|
||||
@@ -6,7 +6,6 @@
|
||||
|
||||
#include "Host/GraphicsAppManager.hpp"
|
||||
#include "ExampleAppList.hpp"
|
||||
#include "ExampleApps/TextExampleApp.hpp"
|
||||
|
||||
#include <ftxui/component/captured_mouse.hpp>
|
||||
#include <ftxui/component/component.hpp>
|
||||
|
||||
Reference in New Issue
Block a user