lauchmelder/OpenGL-utility
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Improved camera, added new example

Browse source
This commit is contained in:
Robert 2021-01-24 03:31:28 +01:00
parent 13e924538c
commit 5c28e2fb27
14 changed files with 335 additions and 10106 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
examples/debug/main.cpp
View file

@ -59,7 +59,7 @@ int main(int argc, char** argv)
-0.5f, 0.5f, -0.5f, 1.0f, 1.0f // back top left
};
unsigned int indices[] = {
unsigned int indices[] = {
0, 1, 3, // front
1, 2, 3,
7, 4, 0, // top

18
examples/model_loading/CMakeLists.txt
View file

@ -1,18 +0,0 @@
add_executable(model_loading "main.cpp")
find_package(glfw3 REQUIRED)
target_include_directories(model_loading PRIVATE
glfw
)
target_link_libraries(model_loading PRIVATE
"$<TARGET_FILE_DIR:openglu>/$<TARGET_FILE_BASE_NAME:openglu>.lib"
glfw
)
add_custom_command(TARGET model_loading POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:openglu> $<TARGET_FILE:glfw> $<TARGET_FILE_DIR:model_loading>
COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/shaders $<TARGET_FILE_DIR:model_loading>/shaders
COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/assets $<TARGET_FILE_DIR:model_loading>/assets
)

9965
examples/model_loading/assets/utah.obj
View file

File diff suppressed because it is too large Load diff

105
examples/model_loading/main.cpp
View file

@ -1,105 +0,0 @@
#include <iostream>
#include "openglu.hpp"
#include "transformable.hpp"
#include <glad/glad.h>
#include <GLFW/glfw3.h>
#include <glm/glm.hpp>
#include <glm/gtc/matrix_transform.hpp>
#include <glm/gtc/type_ptr.hpp>
void framebuffer_size_callback(GLFWwindow* window, int width, int height)
{
oglu::SetViewport(0, 0, width, height);
}
void processInput(GLFWwindow* window)
{
if (glfwGetKey(window, GLFW_KEY_ESCAPE) == GLFW_PRESS)
glfwSetWindowShouldClose(window, true);
}
int main(int argc, char** argv)
{
// Setup GLFW
glfwInit();
glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 4);
glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 6);
glfwWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE);
const GLFWvidmode* screen = glfwGetVideoMode(glfwGetPrimaryMonitor());
int windowSize = screen->height / 4 * 3;
// Create Window
GLFWwindow* window = glfwCreateWindow(windowSize, windowSize, "Utah teapot", NULL, NULL);
if (window == nullptr)
{
std::cerr << "Failed to create GLFW window" << std::endl;
glfwTerminate();
return -1;
}
glfwMakeContextCurrent(window);
glfwSetFramebufferSizeCallback(window, framebuffer_size_callback);
// glad stuff
oglu::LoadGLLoader((GLADloadproc)glfwGetProcAddress);
oglu::SetViewport(0, 0, windowSize, windowSize);
oglu::VertexArray utah_model;
try {
utah_model = oglu::MakeVertexArray("assets/utah.obj");
}
catch (const std::runtime_error& e)
{
std::cerr << e.what() << std::endl;
return -1;
}
oglu::Object utah(utah_model);
// Create a shader
oglu::Shader shader;
try
{
shader = oglu::MakeShader("shaders/vertexShader.vert", "shaders/fragmentShader.frag");
}
catch (const std::runtime_error& e)
{
std::cerr << e.what() << std::endl;
return -1;
}
oglu::Enable(GL_DEPTH_TEST);
// oglu::Camera camera(45.0f, 1.0f, 0.1f, 100.0f);
//camera.Move(0.0f, -5.0f, -10.0f);
//camera.LookAt(glm::value_ptr(glm::make_vec3(utah.GetPosition()) + glm::vec3(0.0f, 2.0f, 0.0f)));
float t = 0.0f;
// Window loop
while (!glfwWindowShouldClose(window))
{
processInput(window);
oglu::ClearScreen(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT, oglu::Color(0.29f, 0.13f, 0.23f));
utah.Rotate(0.0f, 10.0f, 0.0f);
shader->Use();
shader->SetUniform("model", utah);
//shader->SetUniform("view", camera);
//shader->SetUniformMatrix4fv("projection", 1, GL_FALSE, camera.GetProjectionMatrix());
oglu::PolygonMode(GL_FRONT_AND_BACK, GL_LINE);
utah.Render();
glfwSwapBuffers(window);
glfwPollEvents();
t += 0.01f;
}
glfwTerminate();
return 0;
}

9
examples/model_loading/shaders/fragmentShader.frag
View file

