mirror of
https://github.com/RYDE-WORK/ballistica.git
synced 2026-01-26 17:03:14 +08:00
tidying
This commit is contained in:
Eric
parent
7b73f28862
commit
d751593adb
88
.efrocachemap
generated
88
.efrocachemap
generated
@ -4072,50 +4072,50 @@
|
||||
"build/assets/workspace/ninjafightplug.py": "https://files.ballistica.net/cache/ba1/18/4b/787a9267e17be3c49966072581a5",
|
||||
"build/assets/workspace/onslaughtplug.py": "https://files.ballistica.net/cache/ba1/20/f6/4ce9bc3c1f3732f6adf8237fbe9b",
|
||||
"build/assets/workspace/runaroundplug.py": "https://files.ballistica.net/cache/ba1/a5/30/9058181df0b1255bf6950cbc7813",
|
||||
"build/prefab/full/linux_arm64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/1f/1b/b04b31054b65e8bfdc40534d452d",
|
||||
"build/prefab/full/linux_arm64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/e6/34/ff4ce608cddf75f01c7eff1d21e1",
|
||||
"build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/1f/0c/3a98c68eaf81fac66ae5bcc78236",
|
||||
"build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/23/5e/bfff34c598b06e86199fecb404c0",
|
||||
"build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/a4/6c/c67786baba022816883f6095f0ca",
|
||||
"build/prefab/full/linux_x86_64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/2a/92/5ee2257569d5000a11c48ec666e0",
|
||||
"build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/f4/b9/70fdee7e0058f90cbd001051187d",
|
||||
"build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/df/8e/3402bd0d7b9a30941c2a76920a1c",
|
||||
"build/prefab/full/mac_arm64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/27/d6/5d60019a10d5fc40d6b26b53dba0",
|
||||
"build/prefab/full/mac_arm64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/20/48/d088312af59adeb596db8196d8a9",
|
||||
"build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/5a/73/d4bbe844928c71aece7779fbf0ef",
|
||||
"build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/79/a5/cb9984a630f18d9d43be72ea22fd",
|
||||
"build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/8a/fa/babadd97a86a505a38abc8e71f81",
|
||||
"build/prefab/full/mac_x86_64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/a4/4d/eb069364cb2ced2ba4bab9dc9e94",
|
||||
"build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/a4/7a/739366db05e974d46d30954879cc",
|
||||
"build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/3c/80/f2fa67168ae81563b6f21b7678d9",
|
||||
"build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "https://files.ballistica.net/cache/ba1/55/be/64590d708b8d9069f10f59c5f211",
|
||||
"build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "https://files.ballistica.net/cache/ba1/c0/2d/a02f1bd08dd91ddb861baf1be2d7",
|
||||
"build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "https://files.ballistica.net/cache/ba1/df/37/b25c4f3ddd53c9c6688b4660afb9",
|
||||
"build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "https://files.ballistica.net/cache/ba1/e6/00/d7d194778893769a4a4d5af1dc80",
|
||||
"build/prefab/lib/linux_arm64_gui/debug/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/d9/56/b0a16db98621500b473844ec39d6",
|
||||
"build/prefab/lib/linux_arm64_gui/release/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/57/f9/f304c67d9958574b6b35de2ad13d",
|
||||
"build/prefab/lib/linux_arm64_server/debug/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/04/55/a41ad832c081ff421039827d16c1",
|
||||
"build/prefab/lib/linux_arm64_server/release/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/65/a7/2008753f3dbe890a730ca081ee8f",
|
||||
"build/prefab/lib/linux_x86_64_gui/debug/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/a1/1f/cb01b3a6773cd8fc1a3ed1c320c5",
|
||||
"build/prefab/lib/linux_x86_64_gui/release/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/49/a7/b65d9e50fc94a82e88e5802020b4",
|
||||
"build/prefab/lib/linux_x86_64_server/debug/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/25/28/a1657fe9f97172fee036f8f31173",
|
||||
"build/prefab/lib/linux_x86_64_server/release/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/5c/5b/2edf7105dcd7a653fa449af25bab",
|
||||
"build/prefab/lib/mac_arm64_gui/debug/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/c9/02/670a183eed30429ebd3c61a26229",
|
||||
"build/prefab/lib/mac_arm64_gui/release/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/7d/50/17bb34179dd958f1e3563634dab5",
|
||||
"build/prefab/lib/mac_arm64_server/debug/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/3f/9d/30372ce093efd265ac89955ef774",
|
||||
"build/prefab/lib/mac_arm64_server/release/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/ca/89/4d9fb94ed0ec2e5cc36f40908f34",
|
||||
"build/prefab/lib/mac_x86_64_gui/debug/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/cd/87/606884c0a1d45fbfc57db6c635cb",
|
||||
"build/prefab/lib/mac_x86_64_gui/release/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/88/1a/1ea680450c3c9bc97147df4bf99d",
|
||||
"build/prefab/lib/mac_x86_64_server/debug/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/91/b3/31b980ca2a000871408cbc7923e3",
|
||||
"build/prefab/lib/mac_x86_64_server/release/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/67/d1/8b98ad3d0d67bf6bc23c2c9167cf",
|
||||
"build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "https://files.ballistica.net/cache/ba1/1c/30/dbf3906b8c1bec2d72df632d6099",
|
||||
"build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "https://files.ballistica.net/cache/ba1/c1/cc/dd517bc59c5cc0f4e3d23ac4eac6",
|
||||
"build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "https://files.ballistica.net/cache/ba1/fa/63/7a26568ee4f87c41495dfc9a97e0",
|
||||
"build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "https://files.ballistica.net/cache/ba1/2b/1c/7394f271641c26792cfa93da8a7b",
|
||||
"build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "https://files.ballistica.net/cache/ba1/34/1b/c726dfb7e0e750399fa7ba169c84",
|
||||
"build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "https://files.ballistica.net/cache/ba1/ff/19/62b199f7a9fbe4ec47ea15c3a234",
|
||||
"build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "https://files.ballistica.net/cache/ba1/67/80/58ceb85465bea71878893398996f",
|
||||
"build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "https://files.ballistica.net/cache/ba1/2a/32/d36cdfc0a36804ea78e477cece0c",
|
||||
"build/prefab/full/linux_arm64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/88/5a/046584c2f9bb1dfaf2cc7305811a",
|
||||
"build/prefab/full/linux_arm64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/04/21/578917394a42afdaa94a6d0c2af1",
|
||||
"build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/9c/cc/b1456d7f585078f0b5116e16ca5b",
|
||||
"build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/6a/4c/8eefc8bca27698731ae4eb385b31",
|
||||
"build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/ba/e7/14a5244c9740a6a3ca510a17d9d2",
|
||||
"build/prefab/full/linux_x86_64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/c5/23/55a127747393ea1bdb45d52f8ef3",
|
||||
"build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/62/39/db07ddb660c23869885b6dfeb2bd",
|
||||
"build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/f9/88/89c742f5d6d2d03858edc409107c",
|
||||
"build/prefab/full/mac_arm64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/23/9e/2c6f955ad9ee17fd0fd0d132127e",
|
||||
"build/prefab/full/mac_arm64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/36/f1/cf87abc5c2d38e21f31d17783c64",
|
||||
"build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/96/94/b9ca75a69e7c2fe122d1af08684e",
|
||||
"build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/f5/0b/0bf0d0d9722df1c2bd4a9566166f",
|
||||
"build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/a0/83/b185f5ee357b4730bd96df784bf5",
|
||||
"build/prefab/full/mac_x86_64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/40/2e/291910a12f2e637d585a23732e39",
|
||||
"build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/b5/97/fdf687c944dff99145350594fbd6",
|
||||
"build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/bc/e6/acb2fa1eebb0c8219919fc7bd904",
|
||||
"build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "https://files.ballistica.net/cache/ba1/43/1d/1e30712c0f7bbed6bc4c4d19d9be",
|
||||
"build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "https://files.ballistica.net/cache/ba1/b9/03/9f180b240019437ebdad1d2450b3",
|
||||
"build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "https://files.ballistica.net/cache/ba1/ee/1c/c2f9d7571fa7123305727345c493",
|
||||
"build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "https://files.ballistica.net/cache/ba1/13/66/5f85708aab5186b5c2cc7dad5628",
|
||||
"build/prefab/lib/linux_arm64_gui/debug/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/f6/e4/1fc7d7c6701ca9d1a4fc104c11a0",
|
||||
"build/prefab/lib/linux_arm64_gui/release/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/d2/40/7b8787a2a20b2bf5b853762abf82",
|
||||
"build/prefab/lib/linux_arm64_server/debug/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/3d/a9/4d58c1ba26c71020600f16212c59",
|
||||
"build/prefab/lib/linux_arm64_server/release/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/a1/81/6700b345f65181be591b999bd0ba",
|
||||
"build/prefab/lib/linux_x86_64_gui/debug/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/9b/f3/3e6848d3d51e45f2bc892ba866fe",
|
||||
"build/prefab/lib/linux_x86_64_gui/release/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/71/26/3e4f7d23518f3d4dd719223c7bd5",
|
||||
"build/prefab/lib/linux_x86_64_server/debug/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/41/30/ebf7264a7846b7e17d2ccee1e68e",
|
||||
"build/prefab/lib/linux_x86_64_server/release/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/b7/36/7b5926a3f526c4f53beeb85e0f28",
|
||||
"build/prefab/lib/mac_arm64_gui/debug/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/bb/df/26fd523b58edf61c230e0d8c29a9",
|
||||
"build/prefab/lib/mac_arm64_gui/release/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/60/d6/d24629a9c4cc8d53034b166533fc",
|
||||
"build/prefab/lib/mac_arm64_server/debug/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/ae/74/add4f1b22a9d870deab498a78150",
|
||||
"build/prefab/lib/mac_arm64_server/release/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/60/cc/efd87e8316e57e6060c0f8c1c3b5",
|
||||
"build/prefab/lib/mac_x86_64_gui/debug/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/06/a5/b9dc8830177144edccc3361f2380",
|
||||
"build/prefab/lib/mac_x86_64_gui/release/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/d6/55/0ed426d7d9718e6c7cfa25ed45fa",
|
||||
"build/prefab/lib/mac_x86_64_server/debug/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/36/d9/1bac79e3118546083de075c591eb",
|
||||
"build/prefab/lib/mac_x86_64_server/release/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/0d/51/6431fa180fe6ca7a4f5e755deb13",
|
||||
"build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "https://files.ballistica.net/cache/ba1/88/27/5acc5bf12db2eeafad941cb4983c",
|
||||
"build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "https://files.ballistica.net/cache/ba1/b5/17/999fb8864717791fdb549e8d27ee",
|
||||
"build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "https://files.ballistica.net/cache/ba1/75/a7/8a9faed3b33c85ed48becd57b96e",
|
||||
"build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "https://files.ballistica.net/cache/ba1/7c/a5/7e049cf1b1974b1dafa6a5a5c651",
|
||||
"build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "https://files.ballistica.net/cache/ba1/e0/2e/0fb1dcf86dc106e610cdf85d9904",
|
||||
"build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "https://files.ballistica.net/cache/ba1/f1/4f/6d693934819c9fa3b46f5796d040",
|
||||
"build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "https://files.ballistica.net/cache/ba1/a2/98/1149701221912567fed626f41262",
|
||||
"build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "https://files.ballistica.net/cache/ba1/9c/51/6659783ad53b29633d8962fa6463",
|
||||
"src/assets/ba_data/python/babase/_mgen/__init__.py": "https://files.ballistica.net/cache/ba1/52/c6/c11130af7b10d6c0321add5518fa",
|
||||
"src/assets/ba_data/python/babase/_mgen/enums.py": "https://files.ballistica.net/cache/ba1/38/c3/1dedd5e74f2508efc5974c8815a1",
|
||||
"src/ballistica/base/mgen/pyembed/binding_base.inc": "https://files.ballistica.net/cache/ba1/ea/6a/6a4721b144e5e297b542d2a0eea2",
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
### 1.7.20 (build 21119, api 8, 2023-06-16)
|
||||
### 1.7.20 (build 21121, api 8, 2023-06-16)
|
||||
|
||||
- This seems like a good time for a `refactoring` release in anticipation of
|
||||
changes coming in 1.8. Basically this means that a lot of things will be
|
||||
|
||||
@ -28,7 +28,7 @@ if TYPE_CHECKING:
|
||||
|
||||
# Build number and version of the ballistica binary we expect to be
|
||||
# using.
|
||||
TARGET_BALLISTICA_BUILD = 21119
|
||||
TARGET_BALLISTICA_BUILD = 21121
|
||||
TARGET_BALLISTICA_VERSION = '1.7.20'
|
||||
|
||||
_g_env_config: EnvConfig | None = None
|
||||
|
||||
@ -389,7 +389,7 @@ void Graphics::DrawMiscOverlays(RenderPass* pass) {
|
||||
if (!fps_text_group_.Exists()) {
|
||||
fps_text_group_ = Object::New<TextGroup>();
|
||||
}
|
||||
fps_text_group_->SetText(fps_string_);
|
||||
fps_text_group_->set_text(fps_string_);
|
||||
}
|
||||
SimpleComponent c(pass);
|
||||
c.SetTransparent(true);
|
||||
@ -422,7 +422,7 @@ void Graphics::DrawMiscOverlays(RenderPass* pass) {
|
||||
if (!ping_text_group_.Exists()) {
|
||||
ping_text_group_ = Object::New<TextGroup>();
|
||||
}
|
||||
ping_text_group_->SetText(ping_string_);
|
||||
ping_text_group_->set_text(ping_string_);
|
||||
}
|
||||
SimpleComponent c(pass);
|
||||
c.SetTransparent(true);
|
||||
@ -457,7 +457,7 @@ void Graphics::DrawMiscOverlays(RenderPass* pass) {
|
||||
if (!net_info_text_group_.Exists()) {
|
||||
net_info_text_group_ = Object::New<TextGroup>();
|
||||
}
|
||||
net_info_text_group_->SetText(net_info_string_);
|
||||
net_info_text_group_->set_text(net_info_string_);
|
||||
}
|
||||
SimpleComponent c(pass);
|
||||
c.SetTransparent(true);
|
||||
@ -1914,7 +1914,7 @@ auto Graphics::ScreenMessageEntry::GetText() -> TextGroup& {
|
||||
mesh_dirty = true;
|
||||
}
|
||||
if (mesh_dirty) {
|
||||
s_mesh_->SetText(
|
||||
s_mesh_->set_text(
|
||||
s_translated,
|
||||
align_left ? TextMesh::HAlign::kLeft : TextMesh::HAlign::kCenter,
|
||||
TextMesh::VAlign::kBottom);
|
||||
|
||||
@ -152,8 +152,8 @@ void NetGraph::Draw(RenderPass* pass, double time, double x, double y, double w,
|
||||
snprintf(val_str, sizeof(val_str), "%.3f",
|
||||
impl_->smoothed ? impl_->v_smoothed : val);
|
||||
}
|
||||
impl_->max_vel_text.SetText(val_str, TextMesh::HAlign::kLeft,
|
||||
TextMesh::VAlign::kTop);
|
||||
impl_->max_vel_text.set_text(val_str, TextMesh::HAlign::kLeft,
|
||||
TextMesh::VAlign::kTop);
|
||||
|
||||
SimpleComponent c2(pass);
|
||||
c2.SetTransparent(true);
|
||||
|
||||
@ -8,9 +8,9 @@
|
||||
|
||||
namespace ballistica::base {
|
||||
|
||||
void TextGroup::SetText(const std::string& text, TextMesh::HAlign alignment_h,
|
||||
TextMesh::VAlign alignment_v, bool big,
|
||||
float resolution_scale) {
|
||||
void TextGroup::set_text(const std::string& text, TextMesh::HAlign alignment_h,
|
||||
TextMesh::VAlign alignment_v, bool big,
|
||||
float resolution_scale) {
|
||||
text_ = text;
|
||||
|
||||
// In order to *actually* draw big, all our letters
|
||||
|
||||
@ -55,11 +55,11 @@ class TextGroup : public Object {
|
||||
? SysTextureID::kSoftRect2
|
||||
: SysTextureID::kSoftRect);
|
||||
}
|
||||
void SetText(const std::string& text,
|
||||
TextMesh::HAlign alignment_h = TextMesh::HAlign::kLeft,
|
||||
TextMesh::VAlign alignment_v = TextMesh::VAlign::kNone,
|
||||
bool big = false, float resolution_scale = 1.0f);
|
||||
auto getText() const -> const std::string& { return text_; }
|
||||
void set_text(const std::string& text,
|
||||
TextMesh::HAlign alignment_h = TextMesh::HAlign::kLeft,
|
||||
TextMesh::VAlign alignment_v = TextMesh::VAlign::kNone,
|
||||
bool big = false, float resolution_scale = 1.0f);
|
||||
auto text() const -> const std::string& { return text_; }
|
||||
void GetCaratPts(const std::string& text_in, TextMesh::HAlign alignment_h,
|
||||
TextMesh::VAlign alignment_v, int carat_pos, float* carat_x,
|
||||
float* carat_y);
|
||||
|
||||
@ -37,9 +37,9 @@ Console::Console() {
|
||||
title += " (test)";
|
||||
}
|
||||
|
||||
title_text_group_.SetText(title);
|
||||
built_text_group_.SetText("Built: " __DATE__ " " __TIME__);
|
||||
prompt_text_group_.SetText(">");
|
||||
title_text_group_.set_text(title);
|
||||
built_text_group_.set_text("Built: " __DATE__ " " __TIME__);
|
||||
prompt_text_group_.set_text(">");
|
||||
}
|
||||
|
||||
Console::~Console() = default;
|
||||
@ -292,7 +292,7 @@ void Console::Draw(RenderPass* pass) {
|
||||
c.Submit();
|
||||
}
|
||||
if (input_text_dirty_) {
|
||||
input_text_group_.SetText(input_string_);
|
||||
input_text_group_.set_text(input_string_);
|
||||
input_text_dirty_ = false;
|
||||
last_input_text_change_time_ = pass->frame_def()->real_time();
|
||||
}
|
||||
@ -372,7 +372,7 @@ void Console::Draw(RenderPass* pass) {
|
||||
if (!last_line_mesh_group_.Exists()) {
|
||||
last_line_mesh_group_ = Object::New<TextGroup>();
|
||||
}
|
||||
last_line_mesh_group_->SetText(last_line_);
|
||||
last_line_mesh_group_->set_text(last_line_);
|
||||
last_line_mesh_dirty_ = false;
|
||||
}
|
||||
int elem_count = last_line_mesh_group_->GetElementCount();
|
||||
|
||||
@ -50,7 +50,7 @@ class Console {
|
||||
auto GetText() -> TextGroup& {
|
||||
if (!s_mesh_.Exists()) {
|
||||
s_mesh_ = Object::New<TextGroup>();
|
||||
s_mesh_->SetText(s);
|
||||
s_mesh_->set_text(s);
|
||||
}
|
||||
return *s_mesh_;
|
||||
}
|
||||
|
||||
@ -4783,7 +4783,7 @@ void SpazNode::Draw(base::FrameDef* frame_def) {
|
||||
snprintf(buffer, sizeof(buffer), "%d", static_cast<int>(diff));
|
||||
if (curse_timer_txt_ != buffer) {
|
||||
curse_timer_txt_ = buffer;
|
||||
curse_timer_text_group_.SetText(curse_timer_txt_);
|
||||
curse_timer_text_group_.set_text(curse_timer_txt_);
|
||||
}
|
||||
float r, g, b;
|
||||
if (render_frame_count % 6 < 3) {
|
||||
@ -4911,7 +4911,7 @@ void SpazNode::Draw(base::FrameDef* frame_def) {
|
||||
{ // text
|
||||
if (counter_mesh_text_ != counter_text_) {
|
||||
counter_mesh_text_ = counter_text_;
|
||||
counter_text_group_.SetText(counter_mesh_text_);
|
||||
counter_text_group_.set_text(counter_mesh_text_);
|
||||
}
|
||||
base::SimpleComponent c(frame_def->overlay_3d_pass());
|
||||
c.SetTransparent(true);
|
||||
@ -4940,9 +4940,9 @@ void SpazNode::Draw(base::FrameDef* frame_def) {
|
||||
if (explicit_bool(true)) {
|
||||
if (name_mesh_txt_ != name_) {
|
||||
name_mesh_txt_ = name_;
|
||||
name_text_group_.SetText(name_mesh_txt_,
|
||||
base::TextMesh::HAlign::kCenter,
|
||||
base::TextMesh::VAlign::kCenter);
|
||||
name_text_group_.set_text(name_mesh_txt_,
|
||||
base::TextMesh::HAlign::kCenter,
|
||||
base::TextMesh::VAlign::kCenter);
|
||||
}
|
||||
base::SimpleComponent c(frame_def->overlay_3d_pass());
|
||||
c.SetTransparent(true);
|
||||
|
||||
@ -418,7 +418,7 @@ void TextNode::Draw(base::FrameDef* frame_def) {
|
||||
}
|
||||
|
||||
// update if need be
|
||||
text_group_.SetText(text_translated_, h_align, v_align, true, 2.5f);
|
||||
text_group_.set_text(text_translated_, h_align, v_align, true, 2.5f);
|
||||
text_group_dirty_ = false;
|
||||
}
|
||||
|
||||
@ -589,7 +589,7 @@ void TextNode::Draw(base::FrameDef* frame_def) {
|
||||
}
|
||||
|
||||
// Update if need be.
|
||||
text_group_.SetText(text_translated_, h_align, v_align);
|
||||
text_group_.set_text(text_translated_, h_align, v_align);
|
||||
text_group_dirty_ = false;
|
||||
}
|
||||
float z = vr_2d_text
|
||||
|
||||
@ -39,7 +39,7 @@ auto main(int argc, char** argv) -> int {
|
||||
namespace ballistica {
|
||||
|
||||
// These are set automatically via script; don't modify them here.
|
||||
const int kEngineBuildNumber = 21119;
|
||||
const int kEngineBuildNumber = 21121;
|
||||
const char* kEngineVersion = "1.7.20";
|
||||
|
||||
auto MonolithicMain(const core::CoreConfig& core_config) -> int {
|
||||
|
||||
@ -265,10 +265,10 @@ void RootUI::Draw(base::FrameDef* frame_def) {
|
||||
if (!party_button_text_group_.Exists()) {
|
||||
party_button_text_group_ = Object::New<base::TextGroup>();
|
||||
}
|
||||
if (party_button_name != party_button_text_group_->getText()) {
|
||||
party_button_text_group_->SetText(party_button_name,
|
||||
base::TextMesh::HAlign::kCenter,
|
||||
base::TextMesh::VAlign::kTop);
|
||||
if (party_button_name != party_button_text_group_->text()) {
|
||||
party_button_text_group_->set_text(
|
||||
party_button_name, base::TextMesh::HAlign::kCenter,
|
||||
base::TextMesh::VAlign::kTop);
|
||||
}
|
||||
int text_elem_count = party_button_text_group_->GetElementCount();
|
||||
for (int e = 0; e < text_elem_count; e++) {
|
||||
@ -302,7 +302,7 @@ void RootUI::Draw(base::FrameDef* frame_def) {
|
||||
if (!party_size_text_group_.Exists()) {
|
||||
party_size_text_group_ = Object::New<base::TextGroup>();
|
||||
}
|
||||
party_size_text_group_->SetText(
|
||||
party_size_text_group_->set_text(
|
||||
std::to_string(party_size_text_group_num_));
|
||||
|
||||
// ..we also may want to update our 'someone joined' message if we're
|
||||
@ -312,12 +312,12 @@ void RootUI::Draw(base::FrameDef* frame_def) {
|
||||
start_a_game_text_group_ = Object::New<base::TextGroup>();
|
||||
}
|
||||
if (party_size == 2) { // (includes us as host)
|
||||
start_a_game_text_group_->SetText(
|
||||
start_a_game_text_group_->set_text(
|
||||
g_base->assets->GetResourceString(
|
||||
"joinedPartyInstructionsText"),
|
||||
base::TextMesh::HAlign::kRight, base::TextMesh::VAlign::kTop);
|
||||
} else if (party_size > 2) {
|
||||
start_a_game_text_group_->SetText(
|
||||
start_a_game_text_group_->set_text(
|
||||
std::to_string(party_size - 1) +
|
||||
" friends have joined your party.\nGo to 'Play' to start "
|
||||
"a game.",
|
||||
|
||||
@ -301,7 +301,7 @@ void TextWidget::Draw(base::RenderPass* pass, bool draw_transparent) {
|
||||
text_group_ = Object::New<base::TextGroup>();
|
||||
}
|
||||
if (text_group_dirty_) {
|
||||
text_group_->SetText(text_translated_, align_h, align_v, big_, res_scale_);
|
||||
text_group_->set_text(text_translated_, align_h, align_v, big_, res_scale_);
|
||||
text_width_ = g_base->text_graphics->GetStringWidth(text_translated_, big_);
|
||||
|
||||
// FIXME: doesnt support big.
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user