mirror of https://github.com/bkaradzic/bgfx
Cleanup.
This commit is contained in:
parent
07191eb38b
commit
e105c88e55
|
@ -24,9 +24,6 @@
|
||||||
#include "common.h"
|
#include "common.h"
|
||||||
#include "bgfx_utils.h"
|
#include "bgfx_utils.h"
|
||||||
|
|
||||||
#include <stdio.h>
|
|
||||||
#include <math.h>
|
|
||||||
|
|
||||||
#include <bx/string.h>
|
#include <bx/string.h>
|
||||||
#include <bx/timer.h>
|
#include <bx/timer.h>
|
||||||
#include <bimg/decode.h>
|
#include <bimg/decode.h>
|
||||||
|
@ -1029,7 +1026,7 @@ int loadDemoData(struct NVGcontext* vg, struct DemoData* data)
|
||||||
data->images[i] = createImage(vg, file, 0);
|
data->images[i] = createImage(vg, file, 0);
|
||||||
if (data->images[i] == 0)
|
if (data->images[i] == 0)
|
||||||
{
|
{
|
||||||
printf("Could not load %s.\n", file);
|
bx::debugPrintf("Could not load %s.\n", file);
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1037,30 +1034,31 @@ int loadDemoData(struct NVGcontext* vg, struct DemoData* data)
|
||||||
data->fontIcons = nvgCreateFont(vg, "icons", "font/entypo.ttf");
|
data->fontIcons = nvgCreateFont(vg, "icons", "font/entypo.ttf");
|
||||||
if (data->fontIcons == -1)
|
if (data->fontIcons == -1)
|
||||||
{
|
{
|
||||||
printf("Could not add font icons.\n");
|
bx::debugPrintf("Could not add font icons.\n");
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
data->fontNormal = nvgCreateFont(vg, "sans", "font/roboto-regular.ttf");
|
data->fontNormal = nvgCreateFont(vg, "sans", "font/roboto-regular.ttf");
|
||||||
if (data->fontNormal == -1)
|
if (data->fontNormal == -1)
|
||||||
{
|
{
|
||||||
printf("Could not add font italic.\n");
|
bx::debugPrintf("Could not add font italic.\n");
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
data->fontBold = nvgCreateFont(vg, "sans-bold", "font/roboto-bold.ttf");
|
data->fontBold = nvgCreateFont(vg, "sans-bold", "font/roboto-bold.ttf");
|
||||||
if (data->fontBold == -1)
|
if (data->fontBold == -1)
|
||||||
{
|
{
|
||||||
printf("Could not add font bold.\n");
|
bx::debugPrintf("Could not add font bold.\n");
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
data->fontEmoji = nvgCreateFont(vg, "emoji", "font/NotoEmoji-Regular.ttf");
|
data->fontEmoji = nvgCreateFont(vg, "emoji", "font/NotoEmoji-Regular.ttf");
|
||||||
if (data->fontEmoji == -1)
|
if (data->fontEmoji == -1)
|
||||||
{
|
{
|
||||||
printf("Could not add font emoji.\n");
|
bx::debugPrintf("Could not add font emoji.\n");
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
nvgAddFallbackFontId(vg, data->fontNormal, data->fontEmoji);
|
nvgAddFallbackFontId(vg, data->fontNormal, data->fontEmoji);
|
||||||
nvgAddFallbackFontId(vg, data->fontBold, data->fontEmoji);
|
nvgAddFallbackFontId(vg, data->fontBold, data->fontEmoji);
|
||||||
|
|
||||||
|
|
|
@ -2540,7 +2540,7 @@ namespace bgfx
|
||||||
return bx::kExitSuccess;
|
return bx::kExitSuccess;
|
||||||
}
|
}
|
||||||
|
|
||||||
remove(outFilePath);
|
bx::remove(outFilePath);
|
||||||
|
|
||||||
fprintf(stderr, "Failed to build shader.\n");
|
fprintf(stderr, "Failed to build shader.\n");
|
||||||
return bx::kExitFailure;
|
return bx::kExitFailure;
|
||||||
|
|
Loading…
Reference in New Issue