V1.1.3 (#1255)
This commit is contained in:
parent
2fb6b9308a
commit
5b7b9fb309
14 changed files with 56 additions and 53 deletions
|
@ -156,8 +156,7 @@ public:
|
||||||
std::string getValueAlias(double frame, int precision) override;
|
std::string getValueAlias(double frame, int precision) override;
|
||||||
};
|
};
|
||||||
|
|
||||||
DVAPI void splitSpeedInOutSegment(TDoubleKeyframe &k,
|
DVAPI void splitSpeedInOutSegment(TDoubleKeyframe &k, TDoubleKeyframe &k0,
|
||||||
TDoubleKeyframe &k0,
|
|
||||||
TDoubleKeyframe &k1);
|
TDoubleKeyframe &k1);
|
||||||
|
|
||||||
//---------------------------------------------------------
|
//---------------------------------------------------------
|
||||||
|
|
|
@ -142,9 +142,10 @@ public:
|
||||||
class TPersistDeclarationT
|
class TPersistDeclarationT
|
||||||
*/
|
*/
|
||||||
#define PERSIST_DECLARATION(T) \
|
#define PERSIST_DECLARATION(T) \
|
||||||
|
\
|
||||||
private: \
|
private: \
|
||||||
static TPersistDeclarationT<T> m_declaration; \
|
static TPersistDeclarationT<T> m_declaration; \
|
||||||
\
|
\
|
||||||
public: \
|
public: \
|
||||||
const TPersistDeclaration *getDeclaration() const override { \
|
const TPersistDeclaration *getDeclaration() const override { \
|
||||||
return &m_declaration; \
|
return &m_declaration; \
|
||||||
|
|
|
@ -230,8 +230,7 @@ inline TPixel32 quickOverPix(const TPixel32 &bot, const TPixel32 &top) {
|
||||||
|
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
|
|
||||||
inline TPixel32 quickOverPixPremult(const TPixel32 &bot,
|
inline TPixel32 quickOverPixPremult(const TPixel32 &bot, const TPixel32 &top) {
|
||||||
const TPixel32 &top) {
|
|
||||||
return quickOverPixPremultT<TPixel32, UCHAR>(bot, top);
|
return quickOverPixPremultT<TPixel32, UCHAR>(bot, top);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -62,7 +62,6 @@ class TRasterPT;
|
||||||
class TRaster;
|
class TRaster;
|
||||||
typedef TSmartPointerT<TRaster> TRasterP;
|
typedef TSmartPointerT<TRaster> TRasterP;
|
||||||
|
|
||||||
|
|
||||||
//------------------------------------------------------------
|
//------------------------------------------------------------
|
||||||
|
|
||||||
//
|
//
|
||||||
|
|
|
@ -132,10 +132,11 @@ static TRenderResourceManagerGenerator* gen();
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#define T_RENDER_RESOURCE_MANAGER \
|
#define T_RENDER_RESOURCE_MANAGER \
|
||||||
|
\
|
||||||
public: \
|
public: \
|
||||||
static TRenderResourceManagerGenerator *gen(); \
|
static TRenderResourceManagerGenerator *gen(); \
|
||||||
static TRenderResourceManagerGenerator *deps(); \
|
static TRenderResourceManagerGenerator *deps(); \
|
||||||
\
|
\
|
||||||
private:
|
private:
|
||||||
|
|
||||||
//--------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------
|
||||||
|
|
|
@ -165,7 +165,6 @@ class ImageMesh final : public TSmartObject,
|
||||||
public tcg::Mesh<Vertex, Edge, Face> {};
|
public tcg::Mesh<Vertex, Edge, Face> {};
|
||||||
|
|
||||||
//--------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------
|
||||||
|
|
||||||
}
|
}
|
||||||
} // namespace TRop::borders
|
} // namespace TRop::borders
|
||||||
|
|
||||||
|
@ -267,7 +266,6 @@ void readMeshes(const TRasterPT<Pixel> &raster,
|
||||||
ImageMeshesReaderT<Pixel> &reader);
|
ImageMeshesReaderT<Pixel> &reader);
|
||||||
|
|
||||||
//--------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------
|
||||||
|
|
||||||
}
|
}
|
||||||
} // namespace TRop::borders
|
} // namespace TRop::borders
|
||||||
|
|
||||||
|
|
|
@ -87,9 +87,10 @@ private:
|
||||||
};
|
};
|
||||||
|
|
||||||
#define DECLARE_CLASS_CODE \
|
#define DECLARE_CLASS_CODE \
|
||||||
|
\
|
||||||
private: \
|
private: \
|
||||||
static const TSmartObject::ClassCode m_classCode; \
|
static const TSmartObject::ClassCode m_classCode; \
|
||||||
\
|
\
|
||||||
public: \
|
public: \
|
||||||
inline static TINT32 getInstanceCount() { \
|
inline static TINT32 getInstanceCount() { \
|
||||||
return TSmartObject::getInstanceCount(m_classCode); \
|
return TSmartObject::getInstanceCount(m_classCode); \
|
||||||
|
|
|
@ -133,10 +133,10 @@ from which it's created.It hasn't reference to the object.
|
||||||
*dstSample++ = *srcSample++;
|
*dstSample++ = *srcSample++;
|
||||||
}
|
}
|
||||||
|
|
||||||
//----------------------------------------------------------------------------
|
//----------------------------------------------------------------------------
|
||||||
|
|
||||||
//! Applies a trasformation (echo, reverb, ect) to the object and returns the
|
//! Applies a trasformation (echo, reverb, ect) to the object and returns the
|
||||||
//! transformed soundtrack
|
//! transformed soundtrack
|
||||||
TSoundTrackP apply(TSoundTransform *transform) override;
|
TSoundTrackP apply(TSoundTransform *transform) override;
|
||||||
//----------------------------------------------------------------------------
|
//----------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
|
@ -61,29 +61,29 @@ const std::string msg_from_err_(/* 直によんではいけない */
|
||||||
}
|
}
|
||||||
/*--- ::GetLastError()値からエラーメッセージを得る ---*/
|
/*--- ::GetLastError()値からエラーメッセージを得る ---*/
|
||||||
#ifdef _MSC_VER
|
#ifdef _MSC_VER
|
||||||
#define igs_resource_msg_from_err(tit, error_message_id) \
|
#define igs_resource_msg_from_err(tit, error_message_id) \
|
||||||
igs::resource::msg_from_err_( \
|
igs::resource::msg_from_err_( \
|
||||||
tit, error_message_id, TEXT(__FILE__), TEXT(igs_tostr(__LINE__)), \
|
tit, error_message_id, TEXT(__FILE__), TEXT(igs_tostr(__LINE__)), \
|
||||||
TEXT(__FUNCSIG__), TEXT(igs_tostr_(_MSC_VER)), \
|
TEXT(__FUNCSIG__), TEXT(igs_tostr_(_MSC_VER)), \
|
||||||
TEXT(igs_tostr(_MSC_FULL_VER)), TEXT(__DATE__), TEXT(__TIME__))
|
TEXT(igs_tostr(_MSC_FULL_VER)), TEXT(__DATE__), TEXT(__TIME__))
|
||||||
/*--- エラーメッセージを得る ---*/
|
/*--- エラーメッセージを得る ---*/
|
||||||
#define igs_resource_msg_from_er(tit) \
|
#define igs_resource_msg_from_er(tit) \
|
||||||
igs::resource::msg_from_err_( \
|
igs::resource::msg_from_err_( \
|
||||||
tit, NO_ERROR, TEXT(__FILE__), TEXT(igs_tostr(__LINE__)), \
|
tit, NO_ERROR, TEXT(__FILE__), TEXT(igs_tostr(__LINE__)), \
|
||||||
TEXT(__FUNCSIG__), TEXT(igs_tostr_(_MSC_VER)), \
|
TEXT(__FUNCSIG__), TEXT(igs_tostr_(_MSC_VER)), \
|
||||||
TEXT(igs_tostr(_MSC_FULL_VER)), TEXT(__DATE__), TEXT(__TIME__))
|
TEXT(igs_tostr(_MSC_FULL_VER)), TEXT(__DATE__), TEXT(__TIME__))
|
||||||
#else
|
#else
|
||||||
#define igs_resource_msg_from_err(tit, error_message_id) \
|
#define igs_resource_msg_from_err(tit, error_message_id) \
|
||||||
igs::resource::msg_from_err_( \
|
igs::resource::msg_from_err_( \
|
||||||
tit, error_message_id, TEXT(__FILE__), TEXT(igs_tostr(__LINE__)), \
|
tit, error_message_id, TEXT(__FILE__), TEXT(igs_tostr(__LINE__)), \
|
||||||
TEXT(__PRETTY_FUNCTION__), TEXT(__VERSION__), \
|
TEXT(__PRETTY_FUNCTION__), TEXT(__VERSION__), TEXT(__VERSION__), \
|
||||||
TEXT(__VERSION__), TEXT(__DATE__), TEXT(__TIME__))
|
TEXT(__DATE__), TEXT(__TIME__))
|
||||||
/*--- エラーメッセージを得る ---*/
|
/*--- エラーメッセージを得る ---*/
|
||||||
#define igs_resource_msg_from_er(tit) \
|
#define igs_resource_msg_from_er(tit) \
|
||||||
igs::resource::msg_from_err_( \
|
igs::resource::msg_from_err_( \
|
||||||
tit, NO_ERROR, TEXT(__FILE__), TEXT(igs_tostr(__LINE__)), \
|
tit, NO_ERROR, TEXT(__FILE__), TEXT(igs_tostr(__LINE__)), \
|
||||||
TEXT(__PRETTY_FUNCTION__), TEXT(__VERSION__), \
|
TEXT(__PRETTY_FUNCTION__), TEXT(__VERSION__), TEXT(__VERSION__), \
|
||||||
TEXT(__VERSION__), TEXT(__DATE__), TEXT(__TIME__))
|
TEXT(__DATE__), TEXT(__TIME__))
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#endif /* !igs_resource_msg_from_err_h */
|
#endif /* !igs_resource_msg_from_err_h */
|
||||||
|
|
|
@ -15,6 +15,7 @@ class PaletteFilterFxRenderData;
|
||||||
static const std::string PLUGIN_PREFIX("STD");
|
static const std::string PLUGIN_PREFIX("STD");
|
||||||
|
|
||||||
#define FX_PLUGIN_DECLARATION(T) \
|
#define FX_PLUGIN_DECLARATION(T) \
|
||||||
|
\
|
||||||
public: \
|
public: \
|
||||||
const TPersistDeclaration *getDeclaration() const override;
|
const TPersistDeclaration *getDeclaration() const override;
|
||||||
|
|
||||||
|
|
|
@ -64,7 +64,7 @@ void ScreenPicker::mousePressEvent(QWidget *widget, QMouseEvent *me) {
|
||||||
|
|
||||||
void ScreenPicker::mouseMoveEvent(QWidget *widget, QMouseEvent *me) {
|
void ScreenPicker::mouseMoveEvent(QWidget *widget, QMouseEvent *me) {
|
||||||
// On fast movements, the mouse release can fire before the mouse movement
|
// On fast movements, the mouse release can fire before the mouse movement
|
||||||
//assert(m_mouseGrabbed); - can cause a crash
|
// assert(m_mouseGrabbed); - can cause a crash
|
||||||
if (!m_mousePressed || !m_mouseGrabbed) return;
|
if (!m_mousePressed || !m_mouseGrabbed) return;
|
||||||
|
|
||||||
QPoint pos(widget->mapToGlobal(me->pos()));
|
QPoint pos(widget->mapToGlobal(me->pos()));
|
||||||
|
|
|
@ -92,7 +92,7 @@ const char *systemVarPrefix = "LINETEST";
|
||||||
#else
|
#else
|
||||||
const char *applicationName = "OpenToonz";
|
const char *applicationName = "OpenToonz";
|
||||||
const char *applicationVersion = "1.1";
|
const char *applicationVersion = "1.1";
|
||||||
const char *applicationRevision = "2";
|
const char *applicationRevision = "3";
|
||||||
const char *dllRelativePath = "./toonz6.app/Contents/Frameworks";
|
const char *dllRelativePath = "./toonz6.app/Contents/Frameworks";
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -105,7 +105,7 @@ TEnv::IntVar EnvSoftwareCurrentFontSize("SoftwareCurrentFontSize", 12);
|
||||||
TEnv::StringVar EnvSoftwareCurrentFontWeight("SoftwareCurrentFontWeightIsBold",
|
TEnv::StringVar EnvSoftwareCurrentFontWeight("SoftwareCurrentFontWeightIsBold",
|
||||||
"Yes");
|
"Yes");
|
||||||
|
|
||||||
const char *applicationFullName = "OpenToonz 1.1.2";
|
const char *applicationFullName = "OpenToonz 1.1.3";
|
||||||
const char *rootVarName = "TOONZROOT";
|
const char *rootVarName = "TOONZROOT";
|
||||||
const char *systemVarPrefix = "TOONZ";
|
const char *systemVarPrefix = "TOONZ";
|
||||||
|
|
||||||
|
@ -396,8 +396,8 @@ int main(int argc, char *argv[]) {
|
||||||
fmt.setStencil(true);
|
fmt.setStencil(true);
|
||||||
QGLFormat::setDefaultFormat(fmt);
|
QGLFormat::setDefaultFormat(fmt);
|
||||||
|
|
||||||
// seems this function should be called at all systems
|
// seems this function should be called at all systems
|
||||||
// pheraps in some GLUT-implementations initalization is mere formality
|
// pheraps in some GLUT-implementations initalization is mere formality
|
||||||
#if defined(LINUX) || (defined(_WIN32) && defined(__GNUC__))
|
#if defined(LINUX) || (defined(_WIN32) && defined(__GNUC__))
|
||||||
glutInit(&argc, argv);
|
glutInit(&argc, argv);
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -2272,9 +2272,9 @@ RecentFiles::~RecentFiles() {}
|
||||||
|
|
||||||
void RecentFiles::addFilePath(QString path, FileType fileType) {
|
void RecentFiles::addFilePath(QString path, FileType fileType) {
|
||||||
QList<QString> files =
|
QList<QString> files =
|
||||||
(fileType == Scene) ? m_recentScenes : (fileType == Level)
|
(fileType == Scene)
|
||||||
? m_recentLevels
|
? m_recentScenes
|
||||||
: m_recentFlipbookImages;
|
: (fileType == Level) ? m_recentLevels : m_recentFlipbookImages;
|
||||||
int i;
|
int i;
|
||||||
for (i = 0; i < files.size(); i++)
|
for (i = 0; i < files.size(); i++)
|
||||||
if (files.at(i) == path) files.removeAt(i);
|
if (files.at(i) == path) files.removeAt(i);
|
||||||
|
@ -2399,9 +2399,9 @@ void RecentFiles::saveRecentFiles() {
|
||||||
|
|
||||||
QList<QString> RecentFiles::getFilesNameList(FileType fileType) {
|
QList<QString> RecentFiles::getFilesNameList(FileType fileType) {
|
||||||
QList<QString> files =
|
QList<QString> files =
|
||||||
(fileType == Scene) ? m_recentScenes : (fileType == Level)
|
(fileType == Scene)
|
||||||
? m_recentLevels
|
? m_recentScenes
|
||||||
: m_recentFlipbookImages;
|
: (fileType == Level) ? m_recentLevels : m_recentFlipbookImages;
|
||||||
QList<QString> names;
|
QList<QString> names;
|
||||||
int i;
|
int i;
|
||||||
for (i = 0; i < files.size(); i++) {
|
for (i = 0; i < files.size(); i++) {
|
||||||
|
@ -2428,9 +2428,9 @@ void RecentFiles::refreshRecentFilesMenu(FileType fileType) {
|
||||||
menu->setEnabled(false);
|
menu->setEnabled(false);
|
||||||
else {
|
else {
|
||||||
CommandId clearActionId =
|
CommandId clearActionId =
|
||||||
(fileType == Scene) ? MI_ClearRecentScene : (fileType == Level)
|
(fileType == Scene)
|
||||||
? MI_ClearRecentLevel
|
? MI_ClearRecentScene
|
||||||
: MI_ClearRecentImage;
|
: (fileType == Level) ? MI_ClearRecentLevel : MI_ClearRecentImage;
|
||||||
menu->setActions(names);
|
menu->setActions(names);
|
||||||
menu->addSeparator();
|
menu->addSeparator();
|
||||||
QAction *clearAction = CommandManager::instance()->getAction(clearActionId);
|
QAction *clearAction = CommandManager::instance()->getAction(clearActionId);
|
||||||
|
|
|
@ -42,14 +42,16 @@ KeyframeNavigator::KeyframeNavigator(QWidget *parent, TFrameHandle *frameHandle)
|
||||||
|
|
||||||
setObjectName("keyFrameNavigator");
|
setObjectName("keyFrameNavigator");
|
||||||
|
|
||||||
QPixmap emptyPrevPixmap(23, 23); // set transparent icon to show button's background
|
QPixmap emptyPrevPixmap(
|
||||||
|
23, 23); // set transparent icon to show button's background
|
||||||
emptyPrevPixmap.fill(Qt::transparent);
|
emptyPrevPixmap.fill(Qt::transparent);
|
||||||
QIcon emptyPrevIcon(emptyPrevPixmap);
|
QIcon emptyPrevIcon(emptyPrevPixmap);
|
||||||
|
|
||||||
m_actPreviewKey = new QAction(emptyPrevIcon, tr("Previous Key"), this);
|
m_actPreviewKey = new QAction(emptyPrevIcon, tr("Previous Key"), this);
|
||||||
connect(m_actPreviewKey, SIGNAL(triggered()), SLOT(togglePrevKeyAct()));
|
connect(m_actPreviewKey, SIGNAL(triggered()), SLOT(togglePrevKeyAct()));
|
||||||
addAction(m_actPreviewKey);
|
addAction(m_actPreviewKey);
|
||||||
QWidget* prevWidget = widgetForAction(m_actPreviewKey); // obtain a widget generated from QAction
|
QWidget *prevWidget = widgetForAction(
|
||||||
|
m_actPreviewKey); // obtain a widget generated from QAction
|
||||||
prevWidget->setObjectName("PreviousKey");
|
prevWidget->setObjectName("PreviousKey");
|
||||||
|
|
||||||
m_actKeyNo = new QAction(createQIconPNG("key_no"), tr("Set Key"), this);
|
m_actKeyNo = new QAction(createQIconPNG("key_no"), tr("Set Key"), this);
|
||||||
|
@ -65,14 +67,16 @@ KeyframeNavigator::KeyframeNavigator(QWidget *parent, TFrameHandle *frameHandle)
|
||||||
connect(m_actKeyTotal, SIGNAL(triggered()), SLOT(toggleKeyAct()));
|
connect(m_actKeyTotal, SIGNAL(triggered()), SLOT(toggleKeyAct()));
|
||||||
addAction(m_actKeyTotal);
|
addAction(m_actKeyTotal);
|
||||||
|
|
||||||
QPixmap emptyNextPixmap(23, 23); // set transparent icon to show button's background
|
QPixmap emptyNextPixmap(
|
||||||
|
23, 23); // set transparent icon to show button's background
|
||||||
emptyNextPixmap.fill(Qt::transparent);
|
emptyNextPixmap.fill(Qt::transparent);
|
||||||
QIcon emptyNextIcon(emptyNextPixmap);
|
QIcon emptyNextIcon(emptyNextPixmap);
|
||||||
|
|
||||||
m_actNextKey = new QAction(emptyNextIcon, tr("Next Key"), this);
|
m_actNextKey = new QAction(emptyNextIcon, tr("Next Key"), this);
|
||||||
connect(m_actNextKey, SIGNAL(triggered()), SLOT(toggleNextKeyAct()));
|
connect(m_actNextKey, SIGNAL(triggered()), SLOT(toggleNextKeyAct()));
|
||||||
addAction(m_actNextKey);
|
addAction(m_actNextKey);
|
||||||
QWidget* nextWidget = widgetForAction(m_actNextKey); // obtain a widget generated from QAction
|
QWidget *nextWidget =
|
||||||
|
widgetForAction(m_actNextKey); // obtain a widget generated from QAction
|
||||||
nextWidget->setObjectName("NextKey");
|
nextWidget->setObjectName("NextKey");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue