fix building with msvc & reduce warnings

Author: penggrin12

examples/shaders/shaders_basic_lighting.cpp

@@ -48,9 +48,9 @@ int main(void)
 
     // Define the camera to look into our 3d world
     raylib::Camera camera;
-    camera.position = (Vector3){ 2.0f, 4.0f, 6.0f };    // Camera position
-    camera.target = (Vector3){ 0.0f, 0.5f, 0.0f };      // Camera looking at point
-    camera.up = (Vector3){ 0.0f, 1.0f, 0.0f };          // Camera up vector (rotation towards target)
+    camera.position = Vector3{ 2.0f, 4.0f, 6.0f };    // Camera position
+    camera.target = Vector3{ 0.0f, 0.5f, 0.0f };      // Camera looking at point
+    camera.up = Vector3{ 0.0f, 1.0f, 0.0f };          // Camera up vector (rotation towards target)
     camera.fovy = 45.0f;                                // Camera field-of-view Y
     camera.projection = CAMERA_PERSPECTIVE;             // Camera projection type
 
@@ -70,10 +70,10 @@ int main(void)
 
     // Create lights
     std::array<Light, MAX_LIGHTS> lights = {
-        CreateLight(LIGHT_POINT, (Vector3) {-2, 1, -2}, Vector3Zero(), YELLOW, shader),
-        CreateLight(LIGHT_POINT, (Vector3) {2, 1, 2}, Vector3Zero(), RED, shader),
-        CreateLight(LIGHT_POINT, (Vector3) {-2, 1, 2}, Vector3Zero(), GREEN, shader),
-        CreateLight(LIGHT_POINT, (Vector3) {2, 1, -2}, Vector3Zero(), BLUE, shader),
+        CreateLight(LIGHT_POINT, Vector3 {-2, 1, -2}, Vector3Zero(), YELLOW, shader),
+        CreateLight(LIGHT_POINT, Vector3 {2, 1, 2}, Vector3Zero(), RED, shader),
+        CreateLight(LIGHT_POINT, Vector3 {-2, 1, 2}, Vector3Zero(), GREEN, shader),
+        CreateLight(LIGHT_POINT, Vector3 {2, 1, -2}, Vector3Zero(), BLUE, shader),
     };
 
     SetTargetFPS(60);                   // Set our game to run at 60 frames-per-second
@@ -110,7 +110,7 @@ int main(void)
 
         BeginShaderMode(shader);
 
-        DrawPlane(Vector3Zero(), (Vector2) { 10.0, 10.0 }, WHITE);
+        DrawPlane(Vector3Zero(), Vector2 { 10.0, 10.0 }, WHITE);
         DrawCube(Vector3Zero(), 2.0, 4.0, 2.0, WHITE);
 
         EndShaderMode();

examples/shaders/shaders_basic_pbr.cpp

@@ -88,9 +88,9 @@ int main()
 
     // Define the camera to look into our 3d world
     raylib::Camera camera;
-    camera.position = (Vector3){ 2.0f, 2.0f, 6.0f };    // Camera position
-    camera.target = (Vector3){ 0.0f, 0.5f, 0.0f };      // Camera looking at point
-    camera.up = (Vector3){ 0.0f, 1.0f, 0.0f };          // Camera up vector (rotation towards target)
+    camera.position = Vector3{ 2.0f, 2.0f, 6.0f };    // Camera position
+    camera.target = Vector3{ 0.0f, 0.5f, 0.0f };      // Camera looking at point
+    camera.up = Vector3{ 0.0f, 1.0f, 0.0f };          // Camera up vector (rotation towards target)
     camera.fovy = 45.0f;                                // Camera field-of-view Y
     camera.projection = CAMERA_PERSPECTIVE;             // Camera projection type
 
@@ -117,8 +117,8 @@ int main()
 
     // Setup ambient color and intensity parameters
     float ambientIntensity = 0.02f;
