Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 0 additions & 20 deletions cmake/macros/TargetOculusMobile.cmake

This file was deleted.

43 changes: 0 additions & 43 deletions cmake/modules/FindLibOVR.cmake

This file was deleted.

44 changes: 0 additions & 44 deletions cmake/modules/FindLibOVRPlatform.cmake

This file was deleted.

2 changes: 2 additions & 0 deletions cmake/templates/NSIS.template.in
Original file line number Diff line number Diff line change
Expand Up @@ -1209,6 +1209,8 @@ Section "-Core installation"

; Delete old hifiNeuron.dll, since we dropped support for it and it causes a crash on startup.
Delete "$INSTDIR\plugins\hifiNeuron.dll"
; Delete old Oculus plugin, since we dropped support for it.
Delete "$INSTDIR\plugins\oculus.dll"

; Delete old audioWin7 and audioWin8 folders, since we dropped support for Windows 7.
; This isn't necessary, but saves disk space.
Expand Down
2 changes: 0 additions & 2 deletions conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,6 @@ def requirements(self):

if self.settings.os == "Windows":
self.requires("neuron/12.2@overte/prebuild")
self.requires("ovr-skd/1.35.0@overte/prebuild")
self.requires("ovr-platform-skd/1.10.0@overte/prebuild")

self.requires(openssl, force=True)

Expand Down
5 changes: 0 additions & 5 deletions interface/src/LODManager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -396,11 +396,6 @@ void LODManager::loadSettings() {
auto desktopQuality = static_cast<WorldDetailQuality>(desktopWorldDetailQuality.get());
auto hmdQuality = static_cast<WorldDetailQuality>(hmdWorldDetailQuality.get());

Setting::Handle<bool> firstRun{ Settings::firstRun, true };
if (qApp->property(hifi::properties::OCULUS_STORE).toBool() && firstRun.get()) {
hmdQuality = WORLD_DETAIL_HIGH;
}

_automaticLODAdjust = automaticLODAdjust.get();
_lodHalfAngle = lodHalfAngle.get();

Expand Down
8 changes: 0 additions & 8 deletions interface/src/ui/PreferencesDialog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -667,12 +667,4 @@ void setupPreferences() {
preferences->addPreference(preference);
}
}

static const QString PLUGIN_CATEGORY{ "Plugins" };
auto pluginManager = PluginManager::getInstance();
{
auto getter = [pluginManager]()->bool { return pluginManager->getEnableOculusPluginSetting(); };
auto setter = [pluginManager](bool value) { pluginManager->setEnableOculusPluginSetting(value); };
preferences->addPreference(new CheckPreference(PLUGIN_CATEGORY, "Enable Oculus Platform Plugin", getter, setter));
}
}
3 changes: 0 additions & 3 deletions libraries/plugins/src/plugins/PluginManager.h
Original file line number Diff line number Diff line change
Expand Up @@ -259,9 +259,6 @@ class PluginManager : public QObject, public Dependency {
*/
Q_INVOKABLE DisplayPluginList getAllDisplayPlugins();

bool getEnableOculusPluginSetting() { return _enableOculusPluginSetting.get(); }
void setEnableOculusPluginSetting(bool value);

/**
* @brief Returns information about known plugins
*
Expand Down
7 changes: 0 additions & 7 deletions plugins/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,6 @@ list(REMOVE_ITEM PLUGIN_SUBDIRS "CMakeFiles")

# client-side plugins
if (OVERTE_BUILD_CLIENT AND NOT ANDROID)
if (WIN32 AND (NOT OVERTE_RENDERING_BACKEND STREQUAL "GLES"))
set(DIR "oculus")
add_subdirectory(${DIR})
set(DIR "oculusLegacy")
add_subdirectory(${DIR})
endif()

if (NOT CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64")
# Note: OpenVR is a Steam thing, which is different from OVR, which is an Oculus SDK component.
set(DIR "openvr")
Expand Down
35 changes: 0 additions & 35 deletions plugins/oculus/CMakeLists.txt

This file was deleted.

Loading
Loading