Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
MasterArbeit
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kai Westerkamp
MasterArbeit
Commits
7f3cf6f8
Commit
7f3cf6f8
authored
Jul 24, 2017
by
wester
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed dirty
parent
f370cc4a
Pipeline
#265
passed with stage
in 27 seconds
Changes
4
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
3 deletions
+8
-3
.gitmodules
.gitmodules
+1
-0
example.pnts
3_PointCloud/example.pnts
+0
-0
glut.cpp
3_PointCloud/glut.cpp
+4
-0
main.cpp
3_PointCloud/main.cpp
+3
-3
No files found.
.gitmodules
View file @
7f3cf6f8
...
@@ -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
3_PointCloud/example.pnts
View file @
7f3cf6f8
No preview for this file type
3_PointCloud/glut.cpp
View file @
7f3cf6f8
...
@@ -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
);
...
...
3_PointCloud/main.cpp
View file @
7f3cf6f8
...
@@ -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.0
f
)
/
1000.0
f
;
float
KinectOriginOffsetX
=
((
92
+
73
)
/
2.0
f
)
/
1000.0
f
;
float
KinectOriginOffsetY
=
21
/
1000.0
f
;
float
KinectOriginOffsetY
=
21
/
1000.0
f
;
float
KinectSizeX
=
0.249
;
float
KinectSizeX
=
0.249
;
float
KinectSizeY
=
0.0
66
;
float
KinectSizeY
=
0.0
42
;
// 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.0
f
,
-
7.5
f
,
13.0
f
)
*
0.01
f
));
controlerToKinect
=
glm
::
translate
(
glm
::
mat4x4
(),
(
glm
::
vec3
(
-
4.0
f
,
-
7.5
f
,
13.0
f
)
*
0.01
f
));
float
dx
=
KinectOriginOffsetX
-
KinectSizeX
/
2
;
float
dx
=
KinectOriginOffsetX
-
KinectSizeX
/
2
;
float
dy
=
KinectSizeY
/
2
+
0.008
;
// dicke Halterung;
float
dy
=
KinectSizeY
/
2
.0
f
+
0.008
;
// dicke Halterung;
float
dz
=
0.0
37
f
+
0.02
;
//TODO - offset nach hinten;
float
dz
=
0.0
45
f
+
(
KinectSizeZ
-
(
0.066
/*halterung z*/
-
0.012
/*halterung ende*/
))
;
//TODO - offset nach hinten;
controlerToKinect
=
glm
::
translate
(
glm
::
mat4x4
(),
(
glm
::
vec3
(
0.0
f
,
0.0
f
,
0.173
/*controller*/
+
0.03
/*Halterung*/
)));
controlerToKinect
=
glm
::
translate
(
glm
::
mat4x4
(),
(
glm
::
vec3
(
0.0
f
,
0.0
f
,
0.173
/*controller*/
+
0.03
/*Halterung*/
)));
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment