File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change 22
33#include " ../ecs/entity.hpp"
44#include " camera.hpp"
5- #include " mesh-renderer.hpp"
65#include " free-camera-controller.hpp"
6+ #include " mesh-renderer.hpp"
77#include " movement.hpp"
88
99namespace our {
Original file line number Diff line number Diff line change 11#include " mesh-renderer.hpp"
2+
23#include " ../asset-loader.hpp"
34
45namespace our {
Original file line number Diff line number Diff line change 11#pragma once
22
33#include < unordered_set>
4+
45#include " entity.hpp"
56
67namespace our {
Original file line number Diff line number Diff line change @@ -38,7 +38,8 @@ namespace our {
3838
3939 // This function should call the setup of its parent and
4040 // set the "alphaThreshold" uniform to the value in the member variable alphaThreshold
41- // Then it should bind the texture and sampler to a texture unit and send the unit number to the uniform variable "tex"
41+ // Then it should bind the texture and sampler to a texture unit and send the unit number to the uniform variable
42+ // "tex"
4243 void TexturedMaterial::setup () const {
4344 TintedMaterial::setup ();
4445 shader->set (" alphaThreshold" , alphaThreshold);
Original file line number Diff line number Diff line change 11#include " forward-renderer.hpp"
2+
23#include " ../mesh/mesh-utils.hpp"
34#include " ../texture/texture-utils.hpp"
45
Original file line number Diff line number Diff line change 22
33#include < glad/gl.h>
44
5+ #include < glm/gtc/type_ptr.hpp>
56#include < glm/vec4.hpp>
67#include < json/json.hpp>
7- #include < glm/gtc/type_ptr.hpp>
88
99namespace our {
1010
Original file line number Diff line number Diff line change 11#pragma once
22
3+ #include < application.hpp>
34#include < asset-loader.hpp>
4- #include < ecs/world.hpp>
55#include < components/camera.hpp>
66#include < components/mesh-renderer.hpp>
7- #include < application .hpp>
7+ #include < ecs/world .hpp>
88
99// This is a helper function that will search for a component and will return the first one found
1010template <typename T>
You can’t perform that action at this time.
0 commit comments