From 49d190defe437e86b9766200ad8702eef2add1e5 Mon Sep 17 00:00:00 2001 From: auria Date: Thu, 16 Feb 2012 00:41:45 +0000 Subject: [PATCH] Work on little cutscene where you earn a trophy git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10858 178a84e3-b1eb-0310-8ba1-8eac791a3b58 --- data/models/trophy_bronze.b3d | Bin 85843 -> 85843 bytes data/models/trophy_gold.b3d | Bin 85841 -> 85841 bytes data/models/trophy_silver.b3d | Bin 85843 -> 85843 bytes src/states_screens/feature_unlocked.cpp | 16 ++++++++++------ 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/data/models/trophy_bronze.b3d b/data/models/trophy_bronze.b3d index f58fd155ba3ad7c88717ab3854b2283b6952e809..fe5d3c29c63c2b1b44c20f528f3b966665eb24a7 100644 GIT binary patch delta 23 fcmcaSkM;6A)(IW#Z)EmVykOne*uS-(@rWM)iV6!_ delta 23 fcmcaSkM;6A)(IW#3=15N_P@4o?BCkYc*G9?f%yv2 diff --git a/data/models/trophy_gold.b3d b/data/models/trophy_gold.b3d index 3ff39676b91012a0530cac5cd5e5bb34b65bbb3b..88039ce821de0193c70b7dc44f03ec044cb519dc 100644 GIT binary patch delta 23 fcmcaOkM-g_)(LIwZ)EmVykOne*t@lt@rWM)iGT}G delta 23 fcmcaOkM-g_)(LIw3=15N_P@4o?A_YSc*G9?fo}@O diff --git a/data/models/trophy_silver.b3d b/data/models/trophy_silver.b3d index 6a648af3f6f223f946c24f0ffc7ef4197327eff1..b57585d263bc1d8a0af3fd1c99e0090ea555401f 100644 GIT binary patch delta 23 fcmcaSkM;6A)(IW#Z)EmVykOne*uS-(@rWM)iV6!_ delta 23 fcmcaSkM;6A)(IW#3=15N_P@4o?BCkYc*G9?f%yv2 diff --git a/src/states_screens/feature_unlocked.cpp b/src/states_screens/feature_unlocked.cpp index c9201839f..6320d63f1 100644 --- a/src/states_screens/feature_unlocked.cpp +++ b/src/states_screens/feature_unlocked.cpp @@ -289,6 +289,7 @@ void FeatureUnlockedCutScene::init() if (m_unlocked_stuff[n].m_unlock_model.size() > 0) { m_unlocked_stuff[n].m_root_gift_node = irr_driver->addMesh( irr_driver->getMesh(m_unlocked_stuff[n].m_unlock_model) ); + m_unlocked_stuff[n].m_root_gift_node->setScale( core::vector3df(0.5f, 0.5f, 0.5f) ); } else if (m_unlocked_stuff[n].m_unlocked_kart != NULL) { @@ -451,23 +452,24 @@ void FeatureUnlockedCutScene::onUpdate(float dt, } else { - pos.X += 2.0f*dt; + //pos.X -= 2.0f*dt; } - if (m_global_time > GIFT_EXIT_FROM + 2.0f) pos.Z += 5.0f*dt; + if (m_global_time > GIFT_EXIT_FROM + 2.0f) pos.Z += 6.0f*dt; m_unlocked_stuff[n].m_root_gift_node->setPosition(pos); core::vector3df scale = m_unlocked_stuff[n].m_root_gift_node->getScale(); - scale.X += 2.0f*dt; - scale.Y += 2.0f*dt; - scale.Z += 2.0f*dt; + scale.X += 0.9f*dt; + scale.Y += 0.9f*dt; + scale.Z += 0.9f*dt; m_unlocked_stuff[n].m_root_gift_node->setScale(scale); } core::vector3df campos = m_camera->getPosition(); - campos.X += 2.0f*dt; + campos.X -= 8.0f*dt; + campos.Y += 5.0f*dt; campos.Z += 5.0f*dt; m_camera->setPosition(campos); @@ -483,6 +485,8 @@ void FeatureUnlockedCutScene::onUpdate(float dt, { if (m_unlocked_stuff[n].m_root_gift_node == NULL) continue; + m_unlocked_stuff[n].m_root_gift_node->setRotation(m_unlocked_stuff[n].m_root_gift_node->getRotation() + core::vector3df(0.0f, dt*25.0f, 0.0f)); + if (!m_unlocked_stuff[n].m_pictures.empty()) { const int pictureCount = m_unlocked_stuff[n].m_pictures.size();