AnarchistGamers/TES3MP
1
0
Fork 0
mirror of https://github.com/TES3MP/TES3MP.git synced 2025-10-01 00:50:15 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'zini/master' into animation2

Browse Source
This commit is contained in:
Chris Robinson 2013-02-05 02:57:02 -08:00
commit 786cb6e928
3 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -306,7 +306,7 @@ endif()
# Compiler settings # Compiler settings
if (CMAKE_COMPILER_IS_GNUCC) if (CMAKE_COMPILER_IS_GNUCC)
add_definitions (-Wall -Wextra -Wno-unused-parameter -Wno-reorder -std=c++03 -pedantic -Wno-long-long) add_definitions (-Wall -Wextra -Wno-unused-parameter -Wno-reorder -std=c++98 -pedantic -Wno-long-long)
# Silence warnings in OGRE headers. Remove once OGRE got fixed! # Silence warnings in OGRE headers. Remove once OGRE got fixed!
add_definitions (-Wno-ignored-qualifiers) add_definitions (-Wno-ignored-qualifiers)

11
apps/openmw/mwrender/terrain.cpp
View File

@ -3,6 +3,7 @@
#include <OgreTerrain.h> #include <OgreTerrain.h>
#include <OgreTerrainGroup.h> #include <OgreTerrainGroup.h>
#include <OgreHardwarePixelBuffer.h> #include <OgreHardwarePixelBuffer.h>
#include <OgreRoot.h>
#include "../mwworld/esmstore.hpp" #include "../mwworld/esmstore.hpp"
@ -178,6 +179,16 @@ namespace MWRender
} }
} }
// when loading from a heightmap, Ogre::Terrain does not update the derived data (normal map, LOD)
// synchronously, even if we supply synchronous = true parameter to loadTerrain.
// the following to be the only way to make sure derived data is ready when rendering the next frame.
while (mTerrainGroup.isDerivedDataUpdateInProgress())
{
// we need to wait for this to finish
OGRE_THREAD_SLEEP(5);
Root::getSingleton().getWorkQueue()->processResponses();
}
mTerrainGroup.freeTemporaryResources(); mTerrainGroup.freeTemporaryResources();
} }

2
readme.txt
View File

@ -114,8 +114,10 @@ Bug #521: MWGui::InventoryWindow creates a duplicate player actor at the origin
Bug #524: Beast races are able to wear shoes Bug #524: Beast races are able to wear shoes
Bug #527: Background music fails to play Bug #527: Background music fails to play
Bug #533: The arch at Gnisis entrance is not displayed Bug #533: The arch at Gnisis entrance is not displayed
Bug #534: Terrain gets its correct shape only some time after the cell is loaded
Bug #536: The same entry can be added multiple times to the journal Bug #536: The same entry can be added multiple times to the journal
Bug #539: Race selection is broken Bug #539: Race selection is broken
Bug #544: Terrain normal map corrupt when the map is rendered
Feature #39: Video Playback Feature #39: Video Playback
Feature #151: ^-escape sequences in text output Feature #151: ^-escape sequences in text output
Feature #392: Add AI related script functions Feature #392: Add AI related script functions