mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-05 04:15:33 +00:00
Code Issues Releases Wiki Activity

clean up

Browse source
This commit is contained in:
gus 2014-08-12 21:32:07 +02:00
parent 11922dc53a
commit 1ac220593d
2 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
apps/opencs/editor.cpp
View file

@ -13,7 +13,6 @@
#include <extern/shiny/Platforms/Ogre/OgrePlatform.hpp> #include <extern/shiny/Platforms/Ogre/OgrePlatform.hpp>
#include <components/ogreinit/ogreinit.hpp> #include <components/ogreinit/ogreinit.hpp>
#include <Overlay/OgreFontManager.h>
#include <components/bsa/resources.hpp> #include <components/bsa/resources.hpp>

11
apps/opencs/view/render/pagedworldspacewidget.cpp
View file

@ -99,16 +99,13 @@ bool CSVRender::PagedWorldspaceWidget::adjustCells()
painter.setPen(Qt::white); painter.setPen(Qt::white);
painter.drawText(QRect(0, 0, 1024, 1024), Qt::AlignCenter, QString(text.c_str())); painter.drawText(QRect(0, 0, 1024, 1024), Qt::AlignCenter, QString(text.c_str()));
Ogre::TexturePtr texture;
if (Ogre::TextureManager::getSingleton().resourceExists("CellBillboardTexture" + iter->getId(mWorldspace))) Ogre::TexturePtr texture = Ogre::TextureManager::getSingleton().getByName("CellBillboardTexture" + iter->getId(mWorldspace));
{ if (texture.isNull())
texture = Ogre::TextureManager::getSingleton().getByName("CellBillboardTexture" + iter->getId(mWorldspace));
}
else
{ {
texture = Ogre::TextureManager::getSingleton().createManual("CellBillboardTexture" + iter->getId(mWorldspace), texture = Ogre::TextureManager::getSingleton().createManual("CellBillboardTexture" + iter->getId(mWorldspace),
Ogre::ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME, Ogre::ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME,
Ogre::TEX_TYPE_2D, 1024, 1024, 1, Ogre::PF_X8R8G8B8, Ogre::TU_DEFAULT); Ogre::TEX_TYPE_2D, 1024, 1024, 5, Ogre::PF_X8R8G8B8, Ogre::TU_DEFAULT);
int w = 1024; int w = 1024;
int h = 1024; int h = 1024;