Warwick/game
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added assimp version requirement as default debian version doesn't support pbr by defualt

Browse source
This commit is contained in:
Warwick 2022-07-18 15:41:49 +01:00
parent 187936bea6
commit 7e3a7f0df7
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CMakeLists.txt
View file

@ -26,6 +26,10 @@ find_package(GLEW REQUIRED)
find_package(GLM REQUIRED) find_package(GLM REQUIRED)
find_package(assimp REQUIRED) find_package(assimp REQUIRED)
if (assimp_VERSION VERSION_LESS "5.1")
message(FATAL_ERROR "Assimp ${assimp_VERSION} out of date, Assimp 5.1.0 or newer is required!")
endif()
include_directories( include_directories(
${SDL2_INCLUDE_DIRS} ${SDL2_INCLUDE_DIRS}
${SDL2_IMAGE_DIRS} ${SDL2_IMAGE_DIRS}

6
data/shaders/pbrFragment.glsl
View file

@ -29,8 +29,6 @@ uniform sampler2D texture_diffuse3;
uniform sampler2D texture_specular1; uniform sampler2D texture_specular1;
uniform sampler2D texture_specular2; uniform sampler2D texture_specular2;
uniform sampler2D ourTexture;
// PBR functions from learnOpenGL.com // PBR functions from learnOpenGL.com
const float PI = 3.14159265359; const float PI = 3.14159265359;
@ -74,7 +72,7 @@ float GeometrySmith(vec3 N, vec3 V, vec3 L, float roughness)
void main() void main()
{ {
albedo = vec3(texture(texture_diffuse1, ourTexCoord)); //albedo = vec3(texture(texture_diffuse1, ourTexCoord));
// Establish ambient lighting // Establish ambient lighting
float ambientStrength = 0.1; float ambientStrength = 0.1;
@ -87,7 +85,7 @@ void main()
vec3 V = normalize(CameraPos - WorldPos); vec3 V = normalize(CameraPos - WorldPos);
vec3 Lo = vec3(0.0f); vec3 Lo = vec3(0.0f);
//TODO: Loop through this block for the number of lights //TODO: Loop through the code up to ambient definition for each light
vec3 L = normalize(lightPosition - WorldPos); vec3 L = normalize(lightPosition - WorldPos);
vec3 H = normalize(V - L); vec3 H = normalize(V - L);
float distance = length(lightPosition - WorldPos); float distance = length(lightPosition - WorldPos);