OpenToonz - An open-source full-featured 2D animation creation software
C
Move dpiAff setting to addCell
Abel You20a40e5593ba
diff --git a/toonz/sources/toonzlib/imagebuilders.cpp b/toonz/sources/toonzlib/imagebuilders.cppindex 750886038..5438d7b41 100644--- a/toonz/sources/toonzlib/imagebuilders.cpp+++ b/toonz/sources/toonzlib/imagebuilders.cpp@@ -299,17 +299,16 @@ TImageP ImageRasterizer::build(int imFlags, void *extData) {TVectorImageP vi = img;if (vi) {TRectD bbox = vi->getBBox();- d = TDimension(tceil(bbox.getLx() * data->cameraDpi.x / Stage::inch+1),- tceil(bbox.getLy() * data->cameraDpi.x / Stage::inch+1));- TScale scale = TScale(data->cameraDpi.x / Stage::inch,- data->cameraDpi.y / Stage::inch);+ double sx, sy;+ sx = data->cameraDpi.x / Stage::inch;+ sy = data->cameraDpi.x / Stage::inch;+ d = TDimension(tceil(bbox.getLx() * sx)+1,+ tceil(bbox.getLy() * sy)+1);+ TScale scale = TScale(sx,sy);off = TPoint((int)bbox.x0, (int)bbox.y0);TPalette *vpalette = vi->getPalette();- //TVectorRenderData rd(scale * TTranslation(-off.x, -off.y),- // TRect(TPoint(0, 0), TDimension(d.lx, d.ly)),- // vpalette, 0, false, true);TVectorRenderData rd(TVectorRenderData::ProductionSettings(),scale * TTranslation(-off.x, -off.y),TRect(TPoint(0, 0), TDimension(d.lx, d.ly)),@@ -371,8 +370,7 @@ TImageP ImageRasterizer::build(int imFlags, void *extData) {glPopAttrib();TRasterImageP ri = TRasterImageP(ras);- ri->setOffset(off + ras->getCenter());-+ ri->setOffset(TPoint(off.x*sx,off.y*sy) + ras->getCenter());assert(glGetError() == 0);return ri;diff --git a/toonz/sources/toonzlib/stage.cpp b/toonz/sources/toonzlib/stage.cppindex d82ba766c..b0dcb788c 100644--- a/toonz/sources/toonzlib/stage.cpp+++ b/toonz/sources/toonzlib/stage.cpp@@ -38,6 +38,7 @@#include "imagebuilders.h"#include "toonz/toonzscene.h"#include "toonz/sceneproperties.h"+#include "toonz/tcamera.h"// Qt includes#include <QImage>@@ -424,7 +425,18 @@ void StageBuilder::addCell(PlayerSet &players, ToonzScene *scene, TXsheet *xsh,player.m_isGuidedDrawingEnabled = m_isGuidedDrawingEnabled;player.m_guidedFrontStroke = m_guidedFrontStroke;player.m_guidedBackStroke = m_guidedBackStroke;+ if (xsh) {+ TPointD cameraDpi =+ xsh->getStageObjectTree()->getCurrentCamera()->getDpi();+ player.m_dpiAff =+ sl ? ((sl->getType() == PLI_XSHLEVEL && sl->m_rasterizePli)+ ? TScale(Stage::inch / cameraDpi.x,+ Stage::inch / cameraDpi.y)+ : getDpiAffine(sl, cell.m_frameId))+ : TAffine();+ } elseplayer.m_dpiAff = sl ? getDpiAffine(sl, cell.m_frameId) : TAffine();+player.m_onionSkinDistance = m_onionSkinDistance;// when visiting the subxsheet, valuate the subxsheet column indexbool isCurrent = (subSheetColIndex >= 0)diff --git a/toonz/sources/toonzlib/stagevisitor.cpp b/toonz/sources/toonzlib/stagevisitor.cppindex 073f4890e..9761d896c 100644--- a/toonz/sources/toonzlib/stagevisitor.cpp+++ b/toonz/sources/toonzlib/stagevisitor.cpp@@ -50,7 +50,6 @@#include "imagebuilders.h"#include "toonz/tframehandle.h"#include "toonz/preferences.h"-#include "toonz/tcamera.h"// Qt includes#include <QImage>@@ -999,14 +998,13 @@ void RasterPainter::onRasterImage(TRasterImage *ri,TAffine aff;aff = m_viewAff * player.m_placement * player.m_dpiAff;+aff = TTranslation(m_dim.lx * 0.5, m_dim.ly * 0.5) * aff *TTranslation(-r->getCenterD() +convert(ri->getOffset())); // this offset is !=0 only if- // in cleanup camera test mode- if (player.m_sl->m_rasterizePli) {- TPointD dpi = player.m_xsh->getStageObjectTree()->getCurrentCamera()->getDpi();- aff *= TScale(Stage::inch / dpi.x, Stage::inch / dpi.y);- }+ // in cleanup camera test mode+ // and rasterizer+TRectD bbox = TRectD(0, 0, m_dim.lx, m_dim.ly);bbox *= convert(m_clipRect);if (bbox.isEmpty()) return;