From 2b5bdc0324015d4a51e2c4af0855290e943f094e Mon Sep 17 00:00:00 2001 From: victorfisac Date: Sat, 15 Jul 2017 16:44:56 +0200 Subject: [PATCH] Fixed little bug --- examples/models/models_material_pbr.c | 2 +- examples/models/models_skybox.c | 10 +++------- examples/models/resources/shaders/pbr.fs | 2 +- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/examples/models/models_material_pbr.c b/examples/models/models_material_pbr.c index 8423037dd..8d4e01b25 100644 --- a/examples/models/models_material_pbr.c +++ b/examples/models/models_material_pbr.c @@ -46,7 +46,7 @@ int main() int screenWidth = 800; int screenHeight = 450; - SetConfigFlags(FLAG_MSAA_4X_HINT); + SetConfigFlags(FLAG_MSAA_4X_HINT); // Enable Multi Sampling Anti Aliasing 4x (if available) InitWindow(screenWidth, screenHeight, "raylib [models] example - pbr material"); // Define the camera to look into our 3d world diff --git a/examples/models/models_skybox.c b/examples/models/models_skybox.c index 5f0447df6..67087ef4e 100644 --- a/examples/models/models_skybox.c +++ b/examples/models/models_skybox.c @@ -24,16 +24,12 @@ int main() // Define the camera to look into our 3d world Camera camera = {{ 1.0f, 1.0f, 1.0f }, { 0.0f, 0.0f, 0.0f }, { 0.0f, 1.0f, 0.0f }, 45.0f }; - // Load skybox model and shader - #define PATH_SKYBOX_VS "resources/shaders/skybox.vs" // Path to skybox vertex shader - #define PATH_SKYBOX_FS "resources/shaders/skybox.fs" // Path to skybox fragment shader - #define PATH_TEXTURES_HDR "resources/pinetree.hdr" // Path to HDR image - + // Load skybox model and shader Mesh cube = GenMeshCube(1.0f, 1.0f, 1.0f); Model skybox = LoadModelFromMesh(cube, false); - skybox.material.shader = LoadShader(PATH_SKYBOX_VS, PATH_SKYBOX_FS); + skybox.material.shader = LoadShader("resources/shaders/skybox.vs", "resources/shaders/skybox.fs"); - Texture2D texHDR = LoadTexture(PATH_TEXTURES_HDR); + Texture2D texHDR = LoadTexture("resources/pinetree.hdr"); skybox.material.maps[TEXMAP_CUBEMAP].tex = rlGenMapCubemap(texHDR, 512); SetShaderValuei(skybox.material.shader, GetShaderLocation(skybox.material.shader, "environmentMap"), (int[1]){ TEXMAP_CUBEMAP }, 1); diff --git a/examples/models/resources/shaders/pbr.fs b/examples/models/resources/shaders/pbr.fs index 347a0d941..068148236 100644 --- a/examples/models/resources/shaders/pbr.fs +++ b/examples/models/resources/shaders/pbr.fs @@ -74,7 +74,7 @@ vec2 ParallaxMapping(vec2 texCoords, vec3 viewDir); vec3 ComputeMaterialProperty(MaterialProperty property) { - vec result = vec3(0.0, 0.0, 0.0); + vec3 result = vec3(0.0, 0.0, 0.0); if (property.useSampler == 1) result = texture(property.sampler, texCoord).rgb; else result = property.color;