curioustorvald/Terrarum
1
0
Fork 0
mirror of https://github.com/curioustorvald/Terrarum.git synced 2026-06-15 21:14:04 +09:00
Code Issues Packages Projects Releases Wiki Activity

working UV simulation using alpha channel

Browse Source
This commit is contained in:
minjaesong
2017-07-12 02:35:36 +09:00
parent e01ad32849
commit 7fc2d85c46
30 changed files with 94 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/net/torvald/terrarum/gameactors/ActorHumanoid.kt
View File

@@ -49,7 +49,7 @@ open class ActorHumanoid(birth: GameDate, death: GameDate? = null)
if (houseDesignation != null) houseDesignation!!.clear()
}
override var luminosity: Color
override var color: Color
get() = Color(
(actorValue.getAsFloat(AVKey.LUMR) ?: 0f) / LightmapRenderer.MUL_FLOAT,
(actorValue.getAsFloat(AVKey.LUMG) ?: 0f) / LightmapRenderer.MUL_FLOAT,

2
src/net/torvald/terrarum/gameactors/FixtureTikiTorch.kt
View File

@@ -12,7 +12,7 @@ import java.util.*
*/
internal class FixtureTikiTorch : FixtureBase(), Luminous {
override var luminosity: Color
override var color: Color
get() = BlockCodex[Block.TORCH].luminosity
set(value) {
throw UnsupportedOperationException()

6
src/net/torvald/terrarum/gameactors/Luminous.kt
View File

@@ -8,9 +8,11 @@ import com.badlogic.gdx.graphics.Color
interface Luminous {
/**
* Range of 0.0 - 4.0 for each channel
*
* Recommended implementation:
*
override var luminosity: Color
override var color: Color
get() = Color(
(actorValue.getAsFloat(AVKey.LUMR) ?: 0f) / LightmapRenderer.MUL_FLOAT,
(actorValue.getAsFloat(AVKey.LUMG) ?: 0f) / LightmapRenderer.MUL_FLOAT,
@@ -24,7 +26,7 @@ interface Luminous {
actorValue[AVKey.LUMA] = value.a * LightmapRenderer.MUL_FLOAT
}
*/
var luminosity: Color
var color: Color
/**
* Arguments:

6
src/net/torvald/terrarum/gameactors/PlayerBuilderSigrid.kt
View File

@@ -50,9 +50,9 @@ object PlayerBuilderSigrid {
p.actorValue[AVKey.INTELLIGENT] = true
//p.actorValue[AVKey.LUMR] = 0.84
//p.actorValue[AVKey.LUMR] = 0.93
//p.actorValue[AVKey.LUMR] = 1.37
p.actorValue[AVKey.LUMA] = 0.32
//p.actorValue[AVKey.LUMG] = 0.93
//p.actorValue[AVKey.LUMB] = 1.37
//p.actorValue[AVKey.LUMA] = 1.93
p.actorValue[AVKey.BASEDEFENCE] = 141

2
src/net/torvald/terrarum/gameactors/ProjectileSimple.kt
View File

@@ -28,7 +28,7 @@ open class ProjectileSimple(
val speed: Int
override var luminosity: Color
override var color: Color
get() = (bulletDatabase[type][OFFSET_LUMINOSITY] as Color).cpy()
set(value) {
}

4
src/net/torvald/terrarum/gameactors/WeaponSwung.kt
View File

@@ -11,13 +11,13 @@ class WeaponSwung(val itemID: Int) : ActorWithPhysics(Actor.RenderOrder.MIDTOP),
/**
* Recommended implementation:
*
override var luminosity: Int
override var color: Int
get() = actorValue.getAsInt(AVKey.LUMINOSITY) ?: 0
set(value) {
actorValue[AVKey.LUMINOSITY] = value
}
*/
override var luminosity: Color
override var color: Color
get() = throw UnsupportedOperationException()
set(value) {
}