ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed funny-colored stuff coming out of the chest (and fixed the network button hack to get there quicker)

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4930 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
auria 2010-03-05 01:42:54 +00:00
parent bdd985c88a
commit c18ba6bc03
3 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/graphics/irr_driver.cpp
View File

@ -529,22 +529,22 @@ scene::IMesh *IrrDriver::createTexturedQuadMesh(const video::SMaterial *material
video::S3DVertex v1; video::S3DVertex v1;
v1.Pos = core::vector3df(-w_2,-h_2,0); v1.Pos = core::vector3df(-w_2,-h_2,0);
v1.Normal = core::vector3df(1/sqrt(2.0f), 1/sqrt(2.0f), 0); // I hope normals are ok... v1.Normal = core::vector3df(0, 0, -1.0f);
v1.TCoords = core::vector2d<f32>(0,1); v1.TCoords = core::vector2d<f32>(0,1);
video::S3DVertex v2; video::S3DVertex v2;
v2.Pos = core::vector3df(w_2,-h_2,0); v2.Pos = core::vector3df(w_2,-h_2,0);
v2.Normal = core::vector3df(1/sqrt(2.0f), 1/sqrt(2.0f), 0); v2.Normal = core::vector3df(0, 0, -1.0f);
v2.TCoords = core::vector2d<f32>(1,1); v2.TCoords = core::vector2d<f32>(1,1);
video::S3DVertex v3; video::S3DVertex v3;
v3.Pos = core::vector3df(w_2,h_2,0); v3.Pos = core::vector3df(w_2,h_2,0);
v3.Normal = core::vector3df(1/sqrt(2.0f), 1/sqrt(2.0f), 0); v3.Normal = core::vector3df(0, 0, -1.0f);
v3.TCoords = core::vector2d<f32>(1,0); v3.TCoords = core::vector2d<f32>(1,0);
video::S3DVertex v4; video::S3DVertex v4;
v4.Pos = core::vector3df(-w_2,h_2,0); v4.Pos = core::vector3df(-w_2,h_2,0);
v4.Normal = core::vector3df(1/sqrt(2.0f), 1/sqrt(2.0f), 0); v4.Normal = core::vector3df(0, 0, -1.0f);
v4.TCoords = core::vector2d<f32>(0,0); v4.TCoords = core::vector2d<f32>(0,0);

7
src/states_screens/feature_unlocked.cpp
View File

@ -109,9 +109,10 @@ void FeatureUnlockedCutScene::init()
m.MaterialType = video::EMT_TRANSPARENT_ALPHA_CHANNEL; m.MaterialType = video::EMT_TRANSPARENT_ALPHA_CHANNEL;
m.BackfaceCulling = false; m.BackfaceCulling = false;
m.setTexture(0, m_unlocked_stuff[n].m_picture); m.setTexture(0, m_unlocked_stuff[n].m_picture);
m.AmbientColor = SColor(255,255,255,255); m.AmbientColor = video::SColor(255, 255, 255, 255);
m.DiffuseColor = SColor(255,255,255,255); m.DiffuseColor = video::SColor(255, 255, 255, 255);
m.SpecularColor = SColor(0,0,0,0); m.EmissiveColor = video::SColor(255, 255, 255, 255);
m.SpecularColor = video::SColor(255, 255, 255, 255);
m.GouraudShading = false; m.GouraudShading = false;
m.Shininess = 0; m.Shininess = 0;
//m.setFlag(video::EMF_TEXTURE_WRAP, false); //m.setFlag(video::EMF_TEXTURE_WRAP, false);

12
src/states_screens/main_menu_screen.cpp
View File

@ -66,12 +66,13 @@ void MainMenuScreen::eventCallback(Widget* widget, const std::string& name, cons
if (selection == "network") if (selection == "network")
{ {
// FIXME : remove, temporary test // FIXME : remove, temporary test
/*
GrandPrixOver* scene = GrandPrixOver::getInstance(); GrandPrixOver* scene = GrandPrixOver::getInstance();
const std::string winners[] = { "mriceblock", "nolok", "pidgin" }; const std::string winners[] = { "mriceblock", "nolok", "pidgin" };
scene->setKarts( winners ); scene->setKarts( winners );
StateManager::get()->pushScreen(scene); StateManager::get()->pushScreen(scene);
*/
/*
FeatureUnlockedCutScene* scene = FeatureUnlockedCutScene::getInstance(); FeatureUnlockedCutScene* scene = FeatureUnlockedCutScene::getInstance();
static int i = 0; static int i = 0;
@ -80,15 +81,16 @@ void MainMenuScreen::eventCallback(Widget* widget, const std::string& name, cons
if (i % 2 == 0) if (i % 2 == 0)
{ {
// the passed kart will not be modified, that's why I allow myself to use const_cast // the passed kart will not be modified, that's why I allow myself to use const_cast
scene->setUnlockedKart( const_cast<KartProperties*>(kart_properties_manager->getKart("gnu")) ); scene->addUnlockedKart( const_cast<KartProperties*>(kart_properties_manager->getKart("gnu")),
L"Unlocked");
StateManager::get()->pushScreen(scene); StateManager::get()->pushScreen(scene);
} }
else else
{ {
scene->setUnlockedPicture( irr_driver->getTexture(track_manager->getTrack("beach")->getScreenshotFile().c_str()) ); scene->addUnlockedPicture( irr_driver->getTexture(track_manager->getTrack("beach")->getScreenshotFile().c_str()),
1.0, 0.75, L"You did it");
StateManager::get()->pushScreen(scene); StateManager::get()->pushScreen(scene);
} }
*/
} }
if (selection == "new") if (selection == "new")