Removed the WebVR example, which was obsoleted by WebXR.

mosra · Jul 5, 2020 · 9db2614 · 9db2614
1 parent 0e6d0f4
commit 9db2614
Show file tree

Hide file tree

Showing 19 changed files with 10 additions and 501 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -63,7 +63,6 @@ option(WITH_TRIANGLE_SOKOL_EXAMPLE "Build sokol_gfx Triangle example" OFF)
 option(WITH_TRIANGLE_VULKAN_EXAMPLE "Build Vulkan Triangle example" OFF)
 option(WITH_VIEWER_EXAMPLE "Build Viewer example (requires the AnySceneImporter plugin)" OFF)
 if(CORRADE_TARGET_EMSCRIPTEN)
-    option(WITH_WEBVR_EXAMPLE "Build WebVR example" OFF)
     option(WITH_WEBXR_EXAMPLE "Build WebXR example" OFF)
 endif()
 

diff --git a/doc/building-examples.dox b/doc/building-examples.dox
@@ -244,7 +244,7 @@ integration libraries, see @ref building-plugins, @ref building-integration and
     [GLEW](http://glew.sourceforge.net/).
 -   `WITH_VIEWER_EXAMPLE` --- Build the @ref examples-viewer "Viewer" example.
     Requires the @ref Trade::AnySceneImporter "AnySceneImporter" plugin.
--   `WITH_WEBVR_EXAMPLE` --- Build the @ref examples-webvr "WebVR" example.
+-   `WITH_WEBXR_EXAMPLE` --- Build the @ref examples-webxr "WebXR" example.
     Available only on @ref CORRADE_TARGET_EMSCRIPTEN "Emscripten".
 
 Some examples accept additional options:

diff --git a/doc/changelog-examples-old.dox b/doc/changelog-examples-old.dox
@@ -67,8 +67,7 @@ Released 2018-05-01, tagged as
 
 @subsection changelog-examples-2018-04-bugfixes Bug fixes
 
--   The @ref examples-webvr example was fixed to work on Android phones
-    (see [mosra/magnum-examples#38](https://github.com/mosra/magnum-examples/pull/38))
+-   The WebVR example was fixed to work on Android phones (see [mosra/magnum-examples#38](https://github.com/mosra/magnum-examples/pull/38))
 
 @section changelog-examples-2018-02 2018.02
 
@@ -122,7 +121,7 @@ for a high-level overview.
         [mosra/magnum-examples#24](https://github.com/mosra/magnum-examples/pull/24))
     -   @ref examples-triangle-plain-glfw example showing integration into
         custom platform toolkits
-    -   @ref examples-webvr example showing basic usage of WebVR (see
+    -   WebVR example showing basic usage of WebVR (see
         [mosra/magnum-examples#33](https://github.com/mosra/magnum-examples/pull/33),
         [mosra/magnum-examples#36](https://github.com/mosra/magnum-examples/pull/36))
 -   A new [ports](https://github.com/mosra/magnum-examples/tree/ports) branch

diff --git a/doc/changelog-examples.dox b/doc/changelog-examples.dox
@@ -35,6 +35,8 @@ namespace Magnum {
 @subsection changelog-examples-latest-changes Changes and improvements
 
 -   Fixed the @ref examples-webxr example to look correctly on HiDPI
+-   The WebVR example was obsoleted by the @ref examples-webxr example and is
+    now removed
 
 @section changelog-examples-2020-06 2020.06
 

diff --git a/doc/credits.dox b/doc/credits.dox
@@ -51,8 +51,7 @@ namespace Magnum {
     fixes
 -   **Jonathan Hale** ([\@Squareys](https://github.com/Squareys)) --- the
     @ref examples-ovr, @ref examples-audio, @ref examples-arealights,
-    @ref examples-webvr, @ref examples-leapmotion, @ref examples-imgui and
-    @ref examples-webxr
+    @ref examples-leapmotion, @ref examples-imgui, WebVR and @ref examples-webxr
     examples, porting to @ref Platform::EmscriptenApplication
 -   **Konstantinos Chatzilygeroudis** ([\@costashatz](https://github.com/costashatz))
     --- the @ref examples-dart example

diff --git a/doc/example-index.dox b/doc/example-index.dox
@@ -259,20 +259,12 @@ The following consist of documented source code only:
 
 @parblock
 
-@m_div{m-col-m-4 m-col-s-6 m-text-center}
+@m_div{m-col-m-4 m-col-s-6 m-push-m-2 m-text-center}
 @image html ovr.png
 @subpage examples-ovr @m_class{m-label m-primary} **vr** \n @copybrief examples-ovr
 @m_enddiv
 
-@m_div{m-col-m-4 m-col-s-6 m-text-center}
-@image html webvr.png
-@subpage examples-webvr @m_class{m-label m-primary} **vr** @m_class{m-label m-default m-flat} **live web demo**
-\n @copybrief examples-webvr
-@m_enddiv
-
-@m_div{m-clearfix-s} @m_enddiv
-
-@m_div{m-col-m-4 m-col-s-6 m-push-s-3 m-push-m-0 m-text-center}
+@m_div{m-col-m-4 m-col-s-6 m-push-m-2 m-text-center}
 @image html webxr.png
 @subpage examples-webxr @m_class{m-label m-primary} **vr** @m_class{m-label m-default m-flat} **live web demo**
 \n @copybrief examples-webxr

diff --git a/doc/ovr.dox b/doc/ovr.dox
@@ -32,7 +32,7 @@ namespace Magnum {
 
 @image html ovr.png
 
-Note that there is also a @ref examples-webvr "WebVR example" and a
+Note that there is also a @ref examples-webxr "WebXR example" and a
 @ref examples-leapmotion "Leap Motion example".
 
 @section examples-ovr-usage Usage

diff --git a/doc/webvr.dox b/doc/webvr.dox
diff --git a/doc/webvr.png b/doc/webvr.png
diff --git a/doc/webxr.dox b/doc/webxr.dox
@@ -44,8 +44,7 @@ and search for WebXR. Works on Android as well.
 
 @m_div{m-button m-primary} <a href="https://magnum.graphics/showcase/webxr/">@m_div{m-big} Live web demo @m_enddiv @m_div{m-small} uses WebAssembly & WebGL @m_enddiv </a> @m_enddiv
 
-Note that there is also a @ref examples-webvr "WebVR example", a
-@ref examples-ovr "Oculus VR example" and a
+Note that there is also a @ref examples-ovr "Oculus VR example" and a
 @ref examples-leapmotion "Leap Motion example".
 
 @section examples-webxr-controls Controls

diff --git a/package/archlinux/PKGBUILD-emscripten b/package/archlinux/PKGBUILD-emscripten
@@ -52,7 +52,6 @@ build() {
         -DWITH_TRIANGLE_PLAIN_GLFW_EXAMPLE=OFF \
         -DWITH_TRIANGLE_SOKOL_EXAMPLE=OFF \
         -DWITH_VIEWER_EXAMPLE=OFF \
-        -DWITH_WEBVR_EXAMPLE=ON \
         -DWITH_WEBXR_EXAMPLE=ON
     ninja
 }

diff --git a/package/archlinux/PKGBUILD-emscripten-wasm b/package/archlinux/PKGBUILD-emscripten-wasm
@@ -52,7 +52,6 @@ build() {
         -DWITH_TRIANGLE_PLAIN_GLFW_EXAMPLE=OFF \
         -DWITH_TRIANGLE_SOKOL_EXAMPLE=OFF \
         -DWITH_VIEWER_EXAMPLE=OFF \
-        -DWITH_WEBVR_EXAMPLE=ON \
         -DWITH_WEBXR_EXAMPLE=ON
     ninja
 }

diff --git a/package/archlinux/PKGBUILD-emscripten-wasm-webgl2 b/package/archlinux/PKGBUILD-emscripten-wasm-webgl2
@@ -52,7 +52,6 @@ build() {
         -DWITH_TRIANGLE_PLAIN_GLFW_EXAMPLE=OFF \
         -DWITH_TRIANGLE_SOKOL_EXAMPLE=OFF \
         -DWITH_VIEWER_EXAMPLE=OFF \
-        -DWITH_WEBVR_EXAMPLE=ON \
         -DWITH_WEBXR_EXAMPLE=ON
     ninja
 }

diff --git a/package/archlinux/PKGBUILD-emscripten-webgl2 b/package/archlinux/PKGBUILD-emscripten-webgl2
@@ -53,7 +53,6 @@ build() {
         -DWITH_TRIANGLE_PLAIN_GLFW_EXAMPLE=OFF \
         -DWITH_TRIANGLE_SOKOL_EXAMPLE=OFF \
         -DWITH_VIEWER_EXAMPLE=OFF \
-        -DWITH_WEBVR_EXAMPLE=ON \
         -DWITH_WEBXR_EXAMPLE=ON
     ninja
 }

diff --git a/package/ci/travis-emscripten.sh b/package/ci/travis-emscripten.sh
@@ -140,7 +140,6 @@ cmake .. \
     -DWITH_TRIANGLE_PLAIN_GLFW_EXAMPLE=OFF \
     -DWITH_TRIANGLE_SOKOL_EXAMPLE=OFF \
     -DWITH_VIEWER_EXAMPLE=OFF \
-    -DWITH_WEBVR_EXAMPLE=ON \
     -DWITH_WEBXR_EXAMPLE=ON \
     -G Ninja
 # Otherwise the job gets killed (probably because using too much memory)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -148,10 +148,6 @@ if(WITH_VIEWER_EXAMPLE)
     add_subdirectory(viewer)
 endif()
 
-if(WITH_WEBVR_EXAMPLE)
-    add_subdirectory(webvr)
-endif()
-
 if(WITH_WEBXR_EXAMPLE)
     add_subdirectory(webxr)
 endif()
diff --git a/src/webvr/CMakeLists.txt b/src/webvr/CMakeLists.txt