Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Origin stuff; #671

Closed
wants to merge 1 commit into from
Closed

Origin stuff; #671

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/api/l_event.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ StringEntry lovrEventType[] = {
[EVENT_QUIT] = ENTRY("quit"),
[EVENT_RESTART] = ENTRY("restart"),
[EVENT_FOCUS] = ENTRY("focus"),
[EVENT_RECENTER] = ENTRY("recenter"),
[EVENT_RESIZE] = ENTRY("resize"),
[EVENT_KEYPRESSED] = ENTRY("keypressed"),
[EVENT_KEYRELEASED] = ENTRY("keyreleased"),
Expand Down Expand Up @@ -150,6 +151,9 @@ static int nextEvent(lua_State* L) {
lua_pushboolean(L, event.data.boolean.value);
return 2;

case EVENT_RECENTER:
return 1;

case EVENT_RESIZE:
lua_pushinteger(L, event.data.resize.width);
lua_pushinteger(L, event.data.resize.height);
Expand Down
184 changes: 136 additions & 48 deletions src/api/l_headset.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,6 @@ StringEntry lovrHeadsetDriver[] = {
{ 0 }
};

StringEntry lovrHeadsetOrigin[] = {
[ORIGIN_HEAD] = ENTRY("head"),
[ORIGIN_FLOOR] = ENTRY("floor"),
{ 0 }
};

StringEntry lovrPassthroughMode[] = {
[PASSTHROUGH_OPAQUE] = ENTRY("opaque"),
[PASSTHROUGH_BLEND] = ENTRY("blend"),
Expand Down Expand Up @@ -102,11 +96,53 @@ static int l_lovrHeadsetGetName(lua_State* L) {
return 1;
}

static int l_lovrHeadsetGetOriginType(lua_State* L) {
luax_pushenum(L, HeadsetOrigin, lovrHeadsetInterface->getOriginType());
static int l_lovrHeadsetIsSeated(lua_State* L) {
lua_pushboolean(L, lovrHeadsetInterface->isSeated());
return 1;
}

static int l_lovrHeadsetGetOffset(lua_State* L) {
float position[4], orientation[4], angle, ax, ay, az;
lovrHeadsetGetOffset(position, orientation);
quat_getAngleAxis(orientation, &angle, &ax, &ay, &az);
lua_pushnumber(L, position[0]);
lua_pushnumber(L, position[1]);
lua_pushnumber(L, position[2]);
lua_pushnumber(L, angle);
lua_pushnumber(L, ax);
lua_pushnumber(L, ay);
lua_pushnumber(L, az);
return 7;
}

static int l_lovrHeadsetSetOffset(lua_State* L) {
int index = 1;
float position[4], orientation[4];
index = luax_readvec3(L, index, position, NULL);
index = luax_readquat(L, index, orientation, NULL);
lovrHeadsetSetOffset(position, orientation);
return 0;
}

static int l_lovrHeadsetTranslate(lua_State* L) {
float position[4], orientation[4], translation[4];
lovrHeadsetGetOffset(position, orientation);
luax_readvec3(L, 1, translation, NULL);
quat_rotate(orientation, translation);
vec3_add(position, translation);
lovrHeadsetSetOffset(position, orientation);
return 0;
}

static int l_lovrHeadsetRotate(lua_State* L) {
float position[4], orientation[4], rotation[4];
lovrHeadsetGetOffset(position, orientation);
luax_readquat(L, 1, rotation, NULL);
quat_mul(orientation, orientation, rotation);
lovrHeadsetSetOffset(position, orientation);
return 0;
}

static int l_lovrHeadsetGetDisplayWidth(lua_State* L) {
uint32_t width, height;
lovrHeadsetInterface->getDisplayDimensions(&width, &height);
Expand Down Expand Up @@ -202,13 +238,13 @@ static int l_lovrHeadsetGetViewCount(lua_State* L) {
}

static int l_lovrHeadsetGetViewPose(lua_State* L) {
float position[4], orientation[4];
float position[4], orientation[4], angle, ax, ay, az;
uint32_t view = luax_checku32(L, 1) - 1;
if (!lovrHeadsetInterface->getViewPose(view, position, orientation)) {
lua_pushnil(L);
return 1;
}
float angle, ax, ay, az;
lovrHeadsetApplyOffset(position, orientation);
quat_getAngleAxis(orientation, &angle, &ax, &ay, &az);
lua_pushnumber(L, position[0]);
lua_pushnumber(L, position[1]);
Expand Down Expand Up @@ -249,6 +285,40 @@ static int l_lovrHeadsetSetClipDistance(lua_State* L) {
return 0;
}

static int l_lovrHeadsetGetBoundsPosition(lua_State* L) {
float position[4], orientation[4];
lovrHeadsetInterface->getBoundsPose(position, orientation);
lua_pushnumber(L, position[0]);
lua_pushnumber(L, position[1]);
lua_pushnumber(L, position[2]);
return 3;
}

static int l_lovrHeadsetGetBoundsOrientation(lua_State* L) {
float position[4], orientation[4], angle, ax, ay, az;
lovrHeadsetInterface->getBoundsPose(position, orientation);
quat_getAngleAxis(orientation, &angle, &ax, &ay, &az);
lua_pushnumber(L, angle);
lua_pushnumber(L, ax);
lua_pushnumber(L, ay);
lua_pushnumber(L, az);
return 4;
}

static int l_lovrHeadsetGetBoundsPose(lua_State* L) {
float position[4], orientation[4], angle, ax, ay, az;
lovrHeadsetInterface->getBoundsPose(position, orientation);
quat_getAngleAxis(orientation, &angle, &ax, &ay, &az);
lua_pushnumber(L, position[0]);
lua_pushnumber(L, position[1]);
lua_pushnumber(L, position[2]);
lua_pushnumber(L, angle);
lua_pushnumber(L, ax);
lua_pushnumber(L, ay);
lua_pushnumber(L, az);
return 7;
}

static int l_lovrHeadsetGetBoundsWidth(lua_State* L) {
float width, depth;
lovrHeadsetInterface->getBoundsDimensions(&width, &depth);
Expand Down Expand Up @@ -309,62 +379,59 @@ static int l_lovrHeadsetIsTracked(lua_State* L) {

static int l_lovrHeadsetGetPose(lua_State* L) {
Device device = luax_optdevice(L, 1);
float position[4], orientation[4];
float position[4], orientation[4], angle, ax, ay, az;
if (lovrHeadsetInterface->getPose(device, position, orientation)) {
float angle, ax, ay, az;
quat_getAngleAxis(orientation, &angle, &ax, &ay, &az);
lua_pushnumber(L, position[0]);
lua_pushnumber(L, position[1]);
lua_pushnumber(L, position[2]);
lua_pushnumber(L, angle);
lua_pushnumber(L, ax);
lua_pushnumber(L, ay);
lua_pushnumber(L, az);
return 7;
}
for (int i = 0; i < 7; i++) {
lua_pushnumber(L, 0.);
lovrHeadsetApplyOffset(position, orientation);
} else {
lovrHeadsetGetOffset(position, orientation);
}
quat_getAngleAxis(orientation, &angle, &ax, &ay, &az);
lua_pushnumber(L, position[0]);
lua_pushnumber(L, position[1]);
lua_pushnumber(L, position[2]);
lua_pushnumber(L, angle);
lua_pushnumber(L, ax);
lua_pushnumber(L, ay);
lua_pushnumber(L, az);
return 7;
}

static int l_lovrHeadsetGetPosition(lua_State* L) {
Device device = luax_optdevice(L, 1);
float position[4], orientation[4];
if (lovrHeadsetInterface->getPose(device, position, orientation)) {
lua_pushnumber(L, position[0]);
lua_pushnumber(L, position[1]);
lua_pushnumber(L, position[2]);
return 3;
}
for (int i = 0; i < 3; i++) {
lua_pushnumber(L, 0.);
lovrHeadsetApplyOffset(position, orientation);
} else {
lovrHeadsetGetOffset(position, orientation);
}
lua_pushnumber(L, position[0]);
lua_pushnumber(L, position[1]);
lua_pushnumber(L, position[2]);
return 3;
}

static int l_lovrHeadsetGetOrientation(lua_State* L) {
Device device = luax_optdevice(L, 1);
float position[4], orientation[4];
float position[4], orientation[4], angle, ax, ay, az;
if (lovrHeadsetInterface->getPose(device, position, orientation)) {
float angle, ax, ay, az;
quat_getAngleAxis(orientation, &angle, &ax, &ay, &az);
lua_pushnumber(L, angle);
lua_pushnumber(L, ax);
lua_pushnumber(L, ay);
lua_pushnumber(L, az);
return 4;
}
for (int i = 0; i < 4; i++) {
lua_pushnumber(L, 0.);
lovrHeadsetApplyOffset(position, orientation);
} else {
lovrHeadsetGetOffset(position, orientation);
}
quat_getAngleAxis(orientation, &angle, &ax, &ay, &az);
lua_pushnumber(L, angle);
lua_pushnumber(L, ax);
lua_pushnumber(L, ay);
lua_pushnumber(L, az);
return 4;
}

static int l_lovrHeadsetGetVelocity(lua_State* L) {
Device device = luax_optdevice(L, 1);
float velocity[4], angularVelocity[4];
float velocity[4], angularVelocity[4], position[4], orientation[4];
if (lovrHeadsetInterface->getVelocity(device, velocity, angularVelocity)) {
lovrHeadsetGetOffset(position, orientation);
quat_rotate(orientation, velocity);
lua_pushnumber(L, velocity[0]);
lua_pushnumber(L, velocity[1]);
lua_pushnumber(L, velocity[2]);
Expand All @@ -378,8 +445,10 @@ static int l_lovrHeadsetGetVelocity(lua_State* L) {

static int l_lovrHeadsetGetAngularVelocity(lua_State* L) {
Device device = luax_optdevice(L, 1);
float velocity[4], angularVelocity[4];
float velocity[4], angularVelocity[4], position[4], orientation[4];
if (lovrHeadsetInterface->getVelocity(device, velocity, angularVelocity)) {
lovrHeadsetGetOffset(position, orientation);
quat_rotate(orientation, angularVelocity);
lua_pushnumber(L, angularVelocity[0]);
lua_pushnumber(L, angularVelocity[1]);
lua_pushnumber(L, angularVelocity[2]);
Expand Down Expand Up @@ -478,6 +547,7 @@ static int l_lovrHeadsetGetSkeleton(lua_State* L) {

float angle, ax, ay, az;
float* pose = poses + i * 8;
lovrHeadsetApplyOffset(pose, pose + 4);
quat_getAngleAxis(pose + 4, &angle, &ax, &ay, &az);
lua_pushnumber(L, pose[0]);
lua_pushnumber(L, pose[1]);
Expand Down Expand Up @@ -612,11 +682,25 @@ static int l_lovrHeadsetGetHands(lua_State* L) {
return 1;
}

// Deprecated
static int l_lovrHeadsetGetOriginType(lua_State* L) {
if (lovrHeadsetInterface->isSeated()) {
lua_pushliteral(L, "head");
} else {
lua_pushliteral(L, "floor");
}
return 1;
}

static const luaL_Reg lovrHeadset[] = {
{ "start", l_lovrHeadsetStart },
{ "getDriver", l_lovrHeadsetGetDriver },
{ "getName", l_lovrHeadsetGetName },
{ "getOriginType", l_lovrHeadsetGetOriginType },
{ "isSeated", l_lovrHeadsetIsSeated },
{ "getOffset", l_lovrHeadsetGetOffset },
{ "setOffset", l_lovrHeadsetSetOffset },
{ "translate", l_lovrHeadsetTranslate },
{ "rotate", l_lovrHeadsetRotate },
{ "getDisplayWidth", l_lovrHeadsetGetDisplayWidth },
{ "getDisplayHeight", l_lovrHeadsetGetDisplayHeight },
{ "getDisplayDimensions", l_lovrHeadsetGetDisplayDimensions },
Expand All @@ -631,6 +715,9 @@ static const luaL_Reg lovrHeadset[] = {
{ "getViewAngles", l_lovrHeadsetGetViewAngles },
{ "getClipDistance", l_lovrHeadsetGetClipDistance },
{ "setClipDistance", l_lovrHeadsetSetClipDistance },
{ "getBoundsPosition", l_lovrHeadsetGetBoundsPosition },
{ "getBoundsOrientation", l_lovrHeadsetGetBoundsOrientation },
{ "getBoundsPose", l_lovrHeadsetGetBoundsPose },
{ "getBoundsWidth", l_lovrHeadsetGetBoundsWidth },
{ "getBoundsDepth", l_lovrHeadsetGetBoundsDepth },
{ "getBoundsDimensions", l_lovrHeadsetGetBoundsDimensions },
Expand Down Expand Up @@ -660,6 +747,7 @@ static const luaL_Reg lovrHeadset[] = {
{ "getHands", l_lovrHeadsetGetHands },

// Deprecated
{ "getOriginType", l_lovrHeadsetGetOriginType },
{ "getDisplayFrequency", l_lovrHeadsetGetRefreshRate },
{ "getDisplayFrequencies", l_lovrHeadsetGetRefreshRates },
{ "setDisplayFrequency", l_lovrHeadsetSetRefreshRate },
Expand All @@ -677,7 +765,7 @@ int luaopen_lovr_headset(lua_State* L) {
.drivers = drivers,
.driverCount = 0,
.supersample = 1.f,
.offset = 1.7f,
.seated = false,
.stencil = false,
.antialias = true,
.submitDepth = true,
Expand Down Expand Up @@ -706,8 +794,8 @@ int luaopen_lovr_headset(lua_State* L) {
}
lua_pop(L, 1);

lua_getfield(L, -1, "offset");
config.offset = luax_optfloat(L, -1, 1.7f);
lua_getfield(L, -1, "seated");
config.seated = lua_toboolean(L, -1);
lua_pop(L, 1);

lua_getfield(L, -1, "stencil");
Expand Down
1 change: 1 addition & 0 deletions src/modules/event/event.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ typedef enum {
EVENT_QUIT,
EVENT_RESTART,
EVENT_FOCUS,
EVENT_RECENTER,
EVENT_RESIZE,
EVENT_KEYPRESSED,
EVENT_KEYRELEASED,
Expand Down
34 changes: 29 additions & 5 deletions src/modules/headset/headset.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,19 @@
#include "headset/headset.h"
#include "util.h"
#include "core/maf.h"
#include <string.h>

HeadsetInterface* lovrHeadsetInterface = NULL;
static bool initialized = false;

static struct {
bool initialized;
float position[4];
float orientation[4];
} state;

bool lovrHeadsetInit(HeadsetConfig* config) {
if (initialized) return false;
initialized = true;
if (state.initialized) return false;
state.initialized = true;

for (size_t i = 0; i < config->driverCount; i++) {
HeadsetInterface* interface = NULL;
Expand All @@ -31,14 +38,31 @@ bool lovrHeadsetInit(HeadsetConfig* config) {
}

lovrAssert(lovrHeadsetInterface, "No headset display driver available, check t.headset.drivers in conf.lua");
state.orientation[3] = 1.f;
return true;
}

void lovrHeadsetDestroy(void) {
if (!initialized) return;
initialized = false;
if (!state.initialized) return;
if (lovrHeadsetInterface) {
lovrHeadsetInterface->destroy();
lovrHeadsetInterface = NULL;
}
memset(&state, 0, sizeof(state));
}

void lovrHeadsetGetOffset(float* position, float* orientation) {
memcpy(position, state.position, 4 * sizeof(float));
memcpy(orientation, state.orientation, 4 * sizeof(float));
}

void lovrHeadsetSetOffset(float* position, float* orientation) {
memcpy(state.position, position, 4 * sizeof(float));
memcpy(state.orientation, orientation, 4 * sizeof(float));
}

void lovrHeadsetApplyOffset(float* position, float* orientation) {
quat_rotate(state.orientation, position);
vec3_add(position, state.position);
quat_mul(orientation, state.orientation, orientation);
}
Loading