From 3ba6f73025671ecefa846b4448efef56802d0dfd Mon Sep 17 00:00:00 2001 From: nokotan Date: Mon, 3 Oct 2022 15:24:51 +0900 Subject: [PATCH] [Web][CI] keyup --- Web/CI/src/config.ts | 10 +++++----- Web/CI/src/util.ts | 6 +++--- Web/VisualStudioTemplate/Files/Siv3DTest.vcxproj | 4 ++-- Web/VisualStudioTemplate/Files/Siv3DTest.vcxproj.tpl | 4 ++-- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Web/CI/src/config.ts b/Web/CI/src/config.ts index de2f53aa3..98aa4a342 100644 --- a/Web/CI/src/config.ts +++ b/Web/CI/src/config.ts @@ -36,13 +36,13 @@ export const deviceCapabilities: DeciceCapability[] = [ 'os' : 'Windows', 'os_version' : '10', 'browserName' : 'Chrome', - 'browser_version' : '98' + 'browser_version' : '105' }, // { // 'os' : 'Windows', // 'os_version' : '10', // 'browserName' : 'Edge', - // 'browser_version' : '98' + // 'browser_version' : '105' // }, { 'os' : 'OS X', @@ -54,13 +54,13 @@ export const deviceCapabilities: DeciceCapability[] = [ 'os' : 'OS X', 'os_version' : 'Monterey', 'browserName' : 'Chrome', - 'browser_version' : '98' + 'browser_version' : '105' }, { 'os' : 'OS X', 'os_version' : 'Monterey', 'browserName' : 'FireFox', - 'browser_version' : '97' + 'browser_version' : '105' }, // { // 'os' : 'android', @@ -141,7 +141,7 @@ export const notSupportedDeviceCapabilities: DeciceCapability[] = [ 'os' : 'Windows', 'os_version' : '10', 'browserName' : 'Firefox', - 'browser_version' : '97' + 'browser_version' : '105' }, { 'os' : 'OS X', diff --git a/Web/CI/src/util.ts b/Web/CI/src/util.ts index e5941f083..a7f9ea770 100644 --- a/Web/CI/src/util.ts +++ b/Web/CI/src/util.ts @@ -162,7 +162,7 @@ export class Siv3DApp { await actions .move(this.scalePoint(point)) .press() - .pause(50) + .pause(200) .release() .perform(); } @@ -170,7 +170,7 @@ export class Siv3DApp { async keyDown(actions: Actions, key: string) { await actions .keyDown(key) - .pause(30) + .pause(200) .keyUp(key) .perform(); } @@ -178,7 +178,7 @@ export class Siv3DApp { async sendKeys(actions: Actions, keys: string) { for (const key of keys) { actions.keyDown(key) - .pause(30) + .pause(200) .keyUp(key); } diff --git a/Web/VisualStudioTemplate/Files/Siv3DTest.vcxproj b/Web/VisualStudioTemplate/Files/Siv3DTest.vcxproj index 1bcdb28a9..846a2bb72 100644 --- a/Web/VisualStudioTemplate/Files/Siv3DTest.vcxproj +++ b/Web/VisualStudioTemplate/Files/Siv3DTest.vcxproj @@ -303,7 +303,7 @@ $(ProjectDir)\resources@/resources;$(ProjectDir)\example@/example -s USE_OGG=1 -s USE_VORBIS=1 -s WARN_ON_UNDEFINED_SYMBOLS=0 -s ERROR_ON_UNDEFINED_SYMBOLS=0 -s FULL_ES3=1 -s USE_WEBGPU=1 -s USE_GLFW=3 -s MIN_WEBGL_VERSION=2 -s MAX_WEBGL_VERSION=2 -s MODULARIZE=1 -s EXCEPTION_CATCHING_ALLOWED=["main","_ZN3s3d7TryMainEv"] -s ASYNCIFY=1 -s ASYNCIFY_IGNORE_INDIRECT=1 - -s ASYNCIFY_IMPORTS="[ 'siv3dRequestAnimationFrame', 'siv3dGetClipboardText', 'siv3dDecodeImageFromFile', 'siv3dSleepUntilWaked', 'invoke_vi', 'invoke_vi' ]" + -s ASYNCIFY_IMPORTS="[ 'siv3dRequestAnimationFrame', 'siv3dGetClipboardText', 'siv3dDecodeImageFromFile', 'siv3dSleepUntilWaked', 'invoke_vi', 'invoke_v' ]" -s ASYNCIFY_ADD="[ 'main','Main()','dynCall_v','dynCall_vi','s3d::TryMain()','s3d::CSystem::init()','s3d::System::Update()','s3d::AACDecoder::decode(*) const','s3d::MP3Decoder::decode(*) const','s3d::CAudioDecoder::decode(*)','s3d::AudioDecoder::Decode(*)','s3d::Wave::Wave(*)','s3d::Audio::Audio(*)','s3d::Clipboard::GetText(*)','s3d::CClipboard::getText(*)','s3d::GenericDecoder::decode(*) const','s3d::CImageDecoder::decode(*)','s3d::Image::Image(*)','s3d::Texture::Texture(*)','s3d::ImageDecoder::Decode(*)','s3d::ImageDecoder::GetImageInfo(*)','s3d::CRenderer2D_GLES3::init()','s3d::CRenderer2D_WebGPU::init()','s3d::Clipboard::GetText(*)','s3d::CClipboard::getText(*)','s3d::SimpleHTTP::Save(*)','s3d::SimpleHTTP::Load(*)','s3d::SimpleHTTP::Get(*)','s3d::SimpleHTTP::Post(*)','s3d::VideoReader::VideoReader(*)','s3d::VideoReader::open(*)','s3d::Platform::Web::FetchFileIfNotExists(*)' ]" %(AdditionalOptions) $(LibraryPath);%(AdditionalLinkDirectories) Siv3DScript;Siv3D;opencv_objdetect;opencv_photo;opencv_imgproc;opencv_core;harfbuzz;freetype;turbojpeg;gif;webp;opusfile;opus;tiff;png;z;SDL2; @@ -331,7 +331,7 @@ -s USE_OGG=1 -s USE_VORBIS=1 -s WARN_ON_UNDEFINED_SYMBOLS=0 -s ERROR_ON_UNDEFINED_SYMBOLS=0 -s FULL_ES3=1 -s USE_WEBGPU=1 -s USE_GLFW=3 -s MIN_WEBGL_VERSION=2 -s MAX_WEBGL_VERSION=2 -s MODULARIZE=1 -s ASYNCIFY=1 -s ASYNCIFY_IGNORE_INDIRECT=1 - -s ASYNCIFY_IMPORTS="[ 'siv3dRequestAnimationFrame', 'siv3dGetClipboardText', 'siv3dDecodeImageFromFile', 'siv3dSleepUntilWaked', 'invoke_vi', 'invoke_vi' ]" + -s ASYNCIFY_IMPORTS="[ 'siv3dRequestAnimationFrame', 'siv3dGetClipboardText', 'siv3dDecodeImageFromFile', 'siv3dSleepUntilWaked', 'invoke_vi', 'invoke_v' ]" -s ASYNCIFY_ADD="[ 'main','Main()','dynCall_v','dynCall_vi','s3d::TryMain()','s3d::CSystem::init()','s3d::System::Update()','s3d::AACDecoder::decode(*) const','s3d::MP3Decoder::decode(*) const','s3d::CAudioDecoder::decode(*)','s3d::AudioDecoder::Decode(*)','s3d::Wave::Wave(*)','s3d::Audio::Audio(*)','s3d::Clipboard::GetText(*)','s3d::CClipboard::getText(*)','s3d::GenericDecoder::decode(*) const','s3d::CImageDecoder::decode(*)','s3d::Image::Image(*)','s3d::Texture::Texture(*)','s3d::ImageDecoder::Decode(*)','s3d::ImageDecoder::GetImageInfo(*)','s3d::CRenderer2D_GLES3::init()','s3d::CRenderer2D_WebGPU::init()','s3d::Clipboard::GetText(*)','s3d::CClipboard::getText(*)','s3d::SimpleHTTP::Save(*)','s3d::SimpleHTTP::Load(*)','s3d::SimpleHTTP::Get(*)','s3d::SimpleHTTP::Post(*)','s3d::VideoReader::VideoReader(*)','s3d::VideoReader::open(*)','s3d::Platform::Web::FetchFileIfNotExists(*)' ]" %(AdditionalOptions) Siv3DScript;Siv3D;opencv_objdetect;opencv_photo;opencv_imgproc;opencv_core;harfbuzz;freetype;turbojpeg;gif;webp;opusfile;opus;tiff;png;z;SDL2; $(ProjectDir)\resources@/resources;$(ProjectDir)\example@/example diff --git a/Web/VisualStudioTemplate/Files/Siv3DTest.vcxproj.tpl b/Web/VisualStudioTemplate/Files/Siv3DTest.vcxproj.tpl index 7331600eb..8e224c16e 100644 --- a/Web/VisualStudioTemplate/Files/Siv3DTest.vcxproj.tpl +++ b/Web/VisualStudioTemplate/Files/Siv3DTest.vcxproj.tpl @@ -96,7 +96,7 @@ ${ExampleItems} $(ProjectDir)\resources@/resources;$(ProjectDir)\example@/example -s USE_OGG=1 -s USE_VORBIS=1 -s WARN_ON_UNDEFINED_SYMBOLS=0 -s ERROR_ON_UNDEFINED_SYMBOLS=0 -s FULL_ES3=1 -s USE_WEBGPU=1 -s USE_GLFW=3 -s MIN_WEBGL_VERSION=2 -s MAX_WEBGL_VERSION=2 -s MODULARIZE=1 -s EXCEPTION_CATCHING_ALLOWED=["main","_ZN3s3d7TryMainEv"] -s ASYNCIFY=1 -s ASYNCIFY_IGNORE_INDIRECT=1 - -s ASYNCIFY_IMPORTS="[ 'siv3dRequestAnimationFrame', 'siv3dGetClipboardText', 'siv3dDecodeImageFromFile', 'siv3dSleepUntilWaked', 'invoke_vi', 'invoke_vi' ]" + -s ASYNCIFY_IMPORTS="[ 'siv3dRequestAnimationFrame', 'siv3dGetClipboardText', 'siv3dDecodeImageFromFile', 'siv3dSleepUntilWaked', 'invoke_vi', 'invoke_v' ]" -s ASYNCIFY_ADD="[ 'main','Main()','dynCall_v','dynCall_vi','s3d::TryMain()','s3d::CSystem::init()','s3d::System::Update()','s3d::AACDecoder::decode(*) const','s3d::MP3Decoder::decode(*) const','s3d::CAudioDecoder::decode(*)','s3d::AudioDecoder::Decode(*)','s3d::Wave::Wave(*)','s3d::Audio::Audio(*)','s3d::Clipboard::GetText(*)','s3d::CClipboard::getText(*)','s3d::GenericDecoder::decode(*) const','s3d::CImageDecoder::decode(*)','s3d::Image::Image(*)','s3d::Texture::Texture(*)','s3d::ImageDecoder::Decode(*)','s3d::ImageDecoder::GetImageInfo(*)','s3d::CRenderer2D_GLES3::init()','s3d::CRenderer2D_WebGPU::init()','s3d::Clipboard::GetText(*)','s3d::CClipboard::getText(*)','s3d::SimpleHTTP::Save(*)','s3d::SimpleHTTP::Load(*)','s3d::SimpleHTTP::Get(*)','s3d::SimpleHTTP::Post(*)','s3d::VideoReader::VideoReader(*)','s3d::VideoReader::open(*)','s3d::Platform::Web::FetchFileIfNotExists(*)' ]" %(AdditionalOptions) $(LibraryPath);%(AdditionalLinkDirectories) Siv3DScript;Siv3D;opencv_objdetect;opencv_photo;opencv_imgproc;opencv_core;harfbuzz;freetype;turbojpeg;gif;webp;opusfile;opus;tiff;png;z;SDL2; @@ -124,7 +124,7 @@ ${ExampleItems} -s USE_OGG=1 -s USE_VORBIS=1 -s WARN_ON_UNDEFINED_SYMBOLS=0 -s ERROR_ON_UNDEFINED_SYMBOLS=0 -s FULL_ES3=1 -s USE_WEBGPU=1 -s USE_GLFW=3 -s MIN_WEBGL_VERSION=2 -s MAX_WEBGL_VERSION=2 -s MODULARIZE=1 -s ASYNCIFY=1 -s ASYNCIFY_IGNORE_INDIRECT=1 - -s ASYNCIFY_IMPORTS="[ 'siv3dRequestAnimationFrame', 'siv3dGetClipboardText', 'siv3dDecodeImageFromFile', 'siv3dSleepUntilWaked', 'invoke_vi', 'invoke_vi' ]" + -s ASYNCIFY_IMPORTS="[ 'siv3dRequestAnimationFrame', 'siv3dGetClipboardText', 'siv3dDecodeImageFromFile', 'siv3dSleepUntilWaked', 'invoke_vi', 'invoke_v' ]" -s ASYNCIFY_ADD="[ 'main','Main()','dynCall_v','dynCall_vi','s3d::TryMain()','s3d::CSystem::init()','s3d::System::Update()','s3d::AACDecoder::decode(*) const','s3d::MP3Decoder::decode(*) const','s3d::CAudioDecoder::decode(*)','s3d::AudioDecoder::Decode(*)','s3d::Wave::Wave(*)','s3d::Audio::Audio(*)','s3d::Clipboard::GetText(*)','s3d::CClipboard::getText(*)','s3d::GenericDecoder::decode(*) const','s3d::CImageDecoder::decode(*)','s3d::Image::Image(*)','s3d::Texture::Texture(*)','s3d::ImageDecoder::Decode(*)','s3d::ImageDecoder::GetImageInfo(*)','s3d::CRenderer2D_GLES3::init()','s3d::CRenderer2D_WebGPU::init()','s3d::Clipboard::GetText(*)','s3d::CClipboard::getText(*)','s3d::SimpleHTTP::Save(*)','s3d::SimpleHTTP::Load(*)','s3d::SimpleHTTP::Get(*)','s3d::SimpleHTTP::Post(*)','s3d::VideoReader::VideoReader(*)','s3d::VideoReader::open(*)','s3d::Platform::Web::FetchFileIfNotExists(*)' ]" %(AdditionalOptions) Siv3DScript;Siv3D;opencv_objdetect;opencv_photo;opencv_imgproc;opencv_core;harfbuzz;freetype;turbojpeg;gif;webp;opusfile;opus;tiff;png;z;SDL2; $(ProjectDir)\resources@/resources;$(ProjectDir)\example@/example