curioustorvald/Terrarum
1
0
Fork 0
mirror of https://github.com/curioustorvald/Terrarum.git synced 2026-06-12 19:44:05 +09:00
Code Issues Packages Projects Releases Wiki Activity

some changes

Browse Source
This commit is contained in:
minjaesong
2024-03-11 23:59:21 +09:00
parent b05ae829cc
commit c829245b41
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/net/torvald/terrarum/gameactors/ActorWithBody.kt
View File

@@ -685,9 +685,6 @@ open class ActorWithBody : Actor {
// isStationary = (hitbox - oldHitbox).magnitudeSquared < PHYS_EPSILON_VELO // isStationary = (hitbox - oldHitbox).magnitudeSquared < PHYS_EPSILON_VELO
isStationary = isCloseEnough(hitbox.startX, oldHitbox.startX) && // this is supposed to be more accurate, idk isStationary = isCloseEnough(hitbox.startX, oldHitbox.startX) && // this is supposed to be more accurate, idk
isCloseEnough(hitbox.startY, oldHitbox.startY) isCloseEnough(hitbox.startY, oldHitbox.startY)
printdbg(this, tooltipShowing.keys.sorted())
} }
fun getDrag(externalForce: Vector2): Vector2 { fun getDrag(externalForce: Vector2): Vector2 {

8
src/net/torvald/terrarum/modulebasegame/gameactors/FixtureTapestry.kt
View File

@@ -21,8 +21,9 @@ internal class FixtureTapestry : FixtureBase {
@Transient override val spawnNeedsWall = true @Transient override val spawnNeedsWall = true
@Transient override val spawnNeedsFloor = false @Transient override val spawnNeedsFloor = false
var artName = ""; private set // these properties are transient as they are filled in by reading a binary file
var artAuthor = ""; private set @Transient var artName = ""; private set
@Transient var artAuthor = ""; private set
// val tw = 1 // val tw = 1
// val th = 1 // val th = 1
@@ -109,6 +110,7 @@ internal class FixtureTapestry : FixtureBase {
App.disposables.add(texture) App.disposables.add(texture)
// must be re-spawned on reload to make it visible after load
spawn( spawn(
intTilewiseHitbox.canonicalX.toInt(), intTilewiseHitbox.canonicalX.toInt(),
intTilewiseHitbox.canonicalY.toInt(), intTilewiseHitbox.canonicalY.toInt(),
@@ -118,5 +120,5 @@ internal class FixtureTapestry : FixtureBase {
) )
} }
override var tooltipText: String? = "TEST\nSTRING"//if (artName.length + artAuthor.length > 0) "$artName\n$artAuthor" else null override var tooltipText: String? = if (artName.length + artAuthor.length > 0) "$artName\n$artAuthor" else null
} }