@ -1,9 +0,0 @@
#version 330 core
in vec4 oCol;
out vec4 FragColor;
void main()
{
FragColor = oCol;
}

18
examples/movement/CMakeLists.txt Normal file
View file

@ -0,0 +1,18 @@
add_executable(movement "main.cpp" "shaders/fragmentShader.frag" "shaders/vertexShader.vert")
find_package(glfw3 REQUIRED)
target_include_directories(movement PRIVATE
glfw
)
target_link_libraries(movement PRIVATE
"$<TARGET_FILE_DIR:openglu>/$<TARGET_FILE_BASE_NAME:openglu>.lib"
glfw
)
add_custom_command(TARGET movement POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:openglu> $<TARGET_FILE:glfw> $<TARGET_FILE_DIR:movement>
COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/shaders $<TARGET_FILE_DIR:movement>/shaders
COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/assets $<TARGET_FILE_DIR:movement>/assets
)

BIN
examples/movement/assets/crate.jpg Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 75 KiB

BIN
examples/movement/assets/opengl.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 38 KiB

232
examples/movement/main.cpp Normal file
View file

@ -0,0 +1,232 @@
#include <iostream>
#include <vector>
#include "openglu.hpp"
#include <GLFW/glfw3.h>
#include <glm/gtc/type_ptr.hpp>
#include <glm/gtx/string_cast.hpp>
bool firstMouse = true;
bool escaped = false;
double lastX = 0.0f;
double lastY = 0.0f;
oglu::Camera camera;
void framebuffer_size_callback(GLFWwindow* window, int width, int height)
{
oglu::SetViewport(0, 0, width, height);
camera.SetAspectRatio((float)width / (float)height);
}
void mouse_callback(GLFWwindow* window, double xpos, double ypos)
{
if (escaped)
return;
if (firstMouse)
{
lastX = xpos;
lastY = ypos;
firstMouse = false;
}
float xoffset = xpos - lastX;
float yoffset = lastY - ypos;
lastX = xpos;
lastY = ypos;
float sensitivity = 0.1f;
xoffset *= sensitivity;
yoffset *= sensitivity;
camera.Pan(-xoffset);
camera.Tilt(yoffset);
//glm::vec3 direction;
//direction.x = cos(glm::radians(yaw)) * cos(glm::radians(pitch));
//direction.y = sin(glm::radians(pitch));
//direction.z = sin(glm::radians(yaw)) * cos(glm::radians(pitch));
//cameraFront = glm::normalize(direction);
}
void key_callback(GLFWwindow* window, int key, int scancode, int action, int mods)
{
if (key == GLFW_KEY_ESCAPE && action == GLFW_RELEASE)
{
escaped = !escaped;
firstMouse = true;
glfwSetInputMode(window, GLFW_CURSOR, escaped ? GLFW_CURSOR_NORMAL : GLFW_CURSOR_DISABLED);
}
}
void processInput(GLFWwindow* window)
{
if (glfwGetKey(window, GLFW_KEY_W) == GLFW_PRESS)
camera.Forward(0.1f);
if (glfwGetKey(window, GLFW_KEY_A) == GLFW_PRESS)
camera.Sideways(-0.1f);
if (glfwGetKey(window, GLFW_KEY_S) == GLFW_PRESS)
camera.Forward(-0.1f);
if (glfwGetKey(window, GLFW_KEY_D) == GLFW_PRESS)
camera.Sideways(0.1f);
if (glfwGetKey(window, GLFW_KEY_SPACE) == GLFW_PRESS)
camera.Move(0.0f, 0.1f, 0.0f);
if (glfwGetKey(window, GLFW_KEY_LEFT_SHIFT) == GLFW_PRESS)
camera.Move(0.0f, -0.1f, 0.0f);
}
int main(int argc, char** argv)
{
// Setup GLFW
glfwInit();
glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 4);
glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 6);
glfwWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE);
const GLFWvidmode* screen = glfwGetVideoMode(glfwGetPrimaryMonitor());
int windowSize = screen->height / 4 * 3;
// Create Window
GLFWwindow* window = glfwCreateWindow(windowSize, windowSize, "First Person Movement Test", NULL, NULL);
if (window == nullptr)
{
std::cerr << "Failed to create GLFW window" << std::endl;
glfwTerminate();
return -1;
}
glfwMakeContextCurrent(window);
glfwSetFramebufferSizeCallback(window, framebuffer_size_callback);
glfwSetCursorPosCallback(window, mouse_callback);
glfwSetKeyCallback(window, key_callback);
// glad stuff
oglu::LoadGLLoader((GLADloadproc)glfwGetProcAddress);
oglu::SetViewport(0, 0, windowSize, windowSize);
// Create vertices for square
float vertices[] = {
0.5f, 0.5f, 0.5f, 1.0f, 1.0f, // front top right
0.5f, -0.5f, 0.5f, 1.0f, 0.0f, // front bottom right
-0.5f, -0.5f, 0.5f, 0.0f, 0.0f, // front bottom left
-0.5f, 0.5f, 0.5f, 0.0f, 1.0f, // front top left
0.5f, 0.5f, -0.5f, 0.0f, 1.0f, // back top right
0.5f, -0.5f, -0.5f, 0.0f, 0.0f, // back bottom right
-0.5f, -0.5f, -0.5f, 1.0f, 0.0f, // back bottom left
-0.5f, 0.5f, -0.5f, 1.0f, 1.0f // back top left
};
unsigned int indices[] = {
0, 1, 3, // front
1, 2, 3,
7, 4, 0, // top
7, 0, 3,
0, 4, 5, // right
0, 5, 1,
7, 3, 2, // right
7, 2, 6,
2, 1, 6, // bottom
1, 6, 5,
4, 7, 5, // back
7, 6, 5
};
oglu::VertexAttribute topology[] = {
{ 0, 3, GL_FLOAT, GL_FALSE, 5 * sizeof(float), (void*)0 },
{ 1, 2, GL_FLOAT, GL_FALSE, 5 * sizeof(float), (void*)(3 * sizeof(float)) }
};
// Make a square
oglu::VertexArray cubeDefault = oglu::MakeVertexArray(vertices, sizeof(vertices), indices, sizeof(indices), topology, sizeof(topology));
oglu::Object cubes[10] = {
oglu::Object(cubeDefault),
oglu::Object(cubeDefault),
oglu::Object(cubeDefault),
oglu::Object(cubeDefault),
oglu::Object(cubeDefault),
oglu::Object(cubeDefault),
oglu::Object(cubeDefault),
oglu::Object(cubeDefault),
oglu::Object(cubeDefault),
oglu::Object(cubeDefault)
};
cubes[0].SetPosition(0.0f, 0.0f, 0.0f);
cubes[1].SetPosition(2.0f, 5.0f, -15.0f);
cubes[2].SetPosition(-1.5f, -2.2f, -2.5f);
cubes[3].SetPosition(-3.8f, -2.0f, -12.3f);
cubes[4].SetPosition(2.4f, -0.4f, -3.5f);
cubes[5].SetPosition(-1.7f, 3.0f, -7.5f);
cubes[6].SetPosition(1.3f, -2.0f, -2.5f);
cubes[7].SetPosition(1.5f, 2.0f, -2.5f);
cubes[8].SetPosition(1.5f, 0.2f, -1.5f);
cubes[9].SetPosition(-1.3f, 1.0f, -1.5f);
cubes[0].SetRotation(45.0f, 30.0f, 1.0f);
cubes[1].SetRotation(270.0f, 90.0f, 70.0f);
cubes[2].SetRotation(-80.0f, -190.0f, 270.0f);
cubes[3].SetRotation(100.0f, -200.0f, -120.3f);
cubes[4].SetRotation(240.0f, -40.0f, -30.5f);
cubes[5].SetRotation(-170.0f, 300.0f, -75.0f);
cubes[6].SetRotation(130.0f, -20.0f, -250.0f);
cubes[7].SetRotation(150.0f, 200.0f, -25.0f);
cubes[8].SetRotation(150.0f, 20.0f, -150.0f);
cubes[9].SetRotation(-130.0f, 10.0f, -150.0f);
// Create a shader
oglu::Shader shader;
try
{
shader = oglu::MakeShader("shaders/vertexShader.vert", "shaders/fragmentShader.frag");
}
catch (const std::runtime_error& e)
{
std::cerr << e.what() << std::endl;
return -1;
}
// Create a texture
oglu::Texture crate = oglu::MakeTexture("assets/crate.jpg");
oglu::Texture opengl = oglu::MakeTexture("assets/opengl.png");
camera.Move(0.0f, 0.0f, 5.0f);
// Window loop
oglu::Enable(GL_DEPTH_TEST);
float t = 0.0f;
glfwSetInputMode(window, GLFW_CURSOR, GLFW_CURSOR_DISABLED);
while (!glfwWindowShouldClose(window))
{
processInput(window);
oglu::ClearScreen(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT, oglu::Color(0.29f, 0.13f, 0.23f));
shader->Use();
shader->SetUniform("texture1", crate, 0);
shader->SetUniform("texture2", opengl, 1);
shader->SetUniformMatrix4fv("view", 1, GL_FALSE, glm::value_ptr(camera.GetMatrix()));
shader->SetUniformMatrix4fv("projection", 1, GL_FALSE, glm::value_ptr(camera.GetProjection()));
for (oglu::Object& cube : cubes)
{
shader->SetUniform("model", cube);
cube.Render();
}
glfwSwapBuffers(window);
glfwPollEvents();
t += 0.05f;
}
glfwTerminate();
return 0;
}

