RYDE-WORK/ballistica
1
0
Fork 0
mirror of https://github.com/RYDE-WORK/ballistica.git synced 2026-02-06 15:47:06 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

made dev button prettier

Browse Source
This commit is contained in:
Eric 2023-09-07 20:23:42 -07:00
parent 53b0df2e6d
commit fea8057182
No known key found for this signature in database
GPG Key ID: 89C93F0F8D6D5A98
7 changed files with 30 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
.efrocachemap generated
View File

@ -4064,26 +4064,26 @@
"build/assets/windows/Win32/ucrtbased.dll": "2def5335207d41b21b9823f6805997f1", "build/assets/windows/Win32/ucrtbased.dll": "2def5335207d41b21b9823f6805997f1",
"build/assets/windows/Win32/vc_redist.x86.exe": "b08a55e2e77623fe657bea24f223a3ae", "build/assets/windows/Win32/vc_redist.x86.exe": "b08a55e2e77623fe657bea24f223a3ae",
"build/assets/windows/Win32/vcruntime140d.dll": "865b2af4d1e26a1a8073c89acb06e599", "build/assets/windows/Win32/vcruntime140d.dll": "865b2af4d1e26a1a8073c89acb06e599",
"build/prefab/full/linux_arm64_gui/debug/ballisticakit": "e1b769cee4e1910b1f624c8c89e4ac57", "build/prefab/full/linux_arm64_gui/debug/ballisticakit": "7cf705701bab34748af15971e5f9a90f",
"build/prefab/full/linux_arm64_gui/release/ballisticakit": "e3b8c7317208183b186cec87460c7c4a", "build/prefab/full/linux_arm64_gui/release/ballisticakit": "dd38cb0d13d5432403c6aa5a9360f201",
"build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "d80101bc466f64c24be3919e4465f9a8", "build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "4f07365746d6da86428e377754513bd5",
"build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "19736e5df72357700c9f29df4cc63256", "build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "4fac288787b04ed0e2c997c2fd421507",
"build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "11c6eab78eedb694955f72f1d9a3ff28", "build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "96af1ce7bf69f5ff0cff7af6f7a1cad6",
"build/prefab/full/linux_x86_64_gui/release/ballisticakit": "564e93d203233f683061bd997c9b97a6", "build/prefab/full/linux_x86_64_gui/release/ballisticakit": "24cc85e509d291341cdb4da2a6cbcc58",
"build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "5feb58af7c6324ba1ed40c5fa04dc902", "build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "60b419b8bd702d2d76b02d0295d125b0",
"build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "45300ce2ed2934c04b290771097b57fc", "build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "983d31837bbf1dc128f96668de4554e6",
"build/prefab/full/mac_arm64_gui/debug/ballisticakit": "8105175df0aa717e246605d737a8e4ac", "build/prefab/full/mac_arm64_gui/debug/ballisticakit": "e611c1bc08f1d2e04c29e87626d457c6",
"build/prefab/full/mac_arm64_gui/release/ballisticakit": "197678caf46d9caa810be6ea31f74056", "build/prefab/full/mac_arm64_gui/release/ballisticakit": "c847a2653d487d5893f53670d7108dec",
"build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "1b9f3662197f33b691ba2c7e3231c06d", "build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "073e725787ad536eff4a7baca9d6944f",
"build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "e27d0e524256be185f81e661c7eebfcd", "build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "11191672f8b7fffc240be03e7a610d14",
"build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "c61305f3fcab810444419b7920f592b9", "build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "e94e4e55d1a286c5cb5f1c280c6fc735",
"build/prefab/full/mac_x86_64_gui/release/ballisticakit": "aac2b4f520cd94185f41290e99c6efe2", "build/prefab/full/mac_x86_64_gui/release/ballisticakit": "7131406bf0f32bc579929307e26d86cc",
"build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "5996e4300d00cb15c78595aae9ed354b", "build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "4b1955f776c8c2697311ca99619bbb4b",
"build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "b87de361b664c71b029006a64507c970", "build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "7dce31f3707233a351e26ffbf40f37e2",
"build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "9eedf6d4715657dbf5b8a014db02f281", "build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "6b3ab059b402032177c1066d94be69f5",
"build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "915af3b698d4231c67693d13debf6195", "build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "b06d14a8368bf049cef7166b945b5179",
"build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "e80b0dbb306ec03d6787909e2a5e6efb", "build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "76921b371d70572df5a788b252d7bdf3",
"build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "24ee229ff8a107d4462b9b3f52c69731", "build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "17e05e083b67ca6b83bcb8cc8a096779",
"build/prefab/lib/linux_arm64_gui/debug/libballisticaplus.a": "6ccd6f2bd0e20520063d4bf8e2c016d0", "build/prefab/lib/linux_arm64_gui/debug/libballisticaplus.a": "6ccd6f2bd0e20520063d4bf8e2c016d0",
"build/prefab/lib/linux_arm64_gui/release/libballisticaplus.a": "82e76d58eab4962ee7567fbc655072d6", "build/prefab/lib/linux_arm64_gui/release/libballisticaplus.a": "82e76d58eab4962ee7567fbc655072d6",
"build/prefab/lib/linux_arm64_server/debug/libballisticaplus.a": "6ccd6f2bd0e20520063d4bf8e2c016d0", "build/prefab/lib/linux_arm64_server/debug/libballisticaplus.a": "6ccd6f2bd0e20520063d4bf8e2c016d0",

2
CHANGELOG.md
View File

