mirror
/
openmw-tes3mp
mirror of https://github.com/TES3MP/openmw-tes3mp.git
1
0
Fork 1
Code Issues Releases Wiki Activity

Physics working

Browse Source
actorid
Jason Hooks 13 years ago
parent b3e1044699
commit 15fcdc8b72
21 changed files with 32 additions and 27 deletions
Show Stats Download Patch File Download Diff File

2
apps/openmw/mwclass/activator.cpp
Unescape Escape View File

@ -36,7 +36,7 @@ namespace MWClass
const std::string &model = ref->base->model;
assert (ref->base != NULL);
if(!model.empty()){
physics.insertObjectPhysics(ptr);
physics.insertObjectPhysics(ptr, "meshes\\" + model);
}
}

2
apps/openmw/mwclass/apparatus.cpp
Unescape Escape View File

@ -38,7 +38,7 @@ namespace MWClass
const std::string &model = ref->base->model;
assert (ref->base != NULL);
if(!model.empty()){
physics.insertObjectPhysics(ptr);
physics.insertObjectPhysics(ptr, "meshes\\" + model);
}
}

2
apps/openmw/mwclass/armor.cpp
Unescape Escape View File

@ -37,7 +37,7 @@ namespace MWClass
const std::string &model = ref->base->model;
assert (ref->base != NULL);
if(!model.empty()){
physics.insertObjectPhysics(ptr);
physics.insertObjectPhysics(ptr, "meshes\\" + model);
}
}

2
apps/openmw/mwclass/book.cpp
Unescape Escape View File

@ -38,7 +38,7 @@ namespace MWClass
const std::string &model = ref->base->model;
assert (ref->base != NULL);
if(!model.empty()){
physics.insertObjectPhysics(ptr);
physics.insertObjectPhysics(ptr, "meshes\\" + model);
}
}

2
apps/openmw/mwclass/clothing.cpp
Unescape Escape View File

@ -38,7 +38,7 @@ namespace MWClass
const std::string &model = ref->base->model;
assert (ref->base != NULL);
if(!model.empty()){
physics.insertObjectPhysics(ptr);
physics.insertObjectPhysics(ptr, "meshes\\" + model);
}
}

2
apps/openmw/mwclass/container.cpp
Unescape Escape View File

@ -34,7 +34,7 @@ namespace MWClass
const std::string &model = ref->base->model;
assert (ref->base != NULL);
if(!model.empty()){
physics.insertObjectPhysics(ptr);
physics.insertObjectPhysics(ptr, "meshes\\" + model);
}
}

2
apps/openmw/mwclass/creature.cpp
Unescape Escape View File

@ -49,7 +49,7 @@ namespace MWClass
const std::string &model = ref->base->model;
assert (ref->base != NULL);
if(!model.empty()){
physics.insertActorPhysics(ptr);
physics.insertActorPhysics(ptr, "meshes\\" + model);
}*/
}

2
apps/openmw/mwclass/door.cpp
Unescape Escape View File

@ -43,7 +43,7 @@ namespace MWClass
const std::string &model = ref->base->model;
assert (ref->base != NULL);
if(!model.empty()){
physics.insertObjectPhysics(ptr);
physics.insertObjectPhysics(ptr, "meshes\\" + model);
}
}

2
apps/openmw/mwclass/ingredient.cpp
Unescape Escape View File

@ -39,7 +39,7 @@ namespace MWClass
const std::string &model = ref->base->model;
assert (ref->base != NULL);
if(!model.empty()){
physics.insertObjectPhysics(ptr);
physics.insertObjectPhysics(ptr, "meshes\\" + model);
}
}

2
apps/openmw/mwclass/light.cpp
Unescape Escape View File

@ -47,7 +47,7 @@ namespace MWClass
const std::string &model = ref->base->model;
assert (ref->base != NULL);
if(!model.empty()){
physics.insertObjectPhysics(ptr);
physics.insertObjectPhysics(ptr, "meshes\\" + model);
}
}

2
apps/openmw/mwclass/lockpick.cpp
Unescape Escape View File

@ -37,7 +37,7 @@ namespace MWClass
const std::string &model = ref->base->model;
assert (ref->base != NULL);
if(!model.empty()){
physics.insertObjectPhysics(ptr);
physics.insertObjectPhysics(ptr, "meshes\\" + model);
}
}

2
apps/openmw/mwclass/misc.cpp
Unescape Escape View File

@ -37,7 +37,7 @@ namespace MWClass
const std::string &model = ref->base->model;
assert (ref->base != NULL);
if(!model.empty()){
physics.insertObjectPhysics(ptr);
physics.insertObjectPhysics(ptr, "meshes\\" + model);
}
}

2
apps/openmw/mwclass/npc.cpp
Unescape Escape View File

@ -58,7 +58,7 @@ namespace MWClass
const std::string &model = ref->base->model;
assert (ref->base != NULL);
if(!model.empty()){
physics.insertActorPhysics(ptr);
physics.insertActorPhysics(ptr, "meshes\\" + model);
}*/
}

2
apps/openmw/mwclass/potion.cpp
Unescape Escape View File

