Merge branch 'revert_3003' into 'master'

Revert !3003 because it caused #7361

Closes #7361

See merge request OpenMW/openmw!3006

apps/openmw/mwphysics/movementsolver.cpp

@@ -98,27 +98,21 @@ namespace MWPhysics
         // Check if we actually found a valid spawn point (use an infinitely thin ray this time).
         // Required for some broken door destinations in Morrowind.esm, where the spawn point
         // intersects with other geometry if the actor's base is taken into account
-        btVector3 from = Misc::Convert::toBullet(position + offset);
+        btVector3 from = Misc::Convert::toBullet(position);
         btVector3 to = from - btVector3(0, 0, maxHeight);
 
-        btCollisionWorld::ClosestConvexResultCallback resultCallback1(from, to);
+        btCollisionWorld::ClosestRayResultCallback resultCallback1(from, to);
         resultCallback1.m_collisionFilterGroup = CollisionType_AnyPhysical;
         resultCallback1.m_collisionFilterMask = CollisionType_World | CollisionType_HeightMap;
 
-        const btQuaternion btrot = btQuaternion::getIdentity();
-        collisionWorld->convexSweepTest(
-            actor->getConvexShape(), btTransform(btrot, from), btTransform(btrot, to), resultCallback1);
+        collisionWorld->rayTest(from, to, resultCallback1);
 
         if (resultCallback1.hasHit()
             && ((Misc::Convert::toOsg(resultCallback1.m_hitPointWorld) - tracer.mEndPos + offset).length2() > 35 * 35
                 || !isWalkableSlope(tracer.mPlaneNormal)))
         {
             actor->setOnSlope(!isWalkableSlope(resultCallback1.m_hitNormalWorld));
-            osg::Vec3f res = Misc::Convert::toOsg(resultCallback1.m_hitPointWorld);
-            res.x() = position.x();
-            res.y() = position.y();
-            res.z() += sGroundOffset;
-            return res;
+            return Misc::Convert::toOsg(resultCallback1.m_hitPointWorld) + osg::Vec3f(0.f, 0.f, sGroundOffset);
         }
 
         actor->setOnSlope(!isWalkableSlope(tracer.mPlaneNormal));