update openmw, gl4es and something

Sisah2 · May 6, 2024 · 3285ee1 · 3285ee1
1 parent 718072a
commit 3285ee1
Show file tree

Hide file tree

Showing 6 changed files with 84 additions and 26 deletions.
diff --git a/app/src/main/java/ui/activity/GameActivity.kt b/app/src/main/java/ui/activity/GameActivity.kt
@@ -102,6 +102,10 @@ class GameActivity : SDLActivity() {
         if (textureShrinkingOption == "medium") Os.setenv("LIBGL_SHRINK", "7", true)
         if (textureShrinkingOption == "high") Os.setenv("LIBGL_SHRINK", "6", true)
 
+        val avoid16bits = prefs!!.getBoolean("pref_avoid16bits", true)
+        if (avoid16bits == true) Os.setenv("LIBGL_AVOID16BITS", "1", true)
+        else Os.setenv("LIBGL_AVOID16BITS", "0", true)
+
         Os.setenv("OSG_VERTEX_BUFFER_HINT", "VBO", true)
         Os.setenv("OPENMW_USER_FILE_STORAGE", Constants.USER_FILE_STORAGE + "/", true)
         //Os.setenv("OSG_NOTIFY_LEVEL", "FATAL", true) //hide osg errors for now, gl4es bug.

diff --git a/app/src/main/java/ui/activity/MainActivity.kt b/app/src/main/java/ui/activity/MainActivity.kt
@@ -485,32 +485,49 @@ class MainActivity : AppCompatActivity() {
 	val orientation = this.getResources().getConfiguration().orientation
 	var displayWidth = 0
 	var displayHeight = 0
-
-	if (orientation == Configuration.ORIENTATION_PORTRAIT)
-	{
-		displayWidth = if(resolutionX == 0) dm.heightPixels else resolutionX
-		displayHeight = if(resolutionY == 0) dm.widthPixels else resolutionY
-                if( displayInCutoutArea == false && resolutionX == 0) {
-                    val cutoutRectTop = windowManager.defaultDisplay.getCutout()!!.getBoundingRectTop()
-                    val cutoutRectBottom = windowManager.defaultDisplay.getCutout()!!.getBoundingRectBottom()
-                    if (cutoutRectTop != null && cutoutRectBottom != null)
+        val cutout = windowManager.defaultDisplay.getCutout()
+
+        if (cutout != null) {
+	    if (orientation == Configuration.ORIENTATION_PORTRAIT)
+	    {
+		    displayWidth = if(resolutionX == 0) dm.heightPixels else resolutionX
+		    displayHeight = if(resolutionY == 0) dm.widthPixels else resolutionY
+                    if( displayInCutoutArea == false && resolutionX == 0) {
+                        val cutoutRectTop = cutout.getBoundingRectTop()
+                        val cutoutRectBottom = cutout.getBoundingRectBottom()
                         displayWidth = dm.heightPixels - maxOf(cutoutRectTop.bottom, cutoutRectBottom.bottom - cutoutRectBottom.top)
-                }
-	}
-	else
-	{
-		displayWidth = if(resolutionX == 0) dm.widthPixels else resolutionX
-		displayHeight = if(resolutionY == 0) dm.heightPixels else resolutionY
-                if( displayInCutoutArea == false && resolutionY == 0) {
-                    val cutoutRectLeft = windowManager.defaultDisplay.getCutout()!!.getBoundingRectLeft()
-                    val cutoutRectRight = windowManager.defaultDisplay.getCutout()!!.getBoundingRectRight()
-                    if (cutoutRectLeft != null && cutoutRectRight != null)
+                    }
+	    }
+	    else
+	    {
+		    displayWidth = if(resolutionX == 0) dm.widthPixels else resolutionX
+		    displayHeight = if(resolutionY == 0) dm.heightPixels else resolutionY
+                    if( displayInCutoutArea == false && resolutionY == 0) {
+                        val cutoutRectLeft = cutout.getBoundingRectLeft()
+                        val cutoutRectRight = cutout.getBoundingRectRight()
                         displayWidth = dm.widthPixels - maxOf(cutoutRectLeft.right, cutoutRectRight.right - cutoutRectRight.left)
-                }
-	}
+                    }
+	    }
 
-	writeSetting("Video", "resolution x", displayWidth.toString())
-	writeSetting("Video", "resolution y", displayHeight.toString())
+	    writeSetting("Video", "resolution x", displayWidth.toString())
+	    writeSetting("Video", "resolution y", displayHeight.toString())
+        }
+        else {
+            if (resolutionX != 0 && resolutionY != 0) {
+                writeSetting("Video", "resolution x", displayWidth.toString())
+	        writeSetting("Video", "resolution y", displayHeight.toString())
+            }
+            else {
+                if (orientation == Configuration.ORIENTATION_PORTRAIT) {
+                    writeSetting("Video", "resolution x", dm.heightPixels.toString())
+	            writeSetting("Video", "resolution y", dm.widthPixels.toString())
+                }
+                else {
+                    writeSetting("Video", "resolution x", dm.widthPixels.toString())
+	            writeSetting("Video", "resolution y", dm.heightPixels.toString())
+                }
+            }
+        }
 
 	// Game Mechanics
 	writeSetting("Game", "toggle sneak", if(prefs.getBoolean("gs_toggle_sneak", true)) "true" else "false")

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -179,6 +179,7 @@
     <string name="btn_back">Back</string>
     <string name="pref_customResolution">Custom resolution</string>
     <string name="pref_display_cutout_area">Display in cutout area</string>
+    <string name="pref_avoid16bits">Avoid 16 bits colors</string>
     <string name="mods">Mods…</string>
     <string name="action_about">About</string>
     <string name="about_title">About OMW</string>

diff --git a/app/src/main/res/xml/settings.xml b/app/src/main/res/xml/settings.xml
@@ -99,7 +99,13 @@
 
         <CheckBoxPreference
             android:key="pref_display_cutout_area"
-            android:title="@string/pref_display_cutout_area" />
+            android:title="@string/pref_display_cutout_area" 
+            android:summary="Disabling should help with memory usage if software decompression is used, may increase loading times? decrease visual quality? need testing"/>
+
+        <CheckBoxPreference
+            android:key="pref_avoid16bits"
+            android:title="@string/pref_avoid16bits" 
+            android:defaultValue="true"/>
 
         <ListPreference
             android:key="pref_textureShrinking_v2"

diff --git a/buildscripts/CMakeLists.txt b/buildscripts/CMakeLists.txt
@@ -37,7 +37,7 @@ set(MYGUI_VERSION 3.4.3)
 set(MYGUI_HASH SHA256=d1d5f294670ae71f7200ed4b30859018281d8cfd45d6a38d18b97a4aba604c42)
 
 # https://github.com/sisah2/gl4es/releases
-set(GL4ES_VERSION eb87d808d643782d81f77e8013799e4bbd21dded)
+set(GL4ES_VERSION 8b6c0418dabe3410fc53918b66285588cde9a7e7)
 set(GL4ES_HASH SHA256=b565e717c7d192e936bda25f3cb90ad8db398af56414ec08294b6716574c1a6d)
 
 # https://github.com/openscenegraph/OpenSceneGraph/releases
@@ -56,7 +56,7 @@ set(LIBICU_VERSION 70-1)
 set(LIBICU_HASH SHA256=4013d7aff8a34bae410664bdb16554d7eda03654b22627b9284ab55a685492d4)
 
 # https://github.com/OpenMW/openmw/commits/master
-set(OPENMW_VERSION dcfb943186c8c0ec185f31b52bf10d172c674043)
+set(OPENMW_VERSION 6107a99cc70066b6d62ce7d1b418576170501591)
 set(OPENMW_HASH SHA256=44d044ad0a5546216fe611fe92c37065bb07e2efeeeaac4f049dae03df313186)
 
 # End of configurable options
@@ -539,6 +539,7 @@ set(OSG_PATCH
 	patch -d <SOURCE_DIR> -p1 -t -N < ${CMAKE_SOURCE_DIR}/patches/osg/0004-IncrementalCompileOperation-wrap-some-stuff-in-atomi.patch &&
 	patch -d <SOURCE_DIR> -p1 -t -N < ${CMAKE_SOURCE_DIR}/patches/osg/force-add-plugins.patch &&
 	patch -d <SOURCE_DIR> -p1 -t -N < ${CMAKE_SOURCE_DIR}/patches/osg/dae_collada.patch &&
+	patch -d <SOURCE_DIR> -p1 -t -N < ${CMAKE_SOURCE_DIR}/patches/osg/mipmaps.patch &&
 	patch -d <SOURCE_DIR> -p1 -t -N < ${CMAKE_SOURCE_DIR}/patches/osg/0005-CullSettings-make-inheritanceMask-atomic-to-silence-.patch
 )
 

diff --git a/buildscripts/patches/osg/mipmaps.patch b/buildscripts/patches/osg/mipmaps.patch
@@ -0,0 +1,29 @@
+diff --git a/src/osg/Texture.cpp b/src/osg/Texture.cpp
+index 2c0bd4b4e..74ba0ed07 100644
+--- a/src/osg/Texture.cpp
++++ b/src/osg/Texture.cpp
+@@ -2497,9 +2497,13 @@ void Texture::applyTexImage2D_load(State& state, GLenum target, const Image* ima
+             GLint blockSize, size;
+             getCompressedSize(_internalFormat, inwidth, inheight, 1, blockSize,size);
+
++            int size2 = size;
++            if (useHardwareMipMapGeneration)
++                size2 *= -1;
++
+             extensions->glCompressedTexImage2D(target, 0, _internalFormat,
+                 inwidth, inheight,0,
+-                size,
++                size2,
+                 dataPtr);
+         }
+
+@@ -2619,6 +2623,9 @@ void Texture::applyTexImage2D_load(State& state, GLenum target, const Image* ima
+
+                         getCompressedSize(_internalFormat, width, height, 1, blockSize,size);
+
++                        if (k == numMipmapLevels - 1)
++                            size *= -1;
++
+                         extensions->glCompressedTexImage2D(target, k, _internalFormat,
+                                                            width, height, _borderWidth,
+                                                            size, dataPtr + image->getMipmapOffset(k));