feat: updated engine version to 4.4-rc1
This commit is contained in:
parent
ee00efde1f
commit
21ba8e33af
5459 changed files with 1128836 additions and 198305 deletions
|
|
@ -30,9 +30,6 @@
|
|||
|
||||
#include "xr_server.h"
|
||||
#include "core/config/project_settings.h"
|
||||
#include "xr/xr_body_tracker.h"
|
||||
#include "xr/xr_face_tracker.h"
|
||||
#include "xr/xr_hand_tracker.h"
|
||||
#include "xr/xr_interface.h"
|
||||
#include "xr/xr_positional_tracker.h"
|
||||
#include "xr_server.compat.inc"
|
||||
|
|
@ -62,9 +59,12 @@ void XRServer::_bind_methods() {
|
|||
ClassDB::bind_method(D_METHOD("clear_reference_frame"), &XRServer::clear_reference_frame);
|
||||
ClassDB::bind_method(D_METHOD("center_on_hmd", "rotation_mode", "keep_height"), &XRServer::center_on_hmd);
|
||||
ClassDB::bind_method(D_METHOD("get_hmd_transform"), &XRServer::get_hmd_transform);
|
||||
ClassDB::bind_method(D_METHOD("set_camera_locked_to_origin", "enabled"), &XRServer::set_camera_locked_to_origin);
|
||||
ClassDB::bind_method(D_METHOD("is_camera_locked_to_origin"), &XRServer::is_camera_locked_to_origin);
|
||||
|
||||
ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "world_scale"), "set_world_scale", "get_world_scale");
|
||||
ADD_PROPERTY(PropertyInfo(Variant::VECTOR3, "world_origin"), "set_world_origin", "get_world_origin");
|
||||
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "camera_locked_to_origin"), "set_camera_locked_to_origin", "is_camera_locked_to_origin");
|
||||
|
||||
ClassDB::bind_method(D_METHOD("add_interface", "interface"), &XRServer::add_interface);
|
||||
ClassDB::bind_method(D_METHOD("get_interface_count"), &XRServer::get_interface_count);
|
||||
|
|
@ -183,7 +183,7 @@ Transform3D XRServer::get_reference_frame() const {
|
|||
}
|
||||
|
||||
void XRServer::center_on_hmd(RotationMode p_rotation_mode, bool p_keep_height) {
|
||||
if (primary_interface == nullptr) {
|
||||
if (primary_interface.is_null()) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -235,12 +235,16 @@ void XRServer::_set_render_reference_frame(const Transform3D &p_reference_frame)
|
|||
|
||||
Transform3D XRServer::get_hmd_transform() {
|
||||
Transform3D hmd_transform;
|
||||
if (primary_interface != nullptr) {
|
||||
if (primary_interface.is_valid()) {
|
||||
hmd_transform = primary_interface->get_camera_transform();
|
||||
}
|
||||
return hmd_transform;
|
||||
}
|
||||
|
||||
void XRServer::set_camera_locked_to_origin(bool p_enable) {
|
||||
camera_locked_to_origin = p_enable;
|
||||
}
|
||||
|
||||
void XRServer::add_interface(const Ref<XRInterface> &p_interface) {
|
||||
ERR_FAIL_COND(p_interface.is_null());
|
||||
|
||||
|
|
@ -428,7 +432,7 @@ void XRServer::_process() {
|
|||
|
||||
// process all active interfaces
|
||||
for (int i = 0; i < interfaces.size(); i++) {
|
||||
if (!interfaces[i].is_valid()) {
|
||||
if (interfaces[i].is_null()) {
|
||||
// ignore, not a valid reference
|
||||
} else if (interfaces[i]->is_initialized()) {
|
||||
interfaces.write[i]->process();
|
||||
|
|
@ -442,7 +446,7 @@ void XRServer::pre_render() {
|
|||
|
||||
// process all active interfaces
|
||||
for (int i = 0; i < interfaces.size(); i++) {
|
||||
if (!interfaces[i].is_valid()) {
|
||||
if (interfaces[i].is_null()) {
|
||||
// ignore, not a valid reference
|
||||
} else if (interfaces[i]->is_initialized()) {
|
||||
interfaces.write[i]->pre_render();
|
||||
|
|
@ -455,7 +459,7 @@ void XRServer::end_frame() {
|
|||
|
||||
// process all active interfaces
|
||||
for (int i = 0; i < interfaces.size(); i++) {
|
||||
if (!interfaces[i].is_valid()) {
|
||||
if (interfaces[i].is_null()) {
|
||||
// ignore, not a valid reference
|
||||
} else if (interfaces[i]->is_initialized()) {
|
||||
interfaces.write[i]->end_frame();
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue