mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-06 11:45:35 +00:00
Code Issues Releases Wiki Activity

Fix the name of DragRecordTable::startDrag method. Make the compiler be quiet about BulletShapeLoader's hidden overloaded methods.

Browse source
This commit is contained in:
cc9cii 2015-03-14 19:41:55 +11:00
parent 17e6244bd6
commit 15b9a628ac
8 changed files with 20 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/opencs/view/tools/reporttable.cpp
View file

@ -30,7 +30,7 @@ void CSVTools::ReportTable::contextMenuEvent (QContextMenuEvent *event)
void CSVTools::ReportTable::mouseMoveEvent (QMouseEvent *event)
{
if (event->buttons() & Qt::LeftButton)
startDragToTable (*this);
startDragFromTable (*this);
}
void CSVTools::ReportTable::mouseDoubleClickEvent (QMouseEvent *event)

2
apps/opencs/view/world/dragrecordtable.cpp
View file

@ -3,7 +3,7 @@
#include "../../model/world/tablemimedata.hpp"
#include "dragrecordtable.hpp"
void CSVWorld::DragRecordTable::startDragToTable (const CSVWorld::DragRecordTable& table)
void CSVWorld::DragRecordTable::startDragFromTable (const CSVWorld::DragRecordTable& table)
{
CSMWorld::TableMimeData* mime = new CSMWorld::TableMimeData (table.getDraggedRecords(), mDocument);

2
apps/opencs/view/world/dragrecordtable.hpp
View file

@ -33,7 +33,7 @@ namespace CSVWorld
void setEditLock(bool locked);
protected:
void startDragToTable(const DragRecordTable& table);
void startDragFromTable(const DragRecordTable& table);
void dragEnterEvent(QDragEnterEvent *event);

2
apps/opencs/view/world/regionmap.cpp
View file

@ -345,7 +345,7 @@ void CSVWorld::RegionMap::viewInTable()
void CSVWorld::RegionMap::mouseMoveEvent (QMouseEvent* event)
{
startDragToTable(*this);
startDragFromTable(*this);
}
std::vector< CSMWorld::UniversalId > CSVWorld::RegionMap::getDraggedRecords() const

2
apps/opencs/view/world/table.cpp
View file

@ -635,7 +635,7 @@ void CSVWorld::Table::mouseMoveEvent (QMouseEvent* event)
{
if (event->buttons() & Qt::LeftButton)
{
startDragToTable(*this);
startDragFromTable(*this);
}
}

7
libs/openengine/bullet/BulletShapeLoader.cpp
View file

@ -117,6 +117,13 @@ BulletShapePtr BulletShapeManager::create (const Ogre::String& name, const Ogre:
return createResource(name,group,isManual,loader,createParams).staticCast<BulletShape>();
}
Ogre::ResourcePtr BulletShapeManager::load(const Ogre::String &name, const Ogre::String &group,
bool isManual, Ogre::ManualResourceLoader *loader, const Ogre::NameValuePairList *loadParams,
bool backgroundThread)
{
return this->load(name, group);
}
BulletShapePtr BulletShapeManager::load(const Ogre::String &name, const Ogre::String &group)
{
BulletShapePtr textf = getByName(name);

8
libs/openengine/bullet/BulletShapeLoader.h
View file

@ -92,6 +92,11 @@ private:
/** \brief Private operator= . This is a forbidden operation. */
BulletShapeManager& operator=(const BulletShapeManager &);
// Not intended to be used, declared here to keep the compiler from complaining
// about hidden virtual methods.
virtual Ogre::ResourcePtr load(const Ogre::String &name, const Ogre::String &group,
bool isManual, Ogre::ManualResourceLoader *loader, const Ogre::NameValuePairList *loadParams,
bool backgroundThread);
public:
@ -101,7 +106,8 @@ public:
/// Get a resource by name
/// @see ResourceManager::getByName
BulletShapePtr getByName(const Ogre::String& name, const Ogre::String& groupName = Ogre::ResourceGroupManager::AUTODETECT_RESOURCE_GROUP_NAME);
BulletShapePtr getByName(const Ogre::String& name,
const Ogre::String& groupName = Ogre::ResourceGroupManager::AUTODETECT_RESOURCE_GROUP_NAME);
/// Create a new shape
/// @see ResourceManager::createResource

2
libs/openengine/bullet/physic.cpp
View file

@ -828,7 +828,7 @@ namespace Physic
if (callback.hasHit())
return std::make_pair(true, callback.m_closestHitFraction);
else
return std::make_pair(false, 1);
return std::make_pair(false, 1.0f);
}
std::vector< std::pair<float, std::string> > PhysicEngine::rayTest2(const btVector3& from, const btVector3& to, int filterGroup)