mirror of
https://github.com/DrBeef/QuakeQuest.git
synced 2024-11-25 05:21:48 +00:00
Implementing Dr Beefs HL solution for Head movement
Fixes issue when looking downward / upward
This commit is contained in:
Grant Bagwell
parent
dec6e69594
commit
af84bfbdfc
2 changed files with 103 additions and 157 deletions
|
|
@ -1,145 +1,16 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<module external.linked.project.id=":VrSamples:QuakeQuest:Projects:Android" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
|
<module external.system.id="GRADLE" type="JAVA_MODULE" version="4">
|
||||||
<component name="FacetManager">
|
<component name="FacetManager">
|
||||||
<facet type="android-gradle" name="Android-Gradle">
|
<facet type="android-gradle" name="Android-Gradle">
|
||||||
<configuration>
|
<configuration>
|
||||||
<option name="GRADLE_PROJECT_PATH" value=":VrSamples:QuakeQuest:Projects:Android" />
|
<option name="GRADLE_PROJECT_PATH" value=":" />
|
||||||
</configuration>
|
|
||||||
</facet>
|
|
||||||
<facet type="native-android-gradle" name="Native-Android-Gradle">
|
|
||||||
<configuration>
|
|
||||||
<option name="SELECTED_BUILD_VARIANT" value="debug" />
|
|
||||||
</configuration>
|
|
||||||
</facet>
|
|
||||||
<facet type="android" name="Android">
|
|
||||||
<configuration>
|
|
||||||
<option name="SELECTED_BUILD_VARIANT" value="debug" />
|
|
||||||
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
|
|
||||||
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
|
|
||||||
<afterSyncTasks>
|
|
||||||
<task>generateDebugSources</task>
|
|
||||||
</afterSyncTasks>
|
|
||||||
<option name="ALLOW_USER_CONFIGURATION" value="false" />
|
|
||||||
<option name="RES_FOLDER_RELATIVE_PATH" value="/../../res" />
|
|
||||||
<option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/../../res" />
|
|
||||||
<option name="ASSETS_FOLDER_RELATIVE_PATH" value="/../../assets" />
|
|
||||||
</configuration>
|
</configuration>
|
||||||
</facet>
|
</facet>
|
||||||
</component>
|
</component>
|
||||||
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7">
|
<component name="NewModuleRootManager" inherit-compiler-output="true">
|
||||||
<output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
|
|
||||||
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
|
|
||||||
<exclude-output />
|
<exclude-output />
|
||||||
<content url="file://$MODULE_DIR$">
|
<content url="file://$MODULE_DIR$" />
|
||||||
<sourceFolder url="file://$MODULE_DIR$/jni" isTestSource="false" />
|
<orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
|
||||||
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
|
|
||||||
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
|
|
||||||
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
|
|
||||||
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
|
|
||||||
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
|
|
||||||
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
|
|
||||||
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
|
|
||||||
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
|
|
||||||
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
|
|
||||||
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
|
|
||||||
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
|
|
||||||
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
|
|
||||||
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
|
|
||||||
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
|
|
||||||
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/test/debug" isTestSource="true" generated="true" />
|
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
|
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
|
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
|
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
|
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
|
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
|
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
|
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
|
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
|
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
|
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
|
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
|
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
|
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/jni" isTestSource="true" />
|
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
|
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
|
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/res" type="java-test-resource" />
|
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/resources" type="java-test-resource" />
|
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/assets" type="java-test-resource" />
|
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/aidl" isTestSource="true" />
|
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/java" isTestSource="true" />
|
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/jni" isTestSource="true" />
|
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/rs" isTestSource="true" />
|
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/shaders" isTestSource="true" />
|
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
|
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
|
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
|
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
|
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
|
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
|
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
|
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
|
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
|
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
|
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
|
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
|
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
|
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
|
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
|
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
|
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
|
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
|
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
|
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
|
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
|
|
||||||
<excludeFolder url="file://$MODULE_DIR$/.externalNativeBuild" />
|
|
||||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
|
|
||||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
|
|
||||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/build-info" />
|
|
||||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />
|
|
||||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-manifest" />
|
|
||||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
|
|
||||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
|
|
||||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-classes" />
|
|
||||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-runtime-classes" />
|
|
||||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-verifier" />
|
|
||||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-apk" />
|
|
||||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-main-apk-res" />
|
|
||||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-resources" />
|
|
||||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaPrecompile" />
|
|
||||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
|
|
||||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
|
|
||||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifest-checker" />
|
|
||||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
|
|
||||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/ndkBuild" />
|
|
||||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/prebuild" />
|
|
||||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
|
|
||||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
|
|
||||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/resources" />
|
|
||||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
|
|
||||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
|
|
||||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/split-apk" />
|
|
||||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/splits-support" />
|
|
||||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
|
|
||||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
|
|
||||||
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
|
|
||||||
<excludeFolder url="file://$MODULE_DIR$/build/reports" />
|
|
||||||
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
|
|
||||||
</content>
|
|
||||||
<content url="file://$MODULE_DIR$/../../Src">
|
|
||||||
<sourceFolder url="file://$MODULE_DIR$/../../Src" isTestSource="false" />
|
|
||||||
</content>
|
|
||||||
<content url="file://$MODULE_DIR$/../../assets">
|
|
||||||
<sourceFolder url="file://$MODULE_DIR$/../../assets" type="java-resource" />
|
|
||||||
</content>
|
|
||||||
<content url="file://$MODULE_DIR$/../../java">
|
|
||||||
<sourceFolder url="file://$MODULE_DIR$/../../java" isTestSource="false" />
|
|
||||||
</content>
|
|
||||||
<content url="file://$MODULE_DIR$/../../res">
|
|
||||||
<sourceFolder url="file://$MODULE_DIR$/../../res" type="java-resource" />
|
|
||||||
</content>
|
|
||||||
<orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
|
|
||||||
<orderEntry type="sourceFolder" forTests="false" />
|
<orderEntry type="sourceFolder" forTests="false" />
|
||||||
<orderEntry type="library" name="Gradle: android-android-21" level="project" />
|
|
||||||
</component>
|
</component>
|
||||||
</module>
|
</module>
|
||||||
|
|
@ -1044,31 +1044,106 @@ static void ovrRenderer_Destroy( ovrRenderer * renderer )
|
||||||
renderer->ProjectionMatrix = ovrMatrix4f_CreateIdentity();
|
renderer->ProjectionMatrix = ovrMatrix4f_CreateIdentity();
|
||||||
}
|
}
|
||||||
|
|
||||||
void QuatToYawPitchRoll(ovrQuatf q, vec3_t out) {
|
#ifndef EPSILON
|
||||||
float sqw = q.w*q.w;
|
#define EPSILON 0.001f
|
||||||
float sqx = q.x*q.x;
|
#endif
|
||||||
float sqy = q.y*q.y;
|
|
||||||
float sqz = q.z*q.z;
|
|
||||||
float unit = sqx + sqy + sqz + sqw; // if normalised is one, otherwise is correction factor
|
|
||||||
float test = q.x*q.y + q.z*q.w;
|
|
||||||
if( test > 0.49999*unit ) { // singularity at north pole
|
|
||||||
out[YAW] = 2 * atan2f(q.x,q.w) / ((float)M_PI / 180.0f);
|
|
||||||
out[ROLL] = -(float)M_PI/2 / ((float)M_PI / 180.0f) ;
|
|
||||||
out[PITCH] = 0;
|
|
||||||
}
|
|
||||||
else if( test < -0.49999*unit ) { // singularity at south pole
|
|
||||||
out[YAW] = -2 * atan2f(q.x,q.w) / ((float)M_PI / 180.0f);
|
|
||||||
out[ROLL] = (float)M_PI/2 / ((float)M_PI / 180.0f);
|
|
||||||
out[PITCH] = 0;
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
//out[YAW] = atan2(2*q.y*q.w-2*q.x*q.z , sqx - sqy - sqz + sqw) / (M_PI / 180.0f);
|
|
||||||
out[YAW] = atan2f(2*q.y*q.w-2*q.x*q.z , 1 - 2*sqy - 2*sqz) / ((float)M_PI / 180.0f);
|
|
||||||
out[ROLL] = -asinf(2*test/unit) / ((float)M_PI / 180.0f);
|
|
||||||
//out[PITCH] = -atan2(2*q.x*q.w-2*q.y*q.z , -sqx + sqy - sqz + sqw) / (M_PI / 180.0f);
|
|
||||||
out[PITCH] = -atan2f(2*q.x*q.w-2*q.y*q.z , 1 - 2*sqx - 2*sqz) / ((float)M_PI / 180.0f);
|
|
||||||
|
|
||||||
|
static ovrVector3f normalizeVec(ovrVector3f vec) {
|
||||||
|
//NOTE: leave w-component untouched
|
||||||
|
//@@const float EPSILON = 0.000001f;
|
||||||
|
float xxyyzz = vec.x*vec.x + vec.y*vec.y + vec.z*vec.z;
|
||||||
|
//@@if(xxyyzz < EPSILON)
|
||||||
|
//@@ return *this; // do nothing if it is zero vector
|
||||||
|
|
||||||
|
//float invLength = invSqrt(xxyyzz);
|
||||||
|
ovrVector3f result;
|
||||||
|
float invLength = 1.0f / sqrtf(xxyyzz);
|
||||||
|
result.x = vec.x * invLength;
|
||||||
|
result.y = vec.y * invLength;
|
||||||
|
result.z = vec.z * invLength;
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
void NormalizeAngles(vec3_t angles)
|
||||||
|
{
|
||||||
|
while (angles[0] >= 90) angles[0] -= 360;
|
||||||
|
while (angles[1] >= 180) angles[1] -= 360;
|
||||||
|
while (angles[2] >= 180) angles[2] -= 360;
|
||||||
|
while (angles[0] < -90) angles[0] += 360;
|
||||||
|
while (angles[1] < -180) angles[1] += 360;
|
||||||
|
while (angles[2] < -180) angles[2] += 360;
|
||||||
|
}
|
||||||
|
|
||||||
|
void GetAnglesFromVectors(const ovrVector3f forward, const ovrVector3f right, const ovrVector3f up, vec3_t angles)
|
||||||
|
{
|
||||||
|
float sr, sp, sy, cr, cp, cy;
|
||||||
|
|
||||||
|
sp = -forward.z;
|
||||||
|
|
||||||
|
float cp_x_cy = forward.x;
|
||||||
|
float cp_x_sy = forward.y;
|
||||||
|
float cp_x_sr = -right.z;
|
||||||
|
float cp_x_cr = up.z;
|
||||||
|
|
||||||
|
float yaw = atan2(cp_x_sy, cp_x_cy);
|
||||||
|
float roll = atan2(cp_x_sr, cp_x_cr);
|
||||||
|
|
||||||
|
cy = cos(yaw);
|
||||||
|
sy = sin(yaw);
|
||||||
|
cr = cos(roll);
|
||||||
|
sr = sin(roll);
|
||||||
|
|
||||||
|
if (fabs(cy) > EPSILON)
|
||||||
|
{
|
||||||
|
cp = cp_x_cy / cy;
|
||||||
}
|
}
|
||||||
|
else if (fabs(sy) > EPSILON)
|
||||||
|
{
|
||||||
|
cp = cp_x_sy / sy;
|
||||||
|
}
|
||||||
|
else if (fabs(sr) > EPSILON)
|
||||||
|
{
|
||||||
|
cp = cp_x_sr / sr;
|
||||||
|
}
|
||||||
|
else if (fabs(cr) > EPSILON)
|
||||||
|
{
|
||||||
|
cp = cp_x_cr / cr;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
cp = cos(asin(sp));
|
||||||
|
}
|
||||||
|
|
||||||
|
float pitch = atan2(sp, cp);
|
||||||
|
|
||||||
|
angles[0] = pitch / (M_PI*2.f / 360.f);
|
||||||
|
angles[1] = yaw / (M_PI*2.f / 360.f);
|
||||||
|
angles[2] = roll / (M_PI*2.f / 360.f);
|
||||||
|
|
||||||
|
NormalizeAngles(angles);
|
||||||
|
}
|
||||||
|
|
||||||
|
void QuatToYawPitchRoll(ovrQuatf q, vec3_t out) {
|
||||||
|
|
||||||
|
ovrMatrix4f mat = ovrMatrix4f_CreateFromQuaternion( &q );
|
||||||
|
ovrVector4f v1 = {0, 0, -1, 0};
|
||||||
|
ovrVector4f v2 = {1, 0, 0, 0};
|
||||||
|
ovrVector4f v3 = {0, 1, 0, 0};
|
||||||
|
|
||||||
|
ovrVector4f forwardInVRSpace = ovrVector4f_MultiplyMatrix4f(&mat, &v1);
|
||||||
|
ovrVector4f rightInVRSpace = ovrVector4f_MultiplyMatrix4f(&mat, &v2);
|
||||||
|
ovrVector4f upInVRSpace = ovrVector4f_MultiplyMatrix4f(&mat, &v3);
|
||||||
|
|
||||||
|
ovrVector3f forward = {-forwardInVRSpace.z, -forwardInVRSpace.x, forwardInVRSpace.y};
|
||||||
|
ovrVector3f right = {-rightInVRSpace.z, -rightInVRSpace.x, rightInVRSpace.y};
|
||||||
|
ovrVector3f up = {-upInVRSpace.z, -upInVRSpace.x, upInVRSpace.y};
|
||||||
|
|
||||||
|
ovrVector3f forwardNormal = normalizeVec(forward);
|
||||||
|
ovrVector3f rightNormal = normalizeVec(right);
|
||||||
|
ovrVector3f upNormal = normalizeVec(up);
|
||||||
|
|
||||||
|
GetAnglesFromVectors(forwardNormal, rightNormal, upNormal, out);
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void adjustYaw(float adjustment, float* out)
|
static void adjustYaw(float adjustment, float* out)
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue