-
Notifications
You must be signed in to change notification settings - Fork 272
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
5 changed files
with
29 additions
and
36 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -29,48 +29,48 @@ class ObjectData | |
public: | ||
ObjectData(); | ||
|
||
void setCurrentFrame( int n ) { mCurrentFrame = n; } | ||
This comment has been minimized.
Sorry, something went wrong.
scribblemaniac
Member
|
||
int getCurrentFrame() const { return mCurrentFrame; } | ||
void setCurrentFrame(int n) { mCurrentFrame = n; } | ||
int getCurrentFrame() const { return mCurrentFrame; } | ||
|
||
void setCurrentColor( QColor c ) { mCurrentColor = c; } | ||
QColor getCurrentColor() const { return mCurrentColor; } | ||
void setCurrentColor(QColor c) { mCurrentColor = c; } | ||
QColor getCurrentColor() const { return mCurrentColor; } | ||
|
||
void setCurrentLayer( int n ) { mCurrentLayer = n; } | ||
int getCurrentLayer() const { return mCurrentLayer; } | ||
void setCurrentLayer(int n) { mCurrentLayer = n; } | ||
int getCurrentLayer() const { return mCurrentLayer; } | ||
|
||
void setCurrentView( QTransform t ) { mCurrentView = t; } | ||
QTransform getCurrentView() const { return mCurrentView; } | ||
void setCurrentView(QTransform t) { mCurrentView = t; } | ||
QTransform getCurrentView() const { return mCurrentView; } | ||
|
||
void setFrameRate( int n ) { mFps = n; } | ||
int getFrameRate() const { return mFps; } | ||
|
||
void setLooping( bool b ) { mIsLoop = b; } | ||
bool isLooping() const { return mIsLoop; } | ||
void setFrameRate(int n) { mFps = n; } | ||
int getFrameRate() const { return mFps; } | ||
|
||
void setRangedPlayback( bool b ) { mIsRangedPlayback = b; } | ||
bool isRangedPlayback() const { return mIsRangedPlayback; } | ||
void setLooping(bool b) { mIsLoop = b; } | ||
bool isLooping() const { return mIsLoop; } | ||
|
||
void setMarkInFrameNumber( int n ) { mMarkInFrame = n; } | ||
int getMarkInFrameNumber() const { return mMarkInFrame; } | ||
void setRangedPlayback(bool b) { mIsRangedPlayback = b; } | ||
bool isRangedPlayback() const { return mIsRangedPlayback; } | ||
|
||
void setMarkOutFrameNumber( int n ) { mMarkOutFrame = n; } | ||
int getMarkOutFrameNumber() const { return mMarkOutFrame; } | ||
void setMarkInFrameNumber(int n) { mMarkInFrame = n; } | ||
int getMarkInFrameNumber() const { return mMarkInFrame; } | ||
|
||
void setMarkOutFrameNumber(int n) { mMarkOutFrame = n; } | ||
int getMarkOutFrameNumber() const { return mMarkOutFrame; } | ||
|
||
private: | ||
int mCurrentFrame = 1; | ||
int mCurrentFrame = 1; | ||
QColor mCurrentColor{ 0, 0, 0, 255 }; | ||
int mCurrentLayer = 2; // Layers are counted bottom up | ||
int mCurrentLayer = 2; // Layers are counted bottom up | ||
// 0 - Camera Layer | ||
// 1 - Vector Layer | ||
// 2 - Bitmap Layer | ||
// view manager | ||
QTransform mCurrentView; | ||
|
||
// playback manager | ||
int mFps = 12; | ||
bool mIsLoop = false; | ||
bool mIsRangedPlayback = false; | ||
int mMarkInFrame = 1; | ||
int mMarkInFrame = 1; | ||
int mMarkOutFrame = 10; | ||
|
||
}; | ||
|
That was there for a reason. Now, it will produce a warning because the parameter o is unused.