83c0cff6dc
* add multi arc mockup * implement mutli arc * add join and smooth option * reset multiarc and arc when deactivated * create self loop if the last point is the same as the first * make join option in multiarc consistent with tape tool * fix a bug where thickness don't affect mutliarc in vector level * remove join option in geometric tool * stop mutliarc after closing shape * double click can also end multi arc * fix a bug where multiArc will produce buggy stroke * fix a bug where geometric tools is not deactivated * add multiArc shortcut * rewrite multiArc * revert changes to tvectorimage * add undo data for multiArc * Paste as Copy Command for XSheet * Remove unneeded code * Bug fix * prevent guide lines from jumping around in MultiArc * make stroke color consistent in MultiArc * remove color in MultiArc's undo data * make color consistent in MultiArc with previous version * Fix single image raster levels * fix compilation error * fix a bug where multiArc might generate bugged stroke * Remove ICONV dep (#3304) * fix crash on saving studio palette * Move to Paste Special Menu * Don't Set Fixed Width if Docking a Floating Panel * Update how_to_build_win.md New draft of pr for requested changes to windows build instructions. * fix geometric tool multiarc smooth option * fix level saving failure * fix wrong warning after saving palette * fix a bug where moving a control point while holding alt has unintended result * fix overwriting raster drawing palette * Hide color swatch on color 0 Co-authored-by: pojienie <pojienie@gmail.com> Co-authored-by: rim <11380091+rozhuk-im@users.noreply.github.com> Co-authored-by: shun-iwasawa <shun.iwasawa@ghibli.jp> Co-authored-by: Rodney <rodney.baker@gmail.com> Co-authored-by: DoctorRyan <65507211+DoctorRyan@users.noreply.github.com>
402 lines
12 KiB
C++
402 lines
12 KiB
C++
|
|
|
|
// TnzCore includes
|
|
#include "tcommon.h"
|
|
|
|
#include "timageinfo.h"
|
|
#include "timage_io.h"
|
|
#include "tlevel_io.h"
|
|
|
|
#include "ttoonzimage.h"
|
|
#include "tvectorimage.h"
|
|
#include "trastercm.h"
|
|
#include "tvectorrenderdata.h"
|
|
#include "tpalette.h"
|
|
|
|
#include "tgl.h"
|
|
#include "tvectorgl.h"
|
|
#include "tofflinegl.h"
|
|
|
|
#include "timagecache.h"
|
|
|
|
// TnzLib includes
|
|
#include "toonz/txshleveltypes.h"
|
|
#include "toonz/levelproperties.h"
|
|
#include "toonz/txshsimplelevel.h"
|
|
#include "toonz/fill.h"
|
|
|
|
// Qt includes
|
|
#include <QImage>
|
|
#include <QThread>
|
|
#include <QOpenGLContext>
|
|
#include <QOffscreenSurface>
|
|
#include <QOpenGLFramebufferObject>
|
|
|
|
#include "imagebuilders.h"
|
|
|
|
//***************************************************************************************
|
|
// Global stuff
|
|
//***************************************************************************************
|
|
|
|
extern TOfflineGL *currentOfflineGL;
|
|
|
|
//***************************************************************************************
|
|
// ImageLoader implementation
|
|
//***************************************************************************************
|
|
|
|
ImageLoader::ImageLoader(const TFilePath &path, const TFrameId &fid)
|
|
: m_path(path), m_fid(fid), m_subsampling(0), m_64bitCompatible(false) {}
|
|
|
|
//-------------------------------------------------------------------------
|
|
|
|
bool ImageLoader::getInfo(TImageInfo &info, int imFlags, void *extData) {
|
|
try {
|
|
TLevelReaderP lr(m_path);
|
|
TImageReaderP fr = lr->getFrameReader(m_fid);
|
|
|
|
// NOTE: Currently not changing imageInfo's bpp stuff...
|
|
// Ignoring subsampling too...
|
|
|
|
return ImageBuilder::setImageInfo(info, fr.getPointer());
|
|
} catch (TException &e) {
|
|
QString msg = QString::fromStdWString(e.getMessage());
|
|
if (msg == QString("Old 4.1 Palette")) throw;
|
|
|
|
return false;
|
|
}
|
|
}
|
|
|
|
//-------------------------------------------------------------------------
|
|
|
|
inline int ImageLoader::buildSubsampling(int imFlags, BuildExtData *data) {
|
|
return (imFlags & ImageManager::toBeModified)
|
|
? 1
|
|
: (data->m_subs > 0)
|
|
? data->m_subs
|
|
: (m_subsampling > 0)
|
|
? m_subsampling
|
|
: data->m_sl->getProperties()->getSubsampling();
|
|
}
|
|
|
|
//-------------------------------------------------------------------------
|
|
|
|
TImageP ImageLoader::build(int imFlags, void *extData) {
|
|
assert(extData);
|
|
|
|
// Extract external data
|
|
BuildExtData *data = static_cast<BuildExtData *>(extData);
|
|
|
|
int subsampling = buildSubsampling(imFlags, data);
|
|
|
|
try {
|
|
// Initialize level reader
|
|
TLevelReaderP lr(m_path);
|
|
if (!lr) return TImageP();
|
|
|
|
// Load info in cases where it's required first
|
|
lr->doReadPalette(false);
|
|
|
|
if ((m_path.getType() == "pli") || (m_path.getType() == "svg") ||
|
|
(m_path.getType() == "psd"))
|
|
lr->loadInfo();
|
|
|
|
bool isTlvIcon = data->m_icon && m_path.getType() == "tlv";
|
|
|
|
// for TLV icons, palettes will be applied in IconGenerator later
|
|
if (!isTlvIcon) lr->doReadPalette(true); // Allow palette loading
|
|
|
|
TImageReaderP ir = lr->getFrameReader(m_fid);
|
|
|
|
bool enable64bit = (imFlags & ImageManager::is64bitEnabled);
|
|
ir->enable16BitRead(enable64bit); // Set 64-bit loading if required
|
|
|
|
// Load the image
|
|
TImageP img;
|
|
|
|
if (isTlvIcon)
|
|
img = ir->loadIcon(); // TODO: Why just in the tlv case??
|
|
else {
|
|
ir->setShrink(subsampling);
|
|
img = ir->load();
|
|
}
|
|
|
|
ir->enable16BitRead(false);
|
|
|
|
if (!img) return img; // There was an error loading the image.
|
|
|
|
TPalette *palette = data->m_sl->getPalette();
|
|
if (palette) img->setPalette(palette);
|
|
|
|
if (subsampling > 1) {
|
|
// Store the subsampling info in the image
|
|
if (TRasterImageP ri = img)
|
|
ri->setSubsampling(subsampling);
|
|
else if (TToonzImageP ti = img)
|
|
ti->setSubsampling(subsampling);
|
|
}
|
|
|
|
// In case the image will be cached, store its subsampling and 64 bit
|
|
// compatibility
|
|
if (!(imFlags & ImageManager::dontPutInCache)) {
|
|
m_subsampling = subsampling;
|
|
m_64bitCompatible =
|
|
data->m_sl->is16BitChannelLevel() ? enable64bit : true;
|
|
}
|
|
|
|
return img;
|
|
} catch (...) {
|
|
return TImageP();
|
|
}
|
|
}
|
|
|
|
//-------------------------------------------------------------------------
|
|
|
|
bool ImageLoader::isImageCompatible(int imFlags, void *extData) {
|
|
assert(extData);
|
|
|
|
BuildExtData *data = static_cast<BuildExtData *>(extData);
|
|
const TXshSimpleLevel *sl = data->m_sl;
|
|
|
|
// NOTE: Vector and Mesh dont care about sub sampling rate and bit depth
|
|
// compatibility.
|
|
// They are property of Raster.
|
|
if (sl->getType() == PLI_XSHLEVEL || sl->getType() == MESH_XSHLEVEL)
|
|
return true;
|
|
|
|
int subsampling = buildSubsampling(imFlags, data);
|
|
|
|
if (m_subsampling <= 0 || subsampling != m_subsampling) return false;
|
|
|
|
if (m_64bitCompatible || !(imFlags & ImageManager::is64bitEnabled)) {
|
|
return true;
|
|
} else {
|
|
return false;
|
|
}
|
|
}
|
|
|
|
//-------------------------------------------------------------------------
|
|
|
|
void ImageLoader::invalidate() {
|
|
ImageBuilder::invalidate();
|
|
m_subsampling = 0;
|
|
m_64bitCompatible = false;
|
|
}
|
|
|
|
//-------------------------------------------------------------------------
|
|
/*--
|
|
* ImageBuilder仮想関数の実装。アイコン、画像をLoad時に全てキャッシュに格納する
|
|
* --*/
|
|
|
|
void ImageLoader::buildAllIconsAndPutInCache(TXshSimpleLevel *level,
|
|
std::vector<TFrameId> fids,
|
|
std::vector<std::string> iconIds,
|
|
bool cacheImagesAsWell) {
|
|
if (m_path.getType() != "tlv") return;
|
|
if (fids.empty() || iconIds.empty()) return;
|
|
/*- fidとアイコンidの数は同じはず -*/
|
|
if ((int)fids.size() != (int)iconIds.size()) return;
|
|
|
|
try {
|
|
TLevelReaderP lr(m_path);
|
|
if (!lr) return;
|
|
|
|
for (int i = 0; i < (int)fids.size(); i++) {
|
|
lr->doReadPalette(false);
|
|
TImageReaderP ir = lr->getFrameReader(fids[i]);
|
|
lr->doReadPalette(true);
|
|
|
|
TImageInfo info;
|
|
TPalette *palette = level->getPalette();
|
|
std::string fullImgId = level->getImageId(fids[i]);
|
|
|
|
/*- 画像データも一緒にキャッシュする場合 -*/
|
|
if (cacheImagesAsWell) {
|
|
ir->enable16BitRead(m_64bitCompatible);
|
|
ir->setShrink(1);
|
|
TImageP fullImg = ir->load();
|
|
if (fullImg) {
|
|
if (palette) fullImg->setPalette(palette);
|
|
TImageCache::instance()->add(fullImgId, fullImg, true);
|
|
setImageInfo(info, fullImg.getPointer());
|
|
}
|
|
}
|
|
|
|
/*- アイコンのロード -*/
|
|
TImageP img = ir->loadIcon();
|
|
ir->enable16BitRead(false);
|
|
if (img) {
|
|
if (palette) img->setPalette(palette);
|
|
TImageCache::instance()->add(iconIds[i], img, true);
|
|
}
|
|
}
|
|
} catch (...) {
|
|
return;
|
|
}
|
|
}
|
|
|
|
void ImageLoader::setFid(const TFrameId &fid) { m_fid = fid; }
|
|
|
|
//***************************************************************************************
|
|
// ImageRasterizer implementation
|
|
//***************************************************************************************
|
|
|
|
bool ImageRasterizer::getInfo(TImageInfo &info, int imFlags, void *extData) {
|
|
assert(false); // None should get these... in case, TODO
|
|
return false;
|
|
}
|
|
|
|
//-------------------------------------------------------------------------
|
|
|
|
TImageP ImageRasterizer::build(int imFlags, void *extData) {
|
|
assert(!(imFlags &
|
|
~(ImageManager::dontPutInCache | ImageManager::forceRebuild)));
|
|
|
|
TDimension d(10, 10);
|
|
TPoint off(0, 0);
|
|
|
|
// Fetch image
|
|
assert(extData);
|
|
ImageLoader::BuildExtData *data = (ImageLoader::BuildExtData *)extData;
|
|
|
|
const std::string &srcImgId = data->m_sl->getImageId(data->m_fid);
|
|
|
|
TImageP img = ImageManager::instance()->getImage(srcImgId, imFlags, extData);
|
|
if (img) {
|
|
TVectorImageP vi = img;
|
|
if (vi) {
|
|
TRectD bbox = vi->getBBox();
|
|
|
|
d = TDimension(tceil(bbox.getLx()) + 1, tceil(bbox.getLy()) + 1);
|
|
off = TPoint((int)bbox.x0, (int)bbox.y0);
|
|
|
|
TPalette *vpalette = vi->getPalette();
|
|
TVectorRenderData rd(TTranslation(-off.x, -off.y), TRect(TPoint(0, 0), d),
|
|
vpalette, 0, true, true);
|
|
|
|
// this is too slow.
|
|
{
|
|
QSurfaceFormat format;
|
|
format.setProfile(QSurfaceFormat::CompatibilityProfile);
|
|
|
|
std::unique_ptr<QOffscreenSurface> surface(new QOffscreenSurface());
|
|
surface->setFormat(format);
|
|
surface->create();
|
|
|
|
TRaster32P ras(d);
|
|
|
|
glPushAttrib(GL_ALL_ATTRIB_BITS);
|
|
glMatrixMode(GL_MODELVIEW), glPushMatrix();
|
|
glMatrixMode(GL_PROJECTION), glPushMatrix();
|
|
{
|
|
std::unique_ptr<QOpenGLFramebufferObject> fb(
|
|
new QOpenGLFramebufferObject(d.lx, d.ly));
|
|
|
|
fb->bind();
|
|
|
|
glViewport(0, 0, d.lx, d.ly);
|
|
glClearColor(0, 0, 0, 0);
|
|
glClear(GL_COLOR_BUFFER_BIT);
|
|
|
|
glMatrixMode(GL_PROJECTION);
|
|
glLoadIdentity();
|
|
gluOrtho2D(0, d.lx, 0, d.ly);
|
|
|
|
glMatrixMode(GL_MODELVIEW);
|
|
glLoadIdentity();
|
|
glTranslatef(0.375, 0.375, 0.0);
|
|
|
|
tglDraw(rd, vi.getPointer());
|
|
|
|
glFlush();
|
|
|
|
QImage img =
|
|
fb->toImage().scaled(QSize(d.lx, d.ly), Qt::IgnoreAspectRatio,
|
|
Qt::SmoothTransformation);
|
|
|
|
int wrap = ras->getLx() * sizeof(TPixel32);
|
|
uchar *srcPix = img.bits();
|
|
uchar *dstPix = ras->getRawData() + wrap * (d.ly - 1);
|
|
for (int y = 0; y < d.ly; y++) {
|
|
memcpy(dstPix, srcPix, wrap);
|
|
dstPix -= wrap;
|
|
srcPix += wrap;
|
|
}
|
|
fb->release();
|
|
}
|
|
glMatrixMode(GL_MODELVIEW), glPopMatrix();
|
|
glMatrixMode(GL_PROJECTION), glPopMatrix();
|
|
|
|
glPopAttrib();
|
|
|
|
TRasterImageP ri = TRasterImageP(ras);
|
|
ri->setOffset(off + ras->getCenter());
|
|
|
|
assert(glGetError() == 0);
|
|
|
|
return ri;
|
|
}
|
|
}
|
|
}
|
|
|
|
// Error case: return a dummy image (is it really required?)
|
|
|
|
TRaster32P ras(d);
|
|
ras->fill(TPixel32(127, 0, 127, 127));
|
|
|
|
return TRasterImageP(ras);
|
|
}
|
|
|
|
//***************************************************************************************
|
|
// ImageFiller implementation
|
|
//***************************************************************************************
|
|
|
|
bool ImageFiller::getInfo(TImageInfo &info, int imFlags, void *extData) {
|
|
assert(false); // None should get these... in case, TODO
|
|
return false;
|
|
}
|
|
|
|
//-------------------------------------------------------------------------
|
|
|
|
TImageP ImageFiller::build(int imFlags, void *extData) {
|
|
assert(imFlags == ImageManager::none);
|
|
|
|
// Fetch image
|
|
assert(extData);
|
|
|
|
ImageLoader::BuildExtData *data = (ImageLoader::BuildExtData *)extData;
|
|
assert(data->m_subs == 0);
|
|
|
|
const std::string &srcImgId = data->m_sl->getImageId(data->m_fid);
|
|
|
|
TImageP img = ImageManager::instance()->getImage(srcImgId, imFlags, extData);
|
|
if (img) {
|
|
TRasterImageP ri = img;
|
|
if (ri) {
|
|
TRaster32P ras = ri->getRaster();
|
|
if (ras) {
|
|
TRaster32P newRas = ras->clone();
|
|
FullColorAreaFiller filler(newRas);
|
|
|
|
TPaletteP palette = new TPalette();
|
|
int styleId = palette->getPage(0)->addStyle(TPixel32::White);
|
|
|
|
FillParameters params;
|
|
params.m_palette = palette.getPointer();
|
|
params.m_styleId = styleId;
|
|
params.m_minFillDepth = 0;
|
|
params.m_maxFillDepth = 15;
|
|
filler.rectFill(newRas->getBounds(), params, false);
|
|
|
|
TRasterImageP ri = TRasterImageP(newRas);
|
|
return ri;
|
|
}
|
|
}
|
|
}
|
|
|
|
// Error case: return a dummy image (is it really required?)
|
|
|
|
TRaster32P ras(10, 10);
|
|
ras->fill(TPixel32(127, 0, 127, 127));
|
|
|
|
return TRasterImageP(ras);
|
|
}
|