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

Minor refactoring and cleanup.

Browse Source
loadfix
cc9cii 10 years ago
parent cca6d0a024
commit 4d86371ca3
2 changed files with 100 additions and 92 deletions
Show Stats Download Patch File Download Diff File

120
apps/opencs/view/world/physicssystem.cpp
Unescape Escape View File

@ -14,6 +14,29 @@
#include <components/nifbullet/bulletnifloader.hpp>
#include "../../model/settings/usersettings.hpp"
namespace
{
void showHitPoint(Ogre::SceneManager *sceneMgr, std::string name, Ogre::Vector3 point)
{
sceneMgr->destroyManualObject("manual" + name);
Ogre::ManualObject* manual = sceneMgr->createManualObject("manual" + name);
manual->begin("BaseWhite", Ogre::RenderOperation::OT_LINE_LIST);
manual-> position(point.x, point.y, point.z-100);
manual-> position(point.x, point.y, point.z+100);
manual-> position(point.x, point.y-100, point.z);
manual-> position(point.x, point.y+100, point.z);
manual-> position(point.x-100, point.y, point.z);
manual-> position(point.x+100, point.y, point.z);
manual->end();
sceneMgr->getRootSceneNode()->createChildSceneNode()->attachObject(manual);
}
void removeHitPoint(Ogre::SceneManager *sceneMgr, std::string name)
{
sceneMgr->destroyManualObject("manual" + name);
}
}
namespace CSVWorld
{
PhysicsSystem::PhysicsSystem(Ogre::SceneManager *sceneMgr) : mSceneMgr(sceneMgr)
@ -24,7 +47,7 @@ namespace CSVWorld
mEngine->setSceneManager(sceneMgr); // needed for toggleDebugRendering()
// material for visual cue
// material for visual cue on selected objects
Ogre::TexturePtr texture = Ogre::TextureManager::getSingleton().getByName("DynamicTrans");
if(texture.isNull())
{
@ -89,15 +112,21 @@ namespace CSVWorld
float scale,
const Ogre::Vector3 &position,
const Ogre::Quaternion &rotation,
//Ogre::Vector3* scaledBoxTranslation,
//Ogre::Quaternion* boxRotation,
//bool raycasting,
bool placeable)
{
//handleToMesh[node->getName()] = mesh;
//mHandleToMesh[name] = mesh;
mEngine->createAndAdjustRigidBody(mesh, name, scale, position, rotation,
0, 0, true, placeable);
0, // scaledBoxTranslation
0, // boxRotation
true, // raycasting
placeable);
}
void PhysicsSystem::removeObject(const std::string& name)
{
mEngine->removeRigidBody(name);
mEngine->deleteRigidBody(name);
}
void PhysicsSystem::toggleDebugRendering()
@ -107,7 +136,7 @@ namespace CSVWorld
Ogre::Root::getSingleton().renderOneFrame(); // FIXME: temporary workaround for immediate visual feedback
}
/*std::pair<bool, Ogre::Vector3>*/ void PhysicsSystem::castRay(float mouseX, float mouseY,
std::pair<bool, Ogre::Vector3> PhysicsSystem::castRay(float mouseX, float mouseY,
Ogre::Vector3* normal, std::string* hit, Ogre::Camera *camera)
{
// using a really small value seems to mess up with the projections
@ -131,53 +160,17 @@ namespace CSVWorld
std::pair<std::string, float> result =
mEngine->rayTest(_from, _to, raycastingObjectOnly, ignoreHeightMap, &norm);
if (result.first == "")
//return std::make_pair(false, Ogre::Vector3());
std::cout << "no hit" << std::endl;
if ((result.first == "") || !mSceneMgr->hasSceneNode(result.first))
return std::make_pair(false, Ogre::Vector3());
//std::cout << "no hit" << std::endl;
else
{
std::cout << "hit " << result.first
+ " result " + std::to_string(result.second*farClipDist) << std::endl;
std::cout << "normal " + std::to_string(norm.x)
+ ", " + std::to_string(norm.y)
+ ", " + std::to_string(norm.z) << std::endl;
std::cout << "hit pos "+ std::to_string(ray.getPoint(farClipDist*result.second).x)
+ ", " + std::to_string(ray.getPoint(farClipDist*result.second).y)
+ ", " + std::to_string(ray.getPoint(farClipDist*result.second).z) << std::endl;
if(mSceneMgr->hasSceneNode(result.first))
{
// FIXME: for debugging cursor position
mSceneMgr->destroyManualObject("manual" + result.first);
Ogre::ManualObject* manual = mSceneMgr->createManualObject("manual" + result.first);
manual->begin("BaseWhite", Ogre::RenderOperation::OT_LINE_LIST);
manual-> position(ray.getPoint(farClipDist*result.second).x,
ray.getPoint(farClipDist*result.second).y,
ray.getPoint(farClipDist*result.second).z);
manual-> position(ray.getPoint(farClipDist*result.second).x,
ray.getPoint(farClipDist*result.second).y,
ray.getPoint(farClipDist*result.second).z+1000);
manual-> position(ray.getPoint(farClipDist*result.second).x,
ray.getPoint(farClipDist*result.second).y,
ray.getPoint(farClipDist*result.second).z);
manual-> position(ray.getPoint(farClipDist*result.second).x,
ray.getPoint(farClipDist*result.second).y+1000,
ray.getPoint(farClipDist*result.second).z);
manual-> position(ray.getPoint(farClipDist*result.second).x,
ray.getPoint(farClipDist*result.second).y,
ray.getPoint(farClipDist*result.second).z);
manual-> position(ray.getPoint(farClipDist*result.second).x+1000,
ray.getPoint(farClipDist*result.second).y,
ray.getPoint(farClipDist*result.second).z);
manual->end();
mSceneMgr->getRootSceneNode()->createChildSceneNode()->attachObject(manual);
// end debugging cursor position
//TODO: Try http://www.ogre3d.org/tikiwiki/Create+outline+around+a+character
Ogre::SceneNode *scene = mSceneMgr->getSceneNode(result.first);
std::map<std::string, std::vector<std::string>>::iterator iter =
mSelectedEntities.find(result.first);
if(iter != mSelectedEntities.end()) // currently selected
{
//scene->showBoundingBox(false);
std::vector<std::string> deletedEntities = mSelectedEntities[result.first];
while(!deletedEntities.empty())
{
@ -186,11 +179,11 @@ namespace CSVWorld
deletedEntities.pop_back();
}
mSelectedEntities.erase(iter);
mSceneMgr->destroyManualObject("manual" + result.first);
removeHitPoint(mSceneMgr, result.first); // FIXME: for debugging
}
else
{
//scene->showBoundingBox(true);
std::vector<std::string> clonedEntities;
Ogre::SceneNode::ObjectIterator iter = scene->getAttachedObjectIterator();
iter.begin();
@ -200,14 +193,14 @@ namespace CSVWorld
if(element->getMovableType() != "Entity")
continue;
Ogre::Entity * e = dynamic_cast<Ogre::Entity *>(element);
if(mSceneMgr->hasEntity(e->getName()+"cover"))
Ogre::Entity * entity = dynamic_cast<Ogre::Entity *>(element);
if(mSceneMgr->hasEntity(entity->getName()+"cover"))
{
// FIXME: this shouldn't really happen...
scene->detachObject(e->getName()+"cover");
mSceneMgr->destroyEntity(e->getName()+"cover");
// FIXME: this shouldn't really happen... but does :(
scene->detachObject(entity->getName()+"cover");
mSceneMgr->destroyEntity(entity->getName()+"cover");
}
Ogre::Entity * clone = e->clone(e->getName()+"cover");
Ogre::Entity * clone = entity->clone(entity->getName()+"cover");
Ogre::MaterialPtr mat =
Ogre::MaterialManager::getSingleton().getByName("TransMaterial");
@ -215,15 +208,28 @@ namespace CSVWorld
{
clone->setMaterial(mat);
scene->attachObject(clone);
clonedEntities.push_back(e->getName()+"cover");
clonedEntities.push_back(entity->getName()+"cover");
}
}
mSelectedEntities[result.first] = clonedEntities;
// FIXME: show cursor position for debugging
showHitPoint(mSceneMgr, result.first, ray.getPoint(farClipDist*result.second));
}
// FIXME: temporary workaround for immediate visual feedback
Ogre::Root::getSingleton().renderOneFrame();
}
#if 0
std::cout << "hit " << result.first
+ " result " + std::to_string(result.second*farClipDist) << std::endl;
std::cout << "normal " + std::to_string(norm.x)
+ ", " + std::to_string(norm.y)
+ ", " + std::to_string(norm.z) << std::endl;
std::cout << "hit pos "+ std::to_string(ray.getPoint(farClipDist*result.second).x)
+ ", " + std::to_string(ray.getPoint(farClipDist*result.second).y)
+ ", " + std::to_string(ray.getPoint(farClipDist*result.second).z) << std::endl;
#endif
return std::make_pair(true, ray.getPoint(farClipDist*result.second));
}
}
}

6
apps/opencs/view/world/physicssystem.hpp
Unescape Escape View File

@ -24,7 +24,7 @@ namespace CSVWorld
{
class PhysicsSystem
{
std::map<std::string, std::string> handleToMesh;
//std::map<std::string, std::string> mHandleToMesh;
OEngine::Physic::PhysicEngine* mEngine;
Ogre::SceneManager *mSceneMgr;
std::map<std::string, std::vector<std::string>> mSelectedEntities;
@ -44,9 +44,11 @@ namespace CSVWorld
//bool raycasting=false,
bool placeable=false);
void removeObject(const std::string &name);
void toggleDebugRendering();
/*std::pair<bool, Ogre::Vector3>*/ void castRay(float mouseX, float mouseY,
std::pair<bool, Ogre::Vector3> castRay(float mouseX, float mouseY,
Ogre::Vector3* normal, std::string* hit, Ogre::Camera *camera);
};
}

Write Preview
Loading…
Cancel
Save