[Bf-blender-cvs] [60bcfbef40a] vr_scene_inspection: Cleanup: Change misleading name
Julian Eisel
noreply at git.blender.org
Mon Mar 16 11:22:36 CET 2020
Commit: 60bcfbef40a605001900340cb2b6a5daaab75a2d
Author: Julian Eisel
Date: Sun Mar 15 02:07:52 2020 +0100
Branches: vr_scene_inspection
https://developer.blender.org/rB60bcfbef40a605001900340cb2b6a5daaab75a2d
Cleanup: Change misleading name
===================================================================
M source/blender/windowmanager/intern/wm_xr.c
===================================================================
diff --git a/source/blender/windowmanager/intern/wm_xr.c b/source/blender/windowmanager/intern/wm_xr.c
index 3231d7f5847..2d67dd25a8f 100644
--- a/source/blender/windowmanager/intern/wm_xr.c
+++ b/source/blender/windowmanager/intern/wm_xr.c
@@ -89,7 +89,7 @@ typedef struct wmXrSessionState {
/** Copy of wmXrDrawData.eye_position_ofs. */
float prev_eye_position_ofs[3];
- bool is_initialized;
+ bool is_view_data_set;
} wmXrSessionState;
typedef struct wmXrRuntimeData {
@@ -290,7 +290,7 @@ static void wm_xr_draw_data_populate(const wmXrSessionState *state,
wm_xr_reference_pose_calc(scene, settings, &r_draw_data->reference_pose);
- if (position_tracking_toggled || !state->is_initialized) {
+ if (position_tracking_toggled || !state->is_view_data_set) {
if (use_position_tracking) {
copy_v3_fl(r_draw_data->eye_position_ofs, 0.0f);
}
@@ -343,7 +343,7 @@ static void wm_xr_session_state_update(wmXrSessionState *state,
copy_v3_v3(state->prev_eye_position_ofs, draw_data->eye_position_ofs);
state->prev_settings_flag = settings->flag;
- state->is_initialized = true;
+ state->is_view_data_set = true;
}
wmXrSessionState *WM_xr_session_state_handle_get(const wmXrData *xr)
@@ -353,7 +353,7 @@ wmXrSessionState *WM_xr_session_state_handle_get(const wmXrData *xr)
bool WM_xr_session_state_viewer_location_get(const wmXrData *xr, float r_location[3])
{
- if (!WM_xr_session_is_running(xr) || !xr->runtime->session_state.is_initialized) {
+ if (!WM_xr_session_is_running(xr) || !xr->runtime->session_state.is_view_data_set) {
zero_v3(r_location);
return false;
}
@@ -364,7 +364,7 @@ bool WM_xr_session_state_viewer_location_get(const wmXrData *xr, float r_locatio
bool WM_xr_session_state_viewer_rotation_get(const wmXrData *xr, float r_rotation[4])
{
- if (!WM_xr_session_is_running(xr) || !xr->runtime->session_state.is_initialized) {
+ if (!WM_xr_session_is_running(xr) || !xr->runtime->session_state.is_view_data_set) {
unit_qt(r_rotation);
return false;
}
@@ -377,7 +377,7 @@ bool WM_xr_session_state_viewer_matrix_info_get(const wmXrData *xr,
float r_viewmat[4][4],
float *r_focal_len)
{
- if (!WM_xr_session_is_running(xr) || !xr->runtime->session_state.is_initialized) {
+ if (!WM_xr_session_is_running(xr) || !xr->runtime->session_state.is_view_data_set) {
unit_m4(r_viewmat);
*r_focal_len = 0.0f;
return false;
More information about the Bf-blender-cvs
mailing list