mirror of
https://github.com/TheRedShip/RT_GPU.git
synced 2025-09-27 18:48:36 +02:00
~ | Better camera system + | Quad intersection test
This commit is contained in:
@ -38,14 +38,16 @@ void Camera::update_camera_vectors()
|
||||
|
||||
void Camera::update(float delta_time)
|
||||
{
|
||||
delta_time = std::min(delta_time, 0.1f);
|
||||
|
||||
_velocity += _acceleration * delta_time;
|
||||
|
||||
if (glm::length(_acceleration) < 0.1f)
|
||||
_velocity *= (1.0f - _deceleration_rate * delta_time);
|
||||
_velocity *= std::max(0.0f, 1.0f - _deceleration_rate * delta_time);
|
||||
|
||||
float speed = glm::length(_velocity);
|
||||
if (speed > _maxSpeed)
|
||||
_velocity = (_velocity / speed) * _maxSpeed;
|
||||
_velocity = glm::normalize(_velocity) * _maxSpeed;
|
||||
|
||||
_position += _velocity * delta_time;
|
||||
_acceleration = glm::vec3(0.0f);
|
||||
|
@ -90,6 +90,12 @@ void Scene::updateGPUData()
|
||||
auto plane = static_cast<const Plane *>(obj);
|
||||
gpu_obj.normal = plane->getNormal();
|
||||
}
|
||||
else if (obj->getType() == Object::Type::QUAD)
|
||||
{
|
||||
auto quad = static_cast<const Quad *>(obj);
|
||||
gpu_obj.edge1 = quad->getEdge1();
|
||||
gpu_obj.edge2 = quad->getEdge2();
|
||||
}
|
||||
|
||||
_gpu_objects.push_back(gpu_obj);
|
||||
}
|
||||
|
@ -25,6 +25,12 @@ SceneParser::SceneParser(Scene *scene) : _scene(scene)
|
||||
try { return (new Plane(ss)); }
|
||||
catch (const std::exception &e) { throw; }
|
||||
};
|
||||
|
||||
object_parsers["qu"] = [](std::stringstream &ss) -> Object *
|
||||
{
|
||||
try { return (new Quad(ss)); }
|
||||
catch (const std::exception &e) { throw; }
|
||||
};
|
||||
}
|
||||
|
||||
void SceneParser::parseMaterial(std::stringstream &line)
|
||||
|
Reference in New Issue
Block a user