From 1ac220593d180d9d6f4561c05a99c1897b713e02 Mon Sep 17 00:00:00 2001 From: gus Date: Tue, 12 Aug 2014 21:32:07 +0200 Subject: [PATCH] clean up --- apps/opencs/editor.cpp | 1 - apps/opencs/view/render/pagedworldspacewidget.cpp | 11 ++++------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/apps/opencs/editor.cpp b/apps/opencs/editor.cpp index 0fcac2474d..b3513a7f15 100644 --- a/apps/opencs/editor.cpp +++ b/apps/opencs/editor.cpp @@ -13,7 +13,6 @@ #include #include -#include #include diff --git a/apps/opencs/view/render/pagedworldspacewidget.cpp b/apps/opencs/view/render/pagedworldspacewidget.cpp index d9367b2fe6..9862c12109 100644 --- a/apps/opencs/view/render/pagedworldspacewidget.cpp +++ b/apps/opencs/view/render/pagedworldspacewidget.cpp @@ -99,16 +99,13 @@ bool CSVRender::PagedWorldspaceWidget::adjustCells() painter.setPen(Qt::white); 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))) - { - texture = Ogre::TextureManager::getSingleton().getByName("CellBillboardTexture" + iter->getId(mWorldspace)); - } - else + + Ogre::TexturePtr texture = Ogre::TextureManager::getSingleton().getByName("CellBillboardTexture" + iter->getId(mWorldspace)); + if (texture.isNull()) { texture = Ogre::TextureManager::getSingleton().createManual("CellBillboardTexture" + iter->getId(mWorldspace), 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 h = 1024;