Skip to content
Permalink
Browse files
minimal fix concerning camera position
  • Loading branch information
Daniel Bisig committed Jan 4, 2022
1 parent 8b24a81 commit 3d5f150d93f86e3056e11a1af2ce8c8baeea3979
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 10 deletions.
@@ -1,5 +1,5 @@
{
"mocapFileName": "/Users/dbisig/Projects/E2-Create/Software/Tools/MocapPlayer_v3/bin/data/MUR_Fluidity_1Arm_01_mb_proc.json",
"mocapFileName": "data/Zachary_Chant_005.json",
"oscSendAddress": "127.0.0.1",
"oscSendPort": 9003
}
@@ -121,6 +121,7 @@ void ofApp::mouseScrolled(int x, int y, float scrollX, float scrollY)
//std::cout << "scrollX " << scrollX << " scrollY " << scrollY << "\n";

mCameraDistance += scrollY * 10.0;

updateCamera();
}

@@ -538,18 +539,16 @@ ofApp::displayGraphics() throw (dab::Exception)
void
ofApp::updateCamera()
{
float zOffset = 100.0;

glm::vec3 cameraPos(0.0, 0.0, 0.0);
cameraPos.x = cos(mCameraAzumith) * sin(mCameraElevation) * mCameraDistance;
cameraPos.y = sin(mCameraAzumith) * sin(mCameraElevation) * mCameraDistance;
cameraPos.z = cos(mCameraElevation) * mCameraDistance;

cameraPos.z += mCameraVerticalOffset;
cameraPos.y += mCameraVerticalOffset;
cameraPos.z += mCameraDistance;

mCamera->setPosition(cameraPos);
mCamera->lookAt(ofVec3f(0.0, 0.0, mCameraVerticalOffset), ofVec3f(0.0, 0.0, 1.0));
//mCamera->lookAt(ofVec3f(0.0, 200.0, 0.0), ofVec3f(0.0, 1.0, 0.0));
mCamera->lookAt(ofVec3f(0.0, mCameraVerticalOffset, 0.0), ofVec3f(0.0, 0.0, 1.0));
mCamera->setFov(20.0);

std::cout << "mCameraAzumith " << mCameraAzumith << " mCameraElevation " << mCameraElevation << " mCameraDistance " << mCameraDistance << "\n";
@@ -85,10 +85,10 @@ class ofApp : public ofBaseApp, public dab::OscListener, public dab::UpdateListe
// camera
bool mMouseDragActive = false;
glm::vec2 mMouseDragStartPos;
float mCameraVerticalOffset = 90.0;
float mCameraAzumith = PI;
float mCameraElevation = PI / 2.0;
float mCameraDistance = 1000.0;
float mCameraVerticalOffset = 200.0;
float mCameraAzumith = -PI/2.0; // for Muriel Mocap: PI
float mCameraElevation = 0.001; // for Muriel Mocap: PI / 2.0
float mCameraDistance = 800.0; // for Muriel Mocap: 1000.0

float mMocapFPS = 50;
int mSeqIndex = 0;

0 comments on commit 3d5f150

Please sign in to comment.