@ -1,4 +1,4 @@
### 1.7.28 (build 21324, api 8, 2023-09-07) ### 1.7.28 (build 21325, api 8, 2023-09-07)
- Renamed Console to DevConsole, and added an option under advanced settings to - Renamed Console to DevConsole, and added an option under advanced settings to
always show an ugly 'dev' button onscreen which can be used to toggle it. The always show an ugly 'dev' button onscreen which can be used to toggle it. The

2
src/assets/ba_data/python/baenv.py
View File

@ -52,7 +52,7 @@ if TYPE_CHECKING:
# Build number and version of the ballistica binary we expect to be # Build number and version of the ballistica binary we expect to be
# using. # using.
TARGET_BALLISTICA_BUILD = 21324 TARGET_BALLISTICA_BUILD = 21325
TARGET_BALLISTICA_VERSION = '1.7.28' TARGET_BALLISTICA_VERSION = '1.7.28'

2
src/ballistica/base/graphics/component/simple_component.h
View File

@ -70,7 +70,7 @@ class SimpleComponent : public RenderComponent {
EnsureConfiguring(); EnsureConfiguring();
mask_uv2_texture_ = t; mask_uv2_texture_ = t;
} }
void clearMaskUV2Texture() { void ClearMaskUV2Texture() {
EnsureConfiguring(); EnsureConfiguring();
mask_uv2_texture_.Clear(); mask_uv2_texture_.Clear();
} }

7
src/ballistica/base/ui/ui.cc
View File

@ -398,6 +398,7 @@ void UI::DrawDevConsoleButton_(FrameDef* frame_def) {
SimpleComponent c(frame_def->overlay_pass()); SimpleComponent c(frame_def->overlay_pass());
c.SetTransparent(true); c.SetTransparent(true);
c.SetTexture(g_base->assets->SysTexture(SysTextureID::kCircleShadow));
if (dev_console_button_pressed_) { if (dev_console_button_pressed_) {
c.SetColor(1.0f, 1.0f, 1.0f, 0.8f); c.SetColor(1.0f, 1.0f, 1.0f, 0.8f);
} else { } else {
@ -410,17 +411,17 @@ void UI::DrawDevConsoleButton_(FrameDef* frame_def) {
c.DrawMeshAsset(g_base->assets->SysMesh(SysMeshID::kImage1x1)); c.DrawMeshAsset(g_base->assets->SysMesh(SysMeshID::kImage1x1));
{ {
auto xf = c.ScopedTransform(); auto xf = c.ScopedTransform();
c.Scale(0.02f, 0.02f, 1.0f); c.Scale(0.017f, 0.017f, 1.0f);
c.Translate(-20.0f, -15.0f, 0.0f); c.Translate(-20.0f, -15.0f, 0.0f);
int text_elem_count = grp.GetElementCount(); int text_elem_count = grp.GetElementCount();
if (dev_console_button_pressed_) { if (dev_console_button_pressed_) {
c.SetColor(1.0f, 1.0f, 1.0f, 1.0f); c.SetColor(1.0f, 1.0f, 1.0f, 1.0f);
} else { } else {
c.SetColor(0.0f, 0.0f, 0.0f, 1.0f); c.SetColor(0.15f, 0.15f, 0.15f, 1.0f);
} }
for (int e = 0; e < text_elem_count; e++) { for (int e = 0; e < text_elem_count; e++) {
c.SetTexture(grp.GetElementTexture(e)); c.SetTexture(grp.GetElementTexture(e));
c.SetFlatness(1.0f); c.SetFlatness(0.0f);
c.DrawMesh(grp.GetElementMesh(e)); c.DrawMesh(grp.GetElementMesh(e));
} }
} }

4
src/ballistica/scene_v1/node/text_node.cc
View File

@ -529,7 +529,7 @@ void TextNode::Draw(base::FrameDef* frame_def) {
if (shadow_opacity > 0) { if (shadow_opacity > 0) {
c.SetMaskUV2Texture(text_group_.GetElementMaskUV2Texture(e)); c.SetMaskUV2Texture(text_group_.GetElementMaskUV2Texture(e));
} else { } else {
c.clearMaskUV2Texture(); c.ClearMaskUV2Texture();
} }
c.PushTransform(); c.PushTransform();
@ -625,7 +625,7 @@ void TextNode::Draw(base::FrameDef* frame_def) {
if (shadow_opacity > 0) { if (shadow_opacity > 0) {
c.SetMaskUV2Texture(text_group_.GetElementMaskUV2Texture(e)); c.SetMaskUV2Texture(text_group_.GetElementMaskUV2Texture(e));
} else { } else {
c.clearMaskUV2Texture(); c.ClearMaskUV2Texture();
} }
if (text_group_.GetElementCanColor(e)) { if (text_group_.GetElementCanColor(e)) {
c.SetColor(color_[0], color_[1], color_[2], fin_a); c.SetColor(color_[0], color_[1], color_[2], fin_a);

2
src/ballistica/shared/ballistica.cc
View File

@ -39,7 +39,7 @@ auto main(int argc, char** argv) -> int {
namespace ballistica { namespace ballistica {
// These are set automatically via script; don't modify them here. // These are set automatically via script; don't modify them here.
const int kEngineBuildNumber = 21324; const int kEngineBuildNumber = 21325;
const char* kEngineVersion = "1.7.28"; const char* kEngineVersion = "1.7.28";
const int kEngineApiVersion = 8; const int kEngineApiVersion = 8;