Merge branch 'universal'

nickarora · Feb 29, 2020 · b8fcb8a · b8fcb8a
2 parents 7085a64 + eac6a2a
commit b8fcb8a
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/SGPlayer.xcodeproj/xcshareddata/xcschemes/SGPlayer iOS.xcscheme b/SGPlayer.xcodeproj/xcshareddata/xcschemes/SGPlayer iOS.xcscheme
@@ -31,7 +31,7 @@
       </Testables>
    </TestAction>
    <LaunchAction
-      buildConfiguration = "Debug"
+      buildConfiguration = "Release"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"

diff --git a/SGPlayer/Classes/Core/SGVR/SGVRProjection.m b/SGPlayer/Classes/Core/SGVR/SGVRProjection.m
@@ -94,11 +94,18 @@ - (BOOL)matrixWithAspect:(Float64)aspect matrix1:(GLKMatrix4 *)matrix1
         modelMatrix = GLKMatrix4Multiply(modelMatrix, self.sensor.matrix);
     }
 #endif
+    // model
     modelMatrix = GLKMatrix4RotateY(modelMatrix, GLKMathDegreesToRadians(self.viewport.x) * (self.viewport.flipX ? -1 : 1));
-    GLKMatrix4 viewMatrix = GLKMatrix4MakeLookAt(0, 0, 0.0, 0, 0, -1000, 0, 1, 0);
-    GLKMatrix4 projectionMatrix = GLKMatrix4MakePerspective(GLKMathDegreesToRadians(self.viewport.degress), aspect, 0.1f, 400.0f);
+
+    // view
+    GLKMatrix4 viewMatrix = GLKMatrix4MakeLookAt(0, 0, 0, 0, 0, -1000, 0, 1, 0);
+
+    // projection
+    GLKMatrix4 projectionMatrix = GLKMatrix4MakePerspective(GLKMathDegreesToRadians(90), aspect, 0.1f, 400.0f);
+
     GLKMatrix4 modelViewProjectionMatrix = GLKMatrix4Multiply(projectionMatrix, viewMatrix);
     modelViewProjectionMatrix = GLKMatrix4Multiply(modelViewProjectionMatrix, modelMatrix);
+
     *matrix1 = modelViewProjectionMatrix;
     self.lastMatrix1Available = YES;
     self.lastMatrix11 = modelViewProjectionMatrix;

diff --git a/scripts/do-compile-openssl.sh b/scripts/do-compile-openssl.sh
@@ -191,6 +191,7 @@ if [ -f "./Makefile" ]; then
     echo 'reuse configure'
 else
     echo "config: $OPENSSL_CFG_FLAGS"
+    export COMMAND_MODE=unix2003
     ./Configure \
         $OPENSSL_CFG_FLAGS
     make clean