From: <cu...@us...> - 2013-07-23 18:53:16
|
Revision: 13328 http://sourceforge.net/p/supertuxkart/code/13328 Author: curaga Date: 2013-07-23 18:53:12 +0000 (Tue, 23 Jul 2013) Log Message: ----------- Remove kart selection flicker Modified Paths: -------------- main/trunk/src/graphics/irr_driver.cpp Modified: main/trunk/src/graphics/irr_driver.cpp =================================================================== --- main/trunk/src/graphics/irr_driver.cpp 2013-07-23 17:06:51 UTC (rev 13327) +++ main/trunk/src/graphics/irr_driver.cpp 2013-07-23 18:53:12 UTC (rev 13328) @@ -1872,7 +1872,6 @@ m_light->setLightType(video::ELT_SPOT); m_light->setRotation((core::vector3df(0, 10, 0) - spot_pos).getHorizontalAngle()); m_light->updateAbsolutePosition(); - m_light->OnRegisterSceneNode(); m_rtt_main_node->setMaterialFlag(video::EMF_GOURAUD_SHADING , true); m_rtt_main_node->setMaterialFlag(video::EMF_LIGHTING, true); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cu...@us...> - 2013-08-09 18:33:19
|
Revision: 13448 http://sourceforge.net/p/supertuxkart/code/13448 Author: curaga Date: 2013-08-09 18:33:16 +0000 (Fri, 09 Aug 2013) Log Message: ----------- Up the kart selection screen ambient light Modified Paths: -------------- main/trunk/src/graphics/irr_driver.cpp Modified: main/trunk/src/graphics/irr_driver.cpp =================================================================== --- main/trunk/src/graphics/irr_driver.cpp 2013-08-09 18:21:14 UTC (rev 13447) +++ main/trunk/src/graphics/irr_driver.cpp 2013-08-09 18:33:16 UTC (rev 13448) @@ -1863,7 +1863,7 @@ } } - irr_driver->getSceneManager()->setAmbientLight(video::SColor(255, 10, 10, 10) ); + irr_driver->getSceneManager()->setAmbientLight(video::SColor(255, 35, 35, 35) ); const core::vector3df &spot_pos = core::vector3df(30, 30, 30); m_light = irr_driver->getSceneManager() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cu...@us...> - 2013-08-09 18:33:41
|
Revision: 13449 http://sourceforge.net/p/supertuxkart/code/13449 Author: curaga Date: 2013-08-09 18:33:38 +0000 (Fri, 09 Aug 2013) Log Message: ----------- Move the spot to the front Modified Paths: -------------- main/trunk/src/graphics/irr_driver.cpp Modified: main/trunk/src/graphics/irr_driver.cpp =================================================================== --- main/trunk/src/graphics/irr_driver.cpp 2013-08-09 18:33:16 UTC (rev 13448) +++ main/trunk/src/graphics/irr_driver.cpp 2013-08-09 18:33:38 UTC (rev 13449) @@ -1865,7 +1865,7 @@ irr_driver->getSceneManager()->setAmbientLight(video::SColor(255, 35, 35, 35) ); - const core::vector3df &spot_pos = core::vector3df(30, 30, 30); + const core::vector3df &spot_pos = core::vector3df(0, 30, 40); m_light = irr_driver->getSceneManager() ->addLightSceneNode(NULL, spot_pos, video::SColorf(1.0f,1.0f,1.0f), 1600 /* radius */); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fu...@us...> - 2013-11-11 23:13:51
|
Revision: 14410 http://sourceforge.net/p/supertuxkart/code/14410 Author: funto66 Date: 2013-11-11 23:13:47 +0000 (Mon, 11 Nov 2013) Log Message: ----------- Set the B3D_TEXTURE_PATH Irrlicht Scene Manager attribute upon B3D file loading. Hope that this fixes the rare bug where I got Beastie's kart.png texture applied instead of Beagle's kart.png texture. Modified Paths: -------------- main/trunk/src/graphics/irr_driver.cpp Modified: main/trunk/src/graphics/irr_driver.cpp =================================================================== --- main/trunk/src/graphics/irr_driver.cpp 2013-11-11 21:07:16 UTC (rev 14409) +++ main/trunk/src/graphics/irr_driver.cpp 2013-11-11 23:13:47 UTC (rev 14410) @@ -686,11 +686,11 @@ scene::IAnimatedMesh *IrrDriver::getAnimatedMesh(const std::string &filename) { scene::IAnimatedMesh *m = NULL; + io::IFileSystem* file_system = getDevice()->getFileSystem(); if (StringUtils::getExtension(filename) == "b3dz") { // compressed file - io::IFileSystem* file_system = getDevice()->getFileSystem(); if (!file_system->addFileArchive(filename.c_str(), /*ignoreCase*/false, /*ignorePath*/true, io::EFAT_ZIP)) @@ -705,6 +705,8 @@ io::IFileArchive* zip_archive = file_system->getFileArchive(file_system->getFileArchiveCount()-1); io::IReadFile* content = zip_archive->createAndOpenFile(0); + + m_scene_manager->getParameters()->setAttribute(irr::scene::B3D_TEXTURE_PATH, file_system->getFileDir(irr::io::path(filename.c_str()) ).c_str() ); m = m_scene_manager->getMesh(content); content->drop(); @@ -712,6 +714,7 @@ } else { + m_scene_manager->getParameters()->setAttribute(irr::scene::B3D_TEXTURE_PATH, file_system->getFileDir(irr::io::path(filename.c_str()) ).c_str() ); m = m_scene_manager->getMesh(filename.c_str()); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <hik...@us...> - 2013-11-13 03:33:43
|
Revision: 14417 http://sourceforge.net/p/supertuxkart/code/14417 Author: hikerstk Date: 2013-11-13 03:33:39 +0000 (Wed, 13 Nov 2013) Log Message: ----------- Fixed fullscreen issues (resulting in rtt not working) on intel graphics card. Strange thing: everybody should have been running stk in 16 bit colour mode since r12825, and no one noticed?? Now we properly request and set 32 bit mode, and all is working fine on intel. Revision Links: -------------- http://sourceforge.net/p/supertuxkart/code/12825 Modified Paths: -------------- main/trunk/src/graphics/irr_driver.cpp Modified: main/trunk/src/graphics/irr_driver.cpp =================================================================== --- main/trunk/src/graphics/irr_driver.cpp 2013-11-12 23:33:37 UTC (rev 14416) +++ main/trunk/src/graphics/irr_driver.cpp 2013-11-13 03:33:39 UTC (rev 14417) @@ -345,9 +345,11 @@ "anti-alias setting : %i\n", (int)UserConfigParams::m_antialiasing); } + m_device = createDeviceEx(params); + if(m_device) + break; } // for bits=32, 24, 16 - m_device = createDeviceEx(params); // if still no device, try with a standard 800x600 window size, maybe // size is the problem This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <hik...@us...> - 2013-11-15 00:40:57
|
Revision: 14442 http://sourceforge.net/p/supertuxkart/code/14442 Author: hikerstk Date: 2013-11-15 00:40:53 +0000 (Fri, 15 Nov 2013) Log Message: ----------- Reverted r14410 - the proper finding of textures when loading models is implemented, and has worked properly in the last years. This patch will unlikely fix the issue Funto had (incorrect texture for one kart), but might have unwanted side effects which are hard to evaluate so short before a release. Revision Links: -------------- http://sourceforge.net/p/supertuxkart/code/14410 Modified Paths: -------------- main/trunk/src/graphics/irr_driver.cpp Modified: main/trunk/src/graphics/irr_driver.cpp =================================================================== --- main/trunk/src/graphics/irr_driver.cpp 2013-11-15 00:29:28 UTC (rev 14441) +++ main/trunk/src/graphics/irr_driver.cpp 2013-11-15 00:40:53 UTC (rev 14442) @@ -688,11 +688,11 @@ scene::IAnimatedMesh *IrrDriver::getAnimatedMesh(const std::string &filename) { scene::IAnimatedMesh *m = NULL; - io::IFileSystem* file_system = getDevice()->getFileSystem(); if (StringUtils::getExtension(filename) == "b3dz") { // compressed file + io::IFileSystem* file_system = getDevice()->getFileSystem(); if (!file_system->addFileArchive(filename.c_str(), /*ignoreCase*/false, /*ignorePath*/true, io::EFAT_ZIP)) @@ -707,8 +707,6 @@ io::IFileArchive* zip_archive = file_system->getFileArchive(file_system->getFileArchiveCount()-1); io::IReadFile* content = zip_archive->createAndOpenFile(0); - - m_scene_manager->getParameters()->setAttribute(irr::scene::B3D_TEXTURE_PATH, file_system->getFileDir(irr::io::path(filename.c_str()) ).c_str() ); m = m_scene_manager->getMesh(content); content->drop(); @@ -716,7 +714,6 @@ } else { - m_scene_manager->getParameters()->setAttribute(irr::scene::B3D_TEXTURE_PATH, file_system->getFileDir(irr::io::path(filename.c_str()) ).c_str() ); m = m_scene_manager->getMesh(filename.c_str()); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sam...@us...> - 2013-12-09 02:59:32
|
Revision: 14680 http://sourceforge.net/p/supertuxkart/code/14680 Author: samuncle Date: 2013-12-09 02:59:29 +0000 (Mon, 09 Dec 2013) Log Message: ----------- Use the color violet for displaying FPS. Everything related to debug/etc should be in violet Modified Paths: -------------- main/trunk/src/graphics/irr_driver.cpp Modified: main/trunk/src/graphics/irr_driver.cpp =================================================================== --- main/trunk/src/graphics/irr_driver.cpp 2013-12-09 02:28:11 UTC (rev 14679) +++ main/trunk/src/graphics/irr_driver.cpp 2013-12-09 02:59:29 UTC (rev 14680) @@ -1401,7 +1401,7 @@ { no_trust--; - static video::SColor fpsColor = video::SColor(255, 255, 0, 0); + static video::SColor fpsColor = video::SColor(255, 106, 82, 217); font->draw( L"FPS: ...", core::rect< s32 >(100,0,400,50), fpsColor, false ); @@ -1434,7 +1434,7 @@ core::stringw fpsString = buffer; - static video::SColor fpsColor = video::SColor(255, 255, 0, 0); + static video::SColor fpsColor = video::SColor(255, 125, 96, 255); font->draw( fpsString.c_str(), core::rect< s32 >(100,0,400,50), fpsColor, false ); } // updateFPS This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sam...@us...> - 2013-12-09 14:07:45
|
Revision: 14688 http://sourceforge.net/p/supertuxkart/code/14688 Author: samuncle Date: 2013-12-09 14:07:42 +0000 (Mon, 09 Dec 2013) Log Message: ----------- Now there the FPS display has a background so it's more readable Modified Paths: -------------- main/trunk/src/graphics/irr_driver.cpp Modified: main/trunk/src/graphics/irr_driver.cpp =================================================================== --- main/trunk/src/graphics/irr_driver.cpp 2013-12-09 14:07:28 UTC (rev 14687) +++ main/trunk/src/graphics/irr_driver.cpp 2013-12-09 14:07:42 UTC (rev 14688) @@ -1372,6 +1372,8 @@ { gui::IGUIFont* font = GUIEngine::getFont(); + irr_driver->getVideoDriver()->draw2DRectangle(video::SColor(150, 44, 34, 90),core::rect< s32 >(75,0,800,50),NULL); + // We will let pass some time to let things settle before trusting FPS counter // even if we also ignore fps = 1, which tends to happen in first checks const int NO_TRUST_COUNT = 200; @@ -1401,7 +1403,7 @@ { no_trust--; - static video::SColor fpsColor = video::SColor(255, 106, 82, 217); + static video::SColor fpsColor = video::SColor(255, 0, 0, 0); font->draw( L"FPS: ...", core::rect< s32 >(100,0,400,50), fpsColor, false ); @@ -1434,7 +1436,8 @@ core::stringw fpsString = buffer; - static video::SColor fpsColor = video::SColor(255, 125, 96, 255); + static video::SColor fpsColor = video::SColor(255, 0, 0, 0); + font->draw( fpsString.c_str(), core::rect< s32 >(100,0,400,50), fpsColor, false ); } // updateFPS This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <au...@us...> - 2013-12-12 00:50:30
|
Revision: 14713 http://sourceforge.net/p/supertuxkart/code/14713 Author: auria Date: 2013-12-12 00:50:27 +0000 (Thu, 12 Dec 2013) Log Message: ----------- Remove cand's water-wave node for now and revert back to irrlicht's for the moment. The problem with cand's is that it ignores all our material flags, which is not acceptable Modified Paths: -------------- main/trunk/src/graphics/irr_driver.cpp Modified: main/trunk/src/graphics/irr_driver.cpp =================================================================== --- main/trunk/src/graphics/irr_driver.cpp 2013-12-12 00:39:19 UTC (rev 14712) +++ main/trunk/src/graphics/irr_driver.cpp 2013-12-12 00:50:27 UTC (rev 14713) @@ -834,16 +834,18 @@ ->createMeshWelded(mesh); scene::ISceneNode* out = NULL; - if (!m_glsl) - { + // TODO: using cand's new WaterNode would be better, but it does not + // support our material flags (like transparency, etc.) + //if (!m_glsl) + //{ out = m_scene_manager->addWaterSurfaceSceneNode(welded_mesh, wave_height, wave_speed, wave_length); - } else - { - out = new WaterNode(m_scene_manager, welded_mesh, wave_height, wave_speed, - wave_length); - } + //} else + //{ + // out = new WaterNode(m_scene_manager, welded_mesh, wave_height, wave_speed, + // wave_length); + //} out->getMaterial(0).setFlag(video::EMF_GOURAUD_SHADING, true); welded_mesh->drop(); // The scene node keeps a reference @@ -2043,7 +2045,12 @@ viamb = ((scene::IMeshSceneNode *) node)->isReadOnlyMaterials(); mesh = ((scene::IMeshSceneNode *) node)->getMesh(); } - + else if (node->getType() == scene::ESNT_WATER_SURFACE) + { + viamb = (dynamic_cast<scene::IMeshSceneNode*>(node))->isReadOnlyMaterials(); + mesh = (dynamic_cast<scene::IMeshSceneNode*>(node))->getMesh(); + } + for (i = 0; i < mcount; i++) { video::SMaterial &nodemat = node->getMaterial(i); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <au...@us...> - 2013-12-12 01:10:33
|
Revision: 14715 http://sourceforge.net/p/supertuxkart/code/14715 Author: auria Date: 2013-12-12 01:10:28 +0000 (Thu, 12 Dec 2013) Log Message: ----------- remove problematic code that crashes for some people only, will figure that out later Modified Paths: -------------- main/trunk/src/graphics/irr_driver.cpp Modified: main/trunk/src/graphics/irr_driver.cpp =================================================================== --- main/trunk/src/graphics/irr_driver.cpp 2013-12-12 01:04:22 UTC (rev 14714) +++ main/trunk/src/graphics/irr_driver.cpp 2013-12-12 01:10:28 UTC (rev 14715) @@ -2045,11 +2045,11 @@ viamb = ((scene::IMeshSceneNode *) node)->isReadOnlyMaterials(); mesh = ((scene::IMeshSceneNode *) node)->getMesh(); } - else if (node->getType() == scene::ESNT_WATER_SURFACE) - { - viamb = (dynamic_cast<scene::IMeshSceneNode*>(node))->isReadOnlyMaterials(); - mesh = (dynamic_cast<scene::IMeshSceneNode*>(node))->getMesh(); - } + //else if (node->getType() == scene::ESNT_WATER_SURFACE) + //{ + // viamb = (dynamic_cast<scene::IMeshSceneNode*>(node))->isReadOnlyMaterials(); + // mesh = (dynamic_cast<scene::IMeshSceneNode*>(node))->getMesh(); + //} for (i = 0; i < mcount; i++) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <de...@us...> - 2013-12-18 10:09:06
|
Revision: 14733 http://sourceforge.net/p/supertuxkart/code/14733 Author: deveee Date: 2013-12-18 10:09:03 +0000 (Wed, 18 Dec 2013) Log Message: ----------- Fixed start game with disabled shaders Modified Paths: -------------- main/trunk/src/graphics/irr_driver.cpp Modified: main/trunk/src/graphics/irr_driver.cpp =================================================================== --- main/trunk/src/graphics/irr_driver.cpp 2013-12-18 00:00:16 UTC (rev 14732) +++ main/trunk/src/graphics/irr_driver.cpp 2013-12-18 10:09:03 UTC (rev 14733) @@ -412,7 +412,7 @@ file_manager->reInit(); -// if (m_glsl) + if (m_glsl) { Log::info("irr_driver", "GLSL supported."); @@ -454,7 +454,7 @@ m_suncam->grab(); m_suncam->setParent(NULL); } -// else + else { Log::warn("irr_driver", "Using the fixed pipeline (old GPU, or shaders disabled in options)"); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ste...@us...> - 2014-01-05 21:14:30
|
Revision: 14930 http://sourceforge.net/p/supertuxkart/code/14930 Author: stephenjust Date: 2014-01-05 21:14:28 +0000 (Sun, 05 Jan 2014) Log Message: ----------- Fix crash loading tracks when shaders are disabled Modified Paths: -------------- main/trunk/src/graphics/irr_driver.cpp Modified: main/trunk/src/graphics/irr_driver.cpp =================================================================== --- main/trunk/src/graphics/irr_driver.cpp 2014-01-05 21:14:10 UTC (rev 14929) +++ main/trunk/src/graphics/irr_driver.cpp 2014-01-05 21:14:28 UTC (rev 14930) @@ -2161,7 +2161,7 @@ } else { - return NULL; + return m_scene_manager->addLightSceneNode(m_scene_manager->getRootSceneNode(), pos, video::SColor(1., r, g, b)); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <hik...@us...> - 2014-01-06 21:10:52
|
Revision: 14943 http://sourceforge.net/p/supertuxkart/code/14943 Author: hikerstk Date: 2014-01-06 21:10:50 +0000 (Mon, 06 Jan 2014) Log Message: ----------- Fixed warning and incorrect color values (for non-shader). Modified Paths: -------------- main/trunk/src/graphics/irr_driver.cpp Modified: main/trunk/src/graphics/irr_driver.cpp =================================================================== --- main/trunk/src/graphics/irr_driver.cpp 2014-01-06 20:05:23 UTC (rev 14942) +++ main/trunk/src/graphics/irr_driver.cpp 2014-01-06 21:10:50 UTC (rev 14943) @@ -2162,7 +2162,7 @@ else { return m_scene_manager->addLightSceneNode(m_scene_manager->getRootSceneNode(), - pos, video::SColor(1.0f, r, g, b)); + pos, video::SColorf(1.0f, r, g, b)); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |