Remove experimental rendering (experiment unsuccessful)

This commit is contained in:
Yair Morgenstern
2023-04-24 17:31:42 +03:00
parent 033957c738
commit 0b3614d1df
5 changed files with 1 additions and 1472 deletions

View File

@ -737,7 +737,6 @@ Unit icon opacity =
### Performance subgroup
Continuous rendering =
Experimental rendering improvements =
When disabled, saves battery life but certain animations will be suspended =
## Gameplay tab

View File

@ -78,7 +78,6 @@ class GameSettings {
val showPixelUnits: Boolean get() = unitSet != null
var showPixelImprovements: Boolean = true
var continuousRendering = false
var experimentalRendering = false
var orderTradeOffersByAmount = true
var confirmNextTurn = false
var windowState = WindowState()

View File

@ -99,12 +99,6 @@ fun displayTab(
)
continuousRenderingLabel.wrap = true
add(continuousRenderingLabel).colspan(2).padTop(10f).row()
optionsPopup.addCheckbox(this, "Experimental rendering improvements", settings.experimentalRendering) {
settings.experimentalRendering = it
onChange()
}
}
private fun addMinimapSizeSlider(table: Table, settings: GameSettings, selectBoxMinWidth: Float) {

View File

@ -6,7 +6,6 @@ import com.badlogic.gdx.graphics.g2d.SpriteBatch
import com.badlogic.gdx.math.Rectangle
import com.badlogic.gdx.scenes.scene2d.Stage
import com.badlogic.gdx.utils.viewport.Viewport
import com.unciv.UncivGame
import com.unciv.logic.event.Event
import com.unciv.logic.event.EventBus
import com.unciv.ui.crashhandling.wrapCrashHandling
@ -18,18 +17,7 @@ import com.unciv.utils.Log
class UncivStage(viewport: Viewport) : Stage(viewport, getBatch()) {
companion object {
fun getBatch(size: Int=1000): Batch {
// If for some reason it fails, we resort to usual SpriteBatch
return if (UncivGame.Current.settings.experimentalRendering) {
try {
TextureArraySpriteBatch(size)
} catch (e: Exception) {
SpriteBatch(size)
}
} else {
SpriteBatch(size)
}
}
fun getBatch(size: Int=1000): Batch = SpriteBatch(size)
}
/**