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

SafeReleaseInterface重命名

This commit is contained in:
Nomango 2018-05-22 12:24:43 +08:00
parent 7a99c03431
commit 24bf8e007a
13 changed files with 58 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/Base/Input.cpp
View File

@ -93,9 +93,9 @@ void Input::__uninit()
if (s_MouseDevice) if (s_MouseDevice)
s_MouseDevice->Unacquire(); s_MouseDevice->Unacquire();
SafeReleaseInterface(s_MouseDevice); SafeRelease(s_MouseDevice);
SafeReleaseInterface(s_KeyboardDevice); SafeRelease(s_KeyboardDevice);
SafeReleaseInterface(s_pDirectInput); SafeRelease(s_pDirectInput);
} }
void e2d::Input::__update() void e2d::Input::__update()

22
core/Base/Renderer.cpp
View File

@ -133,20 +133,20 @@ bool e2d::Renderer::__createDeviceResources()
void e2d::Renderer::__discardDeviceResources() void e2d::Renderer::__discardDeviceResources()
{ {
SafeReleaseInterface(s_pRenderTarget); SafeRelease(s_pRenderTarget);
SafeReleaseInterface(s_pSolidBrush); SafeRelease(s_pSolidBrush);
SafeReleaseInterface(s_pTextRenderer); SafeRelease(s_pTextRenderer);
} }
void e2d::Renderer::__discardResources() void e2d::Renderer::__discardResources()
{ {
SafeReleaseInterface(s_pTextFormat); SafeRelease(s_pTextFormat);
SafeReleaseInterface(s_pDirect2dFactory); SafeRelease(s_pDirect2dFactory);
SafeReleaseInterface(s_pRenderTarget); SafeRelease(s_pRenderTarget);
SafeReleaseInterface(s_pSolidBrush); SafeRelease(s_pSolidBrush);
SafeReleaseInterface(s_pTextRenderer); SafeRelease(s_pTextRenderer);
SafeReleaseInterface(s_pIWICFactory); SafeRelease(s_pIWICFactory);
SafeReleaseInterface(s_pDWriteFactory); SafeRelease(s_pDWriteFactory);
} }
void e2d::Renderer::__render() void e2d::Renderer::__render()
@ -206,7 +206,7 @@ void e2d::Renderer::__render()
pTextLayout->Draw(nullptr, s_pTextRenderer, 10, 0); pTextLayout->Draw(nullptr, s_pTextRenderer, 10, 0);
SafeReleaseInterface(pTextLayout); SafeRelease(pTextLayout);
} }
} }

4
core/Collider/Collider.cpp
View File

