Skip to content

Commit bcd27dd

Browse files
committed
Fix effekseer compile error
1 parent c44fd72 commit bcd27dd

2 files changed

Lines changed: 16 additions & 6 deletions

File tree

extensions/Effekseer/EffekseerForCocos2d-x/EffekseerForCocos2d-x.cpp

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -688,7 +688,9 @@ void EffectEmitter::draw(const cocos2d::SceneRenderState& state, const cocos2d::
688688
auto renderer2d = manager->getInternalRenderer();
689689
Effekseer::Matrix44 mCamera = renderer2d->GetCameraMatrix();
690690
Effekseer::Matrix44 mProj = renderer2d->GetProjectionMatrix();
691+
Effekseer::Manager::LayerParameter layerParameter = manager->getInternalManager()->GetLayerParameter(0);
691692
renderCommand->func = [=]() -> void {
693+
manager->getInternalManager()->SetLayerParameter(0, layerParameter);
692694
renderer2d->SetCameraMatrix(mCamera);
693695
renderer2d->SetProjectionMatrix(mProj);
694696

@@ -841,8 +843,11 @@ void EffectManager::setIsDistortionEnabled(bool value)
841843
}
842844
}
843845

844-
void EffectManager::begin(cocos2d::Renderer* renderer, float globalZOrder)
846+
void EffectManager::begin(const cocos2d::SceneRenderState& state, float globalZOrder)
845847
{
848+
setCameraMatrix(state.getViewMatrix());
849+
setProjectionMatrix(state.getProjectionMatrix());
850+
846851
if (isDistortionEnabled)
847852
{
848853
isDistorted = false;
@@ -855,6 +860,8 @@ void EffectManager::begin(cocos2d::Renderer* renderer, float globalZOrder)
855860

856861
newFrame();
857862

863+
AX_UNUSED_PARAM(globalZOrder);
864+
858865
// TODO Batch render
859866
/*
860867
beginCommand.init(globalZOrder);
@@ -869,12 +876,15 @@ void EffectManager::begin(cocos2d::Renderer* renderer, float globalZOrder)
869876
870877
871878
872-
renderer->addCommand(&beginCommand);
879+
state.getRenderer()->addCommand(&beginCommand);
873880
*/
874881
}
875882

876-
void EffectManager::end(cocos2d::Renderer* renderer, float globalZOrder)
883+
void EffectManager::end(const cocos2d::SceneRenderState& state, float globalZOrder)
877884
{
885+
AX_UNUSED_PARAM(state);
886+
AX_UNUSED_PARAM(globalZOrder);
887+
878888
// TODO Batch render
879889
/*
880890
endCommand.init(globalZOrder);
@@ -884,7 +894,7 @@ void EffectManager::end(cocos2d::Renderer* renderer, float globalZOrder)
884894
renderer2d->EndRendering();
885895
};
886896
887-
renderer->addCommand(&endCommand);
897+
state.getRenderer()->addCommand(&endCommand);
888898
*/
889899
}
890900

extensions/Effekseer/EffekseerForCocos2d-x/EffekseerForCocos2d-x.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -377,14 +377,14 @@ class EffectManager : public cocos2d::Object
377377
\~English Inherit visit and add a process before drawing the layer.
378378
\~Japanese visitを継承してレイヤーの描画を行う前に実行する。
379379
*/
380-
void begin(cocos2d::Renderer* renderer, float globalZOrder);
380+
void begin(const cocos2d::SceneRenderState& state, float globalZOrder);
381381

382382
/**
383383
@brief
384384
\~English Inherit visit and add a process after drawing the layer.
385385
\~Japanese visitを継承してレイヤーの描画を行った後に実行する。
386386
*/
387-
void end(cocos2d::Renderer* renderer, float globalZOrder);
387+
void end(const cocos2d::SceneRenderState& state, float globalZOrder);
388388

389389
/**
390390
@brief

0 commit comments

Comments
 (0)