fluid viscosity on phys sim

This commit is contained in:
minjaesong
2024-07-16 17:32:56 +09:00
parent 6399f609a9
commit e77aa0c33f
12 changed files with 248 additions and 213 deletions

View File

@@ -78,6 +78,7 @@ class BlockCodex {
private fun register(module: String, records: List<CSVRecord>, blockRegisterHook: (BlockProp) -> Unit) {
records.forEach {
val id = it.intVal("id")
/*if (it.intVal("id") == -1) {
setProp(nullProp, it)
}
@@ -85,8 +86,8 @@ class BlockCodex {
setProp(blockProps[it.intVal("id")], it)
}*/
setProp(module, it.intVal("id"), it)
val tileId = "$module:${it.intVal("id")}"
setProp(module, id, it)
val tileId = "$module:$id"
// register tiles with dynamic light
if ((blockProps[tileId]?.dynamicLuminosityFunction ?: 0) != 0) {
@@ -209,8 +210,6 @@ class BlockCodex {
prop.baseLumCol.set(prop.baseLumColR, prop.baseLumColG, prop.baseLumColB, prop.baseLumColA)
prop.friction = record.intVal("fr")
prop.viscosity = record.intVal("vscs")
prop.colour = record.str16ToInt("colour")
//prop.isFluid = record.boolVal("fluid")
prop.isSolid = record.boolVal("solid")

View File

@@ -34,9 +34,6 @@ class BlockProp : TaggedProp {
var strength: Int = 0
var density: Int = 0
var viscosity: Int = 0
/** Fluid colour */
var colour: Int = 0
/** isSolid is NOT SAME AS !isOpaqueis
* Like, don't ever use this vars to tell this block should be removed by water or something,