Add image loader library
This commit is contained in:
parent
1824b0c38c
commit
704081dbc3
@ -7,7 +7,7 @@ find_package(OpenGL REQUIRED)
|
|||||||
find_package(glfw3 REQUIRED)
|
find_package(glfw3 REQUIRED)
|
||||||
find_package(glm REQUIRED)
|
find_package(glm REQUIRED)
|
||||||
|
|
||||||
add_executable(ecsgame Util/glad.c Util/OBJ_Loader.h Rendering/Shader.cpp Rendering/Shader.h main.cpp ECS/Components/Transform.h ECS/Components/Movement.h ECS/Events/InputEvent.h ECS/Events/MouseMoveEvent.h ECS/Systems/GravitySystem.h ECS/Systems/PositionDebugSystem.h ECS/Systems/KeyboardMovementSystem.h ECS/Components/Camera.h ECS/Systems/RenderSystem.h ECS/Components/Mesh.h ECS/Systems/MouseLookSystem.h ECS/Components/MouseLook.h ECS/Components/ObjMesh.h)
|
add_executable(ecsgame Util/glad.c Util/OBJ_Loader.h Rendering/Shader.cpp Rendering/Shader.h main.cpp ECS/Components/Transform.h ECS/Components/Movement.h ECS/Events/InputEvent.h ECS/Events/MouseMoveEvent.h ECS/Systems/GravitySystem.h ECS/Systems/PositionDebugSystem.h ECS/Systems/KeyboardMovementSystem.h ECS/Components/Camera.h ECS/Systems/RenderSystem.h ECS/Components/Mesh.h ECS/Systems/MouseLookSystem.h ECS/Components/MouseLook.h ECS/Components/ObjMesh.h Util/stb_setup.cpp)
|
||||||
|
|
||||||
include_directories(${OPENGL_INCLUDE_DIRS})
|
include_directories(${OPENGL_INCLUDE_DIRS})
|
||||||
|
|
||||||
|
@ -7,3 +7,5 @@ Some code adapted from Joey de Vries' (https://twitter.com/JoeyDeVriez) tutorial
|
|||||||
OBJ-Loader from https://github.com/Bly7/OBJ-Loader.
|
OBJ-Loader from https://github.com/Bly7/OBJ-Loader.
|
||||||
|
|
||||||
ECS library from https://github.com/redxdev/ECS.
|
ECS library from https://github.com/redxdev/ECS.
|
||||||
|
|
||||||
|
Image loader from https://github.com/nothings/stb/blob/master/stb_image.h.
|
7559
Util/stb_image.h
Normal file
7559
Util/stb_image.h
Normal file
File diff suppressed because it is too large
Load Diff
2
Util/stb_setup.cpp
Normal file
2
Util/stb_setup.cpp
Normal file
@ -0,0 +1,2 @@
|
|||||||
|
#define STB_IMAGE_IMPLEMENTATION
|
||||||
|
#include "stb_image.h"
|
2
main.cpp
2
main.cpp
@ -82,7 +82,7 @@ int main() {
|
|||||||
Entity *box2 = world->create();
|
Entity *box2 = world->create();
|
||||||
box2->assign<Transform>();
|
box2->assign<Transform>();
|
||||||
box2->assign<ObjMesh>("Resources/Monkey.obj");
|
box2->assign<ObjMesh>("Resources/Monkey.obj");
|
||||||
box2->get<Transform>()->translate(glm::vec3(5.0f, 0.0f, 0.0f));
|
box2->get<Transform>()->translate(glm::vec3(0.0f, 0.0f, -5.0f));
|
||||||
|
|
||||||
Shader defaultShader("Shaders/default-vertex.vs", "Shaders/default-fragment.fs");
|
Shader defaultShader("Shaders/default-vertex.vs", "Shaders/default-fragment.fs");
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user