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

Camera in 3D view too

Browse source
This commit is contained in:
Jeremy Bullock 2020-04-10 00:31:49 -06:00
parent b8de304466
commit 8546519ddd
1 changed files with 55 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
toonz/sources/toonz/sceneviewer.cpp
View file

@ -1900,6 +1900,34 @@ void SceneViewer::drawScene() {
} else
xr = std::make_pair(xsh, frame);
TFrameHandle *frameHandle = TApp::instance()->getCurrentFrame();
if (m_stopMotion->m_drawBeneathLevels &&
m_stopMotion->m_liveViewStatus == 2 &&
(!frameHandle->isPlaying() ||
frame == m_stopMotion->getXSheetFrameNumber())) {
if (m_hasStopMotionLineUpImage && m_stopMotion->m_showLineUpImage) {
Stage::Player smPlayer;
double dpiX, dpiY;
m_stopMotionLineUpImage->getDpi(dpiX, dpiY);
smPlayer.m_dpiAff = TScale(Stage::inch / dpiX, Stage::inch / dpiY);
smPlayer.m_opacity = 255;
painter.onRasterImage(m_stopMotionLineUpImage.getPointer(), smPlayer);
}
if (m_hasStopMotionImage) {
Stage::Player smPlayer;
double dpiX, dpiY;
m_stopMotionImage->getDpi(dpiX, dpiY);
smPlayer.m_dpiAff = TScale(Stage::inch / dpiX, Stage::inch / dpiY);
bool hide_opacity = false;
#if WITH_CANON
hide_opacity =
m_stopMotion->m_zooming || m_stopMotion->m_pickLiveViewZoom;
#endif
smPlayer.m_opacity = hide_opacity ? 255.0 : m_stopMotion->getOpacity();
painter.onRasterImage(m_stopMotionImage.getPointer(), smPlayer);
}
}
Stage::VisitArgs args;
args.m_scene = scene;
args.m_xsh = xr.first;
@ -1921,6 +1949,33 @@ void SceneViewer::drawScene() {
// args.m_currentFrameId = app->getCurrentFrame()->getFid();
Stage::visit(painter, args);
if (!m_stopMotion->m_drawBeneathLevels &&
m_stopMotion->m_liveViewStatus == 2 &&
(!frameHandle->isPlaying() ||
frame == m_stopMotion->getXSheetFrameNumber())) {
if (m_hasStopMotionLineUpImage && m_stopMotion->m_showLineUpImage) {
Stage::Player smPlayer;
double dpiX, dpiY;
m_stopMotionLineUpImage->getDpi(dpiX, dpiY);
smPlayer.m_dpiAff = TScale(Stage::inch / dpiX, Stage::inch / dpiY);
smPlayer.m_opacity = 255;
painter.onRasterImage(m_stopMotionLineUpImage.getPointer(), smPlayer);
}
if (m_hasStopMotionImage) {
Stage::Player smPlayer;
double dpiX, dpiY;
m_stopMotionImage->getDpi(dpiX, dpiY);
smPlayer.m_dpiAff = TScale(Stage::inch / dpiX, Stage::inch / dpiY);
bool hide_opacity = false;
#if WITH_CANON
hide_opacity =
m_stopMotion->m_zooming || m_stopMotion->m_pickLiveViewZoom;
#endif
smPlayer.m_opacity = hide_opacity ? 255.0 : m_stopMotion->getOpacity();
painter.onRasterImage(m_stopMotionImage.getPointer(), smPlayer);
}
}
m_minZ = painter.getMinZ();
} else {
// camera 2D (normale)