AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-27 22:06:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Removed "continuous rendering" setting, should always be false since Actions 'override' this and all our animations use Actions"

Browse Source 
This reverts commit d1afbb4a6259d6273e8d3423d5353bdc8d9b8c2d.
This commit is contained in:
yairm210 2024-08-24 22:21:35 +03:00
parent d1afbb4a62
commit 859b55da02
4 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
android/assets/jsons/translations/template.properties
View File

@ -833,6 +833,11 @@ Show pixel units =
Show pixel improvements = Show pixel improvements =
Unit icon opacity = Unit icon opacity =
### Performance subgroup
Performance =
Continuous rendering =
When disabled, saves battery life but certain animations will be suspended =
## Gameplay tab ## Gameplay tab
Gameplay = Gameplay =

2
core/src/com/unciv/UncivGame.kt
View File

@ -139,7 +139,7 @@ open class UncivGame(val isConsoleMode: Boolean = false) : Game(), PlatformSpeci
settings.tileSet = Constants.defaultTileset settings.tileSet = Constants.defaultTileset
} }
Gdx.graphics.isContinuousRendering = false Gdx.graphics.isContinuousRendering = settings.continuousRendering
Concurrency.run("LoadJSON") { Concurrency.run("LoadJSON") {
RulesetCache.loadRulesets() RulesetCache.loadRulesets()

1
core/src/com/unciv/models/metadata/GameSettings.kt
View File

@ -80,6 +80,7 @@ class GameSettings {
var unitIconOpacity = 1f // default corresponds to fully opaque var unitIconOpacity = 1f // default corresponds to fully opaque
val showPixelUnits: Boolean get() = unitSet != null val showPixelUnits: Boolean get() = unitSet != null
var showPixelImprovements: Boolean = true var showPixelImprovements: Boolean = true
var continuousRendering = false
var orderTradeOffersByAmount = true var orderTradeOffersByAmount = true
var confirmNextTurn = false var confirmNextTurn = false
var windowState = WindowState() var windowState = WindowState()

19
core/src/com/unciv/ui/popups/options/DisplayTab.kt
View File

@ -2,6 +2,7 @@ package com.unciv.ui.popups.options
import com.badlogic.gdx.Application import com.badlogic.gdx.Application
import com.badlogic.gdx.Gdx import com.badlogic.gdx.Gdx
import com.badlogic.gdx.graphics.Color
import com.badlogic.gdx.scenes.scene2d.ui.SelectBox import com.badlogic.gdx.scenes.scene2d.ui.SelectBox
import com.badlogic.gdx.scenes.scene2d.ui.Table import com.badlogic.gdx.scenes.scene2d.ui.Table
import com.badlogic.gdx.utils.Array import com.badlogic.gdx.utils.Array
@ -12,12 +13,14 @@ import com.unciv.models.skins.SkinCache
import com.unciv.models.tilesets.TileSetCache import com.unciv.models.tilesets.TileSetCache
import com.unciv.models.translations.tr import com.unciv.models.translations.tr
import com.unciv.ui.components.extensions.addSeparator import com.unciv.ui.components.extensions.addSeparator
import com.unciv.ui.components.extensions.brighten
import com.unciv.ui.components.extensions.toLabel import com.unciv.ui.components.extensions.toLabel
import com.unciv.ui.components.extensions.toTextButton import com.unciv.ui.components.extensions.toTextButton
import com.unciv.ui.components.input.onChange import com.unciv.ui.components.input.onChange
import com.unciv.ui.components.input.onClick import com.unciv.ui.components.input.onClick
import com.unciv.ui.components.widgets.TranslatedSelectBox import com.unciv.ui.components.widgets.TranslatedSelectBox
import com.unciv.ui.components.widgets.UncivSlider import com.unciv.ui.components.widgets.UncivSlider
import com.unciv.ui.components.widgets.WrappableLabel
import com.unciv.ui.images.ImageGetter import com.unciv.ui.images.ImageGetter
import com.unciv.ui.popups.ConfirmPopup import com.unciv.ui.popups.ConfirmPopup
import com.unciv.ui.screens.basescreen.BaseScreen import com.unciv.ui.screens.basescreen.BaseScreen
@ -82,6 +85,22 @@ fun displayTab(
optionsPopup.addCheckbox(this, "Show pixel improvements", settings.showPixelImprovements, true) { settings.showPixelImprovements = it } optionsPopup.addCheckbox(this, "Show pixel improvements", settings.showPixelImprovements, true) { settings.showPixelImprovements = it }
addUnitIconAlphaSlider(this, settings, optionsPopup.selectBoxMinWidth) addUnitIconAlphaSlider(this, settings, optionsPopup.selectBoxMinWidth)
addSeparator()
add("Performance".toLabel(fontSize = 24)).colspan(2).row()
optionsPopup.addCheckbox(this, "Continuous rendering", settings.continuousRendering) {
settings.continuousRendering = it
Gdx.graphics.isContinuousRendering = it
}
val continuousRenderingDescription = "When disabled, saves battery life but certain animations will be suspended"
val continuousRenderingLabel = WrappableLabel(
continuousRenderingDescription,
optionsPopup.tabs.prefWidth, Color.ORANGE.brighten(0.7f), 14
)
continuousRenderingLabel.wrap = true
add(continuousRenderingLabel).colspan(2).padTop(10f).row()
} }
private fun addMinimapSizeSlider(table: Table, settings: GameSettings, selectBoxMinWidth: Float) { private fun addMinimapSizeSlider(table: Table, settings: GameSettings, selectBoxMinWidth: Float) {