From e63300339e9aa2f351a7c12a22354d771090ee51 Mon Sep 17 00:00:00 2001
From: minjaesong <alswo9628@gmail.com>
Date: Wed, 11 Oct 2023 02:51:50 +0900
Subject: [PATCH] corner occlusion should render now

---
 assets/mods/basegame/items/itemid.csv         |  2 ++
 assets/mods/basegame/items/items.tga          |  2 +-
 .../modulebasegame/gameitems/OreItemBase.kt   | 29 +++++++++++++++++++
 .../terrarum/worlddrawer/BlocksDrawer.kt      |  4 +--
 work_files/graphics/items/basegame_items.kra  |  4 +--
 5 files changed, 36 insertions(+), 5 deletions(-)
 create mode 100644 src/net/torvald/terrarum/modulebasegame/gameitems/OreItemBase.kt

diff --git a/assets/mods/basegame/items/itemid.csv b/assets/mods/basegame/items/itemid.csv
index f64f4dc66..80f4cf69d 100644
--- a/assets/mods/basegame/items/itemid.csv
+++ b/assets/mods/basegame/items/itemid.csv
@@ -15,6 +15,8 @@ id;classname
 
 16;net.torvald.terrarum.modulebasegame.gameitems.ItemWorkbench
 
+128;net.torvald.terrarum.modulebasegame.gameitems.OreCopper
+
 256;net.torvald.terrarum.modulebasegame.gameitems.ItemSwingingDoorOak
 257;net.torvald.terrarum.modulebasegame.gameitems.ItemSwingingDoorEbony
 258;net.torvald.terrarum.modulebasegame.gameitems.ItemSwingingDoorBirch
diff --git a/assets/mods/basegame/items/items.tga b/assets/mods/basegame/items/items.tga
index 50e8e6afe..823fcc630 100644
--- a/assets/mods/basegame/items/items.tga
+++ b/assets/mods/basegame/items/items.tga
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5ba755a2fc93d97fb23cd99ed4372ee674e9ceea5c294a81788b818bcb9d96e6
+oid sha256:a6ff2a13e285787cd048ac775036964a69b881a727459b63c07db7127a1d4d24
 size 2408466
diff --git a/src/net/torvald/terrarum/modulebasegame/gameitems/OreItemBase.kt b/src/net/torvald/terrarum/modulebasegame/gameitems/OreItemBase.kt
new file mode 100644
index 000000000..c705a1fda
--- /dev/null
+++ b/src/net/torvald/terrarum/modulebasegame/gameitems/OreItemBase.kt
@@ -0,0 +1,29 @@
+package net.torvald.terrarum.modulebasegame.gameitems
+
+import com.badlogic.gdx.graphics.g2d.TextureRegion
+import net.torvald.terrarum.CommonResourcePool
+import net.torvald.terrarum.gameitems.GameItem
+import net.torvald.terrarum.gameitems.ItemID
+
+/**
+ * Created by minjaesong on 2023-10-11.
+ */
+open class OreItemBase(originalID: ItemID) : GameItem(originalID) {
+    override var baseMass = 10.0
+    override var baseToolSize: Double? = null
+    override var inventoryCategory = Category.GENERIC
+    override val isDynamic = false
+    override val materialId = "OORE"
+}
+
+class OreTimber(originalID: ItemID) : OreItemBase(originalID) {
+    override var originalName = "ITEM_WOODS"
+    override val materialId = "WOOD"
+    override val itemImage: TextureRegion
+        get() = CommonResourcePool.getAsItemSheet("basegame.items").get(0,6)
+}
+class OreCopper(originalID: ItemID) : OreItemBase(originalID) {
+    override var originalName = "ITEM_ORE_MALACHITE"
+    override val itemImage: TextureRegion
+        get() = CommonResourcePool.getAsItemSheet("basegame.items").get(1,6)
+}
diff --git a/src/net/torvald/terrarum/worlddrawer/BlocksDrawer.kt b/src/net/torvald/terrarum/worlddrawer/BlocksDrawer.kt
index 4cd2d0215..edddff40a 100644
--- a/src/net/torvald/terrarum/worlddrawer/BlocksDrawer.kt
+++ b/src/net/torvald/terrarum/worlddrawer/BlocksDrawer.kt
@@ -373,7 +373,7 @@ internal object BlocksDrawer {
 //                            App.tileMaker.fluidToTileNumber(world.getFluid(x, y))
 //                        else
                             renderTag.tileNumber
-                var tileNumber = if (thisTile == 0) 0
+                var tileNumber = if (thisTile == 0 && mode != OCCLUSION) 0
                     // special case: actorblocks and F3 key
                     else if (renderOnF3Only.binarySearch(thisTile) >= 0 && !KeyToggler.isOn(Keys.F3))
                         0
@@ -617,7 +617,7 @@ internal object BlocksDrawer {
     }
 
     private var _tilesBufferAsTex: Texture = Texture(1, 1, Pixmap.Format.RGBA8888)
-    private val occlusionIntensity = 0.35f // too low value and dark-coloured walls won't darken enough
+    private val occlusionIntensity = 0.22222222f // too low value and dark-coloured walls won't darken enough
 
     private fun renderUsingBuffer(mode: Int, projectionMatrix: Matrix4, drawGlow: Boolean) {
         //Gdx.gl.glClearColor(.094f, .094f, .094f, 0f)
diff --git a/work_files/graphics/items/basegame_items.kra b/work_files/graphics/items/basegame_items.kra
index f792e056f..e4de19dc3 100644
--- a/work_files/graphics/items/basegame_items.kra
+++ b/work_files/graphics/items/basegame_items.kra
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4bcf9c503dd3496ffad5bf028e74e6104fdf2cbe6770cf56b33547a1f79a5a23
-size 302900
+oid sha256:04f8eea7cc54d52558f85191ac5e57e1d6d238fb09c84f6f785f6bffa3a57245
+size 333702