mirror of
https://gitlab.com/OpenMW/openmw.git
synced 2025-01-25 06:35:30 +00:00
Cleanup trace.cpp/h
This commit is contained in:
Chris Robinson
parent
f5afa43db5
commit
735c1ec2ae
@ -3,190 +3,116 @@
|
|||||||
|
|
||||||
#include <map>
|
#include <map>
|
||||||
|
|
||||||
|
#include <btBulletDynamicsCommon.h>
|
||||||
|
#include <btBulletCollisionCommon.h>
|
||||||
|
|
||||||
#include "physic.hpp"
|
#include "physic.hpp"
|
||||||
#include "pmove.h"
|
#include "pmove.h"
|
||||||
|
|
||||||
|
|
||||||
void newtrace(traceResults* const results, const Ogre::Vector3& start, const Ogre::Vector3& end, const Ogre::Vector3& BBHalfExtents, const float rotation, bool isInterior, OEngine::Physic::PhysicEngine* enginePass) //Traceobj was a Aedra Object
|
enum traceWorldType
|
||||||
{
|
{
|
||||||
//static float lastyaw = 0.0f;
|
collisionWorldTrace = 1,
|
||||||
//static float lastpitch = 0.0f;
|
pickWorldTrace = 2,
|
||||||
//if (!traceobj)
|
bothWorldTrace = collisionWorldTrace | pickWorldTrace
|
||||||
// return;
|
};
|
||||||
|
|
||||||
//if (!traceobj->incellptr)
|
|
||||||
// return;
|
|
||||||
|
|
||||||
|
|
||||||
const Ogre::Vector3 rayDir = end - start;
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
NewPhysTraceResults out;
|
|
||||||
//std::cout << "Starting trace\n";
|
|
||||||
//Ogre::Vector3 startReplace = Ogre::Vector3(650,950, 45);
|
|
||||||
//Ogre::Vector3 endReplace = startReplace;
|
|
||||||
//endReplace.z -= .25;
|
|
||||||
|
|
||||||
const bool hasHit = NewPhysicsTrace<collisionWorldTrace>(&out, start, end, BBHalfExtents, Ogre::Vector3(0.0f, 0.0f, 0.0f), isInterior, enginePass);
|
|
||||||
|
|
||||||
if (out.fraction < 0.001f)
|
|
||||||
results->startsolid = true;
|
|
||||||
else
|
|
||||||
results->startsolid = false;
|
|
||||||
|
|
||||||
|
|
||||||
//results->allsolid = out.startSolid;
|
|
||||||
|
|
||||||
// If outside and underground, we're solid
|
|
||||||
/*if (isInterior)
|
|
||||||
{
|
|
||||||
const Ogre::Vector3 height = GetGroundPosition(start, CellCoords(traceCell->data->gridX, traceCell->data->gridY) );
|
|
||||||
if (start.yPos - height.yPos < (-2.0f * BBHalfExtents.yPos) )
|
|
||||||
{
|
|
||||||
results->allsolid = true;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
results->allsolid = false;
|
|
||||||
}*/
|
|
||||||
|
|
||||||
// If inside and out of the tree, we're solid
|
|
||||||
//else
|
|
||||||
//{
|
|
||||||
results->allsolid = out.startSolid;
|
|
||||||
//std::cout << "allsolid" << results->allsolid << "\n";
|
|
||||||
//}
|
|
||||||
|
|
||||||
if (!hasHit)
|
|
||||||
{
|
|
||||||
results->endpos = end;
|
|
||||||
results->planenormal = Ogre::Vector3(0.0f, 0.0f, 1.0f);
|
|
||||||
results->entityNum = ENTITYNUM_NONE;
|
|
||||||
results->fraction = 1.0f;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
results->fraction = out.fraction;
|
|
||||||
results->planenormal = out.hitNormal;
|
|
||||||
results->endpos = rayDir * results->fraction + start;
|
|
||||||
results->entityNum = ENTITYNUM_WORLD;
|
|
||||||
/*bprintf("Start: (%f, %f, %f) End: (%f, %f, %f) TraceDir: (%f, %f, %f) HitNormal: (%f, %f, %f) Fraction: %f Hitpos: (%f, %f, %f) CompensatedHitpos: (%f, %f, %f)\n",
|
|
||||||
start.xPos, start.yPos, start.zPos,
|
|
||||||
end.xPos, end.yPos, end.zPos,
|
|
||||||
rayDir.xPos, rayDir.yPos, rayDir.zPos,
|
|
||||||
results->planenormal.xPos, results->planenormal.yPos, results->planenormal.zPos, results->fraction,
|
|
||||||
out.endPos.xPos, out.endPos.yPos, out.endPos.zPos,
|
|
||||||
results->endpos.xPos, results->endpos.yPos, results->endpos.zPos);*/
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
enum collaborativePhysicsType
|
||||||
|
{
|
||||||
|
No_Physics = 0, // Both are empty (example: statics you can walk through, like tall grass)
|
||||||
|
Only_Collision = 1, // This object only has collision physics but no pickup physics (example: statics)
|
||||||
|
Only_Pickup = 2, // This object only has pickup physics but no collision physics (example: items dropped on the ground)
|
||||||
|
Both_Physics = 3 // This object has both kinds of physics (example: activators)
|
||||||
|
};
|
||||||
|
|
||||||
|
struct NewPhysTraceResults
|
||||||
|
{
|
||||||
|
Ogre::Vector3 endPos;
|
||||||
|
Ogre::Vector3 hitNormal;
|
||||||
|
float fraction;
|
||||||
|
bool startSolid;
|
||||||
|
//const Object* hitObj;
|
||||||
|
};
|
||||||
|
|
||||||
template <const traceWorldType traceType>
|
template <const traceWorldType traceType>
|
||||||
const bool NewPhysicsTrace(NewPhysTraceResults* const out, const Ogre::Vector3& start, const Ogre::Vector3& end,
|
static const bool NewPhysicsTrace(NewPhysTraceResults* const out, const Ogre::Vector3& start, const Ogre::Vector3& end,
|
||||||
const Ogre::Vector3& BBHalfExtents, const Ogre::Vector3& rotation, bool isInterior, OEngine::Physic::PhysicEngine* enginePass)
|
const Ogre::Vector3& BBHalfExtents, const Ogre::Vector3& rotation, bool isInterior,
|
||||||
|
OEngine::Physic::PhysicEngine* enginePass)
|
||||||
{
|
{
|
||||||
//if (!traceobj->incellptr)
|
const btVector3 btstart(start.x, start.y, start.z + BBHalfExtents.z);
|
||||||
// return false;
|
const btVector3 btend(end.x, end.y, end.z + BBHalfExtents.z);
|
||||||
//if(enginePass->dynamicsWorld->getCollisionObjectArray().at(60)->getCollisionShape()->isConvex())
|
const btQuaternion btrot(rotation.y, rotation.x, rotation.z); //y, x, z
|
||||||
// std::cout << "It's convex\n";
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
const btVector3 btstart(start.x, start.y, start.z + BBHalfExtents.z);
|
|
||||||
const btVector3 btend(end.x, end.y, end.z + BBHalfExtents.z);
|
|
||||||
const btQuaternion btrot(rotation.y, rotation.x, rotation.z); //y, x, z
|
|
||||||
|
|
||||||
const btBoxShape newshape(btVector3(BBHalfExtents.x, BBHalfExtents.y, BBHalfExtents.z));
|
const btBoxShape newshape(btVector3(BBHalfExtents.x, BBHalfExtents.y, BBHalfExtents.z));
|
||||||
//const btCapsuleShapeZ newshape(BBHalfExtents.x, BBHalfExtents.z * 2 - BBHalfExtents.x * 2);
|
//const btCapsuleShapeZ newshape(BBHalfExtents.x, BBHalfExtents.z * 2 - BBHalfExtents.x * 2);
|
||||||
const btTransform from(btrot, btstart);
|
const btTransform from(btrot, btstart);
|
||||||
const btTransform to(btrot, btend);
|
const btTransform to(btrot, btend);
|
||||||
|
|
||||||
// warning: unused variable ...
|
btCollisionWorld::ClosestConvexResultCallback newTraceCallback(btstart, btend);
|
||||||
/*
|
|
||||||
float x = from.getOrigin().getX();
|
|
||||||
float y = from.getOrigin().getY();
|
|
||||||
float z = from.getOrigin().getZ();
|
|
||||||
float x2 = to.getOrigin().getX();
|
|
||||||
float y2 = to.getOrigin().getY();
|
|
||||||
float z2 = to.getOrigin().getZ();
|
|
||||||
*/
|
|
||||||
|
|
||||||
//std::cout << "BtFrom: " << x << "," << y << "," << z << "\n";
|
|
||||||
//std::cout << "BtTo: " << x2 << "," << y2 << "," << z2 << "\n";
|
|
||||||
//std::cout << "BtTo: " << to.getOrigin().getX() << "," << to.getOrigin().getY() << "," << to.getOrigin().getZ() << "\n";
|
|
||||||
|
|
||||||
|
newTraceCallback.m_collisionFilterMask = (traceType == collisionWorldTrace) ? Only_Collision : Only_Pickup;
|
||||||
|
|
||||||
btCollisionWorld::ClosestConvexResultCallback
|
enginePass->dynamicsWorld->convexSweepTest(&newshape, from, to, newTraceCallback);
|
||||||
newTraceCallback(btstart, btend);
|
|
||||||
|
|
||||||
newTraceCallback.m_collisionFilterMask = (traceType == collisionWorldTrace) ? Only_Collision : Only_Pickup;
|
// Copy the hit data over to our trace results struct:
|
||||||
|
out->fraction = newTraceCallback.m_closestHitFraction;
|
||||||
|
|
||||||
enginePass->dynamicsWorld->convexSweepTest(&newshape, from, to, newTraceCallback);
|
|
||||||
//newTraceCallback.
|
|
||||||
|
|
||||||
|
|
||||||
//std::cout << "NUM: " << enginePass->dynamicsWorld->getNumCollisionObjects() << "\n";
|
|
||||||
|
|
||||||
// Copy the hit data over to our trace results struct:
|
const btVector3& tracehitnormal = newTraceCallback.m_hitNormalWorld;
|
||||||
out->fraction = newTraceCallback.m_closestHitFraction;
|
out->hitNormal.x = tracehitnormal.x();
|
||||||
|
out->hitNormal.y = tracehitnormal.y();
|
||||||
|
out->hitNormal.z = tracehitnormal.z();
|
||||||
|
|
||||||
Ogre::Vector3& outhitnormal = out->hitNormal;
|
const btVector3& tracehitpos = newTraceCallback.m_hitPointWorld;
|
||||||
const btVector3& tracehitnormal = newTraceCallback.m_hitNormalWorld;
|
out->endPos.x = tracehitpos.x();
|
||||||
|
out->endPos.y = tracehitpos.y();
|
||||||
|
out->endPos.z = tracehitpos.z();
|
||||||
|
|
||||||
outhitnormal.x = tracehitnormal.x();
|
// StartSolid test:
|
||||||
outhitnormal.y = tracehitnormal.y();
|
{
|
||||||
outhitnormal.z = tracehitnormal.z();
|
out->startSolid = false;
|
||||||
|
if(isInterior)
|
||||||
Ogre::Vector3& outhitpos = out->endPos;
|
{
|
||||||
const btVector3& tracehitpos = newTraceCallback.m_hitPointWorld;
|
// If inside and out of the tree, we're solid
|
||||||
|
btVector3 aabbMin, aabbMax;
|
||||||
outhitpos.x = tracehitpos.x();
|
enginePass->broadphase->getBroadphaseAabb(aabbMin, aabbMax);
|
||||||
outhitpos.y = tracehitpos.y();
|
btVector3 point(start.x, start.y, start.z);
|
||||||
outhitpos.z= tracehitpos.z();
|
if(!TestPointAgainstAabb2(aabbMin, aabbMax, point))
|
||||||
|
{
|
||||||
// StartSolid test:
|
//We're solid
|
||||||
{
|
//THIS NEEDS TO BE TURNED OFF IF WE WANT FALLING IN EXTERIORS TO WORK CORRECTLY!!!!!!!
|
||||||
out->startSolid = false;
|
|
||||||
//btCollisionObject collision;
|
|
||||||
//collision.setCollisionShape(const_cast<btBoxShape* const>(&newshape) );
|
|
||||||
|
|
||||||
//CustomContactCallback crb;
|
|
||||||
|
|
||||||
//world.world->contactTest(&collision, crb);
|
|
||||||
//out->startSolid = crb.hit;
|
|
||||||
|
|
||||||
// If outside and underground, we're solid
|
|
||||||
if (!isInterior) //Check if we are interior
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
// If inside and out of the tree, we're solid
|
|
||||||
else
|
|
||||||
{
|
|
||||||
btVector3 aabbMin, aabbMax;
|
|
||||||
enginePass->broadphase->getBroadphaseAabb(aabbMin, aabbMax);
|
|
||||||
//std::cout << "AABBMIN" << aabbMin.getX() <<"," <<aabbMin.getY() << "," << aabbMin.getZ() << "\n";
|
|
||||||
//std::cout << "AABBMAX" << aabbMax.getX() <<"," <<aabbMax.getY() << "," << aabbMax.getZ() << "\n";
|
|
||||||
//std::cout << "AABBMAX" << aabbMax << "\n";
|
|
||||||
if (!TestPointAgainstAabb2(aabbMin, aabbMax, *(const btVector3* const)&(start) ) )
|
|
||||||
{
|
|
||||||
//We're solid
|
|
||||||
//THIS NEEDS TO BE TURNED OFF IF WE WANT FALLING IN EXTERIORS TO WORK CORRECTLY!!!!!!!
|
|
||||||
//out->startSolid = true;
|
//out->startSolid = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
const bool hasHit = newTraceCallback.hasHit();
|
return newTraceCallback.hasHit();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void newtrace(traceResults* const results, const Ogre::Vector3& start, const Ogre::Vector3& end, const Ogre::Vector3& BBHalfExtents, const float rotation, bool isInterior, OEngine::Physic::PhysicEngine* enginePass) //Traceobj was a Aedra Object
|
||||||
return hasHit;
|
{
|
||||||
|
NewPhysTraceResults out;
|
||||||
|
const bool hasHit = NewPhysicsTrace<collisionWorldTrace>(&out, start, end, BBHalfExtents,
|
||||||
|
Ogre::Vector3(0.0f, 0.0f, 0.0f),
|
||||||
|
isInterior, enginePass);
|
||||||
|
if (out.fraction < 0.001f)
|
||||||
|
results->startsolid = true;
|
||||||
|
else
|
||||||
|
results->startsolid = false;
|
||||||
|
results->allsolid = out.startSolid;
|
||||||
|
|
||||||
|
if(!hasHit)
|
||||||
|
{
|
||||||
|
results->endpos = end;
|
||||||
|
results->planenormal = Ogre::Vector3(0.0f, 0.0f, 1.0f);
|
||||||
|
results->entityNum = ENTITYNUM_NONE;
|
||||||
|
results->fraction = 1.0f;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
results->fraction = out.fraction;
|
||||||
|
results->planenormal = out.hitNormal;
|
||||||
|
results->endpos = (end-start)*results->fraction + start;
|
||||||
|
results->entityNum = ENTITYNUM_WORLD;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,10 +1,6 @@
|
|||||||
#ifndef OENGINE_BULLET_TRACE_H
|
#ifndef OENGINE_BULLET_TRACE_H
|
||||||
#define OENGINE_BULLET_TRACE_H
|
#define OENGINE_BULLET_TRACE_H
|
||||||
|
|
||||||
|
|
||||||
#include <btBulletDynamicsCommon.h>
|
|
||||||
#include <btBulletCollisionCommon.h>
|
|
||||||
|
|
||||||
#include <OgreVector3.h>
|
#include <OgreVector3.h>
|
||||||
|
|
||||||
|
|
||||||
@ -17,52 +13,21 @@ namespace OEngine
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
enum traceWorldType
|
|
||||||
{
|
|
||||||
collisionWorldTrace = 1,
|
|
||||||
pickWorldTrace = 2,
|
|
||||||
bothWorldTrace = collisionWorldTrace | pickWorldTrace
|
|
||||||
};
|
|
||||||
|
|
||||||
enum collaborativePhysicsType
|
|
||||||
{
|
|
||||||
No_Physics = 0, // Both are empty (example: statics you can walk through, like tall grass)
|
|
||||||
Only_Collision = 1, // This object only has collision physics but no pickup physics (example: statics)
|
|
||||||
Only_Pickup = 2, // This object only has pickup physics but no collision physics (example: items dropped on the ground)
|
|
||||||
Both_Physics = 3 // This object has both kinds of physics (example: activators)
|
|
||||||
};
|
|
||||||
|
|
||||||
struct NewPhysTraceResults
|
|
||||||
{
|
|
||||||
Ogre::Vector3 endPos;
|
|
||||||
Ogre::Vector3 hitNormal;
|
|
||||||
float fraction;
|
|
||||||
bool startSolid;
|
|
||||||
//const Object* hitObj;
|
|
||||||
};
|
|
||||||
struct traceResults
|
struct traceResults
|
||||||
{
|
{
|
||||||
Ogre::Vector3 endpos;
|
Ogre::Vector3 endpos;
|
||||||
Ogre::Vector3 planenormal;
|
Ogre::Vector3 planenormal;
|
||||||
|
|
||||||
float fraction;
|
float fraction;
|
||||||
|
|
||||||
int surfaceFlags;
|
int surfaceFlags;
|
||||||
int contents;
|
int contents;
|
||||||
int entityNum;
|
int entityNum;
|
||||||
|
|
||||||
bool allsolid;
|
bool allsolid;
|
||||||
bool startsolid;
|
bool startsolid;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
template <const traceWorldType traceType>
|
|
||||||
const bool NewPhysicsTrace(NewPhysTraceResults* const out, const Ogre::Vector3& start, const Ogre::Vector3& end, const Ogre::Vector3& BBExtents, const Ogre::Vector3& rotation, bool isInterior, OEngine::Physic::PhysicEngine* enginePass);
|
|
||||||
//template const bool NewPhysicsTrace<collisionWorldTrace>(NewPhysTraceResults* const out, const Ogre::Vector3& start, const Ogre::Vector3& end, const Ogre::Vector3& BBExtents, const Ogre::Vector3& rotation, bool isInterior, OEngine::Physic::PhysicEngine* enginePass);
|
|
||||||
//template const bool NewPhysicsTrace<pickWorldTrace>(NewPhysTraceResults* const out, const Ogre::Vector3& start, const Ogre::Vector3& end, const Ogre::Vector3& BBExtents, const Ogre::Vector3& rotation, bool isInterior, OEngine::Physic::PhysicEngine* enginePass);
|
|
||||||
|
|
||||||
void newtrace(traceResults* const results, const Ogre::Vector3& start, const Ogre::Vector3& end, const Ogre::Vector3& BBExtents, const float rotation, bool isInterior, OEngine::Physic::PhysicEngine* enginePass);
|
void newtrace(traceResults* const results, const Ogre::Vector3& start, const Ogre::Vector3& end, const Ogre::Vector3& BBExtents, const float rotation, bool isInterior, OEngine::Physic::PhysicEngine* enginePass);
|
||||||
|
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user