From 3d4206ba93a036456b93d01ddb008d7b20f633ae Mon Sep 17 00:00:00 2001 From: Li Jin Date: Wed, 4 Dec 2024 12:24:12 +0800 Subject: [PATCH] Updated site. Updated httplib to 0.18.3. --- Docs/i18n/zh-Hans/code.json | 12 ++-- .../src/components/HomepageFeatures/index.tsx | 64 ++++++++++-------- .../HomepageFeatures/styles.module.css | 40 +++++++++-- Docs/src/pages/index.module.css | 5 +- Docs/src/pages/index.tsx | 3 +- Docs/static/img/pix-dora.png | Bin 0 -> 8447 bytes Docs/static/img/pix-toto.png | Bin 0 -> 7248 bytes Source/3rdParty/httplib/httplib.h | 55 +++++++++------ 8 files changed, 116 insertions(+), 63 deletions(-) create mode 100644 Docs/static/img/pix-dora.png create mode 100644 Docs/static/img/pix-toto.png diff --git a/Docs/i18n/zh-Hans/code.json b/Docs/i18n/zh-Hans/code.json index a664db3fc..afba29711 100644 --- a/Docs/i18n/zh-Hans/code.json +++ b/Docs/i18n/zh-Hans/code.json @@ -4,15 +4,15 @@ "description": "The feature title one in front page" }, "feature_description_one": { - "message": "Dora SSR 的理念：开发游戏是一种更有深度地玩游戏的方式。", + "message": "开发游戏是一种更有深度地玩游戏的方式。", "description": "The feature description one in front page" }, "feature_title_two": { - "message": "不限设备，不限场地", + "message": "不限设备，或场地", "description": "The feature title two in front page" }, "feature_description_two": { - "message": "Dora SSR 的目标：在任何电子设备上极速提供开箱即用的游戏开发环境。", + "message": "在任何电子设备上极速提供开箱即用的游戏开发环境。", "description": "The feature description two in front page" }, "feature_title_three": { @@ -20,7 +20,7 @@ "description": "The feature title three in front page" }, "feature_description_three": { - "message": "Dora SSR 提供多元的编程语言支持，满足你多样的编程口味！", + "message": "提供多元的编程语言支持，满足你多样的编程口味！", "description": "The feature description three in front page" }, "theme.ErrorPageContent.title": { @@ -446,11 +446,11 @@ "description": "The engine feature description Rust Scripting Support in front page" }, "promotion_section_title": { - "message": "为什么选择 Dora SSR", + "message": "为什么选择 Dora", "description": "The promotion section title in front page" }, "feature_section_title": { - "message": "部分引擎功能特性", + "message": "部分引擎功能", "description": "The feature section title in front page" }, "engine_feature_title_cross_platform_game_dev_support": { diff --git a/Docs/src/components/HomepageFeatures/index.tsx b/Docs/src/components/HomepageFeatures/index.tsx index fca446e06..935cfae48 100644 --- a/Docs/src/components/HomepageFeatures/index.tsx +++ b/Docs/src/components/HomepageFeatures/index.tsx @@ -3,6 +3,9 @@ import clsx from 'clsx'; import styles from './styles.module.css'; import Translate from '@docusaurus/Translate'; +const pix_dora = require('@site/static/img/pix-dora.png'); +const pix_toto = require('@site/static/img/pix-toto.png'); + const feature_img_one = require('@site/static/img/1.png'); const feature_img_two = require('@site/static/img/2.png'); const feature_img_three = require('@site/static/img/3.png'); @@ -15,23 +18,6 @@ type FeatureItem = { }; const PromotionFeatureList: FeatureItem[] = [ - { - title: ( - - Play as You Create - - ), - image: feature_title_one, - description: ( - - What Dora SSR is for: Making Game Development a New Gaming. - - ), - }, { title: ( - Satisfy your coding cravings with Dora SSR's versatile language support! + Satisfy your coding cravings with versatile language support! + + ), + }, + { + title: ( + + Play as You Create + + ), + image: feature_title_one, + description: ( + + Making Game Development a New Gaming. ), }, @@ -68,13 +71,15 @@ const PromotionFeatureList: FeatureItem[] = [ function PromotionFeature({title, Svg, image, description}: FeatureItem) { return ( -
-
- {Svg ? : image} -
-
-

{title}

-

{description}

+
+
+
+ {Svg ? : image} +
+
+

{title}

+

{description}

+
); @@ -169,8 +174,8 @@ const EngineFeatureList: FeatureItem[] = [ { title: ( + id='engine_feature_platformer_game_support' + description='The engine feature title Platformer Game Support in front page'> Platformer Game Support ), @@ -363,8 +368,10 @@ export default function HomepageFeatures(): JSX.Element { - Why Dora SSR + Why Dora + pix_dora + SSR
{PromotionFeatureList.map((props, idx) => ( @@ -374,6 +381,7 @@ export default function HomepageFeatures(): JSX.Element {

+ pix_toto diff --git a/Docs/src/components/HomepageFeatures/styles.module.css b/Docs/src/components/HomepageFeatures/styles.module.css index 6fac5679f..39a9bcc01 100644 --- a/Docs/src/components/HomepageFeatures/styles.module.css +++ b/Docs/src/components/HomepageFeatures/styles.module.css @@ -16,13 +16,41 @@ --feature-card-description-color: var(--feature-card-description-color-dark); } +.promotionFeature { + display: flex; + flex-direction: row; + border: 2px solid #f9d86d; /* 黄色边框 */ + border-radius: 15px; + box-shadow: 0 4px 8px var(--feature-card-shadow); + width: 100%; + height: 100%; + padding-right: 1rem; +} + +.cardText { + width: 100%; + padding-top: 2rem; +} + +.cardText h3 { + color: var(--ifm-color-primary); + font-size: 20px; + margin-bottom: 5px; +} + +.cardText p { + font-size: 14px; + line-height: 1.6; +} + .features { - padding: 4rem 0; + padding: 4rem 0 0 0; } .featureCard { background-color: var(--feature-card-bg); border-radius: 8px; + border: 1px solid var(--feature-card-shadow); box-shadow: 0 2px 4px var(--feature-card-shadow); padding: 1.5rem; transition: transform 0.2s ease-in-out; @@ -45,8 +73,8 @@ } .featureImg { - height: 90%; - width: 90%; + width: 100%; + height: auto; max-width: 500px; } @@ -74,7 +102,7 @@ .featureSection { margin-bottom: 2rem; padding-bottom: 2rem; - border-bottom: 1px solid #eaeaea; + border-bottom: 1px solid var(--feature-card-shadow); } .featureSection:last-of-type { @@ -84,3 +112,7 @@ .featureSection h2 { margin-bottom: 1.5rem; } + +.pixImg { + width: 40px; +} diff --git a/Docs/src/pages/index.module.css b/Docs/src/pages/index.module.css index 0f0638849..0b3fc9469 100644 --- a/Docs/src/pages/index.module.css +++ b/Docs/src/pages/index.module.css @@ -20,16 +20,17 @@ .heroTitle { font-size: 5rem; color: var(--ifm-color-title); + padding-bottom: 1rem; } .heroSubtitle { - padding-bottom: 1rem; + padding-bottom: 2rem; color: var(--ifm-color-subtitle); } @media screen and (max-width: 996px) { .heroBanner { - padding: 2rem; + padding: 2rem 0; } } diff --git a/Docs/src/pages/index.tsx b/Docs/src/pages/index.tsx index ad36eeeeb..6e337d6d9 100644 --- a/Docs/src/pages/index.tsx +++ b/Docs/src/pages/index.tsx @@ -18,7 +18,7 @@ function HomepageHeader() {

The Dora game engine, Special Super Rare edition.

diff --git a/Docs/static/img/pix-dora.png b/Docs/static/img/pix-dora.png new file mode 100644 index 0000000000000000000000000000000000000000..85d8e1dcea54663ea0893b0abb688a908270e4d4 GIT binary patch literal 8447 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 literal 0 HcmV?d00001 diff --git a/Source/3rdParty/httplib/httplib.h b/Source/3rdParty/httplib/httplib.h index 39609b227..26afd3d06 100644 --- a/Source/3rdParty/httplib/httplib.h +++ b/Source/3rdParty/httplib/httplib.h @@ -8,7 +8,7 @@ #ifndef CPPHTTPLIB_HTTPLIB_H #define CPPHTTPLIB_HTTPLIB_H -#define CPPHTTPLIB_VERSION "0.18.1" +#define CPPHTTPLIB_VERSION "0.18.3" /* * Configuration @@ -613,6 +613,7 @@ using Ranges = std::vector; struct Request { std::string method; std::string path; + Params params; Headers headers; std::string body; @@ -624,7 +625,6 @@ struct Request { // for server std::string version; std::string target; - Params params; MultipartFormDataMap files; Ranges ranges; Match matches; @@ -2275,7 +2275,7 @@ inline std::wstring u8string_to_wstring(const char *s) { wlen = ::MultiByteToWideChar( CP_UTF8, 0, s, len, const_cast(reinterpret_cast(ws.data())), wlen); - if (wlen != ws.size()) { ws.clear(); } + if (wlen != static_cast(ws.size())) { ws.clear(); } } return ws; } @@ -7432,9 +7432,13 @@ inline bool ClientImpl::send(Request &req, Response &res, Error &error) { #ifdef CPPHTTPLIB_OPENSSL_SUPPORT inline bool ClientImpl::is_ssl_peer_could_be_closed(SSL *ssl) const { + detail::set_nonblocking(socket_.sock, true); + auto se = detail::scope_exit( + [&]() { detail::set_nonblocking(socket_.sock, false); }); + char buf[1]; return !SSL_peek(ssl, buf, 1) && - SSL_get_error(ssl, 0) == SSL_ERROR_ZERO_RETURN; + SSL_get_error(ssl, 0) == SSL_ERROR_ZERO_RETURN; } #endif @@ -7452,9 +7456,7 @@ inline bool ClientImpl::send_(Request &req, Response &res, Error &error) { #ifdef CPPHTTPLIB_OPENSSL_SUPPORT if (is_alive && is_ssl()) { - if (is_ssl_peer_could_be_closed(socket_.ssl)) { - is_alive = false; - } + if (is_ssl_peer_could_be_closed(socket_.ssl)) { is_alive = false; } } #endif @@ -7813,7 +7815,13 @@ inline bool ClientImpl::write_request(Stream &strm, Request &req, { detail::BufferStream bstrm; - const auto &path = url_encode_ ? detail::encode_url(req.path) : req.path; + const auto &path_with_query = + req.params.empty() ? req.path + : append_query_params(req.path, req.params); + + const auto &path = + url_encode_ ? detail::encode_url(path_with_query) : path_with_query; + detail::write_request_line(bstrm, req.method, path); header_writer_(bstrm, req.headers); @@ -7972,7 +7980,9 @@ inline bool ClientImpl::process_request(Stream &strm, Request &req, // Body if ((res.status != StatusCode::NoContent_204) && req.method != "HEAD" && req.method != "CONNECT") { - auto redirect = 300 < res.status && res.status < 400 && follow_location_; + auto redirect = 300 < res.status && res.status < 400 && + res.status != StatusCode::NotModified_304 && + follow_location_; if (req.response_handler && !redirect) { if (!req.response_handler(res)) { @@ -7993,9 +8003,7 @@ inline bool ClientImpl::process_request(Stream &strm, Request &req, : static_cast( [&](const char *buf, size_t n, uint64_t /*off*/, uint64_t /*len*/) { - if (res.body.size() + n > res.body.max_size()) { - return false; - } + assert(res.body.size() + n <= res.body.max_size()); res.body.append(buf, n); return true; }); @@ -8009,18 +8017,23 @@ inline bool ClientImpl::process_request(Stream &strm, Request &req, if (res.has_header("Content-Length")) { if (!req.content_receiver) { - auto len = std::min(res.get_header_value_u64("Content-Length"), - res.body.max_size()); - if (len > 0) { res.body.reserve(len); } + auto len = res.get_header_value_u64("Content-Length"); + if (len > res.body.max_size()) { + error = Error::Read; + return false; + } + res.body.reserve(static_cast(len)); } } - int dummy_status; - if (!detail::read_content(strm, res, (std::numeric_limits::max)(), - dummy_status, std::move(progress), std::move(out), - decompress_)) { - if (error != Error::Canceled) { error = Error::Read; } - return false; + if (res.status != StatusCode::NotModified_304) { + int dummy_status; + if (!detail::read_content(strm, res, (std::numeric_limits::max)(), + dummy_status, std::move(progress), + std::move(out), decompress_)) { + if (error != Error::Canceled) { error = Error::Read; } + return false; + } } }