RYDE-WORK/ballistica
1
0
Fork 0
mirror of https://github.com/RYDE-WORK/ballistica.git synced 2026-01-31 03:39:04 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

After make preflight

Browse Source
This commit is contained in:
IvanPragma 2021-11-05 00:59:53 +05:00
parent 4886e3f96b
commit ba6915c3ba
7 changed files with 61 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
assets/src/ba_data/python/._ba_sources_hash
View File

@ -1 +1 @@
291441930138756424684870937756526517762
206834682288822241335693999070871022992

40
assets/src/ba_data/python/_ba.py
View File

@ -2008,6 +2008,22 @@ def get_appconfig_default_value(key: str) -> Any:
return _uninferrable()
def get_camera_position() -> tuple[float, ...]:
"""get_camera_position() -> tuple[float, ...]
(internal)
"""
return (0.0, 0.0, 0.0)
def get_camera_target() -> tuple[float, ...]:
"""get_camera_target() -> tuple[float, ...]
(internal)
"""
return (0.0, 0.0, 0.0)
def get_chat_messages() -> list[str]:
"""get_chat_messages() -> list[str]
@ -3485,6 +3501,30 @@ def set_authenticate_clients(enable: bool) -> None:
return None
def set_camera_manual(value: bool) -> None:
"""set_camera_manual(value: bool) -> None
(internal)
"""
return None
def set_camera_position(x: float, y: float, z: float) -> None:
"""set_camera_position(x: float, y: float, z: float) -> None
(internal)
"""
return None
def set_camera_target(x: float, y: float, z: float) -> None:
"""set_camera_target(x: float, y: float, z: float) -> None
(internal)
"""
return None
def set_debug_speed_exponent(speed: int) -> None:
"""set_debug_speed_exponent(speed: int) -> None

20
src/ballistica/input/device/joystick.cc
View File

@ -672,9 +672,8 @@ void Joystick::HandleSDLEvent(const SDL_Event* e) {
e2.jaxis.axis = static_cast_check_fit<uint8_t>(analog_lr_);
dpad_right_held_ = (e->type == SDL_JOYBUTTONDOWN);
e2.jaxis.value = static_cast_check_fit<int16_t>(
dpad_right_held_ ? (dpad_left_held_ ? 0 : 32767)
: dpad_left_held_ ? -32767
: 0);
dpad_right_held_ ? (dpad_left_held_ ? 0 : 32767)
: dpad_left_held_ ? -32767 : 0);
e = &e2;
} else if (e->jbutton.button == left_button_
|| e->jbutton.button == left_button2_) {
@ -682,9 +681,8 @@ void Joystick::HandleSDLEvent(const SDL_Event* e) {
e2.jaxis.axis = static_cast_check_fit<uint8_t>(analog_lr_);
dpad_left_held_ = (e->type == SDL_JOYBUTTONDOWN);
e2.jaxis.value = static_cast_check_fit<int16_t>(
dpad_right_held_ ? (dpad_left_held_ ? 0 : 32767)
: dpad_left_held_ ? -32767
: 0);
dpad_right_held_ ? (dpad_left_held_ ? 0 : 32767)
: dpad_left_held_ ? -32767 : 0);
e = &e2;
} else if (e->jbutton.button == up_button_
|| e->jbutton.button == up_button2_) {
@ -692,9 +690,8 @@ void Joystick::HandleSDLEvent(const SDL_Event* e) {
e2.jaxis.axis = static_cast_check_fit<uint8_t>(analog_ud_);
dpad_up_held_ = (e->type == SDL_JOYBUTTONDOWN);
e2.jaxis.value = static_cast_check_fit<int16_t>(
dpad_up_held_ ? (dpad_down_held_ ? 0 : -32767)
: dpad_down_held_ ? 32767
: 0);
dpad_up_held_ ? (dpad_down_held_ ? 0 : -32767)
: dpad_down_held_ ? 32767 : 0);
e = &e2;
} else if (e->jbutton.button == down_button_
|| e->jbutton.button == down_button2_) {
@ -702,9 +699,8 @@ void Joystick::HandleSDLEvent(const SDL_Event* e) {
e2.jaxis.axis = static_cast_check_fit<uint8_t>(analog_ud_);
dpad_down_held_ = (e->type == SDL_JOYBUTTONDOWN);
e2.jaxis.value = static_cast_check_fit<int16_t>(
dpad_up_held_ ? (dpad_down_held_ ? 0 : -32767)
: dpad_down_held_ ? 32767
: 0);
dpad_up_held_ ? (dpad_down_held_ ? 0 : -32767)
: dpad_down_held_ ? 32767 : 0);
e = &e2;
}
break;

4
src/ballistica/python/methods/python_methods_graphics.cc
View File

@ -313,13 +313,13 @@ auto PythonMethodsGraphics::GetMethods() -> std::vector<PyMethodDef> {
{"get_camera_position", (PyCFunction)PyGetCameraPosition,
METH_VARARGS | METH_KEYWORDS,
"get_camera_position() -> tuple[float, float, float]\n"
"get_camera_position() -> tuple[float, ...]\n"
"\n"
"(internal)"},
{"get_camera_target", (PyCFunction)PyGetCameraTarget,
METH_VARARGS | METH_KEYWORDS,
"get_camera_target() -> tuple[float, float, float]\n"
"get_camera_target() -> tuple[float, ...]\n"
"\n"
"(internal)"},

4
src/ballistica/scene/node/image_node.cc
View File

@ -214,8 +214,8 @@ void ImageNode::Draw(FrameDef* frame_def) {
}
RenderPass& pass(*(vr_use_fixed ? frame_def->GetOverlayFixedPass()
: front_ ? frame_def->overlay_front_pass()
: frame_def->overlay_pass()));
: front_ ? frame_def->overlay_front_pass()
: frame_def->overlay_pass()));
// If the pass we're drawing into changes dimensions, recalc.
// Otherwise we break if a window is resized.

6
src/ballistica/scene/node/terrain_node.cc
View File

@ -219,9 +219,9 @@ void TerrainNode::Draw(FrameDef* frame_def) {
if (vr_only_ && !IsVRMode()) {
return;
}
ObjectComponent c(overlay_ ? frame_def->overlay_3d_pass()
: background_ ? frame_def->beauty_pass_bg()
: frame_def->beauty_pass());
ObjectComponent c(overlay_ ? frame_def->overlay_3d_pass()
: background_ ? frame_def->beauty_pass_bg()
: frame_def->beauty_pass());
c.SetWorldSpace(true);
c.SetTexture(color_texture_);
if (lighting_) {

10
src/ballistica/scene/node/text_node.cc
View File

@ -379,11 +379,11 @@ void TextNode::Draw(FrameDef* frame_def) {
// make sure we're up to date
Update();
RenderPass& pass(*(in_world_
? frame_def->overlay_3d_pass()
: (vr_use_fixed ? frame_def->GetOverlayFixedPass()
: front_ ? frame_def->overlay_front_pass()
: frame_def->overlay_pass())));
RenderPass& pass(
*(in_world_ ? frame_def->overlay_3d_pass()
: (vr_use_fixed ? frame_def->GetOverlayFixedPass()
: front_ ? frame_def->overlay_front_pass()
: frame_def->overlay_pass())));
if (big_) {
if (text_group_dirty_) {
TextMesh::HAlign h_align;