Update environments (#1067)

MozillaReality · Apr 11, 2019 · 1da3ea0 · 1da3ea0
1 parent 05432a3
commit 1da3ea0
Show file tree

Hide file tree

Showing 46 changed files with 9 additions and 14 deletions.
diff --git a/app/src/common/shared/org/mozilla/vrbrowser/browser/SettingsStore.java b/app/src/common/shared/org/mozilla/vrbrowser/browser/SettingsStore.java
@@ -289,12 +289,7 @@ public void setMaxWindowHeight(int aMaxWindowHeight) {
     }
 
     public String getEnvironment() {
-        String env = mPrefs.getString(mContext.getString(R.string.settings_key_env), ENV_DEFAULT);
-        // Remove when the meadow is ready
-        if (env.equalsIgnoreCase("meadow")) {
-            env = ENV_DEFAULT;
-        }
-        return env;
+        return mPrefs.getString(mContext.getString(R.string.settings_key_env), ENV_DEFAULT);
     }
 
     public void setEnvironment(String aEnv) {

diff --git a/app/src/main/assets/cubemap/meadow/negx.ktx b/app/src/main/assets/cubemap/meadow/negx.ktx
diff --git a/app/src/main/assets/cubemap/meadow/negy.ktx b/app/src/main/assets/cubemap/meadow/negy.ktx
diff --git a/app/src/main/assets/cubemap/meadow/negz.ktx b/app/src/main/assets/cubemap/meadow/negz.ktx
diff --git a/app/src/main/assets/cubemap/meadow/posx.ktx b/app/src/main/assets/cubemap/meadow/posx.ktx
diff --git a/app/src/main/assets/cubemap/meadow/posy.ktx b/app/src/main/assets/cubemap/meadow/posy.ktx
diff --git a/app/src/main/assets/cubemap/meadow/posz.ktx b/app/src/main/assets/cubemap/meadow/posz.ktx
diff --git a/app/src/main/assets/cubemap/underwater/negx.ktx b/app/src/main/assets/cubemap/underwater/negx.ktx
diff --git a/app/src/main/assets/cubemap/underwater/negy.ktx b/app/src/main/assets/cubemap/underwater/negy.ktx
diff --git a/app/src/main/assets/cubemap/underwater/negz.ktx b/app/src/main/assets/cubemap/underwater/negz.ktx
diff --git a/app/src/main/assets/cubemap/underwater/posx.ktx b/app/src/main/assets/cubemap/underwater/posx.ktx
diff --git a/app/src/main/assets/cubemap/underwater/posy.ktx b/app/src/main/assets/cubemap/underwater/posy.ktx
diff --git a/app/src/main/assets/cubemap/underwater/posz.ktx b/app/src/main/assets/cubemap/underwater/posz.ktx
diff --git a/app/src/main/assets/cubemap/winter/negx.ktx b/app/src/main/assets/cubemap/winter/negx.ktx
diff --git a/app/src/main/assets/cubemap/winter/negy.ktx b/app/src/main/assets/cubemap/winter/negy.ktx
diff --git a/app/src/main/assets/cubemap/winter/negz.ktx b/app/src/main/assets/cubemap/winter/negz.ktx
diff --git a/app/src/main/assets/cubemap/winter/posx.ktx b/app/src/main/assets/cubemap/winter/posx.ktx
diff --git a/app/src/main/assets/cubemap/winter/posy.ktx b/app/src/main/assets/cubemap/winter/posy.ktx
diff --git a/app/src/main/assets/cubemap/winter/posz.ktx b/app/src/main/assets/cubemap/winter/posz.ktx
diff --git a/app/src/main/cpp/BrowserWorld.cpp b/app/src/main/cpp/BrowserWorld.cpp
@@ -1141,10 +1141,7 @@ BrowserWorld::CreateSkyBox(const std::string& aBasePath, const std::string& aExt
   const bool empty = aBasePath == "cubemap/void";
   const std::string extension = aExtension.empty() ? ".ktx" : aExtension;
   const GLenum glFormat = extension == ".ktx" ? GL_COMPRESSED_RGB8_ETC2 : GL_RGB8;
-  float size = 1024;
-  if (aBasePath == "cubemap/underwater" || aBasePath == "cubemap/winter") {
-    size = 1000;
-  }
+  const float size = 1024;
   if (m.skybox && empty) {
     m.skybox->SetVisible(false);
     return;

diff --git a/app/src/main/res/layout/options_environment.xml b/app/src/main/res/layout/options_environment.xml
@@ -38,7 +38,7 @@
             style="@style/scrollbar"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:padding="0dp"
+            android:paddingRight="15dp"
             android:layout_above="@+id/separatorBottom"
             android:layout_below="@+id/separatorTop">
 

diff --git a/app/src/main/res/values/options_values.xml b/app/src/main/res/values/options_values.xml
@@ -5,24 +5,27 @@
         <item>@string/developer_options_env_void</item>
         <item>@string/developer_options_env_cave</item>
         <item>@string/developer_options_env_offworld</item>
-        <item>@string/developer_options_env_underwater</item>
+        <!--<item>@string/developer_options_env_underwater</item>-->
         <item>@string/developer_options_env_winter</item>
+        <item>@string/developer_options_env_meadow</item>
     </string-array>
 
     <string-array name="developer_options_environments_values" translatable="false">
         <item>void</item>
         <item>cave</item>
         <item>offworld</item>
-        <item>underwater</item>
+        <!--<item>underwater</item>-->
         <item>winter</item>
+        <item>meadow</item>
     </string-array>
 
     <array name="developer_options_environments_images" translatable="false">
         <item>@color/black</item>
         <item>@drawable/environment_cave</item>
         <item>@drawable/environment_offworld</item>
-        <item>@drawable/environment_underwater</item>
+        <!--<item>@drawable/environment_underwater</item>-->
         <item>@drawable/environment_winter</item>
+        <item>@drawable/environment_meadow</item>
     </array>
 
     <!-- Pointer Options -->

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/underwater/negx.jpeg b/app/src/uncompressed_assets/main/assets/cubemap/underwater/negx.jpeg
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.jpeg b/app/src/uncompressed_assets/main/assets/cubemap/underwater/negy.jpeg
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.jpeg b/app/src/uncompressed_assets/main/assets/cubemap/underwater/negz.jpeg
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.jpeg b/app/src/uncompressed_assets/main/assets/cubemap/underwater/posx.jpeg
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.jpeg b/app/src/uncompressed_assets/main/assets/cubemap/underwater/posy.jpeg
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.jpeg b/app/src/uncompressed_assets/main/assets/cubemap/underwater/posz.jpeg
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