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

V1.1.3 (#1255)

Browse source
This commit is contained in:
shun-iwasawa 2017-06-06 21:19:00 +09:00 committed by GitHub
parent 2fb6b9308a
commit 5b7b9fb309
14 changed files with 56 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
toonz/sources/include/tdoubleparam.h
View file

@ -156,8 +156,7 @@ public:
std::string getValueAlias(double frame, int precision) override;
};
DVAPI void splitSpeedInOutSegment(TDoubleKeyframe &k,
TDoubleKeyframe &k0,
DVAPI void splitSpeedInOutSegment(TDoubleKeyframe &k, TDoubleKeyframe &k0,
TDoubleKeyframe &k1);
//---------------------------------------------------------

3
toonz/sources/include/tpersist.h
View file

@ -142,9 +142,10 @@ public:
class TPersistDeclarationT
*/
#define PERSIST_DECLARATION(T) \
\
private: \
static TPersistDeclarationT<T> m_declaration; \
\
\
public: \
const TPersistDeclaration *getDeclaration() const override { \
return &m_declaration; \

3
toonz/sources/include/tpixelutils.h
View file

@ -230,8 +230,7 @@ inline TPixel32 quickOverPix(const TPixel32 &bot, const TPixel32 &top) {
//-----------------------------------------------------------------------------
inline TPixel32 quickOverPixPremult(const TPixel32 &bot,
const TPixel32 &top) {
inline TPixel32 quickOverPixPremult(const TPixel32 &bot, const TPixel32 &top) {
return quickOverPixPremultT<TPixel32, UCHAR>(bot, top);
}

1
toonz/sources/include/traster.h
View file

@ -62,7 +62,6 @@ class TRasterPT;
class TRaster;
typedef TSmartPointerT<TRaster> TRasterP;
//------------------------------------------------------------
//

3
toonz/sources/include/trenderresourcemanager.h
View file

@ -132,10 +132,11 @@ static TRenderResourceManagerGenerator* gen();
*/
#define T_RENDER_RESOURCE_MANAGER \
\
public: \
static TRenderResourceManagerGenerator *gen(); \
static TRenderResourceManagerGenerator *deps(); \
\
\
private:
//--------------------------------------------------------------------------------

2
toonz/sources/include/trop_borders.h
View file

@ -165,7 +165,6 @@ class ImageMesh final : public TSmartObject,
public tcg::Mesh<Vertex, Edge, Face> {};
//--------------------------------------------------------------------------------
}
} // namespace TRop::borders
@ -267,7 +266,6 @@ void readMeshes(const TRasterPT<Pixel> &raster,
ImageMeshesReaderT<Pixel> &reader);
//--------------------------------------------------------------------------------
}
} // namespace TRop::borders

3
toonz/sources/include/tsmartpointer.h
View file

@ -87,9 +87,10 @@ private:
};
#define DECLARE_CLASS_CODE \
\
private: \
static const TSmartObject::ClassCode m_classCode; \
\
\
public: \
inline static TINT32 getInstanceCount() { \
return TSmartObject::getInstanceCount(m_classCode); \

6
toonz/sources/include/tsound_t.h
View file

@ -133,10 +133,10 @@ from which it's created.It hasn't reference to the object.
*dstSample++ = *srcSample++;
}
//----------------------------------------------------------------------------
//----------------------------------------------------------------------------
//! Applies a trasformation (echo, reverb, ect) to the object and returns the
//! transformed soundtrack
//! Applies a trasformation (echo, reverb, ect) to the object and returns the
//! transformed soundtrack
TSoundTrackP apply(TSoundTransform *transform) override;
//----------------------------------------------------------------------------

44
toonz/sources/stdfx/igs_resource_msg_from_err_win.h
View file

