After make preflight

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

View File

@ -1 +1 @@
291441930138756424684870937756526517762 206834682288822241335693999070871022992

View File

@ -2008,6 +2008,22 @@ def get_appconfig_default_value(key: str) -> Any:
return _uninferrable() 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]: def get_chat_messages() -> list[str]:
"""get_chat_messages() -> list[str] """get_chat_messages() -> list[str]
@ -3485,6 +3501,30 @@ def set_authenticate_clients(enable: bool) -> None:
return 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: def set_debug_speed_exponent(speed: int) -> None:
"""set_debug_speed_exponent(speed: int) -> None """set_debug_speed_exponent(speed: int) -> None

View File

@ -673,8 +673,7 @@ void Joystick::HandleSDLEvent(const SDL_Event* e) {
dpad_right_held_ = (e->type == SDL_JOYBUTTONDOWN); dpad_right_held_ = (e->type == SDL_JOYBUTTONDOWN);
e2.jaxis.value = static_cast_check_fit<int16_t>( e2.jaxis.value = static_cast_check_fit<int16_t>(
dpad_right_held_ ? (dpad_left_held_ ? 0 : 32767) dpad_right_held_ ? (dpad_left_held_ ? 0 : 32767)
: dpad_left_held_ ? -32767 : dpad_left_held_ ? -32767 : 0);
: 0);
e = &e2; e = &e2;
} else if (e->jbutton.button == left_button_ } else if (e->jbutton.button == left_button_
|| e->jbutton.button == left_button2_) { || e->jbutton.button == left_button2_) {
@ -683,8 +682,7 @@ void Joystick::HandleSDLEvent(const SDL_Event* e) {
dpad_left_held_ = (e->type == SDL_JOYBUTTONDOWN); dpad_left_held_ = (e->type == SDL_JOYBUTTONDOWN);
e2.jaxis.value = static_cast_check_fit<int16_t>( e2.jaxis.value = static_cast_check_fit<int16_t>(
dpad_right_held_ ? (dpad_left_held_ ? 0 : 32767) dpad_right_held_ ? (dpad_left_held_ ? 0 : 32767)
: dpad_left_held_ ? -32767 : dpad_left_held_ ? -32767 : 0);
: 0);
e = &e2; e = &e2;
} else if (e->jbutton.button == up_button_ } else if (e->jbutton.button == up_button_
|| e->jbutton.button == up_button2_) { || e->jbutton.button == up_button2_) {
@ -693,8 +691,7 @@ void Joystick::HandleSDLEvent(const SDL_Event* e) {
dpad_up_held_ = (e->type == SDL_JOYBUTTONDOWN); dpad_up_held_ = (e->type == SDL_JOYBUTTONDOWN);
e2.jaxis.value = static_cast_check_fit<int16_t>( e2.jaxis.value = static_cast_check_fit<int16_t>(
dpad_up_held_ ? (dpad_down_held_ ? 0 : -32767) dpad_up_held_ ? (dpad_down_held_ ? 0 : -32767)
: dpad_down_held_ ? 32767 : dpad_down_held_ ? 32767 : 0);
: 0);
e = &e2; e = &e2;
} else if (e->jbutton.button == down_button_ } else if (e->jbutton.button == down_button_
|| e->jbutton.button == down_button2_) { || e->jbutton.button == down_button2_) {
@ -703,8 +700,7 @@ void Joystick::HandleSDLEvent(const SDL_Event* e) {
dpad_down_held_ = (e->type == SDL_JOYBUTTONDOWN); dpad_down_held_ = (e->type == SDL_JOYBUTTONDOWN);
e2.jaxis.value = static_cast_check_fit<int16_t>( e2.jaxis.value = static_cast_check_fit<int16_t>(
dpad_up_held_ ? (dpad_down_held_ ? 0 : -32767) dpad_up_held_ ? (dpad_down_held_ ? 0 : -32767)
: dpad_down_held_ ? 32767 : dpad_down_held_ ? 32767 : 0);
: 0);
e = &e2; e = &e2;
} }
break; break;

View File

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

View File

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