razzaline/tahoma2d
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

fix motionblur_iwa fx (#1952)

Browse source
This commit is contained in:
shun-iwasawa 2018-05-09 16:39:39 +09:00 committed by masafumi-inoue
parent eff63f0236
commit a048bcf55e
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
toonz/sources/toonzlib/scenefx.cpp
View file

@ -477,13 +477,17 @@ static QList<TPointD> getColumnMotionPoints(TXsheet *xsh, double row, int col,
continue;
}
double targetFrame = row + frameOffset;
// Proper position cannot be obtained for frame = -1.0
if (targetFrame == -1.0) targetFrame = -0.9999;
/*-- 自分自身の動きを使うか、別オブジェクトの動きを使うか --*/
if (useOwnMotion)
getColumnPlacement(aff, xsh, row + frameOffset, col, isPreview);
getColumnPlacement(aff, xsh, targetFrame, col, isPreview);
else
getStageObjectPlacement(aff, xsh, row + frameOffset, objectId, isPreview);
getStageObjectPlacement(aff, xsh, targetFrame, objectId, isPreview);
TAffine cameraAff = camera->getPlacement(row + frameOffset);
TAffine cameraAff = camera->getPlacement(targetFrame);
TPointD tmpPos =
dpiAff.inv() * aff * TPointD(-cameraAff.a13, -cameraAff.a23);
@ -1043,7 +1047,8 @@ PlacedFx FxBuilder::makePFfromGenericFx(TFx *fx) {
/*-- 軌跡を取得するBinaryFxの場合 --*/
if (pf.m_fx->getAttributes()->isSpeedAware()) {
MotionAwareBaseFx *mabfx = dynamic_cast<MotionAwareBaseFx *>(fx);
MotionAwareBaseFx *mabfx =
dynamic_cast<MotionAwareBaseFx *>(pf.m_fx.getPointer());
if (mabfx) {
double shutterStart = mabfx->getShutterStart()->getValue(m_frame);
double shutterEnd = mabfx->getShutterEnd()->getValue(m_frame);
@ -1052,7 +1057,7 @@ PlacedFx FxBuilder::makePFfromGenericFx(TFx *fx) {
MotionObjectType type = mabfx->getMotionObjectType();
int index = mabfx->getMotionObjectIndex()->getValue();
TStageObjectId objectId = getMotionObjectId(type, index);
fx->getAttributes()->setMotionPoints(getColumnMotionPoints(
pf.m_fx->getAttributes()->setMotionPoints(getColumnMotionPoints(
m_xsh, m_frame, pf.m_columnIndex, objectId, m_isPreview,
shutterStart, shutterEnd, traceResolution));
}