diff --git a/examples/shaders/resources/old_car_d.png b/examples/shaders/resources/old_car_d.png index b1d0eb3ae..d8b3c833d 100644 Binary files a/examples/shaders/resources/old_car_d.png and b/examples/shaders/resources/old_car_d.png differ diff --git a/examples/shaders/resources/old_car_e.png b/examples/shaders/resources/old_car_e.png index 5128a967c..23f01c0fe 100644 Binary files a/examples/shaders/resources/old_car_e.png and b/examples/shaders/resources/old_car_e.png differ diff --git a/examples/shaders/resources/old_car_mra.png b/examples/shaders/resources/old_car_mra.png index 7e5b08531..0fb46b336 100644 Binary files a/examples/shaders/resources/old_car_mra.png and b/examples/shaders/resources/old_car_mra.png differ diff --git a/examples/shaders/resources/old_car_n.png b/examples/shaders/resources/old_car_n.png index 0931dde18..11f689fe2 100644 Binary files a/examples/shaders/resources/old_car_n.png and b/examples/shaders/resources/old_car_n.png differ diff --git a/examples/shaders/resources/road_a.png b/examples/shaders/resources/road_a.png index 59e5a705c..103777398 100644 Binary files a/examples/shaders/resources/road_a.png and b/examples/shaders/resources/road_a.png differ diff --git a/examples/shaders/resources/road_mra.png b/examples/shaders/resources/road_mra.png index 4c8658a33..988c839cc 100644 Binary files a/examples/shaders/resources/road_mra.png and b/examples/shaders/resources/road_mra.png differ diff --git a/examples/shaders/resources/road_n.png b/examples/shaders/resources/road_n.png index ae9d20d04..a5f3548c1 100644 Binary files a/examples/shaders/resources/road_n.png and b/examples/shaders/resources/road_n.png differ diff --git a/examples/shaders/rpbr.h b/examples/shaders/rpbr.h index 63d8479af..a8b7e9394 100644 --- a/examples/shaders/rpbr.h +++ b/examples/shaders/rpbr.h @@ -173,8 +173,10 @@ void PBRLightUpdate(Shader shader, PBRLight light); void PBRSetAmbient(Shader shader, Color color, float intensity); PBRModel PBRModelLoad(const char *fileName); +PBRModel PBRModelLoadFromMesh(Mesh mesh); + void PBRLoadTextures(PBRMaterial *pbrMat,PBRTexType pbrTexType,const char *fileName); -void UnloadPBRMaterial(PBRMaterial pbrMat) +void UnloadPBRMaterial(PBRMaterial pbrMat); void PBRSetColor(PBRMaterial *pbrMat,PBRColorType pbrColorType,Color color); void PBRSetVec2(PBRMaterial *pbrMat,PBRVec2Type type,Vector2 value); void PBRSetFloat(PBRMaterial *pbrMat, PBRFloatType pbrParamType, float value); @@ -312,7 +314,6 @@ void PBRMaterialSetup(PBRMaterial *pbrMat, Shader pbrShader, PBREnvironment* env SetShaderValue(pbrMat->pbrShader,pbrMat->texOffsetLoc,pbrMat->texOffset,SHADER_UNIFORM_VEC2); } - void PBRLoadTextures(PBRMaterial *pbrMat,PBRTexType pbrTexType,const char *fileName){ if(pbrMat == NULL) return; switch(pbrTexType){ @@ -457,4 +458,9 @@ PBRModel PBRModelLoad(const char *fileName){ return pbrModel; } +PBRModel PBRModelLoadFromMesh(Mesh mesh){ + PBRModel pbrModel = (PBRModel){0}; + pbrModel.model = LoadModelFromMesh(mesh); + return pbrModel; +} #endif // RPBR_IMPLEMENTATION diff --git a/examples/shaders/basic_pbr.c b/examples/shaders/shaders_basic_pbr.c similarity index 99% rename from examples/shaders/basic_pbr.c rename to examples/shaders/shaders_basic_pbr.c index 9e620018c..92a888811 100644 --- a/examples/shaders/basic_pbr.c +++ b/examples/shaders/shaders_basic_pbr.c @@ -72,6 +72,7 @@ int main() PBRSetMaterial(&model,&model_mat,0); PBRModel floor = PBRModelLoad("resources/models/plane.glb"); + PBRMaterial floor_mat = (PBRMaterial){0}; PBRMaterialSetup(&floor_mat, shader, NULL); PBRLoadTextures(&floor_mat, PBR_TEXTURE_ALBEDO, "resources/road_a.png");