mirror of
https://github.com/bailwillharr/engine.git
synced 2024-09-21 04:51:18 +00:00
wont work how fix
This commit is contained in:
parent
fce32b1320
commit
e7b5781216
@ -55,17 +55,16 @@ void CameraControllerSystem::onUpdate(float ts)
|
|||||||
bool isSliding = false;
|
bool isSliding = false;
|
||||||
|
|
||||||
if (col->getIsColliding()) {
|
if (col->getIsColliding()) {
|
||||||
if (c->dy != 0.0f && slope <= MAX_SLOPE_ANGLE) {
|
if (c->dy < 0.0f && slope <= MAX_SLOPE_ANGLE) {
|
||||||
t->position.y = m_scene->getComponent<engine::TransformComponent>(col->getLastEntityCollided())->worldMatrix[3][1] + 1.8f;
|
// in the ground, push up a bit
|
||||||
|
t->position.y += dt;
|
||||||
c->dy = 0.0f;
|
c->dy = 0.0f;
|
||||||
} else {
|
} else {
|
||||||
// slide across wall
|
// slide across wall
|
||||||
isSliding = true;
|
isSliding = true;
|
||||||
}
|
}
|
||||||
} else {
|
|
||||||
c->dy -= G * dt;
|
|
||||||
}
|
}
|
||||||
|
c->dy -= G * dt;
|
||||||
|
|
||||||
// jumping
|
// jumping
|
||||||
constexpr float JUMPVEL = (float)2.82231110971133017648; //std::sqrt(2 * G * JUMPHEIGHT);
|
constexpr float JUMPVEL = (float)2.82231110971133017648; //std::sqrt(2 * G * JUMPHEIGHT);
|
||||||
|
@ -55,7 +55,7 @@ void playGame()
|
|||||||
myScene->registerSystem<CameraControllerSystem>();
|
myScene->registerSystem<CameraControllerSystem>();
|
||||||
|
|
||||||
auto camera = myScene->createEntity("camera");
|
auto camera = myScene->createEntity("camera");
|
||||||
myScene->getComponent<engine::TransformComponent>(camera)->position.y = 2.0f;
|
myScene->getComponent<engine::TransformComponent>(camera)->position.y = 8.0f;
|
||||||
auto cameraCollider = myScene->addComponent<engine::ColliderComponent>(camera);
|
auto cameraCollider = myScene->addComponent<engine::ColliderComponent>(camera);
|
||||||
cameraCollider->colliderType = engine::ColliderType::SPHERE;
|
cameraCollider->colliderType = engine::ColliderType::SPHERE;
|
||||||
cameraCollider->colliders.sphereCollider.r = 1.8f;
|
cameraCollider->colliders.sphereCollider.r = 1.8f;
|
||||||
|
Loading…
Reference in New Issue
Block a user