mirror of
https://github.com/4ian/GDevelop.git
synced 2025-10-15 10:19:04 +00:00
Compare commits
1 Commits
40c576bc2d
...
show-small
Author | SHA1 | Date | |
---|---|---|---|
![]() |
be50c6ccd2 |
@@ -101,8 +101,9 @@ bool ExporterHelper::ExportProjectForPixiPreview(
|
||||
} else {
|
||||
// Most of the time, we skip the logo and minimum duration so that
|
||||
// the preview start as soon as possible.
|
||||
exportedProject.GetLoadingScreen().ShowGDevelopLogoDuringLoadingScreen(false).SetMinDuration(
|
||||
0);
|
||||
exportedProject.GetLoadingScreen()
|
||||
.ShowGDevelopLogoDuringLoadingScreen(false)
|
||||
.SetMinDuration(0);
|
||||
exportedProject.GetWatermark().ShowGDevelopWatermark(false);
|
||||
}
|
||||
|
||||
@@ -308,16 +309,22 @@ bool ExporterHelper::ExportCordovaFiles(const gd::Project &project,
|
||||
}
|
||||
|
||||
// Splashscreen icon for Android 12+.
|
||||
gd::String splashScreenIconFilename = getIconFilename("android", "windowSplashScreenAnimatedIcon");
|
||||
gd::String splashScreenIconFilename =
|
||||
getIconFilename("android", "windowSplashScreenAnimatedIcon");
|
||||
if (!splashScreenIconFilename.empty())
|
||||
output += "<preference name=\"AndroidWindowSplashScreenAnimatedIcon\" value=\""
|
||||
+ splashScreenIconFilename + "\" />\n";
|
||||
output +=
|
||||
"<preference name=\"AndroidWindowSplashScreenAnimatedIcon\" "
|
||||
"value=\"" +
|
||||
splashScreenIconFilename + "\" />\n";
|
||||
|
||||
// Splashscreen "branding" image for Android 12+.
|
||||
gd::String splashScreenBrandingImageFilename = getIconFilename("android", "windowSplashScreenBrandingImage");
|
||||
gd::String splashScreenBrandingImageFilename =
|
||||
getIconFilename("android", "windowSplashScreenBrandingImage");
|
||||
if (!splashScreenBrandingImageFilename.empty())
|
||||
output += "<preference name=\"AndroidWindowSplashScreenBrandingImage\" value=\""
|
||||
+ splashScreenBrandingImageFilename + "\" />\n";
|
||||
output +=
|
||||
"<preference name=\"AndroidWindowSplashScreenBrandingImage\" "
|
||||
"value=\"" +
|
||||
splashScreenBrandingImageFilename + "\" />\n";
|
||||
|
||||
return output;
|
||||
};
|
||||
@@ -621,12 +628,16 @@ void ExporterHelper::AddLibsInclude(bool pixiRenderers,
|
||||
|
||||
if (gdevelopLogoStyle == "dark") {
|
||||
InsertUnique(includesFiles, "splash/gd-logo-dark.js");
|
||||
InsertUnique(includesFiles, "splash/gd-logo-dark-small.js");
|
||||
} else if (gdevelopLogoStyle == "dark-colored") {
|
||||
InsertUnique(includesFiles, "splash/gd-logo-dark-colored.js");
|
||||
InsertUnique(includesFiles, "splash/gd-logo-dark-small.js");
|
||||
} else if (gdevelopLogoStyle == "light-colored") {
|
||||
InsertUnique(includesFiles, "splash/gd-logo-light-colored.js");
|
||||
InsertUnique(includesFiles, "splash/gd-logo-light-small.js");
|
||||
} else {
|
||||
InsertUnique(includesFiles, "splash/gd-logo-light.js");
|
||||
InsertUnique(includesFiles, "splash/gd-logo-light-small.js");
|
||||
}
|
||||
|
||||
if (includeWebsocketDebuggerClient || includeWindowMessageDebuggerClient) {
|
||||
@@ -651,10 +662,8 @@ void ExporterHelper::AddLibsInclude(bool pixiRenderers,
|
||||
InsertUnique(includesFiles, "pixi-renderers/pixi-bitmapfont-manager.js");
|
||||
InsertUnique(includesFiles,
|
||||
"pixi-renderers/spriteruntimeobject-pixi-renderer.js");
|
||||
InsertUnique(includesFiles,
|
||||
"pixi-renderers/CustomObjectPixiRenderer.js");
|
||||
InsertUnique(includesFiles,
|
||||
"pixi-renderers/DebuggerPixiRenderer.js");
|
||||
InsertUnique(includesFiles, "pixi-renderers/CustomObjectPixiRenderer.js");
|
||||
InsertUnique(includesFiles, "pixi-renderers/DebuggerPixiRenderer.js");
|
||||
InsertUnique(includesFiles,
|
||||
"pixi-renderers/loadingscreen-pixi-renderer.js");
|
||||
InsertUnique(includesFiles, "pixi-renderers/pixi-effects-manager.js");
|
||||
|
@@ -43,6 +43,7 @@ namespace gdjs {
|
||||
|
||||
/** Base64 encoded logo of GDevelop for the splash screen. */
|
||||
export let gdevelopLogo: string = '';
|
||||
export let gdevelopLogoSmall: string = '';
|
||||
|
||||
/**
|
||||
* Convert a RGB object to a Hex string.
|
||||
|
@@ -64,9 +64,13 @@ namespace gdjs {
|
||||
this._backgroundSprite.anchor.y = 0.5;
|
||||
this._loadingScreenContainer.addChild(this._backgroundSprite);
|
||||
}
|
||||
const hasLowResolution =
|
||||
this._pixiRenderer.width < 200 || this._pixiRenderer.height < 200;
|
||||
|
||||
if (loadingScreenData.showGDevelopSplash) {
|
||||
this._gdevelopLogoSprite = PIXI.Sprite.from(gdjs.gdevelopLogo);
|
||||
this._gdevelopLogoSprite = hasLowResolution
|
||||
? PIXI.Sprite.from(gdjs.gdevelopLogoSmall)
|
||||
: PIXI.Sprite.from(gdjs.gdevelopLogo);
|
||||
this._gdevelopLogoSprite.alpha = 0;
|
||||
this._gdevelopLogoSprite.anchor.x = 0.5;
|
||||
this._gdevelopLogoSprite.anchor.y = 0.5;
|
||||
@@ -122,10 +126,10 @@ namespace gdjs {
|
||||
this._gdevelopLogoSprite.scale.x = scale;
|
||||
this._gdevelopLogoSprite.scale.y = scale;
|
||||
|
||||
// Give up trying to show the logo if the resolution is really too small.
|
||||
// TODO: use a low resolution logo instead.
|
||||
this._gdevelopLogoSprite.visible =
|
||||
this._pixiRenderer.width > 200 && this._pixiRenderer.height > 200;
|
||||
// // Give up trying to show the logo if the resolution is really too small.
|
||||
// // TODO: use a low resolution logo instead.
|
||||
// this._gdevelopLogoSprite.visible =
|
||||
// this._pixiRenderer.width > 200 && this._pixiRenderer.height > 200;
|
||||
}
|
||||
}
|
||||
|
||||
|
4
GDJS/Runtime/splash/gd-logo-dark-small.ts
Normal file
4
GDJS/Runtime/splash/gd-logo-dark-small.ts
Normal file
@@ -0,0 +1,4 @@
|
||||
namespace gdjs {
|
||||
gdjs.gdevelopLogoSmall =
|
||||
'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADIAAAAOCAYAAABth09nAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAhGVYSWZNTQAqAAAACAAFARIAAwAAAAEAAQAAARoABQAAAAEAAABKARsABQAAAAEAAABSASgAAwAAAAEAAgAAh2kABAAAAAEAAABaAAAAAAAAAEgAAAABAAAASAAAAAEAA6ABAAMAAAABAAEAAKACAAQAAAABAAAAMqADAAQAAAABAAAADgAAAADiIJcvAAAACXBIWXMAAAsTAAALEwEAmpwYAAABWWlUWHRYTUw6Y29tLmFkb2JlLnhtcAAAAAAAPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iWE1QIENvcmUgNi4wLjAiPgogICA8cmRmOlJERiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPgogICAgICA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIgogICAgICAgICAgICB4bWxuczp0aWZmPSJodHRwOi8vbnMuYWRvYmUuY29tL3RpZmYvMS4wLyI+CiAgICAgICAgIDx0aWZmOk9yaWVudGF0aW9uPjE8L3RpZmY6T3JpZW50YXRpb24+CiAgICAgIDwvcmRmOkRlc2NyaXB0aW9uPgogICA8L3JkZjpSREY+CjwveDp4bXBtZXRhPgoZXuEHAAAGdElEQVRIDcVWXWxcRxU+Z2Z2vbETZ+PdjZ2ftkmx96eu4w2mQolCa4SKWjUIKLVSUYQE4iWqhERUiYdWSMBjWyGhKiDUB8pDebAEEahIDVAcSlWKZGKv43i9XgcDDXYct0kc/+3eOzP9zt2usZU8w7Hnzsw9P3P+5rvLtJ0Utk5edef6vqhIfcGz7ybilCeKMxGmBmHB2IfYJT2pr1bLFy9grTFsQ+J/+zRbjoNfDUd7csWzSqvT2mhi/DknsW3GsKnivScTi1O9tv4sXl7o7e3Vk5OTEggPDg7qkUzG03BTfFgMREkSfnNAjv8rNyx84TXlsMR+aEjRsBgawhjeZn/w+nUeGRlxohQRnIjDiXq2cORppcwvxUkE8AbmnxOrJXhRb8rKrJ2X6pFVbl07Wq1UJsqyB21WtbHd9myed2dWtolFwYjM3Wzd7R2hIkO6t/eyTiQSkXHn+JTWiqyt/3mmXDq53f6du2y2+CW0X1dPvv9R5+nS7PT4n7LZgbTn4Btecag8BXi/htpOT0+PvSMWCoWBfSHZB8n7Frh8lJy/hWQtG9ZvBj7sq5bHzw8MDMRGR0cDJLijbs0zTH4n7ExWp0u/yWb7DzhNX2PYhQ32MfeG6clXXoPgU7W14AzOOIvGv5fxQOrelEO7c8VnmP2PsPT4q4GxgfVuVPw7M+Wx10n7r7BVL2mlFi2F3+4p9Fmy9UXw94fr/P22tiAMgvgnULmv9/X1XZ6YmLhhvT0J+/j3aXbqrVptz6jWH7bXYj6JS/YE7J9HEHL/qGbN80r5c66+9jeOtb2QyxU/gGqNvMv4MPEDbqndrwI6o2CupyWxo4Udd4kirMdk9sS3ZSbl4DS1YeBO0y6ldI/WZi+CWxc2ErKwtpaoTE2NzpMzL0PoGBnOIBmzc3NjN9GuK5XKxXFkdH4jpL6GjnvAxt05R4y74P4zNzeyMTtbWiRtNuDAssiAfHe+//Ps/T8rl0tvV6vVGlv6qVX0kGWXIs8Xq9X3lmcmx8bgdYuCe4vWWgkg3tAn3AfpMv+w7KtTpbMz5fFdGF0w+iIrJuuCqf2de34byXtnWlvrEijVW6200qr3qh0mit2F/u9mC/2nhMesqjj8gLQVKV6ZLZUWlff3OEWnuwtHvnXoUDGpaoFDaFEiRQfyQAteiNZ4BHHYx6SYdyABg6KHYL/nyL9rcJkXwKCQ6YFI1/tzcOKzOPopCL3Cml/1Nb5KdHvZMz8uTQcc+AuQIjx48NgOprVaLLYRoYxa1p7iYRw20Ra+tLs19hPYbDhmbYmV/lxAwZfh4NtyFqDmpvH8Wrk8XpF9Pl9MhuQ24VspWnXOp4TXJO+cYaXqSEYVun8AP6hUSlcRoBoReEVFTuTz/dmZ6dKP0dVvGROjmIk9i5a7yMb9m03bbcXqRAOKKaqGSa+3wBkwUAeQjodPA+sW2Oh/IRHtclkx1gRQgGpXvHdJJOJJClcviDx7Nsym0cLYO2fhOyeEJ7Rh7AW06BEBD9nrQJ3EQVdJ+SVo18rlsblKZRxJBu/ggb1X6qE/Bcf3W+fu/3Dp2usYv0imMsve23uB6B1opxgMamTaohx/bW+LvTA/P+9uLixspNNdBePo2J5M13G0np+Znni1oz2TgEePpzJdebx/OJ1ZOvzB0rXxjkzXLlTKVStTf5TDU3v3fdJ6/0g63VnYk9l3XONeOfafTqU6sx2ZzsdanLqCCpXQA99MpTs/hf7cCdT6WUdyX0Ypl4DNSzAjcCyFIBIIRW5+DWcBu/Y8vhBnqpfHJ4V3qFhMco13xx0Fq6uJG++//250yQ8Xjt4Xsy4MNbe6dboOdFqT75DofEycy+V2ynp1tSOEnqBdVDnMcm60Bsy2rqysaGOMF2DAe4LeLtnfutVuo/OGhvThqan0Py5duib8u5EYlIhcd+7IaaXUWWmpIKjX8O53QOjfK8sTztANUdaWk8jYg1g+iXEc8jtRxZeB+88J/2PsF9hsOiyvt5KcJ2Prl3sr/45183vSYAwBnbf9QtiUbxqOjHfnjz7C3v1QGf0Zow26CPjlHXoXfkFCQAEXDcqoXBgAvdwr6PfnBBoHBweNAMCm5UaCxK6QBHY354UvBpuBi0zjACxAsheegn21xf5Wu2A3stOYG79nIsTAl/OE1/4xoMtDuJH3YN6NiASjpTJziOYdp9SvZif/XhVlUFTVxvL/8/wIv2AAqx1rA0sAAAAASUVORK5CYII=';
|
||||
}
|
4
GDJS/Runtime/splash/gd-logo-light-small.ts
Normal file
4
GDJS/Runtime/splash/gd-logo-light-small.ts
Normal file
File diff suppressed because one or more lines are too long
Reference in New Issue
Block a user