From 2edd7e59f407fa21f165fc44b698d3e8dc720837 Mon Sep 17 00:00:00 2001 From: scrawl Date: Wed, 14 Mar 2012 20:44:06 +0100 Subject: [PATCH] some fixes and facilities for saving the fog of war to disk --- apps/openmw/mwrender/localmap.cpp | 150 ++++++++++++++-------- apps/openmw/mwrender/localmap.hpp | 13 ++ apps/openmw/mwrender/renderingmanager.cpp | 5 + apps/openmw/mwrender/renderingmanager.hpp | 3 + apps/openmw/mwworld/scene.cpp | 2 + 5 files changed, 118 insertions(+), 55 deletions(-) diff --git a/apps/openmw/mwrender/localmap.cpp b/apps/openmw/mwrender/localmap.cpp index 496a162dde..fe9b3c191c 100644 --- a/apps/openmw/mwrender/localmap.cpp +++ b/apps/openmw/mwrender/localmap.cpp @@ -4,14 +4,10 @@ #include #include -#include - using namespace MWRender; using namespace Ogre; -#define CACHE_EXTENSION ".jpg" - -#define MAP_RESOLUTION 1024 // 1024*1024 pixels for a 8192*8192 area in world units +#define MAP_RESOLUTION 1024 // 1024*1024 pixels for a SIZE*SIZE area in world units // warning: don't set this too high! dynamic textures are a bottleneck #define FOGOFWAR_RESOLUTION 32 @@ -20,6 +16,9 @@ using namespace Ogre; // example: at 60 fps, a value of 2 would mean to render it at 20 fps. #define FOGOFWAR_SKIP 2 +// size of a map segment (for exterior regions, this equals 1 cell) +#define SIZE 8192.f + LocalMap::LocalMap(OEngine::Render::OgreRenderer* rend) { mRendering = rend; @@ -32,16 +31,16 @@ LocalMap::LocalMap(OEngine::Render::OgreRenderer* rend) // Debug overlay to view the maps - render(0, 0, 10000, 10000, 8192, 8192, "Cell_0_0"); + render(0, 0, 10000, 10000, SIZE, SIZE, "Cell_0_0_"); MaterialPtr mat = MaterialManager::getSingleton().create("testMaterial", ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME); - mat->getTechnique(0)->getPass(0)->createTextureUnitState("Cell_0_0"); + mat->getTechnique(0)->getPass(0)->createTextureUnitState("Cell_0_0_"); mat->getTechnique(0)->getPass(0)->setDepthWriteEnabled(false); mat->getTechnique(0)->getPass(0)->setSceneBlending(SBT_TRANSPARENT_ALPHA); mat->getTechnique(0)->getPass(0)->setDepthCheckEnabled(false); mat = MaterialManager::getSingleton().create("testMaterial2", ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME); - mat->getTechnique(0)->getPass(0)->createTextureUnitState("Cell_0_0"); + mat->getTechnique(0)->getPass(0)->createTextureUnitState("Cell_0_0_"); mat->getTechnique(0)->getPass(0)->setDepthWriteEnabled(false); mat->getTechnique(0)->getPass(0)->setSceneBlending(SBT_TRANSPARENT_ALPHA); mat->getTechnique(0)->getPass(0)->setDepthCheckEnabled(false); @@ -92,26 +91,75 @@ void LocalMap::deleteBuffers() mBuffers.clear(); } +void LocalMap::saveTexture(const std::string& texname, const std::string& filename) +{ + TexturePtr tex = TextureManager::getSingleton().getByName(texname); + if (tex.isNull()) return; + HardwarePixelBufferSharedPtr readbuffer = tex->getBuffer(); + readbuffer->lock(HardwareBuffer::HBL_NORMAL ); + const PixelBox &readrefpb = readbuffer->getCurrentLock(); + uchar *readrefdata = static_cast(readrefpb.data); + + Image img; + img = img.loadDynamicImage (readrefdata, tex->getWidth(), + tex->getHeight(), tex->getFormat()); + img.save("./" + filename); + + readbuffer->unlock(); +} + +std::string LocalMap::coordStr(const int x, const int y) +{ + return StringConverter::toString(x) + "_" + StringConverter::toString(y); +} + +void LocalMap::saveFogOfWar(MWWorld::Ptr::CellStore* cell) +{ + if (!mInterior) + { + /*saveTexture("Cell_"+coordStr(mCellX, mCellY)+"_fog", + "Cell_"+coordStr(mCellX, mCellY)+"_fog.png");*/ + } + else + { + Vector2 min(mBounds.getMinimum().x, mBounds.getMinimum().z); + Vector2 max(mBounds.getMaximum().x, mBounds.getMaximum().z); + /// \todo why is this workaround needed? + min *= 1.3; + max *= 1.3; + Vector2 length = max-min; + + // divide into segments + const int segsX = std::ceil( length.x / SIZE ); + const int segsY = std::ceil( length.y / SIZE ); + + for (int x=0; xcell->data.gridX) - + "_" + StringConverter::toString(cell->cell->data.gridY); + std::string name = "Cell_"+coordStr(cell->cell->data.gridX, cell->cell->data.gridY); - const int x = cell->cell->data.gridX; - const int y = cell->cell->data.gridY; + int x = cell->cell->data.gridX; + int y = cell->cell->data.gridY; - render((x+0.5)*8192, (-y-0.5)*8192, -10000, 10000, 8192, 8192, name); + render((x+0.5)*SIZE, (-y-0.5)*SIZE, -10000, 10000, SIZE, SIZE, name); } void LocalMap::requestMap(MWWorld::Ptr::CellStore* cell, AxisAlignedBox bounds) { - deleteBuffers(); - mInterior = true; mBounds = bounds; @@ -126,10 +174,9 @@ void LocalMap::requestMap(MWWorld::Ptr::CellStore* cell, Vector2 length = max-min; Vector2 center(bounds.getCenter().x, bounds.getCenter().z); - // divide into 8192*8192 segments - /// \todo interiors with more than 1 segment are untested - const int segsX = std::ceil( length.x / 8192 ); - const int segsY = std::ceil( length.y / 8192 ); + // divide into segments + const int segsX = std::ceil( length.x / SIZE ); + const int segsY = std::ceil( length.y / SIZE ); mInteriorName = cell->cell->name; @@ -137,11 +184,11 @@ void LocalMap::requestMap(MWWorld::Ptr::CellStore* cell, { for (int y=0; ycell->name + "_" + StringConverter::toString(x) + "_" + StringConverter::toString(y)); + render(newcenter.x, newcenter.y, z.y, z.x, SIZE, SIZE, + cell->cell->name + "_" + coordStr(x,y)); } } } @@ -171,7 +218,7 @@ void LocalMap::render(const float x, const float y, if (tex.isNull()) { // try loading from disk - //if (boost::filesystem::exists(texture+CACHE_EXTENSION)) + //if (boost::filesystem::exists(texture+".jpg")) //{ /// \todo //} @@ -182,7 +229,7 @@ void LocalMap::render(const float x, const float y, texture, ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME, TEX_TYPE_2D, - xw*MAP_RESOLUTION/8192, yw*MAP_RESOLUTION/8192, + xw*MAP_RESOLUTION/SIZE, yw*MAP_RESOLUTION/SIZE, 0, PF_R8G8B8, TU_RENDERTARGET); @@ -202,7 +249,7 @@ void LocalMap::render(const float x, const float y, texture + "_fog", ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME, TEX_TYPE_2D, - xw*FOGOFWAR_RESOLUTION/8192, yw*FOGOFWAR_RESOLUTION/8192, + xw*FOGOFWAR_RESOLUTION/SIZE, yw*FOGOFWAR_RESOLUTION/SIZE, 0, PF_A8R8G8B8, TU_DYNAMIC_WRITE_ONLY); @@ -221,20 +268,11 @@ void LocalMap::render(const float x, const float y, tex2->getBuffer()->unlock(); mBuffers[texture] = buffer; - - /// \todo + // save to cache for next time - //rtt->writeContentsToFile("./" + texture + CACHE_EXTENSION); + //rtt->writeContentsToFile("./" + texture + ".jpg"); } } - - - - if (!MaterialManager::getSingleton().getByName("testMaterial").isNull()) - { - MaterialPtr mat = MaterialManager::getSingleton().getByName("testMaterial"); - mat->getTechnique(0)->getPass(0)->getTextureUnitState(0)->setTextureName(texture); - } // re-enable fog @@ -254,17 +292,18 @@ void LocalMap::setPlayerPosition (const Ogre::Vector3& position) Vector2 pos(position.x, position.z); if (!mInterior) { - x = (int) (pos.x / 8192.f); - y = (int) (pos.y / 8192.f); + x = std::ceil(pos.x / SIZE)-1; + y = std::ceil(-pos.y / SIZE)-1; + mCellX = x; + mCellY = y; } else { Vector2 min(mBounds.getMinimum().x, mBounds.getMinimum().z); min *= 1.3; - /// \todo interiors with more than 1 segment are untested - x = (int) ((pos.x - min.x)/8192.f); - y = (int) ((pos.y - min.y)/8192.f); + x = std::ceil((pos.x - min.x)/SIZE)-1; + y = std::ceil((pos.y - min.y)/SIZE)-1; } // convert from world coordinates to texture UV coordinates @@ -272,34 +311,30 @@ void LocalMap::setPlayerPosition (const Ogre::Vector3& position) std::string texName; if (!mInterior) { - u = std::abs((pos.x - (8192*x))/8192.f); - v = std::abs((pos.y - (8192*y))/8192.f); - texName = "Cell_" + StringConverter::toString(x) + "_" - + StringConverter::toString(y); + u = std::abs((pos.x - (SIZE*x))/SIZE); + v = 1-std::abs((pos.y + (SIZE*y))/SIZE); + texName = "Cell_"+coordStr(x,y); } else { Vector2 min(mBounds.getMinimum().x, mBounds.getMinimum().z); min *= 1.3; - u = (pos.x - min.x - 8192*x)/8192.f; - v = (pos.y - min.y - 8192*y)/8192.f; + u = (pos.x - min.x - SIZE*x)/SIZE; + v = (pos.y - min.y - SIZE*y)/SIZE; - texName = mInteriorName + "_" + StringConverter::toString(x) + "_" - + StringConverter::toString(y); + texName = mInteriorName + "_" + coordStr(x,y); } - //std::cout << "u " << u<< " v " << v << std::endl; - // explore radius (squared) const float sqrExploreRadius = 0.01 * FOGOFWAR_RESOLUTION*FOGOFWAR_RESOLUTION; // get the appropriate fog of war texture TexturePtr tex = TextureManager::getSingleton().getByName(texName+"_fog"); - if (!tex.isNull()) { // get its buffer + if (mBuffers.find(texName) == mBuffers.end()) return; uint32* buffer = mBuffers[texName]; uint32* pointer = buffer; for (int texV = 0; texV> 24); alpha = std::min( alpha, (uint8) (std::max(0.f, std::min(1.f, (sqrDist/sqrExploreRadius)))*255) ); *((uint32*)pointer) = (alpha << 24); @@ -321,6 +356,11 @@ void LocalMap::setPlayerPosition (const Ogre::Vector3& position) memcpy(tex->getBuffer()->lock(HardwareBuffer::HBL_DISCARD), buffer, FOGOFWAR_RESOLUTION*FOGOFWAR_RESOLUTION*4); tex->getBuffer()->unlock(); + if (!MaterialManager::getSingleton().getByName("testMaterial").isNull()) + { + MaterialPtr mat = MaterialManager::getSingleton().getByName("testMaterial"); + mat->getTechnique(0)->getPass(0)->getTextureUnitState(0)->setTextureName(texName); + } if (!MaterialManager::getSingleton().getByName("testMaterial2").isNull()) { MaterialPtr mat = MaterialManager::getSingleton().getByName("testMaterial2"); diff --git a/apps/openmw/mwrender/localmap.hpp b/apps/openmw/mwrender/localmap.hpp index 588e766337..9e06200c17 100644 --- a/apps/openmw/mwrender/localmap.hpp +++ b/apps/openmw/mwrender/localmap.hpp @@ -42,6 +42,14 @@ namespace MWRender */ void setPlayerPosition (const Ogre::Vector3& position); + /** + * Save the fog of war for the current cell to disk. + * @remarks This should be called before loading a + * new cell, as well as when the game is quit. + * @param current cell + */ + void saveFogOfWar(MWWorld::Ptr::CellStore* cell); + private: OEngine::Render::OgreRenderer* mRendering; @@ -52,6 +60,10 @@ namespace MWRender const float xw, const float yw, const std::string& texture); + void saveTexture(const std::string& texname, const std::string& filename); + + std::string coordStr(const int x, const int y); + // a buffer for the "fog of war" texture of the current cell. // interior cells could be divided into multiple textures, // so we store in a map. @@ -60,6 +72,7 @@ namespace MWRender void deleteBuffers(); bool mInterior; + int mCellX, mCellY; Ogre::AxisAlignedBox mBounds; std::string mInteriorName; }; diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp index bddf575d9a..a8887e64f0 100644 --- a/apps/openmw/mwrender/renderingmanager.cpp +++ b/apps/openmw/mwrender/renderingmanager.cpp @@ -335,4 +335,9 @@ void RenderingManager::requestMap(MWWorld::Ptr::CellStore* cell) mLocalMap->requestMap(cell, mObjects.getDimensions(cell)); } +void RenderingManager::preCellChange(MWWorld::Ptr::CellStore* cell) +{ + mLocalMap->saveFogOfWar(cell); +} + } // namespace diff --git a/apps/openmw/mwrender/renderingmanager.hpp b/apps/openmw/mwrender/renderingmanager.hpp index 65aa46b01d..78a1d2fdb7 100644 --- a/apps/openmw/mwrender/renderingmanager.hpp +++ b/apps/openmw/mwrender/renderingmanager.hpp @@ -76,6 +76,9 @@ class RenderingManager: private RenderingInterface { /// when rebatching is needed and update automatically at the end of each frame. void cellAdded (MWWorld::Ptr::CellStore *store); + void preCellChange (MWWorld::Ptr::CellStore* store); + ///< this event is fired immediately before changing cell + void addObject (const MWWorld::Ptr& ptr); void removeObject (const MWWorld::Ptr& ptr); diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp index a63f6d150e..84c10072a9 100644 --- a/apps/openmw/mwworld/scene.cpp +++ b/apps/openmw/mwworld/scene.cpp @@ -135,6 +135,8 @@ namespace MWWorld void Scene::changeCell (int X, int Y, const ESM::Position& position, bool adjustPlayerPos) { + mRendering.preCellChange(mCurrentCell); + // remove active mEnvironment.mMechanicsManager->removeActor (mWorld->getPlayer().getPlayer());