grass tex revert to smooth

2026-06-13 12:04:06 +09:00 · 2019-07-26 03:28:57 +09:00
parent 7ae5a8c132
commit f1d92744c0
20 changed files with 227 additions and 52 deletions
--- a/src/net/torvald/terrarum/modulebasegame/BuildingMaker.kt
+++ b/src/net/torvald/terrarum/modulebasegame/BuildingMaker.kt
@@ -132,7 +132,7 @@ class BuildingMaker(batch: SpriteBatch) : IngameInstance(batch) {

    val selection = ArrayList<Point2i>()

-    val blockMarkings = AppLoader.resourcePool.getAsTextureRegionPack("blockmarkings_common")
+    val blockMarkings = CommonResourcePool.getAsTextureRegionPack("blockmarkings_common")
    internal var showSelection = true
    val blockPointingCursor = object : ActorWithBody(Actor.RenderOrder.OVERLAY) {

--- a/src/net/torvald/terrarum/modulebasegame/EntryPoint.kt
+++ b/src/net/torvald/terrarum/modulebasegame/EntryPoint.kt
@@ -1,8 +1,8 @@
 package net.torvald.terrarum.modulebasegame

-import net.torvald.terrarum.AppLoader
 import net.torvald.terrarum.AppLoader.IS_DEVELOPMENT_BUILD
 import net.torvald.terrarum.AppLoader.printdbg
+import net.torvald.terrarum.CommonResourcePool
 import net.torvald.terrarum.ModMgr
 import net.torvald.terrarum.ModuleEntryPoint
 import net.torvald.terrarum.blockproperties.BlockCodex
@@ -33,13 +33,13 @@ class EntryPoint : ModuleEntryPoint() {


        // load common resources to the AssetsManager
-        AppLoader.resourcePool.addToLoadingList("$moduleName.items16") {
+        CommonResourcePool.addToLoadingList("$moduleName.items16") {
            TextureRegionPack(ModMgr.getGdxFile(moduleName, "items/items.tga"), 16, 16)
        }
-        AppLoader.resourcePool.addToLoadingList("$moduleName.items24") {
+        CommonResourcePool.addToLoadingList("$moduleName.items24") {
            TextureRegionPack(ModMgr.getGdxFile(moduleName, "items/items24.tga"), 24, 24)
        }
-        AppLoader.resourcePool.addToLoadingList("$moduleName.items48") {
+        CommonResourcePool.addToLoadingList("$moduleName.items48") {
            TextureRegionPack(ModMgr.getGdxFile(moduleName, "items/items48.tga"), 48, 48)
        }

--- a/src/net/torvald/terrarum/modulebasegame/gameactors/FixtureCraftingTable.kt
+++ b/src/net/torvald/terrarum/modulebasegame/gameactors/FixtureCraftingTable.kt
@@ -3,7 +3,7 @@ package net.torvald.terrarum.modulebasegame.gameactors
 import com.badlogic.gdx.graphics.Camera
 import com.badlogic.gdx.graphics.Color
 import com.badlogic.gdx.graphics.g2d.SpriteBatch
-import net.torvald.terrarum.AppLoader
+import net.torvald.terrarum.CommonResourcePool
 import net.torvald.terrarum.Second
 import net.torvald.terrarum.Terrarum
 import net.torvald.terrarum.gameactors.AVKey
@@ -21,7 +21,7 @@ internal class FixtureCraftingTable : FixtureBase(
    init {
        setHitboxDimension(16, 16, 0, 0)

-        makeNewSprite(TextureRegionPack(AppLoader.resourcePool.getAsTextureRegion("itemplaceholder_16").texture, 16, 16))
+        makeNewSprite(TextureRegionPack(CommonResourcePool.getAsTextureRegion("itemplaceholder_16").texture, 16, 16))
        sprite!!.setRowsAndFrames(1, 1)

        actorValue[AVKey.BASEMASS] = MASS
@@ -49,7 +49,7 @@ internal object UICraftingTable : UICanvas() {
    override fun renderUI(batch: SpriteBatch, camera: Camera) {

        batch.color = Color.WHITE
-        batch.draw(AppLoader.resourcePool.getAsTextureRegion("test_texture"), 0f, 0f)
+        batch.draw(CommonResourcePool.getAsTextureRegion("test_texture"), 0f, 0f)

    }

--- a/src/net/torvald/terrarum/modulebasegame/gameitems/ItemCraftingTable.kt
+++ b/src/net/torvald/terrarum/modulebasegame/gameitems/ItemCraftingTable.kt
@@ -1,7 +1,7 @@
 package net.torvald.terrarum.modulebasegame.gameitems

 import com.badlogic.gdx.graphics.g2d.TextureRegion
-import net.torvald.terrarum.AppLoader
+import net.torvald.terrarum.CommonResourcePool
 import net.torvald.terrarum.Terrarum
 import net.torvald.terrarum.gameitem.GameItem
 import net.torvald.terrarum.gameitem.ItemID
@@ -23,7 +23,7 @@ class ItemCraftingTable(originalID: ItemID) : GameItem(originalID) {
    override val isDynamic = false
    override val material = Material()
    override val itemImage: TextureRegion?
-        get() = AppLoader.resourcePool.getAsTextureRegion("itemplaceholder_16")
+        get() = CommonResourcePool.getAsTextureRegion("itemplaceholder_16")
    override var baseToolSize: Double? = baseMass

    init {
--- a/src/net/torvald/terrarum/modulebasegame/gameitems/PickaxeGeneric.kt
+++ b/src/net/torvald/terrarum/modulebasegame/gameitems/PickaxeGeneric.kt
@@ -1,7 +1,7 @@
 package net.torvald.terrarum.modulebasegame.gameitems

 import com.badlogic.gdx.graphics.g2d.TextureRegion
-import net.torvald.terrarum.AppLoader
+import net.torvald.terrarum.CommonResourcePool
 import net.torvald.terrarum.Point2d
 import net.torvald.terrarum.Terrarum
 import net.torvald.terrarum.blockproperties.Block
@@ -14,7 +14,6 @@ import net.torvald.terrarum.itemproperties.MaterialCodex
 import net.torvald.terrarum.modulebasegame.TerrarumIngame
 import net.torvald.terrarum.modulebasegame.gameitems.PickaxeCore.BASE_MASS_AND_SIZE
 import net.torvald.terrarum.modulebasegame.gameitems.PickaxeCore.TOOL_DURABILITY_BASE
-import net.torvald.terrarumsansbitmap.gdx.TextureRegionPack
 import kotlin.math.roundToInt

 /**
@@ -85,7 +84,7 @@ class PickaxeCopper(originalID: ItemID) : GameItem(originalID) {
    override val material = MaterialCodex["CUPR"]
    override var baseMass = material.density.toDouble() / MaterialCodex["IRON"].density * BASE_MASS_AND_SIZE
    override val itemImage: TextureRegion?
-        get() = (AppLoader.resourcePool["basegame.items24"] as TextureRegionPack).get(0,0)
+        get() = CommonResourcePool.getAsTextureRegionPack("basegame.items24").get(0,0)

    init {
        super.equipPosition = GameItem.EquipPosition.HAND_GRIP
@@ -112,7 +111,7 @@ class PickaxeIron(originalID: ItemID) : GameItem(originalID) {
    override val material = MaterialCodex["IRON"]
    override var baseMass = material.density.toDouble() / MaterialCodex["IRON"].density * BASE_MASS_AND_SIZE
    override val itemImage: TextureRegion?
-        get() = (AppLoader.resourcePool["basegame.items24"] as TextureRegionPack).get(1,0)
+        get() = CommonResourcePool.getAsTextureRegionPack("basegame.items24").get(1,0)

    init {
        super.equipPosition = GameItem.EquipPosition.HAND_GRIP
@@ -139,7 +138,7 @@ class PickaxeSteel(originalID: ItemID) : GameItem(originalID) {
    override val material = MaterialCodex["STAL"]
    override var baseMass = material.density.toDouble() / MaterialCodex["IRON"].density * BASE_MASS_AND_SIZE
    override val itemImage: TextureRegion?
-        get() = (AppLoader.resourcePool["basegame.items24"] as TextureRegionPack).get(2,0)
+        get() = CommonResourcePool.getAsTextureRegionPack("basegame.items24").get(2,0)

    init {
        super.equipPosition = GameItem.EquipPosition.HAND_GRIP
--- a/src/net/torvald/terrarum/modulebasegame/gameitems/TikiTorchTester.kt
+++ b/src/net/torvald/terrarum/modulebasegame/gameitems/TikiTorchTester.kt
@@ -1,7 +1,7 @@
 package net.torvald.terrarum.modulebasegame.gameitems

 import com.badlogic.gdx.graphics.g2d.TextureRegion
-import net.torvald.terrarum.AppLoader
+import net.torvald.terrarum.CommonResourcePool
 import net.torvald.terrarum.Terrarum
 import net.torvald.terrarum.gameitem.GameItem
 import net.torvald.terrarum.gameitem.ItemID
@@ -22,7 +22,7 @@ class TikiTorchTester(originalID: ItemID) : GameItem(originalID) {
    override val isDynamic = false
    override val material = Material()
    override val itemImage: TextureRegion?
-        get() = AppLoader.resourcePool.getAsTextureRegion("itemplaceholder_48")
+        get() = CommonResourcePool.getAsTextureRegion("itemplaceholder_48")
    override var baseToolSize: Double? = baseMass

    init {
--- a/src/net/torvald/terrarum/modulebasegame/gameitems/WirePieceSignalWire.kt
+++ b/src/net/torvald/terrarum/modulebasegame/gameitems/WirePieceSignalWire.kt
@@ -1,7 +1,7 @@
 package net.torvald.terrarum.modulebasegame.gameitems

 import com.badlogic.gdx.graphics.g2d.TextureRegion
-import net.torvald.terrarum.AppLoader
+import net.torvald.terrarum.CommonResourcePool
 import net.torvald.terrarum.blockproperties.Wire
 import net.torvald.terrarum.gameitem.GameItem
 import net.torvald.terrarum.gameitem.ItemID
@@ -22,7 +22,7 @@ class WirePieceSignalWire(originalID: ItemID) : GameItem(originalID) {
    override val isDynamic = false
    override val material = Material()
    override val itemImage: TextureRegion?
-        get() = AppLoader.resourcePool.getAsTextureRegionPack("basegame.items16").get(1,9)
+        get() = CommonResourcePool.getAsTextureRegionPack("basegame.items16").get(1,9)

    init {
        super.equipPosition = GameItem.EquipPosition.HAND_GRIP
--- a/src/net/torvald/terrarum/modulebasegame/ui/UIInventoryFull.kt
+++ b/src/net/torvald/terrarum/modulebasegame/ui/UIInventoryFull.kt
@@ -45,9 +45,13 @@ class UIInventoryFull(

    init {
        handler.allowESCtoClose = true
+        CommonResourcePool.addToLoadingList("inventory_caticons") {
+            TextureRegionPack("./assets/graphics/gui/inventory/category.tga", 20, 20)
+        }
+        CommonResourcePool.loadAll()
    }

-    internal val catIcons: TextureRegionPack = TextureRegionPack("./assets/graphics/gui/inventory/category.tga", 20, 20)
+    internal val catIcons: TextureRegionPack = CommonResourcePool.getAsTextureRegionPack("inventory_caticons")
    internal val catArrangement: IntArray = intArrayOf(9,6,7,1,0,2,3,4,5,8)


--- a/src/net/torvald/terrarum/modulebasegame/ui/UIItemInventoryEquippedView.kt
+++ b/src/net/torvald/terrarum/modulebasegame/ui/UIItemInventoryEquippedView.kt
@@ -146,6 +146,7 @@ class UIItemInventoryEquippedView(
    
    override fun dispose() {
        itemGrid.forEach { it.dispose() }
+        equipPosIcon.dispose()
    }

    override fun touchDown(screenX: Int, screenY: Int, pointer: Int, button: Int): Boolean {