mii/rust-openvr
1
0
Fork 0
mirror of https://github.com/mii443/rust-openvr.git synced 2025-08-22 16:25:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed osx build

Browse Source
This commit is contained in:
Colin Sherratt
2014-03-02 14:57:27 -07:00
parent e77c553357
commit b8bafb83a8
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib.rs
View File

@ -24,6 +24,12 @@ use cgmath::angle::rad;
#[link(name="edid")] #[link(name="edid")]
extern {} extern {}
#[cfg(target_os = "macos")]
#[link(name="ovr_wrapper")]
#[link(name="OculusVR")]
#[link(name="stdc++")]
extern {}
pub mod ll { pub mod ll {
use std::libc::{c_uint, c_int, c_float, c_long, c_char, time_t, c_void}; use std::libc::{c_uint, c_int, c_float, c_long, c_char, time_t, c_void};
@ -724,14 +730,14 @@ void main()
} }
float blue = texture2D(Texture0, tcBlue).b; float blue = texture(Texture0, tcBlue).b;
vec2 tcGreen = LensCenter + ScaleOut * theta1; vec2 tcGreen = LensCenter + ScaleOut * theta1;
vec4 center = texture2D(Texture0, tcGreen); vec4 center = texture(Texture0, tcGreen);
vec2 thetaRed = theta1 * (ChromAbParam.x + ChromAbParam.y * rSq); vec2 thetaRed = theta1 * (ChromAbParam.x + ChromAbParam.y * rSq);
vec2 tcRed = LensCenter + ScaleOut * thetaRed; vec2 tcRed = LensCenter + ScaleOut * thetaRed;
float red = texture2D(Texture0, tcRed).r; float red = texture(Texture0, tcRed).r;
color = vec4(red, center.g, blue, center.a); color = vec4(red, center.g, blue, center.a);
} }

4
wrapper.cpp
View File

@ -18,8 +18,8 @@ extern "C"
}; };
struct HMDInfoC { struct HMDInfoC {
uint HResolution; unsigned int HResolution;
uint VResolution; unsigned int VResolution;
float HScreenSize; float HScreenSize;
float VScreenSize; float VScreenSize;
float VScreenCenter; float VScreenCenter;