Move hardcoded cutscene FOV to a config file

This commit is contained in:
auria.mg 2016-06-23 19:10:56 -04:00
parent c17070209d
commit f90703beb6
4 changed files with 6 additions and 2 deletions

View File

@ -118,7 +118,7 @@
<!-- The field od views for 1-4 player split screen. fov-3 is <!-- The field od views for 1-4 player split screen. fov-3 is
actually not used (since 3 player split screen uses the actually not used (since 3 player split screen uses the
same layout as 4 player split screen) --> same layout as 4 player split screen) -->
<camera fov-1="80" fov-2="65" fov-3="50" fov-4="75" /> <camera fov-1="80" fov-2="65" fov-3="50" fov-4="75" cutscene-fov="0.61" />
<!-- disable-while-unskid: Disable steering when stop skidding during <!-- disable-while-unskid: Disable steering when stop skidding during
the time it takes to adjust the physical body with the graphics. the time it takes to adjust the physical body with the graphics.

View File

@ -177,6 +177,7 @@ void STKConfig::init_defaults()
m_ai_acceleration = 1.0f; m_ai_acceleration = 1.0f;
m_disable_steer_while_unskid = false; m_disable_steer_while_unskid = false;
m_camera_follow_skid = false; m_camera_follow_skid = false;
m_cutscene_fov = 0.61f;
m_score_increase.clear(); m_score_increase.clear();
m_leader_intervals.clear(); m_leader_intervals.clear();
@ -264,6 +265,7 @@ void STKConfig::getAllData(const XMLNode * root)
camera->get("fov-2", &m_camera_fov[1]); camera->get("fov-2", &m_camera_fov[1]);
camera->get("fov-3", &m_camera_fov[2]); camera->get("fov-3", &m_camera_fov[2]);
camera->get("fov-4", &m_camera_fov[3]); camera->get("fov-4", &m_camera_fov[3]);
camera->get("cutscene-fov", &m_cutscene_fov);
} }
if (const XMLNode *music_node = root->getNode("music")) if (const XMLNode *music_node = root->getNode("music"))

View File

@ -143,6 +143,8 @@ public:
/** The field of view for 1, 2, 3, 4 player split screen. */ /** The field of view for 1, 2, 3, 4 player split screen. */
float m_camera_fov[4]; float m_camera_fov[4];
float m_cutscene_fov;
/** File names of the default fonts in STK. */ /** File names of the default fonts in STK. */
std::string m_font_default; std::string m_font_default;
std::string m_font_default_fallback; std::string m_font_default_fallback;

View File

@ -80,7 +80,7 @@ void CutsceneWorld::init()
Camera* stk_cam = Camera::createCamera(NULL); Camera* stk_cam = Camera::createCamera(NULL);
m_camera = stk_cam->getCameraSceneNode(); m_camera = stk_cam->getCameraSceneNode();
m_camera->setFOV(0.61f); m_camera->setFOV(stk_config->m_cutscene_fov);
m_camera->bindTargetAndRotation(true); // no "look-at" m_camera->bindTargetAndRotation(true); // no "look-at"
// --- Build list of sounds to play at certain frames // --- Build list of sounds to play at certain frames