Skip to content

Commit

Permalink
Fix setup wizard presets, add note for vcredist
Browse files Browse the repository at this point in the history
  • Loading branch information
@zmerp
zmerp committed Jul 25, 2020
1 parent b4e7e50 commit a057d47
Show file tree
Hide file tree
Showing 7 changed files with 66 additions and 33 deletions.
2 changes: 2 additions & 0 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ This is a fork of [ALVR](https://github.com/polygraphene/ALVR) that works only w

Please uninstall any other VR streaming software on your PC. This includes versions of ALVR prior to v12.0.

Install the latest [Visual C++ Redistrubutable x64 package](https://support.microsoft.com/en-us/help/2977003/the-latest-supported-visual-c-downloads). Do this every time you install a new ALVR version!

To install ALVR just download and unzip `alvr_server_windows.zip` wherever you want and launch `ALVR.exe`. It's important not to move the folder after the first launch.
To keep settings from a previous installation of ALVR (>=v12.0) you can unzip over the old installation folder.

Expand Down
2 changes: 1 addition & 1 deletion alvr/web_server/src/main.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ use logging_backend::*;
use settings_schema::Switch;
use std::{
path::PathBuf,
sync::{Arc, Mutex, atomic::*},
sync::{Arc, Mutex},
time::SystemTime,
};
use tail::tail_stream;
Expand Down
2 changes: 1 addition & 1 deletion server_release_template/web_gui/js/app/nls/it-it/wizard.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ define({
"titlePerformance" : "Impostazioni per la performance",
"textPerformance" : "Scegli la modalità più adatta al tuo PC. Verrano impostati alcuni valori in automatico.",
"compatPerformance" :"Compatibilità",
"perfPerformance" : "Performance",
"qualityPerformance" : "Qualità visuale",
"titleFinished": "Finito",
"textFinished":`Potrai ricomiciare questa guida dalla sezione "Installazione" a sinistra`,
"buttonNext" :"Avanti",
Expand Down
10 changes: 5 additions & 5 deletions server_release_template/web_gui/js/app/nls/wizard.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@ define({
"buttonDriver" : "Register driver",
"titleTracking" : "Tracking",
"textTracking" : "How should the tracking of the controller be handled.If you plan on playing fast paced games like Beatsaber, choose medium or fast. For slower games like Skyrim leave it on normal.",
"normalTracking" : "normal",
"mediumTracking" :"medium",
"fastTracking" : "fast",
"normalTracking" : "Normal",
"mediumTracking" :"Medium",
"fastTracking" : "Fast",
"titlePerformance" : "Performance preset",
"textPerformance" : "Please choose preset that fits your setup. This will adjust some settings for you.",
"compatPerformance" :"compatibility",
"perfPerformance" : "performance",
"compatPerformance" :"Compatibility",
"qualityPerformance" : "Visual quality",
"titleFinished": "Finished",
"textFinished":"You can always restart this wizard from the \"Installation\" tab on the left",
"buttonNext" :"Next",
Expand Down
46 changes: 37 additions & 9 deletions server_release_template/web_gui/js/app/setupWizard.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,37 +66,65 @@ define([
$(".poseOffsetButton").change((ev) => {
var target = $(ev.target);

//IDs depend on the schema!
var poseTimeOffsetTarget = $("#_root_headset_controllers_content_poseTimeOffset");

switch (target.attr("value")) {
case "normal":
$("#root_Main_headset_controllers_content_poseTimeOffset").val("0.01")
poseTimeOffsetTarget.val("0.01");
break;
case "medium":
$("#root_Main_headset_controllers_content_poseTimeOffset").val("0")
poseTimeOffsetTarget.val("0");
break;
case "fast":
$("#root_Main_headset_controllers_content_poseTimeOffset").val("-1")
poseTimeOffsetTarget.val("-1");
break;
default:
break;
}
alvrSettings.storeParam(poseTimeOffsetTarget);

console.log(target.attr("value"))
})

$(".performanceOptions").change((ev) => {
var target = $(ev.target);

//IDs depend on the schema!
var resolutionTarget = $("#_root_video_renderResolution_scale-choice-");
resolutionTarget.prop("checked", true);
alvrSettings.storeParam(resolutionTarget);

var resolutionScaleTarget = $("#_root_video_renderResolution_scale");
var enableFfrTarget = $("#_root_video_foveatedRendering_enabled");
var ffrStrengthTarget = $("#_root_video_foveatedRendering_content_strength");
var bitrateTarget = $("#_root_video_encodeBitrateMbs");

switch (target.attr("value")) {
case "compatibility":
//TODO: add compat options
resolutionScaleTarget.val(0.75);
bitrateTarget.val(15);
enableFfrTarget.prop("checked", true);
ffrStrengthTarget.val(2);

var h264CodecTarget = $("#_root_video_codec_H264-choice-");
h264CodecTarget.prop("checked", true);
alvrSettings.storeParam(h264CodecTarget);
break;
case "performance":
//TODO: add performance options
case "visual_quality":
resolutionScaleTarget.val(1);
bitrateTarget.val(40);
enableFfrTarget.prop("checked", false);

var hevcCodecTarget = $("#_root_video_codec_HEVC-choice-");
hevcCodecTarget.prop("checked", true);
alvrSettings.storeParam(hevcCodecTarget);
break;

default:
break;
}
alvrSettings.storeParam(resolutionScaleTarget);
alvrSettings.storeParam(enableFfrTarget);
alvrSettings.storeParam(ffrStrengthTarget);
alvrSettings.storeParam(bitrateTarget);

console.log(target.attr("value"))
})
Expand Down
2 changes: 1 addition & 1 deletion server_release_template/web_gui/js/app/templates/wizard.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
flex-direction: column;
}

#poseOffsetGroup label input {
.btn-group label input {
display: none;
}

Expand Down
35 changes: 19 additions & 16 deletions server_release_template/web_gui/js/app/templates/wizard.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,20 +35,22 @@ <h6><%= titleDriver %></h6>
<div>
<h6><%= titleTracking %></h6>
<%= textTracking %>

</div>
<div class="wizzardSettings">
<div id="poseOffsetGroup" class="btn-group" data-toggle="buttons">
<label class="btn btn-primary active">
<input type="radio" name="poseOffset" class="poseOffsetButton" value="normal"
autocomplete="off" checked> <%= normalTracking %>
<div class="btn-group" data-toggle="buttons">
<label class="btn btn-primary">
<input type="radio" class="poseOffsetButton" autocomplete="off" value="normal">
<%= normalTracking %>
</label>
<label class="btn btn-primary">
<input type="radio" name="poseOffset" class="poseOffsetButton" autocomplete="off"
value="medium"> <%= mediumTracking %> </label>
<input type="radio" class="poseOffsetButton" autocomplete="off" value="medium">
<%= mediumTracking %>
</label>
<label class="btn btn-primary">
<input type="radio" name="poseOffset" class="poseOffsetButton" autocomplete="off"
value="fast"> <%= fastTracking %> </label>
<input type="radio" class="poseOffsetButton" autocomplete="off" value="fast">
<%= fastTracking %>
</label>
</div>
</div>
</div>
Expand All @@ -59,22 +61,23 @@ <h6><%= titlePerformance %></h6>
<%= textPerformance %>
</div>
<div class="wizzardSettings">
<div id="poseOffsetGroup" class="btn-group" data-toggle="buttons">
<label class="btn btn-primary active">
<input type="radio" name="performanceOptions" class="performaceOffsetButton"
autocomplete="off" checked value="compatibility"> <%= compatPerformance %>
<div class="btn-group" data-toggle="buttons">
<label class="btn btn-primary">
<input type="radio" class="performanceOptions" autocomplete="off" value="compatibility">
<%= compatPerformance %>
</label>
<label class="btn btn-primary">
<input type="radio" name="performanceOptions" class="performaceOffsetButton"
autocomplete="off" value="performance"> <%= perfPerformance %> </label>
<input type="radio" class="performanceOptions" autocomplete="off" value="visual_quality">
<%= qualityPerformance %>
</label>
</div>
</div>
</div>

<div class="wizardContent" style="display: none;">
<div>
<h6><%= titleFinished %></h6>
<%= textFinished %>
<%= textFinished %>
</div>
</div>

Expand Down

0 comments on commit a057d47

Please sign in to comment.