diff --git a/Apps/package-lock.json b/Apps/package-lock.json index 5fe9e4168..29b1b3295 100644 --- a/Apps/package-lock.json +++ b/Apps/package-lock.json @@ -96,6 +96,7 @@ "integrity": "sha512-yDBHV9kQNcr2/sUr9jghVyz9C3Y5G2zUM2H2lo+9mKv4sFgbA8s8Z9t8D1jiTkGoO/NoIfKMyKWr4s6CN23ZwQ==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "@ampproject/remapping": "^2.2.0", "@babel/code-frame": "^7.27.1", @@ -1925,7 +1926,8 @@ "version": "8.25.1", "resolved": "https://registry.npmjs.org/@babylonjs/core/-/core-8.25.1.tgz", "integrity": "sha512-MxnXfRzHe/JzkGz1w/rtmLaU/m93aatqgOnMiXP6lP7a81LodA5nxL48KTHcIgz3cf5ChFr8n2qNkCjc049NIA==", - "license": "Apache-2.0" + "license": "Apache-2.0", + "peer": true }, "node_modules/@babylonjs/gui": { "version": "8.25.1", @@ -2403,6 +2405,7 @@ "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==", "dev": true, "license": "MIT", + "peer": true, "bin": { "acorn": "bin/acorn" }, @@ -2429,6 +2432,7 @@ "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "fast-deep-equal": "^3.1.3", "fast-uri": "^3.0.1", @@ -2611,7 +2615,8 @@ "version": "8.36.1", "resolved": "https://registry.npmjs.org/babylonjs-gltf2interface/-/babylonjs-gltf2interface-8.36.1.tgz", "integrity": "sha512-YzucievP+37reZoFjFnmf5Rn4fLkDR6CgANlu1flolawgiNovqratCzZBD45VTLNBHDHN7uZoLdXie2A+2PEow==", - "license": "Apache-2.0" + "license": "Apache-2.0", + "peer": true }, "node_modules/babylonjs-gui": { "version": "8.36.1", @@ -2743,6 +2748,7 @@ } ], "license": "MIT", + "peer": true, "dependencies": { "caniuse-lite": "^1.0.30001737", "electron-to-chromium": "^1.5.211", @@ -5291,6 +5297,7 @@ "integrity": "sha512-7b0dTKR3Ed//AD/6kkx/o7duS8H3f1a4w3BYpIriX4BzIhjkn4teo05cptsxvLesHFKK5KObnadmCHBwGc+51A==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "@types/eslint-scope": "^3.7.7", "@types/estree": "^1.0.8", @@ -5340,6 +5347,7 @@ "integrity": "sha512-MfwFQ6SfwinsUVi0rNJm7rHZ31GyTcpVE5pgVA3hwFRb7COD4TzjUUwhGWKfO50+xdc2MQPuEBBJoqIMGt3JDw==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "@discoveryjs/json-ext": "^0.6.1", "@webpack-cli/configtest": "^3.0.1", diff --git a/Dependencies/CMakeLists.txt b/Dependencies/CMakeLists.txt index dd3b9f2c1..a09dec6c2 100644 --- a/Dependencies/CMakeLists.txt +++ b/Dependencies/CMakeLists.txt @@ -30,18 +30,17 @@ target_include_directories(base-n INTERFACE "${base-n_SOURCE_DIR}/include") # -------------------------------------------------- # bgfx.cmake # -------------------------------------------------- -set(BGFX_BUILD_TOOLS OFF) set(BGFX_BUILD_EXAMPLES OFF) -set(BGFX_INSTALL OFF) +set(BGFX_BUILD_TOOLS OFF) +set(BGFX_CONFIG_DEBUG_ANNOTATION OFF) +set(BGFX_CONFIG_MULTITHREADED ON) set(BGFX_CUSTOM_TARGETS OFF) -set(BGFX_USE_DEBUG_SUFFIX OFF) +set(BGFX_INSTALL OFF) set(BGFX_OPENGL_USE_EGL ON) +set(BGFX_USE_DEBUG_SUFFIX OFF) FetchContent_MakeAvailable_With_Message(bgfx.cmake) -target_compile_definitions(bgfx PRIVATE BGFX_CONFIG_MULTITHREADED=1) target_compile_definitions(bgfx PRIVATE BGFX_CONFIG_MAX_VERTEX_STREAMS=18) -target_compile_definitions(bgfx PRIVATE BGFX_GL_CONFIG_BLIT_EMULATION=1) -target_compile_definitions(bgfx PRIVATE BGFX_CONFIG_DEBUG_ANNOTATION=0) if(GRAPHICS_API STREQUAL "D3D11") target_compile_definitions(bgfx PRIVATE BGFX_CONFIG_RENDERER_DIRECT3D11=1) elseif(GRAPHICS_API STREQUAL "D3D12") @@ -50,6 +49,7 @@ elseif(GRAPHICS_API STREQUAL "Metal") target_compile_definitions(bgfx PRIVATE BGFX_CONFIG_RENDERER_METAL=1) elseif(GRAPHICS_API STREQUAL "OpenGL") target_compile_definitions(bgfx PRIVATE BGFX_CONFIG_RENDERER_OPENGLES=30) + target_compile_definitions(bgfx PRIVATE BGFX_GL_CONFIG_BLIT_EMULATION=1) target_compile_definitions(bgfx PRIVATE BGFX_GL_CONFIG_TEXTURE_READ_BACK_EMULATION=1) elseif(GRAPHICS_API STREQUAL "Vulkan") target_compile_definitions(bgfx PRIVATE BGFX_CONFIG_RENDERER_VULKAN=1) diff --git a/Polyfills/Canvas/Source/Gradient.cpp b/Polyfills/Canvas/Source/Gradient.cpp index 031b83ab3..e1a6f398b 100644 --- a/Polyfills/Canvas/Source/Gradient.cpp +++ b/Polyfills/Canvas/Source/Gradient.cpp @@ -1,10 +1,13 @@ #include -#include #include "Canvas.h" #include "Context.h" #include "Gradient.h" #include "Colors.h" +#include +#include +#include + #ifdef __GNUC__ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wpedantic" @@ -63,7 +66,7 @@ namespace Babylon::Polyfills::Internal return color; color = nvgRGBAf(color.r * x->mul[0], color.g * x->mul[1], color.b * x->mul[2], color.a * x->mul[3]); color = nvgRGBAf(color.r + x->add[0], color.g + x->add[1], color.b + x->add[2], color.a + x->add[3]); - color = nvgRGBAf(fmax(0.0f, fmin(color.r, 1.0f)), fmax(0.0f, fmin(color.g, 1.0f)), fmax(0.0f, fmin(color.b, 1.0f)), fmax(0.0f, fmin(color.a, 1.0f))); + color = nvgRGBAf(std::max(0.0f, std::min(color.r, 1.0f)), std::max(0.0f, std::min(color.g, 1.0f)), std::max(0.0f, std::min(color.b, 1.0f)), std::max(0.0f, std::min(color.a, 1.0f))); return color; } @@ -182,10 +185,10 @@ namespace Babylon::Polyfills::Internal NVGcolor lerpColor(NVGcolor color0, NVGcolor color1, float offset0, float offset1, float g) { NVGcolor dst; - float den = fmax(0.00001f, offset1 - offset0); + float den = std::max(0.00001f, offset1 - offset0); for (int i = 0; i < 4; i++) dst.rgba[i] = color0.rgba[i] + (color1.rgba[i] - color0.rgba[i]) * (g - offset0) / den; - dst = nvgRGBAf(fmax(0.0f, fmin(dst.r, 1.0f)), fmax(0.0f, fmin(dst.g, 1.0f)), fmax(0.0f, fmin(dst.b, 1.0f)), fmax(0.0f, fmin(dst.a, 1.0f))); + dst = nvgRGBAf(std::max(0.0f, std::min(dst.r, 1.0f)), std::max(0.0f, std::min(dst.g, 1.0f)), std::max(0.0f, std::min(dst.b, 1.0f)), std::max(0.0f, std::min(dst.a, 1.0f))); return dst; } @@ -254,7 +257,7 @@ namespace Babylon::Polyfills::Internal float numerator = (dx * fxp + dy * fyp); float df = dx * fyp - dy * fxp; - numerator += sqrtf((rn * rn) * (dx * dx + dy * dy) - (df * df)); + numerator += std::sqrt((rn * rn) * (dx * dx + dy * dy) - (df * df)); float g = numerator / denominator; // color = c0 + (c1 - c0)(g - x0)/(x1 - x0)