celisej567/Nuake
1
0
Fork 0
mirror of https://github.com/antopilo/Nuake.git synced 2026-09-09 20:08:57 +03:00
Code Issues Packages Projects Releases Wiki Activity

Character controller now responds to setting localPosition on the entity

Browse Source
This commit is contained in:
Antoine Pilote
2024-04-01 19:22:20 -04:00
parent aad15899fd
commit f86e26a490
7 changed files with 47 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
Nuake/src/Physics/DynamicWorld.cpp
View File

@@ -430,6 +430,16 @@ namespace Nuake
return false;
}
void DynamicWorld::SetCharacterControllerPosition(const Entity & entity, const Vector3 & position)
{
const uint32_t entityHandle = entity.GetHandle();
if (_registeredCharacters.find(entityHandle) != _registeredCharacters.end())
{
auto& characterController = _registeredCharacters[entityHandle].Character;
characterController->SetPosition({ position.x, position.y, position.z });
}
}
std::vector<RaycastResult> DynamicWorld::Raycast(const Vector3& from, const Vector3& to)
{
// Create jolt ray
@@ -474,37 +484,27 @@ namespace Nuake
for (const auto& body : _registeredBodies)
{
auto bodyId = static_cast<JPH::BodyID>(body);
JPH::Vec3 position = bodyInterface.GetCenterOfMassPosition(bodyId);
JPH::Vec3 velocity = bodyInterface.GetLinearVelocity(bodyId);
JPH::Mat44 joltTransform = bodyInterface.GetWorldTransform(bodyId);
const auto bodyRotation = bodyInterface.GetRotation(bodyId);
Matrix4 transform = glm::mat4(
joltTransform(0, 0), joltTransform(1, 0), joltTransform(2, 0), joltTransform(3, 0),
joltTransform(0, 1), joltTransform(1, 1), joltTransform(2, 1), joltTransform(3, 1),
joltTransform(0, 2), joltTransform(1, 2), joltTransform(2, 2), joltTransform(3, 2),
joltTransform(0, 3), joltTransform(1, 3), joltTransform(2, 3), joltTransform(3, 3)
);
Vector3 scale = Vector3();
Quat rotation = Quat();
Vector3 pos = Vector3();
Vector3 skew = Vector3();
Vector4 pesp = Vector4();
glm::decompose(transform, scale, rotation, pos, skew, pesp);
auto entId = static_cast<int>(bodyInterface.GetUserData(bodyId));
if (entId == 1337)
{
Entity entity = Engine::GetCurrentScene()->GetEntity("Gizmo");
auto& transformComponent = entity.GetComponent<TransformComponent>();
transformComponent.SetLocalPosition(pos);
transformComponent.SetLocalRotation(Quat(bodyRotation.GetW(), bodyRotation.GetX(), bodyRotation.GetY(), bodyRotation.GetZ()));
transformComponent.SetLocalTransform(transform);
transformComponent.Dirty = true;
}
if (entId != 0)
if (auto entId = static_cast<int>(bodyInterface.GetUserData(bodyId)); entId != 0)
{
JPH::Vec3 position = bodyInterface.GetCenterOfMassPosition(bodyId);
JPH::Vec3 velocity = bodyInterface.GetLinearVelocity(bodyId);
JPH::Mat44 joltTransform = bodyInterface.GetWorldTransform(bodyId);
const auto bodyRotation = bodyInterface.GetRotation(bodyId);
Matrix4 transform = glm::mat4(
joltTransform(0, 0), joltTransform(1, 0), joltTransform(2, 0), joltTransform(3, 0),
joltTransform(0, 1), joltTransform(1, 1), joltTransform(2, 1), joltTransform(3, 1),
joltTransform(0, 2), joltTransform(1, 2), joltTransform(2, 2), joltTransform(3, 2),
joltTransform(0, 3), joltTransform(1, 3), joltTransform(2, 3), joltTransform(3, 3)
);
Vector3 scale = Vector3();
Quat rotation = Quat();
Vector3 pos = Vector3();
Vector3 skew = Vector3();
Vector4 pesp = Vector4();
glm::decompose(transform, scale, rotation, pos, skew, pesp);
Entity entity = Engine::GetCurrentScene()->GetEntityByID(entId);
auto& transformComponent = entity.GetComponent<TransformComponent>();
transformComponent.SetLocalPosition(pos);
@@ -517,10 +517,6 @@ namespace Nuake
void DynamicWorld::SyncCharactersTransforms()
{
// TODO(ANTO): Finish this to connect updated jolt transforms back to the entity.
// The problem was that I dont know yet how to go from jolt body ptr to the entity
// Combinations of find and iterators etc. I do not have the brain power rn zzz.
// const auto& bodyInterface = _JoltPhysicsSystem->GetBodyInterface();
for (const auto& e : _registeredCharacters)
{
Entity entity { (entt::entity)e.first, Engine::GetCurrentScene().get()};

2
Nuake/src/Physics/DynamicWorld.h
View File

@@ -72,6 +72,8 @@ namespace Nuake
void AddGhostbody(Ref<GhostObject> gb);
void AddCharacterController(Ref<CharacterController> cc);
bool IsCharacterGrounded(const Entity& entity);
void SetCharacterControllerPosition(const Entity& entity, const Vector3& position);
// This is going to be ugly. TODO: Find a better way that passing itself as a parameter
void MoveAndSlideCharacterController(const Entity& entity, const Vector3& velocity);
void AddForceToRigidBody(Entity& entity, const Vector3& force);

5
Nuake/src/Physics/PhysicsManager.cpp
View File

@@ -27,6 +27,11 @@ namespace Nuake
m_World->AddCharacterController(cc);
}
void PhysicsManager::SetCharacterControllerPosition(const Entity& entity, const Vector3& position)
{
m_World->SetCharacterControllerPosition(entity, position);
}
void PhysicsManager::Step(Timestep ts)
{
m_World->StepSimulation(ts);

2
Nuake/src/Physics/PhysicsManager.h
View File

@@ -55,5 +55,7 @@ namespace Nuake
void RegisterBody(Ref<Physics::RigidBody> rb);
void RegisterGhostBody(Ref<GhostObject> rb);
void RegisterCharacterController(Ref<Physics::CharacterController> c);
void SetCharacterControllerPosition(const Entity& entity, const Vector3& position);
};
}

5
Nuake/src/Scripting/NetModules/SceneNetAPI.cpp
View File

@@ -112,6 +112,11 @@ namespace Nuake {
{
auto& component = entity.GetComponent<TransformComponent>();
component.SetLocalPosition({ x, y, z });
if (entity.HasComponent<CharacterControllerComponent>())
{
PhysicsManager::Get().SetCharacterControllerPosition(entity, { x, y, z });
}
}
}

5
NuakeNet/src/Entity.cs
View File

@@ -52,15 +52,14 @@ namespace Nuake.Net
public virtual void OnFixedUpdate(float dt) { }
public virtual void OnDestroy() { }
public virtual void OnCollision(int entity1, int entity2)
public virtual void OnCollision(Entity entity1, Entity entity2)
{
Engine.Log("penis");
}
// Physics
public void OnCollisionInternal(int entity1, int entity2)
{
//OnCollision(new Entity { ECSHandle = entity1 }, new Entity { ECSHandle = entity2 });
OnCollision(new Entity { ECSHandle = entity1 }, new Entity { ECSHandle = entity2 });
}
protected static Dictionary<Type, ComponentTypes> MappingTypeEnum = new Dictionary<Type, ComponentTypes>()

1
NuakeNet/src/Scene.cs
View File

@@ -21,6 +21,7 @@ namespace Nuake.Net
{
ECSHandle = handle
};
return entity;
}
}