Commit ab217ebd authored by Lubosz Sarnecki's avatar Lubosz Sarnecki

src: Rename openvr-glib to gxr.

parent 88022c87
......@@ -30,7 +30,7 @@ gnome.gtkdoc('xrdesktop',
'--extra-dir=@0@'.format(join_paths(glib_docpath, 'gobject')),
'--extra-dir=@0@'.format(join_paths(glib_docpath, 'graphene')),
'--extra-dir=@0@'.format(join_paths(glib_docpath, 'gulkan')),
'--extra-dir=@0@'.format(join_paths(glib_docpath, 'openvr-glib')),
'--extra-dir=@0@'.format(join_paths(glib_docpath, 'gxr')),
],
# html_assets: html_images,
install: true,
......
......@@ -8,7 +8,7 @@
#include <glib-unix.h>
#include <openvr-glib.h>
#include <gxr.h>
#include "xrd.h"
typedef struct Example
......@@ -202,8 +202,8 @@ main ()
return false;
}
if (!openvr_io_load_cached_action_manifest (
"openvr-glib",
if (!gxr_io_load_cached_action_manifest (
"gxr",
"/res/bindings",
"example_model_actions.json",
"example_model_bindings_vive_controller.json",
......
......@@ -51,7 +51,7 @@ c = meson.get_compiler('c')
## Required
m_dep = c.find_library('m')
openvr_glib_dep = dependency('openvr-glib-0.12')
gxr_dep = dependency('gxr-0.12')
subdir('shaders')
subdir('res')
......
......@@ -97,7 +97,7 @@ configure_file(
xrdesktop_deps = [
m_dep,
openvr_glib_dep
gxr_dep
]
xrdesktop_inc = include_directories('.', 'scene', 'overlay')
......@@ -130,7 +130,7 @@ pkg.generate(
filebase: api_path,
version: meson.project_version(),
subdirs: api_path,
requires: 'openvr-glib-' + api_version,
requires: 'gxr-' + api_version,
install_dir: join_paths(get_option('libdir'), 'pkgconfig')
)
......
......@@ -7,7 +7,7 @@
#include "xrd-overlay-client.h"
#include <openvr-glib.h>
#include <gxr.h>
#include <gdk/gdk.h>
#include <glib/gprintf.h>
......
......@@ -15,7 +15,7 @@
#include <glib-object.h>
#include <gmodule.h>
#include <openvr-glib.h>
#include <gxr.h>
#include "xrd-client.h"
......
......@@ -7,7 +7,7 @@
#include "xrd-overlay-desktop-cursor.h"
#include <openvr-glib.h>
#include <gxr.h>
#include "xrd-settings.h"
#include "xrd-math.h"
......
......@@ -6,7 +6,7 @@
*/
#include "xrd-overlay-model.h"
#include <openvr-glib.h>
#include <gxr.h>
typedef struct _XrdOverlayModelPrivate
{
......
......@@ -14,7 +14,7 @@
#include <glib-object.h>
#include <openvr-glib.h>
#include <gxr.h>
G_BEGIN_DECLS
......
......@@ -7,7 +7,7 @@
#include <gdk/gdk.h>
#include <openvr-glib.h>
#include <gxr.h>
#include "xrd-overlay-pointer-tip.h"
#include "xrd-settings.h"
......
......@@ -15,7 +15,7 @@
#include <glib-object.h>
#include <gulkan.h>
#include <openvr-glib.h>
#include <gxr.h>
G_BEGIN_DECLS
......
......@@ -15,7 +15,7 @@
#include <glib-object.h>
#include "xrd-overlay-model.h"
#include <openvr-glib.h>
#include <gxr.h>
G_BEGIN_DECLS
......
......@@ -9,7 +9,7 @@
#include <glib/gprintf.h>
#include <openvr-glib.h>
#include <gxr.h>
#include "xrd-math.h"
#include "graphene-ext.h"
......
......@@ -15,7 +15,7 @@
#include <glib-object.h>
#include <gulkan.h>
#include <openvr-glib.h>
#include <gxr.h>
#include "xrd-window.h"
......
......@@ -14,7 +14,7 @@
#include <glib-object.h>
#include <openvr-glib.h>
#include <gxr.h>
#include <gulkan.h>
#include "xrd-scene-object.h"
......
......@@ -12,7 +12,7 @@
#include <gmodule.h>
#include <gulkan.h>
#include <openvr-glib.h>
#include <gxr.h>
#include <signal.h>
......
......@@ -16,7 +16,7 @@
#include <glib-object.h>
#include <openvr-glib.h>
#include <gxr.h>
#include <gulkan.h>
#include "xrd-scene-device.h"
......
......@@ -8,7 +8,7 @@
#include "xrd-scene-device-manager.h"
#include "xrd-scene-model.h"
#include <openvr-glib.h>
#include <gxr.h>
struct _XrdSceneDeviceManager
{
......@@ -169,7 +169,7 @@ xrd_scene_device_manager_update_poses (XrdSceneDeviceManager *self,
continue;
graphene_matrix_t mat;
openvr_math_matrix34_to_graphene (&poses[i].mDeviceToAbsoluteTracking,
gxr_math_matrix34_to_graphene (&poses[i].mDeviceToAbsoluteTracking,
&mat);
XrdSceneObject *obj = XRD_SCENE_OBJECT (device);
......@@ -182,7 +182,7 @@ xrd_scene_device_manager_update_poses (XrdSceneDeviceManager *self,
if (poses[k_unTrackedDeviceIndex_Hmd].bPoseIsValid)
{
openvr_math_matrix34_to_graphene (
gxr_math_matrix34_to_graphene (
&poses[k_unTrackedDeviceIndex_Hmd].mDeviceToAbsoluteTracking,
mat_head_pose);
graphene_matrix_inverse (mat_head_pose, mat_head_pose);
......
......@@ -7,7 +7,7 @@
#include "xrd-scene-device.h"
#include <openvr-glib.h>
#include <gxr.h>
#include <gulkan.h>
struct _XrdSceneDevice
......
......@@ -7,7 +7,7 @@
#include "xrd-scene-model.h"
#include <openvr-glib.h>
#include <gxr.h>
#include "xrd-scene-renderer.h"
......
......@@ -15,7 +15,7 @@
#include <glib-object.h>
#include <gulkan.h>
#include <graphene.h>
#include <openvr-glib.h>
#include <gxr.h>
G_BEGIN_DECLS
......
......@@ -15,7 +15,7 @@
#include <glib-object.h>
#include <gulkan.h>
#include <openvr-glib.h>
#include <gxr.h>
#include "xrd-scene-object.h"
#include "xrd-scene-window.h"
......
......@@ -10,7 +10,7 @@
#include <graphene.h>
#include <gulkan.h>
#include <openvr-glib.h>
#include <gxr.h>
#include "xrd-controller.h"
#include "xrd-scene-pointer.h"
......
......@@ -15,7 +15,7 @@
#include <glib-object.h>
#include <gulkan.h>
#include <openvr-glib.h>
#include <gxr.h>
#include "xrd-scene-object.h"
......
......@@ -15,7 +15,7 @@
#include <glib-object.h>
#include <gulkan.h>
#include <openvr-glib.h>
#include <gxr.h>
#include "xrd-scene-object.h"
......
......@@ -14,7 +14,7 @@
#include <glib-object.h>
#include <openvr-glib.h>
#include <gxr.h>
#include <gulkan.h>
......
......@@ -7,7 +7,7 @@
#include "xrd-client.h"
#include <openvr-io.h>
#include <gxr.h>
#include "graphene-ext.h"
......@@ -16,14 +16,10 @@
#include "xrd-desktop-cursor.h"
#include "xrd-settings.h"
#include "xrd-controller.h"
#include "xrd-scene-client.h"
#include "xrd-overlay-client.h"
#include "xrd-container.h"
#include "xrd-math.h"
#include "xrd-button.h"
#define WINDOW_MIN_DIST .05f
......@@ -2039,7 +2035,7 @@ xrd_client_post_openvr_init (XrdClient *self)
{
XrdClientPrivate *priv = xrd_client_get_instance_private (self);
if (!openvr_io_load_cached_action_manifest (
if (!gxr_io_load_cached_action_manifest (
"xrdesktop",
"/res/bindings",
"actions.json",
......@@ -2234,7 +2230,7 @@ _get_new_window_data_list (XrdClient *self)
* xrd_client_switch_mode:
* @self: current #XrdClient to be destroyed.
*
* References to gulkan, openvr-glib and xrdesktop objects (like #XrdWindow)
* References to gulkan, gxr and xrdesktop objects (like #XrdWindow)
* will be invalid after calling this function.
*
* xrd_client_switch_mode() replaces each #XrdWindow with an appropriate new
......
......@@ -15,7 +15,7 @@
#include <glib-object.h>
#include <gdk/gdk.h>
#include <openvr-glib.h>
#include <gxr.h>
#include "xrd-window.h"
#include "xrd-input-synth.h"
......
......@@ -7,7 +7,7 @@
#include "xrd-container.h"
#include <openvr-glib.h>
#include <gxr.h>
#include "xrd-math.h"
#include "graphene-ext.h"
......
......@@ -7,7 +7,7 @@
#include "xrd-desktop-cursor.h"
#include <openvr-glib.h>
#include <gxr.h>
#include "xrd-settings.h"
#include "graphene-ext.h"
......
......@@ -14,7 +14,7 @@
#include <glib-object.h>
#include <openvr-glib.h>
#include <gxr.h>
#include "xrd-window.h"
#include "xrd-overlay-window.h"
......
......@@ -2,7 +2,7 @@
#include <inttypes.h>
#include <openvr-glib.h>
#include <gxr.h>
#include "graphene-ext.h"
......@@ -18,7 +18,7 @@ xrd_math_point_matrix_distance (graphene_point3d_t *intersection_point,
graphene_point3d_to_vec3 (intersection_point, &intersection_vec);
graphene_vec3_t pose_translation;
openvr_math_matrix_get_translation (pose, &pose_translation);
gxr_math_matrix_get_translation (pose, &pose_translation);
graphene_vec3_t distance_vec;
graphene_vec3_subtract (&pose_translation,
......@@ -28,7 +28,7 @@ xrd_math_point_matrix_distance (graphene_point3d_t *intersection_point,
return graphene_vec3_length (&distance_vec);
}
/* TODO: Put GetProjectionRaw into openvr-glib */
/* TODO: Put GetProjectionRaw into gxr */
/**
* xrd_math_get_frustum_angles:
* @left: The angle from the center view axis to the left in deg.
......
......@@ -9,7 +9,7 @@
#include <gdk/gdk.h>
#include <openvr-glib.h>
#include <gxr.h>
#include "xrd-math.h"
#include "xrd-settings.h"
......
......@@ -8,7 +8,7 @@
#include <gdk/gdk.h>
#include <math.h>
#include <openvr-glib.h>
#include <gxr.h>
#include "xrd-window-manager.h"
#include "xrd-math.h"
......
......@@ -14,7 +14,7 @@
#include <glib-object.h>
#include <openvr-glib.h>
#include <gxr.h>
#include "xrd-window.h"
#include "xrd-controller.h"
......
......@@ -6,7 +6,7 @@
*/
#include <glib.h>
#include <openvr-glib.h>
#include <gxr.h>
#include "xrd.h"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment