Add libassimp to project

This commit is contained in:
4VRDriver
2020-09-04 00:31:12 +02:00
parent 8ffd95207e
commit b6f315a539
4 changed files with 8 additions and 4 deletions

View File

@@ -2,7 +2,10 @@ cmake_minimum_required(VERSION 3.10)
project(Fall-Fever)
set(OpenGL_GL_PREFERENCE "GLVND")
find_package(glfw3 3.3 REQUIRED)
find_package(OpenGL REQUIRED)
add_subdirectory(${PROJECT_SOURCE_DIR}/lib)
@@ -28,7 +31,8 @@ target_link_libraries(
glfw
glad
stb
GL
${OPENGL_LIBRARIES}
assimp
)
target_compile_options(Fall-Fever PRIVATE -Wall -Wextra -pedantic)

View File

@@ -1,9 +1,6 @@
#include "Camera.h"
#include "eventActions.h"
#include <glm/gtc/matrix_transform.hpp>
#include <glm/ext/matrix_transform.hpp>
Camera::Camera(float fov, int width, int height) {
this->fov = fov;
viewMatrix = glm::mat4(1.0f);

View File

@@ -1,6 +1,8 @@
#pragma once
#include <glm/glm.hpp>
#include <glm/gtc/matrix_transform.hpp>
#include <glm/ext/matrix_transform.hpp>
class Camera {

1
lib/CMakeLists.txt vendored
View File

@@ -1,3 +1,4 @@
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/glad)
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/stb)
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/glm)
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/assimp)