Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
L
lava-vr
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
lava
lava-vr
Commits
c1abeac4
Commit
c1abeac4
authored
6 years ago
by
Christian Mattes
Browse files
Options
Downloads
Patches
Plain Diff
Renamed FootElevation to FeetElevation to be more consistent with FeetPlacer
parent
25d2da36
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/lava-vr/FeetElevation.cc
+6
-6
6 additions, 6 deletions
src/lava-vr/FeetElevation.cc
src/lava-vr/FeetElevation.hh
+2
-2
2 additions, 2 deletions
src/lava-vr/FeetElevation.hh
with
8 additions
and
8 deletions
src/lava-vr/F
oo
tElevation.cc
→
src/lava-vr/F
ee
tElevation.cc
+
6
−
6
View file @
c1abeac4
#include
"F
oo
tElevation.hh"
#include
"F
ee
tElevation.hh"
#include
<glm/glm.hpp>
#include
<glm/glm.hpp>
#include
<glm/gtx/transform.hpp>
#include
<glm/gtx/transform.hpp>
#include
<lava/common/log.hh>
#include
<lava/common/log.hh>
...
@@ -7,22 +7,22 @@
...
@@ -7,22 +7,22 @@
namespace
lava
{
namespace
lava
{
namespace
vr
{
namespace
vr
{
F
oo
tElevation
::
Tri
::
Tri
(
glm
::
vec3
_a
,
glm
::
vec3
_b
,
glm
::
vec3
_c
)
F
ee
tElevation
::
Tri
::
Tri
(
glm
::
vec3
_a
,
glm
::
vec3
_b
,
glm
::
vec3
_c
)
:
a
(
_a
),
b
(
_b
),
c
(
_c
)
{
:
a
(
_a
),
b
(
_b
),
c
(
_c
)
{
// bbmin = glm::min(a, glm::min(b, c));
// bbmin = glm::min(a, glm::min(b, c));
// bbmax = glm::max(a, glm::min(b, c));
// bbmax = glm::max(a, glm::min(b, c));
}
}
F
oo
tElevation
::
Tri
transform
(
F
oo
tElevation
::
Tri
const
&
orig
,
F
ee
tElevation
::
Tri
transform
(
F
ee
tElevation
::
Tri
const
&
orig
,
glm
::
mat4
const
&
xf
)
{
glm
::
mat4
const
&
xf
)
{
const
auto
nt
=
glm
::
mat3x4
(
xf
);
const
auto
nt
=
glm
::
mat3x4
(
xf
);
const
auto
t
=
xf
[
3
];
const
auto
t
=
xf
[
3
];
return
F
oo
tElevation
::
Tri
(
nt
*
orig
.
a
+
t
,
//
return
F
ee
tElevation
::
Tri
(
nt
*
orig
.
a
+
t
,
//
nt
*
orig
.
b
+
t
,
//
nt
*
orig
.
b
+
t
,
//
nt
*
orig
.
c
+
t
);
nt
*
orig
.
c
+
t
);
}
}
F
oo
tElevation
::
F
oo
tElevation
(
F
ee
tElevation
::
F
ee
tElevation
(
const
VRMesh
&
mesh
,
const
VRMesh
&
mesh
,
std
::
array
<
lava
::
openvr
::
OpenVRController
*
,
2
>
feet
)
std
::
array
<
lava
::
openvr
::
OpenVRController
*
,
2
>
feet
)
:
mFeet
(
feet
)
{
:
mFeet
(
feet
)
{
...
@@ -60,7 +60,7 @@ glm::vec3 bary(glm::vec2 p, glm::vec2 a, glm::vec2 b, glm::vec2 c) {
...
@@ -60,7 +60,7 @@ glm::vec3 bary(glm::vec2 p, glm::vec2 a, glm::vec2 b, glm::vec2 c) {
glm
::
vec2
projy
(
glm
::
vec3
const
&
x
)
{
return
{
x
.
x
,
x
.
z
};
}
glm
::
vec2
projy
(
glm
::
vec3
const
&
x
)
{
return
{
x
.
x
,
x
.
z
};
}
glm
::
mat4
F
oo
tElevation
::
apply
(
glm
::
mat4
oldMatrix
)
{
glm
::
mat4
F
ee
tElevation
::
apply
(
glm
::
mat4
oldMatrix
)
{
std
::
array
<
glm
::
vec3
,
2
>
feet
=
{{{
mFeet
[
0
]
->
pose
()[
3
]},
//
std
::
array
<
glm
::
vec3
,
2
>
feet
=
{{{
mFeet
[
0
]
->
pose
()[
3
]},
//
{
mFeet
[
1
]
->
pose
()[
3
]}}};
{
mFeet
[
1
]
->
pose
()[
3
]}}};
...
...
This diff is collapsed.
Click to expand it.
src/lava-vr/F
oo
tElevation.hh
→
src/lava-vr/F
ee
tElevation.hh
+
2
−
2
View file @
c1abeac4
...
@@ -5,9 +5,9 @@
...
@@ -5,9 +5,9 @@
namespace
lava
{
namespace
lava
{
namespace
vr
{
namespace
vr
{
class
F
oo
tElevation
{
class
F
ee
tElevation
{
public:
public:
F
oo
tElevation
(
VRMesh
const
&
mesh
,
F
ee
tElevation
(
VRMesh
const
&
mesh
,
std
::
array
<
openvr
::
OpenVRController
*
,
2
>
feet
);
std
::
array
<
openvr
::
OpenVRController
*
,
2
>
feet
);
/// set the distance of the tracker from the floor when it's attached to a
/// set the distance of the tracker from the floor when it's attached to a
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment