Begin work on rotation via touch, rework file structure
Simon Leistikow
6 years ago
parent
8d8b4dad4b
commit
3fbf5b67ec
@ -0,0 +1,136 @@
|
||||
package de.trac.spherical.rendering;
|
||||
|
||||
import android.content.Context;
|
||||
import android.graphics.Bitmap;
|
||||
import android.hardware.Sensor;
|
||||
import android.hardware.SensorEvent;
|
||||
import android.hardware.SensorEventListener;
|
||||
import android.hardware.SensorManager;
|
||||
import android.opengl.GLSurfaceView;
|
||||
import android.opengl.Matrix;
|
||||
import android.os.Build;
|
||||
import android.view.MotionEvent;
|
||||
|
||||
/**
|
||||
* This SurfaceView implementation is the glue between the PhotoSphereRenderer and any input event.
|
||||
*/
|
||||
public class PhotoSphereSurfaceView extends GLSurfaceView implements SensorEventListener {
|
||||
|
||||
public static boolean USE_TOUCH = false; // TODO: determine dynamically
|
||||
|
||||
// The actual rotation matrix determined by user input.
|
||||
private final float rotationMatrix [] = new float[16];
|
||||
|
||||
// These vectors Are used for ray determination.
|
||||
private final float rayStart [] = new float[4];
|
||||
private final float rayDirection [] = new float[4];
|
||||
|
||||
// The renderer used by this view.
|
||||
private PhotoSphereRenderer renderer;
|
||||
|
||||
/**
|
||||
* Constructor. Initializes Renderer.
|
||||
* @param context application context
|
||||
*/
|
||||
public PhotoSphereSurfaceView(Context context) {
|
||||
super(context);
|
||||
|
||||
// Initialize transformation matrix.
|
||||
Matrix.setIdentityM(rotationMatrix, 0);
|
||||
|
||||
// Initialize sensors.
|
||||
SensorManager manager = (SensorManager) context.getSystemService(Context.SENSOR_SERVICE);
|
||||
Sensor sensor;
|
||||
if (Build.VERSION.SDK_INT >= 18) {
|
||||
sensor = manager.getSensorList(Sensor.TYPE_GAME_ROTATION_VECTOR).get(0);
|
||||
} else {
|
||||
sensor = manager.getSensorList(Sensor.TYPE_ROTATION_VECTOR).get(0);
|
||||
}
|
||||
manager.registerListener(this, sensor, SensorManager.SENSOR_DELAY_GAME);
|
||||
|
||||
// Initialize renderer.
|
||||
renderer = new PhotoSphereRenderer(this);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean onTouchEvent(MotionEvent event) {
|
||||
|
||||
if(!USE_TOUCH)
|
||||
return true;
|
||||
|
||||
switch (event.getAction()) {
|
||||
case MotionEvent.ACTION_MOVE:
|
||||
|
||||
// Retrieve ray in world space.
|
||||
renderer.getRay(event.getX(), event.getY(), rayStart, rayDirection);
|
||||
|
||||
// Solve quadric equation.
|
||||
float a = 0.0f, b = 0.0f, c = 0.0f;
|
||||
for(int i=0; i<3; i++) {
|
||||
a += rayDirection[i] * rayDirection[i];
|
||||
b += rayDirection[i] * 2.0f * (rayStart[i]); // Sphere center at origin.
|
||||
c += rayStart[i]*rayStart[i];
|
||||
}
|
||||
c -= PhotoSphereRenderer.SPHERE_RADIUS*PhotoSphereRenderer.SPHERE_RADIUS;
|
||||
float D = b*b-4.0f*a*c;
|
||||
|
||||
// Since the conditions are
|
||||
if(D < 0) {
|
||||
throw new RuntimeException("Ray must intersect with sphere, check camera position");
|
||||
}
|
||||
|
||||
D = (float) Math.sqrt(D);
|
||||
|
||||
// Calculate intersection point p.
|
||||
float t = -0.5f*(b+D)/a;
|
||||
float px = rayStart[0] + t*rayDirection[0];
|
||||
float py = rayStart[1] + t*rayDirection[1];
|
||||
float pz = rayStart[2] + t*rayDirection[2];
|
||||
|
||||
// Calculate angles.
|
||||
//float angleX = (float) Math.toDegrees(Math.atan2(py, px));
|
||||
//float angleY = (float) Math.toDegrees(Math.acos(pz/Matrix.length(px, py, pz)));
|
||||
|
||||
synchronized (rotationMatrix) {
|
||||
Matrix.setLookAtM(rotationMatrix, 0, 0.0f, 0.0f, 0.0f, px, py, pz, 1.0f, 0.0f, 0.0f);
|
||||
}
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onAccuracyChanged(Sensor s, int arg1) {
|
||||
// unused
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onSensorChanged(SensorEvent event) {
|
||||
|
||||
if(USE_TOUCH)
|
||||
return;
|
||||
|
||||
synchronized (rotationMatrix) {
|
||||
SensorManager.getRotationMatrixFromVector(rotationMatrix, event.values);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns a matrix representing the devices rotation.
|
||||
* This function is thread safe.
|
||||
* @return rotation matrix according to device rotation
|
||||
*/
|
||||
public float [] getRotationMatrix() {
|
||||
synchronized (rotationMatrix) {
|
||||
return rotationMatrix;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets the bitmap to be rendered by the internal renderer.
|
||||
* @param bitmap bitmap to be rendered
|
||||
*/
|
||||
public void setBitmap(Bitmap bitmap) {
|
||||
renderer.requestBitmapUpload(bitmap);
|
||||
}
|
||||
}
|
||||
@ -1,101 +0,0 @@
|
||||
package de.trac.spherical.rendering;
|
||||
|
||||
import android.content.Context;
|
||||
import android.hardware.Sensor;
|
||||
import android.hardware.SensorEvent;
|
||||
import android.hardware.SensorEventListener;
|
||||
import android.hardware.SensorManager;
|
||||
import android.opengl.GLSurfaceView;
|
||||
import android.opengl.Matrix;
|
||||
import android.os.Build;
|
||||
import android.view.MotionEvent;
|
||||
|
||||
/**
|
||||
* This SurfaceView implementation is the glue between the Renderer and any input event.
|
||||
*/
|
||||
public class SphereSurfaceView extends GLSurfaceView implements SensorEventListener {
|
||||
|
||||
public static boolean USE_TOUCH = false; // TODO: determine dynamically
|
||||
|
||||
private final float TOUCH_SCALE_FACTOR = 180.0f / 1080;
|
||||
private float previousX;
|
||||
private float previousY;
|
||||
|
||||
// The actual rotation matrix determined by user input.
|
||||
private final float rotationMatrix [] = new float[16];
|
||||
|
||||
public SphereSurfaceView(Context context) {
|
||||
super(context);
|
||||
|
||||
Matrix.setIdentityM(rotationMatrix, 0);
|
||||
|
||||
SensorManager manager = (SensorManager) context.getSystemService(Context.SENSOR_SERVICE);
|
||||
Sensor sensor;
|
||||
if (Build.VERSION.SDK_INT >= 18) {
|
||||
sensor = manager.getSensorList(Sensor.TYPE_GAME_ROTATION_VECTOR).get(0);
|
||||
} else {
|
||||
sensor = manager.getSensorList(Sensor.TYPE_ROTATION_VECTOR).get(0);
|
||||
}
|
||||
manager.registerListener(this, sensor, SensorManager.SENSOR_DELAY_GAME);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean onTouchEvent(MotionEvent event) {
|
||||
|
||||
if(!USE_TOUCH)
|
||||
return true;
|
||||
|
||||
float x = event.getX();
|
||||
float y = event.getY();
|
||||
|
||||
switch (event.getAction()) {
|
||||
case MotionEvent.ACTION_MOVE:
|
||||
|
||||
float dx = x - previousX;
|
||||
float dy = y - previousY;
|
||||
|
||||
if (y > getHeight() / 2)
|
||||
dx = dx * -1 ;
|
||||
|
||||
if (x < getWidth() / 2)
|
||||
dy = dy * -1 ;
|
||||
|
||||
synchronized (rotationMatrix) {
|
||||
Matrix.rotateM(rotationMatrix, 0, dy * TOUCH_SCALE_FACTOR, 1.0f, 0.0f, 0.0f);
|
||||
Matrix.rotateM(rotationMatrix, 0, dx * TOUCH_SCALE_FACTOR, 0.0f, 1.0f, 0.0f);
|
||||
}
|
||||
}
|
||||
|
||||
previousX = x;
|
||||
previousY = y;
|
||||
return true;
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onAccuracyChanged(Sensor s, int arg1) {
|
||||
// unused
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onSensorChanged(SensorEvent event) {
|
||||
|
||||
if(USE_TOUCH)
|
||||
return;
|
||||
|
||||
synchronized (rotationMatrix) {
|
||||
SensorManager.getRotationMatrixFromVector(rotationMatrix, event.values);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns a matrix representing the devices rotation.
|
||||
* This function is thread safe.
|
||||
* @return rotation matrix according to device rotation
|
||||
*/
|
||||
public float [] getRotationMatrix() {
|
||||
synchronized (rotationMatrix) {
|
||||
return rotationMatrix;
|
||||
}
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue