diff --git a/stuff/projects/reslist.txt b/stuff/projects/reslist.txt index e59a3a2..79c5b48 100644 --- a/stuff/projects/reslist.txt +++ b/stuff/projects/reslist.txt @@ -88,4 +88,6 @@ Anamorphic Un-squeezed 2K, 1828x778, 2.35 Anamorphic Un-squeezed 4K, 3656x1556, 2.35 +DCI 2K, 2048x1080, 256/135 +DCI 4K, 4096x2160, 256/135 diff --git a/toonz/sources/common/tvrender/tsimplecolorstyles.cpp b/toonz/sources/common/tvrender/tsimplecolorstyles.cpp index 1f1036d..fada036 100644 --- a/toonz/sources/common/tvrender/tsimplecolorstyles.cpp +++ b/toonz/sources/common/tvrender/tsimplecolorstyles.cpp @@ -1007,7 +1007,8 @@ void TRasterImagePatternStrokeStyle::loadLevel(const std::string &patternName) glContext = new TOfflineGL(ras->getSize()); // camera di default 640x480. probabilmente non e' la scelta // migliore. - TDimension cameraSize(768, 576); + //TDimension cameraSize(768, 576); + TDimension cameraSize(1920, 1080); // definisco i renderdata const TVectorRenderData rd( diff --git a/toonz/sources/include/toonz/tcamera.h b/toonz/sources/include/toonz/tcamera.h index f50185d..3edd98e 100644 --- a/toonz/sources/include/toonz/tcamera.h +++ b/toonz/sources/include/toonz/tcamera.h @@ -22,7 +22,7 @@ class TOStream; //============================================================================= //!The TCamera class provides a camera and allows its management. /*!A camera is specified by size, getSize() and resolution, getRes(). - It can be changed using the setSize(), setRes() functions. + It can be changed using the setSize(), setRes() functions.tcamera The class moreover gives methods to know camera Dpi getDpi(), camera aspect ratio getAspectRatio() and stage rect getStageRect(). @@ -40,6 +40,7 @@ class DVAPI TCamera public: /*! Constructs TCamera with default value, size (12,9) and resolution (768,576). + Constructs TCamera with default value, size (12,9) and resolution (1920,1080). - 05/31/16 */ TCamera(); diff --git a/toonz/sources/toonz/iocommand.cpp b/toonz/sources/toonz/iocommand.cpp index f0169b3..2de1780 100644 --- a/toonz/sources/toonz/iocommand.cpp +++ b/toonz/sources/toonz/iocommand.cpp @@ -1324,7 +1324,8 @@ void IoCmd::newScene() TImageStyle::setCurrentScene(scene); TCamera *camera = scene->getCurrentCamera(); - TDimension res(768, 576); + TDimension res(1920, 1080); + //TDimension res(768, 576); camera->setRes(res); camera->setSize(TDimensionD((double)res.lx / cameraDpi, (double)res.ly / cameraDpi)); scene->getProperties()->setBgColor(TPixel32::White); diff --git a/toonz/sources/toonz/sceneviewer.cpp b/toonz/sources/toonz/sceneviewer.cpp index 6bbad84..b63769d 100644 --- a/toonz/sources/toonz/sceneviewer.cpp +++ b/toonz/sources/toonz/sceneviewer.cpp @@ -836,6 +836,11 @@ void SceneViewer::showEvent(QShowEvent *) m_vRuler->show(); } } + if (m_shownOnce == false) + { + fitToCamera(); + m_shownOnce = true; + } } //----------------------------------------------------------------------------- diff --git a/toonz/sources/toonz/sceneviewer.h b/toonz/sources/toonz/sceneviewer.h index 08cab2a..0f9a75d 100644 --- a/toonz/sources/toonz/sceneviewer.h +++ b/toonz/sources/toonz/sceneviewer.h @@ -71,7 +71,7 @@ class SceneViewer : public QGLWidget, public TTool::Viewer, public Previewer::Li bool m_tabletEvent; //used to handle wrong mouse drag events! bool m_buttonClicked; - + bool m_shownOnce = false; int m_referenceMode; int m_previewMode; bool m_isMouseEntered, m_forceGlFlush; diff --git a/toonz/sources/toonzlib/tcamera.cpp b/toonz/sources/toonzlib/tcamera.cpp index 9dd69c6..368e486 100644 --- a/toonz/sources/toonzlib/tcamera.cpp +++ b/toonz/sources/toonzlib/tcamera.cpp @@ -9,7 +9,8 @@ // TCamera TCamera::TCamera() - : m_size(12, 9), m_res(768, 576), m_xPrevalence(true) + //: m_size(12, 9), m_res(768, 576), m_xPrevalence(true) + : m_size(30, 16.875), m_res(1920, 1080), m_xPrevalence(true) { } diff --git a/toonz/sources/toonzlib/txshsimplelevel.cpp b/toonz/sources/toonzlib/txshsimplelevel.cpp index 55a7404..1e4b468 100644 --- a/toonz/sources/toonzlib/txshsimplelevel.cpp +++ b/toonz/sources/toonzlib/txshsimplelevel.cpp @@ -767,7 +767,8 @@ TImageP buildIcon(const TImageP &img, const TDimension &size) TRaster32P raster(size); if (TVectorImageP vi = img) { TOfflineGL *glContext = new TOfflineGL(size); - TDimension cameraSize(768, 576); + //TDimension cameraSize(768, 576); + TDimension cameraSize(1920, 1080); TPalette *vPalette = img->getPalette(); assert(vPalette); const TVectorRenderData rd(