krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity

finally got rid of the nasty coordinates bug

Browse source
This commit is contained in:
Marc Zinnschlag 2010-08-22 21:30:48 +02:00
parent 15878b12fd
commit 9e8251e6b4
4 changed files with 41 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/openmw/mwrender/playerpos.hpp
View file

@ -58,8 +58,8 @@ namespace MWRender
// Get new camera position, converting back to MW coords. // Get new camera position, converting back to MW coords.
Vector3 pos = camera->getPosition(); Vector3 pos = camera->getPosition();
relX = pos[0]; relX = pos[0];
relY = pos[2]; relY = -pos[2];
relZ = -pos[1]; relZ = pos[1];
// TODO: Collision detection must be used to find the REAL new // TODO: Collision detection must be used to find the REAL new
// position. // position.

8
apps/openmw/mwscript/cellextensions.cpp
View file

@ -62,13 +62,13 @@ namespace MWScript
Interpreter::Type_Integer y = runtime[0].mInteger; Interpreter::Type_Integer y = runtime[0].mInteger;
runtime.pop(); runtime.pop();
const int cellSize = 8192;
ESM::Position pos; ESM::Position pos;
pos.pos[0] = cellSize * (x+0.5);
pos.pos[1] = cellSize * (y+0.5); context.getWorld().indexToPosition (x, y, pos.pos[0], pos.pos[1]);
pos.pos[2] = 0; pos.pos[2] = 0;
pos.rot[0] = pos.rot[1] = pos.rot[2] = 0; pos.rot[0] = pos.rot[1] = pos.rot[2] = 0;
context.getWorld().changeToExteriorCell (pos); context.getWorld().changeToExteriorCell (pos);
} }
}; };

35
apps/openmw/mwworld/world.cpp
View file

@ -633,10 +633,10 @@ namespace MWWorld
void World::changeToExteriorCell (const ESM::Position& position) void World::changeToExteriorCell (const ESM::Position& position)
{ {
const int cellSize = 8192; int x = 0;
int y = 0;
int x = static_cast<int> (position.pos[0] / cellSize); positionToIndex (position.pos[0], position.pos[1], x, y);
int y = static_cast<int> (position.pos[1] / cellSize);
changeCell (x, y, position); changeCell (x, y, position);
} }
@ -692,10 +692,10 @@ namespace MWWorld
if (!(active->first->cell->data.flags & ESM::Cell::Interior)) if (!(active->first->cell->data.flags & ESM::Cell::Interior))
{ {
// exterior -> adjust loaded cells // exterior -> adjust loaded cells
const int cellSize = 8192; int cellX = 0;
int cellY = 0;
int cellX = static_cast<int> (x/cellSize); positionToIndex (x, y, cellX, cellY);
int cellY = static_cast<int> (y/cellSize);
if (active->first->cell->data.gridX!=cellX || active->first->cell->data.gridY!=cellY) if (active->first->cell->data.gridX!=cellX || active->first->cell->data.gridY!=cellY)
{ {
@ -707,4 +707,27 @@ namespace MWWorld
// TODO cell change for non-player ref // TODO cell change for non-player ref
} }
void World::indexToPosition (int cellX, int cellY, float &x, float &y) const
{
const int cellSize = 8192;
x = cellSize * cellX;
y = cellSize * cellY;
}
void World::positionToIndex (float x, float y, int &cellX, int &cellY) const
{
const int cellSize = 8192;
cellX = static_cast<int> (x/cellSize);
if (x<0)
--cellX;
cellY = static_cast<int> (y/cellSize);
if (y<0)
--cellY;
}
} }

6
apps/openmw/mwworld/world.hpp
View file

@ -153,6 +153,12 @@ namespace MWWorld
void deleteObject (Ptr ptr); void deleteObject (Ptr ptr);
void moveObject (Ptr ptr, float x, float y, float z); void moveObject (Ptr ptr, float x, float y, float z);
void indexToPosition (int cellX, int cellY, float &x, float &y) const;
///< Convert cell numbers to position.
void positionToIndex (float x, float y, int &cellX, int &cellY) const;
///< Convert position to cell numbers
}; };
} }