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

Changed default resolution to 1920 x 1080 (#385)

Browse source 
* Changed default resolution

* Resizes view to fit the window on the first time it is shown only.  Otherwise new resolution may seem too big.
This commit is contained in:
turtletooth 2016-06-07 02:46:11 -06:00 committed by Keisuke Ogaki
parent 09a48e32a3
commit 1526ec939f
8 changed files with 18 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
stuff/projects/reslist.txt
View file

@ -88,4 +88,6 @@ Anamorphic Un-squeezed 2K, 1828x778, 2.35
Anamorphic Un-squeezed 4K, 3656x1556, 2.35 Anamorphic Un-squeezed 4K, 3656x1556, 2.35
DCI 2K, 2048x1080, 256/135
DCI 4K, 4096x2160, 256/135

3
toonz/sources/common/tvrender/tsimplecolorstyles.cpp
View file

@ -1007,7 +1007,8 @@ void TRasterImagePatternStrokeStyle::loadLevel(const std::string &patternName)
glContext = new TOfflineGL(ras->getSize()); glContext = new TOfflineGL(ras->getSize());
// camera di default 640x480. probabilmente non e' la scelta // camera di default 640x480. probabilmente non e' la scelta
// migliore. // migliore.
TDimension cameraSize(768, 576); //TDimension cameraSize(768, 576);
TDimension cameraSize(1920, 1080);
// definisco i renderdata // definisco i renderdata
const TVectorRenderData rd( const TVectorRenderData rd(

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

@ -22,7 +22,7 @@ class TOStream;
//============================================================================= //=============================================================================
//!The TCamera class provides a camera and allows its management. //!The TCamera class provides a camera and allows its management.
/*!A camera is specified by size, getSize() and resolution, getRes(). /*!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 The class moreover gives methods to know camera Dpi getDpi(), camera aspect ratio
getAspectRatio() and stage rect getStageRect(). getAspectRatio() and stage rect getStageRect().
@ -40,6 +40,7 @@ class DVAPI TCamera
public: public:
/*! /*!
Constructs TCamera with default value, size (12,9) and resolution (768,576). 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(); TCamera();

3
toonz/sources/toonz/iocommand.cpp
View file

@ -1324,7 +1324,8 @@ void IoCmd::newScene()
TImageStyle::setCurrentScene(scene); TImageStyle::setCurrentScene(scene);
TCamera *camera = scene->getCurrentCamera(); TCamera *camera = scene->getCurrentCamera();
TDimension res(768, 576); TDimension res(1920, 1080);
//TDimension res(768, 576);
camera->setRes(res); camera->setRes(res);
camera->setSize(TDimensionD((double)res.lx / cameraDpi, (double)res.ly / cameraDpi)); camera->setSize(TDimensionD((double)res.lx / cameraDpi, (double)res.ly / cameraDpi));
scene->getProperties()->setBgColor(TPixel32::White); scene->getProperties()->setBgColor(TPixel32::White);

5
toonz/sources/toonz/sceneviewer.cpp
View file

@ -836,6 +836,11 @@ void SceneViewer::showEvent(QShowEvent *)
m_vRuler->show(); m_vRuler->show();
} }
} }
if (m_shownOnce == false)
{
fitToCamera();
m_shownOnce = true;
}
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------

2
toonz/sources/toonz/sceneviewer.h
View file

@ -71,7 +71,7 @@ class SceneViewer : public QGLWidget, public TTool::Viewer, public Previewer::Li
bool m_tabletEvent; bool m_tabletEvent;
//used to handle wrong mouse drag events! //used to handle wrong mouse drag events!
bool m_buttonClicked; bool m_buttonClicked;
bool m_shownOnce = false;
int m_referenceMode; int m_referenceMode;
int m_previewMode; int m_previewMode;
bool m_isMouseEntered, m_forceGlFlush; bool m_isMouseEntered, m_forceGlFlush;

3
toonz/sources/toonzlib/tcamera.cpp
View file

@ -9,7 +9,8 @@
// TCamera // TCamera
TCamera::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)
{ {
} }

3
toonz/sources/toonzlib/txshsimplelevel.cpp
View file

@ -767,7 +767,8 @@ TImageP buildIcon(const TImageP &img, const TDimension &size)
TRaster32P raster(size); TRaster32P raster(size);
if (TVectorImageP vi = img) { if (TVectorImageP vi = img) {
TOfflineGL *glContext = new TOfflineGL(size); TOfflineGL *glContext = new TOfflineGL(size);
TDimension cameraSize(768, 576); //TDimension cameraSize(768, 576);
TDimension cameraSize(1920, 1080);
TPalette *vPalette = img->getPalette(); TPalette *vPalette = img->getPalette();
assert(vPalette); assert(vPalette);
const TVectorRenderData rd( const TVectorRenderData rd(