Commit Graph
880 Commits
Author SHA1 Message Date
Vasily 148acf08ef Prefix OverlayController TabController members with m_ 2019-01-11 23:04:57 +01:00
Vasily d4fbdf5877 Prefix additional member variables in OverlayController with m_ 2019-01-11 23:04:56 +01:00
Vasily 65d1c8da38 Prefix desktopMode and noSound member vars with m_
This keeps consistency with the rest of the class and reduces possible
confusion, especially when member vars and parameters have the same
name.
2019-01-11 23:04:56 +01:00
Vasily 6ce10bd2f0 Change OverlayController from singleton pattern to regular RAII
The singleton pattern was poorly implemented and didn't provide the
benefits usually associated with the singleton pattern, with all the
negatives.

Refer to this github issue:
https://github.com/OpenVR-Advanced-Settings/OpenVR-AdvancedSettings/issues/29
2019-01-11 23:04:55 +01:00
Robin Appelman 227757bd5c Merge pull request #33 from OpenVR-Advanced-Settings/AudioDeviceChangedFix
Fixed audio devices swapping on device hw changes
2019-01-11 19:00:45 +01:00
Kung-vr a55b127366 Fixed audio devices swapping on device hw changes
When audio devices connected or disconnected from the system, the default audio device swapped around. This was because of QML setting index 0 on ComboBox.model changes. onCurrentIndexChanged was calling setPlaybackDeviceIndex() / mirrorDevice/ micDevice etc... in the audio tab controller and actively setting the audio device index to 0 momentarily. Changing onCurrentIndexChanged to onActivated allows the ComboBox to only actively command the audio tab controller in direct response to user interaction.
2019-01-12 00:33:55 +09:00
Kung-vr ad93d4265d Improved Valve Knuckles PTT trigger feel (#32) 2019-01-10 12:00:39 -06:00
Robin Appelman 697e95dffc Merge pull request #30 from OpenVR-Advanced-Settings/SSReproFix
SteamVR tab update.
2019-01-10 15:36:52 +01:00
ykeara ed8587703e updated documentation minor formatting change in QML 2019-01-09 20:50:50 -06:00
ykeara 15fa0ac47a fixed naming bug in QML and formatted/cleaned up 2019-01-09 20:32:39 -06:00
ykeara 813a2b1d3f removed compositor super sampling added error checking for motion smoothing 2019-01-09 20:03:41 -06:00
ykeara 454131f0a0 replaced locally created api keys with proper api keys 2019-01-09 19:25:14 -06:00
ykeara b374ff42f5 cleaned up dead code 2019-01-08 22:46:30 -06:00
ykeara 123c38c586 Fixed Profile Viewing 2019-01-08 21:31:13 -06:00
ykeara 9351267fb5 fixed naming bug in qml 2019-01-08 21:02:52 -06:00
ykeara 7bd02049a2 added Motion Smoothing toggle 2019-01-08 20:37:22 -06:00
ykeara 2fadca76d0 Commented out reprojection logic 2019-01-08 17:33:48 -06:00
username223 16f5438ab0 Update OpenVR dependency to version 1.1.3b (#28)
* Update OpenVR from an unknown version to 1.1.3b

There shouldn't be any breaking changes.

* Add removed variables from old OpenVR version

The strings are the names of variables in steamvr.vrsettings in
C:\Program Files
(x86)\Steam\steamapps\common\SteamVR\resources\settings\

The string allowReprojection leads to warning log spam on some
occasions.

For more information see this github issue
https://github.com/OpenVR-Advanced-Settings/OpenVR-AdvancedSettings/issues/25.
2019-01-08 16:53:16 -06:00
username223 9c7022f802 Fix QML error spam from MyStackViewPage and PlayspacePage (#24)
* Move logging set up into own function

This does not affect the ability to log, the logging macros are
available globally.

* Clean up logging logic and add comments

The logic to find the logging location was broken, in that it always
placed the logs in the directory of the executable.
It was supposed to place the logs in
AppData/Roaming/matzman666/OpenVRAdvancedSettings/AdvancedSettings.log,
but it hasn't done this since at least git tag "v2.7". Since the change
hasn't been documented anywhere it is assumed to be an unintentional
regression.
The settings file is also currently placed in
AppData/Roaming/matzman666/OpenVRAdvancedSettings.ini, so this commit
undoes the probable regression until a strategy can be developed for
changing all paths at once.

* Move command line arg logging calls and add to manifest calls

The LOG_IF macros are cleaner than if blocks, and they do not need to be
in the middle of the Qt logic inside a giant try block.

* Remove unused QCoreApplication constructor in manifest logic

The object is not used in any of the manifest logic functions and
running without the remove/install manifest calls does not use it
either.

* Unindent logic in installManifest

The error checking was unnecessarily done in an else block. Moving it
into an if block and negating the result does the same but leaves the
rest of the logic at a much smaller indentation level.

* Change array in installManifest to be 0 intialized

Not zero initializing could lead to strange bugs if the terminating null
isn't there.

* Move manifest install/removal to separate function

The manifest handling is tangential to the actual main operation of the
program, hence moving it to a separate function improves readability of
the actual program.

The enum ReturnErrorCode has also been moved to the top in order to be
available to all functions. On introspection it is revealed that it
should always have been placed at the top.

* Unindent logic in removeManifest

The logic is unnecessarily indented, leading to harder to follow logic.

While the current logic isn't that hard to understand, it's better if it
follows the same rhythm as installManifest, which errors checks the same
way with a !QFile::exists( manifestQPath ).

* Move manifestPath out of install/removeManifest

Moving the variable outside of the functions reduces code duplication
and increases the versatility of the functions.

Variable was renamed from manifestQPath to manifestPath, because the Q
does not add anything to the name except (maybe wrongfully in the
future) typing a variable that has been typed with 'auto'.

The default variable has been removed, as it did not improve readability
at all.

* Rename installManifest to handleManifestInstallLogic

The new name better reflects the overall purpose. installManifest should
be a function that only installs the manifest.

* Move manifest related things into manifest namespace

* Move manifestInstallation logic into functions

The logic becomes clearer when replaced by function names instead of
just blocks of error checking.

* Refactor installManifest into separate functions

The uses for the removeManifest and installManifest functions could be
boiled down to three separate use cases:
    * If the application was passed the "-installmanifest" arg:
        Reinstall the manifest and enable application autostart.
    * If the application was passed thed "-removemanifest" arg:
        Remove the manifest.
    * If the application was not passed "-desktop" and also not passed
    "-nomanifest" (basically every start):
        Install the manifest.

Where reinstalling means to remove the manifest if installed and then
install it.

The relatively complex logic in installManifest hid this logic behind
several if statements and changing what the "alreadyInstalled" bool
signified.

The refactored functions should make everything easier to understand.

* Add variable for manifest name

* Rename variables in main to camelCase

This appears to be the style chosen for the majority of the project.

* Change cerr to be LOG(ERROR) and add logging for manifest completion

The cerr calls are not likely to be seen by anybody. Logging them as
ERROR will make sure they are available for diagnostics.

* Add comments for new manifest functions

* Reorder namespaces and functions in main

Namespaces and functions are now ordered as they appear in main.

* Add static_cast to height and width in func call in main

width and height are "qreal" (typedef for double). Having them
implicitly cast to int leads to warnings on some compilers, and can lead
to doubt whether they're supposed to be converted.

* Move organizationName and applicationName into overlaycontroller.h

The string have been moved to static constexpr autos inside the
overlaycontroller.

Them remaining static means that they are included in the final binary,
even if they don't need to be included as static.

They should probably also not be directly gotten, instead being offered
up as static getters, but it's better to do them all at the same time in
a specific commit for that.

* Add comment to installApplicationManifest

Describing that OpenVR must be initialized before the function is
called.

* Change QApplication var name and add comments

The previous QApplication was named "a". This is obviously not
sufficient for such a large part of the application, even if the class
is rather boilerplate heavy.

* Add comments to Qt portions of main

Some things have been left uncommented. That's because I don't know what
it does.

* Change documentation for command line arguments, logging config

The information under the Desktop Mode header could be rolled under the
"-desktop" command line arg.

Support for the command line args of Easylogging++ and custom logging
files have not been supported for the original developer. Both should
probably be dropped in favor of having the same logging behavior for all
users.

* Remove error causing property from QML MyStackViewPage and PlayspacePage

The properties were causing an error message to be spammed in the log
QML QQuickText: Detected anchors on an item that is managed by a layout.
This is undefined behavior; use Layout.alignment instead.

and

QML RowLayout: Detected anchors on an item that is managed by a layout.
This is undefined behavior; use Layout.alignment instead.

Removing them fixed the spam and didn't noticeably change the appearance
of the pages.
2019-01-07 19:24:20 -06:00
ykeara 6cd4a56d73 Added CLA (#18)
* Added CLA

added CLA to for better distribution options

* added additional License requirements to TOC
2019-01-06 14:29:32 -06:00
username223 b10581674d Merge pull request #17 from OpenVR-Advanced-Settings/update-win-builds
Update windows build system, add clang-msvc to CI, add versioning to artifacts
2019-01-05 21:07:49 +01:00
Vasily 3e05bb07f9 Change Win build script batch file from test.bat to current_build.bat 2019-01-05 20:43:41 +01:00
Vasily 4787933a52 Add exit condition checking to build, deploy, package cmd files
Without the line checking the exit code, the script will not fail on a
failure from a subsystem.
2019-01-05 20:31:34 +01:00
Vasily 1df8e88e3d Change RM to DEL in build, package, deploy cmd files
RM is the Linux command, DEL is the Windows equivalent.
2019-01-05 19:53:34 +01:00
username223 6c26507945 Merge branch 'master' into update-win-builds 2019-01-04 20:56:39 +01:00
ykeara 553dbe4e12 Merge pull request #16 from ykeara/master
Default Audio Profile
2019-01-04 13:49:22 -06:00
ykeara 20914b4e71 fixed phantom double line 2019-01-04 13:38:20 -06:00
ykeara 4bb1ba7402 Merge branch 'master' of https://github.com/ykeara/OpenVR-AdvancedSettings 2019-01-04 13:35:21 -06:00
ykeara 15855c4564 fixed minor code formatting errors 2019-01-04 13:34:52 -06:00
Vasily d2ef036b8e Add build_scripts\win\test.bat to gitignore
Also reverse slashes to make git recognize the path.
2019-01-04 18:30:31 +01:00
Vasily 81d8c516a8 Add developer docs file
This allows devs on the project to write useful information that might
not fit anywhere else, or might be applicable to multiple things.
2019-01-04 17:07:52 +01:00
Vasily b5eb548b40 Update python scripts with docs 2019-01-04 17:07:52 +01:00
Vasily 3c32cabebf Rename variables in docs 2019-01-04 17:07:52 +01:00
Vasily 9a59f554ed Update .gitignore and appveyor 2019-01-04 17:07:52 +01:00
Vasily 33dba6202b Update PYTHON env var to PYTHON_LOC 2019-01-04 17:07:52 +01:00
Vasily 93bbcc618a Correct 7zip directory, no python definition expansion 2019-01-04 17:07:52 +01:00
Vasily fa17b481b8 Specify python version in build_window.cmd 2019-01-04 17:07:52 +01:00
Vasily d4b09c76ad Update python scripts, build_windows.cmd 2019-01-04 17:07:52 +01:00
Vasily bfb11a9dc8 Add package python script, replace .cmd with py variants from PS 2019-01-04 17:08:34 +01:00
Vasily 1f1d321398 Update deployment script
Still needs file copying and batch file output.
2019-01-04 17:07:52 +01:00
Vasily 979f542348 Rename build.py to win_build.py
It's also going to fit the deploy and package scripts.
2019-01-04 17:07:52 +01:00
Vasily b806667717 Use python build script 2019-01-04 17:07:52 +01:00
Vasily 045a7d8e7c Update appveyor file and turn off /WX for clang-msvc
win32-clang-msvc has an error when compiling with /WX. The moc_predefs.h
file is not being built correctly, while without /WX it works. The
change should be reverted to enabling /WX for all msvc compilers when
the clang-msvc issue is fixed.

Update path to clang-format in appveyor file

Retry CI on Python script

Python script failed on CI due to run-clang-format.py: error: [Error 5]
Access is denied. Research says attempting again might solve the
problem.
2019-01-04 17:07:55 +01:00
Vasily 644c887f71 Update version strings, update NSIS file, move around extra files
The additional files packaged with the installer have been moved to
their own dir to separate them from the C++ source.

All licenses are now also included in the installer, as per the terms.

The version string in overlaycontroller.h has been updated to 2.8.0.
2019-01-04 17:06:02 +01:00
Vasily 14ab02f155 Remove function calls to say all vars are found 2019-01-04 16:14:47 +01:00
Vasily e7cb2d8c1a Add python build.py script
Does not work as well as the PS script, because of having to create
subprocesses and routing stdout and stderr seems to be problematic.
2019-01-04 16:13:23 +01:00
ykeara 894ac6e24d Merge branch 'master' into master 2019-01-03 15:44:05 -06:00
ykeara b883d2cffd default audio profile and view added
Update logging dependency from 9.84 to 9.89

This is the newest version that doesn't lead to compile errors. It has
also reduced the amount of "-Wexpansion-to-defined" errors on clang-msvc
by about 80 (from ~400 to 320).

Update easylogging license file

Originally came as LICENCE.txt (notice C instead of S in LICENSE),
renamed to better fit into the git history.

Move logging defines to QMAKE instead of logging.h

Defines done outside of easylogging++.h does not work according to
official documentation
(https://github.com/zuhd-org/easyloggingpp/blob/master/README.md#configuration-macros)

"NOTE: All the macros can be defined in one of the following ways:

1. Define macros using -D option of compiler, for example in case of
g++ you will do g++ source.cpp ... -DELPP_SYSLOG -DELPP_THREAD_SAFE
... (recommended way)

2. Define macros inside "easylogging++.h" (defining macros in other
files won't work)"

Linking to this issue:
https://github.com/zuhd-org/easyloggingpp/issues/590#issuecomment-346753951

We are using the developer recommended way of defining them by command
line.

What is assumed to be the intention of enabling debug logs before
including easylogging++ never actually did anything, hence this define
is dropped. Newer versions of easylogging++ uses the macro
ELPP_DISABLE_DEBUG_LOGS to _disable_ debug logs. Leaving that macro
undefined satisfies the original intent.

Move easylogging++ include into necessary files

logging.h previously had logic to enable debug logging even on release
builds. This logic was moved to the QMAKE file, hence the logging.h file
is no longer necessary.

Update easylogging++ to 9.96.7, turn on /WX for clang-msvc

Updating from easylogging++ 9.89 to 9.96.7 turns it from a header only
library to one requiring a source file. It has been added to sources
near the other third party includes in the QMAKE to signify that it
isn't a first party file.

Updating easylogging++ also means that clang-msvc can compile without
any warnings, hence turning on warnings as errors for that compiler as
well, to avoid any regressions.

updated to current

fixed formatting

fixed ptt add bug/compilerwarnings/c++14 target

cleaned up .pro file

fixed casting back to c++ style

added default profile and ptt profile view

fixed c++ casts

fixed logic error on getDevice functions
2019-01-03 15:37:20 -06:00
Vasily b0bce08c2d Convert win formatting script to use LLVM_LOC instead of
CLANG_FORMAT_LOC

The path to the bin dir for LLVM can be used for both clang-cl.exe and
clang-format.exe. Changing this will reduce the amount of environment
variables in play, leading to better long term quality.
2018-12-29 01:17:51 +01:00
Vasily 7449b1f1a9 Disable packaging and building installer by default
The average dev doesn't need to test out the zipping and installer
building utility. Having them package on every build is a waste of time.
2018-12-29 00:58:26 +01:00