@ -61,29 +61,29 @@ const std::string msg_from_err_(/* 直によんではいけない */
}
/*--- ::GetLastError()値からエラーメッセージを得る ---*/
#ifdef _MSC_VER
#define igs_resource_msg_from_err(tit, error_message_id) \
igs::resource::msg_from_err_( \
tit, error_message_id, TEXT(__FILE__), TEXT(igs_tostr(__LINE__)), \
TEXT(__FUNCSIG__), TEXT(igs_tostr_(_MSC_VER)), \
TEXT(igs_tostr(_MSC_FULL_VER)), TEXT(__DATE__), TEXT(__TIME__))
/*--- エラーメッセージを得る ---*/
#define igs_resource_msg_from_er(tit) \
igs::resource::msg_from_err_( \
tit, NO_ERROR, TEXT(__FILE__), TEXT(igs_tostr(__LINE__)), \
TEXT(__FUNCSIG__), TEXT(igs_tostr_(_MSC_VER)), \
TEXT(igs_tostr(_MSC_FULL_VER)), TEXT(__DATE__), TEXT(__TIME__))
#define igs_resource_msg_from_err(tit, error_message_id) \
igs::resource::msg_from_err_( \
tit, error_message_id, TEXT(__FILE__), TEXT(igs_tostr(__LINE__)), \
TEXT(__FUNCSIG__), TEXT(igs_tostr_(_MSC_VER)), \
TEXT(igs_tostr(_MSC_FULL_VER)), TEXT(__DATE__), TEXT(__TIME__))
/*--- エラーメッセージを得る ---*/
#define igs_resource_msg_from_er(tit) \
igs::resource::msg_from_err_( \
tit, NO_ERROR, TEXT(__FILE__), TEXT(igs_tostr(__LINE__)), \
TEXT(__FUNCSIG__), TEXT(igs_tostr_(_MSC_VER)), \
TEXT(igs_tostr(_MSC_FULL_VER)), TEXT(__DATE__), TEXT(__TIME__))
#else
#define igs_resource_msg_from_err(tit, error_message_id) \
igs::resource::msg_from_err_( \
tit, error_message_id, TEXT(__FILE__), TEXT(igs_tostr(__LINE__)), \
TEXT(__PRETTY_FUNCTION__), TEXT(__VERSION__), \
TEXT(__VERSION__), TEXT(__DATE__), TEXT(__TIME__))
/*--- エラーメッセージを得る ---*/
#define igs_resource_msg_from_er(tit) \
igs::resource::msg_from_err_( \
tit, NO_ERROR, TEXT(__FILE__), TEXT(igs_tostr(__LINE__)), \
TEXT(__PRETTY_FUNCTION__), TEXT(__VERSION__), \
TEXT(__VERSION__), TEXT(__DATE__), TEXT(__TIME__))
#define igs_resource_msg_from_err(tit, error_message_id) \
igs::resource::msg_from_err_( \
tit, error_message_id, TEXT(__FILE__), TEXT(igs_tostr(__LINE__)), \
TEXT(__PRETTY_FUNCTION__), TEXT(__VERSION__), TEXT(__VERSION__), \
TEXT(__DATE__), TEXT(__TIME__))
/*--- エラーメッセージを得る ---*/
#define igs_resource_msg_from_er(tit) \
igs::resource::msg_from_err_( \
tit, NO_ERROR, TEXT(__FILE__), TEXT(igs_tostr(__LINE__)), \
TEXT(__PRETTY_FUNCTION__), TEXT(__VERSION__), TEXT(__VERSION__), \
TEXT(__DATE__), TEXT(__TIME__))
#endif
#endif /* !igs_resource_msg_from_err_h */

1
toonz/sources/stdfx/stdfx.h
View file

@ -15,6 +15,7 @@ class PaletteFilterFxRenderData;
static const std::string PLUGIN_PREFIX("STD");
#define FX_PLUGIN_DECLARATION(T) \
\
public: \
const TPersistDeclaration *getDeclaration() const override;

2
toonz/sources/tnztools/screenpicker.cpp
View file

