mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-30 21:15:36 +00:00
Code Issues Releases Wiki Activity

Forbid to use toNormalized for normalized path

Browse source
This commit is contained in:
elsid 2024-11-15 14:49:00 +01:00
parent 4a911a647d
commit 630e815f66
No known key found for this signature in database
GPG key ID: 4DE04C198CBA7625
3 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
apps/navmeshtool/worldspacedata.cpp
View file

@ -131,8 +131,7 @@ namespace NavMeshTool
osg::ref_ptr<const Resource::BulletShape> shape = [&] { osg::ref_ptr<const Resource::BulletShape> shape = [&] {
try try
{ {
return bulletShapeManager.getShape( return bulletShapeManager.getShape(Misc::ResourceHelpers::correctMeshPath(model));
VFS::Path::toNormalized(Misc::ResourceHelpers::correctMeshPath(model)));
} }
catch (const std::exception& e) catch (const std::exception& e)
{ {

5
apps/openmw/mwphysics/physicssystem.cpp
View file

@ -571,7 +571,7 @@ namespace MWPhysics
{ {
if (animationMesh != mesh) if (animationMesh != mesh)
{ {
shape = mShapeManager->getShape(VFS::Path::toNormalized(mesh)); shape = mShapeManager->getShape(mesh);
} }
} }
@ -591,8 +591,7 @@ namespace MWPhysics
int PhysicsSystem::addProjectile( int PhysicsSystem::addProjectile(
const MWWorld::Ptr& caster, const osg::Vec3f& position, VFS::Path::NormalizedView mesh, bool computeRadius) const MWWorld::Ptr& caster, const osg::Vec3f& position, VFS::Path::NormalizedView mesh, bool computeRadius)
{ {
osg::ref_ptr<Resource::BulletShapeInstance> shapeInstance osg::ref_ptr<Resource::BulletShapeInstance> shapeInstance = mShapeManager->getInstance(mesh);
= mShapeManager->getInstance(VFS::Path::toNormalized(mesh));
assert(shapeInstance); assert(shapeInstance);
float radius = computeRadius ? shapeInstance->mCollisionBox.mExtents.length() / 2.f : 1.f; float radius = computeRadius ? shapeInstance->mCollisionBox.mExtents.length() / 2.f : 1.f;

4
components/vfs/pathutil.hpp
View file

@ -297,6 +297,10 @@ namespace VFS::Path
{ {
return Normalized(std::forward<T>(value)); return Normalized(std::forward<T>(value));
} }
Normalized toNormalized(NormalizedView value) = delete;
Normalized toNormalized(Normalized value) = delete;
} }
#endif #endif