Commit 7f3cf6f8 by wester

fixed dirty

parent f370cc4a
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
[submodule "3d-tiles-samples"] [submodule "3d-tiles-samples"]
path = 3d-tiles-samples path = 3d-tiles-samples
url = https://github.com/AnalyticalGraphicsInc/3d-tiles-samples.git url = https://github.com/AnalyticalGraphicsInc/3d-tiles-samples.git
ignore = untracked
[submodule "openvr"] [submodule "openvr"]
path = openvr path = openvr
url = https://github.com/ValveSoftware/openvr.git url = https://github.com/ValveSoftware/openvr.git
...@@ -16,6 +16,10 @@ bool init(int argc, char* argv[]) { ...@@ -16,6 +16,10 @@ bool init(int argc, char* argv[]) {
glutInitWindowSize(width,height); glutInitWindowSize(width,height);
glutCreateWindow("Kinect VR Point Cloud"); glutCreateWindow("Kinect VR Point Cloud");
glEnable(GL_DEPTH_TEST);
glDepthMask(GL_TRUE);
glDepthFunc(GL_LESS);
glutKeyboardFunc(keyPressed); glutKeyboardFunc(keyPressed);
glutIgnoreKeyRepeat(1); glutIgnoreKeyRepeat(1);
glutKeyboardUpFunc(keyReleased); glutKeyboardUpFunc(keyReleased);
......
...@@ -62,7 +62,7 @@ ICoordinateMapper* mapper; // Converts between depth, color, and 3d coor ...@@ -62,7 +62,7 @@ ICoordinateMapper* mapper; // Converts between depth, color, and 3d coor
float KinectOriginOffsetX = ((92 + 73) / 2.0f) / 1000.0f; float KinectOriginOffsetX = ((92 + 73) / 2.0f) / 1000.0f;
float KinectOriginOffsetY = 21 / 1000.0f; float KinectOriginOffsetY = 21 / 1000.0f;
float KinectSizeX = 0.249; float KinectSizeX = 0.249;
float KinectSizeY = 0.066; float KinectSizeY = 0.042; // 42 mm, 66mm ist die gesammthhe
float KinectSizeZ = 0.067; float KinectSizeZ = 0.067;
//Vive Tracking //Vive Tracking
...@@ -544,8 +544,8 @@ int main(int argc, char* argv[]) { ...@@ -544,8 +544,8 @@ int main(int argc, char* argv[]) {
controlerToKinect = glm::translate(glm::mat4x4(), (glm::vec3(-4.0f, -7.5f, 13.0f)*0.01f)); controlerToKinect = glm::translate(glm::mat4x4(), (glm::vec3(-4.0f, -7.5f, 13.0f)*0.01f));
float dx = KinectOriginOffsetX - KinectSizeX/ 2; float dx = KinectOriginOffsetX - KinectSizeX/ 2;
float dy = KinectSizeY / 2 + 0.008; // dicke Halterung; float dy = KinectSizeY / 2.0f + 0.008; // dicke Halterung;
float dz = 0.037f +0.02; //TODO - offset nach hinten; float dz = 0.045f +(KinectSizeZ-(0.066 /*halterung z*/-0.012 /*halterung ende*/)); //TODO - offset nach hinten;
controlerToKinect = glm::translate(glm::mat4x4(), (glm::vec3(0.0f, 0.0f,0.173 /*controller*/+0.03 /*Halterung*/ ))); controlerToKinect = glm::translate(glm::mat4x4(), (glm::vec3(0.0f, 0.0f,0.173 /*controller*/+0.03 /*Halterung*/ )));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment