[ADD] made camera follow the character with lerp
This commit is contained in:
@@ -1,4 +1,6 @@
|
||||
#include "camera.h"
|
||||
#include <iostream>
|
||||
#include "../toolbox/toolbox.h"
|
||||
|
||||
namespace entities
|
||||
{
|
||||
@@ -8,7 +10,9 @@ namespace entities
|
||||
{}
|
||||
|
||||
void Camera::Follow(glm::vec3 follow_position) {
|
||||
position.z = follow_position.z + 200;
|
||||
follow_position.z += 100;
|
||||
follow_position.y += 50;
|
||||
position = toolbox::Lerp(position, follow_position, 0.1);
|
||||
}
|
||||
|
||||
void Camera::Move(GLFWwindow* window)
|
||||
@@ -41,9 +45,14 @@ namespace entities
|
||||
{
|
||||
up_down_speed += UP_SPEED;
|
||||
}
|
||||
if (glfwGetKey(window, GLFW_KEY_LEFT_SHIFT) == GLFW_PRESS)
|
||||
{
|
||||
up_down_speed -= UP_SPEED;
|
||||
}
|
||||
|
||||
position.x += side_speed;
|
||||
position.z += movement_speed;
|
||||
position.y += up_down_speed;
|
||||
std::cout <<"x= " << position.x <<"\ny= " << position.y << "\nz= " << position.z << "\n";
|
||||
}
|
||||
}
|
||||
|
||||
@@ -15,7 +15,7 @@ namespace entities
|
||||
glm::vec3 main_character::move(GLFWwindow* window)
|
||||
{
|
||||
float movement_speed = -1.0f;
|
||||
float up_down_speed = -0.4f;
|
||||
float up_down_speed = -0.2f;
|
||||
float side_speed = 0;
|
||||
|
||||
if (glfwGetKey(window, GLFW_KEY_W) == GLFW_PRESS)
|
||||
@@ -47,6 +47,11 @@ namespace entities
|
||||
up_down_speed -= UP_SPEED;
|
||||
}
|
||||
IncreasePosition(glm::vec3(side_speed, up_down_speed, movement_speed));
|
||||
if (position.x > 190) position.x = 190;
|
||||
else if (position.x < -190) position.x = -190;
|
||||
if (position.y > 350) position.y = 350;
|
||||
else if (position.y < -40) position.y = -40;
|
||||
MoveCollisionBox();
|
||||
return glm::vec3(side_speed, up_down_speed, movement_speed );
|
||||
}
|
||||
}
|
||||
|
||||
@@ -7,7 +7,7 @@ namespace entities
|
||||
{
|
||||
class main_character : public CollisionEntity {
|
||||
const float SPEED = 1.0f;
|
||||
const float UP_SPEED = 1.0f;
|
||||
const float UP_SPEED = 0.6f;
|
||||
public:
|
||||
main_character(const models::TexturedModel& model, const glm::vec3& position,
|
||||
const glm::vec3& rotation, float scale, const collision::Box& bounding_box);
|
||||
|
||||
Reference in New Issue
Block a user