mirror of https://github.com/bjornbytes/lovr.git
Weird compile fixes;
This commit is contained in:
parent
3a36bcceae
commit
272cce65a2
|
@ -12,7 +12,7 @@ static int nextEvent(lua_State* L) {
|
|||
return 0;
|
||||
}
|
||||
|
||||
luax_pushenum(L, &EventTypes, event.type, "event type");
|
||||
luax_pushenum(L, &EventTypes, event.type);
|
||||
|
||||
switch (event.type) {
|
||||
case EVENT_QUIT:
|
||||
|
|
|
@ -200,7 +200,7 @@ static aiReturn assimpFileSeek(struct aiFile* assimpFile, size_t position, enum
|
|||
return lovrFileSeek(file, position) ? aiReturn_FAILURE : aiReturn_SUCCESS;
|
||||
}
|
||||
|
||||
static unsigned int assimpFileTell(struct aiFile* assimpFile) {
|
||||
static unsigned long assimpFileTell(struct aiFile* assimpFile) {
|
||||
File* file = (File*) assimpFile->UserData;
|
||||
return lovrFileTell(file);
|
||||
}
|
||||
|
|
|
@ -70,7 +70,7 @@ Model* lovrModelCreate(ModelData* modelData) {
|
|||
model->textures = malloc(modelData->textures.length * sizeof(Texture*));
|
||||
for (int i = 0; i < modelData->textures.length; i++) {
|
||||
if (modelData->textures.data[i]) {
|
||||
model->textures[i] = lovrTextureCreate(TEXTURE_2D, (TextureData**) &modelData->textures.data[i], 1, true, true);
|
||||
model->textures[i] = lovrTextureCreate(TEXTURE_2D, (TextureData**) &modelData->textures.data[i], 1, i == 2, true);
|
||||
} else {
|
||||
model->textures[i] = NULL;
|
||||
}
|
||||
|
|
|
@ -40,8 +40,6 @@ typedef struct {
|
|||
|
||||
static FakeHeadsetState state;
|
||||
|
||||
static void fakePoll();
|
||||
|
||||
/*
|
||||
* callback handlers
|
||||
*/
|
||||
|
@ -214,7 +212,7 @@ static void fakeSetMirrored(bool mirror) {
|
|||
static void fakeGetDisplayDimensions(int* width, int* height) {
|
||||
GLFWwindow* window = glfwGetCurrentContext();
|
||||
if (window) {
|
||||
glfwGetWindowSize(window,width,height);
|
||||
glfwGetFramebufferSize(window, width, height);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -313,12 +311,12 @@ static ModelData* fakeControllerNewModelData(Controller* controller) {
|
|||
|
||||
static void fakeRenderTo(headsetRenderCallback callback, void* userdata) {
|
||||
GLFWwindow* window = glfwGetCurrentContext();
|
||||
if(!window) {
|
||||
if (!window) {
|
||||
return;
|
||||
}
|
||||
|
||||
int w, h;
|
||||
glfwGetWindowSize(window, &w, &h);
|
||||
glfwGetFramebufferSize(window, &w, &h);
|
||||
mat4_perspective(state.projection, state.clipNear, state.clipFar, 67 * M_PI / 180.0, (float) w / h);
|
||||
|
||||
float transform[16];
|
||||
|
|
|
@ -208,12 +208,13 @@ static void openvrPoll() {
|
|||
}
|
||||
|
||||
case EVREventType_VREvent_InputFocusCaptured:
|
||||
case EVREventType_VREvent_InputFocusReleased:
|
||||
case EVREventType_VREvent_InputFocusReleased: {
|
||||
bool isFocused = vrEvent.eventType == EVREventType_VREvent_InputFocusReleased;
|
||||
EventData data = { .focus = { isFocused } };
|
||||
Event event = { .type = EVENT_FOCUS, .data = data };
|
||||
lovrEventPush(event);
|
||||
break;
|
||||
}
|
||||
|
||||
default:
|
||||
break;
|
||||
|
@ -248,7 +249,7 @@ static void ensureCanvas() {
|
|||
state.canvas = lovrCanvasCreate(state.renderWidth, state.renderHeight, FORMAT_RGB, msaa, true, true);
|
||||
}
|
||||
|
||||
static void openvrInit() {
|
||||
static bool openvrInit() {
|
||||
if (state.initialized) return true;
|
||||
|
||||
if (!VR_IsHmdPresent() || !VR_IsRuntimeInstalled()) {
|
||||
|
@ -770,5 +771,6 @@ HeadsetInterface lovrHeadsetOpenVRDriver = {
|
|||
openvrControllerIsTouched,
|
||||
openvrControllerVibrate,
|
||||
openvrControllerNewModelData,
|
||||
openvrRenderTo
|
||||
openvrRenderTo,
|
||||
NULL
|
||||
};
|
||||
|
|
|
@ -20,8 +20,8 @@ typedef struct {
|
|||
float r, g, b, a;
|
||||
} Color;
|
||||
|
||||
_Thread_local extern char lovrErrorMessage[];
|
||||
_Thread_local extern jmp_buf* lovrCatch;
|
||||
extern _Thread_local char lovrErrorMessage[];
|
||||
extern _Thread_local jmp_buf* lovrCatch;
|
||||
|
||||
void lovrThrow(const char* format, ...);
|
||||
void lovrSleep(double seconds);
|
||||
|
|
Loading…
Reference in New Issue