@ -64,7 +64,7 @@ void ScreenPicker::mousePressEvent(QWidget *widget, QMouseEvent *me) {
void ScreenPicker::mouseMoveEvent(QWidget *widget, QMouseEvent *me) {
// 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;
QPoint pos(widget->mapToGlobal(me->pos()));

8
toonz/sources/toonz/main.cpp
View file

@ -92,7 +92,7 @@ const char *systemVarPrefix = "LINETEST";
#else
const char *applicationName = "OpenToonz";
const char *applicationVersion = "1.1";
const char *applicationRevision = "2";
const char *applicationRevision = "3";
const char *dllRelativePath = "./toonz6.app/Contents/Frameworks";
#endif
@ -105,7 +105,7 @@ TEnv::IntVar EnvSoftwareCurrentFontSize("SoftwareCurrentFontSize", 12);
TEnv::StringVar EnvSoftwareCurrentFontWeight("SoftwareCurrentFontWeightIsBold",
"Yes");
const char *applicationFullName = "OpenToonz 1.1.2";
const char *applicationFullName = "OpenToonz 1.1.3";
const char *rootVarName = "TOONZROOT";
const char *systemVarPrefix = "TOONZ";
@ -396,8 +396,8 @@ int main(int argc, char *argv[]) {
fmt.setStencil(true);
QGLFormat::setDefaultFormat(fmt);
// seems this function should be called at all systems
// pheraps in some GLUT-implementations initalization is mere formality
// seems this function should be called at all systems
// pheraps in some GLUT-implementations initalization is mere formality
#if defined(LINUX) || (defined(_WIN32) && defined(__GNUC__))
glutInit(&argc, argv);
#endif

18
toonz/sources/toonz/mainwindow.cpp
View file

@ -2272,9 +2272,9 @@ RecentFiles::~RecentFiles() {}
void RecentFiles::addFilePath(QString path, FileType fileType) {
QList<QString> files =
(fileType == Scene) ? m_recentScenes : (fileType == Level)
? m_recentLevels
: m_recentFlipbookImages;
(fileType == Scene)
? m_recentScenes
: (fileType == Level) ? m_recentLevels : m_recentFlipbookImages;
int i;
for (i = 0; i < files.size(); i++)
if (files.at(i) == path) files.removeAt(i);
@ -2399,9 +2399,9 @@ void RecentFiles::saveRecentFiles() {
QList<QString> RecentFiles::getFilesNameList(FileType fileType) {
QList<QString> files =
(fileType == Scene) ? m_recentScenes : (fileType == Level)
? m_recentLevels
: m_recentFlipbookImages;
(fileType == Scene)
? m_recentScenes
: (fileType == Level) ? m_recentLevels : m_recentFlipbookImages;
QList<QString> names;
int i;
for (i = 0; i < files.size(); i++) {
@ -2428,9 +2428,9 @@ void RecentFiles::refreshRecentFilesMenu(FileType fileType) {
menu->setEnabled(false);
else {
CommandId clearActionId =
(fileType == Scene) ? MI_ClearRecentScene : (fileType == Level)
? MI_ClearRecentLevel
: MI_ClearRecentImage;
(fileType == Scene)
? MI_ClearRecentScene
: (fileType == Level) ? MI_ClearRecentLevel : MI_ClearRecentImage;
menu->setActions(names);
menu->addSeparator();
QAction *clearAction = CommandManager::instance()->getAction(clearActionId);

12
toonz/sources/toonzqt/keyframenavigator.cpp
View file

@ -42,14 +42,16 @@ KeyframeNavigator::KeyframeNavigator(QWidget *parent, TFrameHandle *frameHandle)
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);
QIcon emptyPrevIcon(emptyPrevPixmap);
m_actPreviewKey = new QAction(emptyPrevIcon, tr("Previous Key"), this);
connect(m_actPreviewKey, SIGNAL(triggered()), SLOT(togglePrevKeyAct()));
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");
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()));
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);
QIcon emptyNextIcon(emptyNextPixmap);
m_actNextKey = new QAction(emptyNextIcon, tr("Next Key"), this);
connect(m_actNextKey, SIGNAL(triggered()), SLOT(toggleNextKeyAct()));
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");
}