teamnwah
/
openmw-tes3coop
forked from mirror/openmw-tes3mp
2
0
Fork 1
Code Issues Pull Requests 1 Releases Wiki Activity

Report terrain position on cursor position.

Browse Source
loadfix
cc9cii 10 years ago
parent 8b0dc88db8
commit fb0f85c8db
3 changed files with 63 additions and 47 deletions
Show Stats Download Patch File Download Diff File

68
apps/opencs/view/render/pagedworldspacewidget.cpp
Unescape Escape View File

@ -194,52 +194,60 @@ void CSVRender::PagedWorldspaceWidget::mouseReleaseEvent (QMouseEvent *event)
if(!debug || !getCamera()->getViewport())
return;
if(!((uint32_t)getCamera()->getViewport()->getVisibilityMask() & (uint32_t)CSVRender::Element_Reference))
return;
int viewportWidth = getCamera()->getViewport()->getActualWidth();
int viewportHeight = getCamera()->getViewport()->getActualHeight();
float mouseX = (float) event->x()/viewportWidth;
float mouseY = (float) event->y()/viewportHeight;
bool ignoreHeightMap = true;
if(((uint32_t)getCamera()->getViewport()->getVisibilityMask() & (uint32_t)CSVRender::Element_Terrain))
ignoreHeightMap = false;
// Need to set scene manager each time in case there are multiple subviews
CSVWorld::PhysicsSystem::instance()->setSceneManager(getSceneManager());
std::pair<bool, std::string> result = CSVWorld::PhysicsSystem::instance()->castRay(
mouseX, mouseY, NULL, NULL, getCamera(), ignoreHeightMap);
if(result.first)
std::pair<std::string, Ogre::Vector3> result = CSVWorld::PhysicsSystem::instance()->castRay(
mouseX, mouseY, NULL, NULL, getCamera());
if(result.first != "")
{
std::cout << "ReferenceId: " << result.second << std::endl;
const CSMWorld::CellRef& cellref = mDocument.getData().getReferences().getRecord (result.second).get();
//std::cout << "CellRef.mId: " << cellref.mId << std::endl; // Same as ReferenceId
std::cout << "CellRef.mCell: " << cellref.mCell << std::endl;
const CSMWorld::RefCollection& references = mDocument.getData().getReferences();
int index = references.searchId(result.second);
if (index != -1)
// FIXME: is there a better way to distinguish terrain from objects?
QString name = QString(result.first.c_str());
if(name.contains(QRegExp("^HeightField")))
{
int columnIndex =
references.findColumnIndex(CSMWorld::Columns::ColumnId_ReferenceableId);
// terrain
std::cout << "terrain: " << result.first << std::endl;
std::cout << " hit pos "+ QString::number(result.second.x).toStdString()
+ ", " + QString::number(result.second.y).toStdString()
+ ", " + QString::number(result.second.z).toStdString()
<< std::endl;
std::cout << "index: " + QString::number(index).toStdString()
+", column index: " + QString::number(columnIndex).toStdString() << std::endl;
}
std::map<CSMWorld::CellCoordinates, Cell *>::iterator iter (mCells.begin());
while (iter!=mCells.end())
else
{
if(iter->first.getId("dummy") == cellref.mCell)
std::cout << "ReferenceId: " << result.first << std::endl;
const CSMWorld::CellRef& cellref = mDocument.getData().getReferences().getRecord (result.first).get();
//std::cout << "CellRef.mId: " << cellref.mId << std::endl; // Same as ReferenceId
std::cout << " CellRef.mCell: " << cellref.mCell << std::endl;
const CSMWorld::RefCollection& references = mDocument.getData().getReferences();
int index = references.searchId(result.first);
if (index != -1)
{
//std::cout << "Cell found" << std::endl;
break;
int columnIndex =
references.findColumnIndex(CSMWorld::Columns::ColumnId_ReferenceableId);
std::cout << " index: " + QString::number(index).toStdString()
+", column index: " + QString::number(columnIndex).toStdString() << std::endl;
}
++iter;
std::map<CSMWorld::CellCoordinates, Cell *>::iterator iter (mCells.begin());
while (iter!=mCells.end())
{
if(iter->first.getId("dummy") == cellref.mCell)
{
//std::cout << "Cell found" << std::endl;
break;
}
++iter;
}
flagAsModified();
}
flagAsModified();
}
}
}

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