@ -38,7 +38,7 @@ namespace MWClass
const std::string &model = ref->base->model;
assert (ref->base != NULL);
if(!model.empty()){
physics.insertObjectPhysics(ptr);
physics.insertObjectPhysics(ptr, "meshes\\" + model);
}
}

2
apps/openmw/mwclass/probe.cpp
Unescape Escape View File

@ -38,7 +38,7 @@ namespace MWClass
const std::string &model = ref->base->model;
assert (ref->base != NULL);
if(!model.empty()){
physics.insertObjectPhysics(ptr);
physics.insertObjectPhysics(ptr, "meshes\\" + model);
}
}

2
apps/openmw/mwclass/repair.cpp
Unescape Escape View File

@ -37,7 +37,7 @@ namespace MWClass
const std::string &model = ref->base->model;
assert (ref->base != NULL);
if(!model.empty()){
physics.insertObjectPhysics(ptr);
physics.insertObjectPhysics(ptr, "meshes\\" + model);
}
}

2
apps/openmw/mwclass/static.cpp
Unescape Escape View File

@ -33,7 +33,7 @@ namespace MWClass
const std::string &model = ref->base->model;
assert (ref->base != NULL);
if(!model.empty()){
physics.insertObjectPhysics(ptr);
physics.insertObjectPhysics(ptr, "meshes\\" + model);
}
}

2
apps/openmw/mwclass/weapon.cpp
Unescape Escape View File

@ -38,7 +38,7 @@ namespace MWClass
const std::string &model = ref->base->model;
assert (ref->base != NULL);
if(!model.empty()){
physics.insertObjectPhysics(ptr);
physics.insertObjectPhysics(ptr, "meshes\\" + model);
}
}

8
apps/openmw/mwworld/physicssystem.cpp
Unescape Escape View File

@ -183,15 +183,15 @@ namespace MWWorld
throw std::logic_error ("can't find player");
}
void PhysicsSystem::insertObjectPhysics(const MWWorld::Ptr& ptr){
void PhysicsSystem::insertObjectPhysics(const MWWorld::Ptr& ptr, const std::string model){
Ogre::SceneNode* node = ptr.getRefData().getBaseNode();
addObject (node->getName(), node->getName(), node->getOrientation(),
addObject (node->getName(), model, node->getOrientation(),
node->getScale().x, node->getPosition());
}
void PhysicsSystem::insertActorPhysics(const MWWorld::Ptr& ptr){
void PhysicsSystem::insertActorPhysics(const MWWorld::Ptr& ptr, const std::string model){
Ogre::SceneNode* node = ptr.getRefData().getBaseNode();
addActor (node->getName(), node->getName(), node->getPosition());
addActor (node->getName(), model, node->getPosition());
}
}

4
apps/openmw/mwworld/physicssystem.hpp
Unescape Escape View File

@ -35,9 +35,9 @@ namespace MWWorld
bool toggleCollisionMode();
std::pair<std::string, float> getFacedHandle (MWWorld::World& world);
void insertObjectPhysics(const MWWorld::Ptr& ptr);
void insertObjectPhysics(const MWWorld::Ptr& ptr, std::string model);
void insertActorPhysics(const MWWorld::Ptr& ptr);
void insertActorPhysics(const MWWorld::Ptr&, std::string model);
private:
OEngine::Render::OgreRenderer &mRender;

11
apps/openmw/mwworld/scene.cpp
Unescape Escape View File

@ -57,7 +57,6 @@ void insertCellRefList(MWRender::RenderingManager& rendering, MWWorld::Environme
try
{
rendering.addObject(ptr);
class_.insertObject(ptr, physics, environment);
class_.enable (ptr, environment);
@ -101,14 +100,17 @@ namespace MWWorld
void Scene::loadCell (Ptr::CellStore *cell)
{
std::cout << "Start load\n";
// register local scripts
mWorld->getLocalScripts().addCell (cell);
// This connects the cell data with the rendering scene.
mActiveCells.insert(cell);
mRendering.getObjects().buildStaticGeometry(*cell);
std::cout << "Before static\n";
insertCell(*cell, mEnvironment);
mRendering.getObjects().buildStaticGeometry(*cell);
std::cout << "Done loading cell\n";
}
@ -228,6 +230,7 @@ namespace MWWorld
void Scene::changeToInteriorCell (const std::string& cellName, const ESM::Position& position)
{
std::cout << "Changing to interior\n";
// remove active
CellStoreCollection::iterator active = mActiveCells.begin();
@ -309,7 +312,9 @@ void Scene::insertCell(ESMS::CellStore<MWWorld::RefData> &cell,
MWWorld::Environment& environment)
{
// Loop through all references in the cell
std::cout << "Reflist1\n";
insertCellRefList(mRendering, environment, cell.activators, cell, *mPhysics);
std::cout << "Reflist2\n";
insertCellRefList(mRendering, environment, cell.potions, cell, *mPhysics);
insertCellRefList(mRendering, environment, cell.appas, cell, *mPhysics);
insertCellRefList(mRendering, environment, cell.armors, cell, *mPhysics);

Write Preview
Loading…
Cancel
Save