@ -170,10 +170,10 @@ namespace MWWorld
World : : World ( OEngine : : Render : : OgreRenderer & renderer ,
World : : World ( OEngine : : Render : : OgreRenderer & renderer ,
const Files : : Collections & fileCollections ,
const Files : : Collections & fileCollections ,
const std : : string & master , const boost : : filesystem : : path & resDir , const boost : : filesystem : : path & cacheDir , bool newGame ,
const std : : string & master , const boost : : filesystem : : path & resDir , const boost : : filesystem : : path & cacheDir , bool newGame ,
ToUTF8 : : Utf8Encoder * encoder , std : : map < std : : string , std : : string > fallbackMap
ToUTF8 : : Utf8Encoder * encoder , std : : map < std : : string , std : : string > fallbackMap , int mActivationDistanceOverride )
: mPlayer ( 0 ) , mLocalScripts ( mStore ) , mGlobalVariables ( 0 ) ,
: mPlayer ( 0 ) , mLocalScripts ( mStore ) , mGlobalVariables ( 0 ) ,
mSky ( true ) , mCells ( mStore , mEsm ) ,
mSky ( true ) , mCells ( mStore , mEsm ) ,
mNumFacing ( 0 )
mNumFacing ( 0 ) , mActivationDistanceOverride ( mActivationDistanceOverride )
{
{
mPhysics = new PhysicsSystem ( renderer ) ;
mPhysics = new PhysicsSystem ( renderer ) ;
mPhysEngine = mPhysics - > getEngine ( ) ;
mPhysEngine = mPhysics - > getEngine ( ) ;
@ -573,23 +573,55 @@ namespace MWWorld
return mWorldScene - > markCellAsUnchanged ( ) ;
return mWorldScene - > markCellAsUnchanged ( ) ;
}
}
std : : string World : : getFacedHandle ( )
float World : : getMaxActivationDistance ( )
{
{
if ( mActivationDistanceOverride > = 0 )
return mActivationDistanceOverride ;
return ( std : : max ) ( getNpcActivationDistance ( ) , getObjectActivationDistance ( ) ) ;
}
float World : : getNpcActivationDistance ( )
{
if ( mActivationDistanceOverride > = 0 )
return mActivationDistanceOverride ;
return getStore ( ) . get < ESM : : GameSetting > ( ) . find ( " iMaxActivateDist " ) - > getInt ( ) * 5 / 4 ;
}
float World : : getObjectActivationDistance ( )
{
if ( mActivationDistanceOverride > = 0 )
return mActivationDistanceOverride ;
return getStore ( ) . get < ESM : : GameSetting > ( ) . find ( " iMaxActivateDist " ) - > getInt ( ) ;
}
MWWorld : : Ptr World : : getFacedObject ( )
{
std : : pair < float , std : : string > result ;
if ( ! mRendering - > occlusionQuerySupported ( ) )
if ( ! mRendering - > occlusionQuerySupported ( ) )
{
result = mPhysics - > getFacedHandle ( * this , getMaxActivationDistance ( ) ) ;
std : : pair < std : : string , float > result = mPhysics - > getFacedHandle ( * this ) ;
else
result = std : : make_pair ( mFacedDistance , mFacedHandle ) ;
if ( result . first . empty ( ) | |
if ( result . second . empty ( ) )
result . second > getStore ( ) . get < ESM : : GameSetting > ( ) . find ( " iMaxActivateDist " ) - > getInt ( ) )
return MWWorld : : Ptr ( ) ;
return " " ;
return result . first ;
MWWorld : : Ptr object = searchPtrViaHandle ( result . second ) ;
}
float ActivationDistance ;
if ( object . getTypeName ( ) . find ( " NPC " ) ! = std : : string : : npos )
ActivationDistance = getNpcActivationDistance ( ) ;
else
else
{
ActivationDistance = getObjectActivationDistance ( ) ;
// updated every few frames in update()
return mFacedHandle ;
if ( result . first > ActivationDistance )
}
return MWWorld : : Ptr ( ) ;
return object ;
}
}
void World : : deleteObject ( const Ptr & ptr )
void World : : deleteObject ( const Ptr & ptr )
@ -884,8 +916,6 @@ namespace MWWorld
void World : : update ( float duration , bool paused )
void World : : update ( float duration , bool paused )
{
{
/// \todo split this function up into subfunctions
mWorldScene - > update ( duration , paused ) ;
mWorldScene - > update ( duration , paused ) ;
float pitch , yaw ;
float pitch , yaw ;
@ -895,8 +925,15 @@ namespace MWWorld
mWeatherManager - > update ( duration ) ;
mWeatherManager - > update ( duration ) ;
performUpdateSceneQueries ( ) ;
updateWindowManager ( ) ;
}
void World : : updateWindowManager ( )
{
// inform the GUI about focused object
// inform the GUI about focused object
MWWorld : : Ptr object = searchPtrViaHandle ( mFacedHandle ) ;
MWWorld : : Ptr object = getFacedObject ( ) ;
MWBase : : Environment : : get ( ) . getWindowManager ( ) - > setFocusObject ( object ) ;
MWBase : : Environment : : get ( ) . getWindowManager ( ) - > setFocusObject ( object ) ;
@ -918,7 +955,10 @@ namespace MWWorld
screenCoords [ 0 ] , screenCoords [ 1 ] , screenCoords [ 2 ] , screenCoords [ 3 ] ) ;
screenCoords [ 0 ] , screenCoords [ 1 ] , screenCoords [ 2 ] , screenCoords [ 3 ] ) ;
}
}
}
}
}
void World : : performUpdateSceneQueries ( )
{
if ( ! mRendering - > occlusionQuerySupported ( ) )
if ( ! mRendering - > occlusionQuerySupported ( ) )
{
{
// cast a ray from player to sun to detect if the sun is visible
// cast a ray from player to sun to detect if the sun is visible
@ -937,119 +977,152 @@ namespace MWWorld
MWRender : : OcclusionQuery * query = mRendering - > getOcclusionQuery ( ) ;
MWRender : : OcclusionQuery * query = mRendering - > getOcclusionQuery ( ) ;
if ( ! query - > occlusionTestPending ( ) )
if ( ! query - > occlusionTestPending ( ) )
{
{
// get result of last query
processFacedQueryResults ( query ) ;
if ( mNumFacing = = 0 ) mFacedHandle = " " ;
beginFacedQueryProcess ( query ) ;
else if ( mNumFacing = = 1 )
}
{
}
bool result = query - > getTestResult ( ) ;
}
mFacedHandle = result ? mFaced1Name : " " ;
}
else if ( mNumFacing = = 2 )
{
bool result = query - > getTestResult ( ) ;
mFacedHandle = result ? mFaced2Name : mFaced1Name ;
}
// send new query
void World : : processFacedQueryResults ( MWRender : : OcclusionQuery * query )
// figure out which object we want to test against
{
std : : vector < std : : pair < float , std : : string > > results ;
// get result of last query
if ( MWBase : : Environment : : get ( ) . getWindowManager ( ) - > isGuiMode ( ) )
if ( mNumFacing = = 0 )
{
{
float x , y ;
mFacedHandle = " " ;
MWBase : : Environment : : get ( ) . getWindowManager ( ) - > getMousePosition ( x , y ) ;
mFacedDistance = FLT_MAX ;
results = mPhysics - > getFacedObjects ( x , y ) ;
}
}
else if ( mNumFacing = = 1 )
else
{
results = mPhysics - > getFacedObjects ( ) ;
bool result = query - > getTestResult ( ) ;
mFacedHandle = result ? mFaced1Name : " " ;
mFacedDistance = result ? mFaced1Distance : FLT_MAX ;
}
else if ( mNumFacing = = 2 )
{
bool result = query - > getTestResult ( ) ;
mFacedHandle = result ? mFaced2Name : mFaced1Name ;
mFacedDistance = result ? mFaced1Distance : mFaced1Distance ;
}
}
// ignore the player and other things we're not interested in
void World : : beginFacedQueryProcess ( MWRender : : OcclusionQuery * query )
std : : vector < std : : pair < float , std : : string > > : : iterator it = results . begin ( ) ;
{
while ( it ! = results . end ( ) )
// send new query
{
// figure out which object we want to test against
if ( ( * it ) . second . find ( " HeightField " ) ! = std : : string : : npos // not interested in terrain
std : : vector < std : : pair < float , std : : string > > results ;
| | getPtrViaHandle ( ( * it ) . second ) = = mPlayer - > getPlayer ( ) ) // not interested in player (unless you want to talk to yourself)
if ( MWBase : : Environment : : get ( ) . getWindowManager ( ) - > isGuiMode ( ) )
{
{
it = results . erase ( it ) ;
float x , y ;
}
MWBase : : Environment : : get ( ) . getWindowManager ( ) - > getMousePosition ( x , y ) ;
else
results = mPhysics - > getFacedHandles ( x , y , getMaxActivationDistance ( ) ) ;
+ + it ;
}
}
else
{
results = mPhysics - > getFacedHandles ( getMaxActivationDistance ( ) ) ;
}
if ( results . size ( ) = = 0 )
// ignore the player and other things we're not interested in
{
std : : vector < std : : pair < float , std : : string > > : : iterator it = results . begin ( ) ;
mNumFacing = 0 ;
while ( it ! = results . end ( ) )
}
{
else if ( results . size ( ) = = 1 )
if ( ( * it ) . second . find ( " HeightField " ) ! = std : : string : : npos // not interested in terrain
{
| | getPtrViaHandle ( ( * it ) . second ) = = mPlayer - > getPlayer ( ) ) // not interested in player (unless you want to talk to yourself)
mFaced1 = getPtrViaHandle ( results . front ( ) . second ) ;
{
mFaced1Name = results . front ( ) . second ;
it = results . erase ( it ) ;
mNumFacing = 1 ;
}
else
+ + it ;
}
btVector3 p ;
if ( results . size ( ) = = 0 )
if ( MWBase : : Environment : : get ( ) . getWindowManager ( ) - > isGuiMode ( ) )
{
{
mNumFacing = 0 ;
float x , y ;
}
MWBase : : Environment : : get ( ) . getWindowManager ( ) - > getMousePosition ( x , y ) ;
else if ( results . size ( ) = = 1 )
p = mPhysics - > getRayPoint ( results . front ( ) . first , x , y ) ;
{
}
beginSingleFacedQueryProcess ( query , results ) ;
else
}
p = mPhysics - > getRayPoint ( results . front ( ) . first ) ;
else
Ogre : : Vector3 pos ( p . x ( ) , p . z ( ) , - p . y ( ) ) ;
{
Ogre : : SceneNode * node = mFaced1 . getRefData ( ) . getBaseNode ( ) ;
beginDoubleFacedQueryProcess ( query , results ) ;
}
}
//std::cout << "Num facing 1 : " << mFaced1Name << std::endl;
void World : : beginSingleFacedQueryProcess ( MWRender : : OcclusionQuery * query , std : : vector < std : : pair < float , std : : string > > const & results )
//std::cout << "Type 1 " << mFaced1.getTypeName() << std::endl;
{
mFaced1 = getPtrViaHandle ( results . front ( ) . second ) ;
mFaced1Name = results . front ( ) . second ;
mFaced1Distance = results . front ( ) . first ;
mNumFacing = 1 ;
query - > occlusionTest ( pos , node ) ;
btVector3 p ;
}
if ( MWBase : : Environment : : get ( ) . getWindowManager ( ) - > isGuiMode ( ) )
else
{
{
float x , y ;
mFaced1Name = results . front ( ) . second ;
MWBase : : Environment : : get ( ) . getWindowManager ( ) - > getMousePosition ( x , y ) ;
mFaced2Name = results [ 1 ] . second ;
p = mPhysics - > getRayPoint ( results . front ( ) . first , x , y ) ;
mFaced1 = getPtrViaHandle ( results . front ( ) . second ) ;
}
mFaced2 = getPtrViaHandle ( results [ 1 ] . second ) ;
else
mNumFacing = 2 ;
p = mPhysics - > getRayPoint ( results . front ( ) . first ) ;
Ogre : : Vector3 pos ( p . x ( ) , p . z ( ) , - p . y ( ) ) ;
btVector3 p ;
Ogre : : SceneNode * node = mFaced1 . getRefData ( ) . getBaseNode ( ) ;
if ( MWBase : : Environment : : get ( ) . getWindowManager ( ) - > isGuiMode ( ) )
{
float x , y ;
MWBase : : Environment : : get ( ) . getWindowManager ( ) - > getMousePosition ( x , y ) ;
p = mPhysics - > getRayPoint ( results [ 1 ] . first , x , y ) ;
}
else
p = mPhysics - > getRayPoint ( results [ 1 ] . first ) ;
Ogre : : Vector3 pos ( p . x ( ) , p . z ( ) , - p . y ( ) ) ;
Ogre : : SceneNode * node1 = mFaced1 . getRefData ( ) . getBaseNode ( ) ;
Ogre : : SceneNode * node2 = mFaced2 . getRefData ( ) . getBaseNode ( ) ;
// no need to test if the first node is not occluder
//std::cout << "Num facing 1 : " << mFaced1Name << std::endl;
if ( ! query - > isPotentialOccluder ( node1 ) & & ( mFaced1 . getTypeName ( ) . find ( " Static " ) = = std : : string : : npos ) )
//std::cout << "Type 1 " << mFaced1.getTypeName() << std::endl;
{
mFacedHandle = mFaced1Name ;
//std::cout << "node1 Not an occluder" << std::endl;
return ;
}
// no need to test if the second object is static (thus cannot be activated)
query - > occlusionTest ( pos , node ) ;
if ( mFaced2 . getTypeName ( ) . find ( " Static " ) ! = std : : string : : npos )
}
{
mFacedHandle = mFaced1Name ;
return ;
}
// work around door problems
void World : : beginDoubleFacedQueryProcess ( MWRender : : OcclusionQuery * query , std : : vector < std : : pair < float , std : : string > > const & results )
if ( mFaced1 . getTypeName ( ) . find ( " Static " ) ! = std : : string : : npos
{
& & mFaced2 . getTypeName ( ) . find ( " Door " ) ! = std : : string : : npos )
mFaced1Name = results . at ( 0 ) . second ;
{
mFaced2Name = results . at ( 1 ) . second ;
mFacedHandle = mFaced2Name ;
mFaced1Distance = results . at ( 0 ) . first ;
return ;
mFaced2Distance = results . at ( 1 ) . first ;
}
mFaced1 = getPtrViaHandle ( results . at ( 0 ) . second ) ;
mFaced2 = getPtrViaHandle ( results . at ( 1 ) . second ) ;
mNumFacing = 2 ;
query - > occlusionTest ( pos , node2 ) ;
btVector3 p ;
}
if ( MWBase : : Environment : : get ( ) . getWindowManager ( ) - > isGuiMode ( ) )
}
{
float x , y ;
MWBase : : Environment : : get ( ) . getWindowManager ( ) - > getMousePosition ( x , y ) ;
p = mPhysics - > getRayPoint ( results . at ( 1 ) . first , x , y ) ;
}
}
else
p = mPhysics - > getRayPoint ( results . at ( 1 ) . first ) ;
Ogre : : Vector3 pos ( p . x ( ) , p . z ( ) , - p . y ( ) ) ;
Ogre : : SceneNode * node1 = mFaced1 . getRefData ( ) . getBaseNode ( ) ;
Ogre : : SceneNode * node2 = mFaced2 . getRefData ( ) . getBaseNode ( ) ;
// no need to test if the first node is not occluder
if ( ! query - > isPotentialOccluder ( node1 ) & & ( mFaced1 . getTypeName ( ) . find ( " Static " ) = = std : : string : : npos ) )
{
mFacedHandle = mFaced1Name ;
mFacedDistance = mFaced1Distance ;
//std::cout << "node1 Not an occluder" << std::endl;
return ;
}
// no need to test if the second object is static (thus cannot be activated)
if ( mFaced2 . getTypeName ( ) . find ( " Static " ) ! = std : : string : : npos )
{
mFacedHandle = mFaced1Name ;
mFacedDistance = mFaced1Distance ;
return ;
}
// work around door problems
if ( mFaced1 . getTypeName ( ) . find ( " Static " ) ! = std : : string : : npos
& & mFaced2 . getTypeName ( ) . find ( " Door " ) ! = std : : string : : npos )
{
mFacedHandle = mFaced2Name ;
mFacedDistance = mFaced2Distance ;
return ;
}
query - > occlusionTest ( pos , node2 ) ;
}
}
bool World : : isCellExterior ( ) const
bool World : : isCellExterior ( ) const
@ -1213,12 +1286,12 @@ namespace MWWorld
}
}
}
}
void World : : dropObjectOnGround ( const Ptr & )
void World : : dropObjectOnGround ( const Ptr & actor, const Ptr & object)
{
{
MWWorld : : Ptr : : CellStore * cell = getPlayer( ) . getPlayer ( ) . getCell ( ) ;
MWWorld : : Ptr : : CellStore * cell = actor . getCell ( ) ;
ESM : : Position pos =
ESM : : Position pos =
getPlayer( ) . getPlayer ( ) . getRefData ( ) . getPosition ( ) ;
actor . getRefData ( ) . getPosition ( ) ;
Ogre : : Vector3 orig =
Ogre : : Vector3 orig =
Ogre : : Vector3 ( pos . pos [ 0 ] , pos . pos [ 1 ] , pos . pos [ 2 ] ) ;
Ogre : : Vector3 ( pos . pos [ 0 ] , pos . pos [ 1 ] , pos . pos [ 2 ] ) ;
Jordan Milne
12 years ago