-    raylib::Color ambientColor = (Color){ 26, 32, 135, 255 };
-    raylib::Vector3 ambientColorNormalized = (Vector3){ ambientColor.r/255.0f, ambientColor.g/255.0f, ambientColor.b/255.0f };
+    raylib::Color ambientColor = Color{ 26, 32, 135, 255 };
+    raylib::Vector3 ambientColorNormalized = Vector3{ ambientColor.r/255.0f, ambientColor.g/255.0f, ambientColor.b/255.0f };
     shader.SetValue(shader.GetLocation("ambientColor"), &ambientColorNormalized, SHADER_UNIFORM_VEC3);
     shader.SetValue(shader.GetLocation("ambient"), &ambientIntensity, SHADER_UNIFORM_FLOAT);
 
@@ -142,7 +142,7 @@ int main()
     car.materials[0].maps[MATERIAL_MAP_METALNESS].value = 0.0f;
     car.materials[0].maps[MATERIAL_MAP_ROUGHNESS].value = 0.0f;
     car.materials[0].maps[MATERIAL_MAP_OCCLUSION].value = 1.0f;
-    car.materials[0].maps[MATERIAL_MAP_EMISSION].color = (Color){ 255, 162, 0, 255 };
+    car.materials[0].maps[MATERIAL_MAP_EMISSION].color = Color{ 255, 162, 0, 255 };
 
     // Setup materials[0].maps default textures
     car.materials[0].maps[MATERIAL_MAP_ALBEDO].texture = LoadTexture("resources/old_car_d.png");
@@ -172,15 +172,15 @@ int main()
 
     // Models texture tiling parameter can be stored in the Material struct if required (CURRENTLY NOT USED)
     // NOTE: Material.params[4] are available for generic parameters storage (float)
-    Vector2 carTextureTiling = (Vector2){ 0.5f, 0.5f };
-    Vector2 floorTextureTiling = (Vector2){ 0.5f, 0.5f };
+    Vector2 carTextureTiling = Vector2{ 0.5f, 0.5f };
+    Vector2 floorTextureTiling = Vector2{ 0.5f, 0.5f };
 
     // Create some lights
     std::array<Light, MAX_LIGHTS> lights = {
-            CreateLight(0, LightType::POINT, (Vector3) {-1.0f, 1.0f, -2.0f}, (Vector3) {0.0f, 0.0f, 0.0f}, YELLOW, 4.0f, shader),
-            CreateLight(1, LightType::POINT, (Vector3){ 2.0f, 1.0f, 1.0f }, (Vector3){ 0.0f, 0.0f, 0.0f }, GREEN, 3.3f, shader),
-            CreateLight(2, LightType::POINT, (Vector3){ -2.0f, 1.0f, 1.0f }, (Vector3){ 0.0f, 0.0f, 0.0f }, RED, 8.3f, shader),
-            CreateLight(3, LightType::POINT, (Vector3){ 1.0f, 1.0f, -2.0f }, (Vector3){ 0.0f, 0.0f, 0.0f }, BLUE, 2.0f, shader),
+            CreateLight(0, LightType::POINT, Vector3{-1.0f, 1.0f, -2.0f}, Vector3{0.0f, 0.0f, 0.0f}, YELLOW, 4.0f, shader),
+            CreateLight(1, LightType::POINT, Vector3{ 2.0f, 1.0f, 1.0f }, Vector3{ 0.0f, 0.0f, 0.0f }, GREEN, 3.3f, shader),
+            CreateLight(2, LightType::POINT, Vector3{ -2.0f, 1.0f, 1.0f }, Vector3{ 0.0f, 0.0f, 0.0f }, RED, 8.3f, shader),
+            CreateLight(3, LightType::POINT, Vector3{ 1.0f, 1.0f, -2.0f }, Vector3{ 0.0f, 0.0f, 0.0f }, BLUE, 2.0f, shader),
     };
 
     // Setup material texture maps usage in shader
@@ -228,7 +228,7 @@ int main()
         raylib::Vector4 floorEmissiveColor = ColorNormalize(floor.materials[0].maps[MATERIAL_MAP_EMISSION].color);
         SetShaderValue(shader, emissiveColorLoc, &floorEmissiveColor, SHADER_UNIFORM_VEC4);
 
-        DrawModel(floor, (Vector3){ 0.0f, 0.0f, 0.0f }, 5.0f, WHITE);   // Draw floor model
+        DrawModel(floor, Vector3{ 0.0f, 0.0f, 0.0f }, 5.0f, WHITE);   // Draw floor model
 
         // Set old car model texture tiling, emissive color and emissive intensity parameters on shader
         SetShaderValue(shader, textureTilingLoc, &carTextureTiling, SHADER_UNIFORM_VEC2);
