fix: compile vr android files only on android

zilongshanren · Jun 6, 2016 · fb728da · fb728da
1 parent 90db6da
commit fb728da
Show file tree

Hide file tree

Showing 23 changed files with 278 additions and 12 deletions.
diff --git a/build/cocos2d_libs.xcodeproj/project.pbxproj b/build/cocos2d_libs.xcodeproj/project.pbxproj
diff --git a/cocos/Android.mk b/cocos/Android.mk
@@ -190,6 +190,19 @@ renderer/CCVertexIndexData.cpp \
 renderer/ccGLStateCache.cpp \
 renderer/CCFrameBuffer.cpp \
 renderer/ccShaders.cpp \
+vr/CCVRCardboardHeadTracker.cpp \
+vr/CCVRCardboardRenderer.cpp \
+vr/CCVRDeepoonHeadTracker.cpp \
+vr/CCVRDeepoonRenderer.cpp \
+vr/CCVRDistortion.cpp \
+vr/CCVRDistortionMesh.cpp \
+vr/CCVRGearVRHeadTracker.cpp \
+vr/CCVRGearVRRenderer.cpp \
+vr/CCVRGenericRenderer.cpp \
+vr/CCVRGvrHeadTracker.cpp \
+vr/CCVRGvrRenderer.cpp \
+vr/CCVROculusHeadTracker.cpp \
+vr/CCVROculusRenderer.cpp \
 deprecated/CCArray.cpp \
 deprecated/CCDeprecated.cpp \
 deprecated/CCDictionary.cpp \

diff --git a/cocos/CMakeLists.txt b/cocos/CMakeLists.txt
@@ -40,6 +40,7 @@ include(physics3d/CMakeLists.txt)
 include(math/CMakeLists.txt)
 include(navmesh/CMakeLists.txt)
 include(renderer/CMakeLists.txt)
+include(vr/CMakeLists.txt)
 include(base/CMakeLists.txt)
 include(deprecated/CMakeLists.txt)
 include(ui/CMakeLists.txt)
@@ -73,6 +74,7 @@ set(COCOS_SRC cocos2d.cpp
     ${COCOS_MATH_SRC}
     ${COCOS_NAVMESH_SRC}
     ${COCOS_RENDERER_SRC}
+    ${COCOS_VR_SRC}
     ${COCOS_BASE_SRC}
     ${COCOS_AUDIO_SRC}
     ${COCOS_UI_SRC}

diff --git a/cocos/vr/CCVRCardboardHeadTracker.cpp b/cocos/vr/CCVRCardboardHeadTracker.cpp
@@ -22,6 +22,10 @@
  THE SOFTWARE.
  ****************************************************************************/
 
+#include "platform/CCPlatformMacros.h"
+
+#if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID)
+
 #include "platform/CCPlatformMacros.h"
 #include "vr/CCVRCardboardHeadTracker.h"
 #include "vr/cardboard/CbApi_Helpers.h"
@@ -54,4 +58,6 @@ Mat4 VRCardboardHeadTracker::getLocalRotation()
     return viewMat;
 }
 
-NS_CC_END
+NS_CC_END
+
+#endif // (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID)
diff --git a/cocos/vr/CCVRCardboardHeadTracker.h b/cocos/vr/CCVRCardboardHeadTracker.h
@@ -22,6 +22,9 @@
  THE SOFTWARE.
  ****************************************************************************/
 
+#include "platform/CCPlatformMacros.h"
+#if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID)
+
 #include "vr/CCVRProtocol.h"
 #include "vr/cardboard/CbApi.h"
 #include "math/Vec3.h"
@@ -43,3 +46,5 @@ class CC_DLL VRCardboardHeadTracker : public VRIHeadTracker
 };
 
 NS_CC_END
+
+#endif // (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID)
diff --git a/cocos/vr/CCVRCardboardRenderer.cpp b/cocos/vr/CCVRCardboardRenderer.cpp
@@ -23,6 +23,8 @@
  ****************************************************************************/
 
 #include "platform/CCPlatformMacros.h"
+#if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID)
+
 #include "vr/CCVRCardboardRenderer.h"
 #include "vr/CCVRCardboardHeadTracker.h"
 #include "renderer/CCRenderer.h"
@@ -122,4 +124,6 @@ void VRCardboardRenderer::render(Scene* scene, Renderer* renderer)
     glViewport(viewport[0], viewport[1], viewport[2], viewport[3]);
 }
 
-NS_CC_END
+NS_CC_END
+
+#endif // (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID)
diff --git a/cocos/vr/CCVRCardboardRenderer.h b/cocos/vr/CCVRCardboardRenderer.h
@@ -22,6 +22,9 @@
  THE SOFTWARE.
  ****************************************************************************/
 
+#include "platform/CCPlatformMacros.h"
+#if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID)
+
 #include "vr/CCVRProtocol.h"
 #include "renderer/CCCustomCommand.h"
 #include "renderer/CCFrameBuffer.h"
@@ -53,3 +56,5 @@ class CC_DLL VRCardboardRenderer : public VRIRenderer
 };
 
 NS_CC_END
+
+#endif // (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID)
diff --git a/cocos/vr/CCVRDeepoonHeadTracker.cpp b/cocos/vr/CCVRDeepoonHeadTracker.cpp
@@ -23,8 +23,9 @@
  ****************************************************************************/
 
 #include "platform/CCPlatformMacros.h"
-#include "vr/CCVRDeepoonHeadTracker.h"
+#if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID)
 
+#include "vr/CCVRDeepoonHeadTracker.h"
 
 NS_CC_BEGIN
 
@@ -54,4 +55,6 @@ Mat4 VRDeepoonHeadTracker::getLocalRotation()
     return rotMat;
 }
 
-NS_CC_END
+NS_CC_END
+
+#endif // (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID)
diff --git a/cocos/vr/CCVRDeepoonHeadTracker.h b/cocos/vr/CCVRDeepoonHeadTracker.h
@@ -22,6 +22,9 @@
  THE SOFTWARE.
  ****************************************************************************/
 
+#include "platform/CCPlatformMacros.h"
+#if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID)
+
 #include "vr/CCVRProtocol.h"
 #include "deepoon/include/deepoon_sdk_native.h"
 #include "deepoon/include/deepoon_sdk_utils.h"
@@ -47,3 +50,5 @@ class CC_DLL VRDeepoonHeadTracker : public VRIHeadTracker
 };
 
 NS_CC_END
+
+#endif // (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID)
diff --git a/cocos/vr/CCVRDeepoonRenderer.cpp b/cocos/vr/CCVRDeepoonRenderer.cpp
@@ -23,6 +23,8 @@
  ****************************************************************************/
 
 #include "platform/CCPlatformMacros.h"
+#if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID)
+
 #include "vr/CCVRDeepoonRenderer.h"
 #include "vr/CCVRDeepoonHeadTracker.h"
 #include "renderer/CCRenderer.h"
@@ -305,4 +307,6 @@ void VRDeepoonRenderer::render(Scene* scene, Renderer* renderer)
     glViewport(viewport[0], viewport[1], viewport[2], viewport[3]);
 }
 
-NS_CC_END
+NS_CC_END
+
+#endif // (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID)
diff --git a/cocos/vr/CCVRDeepoonRenderer.h b/cocos/vr/CCVRDeepoonRenderer.h
@@ -22,6 +22,9 @@
  THE SOFTWARE.
  ****************************************************************************/
 
+#include "platform/CCPlatformMacros.h"
+#if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID)
+
 #include "vr/CCVRProtocol.h"
 #include "renderer/CCCustomCommand.h"
 #include "renderer/CCFrameBuffer.h"
@@ -68,3 +71,5 @@ class CC_DLL VRDeepoonRenderer : public VRIRenderer
 };
 
 NS_CC_END
+
+#endif // (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID)
diff --git a/cocos/vr/CCVRGearVRHeadTracker.cpp b/cocos/vr/CCVRGearVRHeadTracker.cpp
@@ -23,6 +23,8 @@
  ****************************************************************************/
 
 #include "platform/CCPlatformMacros.h"
+#if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID)
+
 #include "vr/CCVRGearVRHeadTracker.h"
 
 
@@ -60,4 +62,6 @@ void VRGearVRHeadTracker::applyTracking(double predictedDisplayTime)
     _tracking = vrapi_ApplyHeadModel(&headModelParms, &baseTracking);
 }
 
-NS_CC_END
+NS_CC_END
+
+#endif // (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID)
diff --git a/cocos/vr/CCVRGearVRHeadTracker.h b/cocos/vr/CCVRGearVRHeadTracker.h
@@ -22,6 +22,9 @@
  THE SOFTWARE.
  ****************************************************************************/
 
+#include "platform/CCPlatformMacros.h"
+#if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID)
+
 #include "vr/CCVRProtocol.h"
 #include "gearvr/include/VrApi.h"
 #include "gearvr/include/VrApi_Helpers.h"
@@ -49,3 +52,5 @@ class CC_DLL VRGearVRHeadTracker : public VRIHeadTracker
 };
 
 NS_CC_END
+
+#endif // (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID)
diff --git a/cocos/vr/CCVRGearVRRenderer.cpp b/cocos/vr/CCVRGearVRRenderer.cpp
@@ -23,6 +23,8 @@
  ****************************************************************************/
 
 #include "platform/CCPlatformMacros.h"
+#if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID)
+
 #include "vr/CCVRGearVRRenderer.h"
 #include "vr/CCVRGearVRHeadTracker.h"
 #include "renderer/CCRenderer.h"
@@ -312,4 +314,6 @@ void VRGearVRRenderer::render(Scene* scene, Renderer* renderer)
     vrapi_SubmitFrame(_ovr, &frameParms);
 }
 
-NS_CC_END
+NS_CC_END
+
+#endif // (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID)
diff --git a/cocos/vr/CCVRGearVRRenderer.h b/cocos/vr/CCVRGearVRRenderer.h
@@ -22,6 +22,9 @@
  THE SOFTWARE.
  ****************************************************************************/
 
+#include "platform/CCPlatformMacros.h"
+#if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID)
+
 #include "vr/CCVRProtocol.h"
 #include "renderer/CCCustomCommand.h"
 #include "renderer/CCFrameBuffer.h"
@@ -71,3 +74,5 @@ class CC_DLL VRGearVRRenderer : public VRIRenderer
 };
 
 NS_CC_END
+
+#endif // (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID)
diff --git a/cocos/vr/CCVRGvrHeadTracker.cpp b/cocos/vr/CCVRGvrHeadTracker.cpp
@@ -23,8 +23,9 @@
  ****************************************************************************/
 
 #include "platform/CCPlatformMacros.h"
-#include "vr/CCVRGvrHeadTracker.h"
+#if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID)
 
+#include "vr/CCVRGvrHeadTracker.h"
 
 NS_CC_BEGIN
 
@@ -59,4 +60,6 @@ void VRGvrHeadTracker::applyTracking(gvr::ClockTimePoint targetTime)
     _headPose = _gvrApiRef->GetHeadPoseInStartSpace(targetTime);
 }
 
-NS_CC_END
+NS_CC_END
+
+#endif // (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID)
diff --git a/cocos/vr/CCVRGvrHeadTracker.h b/cocos/vr/CCVRGvrHeadTracker.h
@@ -22,6 +22,9 @@
  THE SOFTWARE.
  ****************************************************************************/
 
+#include "platform/CCPlatformMacros.h"
+#if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID)
+
 #include "vr/CCVRProtocol.h"
 #include "gvr/include/gvr.h"
 #include "math/Vec3.h"
@@ -49,3 +52,5 @@ class CC_DLL VRGvrHeadTracker : public VRIHeadTracker
 };
 
 NS_CC_END
+
+#endif // (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID)
diff --git a/cocos/vr/CCVRGvrRenderer.cpp b/cocos/vr/CCVRGvrRenderer.cpp
@@ -23,6 +23,8 @@
  ****************************************************************************/
 
 #include "platform/CCPlatformMacros.h"
+#if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID)
+
 #include "vr/CCVRGvrRenderer.h"
 #include "vr/CCVRGvrHeadTracker.h"
 #include "renderer/CCRenderer.h"
@@ -190,4 +192,6 @@ void VRGvrRenderer::render(Scene* scene, Renderer* renderer)
     glViewport(viewport[0], viewport[1], viewport[2], viewport[3]);
 }
 
-NS_CC_END
+NS_CC_END
+
+#endif // (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID)
diff --git a/cocos/vr/CCVRGvrRenderer.h b/cocos/vr/CCVRGvrRenderer.h
@@ -22,6 +22,9 @@
  THE SOFTWARE.
  ****************************************************************************/
 
+#include "platform/CCPlatformMacros.h"
+#if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID)
+
 #include "vr/CCVRProtocol.h"
 #include "renderer/CCCustomCommand.h"
 #include "renderer/CCFrameBuffer.h"
@@ -55,3 +58,5 @@ class CC_DLL VRGvrRenderer : public VRIRenderer
 };
 
 NS_CC_END
+
+#endif // (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID)
diff --git a/cocos/vr/CCVROculusHeadTracker.cpp b/cocos/vr/CCVROculusHeadTracker.cpp
@@ -23,6 +23,8 @@
  ****************************************************************************/
 
 #include "platform/CCPlatformMacros.h"
+#if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID)
+
 #include "vr/CCVROculusHeadTracker.h"
 
 
@@ -57,4 +59,6 @@ void cocos2d::VROculusHeadTracker::applyTracking(double predictedDisplayTime)
     _tracking = ovr_GetTrackingState(_HMD, predictedDisplayTime, ovrTrue);
 }
 
-NS_CC_END
+NS_CC_END
+
+#endif // (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID)
diff --git a/cocos/vr/CCVROculusHeadTracker.h b/cocos/vr/CCVROculusHeadTracker.h
@@ -22,6 +22,9 @@
  THE SOFTWARE.
  ****************************************************************************/
 
+#include "platform/CCPlatformMacros.h"
+#if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID)
+
 #include "vr/CCVRProtocol.h"
 #include "oculus/ovr/OVR_CAPI.h"
 #include "math/Vec3.h"
@@ -49,3 +52,5 @@ class CC_DLL VROculusHeadTracker : public VRIHeadTracker
 };
 
 NS_CC_END
+
+#endif // (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID)
diff --git a/cocos/vr/CCVROculusRenderer.cpp b/cocos/vr/CCVROculusRenderer.cpp
@@ -22,6 +22,9 @@
  THE SOFTWARE.
  ****************************************************************************/
 
+#include "platform/CCPlatformMacros.h"
+#if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID)
+
 #include "platform/CCPlatformMacros.h"
 #include "vr/CCVROculusRenderer.h"
 #include "vr/CCVROculusHeadTracker.h"
@@ -360,4 +363,6 @@ void VROculusRenderer::render(Scene* scene, Renderer* renderer)
     glViewport(viewport[0], viewport[1], viewport[2], viewport[3]);
 }
 
-NS_CC_END
+NS_CC_END
+
+#endif // (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID)
diff --git a/cocos/vr/CCVROculusRenderer.h b/cocos/vr/CCVROculusRenderer.h
@@ -22,6 +22,9 @@
  THE SOFTWARE.
  ****************************************************************************/
 
+#include "platform/CCPlatformMacros.h"
+#if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID)
+
 #include "vr/CCVRProtocol.h"
 #include "renderer/CCCustomCommand.h"
 #include "renderer/CCFrameBuffer.h"
@@ -64,3 +67,5 @@ class CC_DLL VROculusRenderer : public VRIRenderer
 };
 
 NS_CC_END
+
+#endif // (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID)