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

LibGDX, here I am.

Browse Source
This commit is contained in:
minjaesong
2017-06-22 02:31:07 +09:00
parent 1ecbc57f83
commit ad481853bb
356 changed files with 3125 additions and 21138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/net/torvald/terrarum/worldgenerator/RoguelikeRandomiser.kt
View File

@@ -1,9 +1,9 @@
package net.torvald.terrarum.worldgenerator
import com.badlogic.gdx.graphics.Color
import net.torvald.dataclass.IntArrayStack
import net.torvald.colourutil.Col4096
import net.torvald.random.HQRNG
import org.newdawn.slick.Color
import java.util.*
/**
@@ -47,7 +47,7 @@ object RoguelikeRandomiser {
return Col4096(colourStack.pop(),
colourStack.pop(),
colourStack.pop())
.toSlickColour()
.toGdxColour()
}

10
src/net/torvald/terrarum/worldgenerator/WorldGenerator.kt
View File

@@ -6,7 +6,7 @@ import net.torvald.terrarum.blockproperties.Block
import com.jme3.math.FastMath
import com.sudoplay.joise.Joise
import com.sudoplay.joise.module.*
import net.torvald.terrarum.Terrarum
import net.torvald.terrarum.TerrarumGDX
import net.torvald.terrarum.concurrent.ThreadParallel
import net.torvald.terrarum.gameactors.roundInt
import java.util.*
@@ -748,14 +748,14 @@ object WorldGenerator {
}
private fun processNoiseLayers(noiseRecords: Array<TaggedJoise>) {
if (Terrarum.MULTITHREAD) {
if (TerrarumGDX.MULTITHREAD) {
// set up indices
for (i in 0..Terrarum.THREADS - 1) {
for (i in 0..TerrarumGDX.THREADS - 1) {
ThreadParallel.map(
i,
ThreadProcessNoiseLayers(
HEIGHT.toFloat().div(Terrarum.THREADS).times(i).roundInt(),
HEIGHT.toFloat().div(Terrarum.THREADS).times(i.plus(1)).roundInt() - 1,
HEIGHT.toFloat().div(TerrarumGDX.THREADS).times(i).roundInt(),
HEIGHT.toFloat().div(TerrarumGDX.THREADS).times(i.plus(1)).roundInt() - 1,
noiseRecords
),
"SampleJoiseMap"