add cardboard M & T mode.

Author: ashqal

app/src/main/java/com/asha/md360player4android/MD360PlayerActivity.java

@@ -52,6 +52,7 @@ public abstract class MD360PlayerActivity extends Activity {
         sInteractiveMode.put(MDVRLibrary.INTERACTIVE_MODE_TOUCH,"TOUCH");
         sInteractiveMode.put(MDVRLibrary.INTERACTIVE_MODE_MOTION_WITH_TOUCH,"M & T");
         sInteractiveMode.put(MDVRLibrary.INTERACTIVE_MODE_CARDBORAD_MOTION,"CARDBOARD M");
+        sInteractiveMode.put(MDVRLibrary.INTERACTIVE_MODE_CARDBORAD_MOTION_WITH_TOUCH,"CARDBOARD M&T");
 
         sProjectionMode.put(MDVRLibrary.PROJECTION_MODE_SPHERE,"SPHERE");
         sProjectionMode.put(MDVRLibrary.PROJECTION_MODE_DOME180,"DOME 180");

vrlib/src/main/java/com/asha/vrlib/MDVRLibrary.java

@@ -50,6 +50,7 @@ public class MDVRLibrary {
     public static final int INTERACTIVE_MODE_TOUCH = 2;
     public static final int INTERACTIVE_MODE_MOTION_WITH_TOUCH = 3;
     public static final int INTERACTIVE_MODE_CARDBORAD_MOTION = 4;
+    public static final int INTERACTIVE_MODE_CARDBORAD_MOTION_WITH_TOUCH = 5;
 
     // display mode
     public static final int DISPLAY_MODE_NORMAL = 101;

vrlib/src/main/java/com/asha/vrlib/strategy/interactive/CardboardMTStrategy.java

@@ -0,0 +1,30 @@
+package com.asha.vrlib.strategy.interactive;
+
+import android.content.res.Resources;
+
+import com.asha.vrlib.MD360Director;
+
+/**
+ * Created by hzqiujiadi on 16/10/13.
+ * hzqiujiadi ashqalcn@gmail.com
+ */
+public class CardboardMTStrategy extends CardboardMotionStrategy {
+
+    private static final float sDensity =  Resources.getSystem().getDisplayMetrics().density;
+
+    private static final float sDamping = 0.2f;
+
+    public CardboardMTStrategy(InteractiveModeManager.Params params) {
+        super(params);
+    }
+
+    @Override
+    public boolean handleDrag(int distanceX, int distanceY) {
+        for (MD360Director director : getDirectorList()){
+            director.setDeltaX(director.getDeltaX() - distanceX / sDensity * sDamping);
+            director.setDeltaY(director.getDeltaY() - distanceY / sDensity * sDamping);
+        }
+        return false;
+    }
+
+}

vrlib/src/main/java/com/asha/vrlib/strategy/interactive/InteractiveModeManager.java

@@ -52,6 +52,8 @@ protected AbsInteractiveStrategy createStrategy(int mode) {
                 return new MotionWithTouchStrategy(mParams);
             case MDVRLibrary.INTERACTIVE_MODE_CARDBORAD_MOTION:
                 return new CardboardMotionStrategy(mParams);
+            case MDVRLibrary.INTERACTIVE_MODE_CARDBORAD_MOTION_WITH_TOUCH:
+                return new CardboardMTStrategy(mParams);
             case MDVRLibrary.INTERACTIVE_MODE_TOUCH:
             default:
                 return new TouchStrategy(mParams);