Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Focus Plus support #1149

Merged
merged 4 commits into from
May 6, 2019
Merged

Focus Plus support #1149

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
634a19f
Add Focus Plus support
bluemarvin May 1, 2019
d6212e7
Add Focus Plus controller model and fix view reset
May 2, 2019
28c3a19
Fix controllers for immersive mode
May 2, 2019
5b27764
Fix grip button with immersive mode
bluemarvin May 3, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/src/main/cpp/BrowserWorld.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,8 +342,8 @@ BrowserWorld::State::UpdateControllers(bool& aRelayoutWidgets) {
continue;
}

vrb::Vector start = controller.transformMatrix.MultiplyPosition(vrb::Vector());
vrb::Vector direction = controller.transformMatrix.MultiplyDirection(vrb::Vector(0.0f, 0.0f, -1.0f));
vrb::Vector start = controller.transformMatrix.MultiplyPosition(controller.beamTransformMatrix.MultiplyPosition(vrb::Vector()));
vrb::Vector direction = controller.transformMatrix.MultiplyDirection(controller.beamTransformMatrix.MultiplyDirection(vrb::Vector(0.0f, 0.0f, -1.0f)));
WidgetPtr hitWidget;
float hitDistance = farClip;
vrb::Vector hitPoint;
Expand Down
1 change: 1 addition & 0 deletions app/src/main/cpp/ControllerContainer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,7 @@ ControllerContainer::CreateController(const int32_t aControllerIndex, const int3
Controller& controller = m.list[aControllerIndex];
controller.index = aControllerIndex;
controller.immersiveName = aImmersiveName;
controller.beamTransformMatrix = aBeamTransform;
if (!controller.transform && (aModelIndex >= 0)) {
m.SetUpModelsGroup(aModelIndex);
CreationContextPtr create = m.context.lock();
Expand Down
34 changes: 34 additions & 0 deletions app/src/wavevr/assets/vr_controller_focus_plus.mtl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
# Blender MTL File: 'None'
# Material Count: 3

newmtl Battery
Ns 94.117647
Ka 1.000000 1.000000 1.000000
Kd 0.624000 0.399360 0.605280
Ks 0.500000 0.500000 0.500000
Ke 0.000000 0.000000 0.000000
Ni 1.000000
d 1.000000
illum 2
map_Kd vr_controller_focus_plus_disable.png

newmtl MI6_texture01
Ns 94.117647
Ka 1.000000 1.000000 1.000000
Kd 0.744000 0.744000 0.744000
Ks 0.500000 0.500000 0.500000
Ke 0.000000 0.000000 0.000000
Ni 1.000000
d 1.000000
illum 2
map_Kd vr_controller_focus_plus.png

newmtl TouchPad_Touch
Ns 94.117647
Ka 1.000000 1.000000 1.000000
Kd 0.089600 0.584960 0.640000
Ks 0.500000 0.500000 0.500000
Ke 0.000000 0.000000 0.000000
Ni 1.000000
d 1.000000
illum 2