Lenheart
/
Magic_Game
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

supplement

This commit is contained in:
Nomango 2018-03-29 13:42:22 +08:00
parent 785dbf9b65
commit 8c9deb5dea
4 changed files with 22 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/Node/Text.cpp
View File

@ -100,17 +100,13 @@ void e2d::Text::setWordWrappingWidth(double wordWrapWidth)
void e2d::Text::onRender() void e2d::Text::onRender()
{ {
D2D1_RECT_F textLayoutRect = D2D1::RectF(0, 0, m_bWordWrapping ? m_fWordWrappingWidth : m_fWidth, m_fHeight);
Renderer::getSolidColorBrush()->SetColor(D2D1::ColorF(m_pFont->m_Color, m_fDisplayOpacity)); Renderer::getSolidColorBrush()->SetColor(D2D1::ColorF(m_pFont->m_Color, m_fDisplayOpacity));
Renderer::getRenderTarget()->DrawTextW( Renderer::getRenderTarget()->DrawTextW(
m_sText, m_sText,
static_cast<UINT32>(m_sText.getLength()), static_cast<UINT32>(m_sText.getLength()),
m_pFont->_getTextFormat(), m_pFont->_getTextFormat(),
D2D1::RectF( textLayoutRect,
0,
0,
m_bWordWrapping ? m_fWordWrappingWidth : m_fWidth,
m_fHeight
),
Renderer::getSolidColorBrush() Renderer::getSolidColorBrush()
); );
} }

7
core/ecommon.h
View File

@ -12,13 +12,6 @@ namespace e2d
// 函数对象 // 函数对象
typedef std::function<void()> Function; typedef std::function<void()> Function;
// 创建函数对象
template<typename Func>
inline Function CreateFunc(Func&& func)
{
return std::bind(func);
}
// 创建函数对象 // 创建函数对象
template<typename Object, typename Func> template<typename Object, typename Func>
inline Function CreateFunc(Object&& obj, Func&& func) inline Function CreateFunc(Object&& obj, Func&& func)

10
project/vs2013/Easy2D.vcxproj
View File

@ -214,15 +214,15 @@
<ClCompile Include="..\..\core\Shape\Ellipse.cpp" /> <ClCompile Include="..\..\core\Shape\Ellipse.cpp" />
<ClCompile Include="..\..\core\Shape\Rect.cpp" /> <ClCompile Include="..\..\core\Shape\Rect.cpp" />
<ClCompile Include="..\..\core\Shape\Shape.cpp" /> <ClCompile Include="..\..\core\Shape\Shape.cpp" />
<ClCompile Include="..\..\core\Tool\File.cpp" /> <ClCompile Include="..\..\core\Tool\Data.cpp" />
<ClCompile Include="..\..\core\Tool\Music.cpp" /> <ClCompile Include="..\..\core\Tool\Music.cpp" />
<ClCompile Include="..\..\core\Tool\Path.cpp" /> <ClCompile Include="..\..\core\Tool\Path.cpp" />
<ClCompile Include="..\..\core\Tool\Random.cpp" /> <ClCompile Include="..\..\core\Tool\Random.cpp" />
<ClCompile Include="..\..\core\Tool\Timer.cpp" /> <ClCompile Include="..\..\core\Tool\Timer.cpp" />
<ClCompile Include="..\..\core\Transition\ETransition.cpp" /> <ClCompile Include="..\..\core\Transition\Transition.cpp" />
<ClCompile Include="..\..\core\Transition\ETransitionEmerge.cpp" /> <ClCompile Include="..\..\core\Transition\TransitionEmerge.cpp" />
<ClCompile Include="..\..\core\Transition\ETransitionFade.cpp" /> <ClCompile Include="..\..\core\Transition\TransitionFade.cpp" />
<ClCompile Include="..\..\core\Transition\ETransitionMove.cpp" /> <ClCompile Include="..\..\core\Transition\TransitionMove.cpp" />
</ItemGroup> </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"> <ImportGroup Label="ExtensionTargets">

30
project/vs2013/Easy2D.vcxproj.filters
View File

@ -138,18 +138,6 @@
<ClCompile Include="..\..\core\Tool\Timer.cpp"> <ClCompile Include="..\..\core\Tool\Timer.cpp">
<Filter>Tool</Filter> <Filter>Tool</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\core\Transition\ETransition.cpp">
<Filter>Transition</Filter>
</ClCompile>
<ClCompile Include="..\..\core\Transition\ETransitionEmerge.cpp">
<Filter>Transition</Filter>
</ClCompile>
<ClCompile Include="..\..\core\Transition\ETransitionFade.cpp">
<Filter>Transition</Filter>
</ClCompile>
<ClCompile Include="..\..\core\Transition\ETransitionMove.cpp">
<Filter>Transition</Filter>
</ClCompile>
<ClCompile Include="..\..\core\Node\Button.cpp"> <ClCompile Include="..\..\core\Node\Button.cpp">
<Filter>Node</Filter> <Filter>Node</Filter>
</ClCompile> </ClCompile>
@ -180,9 +168,6 @@
<ClCompile Include="..\..\core\Manager\ShapeManager.cpp"> <ClCompile Include="..\..\core\Manager\ShapeManager.cpp">
<Filter>Manager</Filter> <Filter>Manager</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\core\Tool\File.cpp">
<Filter>Tool</Filter>
</ClCompile>
<ClCompile Include="..\..\core\Manager\MusicManager.cpp"> <ClCompile Include="..\..\core\Manager\MusicManager.cpp">
<Filter>Manager</Filter> <Filter>Manager</Filter>
</ClCompile> </ClCompile>
@ -201,5 +186,20 @@
<ClCompile Include="..\..\core\Tool\Path.cpp"> <ClCompile Include="..\..\core\Tool\Path.cpp">
<Filter>Tool</Filter> <Filter>Tool</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\core\Transition\Transition.cpp">
<Filter>Transition</Filter>
</ClCompile>
<ClCompile Include="..\..\core\Transition\TransitionEmerge.cpp">
<Filter>Transition</Filter>
</ClCompile>
<ClCompile Include="..\..\core\Transition\TransitionFade.cpp">
<Filter>Transition</Filter>
</ClCompile>
<ClCompile Include="..\..\core\Transition\TransitionMove.cpp">
<Filter>Transition</Filter>
</ClCompile>
<ClCompile Include="..\..\core\Tool\Data.cpp">
<Filter>Tool</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
</Project> </Project>