summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLéo Lam <leo@leolam.fr>2022-01-20 01:11:41 +0100
committerLéo Lam <leo@leolam.fr>2022-01-20 01:11:54 +0100
commita291d84b2b4cc8930901ea17b6c6042e25ca02ac (patch)
tree3e7899be98b3052de172b7587c5bbbfb3867c639
parent731229798a6b2f74de1b7f4aaeb3b06a8a9b2b90 (diff)
Havok: Move hkpConstraintInstance to the correct folder
-rw-r--r--lib/hkStubs/CMakeLists.txt2
-rw-r--r--lib/hkStubs/Havok/Physics2012/Dynamics/Constraint/hkpConstraintInstance.h (renamed from lib/hkStubs/Havok/Physics/Constraint/hkpConstraintInstance.h)0
-rw-r--r--src/KingSystem/Physics/RigidBody/physRigidBody.cpp2
3 files changed, 2 insertions, 2 deletions
diff --git a/lib/hkStubs/CMakeLists.txt b/lib/hkStubs/CMakeLists.txt
index 41100b10..613502a6 100644
--- a/lib/hkStubs/CMakeLists.txt
+++ b/lib/hkStubs/CMakeLists.txt
@@ -67,7 +67,6 @@ add_library(hkStubs OBJECT
Havok/Geometry/Collide/Shapes/hkcdShape.h
- Havok/Physics/Constraint/hkpConstraintInstance.h
Havok/Physics/Constraint/Atom/hkpConstraintAtom.h
Havok/Physics/Constraint/Data/hkpConstraintData.h
Havok/Physics/Constraint/Data/hkpConstraintInfo.h
@@ -107,6 +106,7 @@ add_library(hkStubs OBJECT
Havok/Physics2012/Dynamics/Collide/hkpResponseModifier.h
Havok/Physics2012/Dynamics/Common/hkpMaterial.h
Havok/Physics2012/Dynamics/Common/hkpProperty.h
+ Havok/Physics2012/Dynamics/Constraint/hkpConstraintInstance.h
Havok/Physics2012/Dynamics/Entity/hkpEntity.h
Havok/Physics2012/Dynamics/Entity/hkpRigidBody.h
Havok/Physics2012/Dynamics/Entity/hkpRigidBodyCinfo.h
diff --git a/lib/hkStubs/Havok/Physics/Constraint/hkpConstraintInstance.h b/lib/hkStubs/Havok/Physics2012/Dynamics/Constraint/hkpConstraintInstance.h
index 839e9cd7..839e9cd7 100644
--- a/lib/hkStubs/Havok/Physics/Constraint/hkpConstraintInstance.h
+++ b/lib/hkStubs/Havok/Physics2012/Dynamics/Constraint/hkpConstraintInstance.h
diff --git a/src/KingSystem/Physics/RigidBody/physRigidBody.cpp b/src/KingSystem/Physics/RigidBody/physRigidBody.cpp
index 585c5b85..4dad0822 100644
--- a/src/KingSystem/Physics/RigidBody/physRigidBody.cpp
+++ b/src/KingSystem/Physics/RigidBody/physRigidBody.cpp
@@ -1,8 +1,8 @@
#include "KingSystem/Physics/RigidBody/physRigidBody.h"
#include <Havok/Common/Base/Types/Geometry/Aabb/hkAabb.h>
#include <Havok/Physics/Constraint/Data/hkpConstraintData.h>
-#include <Havok/Physics/Constraint/hkpConstraintInstance.h>
#include <Havok/Physics2012/Dynamics/Collide/hkpResponseModifier.h>
+#include <Havok/Physics2012/Dynamics/Constraint/hkpConstraintInstance.h>
#include <Havok/Physics2012/Dynamics/Entity/hkpRigidBody.h>
#include <Havok/Physics2012/Dynamics/Inertia/hkpInertiaTensorComputer.h>
#include <Havok/Physics2012/Dynamics/Motion/Rigid/hkpFixedRigidMotion.h>