Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-04 04:23:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added 'gyro look' option to have gyro drive your render yaw, added render menu.

Browse source
This commit is contained in:
Philip Rosedale 2013-04-23 13:31:05 -07:00
parent 90c56e796b
commit d550b09399
1 changed files with 28 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
interface/src/main.cpp
View file

@ -160,8 +160,10 @@ bool perfStatsOn = false; // Do we want to display perfStats?
int noiseOn = 0; // Whether to add random noise int noiseOn = 0; // Whether to add random noise
float noise = 1.0; // Overall magnitude scaling for random noise levels float noise = 1.0; // Overall magnitude scaling for random noise levels
bool gyroLook = false; // Whether to allow the gyro data from head to move your view
int displayLevels = 0; int displayLevels = 0;
bool lookingInMirror = 0; // Are we currently rendering one's own head as if in mirror? bool lookingInMirror = 0; // Are we currently rendering one's own head as if in mirror?
int displayField = 0; int displayField = 0;
int displayHeadMouse = 1; // Display sample mouse pointer controlled by head movement int displayHeadMouse = 1; // Display sample mouse pointer controlled by head movement
@ -476,31 +478,18 @@ void updateAvatar(float frametime)
headMouseY = min(headMouseY, HEIGHT); headMouseY = min(headMouseY, HEIGHT);
// Update render direction (pitch/yaw) based on measured gyro rates // Update render direction (pitch/yaw) based on measured gyro rates
const int MIN_YAW_RATE = 100; const float MIN_YAW_RATE = 5;
const int MIN_PITCH_RATE = 100; const float YAW_SENSITIVITY = 1.0;
const float YAW_SENSITIVITY = 0.02;
const float PITCH_SENSITIVITY = 0.05;
// Update render pitch and yaw rates based on keyPositions // If enabled, Update render pitch and yaw based on gyro data
const float KEY_YAW_SENSITIVITY = 2.0; if (::gyroLook)
if (myAvatar.getDriveKeys(ROT_LEFT)) renderYawRate -= KEY_YAW_SENSITIVITY*frametime;
if (myAvatar.getDriveKeys(ROT_RIGHT)) renderYawRate += KEY_YAW_SENSITIVITY*frametime;
if (fabs(gyroYawRate) > MIN_YAW_RATE)
{
if (gyroYawRate > 0)
renderYawRate += (gyroYawRate - MIN_YAW_RATE) * YAW_SENSITIVITY * frametime;
else
renderYawRate += (gyroYawRate + MIN_YAW_RATE) * YAW_SENSITIVITY * frametime;
}
if (fabs(gyroPitchRate) > MIN_PITCH_RATE)
{ {
if (gyroPitchRate > 0) if (fabs(gyroYawRate) > MIN_YAW_RATE) {
renderPitchRate += (gyroPitchRate - MIN_PITCH_RATE) * PITCH_SENSITIVITY * frametime; //if (fabs(myAvatar.getHeadYaw()) > MIN_YAW_ANGLE) {
else myAvatar.addBodyYaw(-gyroYawRate * YAW_SENSITIVITY * frametime);
renderPitchRate += (gyroPitchRate + MIN_PITCH_RATE) * PITCH_SENSITIVITY * frametime; }
} }
float renderPitch = myAvatar.getRenderPitch(); float renderPitch = myAvatar.getRenderPitch();
// Decay renderPitch toward zero because we never look constantly up/down // Decay renderPitch toward zero because we never look constantly up/down
renderPitch *= (1.f - 2.0*frametime); renderPitch *= (1.f - 2.0*frametime);
@ -1072,6 +1061,12 @@ int setNoise(int state) {
return iRet; return iRet;
} }
int setGyroLook(int state) {
int iRet = setValue(state, &::gyroLook);
std::cout << "gyro look" << ::gyroLook << "\n";
return iRet;
}
int setVoxels(int state) { int setVoxels(int state) {
return setValue(state, &::showingVoxels); return setValue(state, &::showingVoxels);
} }
@ -1190,16 +1185,20 @@ const char* getFrustumRenderModeName(int state) {
} }
void initMenu() { void initMenu() {
MenuColumn *menuColumnOptions, *menuColumnTools, *menuColumnDebug, *menuColumnFrustum; MenuColumn *menuColumnOptions, *menuColumnRender, *menuColumnTools, *menuColumnDebug, *menuColumnFrustum;
// Options // Options
menuColumnOptions = menu.addColumn("Options"); menuColumnOptions = menu.addColumn("Options");
menuColumnOptions->addRow("Mirror (h)", setHead); menuColumnOptions->addRow("Mirror (h)", setHead);
menuColumnOptions->addRow("Field (f)", setField); menuColumnOptions->addRow("Noise (n)", setNoise);
menuColumnOptions->addRow("(N)oise", setNoise); menuColumnOptions->addRow("Gyro Look", setGyroLook);
menuColumnOptions->addRow("(V)oxels", setVoxels); menuColumnOptions->addRow("Quit (q)", quitApp);
menuColumnOptions->addRow("Stars (*)", setStars);
menuColumnOptions->addRow("(Q)uit", quitApp);
// Render
menuColumnRender = menu.addColumn("Render");
menuColumnRender->addRow("Voxels (V)", setVoxels);
menuColumnRender->addRow("Stars (*)", setStars);
menuColumnRender->addRow("Field (f)", setField);
// Tools // Tools
menuColumnTools = menu.addColumn("Tools"); menuColumnTools = menu.addColumn("Tools");
menuColumnTools->addRow("Stats (/)", setStats); menuColumnTools->addRow("Stats (/)", setStats);