Initialise mFps. Make field W+H member vars

pencil2d · Dec 16, 2018 · 410f2dd · 410f2dd
1 parent b8f80b8
commit 410f2dd
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git a/core_lib/src/managers/playbackmanager.h b/core_lib/src/managers/playbackmanager.h
@@ -84,7 +84,7 @@ class PlaybackManager : public BaseManager
     int mMarkOutFrame = 10;
     int mActiveSoundFrame = 0;
 
-    int mFps;
+    int mFps = 12;
 
     QTimer* mTimer = nullptr;
     QElapsedTimer* mElapsedTimer = nullptr;

diff --git a/core_lib/src/structure/layercamera.cpp b/core_lib/src/structure/layercamera.cpp
@@ -79,14 +79,14 @@ LayerCamera::LayerCamera( Object* object ) : Layer( object, Layer::CAMERA )
 {
     setName(tr("Camera Layer"));
     QSettings settings (PENCIL2D, PENCIL2D);
-    int fieldW = settings.value("FieldW").toInt();
-    int fieldH = settings.value("FieldH").toInt();
-    if (fieldW < 2)
+    mFieldW = settings.value("FieldW").toInt();
+    mFieldH = settings.value("FieldH").toInt();
+    if (mFieldW < 2 || mFieldH < 2)
     {
-        fieldW = 800;
-        fieldH = 600;
+        mFieldW = 800;
+        mFieldH = 600;
     }
-    viewRect = QRect(QPoint(-fieldW/2, -fieldH/2), QSize(fieldW, fieldH));
+    viewRect = QRect(QPoint(-mFieldW/2, -mFieldH/2), QSize(mFieldW, mFieldH));
     dialog = nullptr;
 }
 

diff --git a/core_lib/src/structure/layercamera.h b/core_lib/src/structure/layercamera.h
@@ -77,6 +77,8 @@ class LayerCamera : public Layer
 private:
     void linearInterpolateTransform(Camera*);
 
+    int mFieldW = 800;
+    int mFieldH = 600;
     QRect viewRect;
     CameraPropertiesDialog* dialog = nullptr;
 };

diff --git a/core_lib/src/structure/objectdata.h b/core_lib/src/structure/objectdata.h
@@ -67,7 +67,7 @@ class ObjectData
     QTransform mCurrentView;
 
     // playback manager
-    int  mFps;
+    int  mFps = 12;
     bool mIsLoop = false;
     bool mIsRangedPlayback = false;
     int  mMarkInFrame  = 1;