@galacean/engine-ui 1.4.14 → 1.5.0-alpha.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/browser.js +2 -2
- package/dist/browser.js.map +1 -1
- package/dist/browser.min.js +1 -1
- package/dist/browser.min.js.map +1 -1
- package/dist/main.js +2 -2
- package/dist/main.js.map +1 -1
- package/dist/module.js +2 -2
- package/dist/module.js.map +1 -1
- package/package.json +3 -3
package/dist/main.js
CHANGED
|
@@ -1521,7 +1521,7 @@ exports.UICanvas = /*#__PURE__*/ function(Component) {
|
|
|
1521
1521
|
set: function set(value) {
|
|
1522
1522
|
var preCamera = this._renderCamera;
|
|
1523
1523
|
if (preCamera !== value) {
|
|
1524
|
-
this._isSameOrChildEntity(value.entity) && engine.Logger.warn("Camera entity matching or nested within the canvas entity disables canvas auto-adaptation in ScreenSpaceCamera mode.");
|
|
1524
|
+
value && this._isSameOrChildEntity(value.entity) && engine.Logger.warn("Camera entity matching or nested within the canvas entity disables canvas auto-adaptation in ScreenSpaceCamera mode.");
|
|
1525
1525
|
this._renderCamera = value;
|
|
1526
1526
|
this._updateCameraObserver();
|
|
1527
1527
|
var preRenderMode = this._realRenderMode;
|
|
@@ -2898,7 +2898,7 @@ var GUIComponent = /*#__PURE__*/Object.freeze({
|
|
|
2898
2898
|
Transition: Transition
|
|
2899
2899
|
});
|
|
2900
2900
|
|
|
2901
|
-
var uiDefaultFs = "#define GLSLIFY 1\nuniform sampler2D renderer_UITexture;\n\nvarying vec2 v_uv;\nvarying vec4 v_color;\n\nvoid main() {\n vec4 baseColor =
|
|
2901
|
+
var uiDefaultFs = "#define GLSLIFY 1\n#include <common>\nuniform sampler2D renderer_UITexture;\n\nvarying vec2 v_uv;\nvarying vec4 v_color;\n\nvoid main() {\n vec4 baseColor = texture2DSRGB(renderer_UITexture, v_uv);\n gl_FragColor = baseColor * v_color;\n}\n"; // eslint-disable-line
|
|
2902
2902
|
|
|
2903
2903
|
var uiDefaultVs = "#define GLSLIFY 1\nuniform mat4 renderer_MVPMat;\n\nattribute vec3 POSITION;\nattribute vec2 TEXCOORD_0;\nattribute vec4 COLOR_0;\n\nvarying vec2 v_uv;\nvarying vec4 v_color;\n\nvoid main() {\n gl_Position = renderer_MVPMat * vec4(POSITION, 1.0);\n\n v_uv = TEXCOORD_0;\n v_color = COLOR_0;\n}\n"; // eslint-disable-line
|
|
2904
2904
|
|