@ -13,6 +13,7 @@
#include <openengine/bullet/physic.hpp>
#include <components/nifbullet/bulletnifloader.hpp>
#include "../../model/settings/usersettings.hpp"
#include "../render/elements.hpp"
namespace
{
@ -174,16 +175,17 @@ namespace CSVWorld
return; // FIXME: add a warning message
mEngine->toggleDebugRendering();
mEngine->stepSimulation(0.0167); // FIXME: DebugDrawer::step() not accessible
mEngine->stepSimulation(0.0167); // DebugDrawer::step() not directly accessible
}
std::pair<bool, std::string> PhysicsSystem::castRay(float mouseX, float mouseY,
Ogre::Vector3* normal, std::string* hit, Ogre::Camera *camera, bool ignoreHeightMap)
// FIXME: this method needs a cleanup/refactoring
std::pair<std::string, Ogre::Vector3> PhysicsSystem::castRay(float mouseX, float mouseY,
Ogre::Vector3* normal, std::string* hit, Ogre::Camera *camera)
{
CSMSettings::UserSettings &userSettings = CSMSettings::UserSettings::instance();
bool debug = userSettings.setting ("debug/mouse-picking", QString("false")) == "true" ? true : false;
if(!mSceneMgr)
return std::make_pair(false, ""); // FIXME: add a warning message
if(!mSceneMgr || !camera || !camera->getViewport())
return std::make_pair("", Ogre::Vector3(0,0,0)); // FIXME: add a warning message
// using a really small value seems to mess up with the projections
float nearClipDistance = camera->getNearClipDistance();
@ -199,17 +201,19 @@ namespace CSVWorld
_from = btVector3(from.x, from.y, from.z);
_to = btVector3(to.x, to.y, to.z);
bool raycastingObjectOnly = true; // FIXME
uint32_t visibilityMask = camera->getViewport()->getVisibilityMask();
bool ignoreHeightMap = !(visibilityMask & (uint32_t)CSVRender::Element_Terrain);
bool ignoreObjects = !(visibilityMask & (uint32_t)CSVRender::Element_Reference);
Ogre::Vector3 norm;
std::pair<std::string, float> result =
mEngine->rayTest(_from, _to, raycastingObjectOnly, ignoreHeightMap, &norm);
mEngine->rayTest(_from, _to, !ignoreObjects, ignoreHeightMap, &norm);
std::string sceneNode;
if(result.first != "")
sceneNode = mRefToSceneNode[result.first];
if ((result.first == "") || !mSceneMgr->hasSceneNode(sceneNode))
return std::make_pair(false, "");
else
if(result.first == "")
return std::make_pair("", Ogre::Vector3(0,0,0));
std::string sceneNode = mRefToSceneNode[result.first];
if(!ignoreObjects && mSceneMgr->hasSceneNode(sceneNode))
{
//TODO: Try http://www.ogre3d.org/tikiwiki/Create+outline+around+a+character
Ogre::SceneNode *scene = mSceneMgr->getSceneNode(sceneNode);
@ -275,7 +279,12 @@ namespace CSVWorld
showHitPoint(mSceneMgr, sceneNode, ray.getPoint(farClipDist*result.second));
}
return std::make_pair(true, result.first);
return std::make_pair(result.first, ray.getPoint(farClipDist*result.second));
}
else
{
// terrain
return std::make_pair(result.first, ray.getPoint(farClipDist*result.second));
}
}
}

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

@ -57,9 +57,8 @@ namespace CSVWorld
void toggleDebugRendering();
std::pair<bool, std::string> castRay(float mouseX, float mouseY,
Ogre::Vector3* normal, std::string* hit,
Ogre::Camera *camera, bool ignoreHeightMap);
std::pair<std::string, Ogre::Vector3> castRay(float mouseX, float mouseY,
Ogre::Vector3* normal, std::string* hit, Ogre::Camera *camera);
};
}

Write Preview
Loading…
Cancel
Save