@@ -237,15 +237,15 @@ int main()
         float emissiveIntensity = 0.01f;
         SetShaderValue(shader, emissiveIntensityLoc, &emissiveIntensity, SHADER_UNIFORM_FLOAT);
 
-        car.Draw((Vector3){ 0.0f, 0.0f, 0.0f }, 0.005f, WHITE);   // Draw car model
+        car.Draw(Vector3{ 0.0f, 0.0f, 0.0f }, 0.005f, WHITE);   // Draw car model
 
         // Draw spheres to show the lights positions
         for (const auto& light : lights)
         {
-            Color lightColor = (Color){ static_cast<unsigned char>(light.color[0]*255),
-                                        static_cast<unsigned char>(light.color[1]*255),
-                                        static_cast<unsigned char>(light.color[2]*255),
-                                        static_cast<unsigned char>(light.color[3]*255) };
+            Color lightColor = Color{ static_cast<unsigned char>(light.color[0]*255),
+                                      static_cast<unsigned char>(light.color[1]*255),
+                                      static_cast<unsigned char>(light.color[2]*255),
+                                      static_cast<unsigned char>(light.color[3]*255) };
 
             if (light.enabled) DrawSphereEx(light.position, 0.2f, 8, 8, lightColor);
             else DrawSphereWires(light.position, 0.2f, 8, 8, ColorAlpha(lightColor, 0.3f));
@@ -267,12 +267,12 @@ int main()
     //--------------------------------------------------------------------------------------
     // Unbind (disconnect) shader from car.material[0]
     // to avoid UnloadMaterial() trying to unload it automatically
-    car.materials[0].shader = (Shader){ 0 };
+    car.materials[0].shader = Shader{ 0 };
     UnloadMaterial(car.materials[0]);
     car.materials[0].maps = NULL;
     //UnloadModel(car);
 
-    floor.materials[0].shader = (Shader){ 0 };
+    floor.materials[0].shader = Shader{ 0 };
     UnloadMaterial(floor.materials[0]);
     floor.materials[0].maps = NULL;
     //UnloadModel(floor);

tests/CMakeLists.txt

@@ -6,7 +6,7 @@ set(CTEST_CUSTOM_TESTS_IGNORE pkg-config--static)
 # Executable
 add_executable(raylib_cpp_test raylib_cpp_test.cpp)
 if (MSVC)
-    target_compile_options(raylib_cpp_test PRIVATE /Wall /W4)
+    target_compile_options(raylib_cpp_test PRIVATE /W4)
 else()
     target_compile_options(raylib_cpp_test PRIVATE -Wall -Wextra -Wconversion -Wsign-conversion -Weffc++)
 endif()

tests/raylib-assert.h

@@ -78,8 +78,9 @@ extern "C" {
 #endif
 
 // Variadic Arguments
-#define RAYLIB_ASSERT_CAT( A, B ) A ## B
-#define RAYLIB_ASSERT_SELECT( NAME, NUM ) RAYLIB_ASSERT_CAT( NAME ## _, NUM )
+#define RAYLIB_ASSERT_CAT(a, b) RAYLIB_ASSERT_CAT_I(a, b)
+#define RAYLIB_ASSERT_CAT_I(a, b) a##b
+#define RAYLIB_ASSERT_SELECT(name, num) RAYLIB_ASSERT_CAT(name##_, num)
 #define RAYLIB_ASSERT_GET_COUNT( _1, _2, _3, _4, _5, _6, _7, RAYLIB_ASSERT_COUNT, ... ) RAYLIB_ASSERT_COUNT
 #define RAYLIB_ASSERT_VA_SIZE( ... ) RAYLIB_ASSERT_GET_COUNT( __VA_ARGS__, 7, 6, 5, 4, 3, 2, 1 )
 #define RAYLIB_ASSERT_VA_SELECT( NAME, ... ) RAYLIB_ASSERT_SELECT( NAME, RAYLIB_ASSERT_VA_SIZE(__VA_ARGS__) )(__VA_ARGS__)