@ -14,7 +14,7 @@ e2d::Collider::Collider()
e2d::Collider::~Collider() e2d::Collider::~Collider()
{ {
SafeReleaseInterface(_transformed); SafeRelease(_transformed);
} }
e2d::Node * e2d::Collider::getParentNode() const e2d::Node * e2d::Collider::getParentNode() const
@ -90,7 +90,7 @@ void e2d::Collider::_transform()
} }
// 释放原碰撞体 // 释放原碰撞体
SafeReleaseInterface(_transformed); SafeRelease(_transformed);
// 根据父节点转换几何图形 // 根据父节点转换几何图形
Renderer::getID2D1Factory()->CreateTransformedGeometry( Renderer::getID2D1Factory()->CreateTransformedGeometry(

4
core/Collider/ColliderCircle.cpp
View File

@ -28,12 +28,12 @@ e2d::ColliderCircle::ColliderCircle(Node * node)
e2d::ColliderCircle::~ColliderCircle() e2d::ColliderCircle::~ColliderCircle()
{ {
SafeReleaseInterface(_d2dCircle); SafeRelease(_d2dCircle);
} }
void e2d::ColliderCircle::setCircle(Point center, double radius) void e2d::ColliderCircle::setCircle(Point center, double radius)
{ {
SafeReleaseInterface(_d2dCircle); SafeRelease(_d2dCircle);
Renderer::getID2D1Factory()->CreateEllipseGeometry( Renderer::getID2D1Factory()->CreateEllipseGeometry(
D2D1::Ellipse( D2D1::Ellipse(

4
core/Collider/ColliderEllipse.cpp
View File

@ -28,12 +28,12 @@ e2d::ColliderEllipse::ColliderEllipse(Node * node)
e2d::ColliderEllipse::~ColliderEllipse() e2d::ColliderEllipse::~ColliderEllipse()
{ {
SafeReleaseInterface(_d2dEllipse); SafeRelease(_d2dEllipse);
} }
void e2d::ColliderEllipse::setEllipse(Point center, double radiusX, double radiusY) void e2d::ColliderEllipse::setEllipse(Point center, double radiusX, double radiusY)
{ {
SafeReleaseInterface(_d2dEllipse); SafeRelease(_d2dEllipse);
Renderer::getID2D1Factory()->CreateEllipseGeometry( Renderer::getID2D1Factory()->CreateEllipseGeometry(
D2D1::Ellipse( D2D1::Ellipse(

4
core/Collider/ColliderRect.cpp
View File

@ -21,12 +21,12 @@ e2d::ColliderRect::ColliderRect(Node * node)
e2d::ColliderRect::~ColliderRect() e2d::ColliderRect::~ColliderRect()
{ {
SafeReleaseInterface(_d2dRectangle); SafeRelease(_d2dRectangle);
} }
void e2d::ColliderRect::setRect(double left, double top, double right, double bottom) void e2d::ColliderRect::setRect(double left, double top, double right, double bottom)
{ {
SafeReleaseInterface(_d2dRectangle); SafeRelease(_d2dRectangle);
Renderer::getID2D1Factory()->CreateRectangleGeometry( Renderer::getID2D1Factory()->CreateRectangleGeometry(
D2D1::RectF( D2D1::RectF(

24
core/Common/Image.cpp
View File

@ -223,10 +223,10 @@ bool e2d::Image::preload(const String& filePath)
} }
// 释放相关资源 // 释放相关资源
SafeReleaseInterface(pDecoder); SafeRelease(pDecoder);
SafeReleaseInterface(pSource); SafeRelease(pSource);
SafeReleaseInterface(pStream); SafeRelease(pStream);
SafeReleaseInterface(pConverter); SafeRelease(pConverter);
return SUCCEEDED(hr); return SUCCEEDED(hr);
} }
@ -348,11 +348,11 @@ bool e2d::Image::preload(int resNameId, const String& resType)
} }
// 释放相关资源 // 释放相关资源
SafeReleaseInterface(pDecoder); SafeRelease(pDecoder);
SafeReleaseInterface(pSource); SafeRelease(pSource);
SafeReleaseInterface(pStream); SafeRelease(pStream);
SafeReleaseInterface(pConverter); SafeRelease(pConverter);
SafeReleaseInterface(pScaler); SafeRelease(pScaler);
return SUCCEEDED(hr); return SUCCEEDED(hr);
} }
@ -362,19 +362,19 @@ void e2d::Image::clearCache()
{ {
for (auto bitmap : s_mBitmapsFromFile) for (auto bitmap : s_mBitmapsFromFile)
{ {
SafeReleaseInterface(bitmap.second); SafeRelease(bitmap.second);
} }
s_mBitmapsFromFile.clear(); s_mBitmapsFromFile.clear();
for (auto bitmap : s_mBitmapsFromResource) for (auto bitmap : s_mBitmapsFromResource)
{ {
SafeReleaseInterface(bitmap.second); SafeRelease(bitmap.second);
} }
s_mBitmapsFromResource.clear(); s_mBitmapsFromResource.clear();
for (auto bitmap : s_vBitmaps) for (auto bitmap : s_vBitmaps)
{ {
SafeReleaseInterface(bitmap); SafeRelease(bitmap);
} }
s_vBitmaps.clear(); s_vBitmaps.clear();
} }

20
core/Custom/TextRenderer.cpp
View File

@ -25,9 +25,9 @@ TextRenderer::TextRenderer(
TextRenderer::~TextRenderer() TextRenderer::~TextRenderer()
{ {
SafeReleaseInterface(pD2DFactory_); SafeRelease(pD2DFactory_);
SafeReleaseInterface(pRT_); SafeRelease(pRT_);
SafeReleaseInterface(pBrush_); SafeRelease(pBrush_);
} }
STDMETHODIMP_(void) TextRenderer::SetTextStyle( STDMETHODIMP_(void) TextRenderer::SetTextStyle(
@ -145,9 +145,9 @@ STDMETHODIMP TextRenderer::DrawGlyphRun(
); );
} }
SafeReleaseInterface(pPathGeometry); SafeRelease(pPathGeometry);
SafeReleaseInterface(pSink); SafeRelease(pSink);
SafeReleaseInterface(pTransformedGeometry); SafeRelease(pTransformedGeometry);
return hr; return hr;
} }
@ -231,8 +231,8 @@ STDMETHODIMP TextRenderer::DrawUnderline(
); );
} }
SafeReleaseInterface(pRectangleGeometry); SafeRelease(pRectangleGeometry);
SafeReleaseInterface(pTransformedGeometry); SafeRelease(pTransformedGeometry);
return S_OK; return S_OK;
} }
@ -316,8 +316,8 @@ STDMETHODIMP TextRenderer::DrawStrikethrough(
); );
} }
SafeReleaseInterface(pRectangleGeometry); SafeRelease(pRectangleGeometry);
SafeReleaseInterface(pTransformedGeometry); SafeRelease(pTransformedGeometry);
return S_OK; return S_OK;
} }

