jgrogan/stuff-from-scratch
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Continue cleaning.

Browse source
This commit is contained in:
jmsgrogan 2023-01-13 14:29:12 +00:00
parent cd688f608f
commit cb4212d972
67 changed files with 367 additions and 282 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/graphics/RasterPainter.cpp
View file

@ -6,7 +6,7 @@
RasterPainter::RasterPainter(DrawingContext* context)
: AbstractPainter(context),
mGrid(std::make_unique<Grid<unsigned char> >(ntk::Rectangle(Point(0, 0), Point(100, 100))))
mGrid(std::make_unique<Grid>(Bounds{0.0, 0.0, 100.0, 100.0}))
{
}
@ -15,7 +15,7 @@ void RasterPainter::paint()
{
const auto width = mDrawingContext->getSurface()->getWidth();
const auto height = mDrawingContext->getSurface()->getHeight();
mGrid->resetBounds(ntk::Rectangle(Point(0, 0), Point(width, height)));
mGrid->resetBounds(Bounds{ 0.0, 0.0, static_cast<double>(width), static_cast<double>(height) });
/*
for (unsigned idx=0; idx< context->getNumItems(); idx++)

5
src/graphics/RasterPainter.h
View file

@ -1,11 +1,10 @@
#pragma once
#include "AbstractPainter.h"
#include <memory>
class DrawingContext;
template<class T>
class Grid;
class RasterPainter : public AbstractPainter
@ -16,5 +15,5 @@ public:
void paint() override;
private:
std::unique_ptr<Grid<unsigned char> > mGrid;
std::unique_ptr<Grid> mGrid;
};

8
src/graphics/directx/DirectXTextPainter.cpp
View file

@ -10,10 +10,10 @@
#include "SceneText.h"
#include "DirectX2dInterface.h"
#include "StringUtils.h"
#include "UnicodeUtils.h"
#include "File.h"
#include <windows.h>
#include "Win32BaseIncludes.h"
#include <d2d1_3.h>
#include <d2d1_1.h>
@ -33,7 +33,7 @@ void DirectXTextPainter::setD2dInterface(DirectX2dInterface* d2dIterface)
void DirectXTextPainter::updateTextFormat(const FontItem& font)
{
mD2dInterface->getDirectWriteFactory()->CreateTextFormat(
StringUtils::convert(font.getFaceName()).c_str(),
UnicodeUtils::utf8ToUtf16WString(font.getFaceName()).c_str(),
nullptr,
DWRITE_FONT_WEIGHT_NORMAL,
DWRITE_FONT_STYLE_NORMAL,
@ -53,7 +53,7 @@ void DirectXTextPainter::paint(SceneText* text, DrawingContext* context)
updateTextFormat(text->getTextData().mFont);
auto content = StringUtils::convert(text->getTextData().mContent);
auto content = UnicodeUtils::utf8ToUtf16WString(text->getTextData().mContent);
mD2dInterface->getRenderTarget()->DrawText(content.c_str(), static_cast<UINT32>(content.size()), mTextFormat.Get(), &textRect, mTextBrush.Get());
}