Advertisement
Guest User

Ogre CHC diff

a guest
Jan 26th, 2011
284
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 2.13 KB | None | 0 0
  1. 116,117c116,117
  2. <       //OverlayElement* guiDbg = OverlayManager::getSingleton().getOverlayElement("Core/DebugText");
  3. <       //guiDbg->show();
  4. ---
  5. >       OverlayElement* guiDbg = OverlayManager::getSingleton().getOverlayElement("Core/DebugText");
  6. >       guiDbg->show();
  7. 520,524c520,524
  8. <           //FileInfoListPtr finfo =  ResourceGroupManager::getSingleton().findResourceFileInfo (
  9. <           //  "Bootstrap", "axes.mesh");
  10. <           //const bool isSDK =  (!finfo->empty()) &&
  11. <           //  StringUtil::startsWith (finfo->begin()->archive->getName(), "../../media/packs/ogrecore.zip", true);
  12. <             const bool isSDK = true;
  13. ---
  14. >           FileInfoListPtr finfo =  ResourceGroupManager::getSingleton().findResourceFileInfo (
  15. >               "Bootstrap", "axes.mesh");
  16. >           const bool isSDK =  (!finfo->empty()) &&
  17. >               StringUtil::startsWith (finfo->begin()->archive->getName(), "../../media/packs/ogrecore.zip", true);
  18. >
  19. 526c526
  20. <             rsm->createResourceGroup("TreeDebug");
  21. ---
  22. >
  23. 529,532c529,532
  24. <               rsm->addResourceLocation ("Media","FileSystem", mResourceGrpName);
  25. <               rsm->addResourceLocation ("Media/gui","FileSystem", mResourceGrpName);
  26. <               rsm->addResourceLocation ("Media/materials","FileSystem", mResourceGrpName);
  27. <               rsm->addResourceLocation ("Media/materials/scripts","FileSystem", mResourceGrpName);
  28. ---
  29. >               rsm->addResourceLocation ("../../../CHC/Media","FileSystem", mResourceGrpName);
  30. >               rsm->addResourceLocation ("../../../CHC/Media/gui","FileSystem", mResourceGrpName);
  31. >               rsm->addResourceLocation ("../../../CHC/Media/materials","FileSystem", mResourceGrpName);
  32. >               rsm->addResourceLocation ("../../../CHC/Media/materials/scripts","FileSystem", mResourceGrpName);
  33. 426,428c426,427
  34. <       //std::vector<std::string> ds = Ogre::StringUtil::split(p,";");
  35. <         Ogre::vector<std::string>::type ds = Ogre::StringUtil::split(p, ";");
  36. <         std::pair<std::string,std::string> d;
  37. ---
  38. >       std::vector<std::string> ds = Ogre::StringUtil::split(p,";");
  39. >       std::pair<std::string,std::string> d;
  40. 430c429
  41. <       for(auto it = ds.begin();it != ds.end();++it) {
  42. ---
  43. >       for(std::vector<std::string>::iterator it = ds.begin();it != ds.end();++it) {
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement