New environment

Igalia · Jan 19, 2022 · 0a9ca17 · 0a9ca17
1 parent 67faa2a
commit 0a9ca17
Show file tree

Hide file tree

Showing 83 changed files with 3,401 additions and 30 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -127,12 +127,12 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
             //signingConfig getUseDebugSigningOnRelease() ? debug.signingConfig : release.signingConfig
             signingConfig signingConfigs.release
-            buildConfigField 'String', 'PROPS_ENDPOINT', '"http://mixedreality.mozilla.org/FirefoxReality/props.json"'
+            buildConfigField 'String', 'PROPS_ENDPOINT', '"https://igalia.github.io/wolvic/props.json"'
         }
         debug {
             applicationIdSuffix getDevApplicationIdSuffix()
             pseudoLocalesEnabled true
-            buildConfigField 'String', 'PROPS_ENDPOINT', '"http://mixedreality.mozilla.org/FirefoxReality/props.json"'
+            buildConfigField 'String', 'PROPS_ENDPOINT', '"https://igalia.github.io/wolvic/props.json"'
         }
     }
 

diff --git a/app/src/common/shared/com/igalia/wolvic/browser/SettingsStore.java b/app/src/common/shared/com/igalia/wolvic/browser/SettingsStore.java
@@ -93,7 +93,7 @@ SettingsStore getInstance(final @NonNull Context aContext) {
     public final static int MAX_WINDOW_HEIGHT_DEFAULT = 1200;
     public final static int POINTER_COLOR_DEFAULT_DEFAULT = Color.parseColor("#FFFFFF");
     public final static int SCROLL_DIRECTION_DEFAULT = 0;
-    public final static String ENV_DEFAULT = "offworld";
+    public final static String ENV_DEFAULT = "wolvic";
     public final static int MSAA_DEFAULT_LEVEL = 0;
     public final static boolean AUDIO_ENABLED = false;
     public final static float CYLINDER_DENSITY_ENABLED_DEFAULT = 4680.0f;

diff --git a/app/src/main/assets/cubemap/offworld/negx.ktx b/app/src/main/assets/cubemap/offworld/negx.ktx
diff --git a/app/src/main/assets/cubemap/offworld/negx_srgb.ktx b/app/src/main/assets/cubemap/offworld/negx_srgb.ktx
diff --git a/app/src/main/assets/cubemap/offworld/negy.ktx b/app/src/main/assets/cubemap/offworld/negy.ktx
diff --git a/app/src/main/assets/cubemap/offworld/negy_srgb.ktx b/app/src/main/assets/cubemap/offworld/negy_srgb.ktx
diff --git a/app/src/main/assets/cubemap/offworld/negz.ktx b/app/src/main/assets/cubemap/offworld/negz.ktx
diff --git a/app/src/main/assets/cubemap/offworld/negz_srgb.ktx b/app/src/main/assets/cubemap/offworld/negz_srgb.ktx
diff --git a/app/src/main/assets/cubemap/offworld/posx.ktx b/app/src/main/assets/cubemap/offworld/posx.ktx
diff --git a/app/src/main/assets/cubemap/offworld/posx_srgb.ktx b/app/src/main/assets/cubemap/offworld/posx_srgb.ktx
diff --git a/app/src/main/assets/cubemap/offworld/posy.ktx b/app/src/main/assets/cubemap/offworld/posy.ktx
diff --git a/app/src/main/assets/cubemap/offworld/posy_srgb.ktx b/app/src/main/assets/cubemap/offworld/posy_srgb.ktx
diff --git a/app/src/main/assets/cubemap/offworld/posz.ktx b/app/src/main/assets/cubemap/offworld/posz.ktx
diff --git a/app/src/main/assets/cubemap/offworld/posz_srgb.ktx b/app/src/main/assets/cubemap/offworld/posz_srgb.ktx
diff --git a/app/src/main/assets/cubemap/wolvic/negx.ktx b/app/src/main/assets/cubemap/wolvic/negx.ktx
diff --git a/app/src/main/assets/cubemap/wolvic/negx_srgb.ktx b/app/src/main/assets/cubemap/wolvic/negx_srgb.ktx
diff --git a/app/src/main/assets/cubemap/wolvic/negy.ktx b/app/src/main/assets/cubemap/wolvic/negy.ktx
diff --git a/app/src/main/assets/cubemap/wolvic/negy_srgb.ktx b/app/src/main/assets/cubemap/wolvic/negy_srgb.ktx
diff --git a/app/src/main/assets/cubemap/wolvic/negz.ktx b/app/src/main/assets/cubemap/wolvic/negz.ktx
diff --git a/app/src/main/assets/cubemap/wolvic/negz_srgb.ktx b/app/src/main/assets/cubemap/wolvic/negz_srgb.ktx
diff --git a/app/src/main/assets/cubemap/wolvic/posx.ktx b/app/src/main/assets/cubemap/wolvic/posx.ktx
diff --git a/app/src/main/assets/cubemap/wolvic/posx_srgb.ktx b/app/src/main/assets/cubemap/wolvic/posx_srgb.ktx
diff --git a/app/src/main/assets/cubemap/wolvic/posy.ktx b/app/src/main/assets/cubemap/wolvic/posy.ktx
diff --git a/app/src/main/assets/cubemap/wolvic/posy_srgb.ktx b/app/src/main/assets/cubemap/wolvic/posy_srgb.ktx
diff --git a/app/src/main/assets/cubemap/wolvic/posz.ktx b/app/src/main/assets/cubemap/wolvic/posz.ktx
diff --git a/app/src/main/assets/cubemap/wolvic/posz_srgb.ktx b/app/src/main/assets/cubemap/wolvic/posz_srgb.ktx
diff --git a/app/src/main/res/drawable/environment_offworld.jpg b/app/src/main/res/drawable/environment_offworld.jpg
diff --git a/app/src/main/res/drawable/environment_wolvic.jpg b/app/src/main/res/drawable/environment_wolvic.jpg
diff --git a/app/src/main/res/values/options_values.xml b/app/src/main/res/values/options_values.xml
@@ -3,17 +3,17 @@
     <!-- Environments Options -->
     <string-array name="developer_options_environments" translatable="false">
         <item>@string/developer_options_env_void</item>
-        <item>@string/developer_options_env_offworld</item>
+        <item>Wolvic</item>
     </string-array>
 
     <string-array name="developer_options_environments_values" translatable="false">
         <item>void</item>
-        <item>offworld</item>
+        <item>wolvic</item>
     </string-array>
 
     <array name="developer_options_environments_images" translatable="false">
         <item>@color/black</item>
-        <item>@drawable/environment_offworld</item>
+        <item>@drawable/environment_wolvic</item>
     </array>
 
     <!-- Pointer Options -->

diff --git a/app/src/oculusvr/assets/vr_controller_oculusgo_tex_srgb.ktx b/app/src/oculusvr/assets/vr_controller_oculusgo_tex_srgb.ktx
diff --git a/app/src/oculusvr/assets/vr_controller_oculusquest_tex_srgb.ktx b/app/src/oculusvr/assets/vr_controller_oculusquest_tex_srgb.ktx
diff --git a/app/src/test/resources/environments/previousVersionEnvs.json b/app/src/test/resources/environments/previousVersionEnvs.json
@@ -1,19 +1,10 @@
 {
-  "12": {
-    "whatsNewUrl": "https://blog.mozvr.com/firefox-reality-11/"
-  },
-  "11": {
-    "whatsNewUrl": "https://blog.mozvr.com/firefox-reality-11/",
+  "1": {
+    "whatsNewUrl": "https://wolvic.com/",
     "environments": [
       {
-        "value": "space",
-        "title": "Space",
-        "thumbnail": "https://mixedreality.mozilla.org/FirefoxReality/envs/space/thumbnail.jpg",
-        "payload": "https://mixedreality.mozilla.org/FirefoxReality/envs/space/space.zip"
-      },
-      {
-        "value": "meadow",
-        "title": "Meadow",
+        "value": "wolvic",
+        "title": "Wolvic",
         "thumbnail": "https://mixedreality.mozilla.org/FirefoxReality/envs/meadow/thumbnail.jpg",
         "payload": "https://mixedreality.mozilla.org/FirefoxReality/envs/meadow/space.zip"
       }

diff --git a/app/src/test/resources/environments/targetVersionEnvs.json b/app/src/test/resources/environments/targetVersionEnvs.json
@@ -1,16 +1,10 @@
 {
-  "11": {
-    "whatsNewUrl": "https://blog.mozvr.com/firefox-reality-11/",
+  "1": {
+    "whatsNewUrl": "https://wolvic.com/",
     "environments": [
       {
-        "value": "space",
-        "title": "Space",
-        "thumbnail": "https://mixedreality.mozilla.org/FirefoxReality/envs/space/thumbnail.jpg",
-        "payload": "https://mixedreality.mozilla.org/FirefoxReality/envs/space/space.zip"
-      },
-      {
-        "value": "meadow",
-        "title": "Meadow",
+        "value": "wolvic",
+        "title": "Wolvic",
         "thumbnail": "https://mixedreality.mozilla.org/FirefoxReality/envs/meadow/thumbnail.jpg",
         "payload": "https://mixedreality.mozilla.org/FirefoxReality/envs/meadow/space.zip"
       }

diff --git a/app/src/test/resources/environments/testNoEnvs.json b/app/src/test/resources/environments/testNoEnvs.json
@@ -1,6 +1,6 @@
 {
     "11": {
-      "whatsNewUrl": "https://blog.mozvr.com/firefox-reality-11/",
+      "whatsNewUrl": "https://wolvic.com",
       "environments": [
       ]
     }

diff --git a/app/src/uncompressed_assets/main/assets/cubemap/cave/negx.jpg b/app/src/uncompressed_assets/main/assets/cubemap/cave/negx.jpg
diff --git a/app/src/uncompressed_assets/main/assets/cubemap/cave/negy.jpg b/app/src/uncompressed_assets/main/assets/cubemap/cave/negy.jpg
diff --git a/app/src/uncompressed_assets/main/assets/cubemap/cave/negz.jpg b/app/src/uncompressed_assets/main/assets/cubemap/cave/negz.jpg
diff --git a/app/src/uncompressed_assets/main/assets/cubemap/cave/posx.jpg b/app/src/uncompressed_assets/main/assets/cubemap/cave/posx.jpg
diff --git a/app/src/uncompressed_assets/main/assets/cubemap/cave/posy.jpg b/app/src/uncompressed_assets/main/assets/cubemap/cave/posy.jpg
diff --git a/app/src/uncompressed_assets/main/assets/cubemap/cave/posz.jpg b/app/src/uncompressed_assets/main/assets/cubemap/cave/posz.jpg
diff --git a/app/src/uncompressed_assets/main/assets/cubemap/meadow/negx.jpg b/app/src/uncompressed_assets/main/assets/cubemap/meadow/negx.jpg
diff --git a/app/src/uncompressed_assets/main/assets/cubemap/meadow/negy.jpg b/app/src/uncompressed_assets/main/assets/cubemap/meadow/negy.jpg
diff --git a/app/src/uncompressed_assets/main/assets/cubemap/meadow/negz.jpg b/app/src/uncompressed_assets/main/assets/cubemap/meadow/negz.jpg
diff --git a/app/src/uncompressed_assets/main/assets/cubemap/meadow/posx.jpg b/app/src/uncompressed_assets/main/assets/cubemap/meadow/posx.jpg
diff --git a/app/src/uncompressed_assets/main/assets/cubemap/meadow/posy.jpg b/app/src/uncompressed_assets/main/assets/cubemap/meadow/posy.jpg
diff --git a/app/src/uncompressed_assets/main/assets/cubemap/meadow/posz.jpg b/app/src/uncompressed_assets/main/assets/cubemap/meadow/posz.jpg
diff --git a/app/src/uncompressed_assets/main/assets/cubemap/offworld/negx.jpg b/app/src/uncompressed_assets/main/assets/cubemap/offworld/negx.jpg
diff --git a/app/src/uncompressed_assets/main/assets/cubemap/offworld/negy.jpg b/app/src/uncompressed_assets/main/assets/cubemap/offworld/negy.jpg
diff --git a/app/src/uncompressed_assets/main/assets/cubemap/offworld/negz.jpg b/app/src/uncompressed_assets/main/assets/cubemap/offworld/negz.jpg
diff --git a/app/src/uncompressed_assets/main/assets/cubemap/offworld/posx.jpg b/app/src/uncompressed_assets/main/assets/cubemap/offworld/posx.jpg
diff --git a/app/src/uncompressed_assets/main/assets/cubemap/offworld/posy.jpg b/app/src/uncompressed_assets/main/assets/cubemap/offworld/posy.jpg
diff --git a/app/src/uncompressed_assets/main/assets/cubemap/offworld/posz.jpg b/app/src/uncompressed_assets/main/assets/cubemap/offworld/posz.jpg
diff --git a/app/src/uncompressed_assets/main/assets/cubemap/space/negx.jpg b/app/src/uncompressed_assets/main/assets/cubemap/space/negx.jpg
diff --git a/app/src/uncompressed_assets/main/assets/cubemap/space/negy.jpg b/app/src/uncompressed_assets/main/assets/cubemap/space/negy.jpg
diff --git a/app/src/uncompressed_assets/main/assets/cubemap/space/negz.jpg b/app/src/uncompressed_assets/main/assets/cubemap/space/negz.jpg
diff --git a/app/src/uncompressed_assets/main/assets/cubemap/space/posx.jpg b/app/src/uncompressed_assets/main/assets/cubemap/space/posx.jpg
diff --git a/app/src/uncompressed_assets/main/assets/cubemap/space/posy.jpg b/app/src/uncompressed_assets/main/assets/cubemap/space/posy.jpg
diff --git a/app/src/uncompressed_assets/main/assets/cubemap/space/posz.jpg b/app/src/uncompressed_assets/main/assets/cubemap/space/posz.jpg
diff --git a/app/src/uncompressed_assets/main/assets/cubemap/underwater/negx.jpg b/app/src/uncompressed_assets/main/assets/cubemap/underwater/negx.jpg
diff --git a/app/src/uncompressed_assets/main/assets/cubemap/underwater/negy.jpg b/app/src/uncompressed_assets/main/assets/cubemap/underwater/negy.jpg
diff --git a/app/src/uncompressed_assets/main/assets/cubemap/underwater/negz.jpg b/app/src/uncompressed_assets/main/assets/cubemap/underwater/negz.jpg
diff --git a/app/src/uncompressed_assets/main/assets/cubemap/underwater/posx.jpg b/app/src/uncompressed_assets/main/assets/cubemap/underwater/posx.jpg
diff --git a/app/src/uncompressed_assets/main/assets/cubemap/underwater/posy.jpg b/app/src/uncompressed_assets/main/assets/cubemap/underwater/posy.jpg
diff --git a/app/src/uncompressed_assets/main/assets/cubemap/underwater/posz.jpg b/app/src/uncompressed_assets/main/assets/cubemap/underwater/posz.jpg
diff --git a/app/src/uncompressed_assets/main/assets/cubemap/winter/negx.jpg b/app/src/uncompressed_assets/main/assets/cubemap/winter/negx.jpg
diff --git a/app/src/uncompressed_assets/main/assets/cubemap/winter/negy.jpg b/app/src/uncompressed_assets/main/assets/cubemap/winter/negy.jpg
diff --git a/app/src/uncompressed_assets/main/assets/cubemap/winter/negz.jpg b/app/src/uncompressed_assets/main/assets/cubemap/winter/negz.jpg
diff --git a/app/src/uncompressed_assets/main/assets/cubemap/winter/posx.jpg b/app/src/uncompressed_assets/main/assets/cubemap/winter/posx.jpg
diff --git a/app/src/uncompressed_assets/main/assets/cubemap/winter/posy.jpg b/app/src/uncompressed_assets/main/assets/cubemap/winter/posy.jpg
diff --git a/app/src/uncompressed_assets/main/assets/cubemap/winter/posz.jpg b/app/src/uncompressed_assets/main/assets/cubemap/winter/posz.jpg
diff --git a/app/src/uncompressed_assets/main/assets/cubemap/wolvic/negx.jpg b/app/src/uncompressed_assets/main/assets/cubemap/wolvic/negx.jpg
diff --git a/app/src/uncompressed_assets/main/assets/cubemap/wolvic/negy.jpg b/app/src/uncompressed_assets/main/assets/cubemap/wolvic/negy.jpg
diff --git a/app/src/uncompressed_assets/main/assets/cubemap/wolvic/negz.jpg b/app/src/uncompressed_assets/main/assets/cubemap/wolvic/negz.jpg
diff --git a/app/src/uncompressed_assets/main/assets/cubemap/wolvic/posx.jpg b/app/src/uncompressed_assets/main/assets/cubemap/wolvic/posx.jpg
diff --git a/app/src/uncompressed_assets/main/assets/cubemap/wolvic/posy.jpg b/app/src/uncompressed_assets/main/assets/cubemap/wolvic/posy.jpg
diff --git a/app/src/uncompressed_assets/main/assets/cubemap/wolvic/posz.jpg b/app/src/uncompressed_assets/main/assets/cubemap/wolvic/posz.jpg
diff --git a/app/src/wavevr/assets/vr_controller_focus_plus.ktx b/app/src/wavevr/assets/vr_controller_focus_plus.ktx
diff --git a/app/src/wavevr/assets/vr_controller_focus_plus_disable.ktx b/app/src/wavevr/assets/vr_controller_focus_plus_disable.ktx
diff --git a/app/src/wavevr/assets/vr_controller_focus_plus_disable_srgb.ktx b/app/src/wavevr/assets/vr_controller_focus_plus_disable_srgb.ktx
diff --git a/app/src/wavevr/assets/vr_controller_focus_plus_srgb.ktx b/app/src/wavevr/assets/vr_controller_focus_plus_srgb.ktx
diff --git a/app/src/wavevr/assets/vr_controller_focus_tex.ktx b/app/src/wavevr/assets/vr_controller_focus_tex.ktx
diff --git a/app/src/wavevr/assets/vr_controller_focus_tex_srgb.ktx b/app/src/wavevr/assets/vr_controller_focus_tex_srgb.ktx