12
examples/movement/shaders/fragmentShader.frag Normal file
View file

@ -0,0 +1,12 @@
#version 330 core
in vec2 oUV;
out vec4 FragColor;
uniform sampler2D texture1;
uniform sampler2D texture2;
void main()
{
FragColor = mix(texture(texture1, oUV), texture(texture2, oUV), 0.2);
}

5
examples/model_loading/shaders/vertexShader.vert → examples/movement/shaders/vertexShader.vert
View file

@ -1,7 +1,8 @@
#version 330 core
layout (location = 0) in vec3 aPos;
layout (location = 1) in vec2 aUV;
out vec4 oCol;
out vec2 oUV;
uniform mat4 model;
uniform mat4 view;
@ -9,6 +10,6 @@ uniform mat4 projection;
void main()
{
oCol = vec4(0.5, 0.5, 0.5, 1.0);
oUV = aUV;
gl_Position = projection * view * model * vec4(aPos, 1.0);
}

41
include/camera.hpp
View file

@ -162,6 +162,47 @@ namespace oglu
*/
void Roll(float angle);
/**
* @brief Move camera forward.
*
* Moves the camera along the @p front vector.
*
* @param[in] amount Amount to move by
*/
void Forward(float amount);
/**
* @brief Move camera sideways.
*
* Moves the camera along the @p right vector.
*
* @param[in] amount Amount to move by
*/
void Sideways(float amount);
/**
* @brief Move camera upwards.
*
* Moves the camera along the @p up vector.
*
* @param[in] amount Amount to move by
*/
void Upwards(float amount);
/**
* @brief Sets a new FOV for the camera.
*
* @param[in] fov The new FOV
*/
void SetFOV(float fov);
/**
* @brief Sets a new aspect ratio for the camera.
*
* @param[in] aspectRatio The new aspect ratio
*/
void SetAspectRatio(float aspectRatio);
/**
* @brief Get the view matrix.
*

2
include/transformable.hpp
View file

@ -373,8 +373,6 @@ namespace oglu
virtual const glm::vec3& GetScaling() const;
protected:
// TODO: Separate translation, rotation and scaling matrices.
// Combine them only when the user wants the transformation matrix
glm::mat4 transformation;
bool recalculateMatrix;

32
src/camera.cpp
View file

@ -81,7 +81,6 @@ namespace oglu
void Camera::LookAt(const glm::vec3& target)
{
front = glm::normalize(target - position);
transformation = glm::lookAt(position, position + front, glm::vec3(0.0f, 1.0f, 0.0f));
right = glm::normalize(glm::cross(front, glm::vec3(0.0f, 1.0f, 0.0f)));
up = glm::normalize(glm::cross(right, front));
}
@ -94,26 +93,51 @@ namespace oglu
void Camera::Pan(float angle)
{
front = glm::rotate(glm::angleAxis(glm::radians(angle), up), front);
transformation = glm::lookAt(position, position + front, glm::vec3(0.0f, 1.0f, 0.0f));
right = glm::normalize(glm::cross(front, glm::vec3(0.0f, 1.0f, 0.0f)));
}
void Camera::Tilt(float angle)
{
front = glm::rotate(glm::angleAxis(glm::radians(angle), right), front);
transformation = glm::lookAt(position, position + front, glm::vec3(0.0f, 1.0f, 0.0f));
up = glm::normalize(glm::cross(right, front));
}
void Camera::Roll(float angle)
{
up = glm::rotate(glm::angleAxis(glm::radians(angle), front), front);
transformation = glm::lookAt(position, position + front, up);
right = glm::normalize(glm::cross(front, up));
}
void Camera::Forward(float amount)
{
position += front * amount;
}
void Camera::Sideways(float amount)
{
position += right * amount;
}
void Camera::Upwards(float amount)
{
position += up * amount;
}
void Camera::SetFOV(float fov)
{
this->fov = fov;
projection = glm::perspective(fov, aspectRatio, zNear, zFar);
}
void Camera::SetAspectRatio(float aspectRatio)
{
this->aspectRatio = aspectRatio;
projection = glm::perspective(fov, aspectRatio, zNear, zFar);
}
const glm::mat4& Camera::GetMatrix()
{
transformation = glm::lookAt(position, position + front, glm::vec3(0.0f, 1.0f, 0.0f));
return transformation;
}