mirror of
https://github.com/yairm210/Unciv.git
synced 2025-07-10 15:59:33 +07:00
Remove experimental rendering (experiment unsuccessful)
This commit is contained in:
@ -737,7 +737,6 @@ Unit icon opacity =
|
|||||||
### Performance subgroup
|
### Performance subgroup
|
||||||
|
|
||||||
Continuous rendering =
|
Continuous rendering =
|
||||||
Experimental rendering improvements =
|
|
||||||
When disabled, saves battery life but certain animations will be suspended =
|
When disabled, saves battery life but certain animations will be suspended =
|
||||||
|
|
||||||
## Gameplay tab
|
## Gameplay tab
|
||||||
|
@ -78,7 +78,6 @@ class GameSettings {
|
|||||||
val showPixelUnits: Boolean get() = unitSet != null
|
val showPixelUnits: Boolean get() = unitSet != null
|
||||||
var showPixelImprovements: Boolean = true
|
var showPixelImprovements: Boolean = true
|
||||||
var continuousRendering = false
|
var continuousRendering = false
|
||||||
var experimentalRendering = false
|
|
||||||
var orderTradeOffersByAmount = true
|
var orderTradeOffersByAmount = true
|
||||||
var confirmNextTurn = false
|
var confirmNextTurn = false
|
||||||
var windowState = WindowState()
|
var windowState = WindowState()
|
||||||
|
@ -99,12 +99,6 @@ fun displayTab(
|
|||||||
)
|
)
|
||||||
continuousRenderingLabel.wrap = true
|
continuousRenderingLabel.wrap = true
|
||||||
add(continuousRenderingLabel).colspan(2).padTop(10f).row()
|
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) {
|
private fun addMinimapSizeSlider(table: Table, settings: GameSettings, selectBoxMinWidth: Float) {
|
||||||
|
File diff suppressed because it is too large
Load Diff
@ -6,7 +6,6 @@ import com.badlogic.gdx.graphics.g2d.SpriteBatch
|
|||||||
import com.badlogic.gdx.math.Rectangle
|
import com.badlogic.gdx.math.Rectangle
|
||||||
import com.badlogic.gdx.scenes.scene2d.Stage
|
import com.badlogic.gdx.scenes.scene2d.Stage
|
||||||
import com.badlogic.gdx.utils.viewport.Viewport
|
import com.badlogic.gdx.utils.viewport.Viewport
|
||||||
import com.unciv.UncivGame
|
|
||||||
import com.unciv.logic.event.Event
|
import com.unciv.logic.event.Event
|
||||||
import com.unciv.logic.event.EventBus
|
import com.unciv.logic.event.EventBus
|
||||||
import com.unciv.ui.crashhandling.wrapCrashHandling
|
import com.unciv.ui.crashhandling.wrapCrashHandling
|
||||||
@ -18,18 +17,7 @@ import com.unciv.utils.Log
|
|||||||
class UncivStage(viewport: Viewport) : Stage(viewport, getBatch()) {
|
class UncivStage(viewport: Viewport) : Stage(viewport, getBatch()) {
|
||||||
|
|
||||||
companion object {
|
companion object {
|
||||||
fun getBatch(size: Int=1000): Batch {
|
fun getBatch(size: Int=1000): Batch = SpriteBatch(size)
|
||||||
// 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)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
Reference in New Issue
Block a user