bartek/base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Editor] Refactor CharacterSet asset name to CharacterSetAsset

Browse Source
This commit is contained in:
Bartłomiej Przemysław Pluta
2022-08-23 12:35:14 +02:00
parent e4b97ed812
commit ead9c1e669
6 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
editor/src/main/kotlin/com/bartlomiejpluta/base/editor/asset/component/AssetTreeCell.kt
View File

@@ -4,7 +4,7 @@ import com.bartlomiejpluta.base.editor.animation.asset.AnimationAsset
import com.bartlomiejpluta.base.editor.asset.model.Asset import com.bartlomiejpluta.base.editor.asset.model.Asset
import com.bartlomiejpluta.base.editor.asset.model.AssetCategory import com.bartlomiejpluta.base.editor.asset.model.AssetCategory
import com.bartlomiejpluta.base.editor.audio.asset.SoundAsset import com.bartlomiejpluta.base.editor.audio.asset.SoundAsset
import com.bartlomiejpluta.base.editor.characterset.asset.CharacterSet import com.bartlomiejpluta.base.editor.characterset.asset.CharacterSetAsset
import com.bartlomiejpluta.base.editor.gui.font.asset.FontAsset import com.bartlomiejpluta.base.editor.gui.font.asset.FontAsset
import com.bartlomiejpluta.base.editor.gui.widget.asset.WidgetAsset import com.bartlomiejpluta.base.editor.gui.widget.asset.WidgetAsset
import com.bartlomiejpluta.base.editor.iconset.asset.IconSetAsset import com.bartlomiejpluta.base.editor.iconset.asset.IconSetAsset
@@ -74,7 +74,7 @@ class AssetTreeCell(renameAsset: (asset: Asset, name: String) -> Asset, deleteAs
is GameMapAsset -> FontIcon("fa-map") is GameMapAsset -> FontIcon("fa-map")
is TileSetAsset -> FontIcon("fa-th") is TileSetAsset -> FontIcon("fa-th")
is ImageAsset -> FontIcon("fa-image") is ImageAsset -> FontIcon("fa-image")
is CharacterSet -> FontIcon("fa-male") is CharacterSetAsset -> FontIcon("fa-male")
is AnimationAsset -> FontIcon("fa-film") is AnimationAsset -> FontIcon("fa-film")
is IconSetAsset -> FontIcon("fa-file-image-o") is IconSetAsset -> FontIcon("fa-file-image-o")
is FontAsset -> FontIcon("fa-font") is FontAsset -> FontIcon("fa-font")

2
editor/src/main/kotlin/com/bartlomiejpluta/base/editor/characterset/asset/CharacterSet.kt → editor/src/main/kotlin/com/bartlomiejpluta/base/editor/characterset/asset/CharacterSetAsset.kt
View File

@@ -3,5 +3,5 @@ package com.bartlomiejpluta.base.editor.characterset.asset
import com.bartlomiejpluta.base.editor.asset.model.GraphicAsset import com.bartlomiejpluta.base.editor.asset.model.GraphicAsset
import com.bartlomiejpluta.base.editor.project.model.Project import com.bartlomiejpluta.base.editor.project.model.Project
class CharacterSet(project: Project, uid: String, source: String, name: String, rows: Int, columns: Int) : class CharacterSetAsset(project: Project, uid: String, source: String, name: String, rows: Int, columns: Int) :
GraphicAsset(project.characterSetsDirectoryProperty, uid, source, name, rows, columns) GraphicAsset(project.characterSetsDirectoryProperty, uid, source, name, rows, columns)

4
editor/src/main/kotlin/com/bartlomiejpluta/base/editor/project/context/DefaultProjectContext.kt
View File

@@ -8,7 +8,7 @@ import com.bartlomiejpluta.base.editor.audio.asset.SoundAssetData
import com.bartlomiejpluta.base.editor.code.model.Code import com.bartlomiejpluta.base.editor.code.model.Code
import com.bartlomiejpluta.base.editor.code.model.CodeType import com.bartlomiejpluta.base.editor.code.model.CodeType
import com.bartlomiejpluta.base.editor.code.service.JavaClassService import com.bartlomiejpluta.base.editor.code.service.JavaClassService
import com.bartlomiejpluta.base.editor.characterset.asset.CharacterSet import com.bartlomiejpluta.base.editor.characterset.asset.CharacterSetAsset
import com.bartlomiejpluta.base.editor.characterset.asset.CharacterSetAssetData import com.bartlomiejpluta.base.editor.characterset.asset.CharacterSetAssetData
import com.bartlomiejpluta.base.editor.file.model.FileNode import com.bartlomiejpluta.base.editor.file.model.FileNode
import com.bartlomiejpluta.base.editor.gui.font.asset.FontAsset import com.bartlomiejpluta.base.editor.gui.font.asset.FontAsset
@@ -206,7 +206,7 @@ class DefaultProjectContext : ProjectContext {
val source = "$uid.${data.file.extension}" val source = "$uid.${data.file.extension}"
val targetFile = File(it.characterSetsDirectory, source) val targetFile = File(it.characterSetsDirectory, source)
data.file.copyTo(targetFile) data.file.copyTo(targetFile)
it.characterSets += CharacterSet(it, uid, source, data.name, data.rows, data.columns) it.characterSets += CharacterSetAsset(it, uid, source, data.name, data.rows, data.columns)
save() save()
} }

4
editor/src/main/kotlin/com/bartlomiejpluta/base/editor/project/model/Project.kt
View File