8
core/Node/Node.cpp
View File

@ -856,7 +856,7 @@ bool e2d::Node::isPointIn(Point point) const
&ret &ret
); );
// 删除临时创建的碰撞体 // 删除临时创建的碰撞体
SafeReleaseInterface(rect); SafeRelease(rect);
} }
if (ret) if (ret)
@ -910,9 +910,9 @@ bool e2d::Node::isOverlappedWith(const Node * node) const
&relation &relation
); );
// 删除临时创建的碰撞体 // 删除临时创建的碰撞体
SafeReleaseInterface(pRect1); SafeRelease(pRect1);
SafeReleaseInterface(pRect2); SafeRelease(pRect2);
SafeReleaseInterface(pCollider); SafeRelease(pCollider);
if ((relation != D2D1_GEOMETRY_RELATION_UNKNOWN) && if ((relation != D2D1_GEOMETRY_RELATION_UNKNOWN) &&
(relation != D2D1_GEOMETRY_RELATION_DISJOINT)) (relation != D2D1_GEOMETRY_RELATION_DISJOINT))
{ {

10
core/Node/Text.cpp
View File

@ -92,8 +92,8 @@ e2d::Text::Text(const String & text, const Font & font, const Style & style)
e2d::Text::~Text() e2d::Text::~Text()
{ {
SafeReleaseInterface(_textFormat); SafeRelease(_textFormat);
SafeReleaseInterface(_textLayout); SafeRelease(_textLayout);
} }
e2d::String e2d::Text::getText() const e2d::String e2d::Text::getText() const
@ -340,7 +340,7 @@ void e2d::Text::_reset()
void e2d::Text::_createFormat() void e2d::Text::_createFormat()
{ {
SafeReleaseInterface(_textFormat); SafeRelease(_textFormat);
HRESULT hr = Renderer::getIDWriteFactory()->CreateTextFormat( HRESULT hr = Renderer::getIDWriteFactory()->CreateTextFormat(
_font.family, _font.family,
@ -386,7 +386,7 @@ void e2d::Text::_createFormat()
void e2d::Text::_createLayout() void e2d::Text::_createLayout()
{ {
SafeReleaseInterface(_textLayout); SafeRelease(_textLayout);
// 文本为空字符串时，重置属性 // 文本为空字符串时，重置属性
if (_text.isEmpty()) if (_text.isEmpty())
@ -437,7 +437,7 @@ void e2d::Text::_createLayout()
// 重设文本宽高 // 重设文本宽高
this->setSize(metrics.width, metrics.height); this->setSize(metrics.width, metrics.height);
// 重新创建 layout // 重新创建 layout
SafeReleaseInterface(_textLayout); SafeRelease(_textLayout);
hr = Renderer::getIDWriteFactory()->CreateTextLayout(_text, length, _textFormat, _width, 0, &_textLayout); hr = Renderer::getIDWriteFactory()->CreateTextLayout(_text, length, _textFormat, _width, 0, &_textLayout);
} }
} }

4
core/Tool/Music.cpp
View File

@ -591,7 +591,7 @@ bool e2d::Music::__init()
if (FAILED(hr = s_pXAudio2->CreateMasteringVoice(&s_pMasteringVoice))) if (FAILED(hr = s_pXAudio2->CreateMasteringVoice(&s_pMasteringVoice)))
{ {
WARN_IF(true, "Failed creating mastering voice"); WARN_IF(true, "Failed creating mastering voice");
e2d::SafeReleaseInterface(s_pXAudio2); e2d::SafeRelease(s_pXAudio2);
return false; return false;
} }
@ -605,5 +605,5 @@ void e2d::Music::__uninit()
s_pMasteringVoice->DestroyVoice(); s_pMasteringVoice->DestroyVoice();
} }
e2d::SafeReleaseInterface(s_pXAudio2); e2d::SafeRelease(s_pXAudio2);
} }

4
core/Transition/Transition.cpp
View File

@ -18,8 +18,8 @@ e2d::Transition::Transition(double duration)
e2d::Transition::~Transition() e2d::Transition::~Transition()
{ {
SafeReleaseInterface(_outLayer); SafeRelease(_outLayer);
SafeReleaseInterface(_inLayer); SafeRelease(_inLayer);
} }
bool e2d::Transition::isDone() bool e2d::Transition::isDone()

2
core/e2dcustom.h
View File

@ -5,7 +5,7 @@
namespace e2d namespace e2d
{ {
template<class Interface> template<class Interface>
inline void SafeReleaseInterface(Interface*& p) inline void SafeRelease(Interface*& p)
{ {
if (p != nullptr) if (p != nullptr)
{ {