Decreased GL,GLFW presence out of Window module

This commit is contained in:
MihailRis
2023-11-09 01:19:44 +03:00
parent 086f04af39
commit 1d9fc44482
6 changed files with 28 additions and 16 deletions
+8 -1
View File
@@ -2,7 +2,7 @@
#include "Texture.h"
#include "Batch2D.h"
Font::Font(std::vector<Texture*> pages) : pages(pages) {
Font::Font(std::vector<Texture*> pages, int lineHeight) : lineHeight_(lineHeight), pages(pages) {
}
Font::~Font(){
@@ -26,6 +26,9 @@ Font::~Font(){
// return 7;
// }
int Font::lineHeight() const {
return lineHeight_;
}
bool Font::isPrintableChar(int c) {
switch (c){
@@ -42,6 +45,10 @@ bool Font::isPrintableChar(int c) {
#define RES 16
int Font::calcWidth(std::wstring text) {
return text.length() * 8;
}
void Font::draw(Batch2D* batch, std::wstring text, int x, int y) {
draw(batch, text, x, y, STYLE_NONE);
}
+4 -1
View File
@@ -12,11 +12,14 @@ class Batch2D;
#define STYLE_OUTLINE 2
class Font {
int lineHeight_;
public:
std::vector<Texture*> pages;
Font(std::vector<Texture*> pages);
Font(std::vector<Texture*> pages, int lineHeight);
~Font();
int lineHeight() const;
int calcWidth(std::wstring text);
// int getGlyphWidth(char c);
bool isPrintableChar(int c);
void draw(Batch2D* batch, std::wstring text, int x, int y);