@@ -3,7 +3,7 @@ package com.bartlomiejpluta.base.editor.project.model
import com.bartlomiejpluta.base.editor.animation.asset.AnimationAsset import com.bartlomiejpluta.base.editor.animation.asset.AnimationAsset
import com.bartlomiejpluta.base.editor.audio.asset.SoundAsset import com.bartlomiejpluta.base.editor.audio.asset.SoundAsset
import com.bartlomiejpluta.base.editor.database.source.DataSource import com.bartlomiejpluta.base.editor.database.source.DataSource
import com.bartlomiejpluta.base.editor.characterset.asset.CharacterSet import com.bartlomiejpluta.base.editor.characterset.asset.CharacterSetAsset
import com.bartlomiejpluta.base.editor.file.model.FileSystemNode import com.bartlomiejpluta.base.editor.file.model.FileSystemNode
import com.bartlomiejpluta.base.editor.gui.font.asset.FontAsset import com.bartlomiejpluta.base.editor.gui.font.asset.FontAsset
import com.bartlomiejpluta.base.editor.gui.widget.asset.WidgetAsset import com.bartlomiejpluta.base.editor.gui.widget.asset.WidgetAsset
@@ -38,7 +38,7 @@ class Project {
val maps = observableListOf<GameMapAsset>() val maps = observableListOf<GameMapAsset>()
val tileSets = observableListOf<TileSetAsset>() val tileSets = observableListOf<TileSetAsset>()
val images = observableListOf<ImageAsset>() val images = observableListOf<ImageAsset>()
val characterSets = observableListOf<CharacterSet>() val characterSets = observableListOf<CharacterSetAsset>()
val animations = observableListOf<AnimationAsset>() val animations = observableListOf<AnimationAsset>()
val iconSets = observableListOf<IconSetAsset>() val iconSets = observableListOf<IconSetAsset>()
val fonts = observableListOf<FontAsset>() val fonts = observableListOf<FontAsset>()

4
editor/src/main/kotlin/com/bartlomiejpluta/base/editor/project/serial/ProtobufProjectDeserializer.kt
View File

@@ -2,7 +2,7 @@ package com.bartlomiejpluta.base.editor.project.serial
import com.bartlomiejpluta.base.editor.animation.asset.AnimationAsset import com.bartlomiejpluta.base.editor.animation.asset.AnimationAsset
import com.bartlomiejpluta.base.editor.audio.asset.SoundAsset import com.bartlomiejpluta.base.editor.audio.asset.SoundAsset
import com.bartlomiejpluta.base.editor.characterset.asset.CharacterSet import com.bartlomiejpluta.base.editor.characterset.asset.CharacterSetAsset
import com.bartlomiejpluta.base.editor.gui.font.asset.FontAsset import com.bartlomiejpluta.base.editor.gui.font.asset.FontAsset
import com.bartlomiejpluta.base.editor.gui.widget.asset.WidgetAsset import com.bartlomiejpluta.base.editor.gui.widget.asset.WidgetAsset
import com.bartlomiejpluta.base.editor.iconset.asset.IconSetAsset import com.bartlomiejpluta.base.editor.iconset.asset.IconSetAsset
@@ -57,7 +57,7 @@ class ProtobufProjectDeserializer : ProjectDeserializer {
name = image.name name = image.name
) )
private fun deserializeCharacterSet(project: Project, characterSetAsset: ProjectProto.CharacterSetAsset) = CharacterSet( private fun deserializeCharacterSet(project: Project, characterSetAsset: ProjectProto.CharacterSetAsset) = CharacterSetAsset(
project = project, project = project,
uid = characterSetAsset.uid, uid = characterSetAsset.uid,
source = characterSetAsset.source, source = characterSetAsset.source,

4
editor/src/main/kotlin/com/bartlomiejpluta/base/editor/project/serial/ProtobufProjectSerializer.kt
View File

@@ -2,7 +2,7 @@ package com.bartlomiejpluta.base.editor.project.serial
import com.bartlomiejpluta.base.editor.animation.asset.AnimationAsset import com.bartlomiejpluta.base.editor.animation.asset.AnimationAsset
import com.bartlomiejpluta.base.editor.audio.asset.SoundAsset import com.bartlomiejpluta.base.editor.audio.asset.SoundAsset
import com.bartlomiejpluta.base.editor.characterset.asset.CharacterSet import com.bartlomiejpluta.base.editor.characterset.asset.CharacterSetAsset
import com.bartlomiejpluta.base.editor.gui.font.asset.FontAsset import com.bartlomiejpluta.base.editor.gui.font.asset.FontAsset
import com.bartlomiejpluta.base.editor.gui.widget.asset.WidgetAsset import com.bartlomiejpluta.base.editor.gui.widget.asset.WidgetAsset
import com.bartlomiejpluta.base.editor.iconset.asset.IconSetAsset import com.bartlomiejpluta.base.editor.iconset.asset.IconSetAsset
@@ -53,7 +53,7 @@ class ProtobufProjectSerializer : ProjectSerializer {
.setName(image.name) .setName(image.name)
.build() .build()
private fun serializeCharacterSet(characterSet: CharacterSet) = ProjectProto.CharacterSetAsset.newBuilder() private fun serializeCharacterSet(characterSet: CharacterSetAsset) = ProjectProto.CharacterSetAsset.newBuilder()
.setUid(characterSet.uid) .setUid(characterSet.uid)
.setSource(characterSet.source) .setSource(characterSet.source)
.setName(characterSet.name) .setName(characterSet.name)