Skip to content

OpenToonz - An open-source full-featured 2D animation creation software

C

Add Preference: Rasterize Vector with Anti Aliasing

Abel You10f8dbf99af0
diff --git a/toonz/sources/include/toonz/preferences.h b/toonz/sources/include/toonz/preferences.h
index 1924c741e..847cf9649 100644
--- a/toonz/sources/include/toonz/preferences.h
+++ b/toonz/sources/include/toonz/preferences.h
@@ -239,6 +239,7 @@ public:
// Visualization tab
bool getShow0ThickLines() const { return getBoolValue(show0ThickLines); }
bool getRegionAntialias() const { return getBoolValue(regionAntialias); }
+ bool getRasterizeAntialias() const { return getBoolValue(rasterizeAntialias); }
// Loading tab
int getDefaultImportPolicy() { return getIntValue(importPolicy); }
diff --git a/toonz/sources/include/toonz/preferencesitemids.h b/toonz/sources/include/toonz/preferencesitemids.h
index dd768d21c..3ef40d1dd 100644
--- a/toonz/sources/include/toonz/preferencesitemids.h
+++ b/toonz/sources/include/toonz/preferencesitemids.h
@@ -45,6 +45,7 @@ enum PreferencesItemId {
// Visualization
show0ThickLines,
regionAntialias,
+ rasterizeAntialias,
//----------
// Loading
diff --git a/toonz/sources/toonz/preferencespopup.cpp b/toonz/sources/toonz/preferencespopup.cpp
index 7158b4757..1444bbefa 100644
--- a/toonz/sources/toonz/preferencespopup.cpp
+++ b/toonz/sources/toonz/preferencespopup.cpp
@@ -1205,6 +1205,7 @@ QString PreferencesPopup::getUIString(PreferencesItemId id) {
// Visualization
{show0ThickLines, tr("Show Lines with Thickness 0")},
{regionAntialias, tr("Antialiased Region Boundaries")},
+ {rasterizeAntialias, tr("Rasterize Vector with Anti Aliasing")},
// Loading
{importPolicy, tr("Default File Import Behavior:")},
@@ -1751,6 +1752,7 @@ QWidget* PreferencesPopup::createVisualizationPage() {
insertUI(show0ThickLines, lay);
insertUI(regionAntialias, lay);
+ insertUI(rasterizeAntialias, lay);
lay->setRowStretch(lay->rowCount(), 1);
widget->setLayout(lay);
diff --git a/toonz/sources/toonzlib/imagebuilders.cpp b/toonz/sources/toonzlib/imagebuilders.cpp
index 9f490cf1c..a977a0213 100644
--- a/toonz/sources/toonzlib/imagebuilders.cpp
+++ b/toonz/sources/toonzlib/imagebuilders.cpp
@@ -27,6 +27,7 @@
#include "toonz/dpiscale.h"
#include "toonz/stage.h"
#include "toonz/tcamera.h"
+#include "toonz/preferences.h"
// Qt includes
#include <QImage>
@@ -282,12 +283,10 @@ bool ImageRasterizer::getInfo(TImageInfo &info, int imFlags, void *extData) {
bool ImageRasterizer::isImageCompatible(int imFlags, void* extData) {
ImageLoader::BuildExtData *data = (ImageLoader::BuildExtData *)extData;
-
if (m_aff == data->currentCamera->getStageToCameraRef())
- return true;
- else {
- return false;
- }
+ if (m_antiAliasing == Preferences::instance()->getRasterizeAntialias())
+ return true;
+ return false;
}
//-------------------------------------------------------------------------
@@ -309,11 +308,12 @@ TImageP ImageRasterizer::build(int imFlags, void *extData) {
TRectD bbox = vi->getBBox();
if (!bbox.isEmpty()) {
m_aff = data->currentCamera->getStageToCameraRef();
+ m_antiAliasing = Preferences::instance()->getRasterizeAntialias();
TDimension d = data->currentCamera->getRes();
TVectorRenderData rd(TVectorRenderData::ProductionSettings(),
m_aff,
TRect(), vi->getPalette());
- rd.m_antiAliasing = true;//TODO: get this value from Preference
+ rd.m_antiAliasing = m_antiAliasing;
//Is this too slow?
{
diff --git a/toonz/sources/toonzlib/imagebuilders.h b/toonz/sources/toonzlib/imagebuilders.h
index b6431f84e..ad463deff 100644
--- a/toonz/sources/toonzlib/imagebuilders.h
+++ b/toonz/sources/toonzlib/imagebuilders.h
@@ -94,7 +94,9 @@ public:
ImageRasterizer() {}
~ImageRasterizer() {}
- TAffine m_aff;
+ TAffine m_aff = TAffine();
+ bool m_antiAliasing = true;
+
//Imagemaneget::getImage
bool isImageCompatible(int imFlags, void *extData) override;
diff --git a/toonz/sources/toonzlib/preferences.cpp b/toonz/sources/toonzlib/preferences.cpp
index 80f95a06d..cedebe8bb 100644
--- a/toonz/sources/toonzlib/preferences.cpp
+++ b/toonz/sources/toonzlib/preferences.cpp
@@ -456,6 +456,7 @@ void Preferences::definePreferenceItems() {
// Visualization
define(show0ThickLines, "show0ThickLines", QMetaType::Bool, true);
define(regionAntialias, "regionAntialias", QMetaType::Bool, false);
+ define(rasterizeAntialias, "rasterizeAntialias", QMetaType::Bool, true);
// Loading
define(importPolicy, "importPolicy", QMetaType::Int, 0); // Always ask