diff --git a/src/main/kotlin/Game.kt b/src/main/kotlin/Game.kt index ebbf803..51a2bfa 100644 --- a/src/main/kotlin/Game.kt +++ b/src/main/kotlin/Game.kt @@ -58,10 +58,9 @@ class Game: ApplicationAdapter() return modelBuilder.createBox(size, size, size, material, attribs.toLong()) } - private fun makeFloor(): Model + private fun makeFloor(size: Float): Model { - val size = 16.0f - val texs = 4.0f + val texs = size / 4.0f val vertex = { pos: Vector3, tex: Vector2 -> val normal = Util.up @@ -126,7 +125,8 @@ class Game: ApplicationAdapter() fntComic = assetManager.get("Comic Sans MS.ttf") cube = makeCube(texJolk) - floor = makeFloor() + var joeMany = 56.0f + floor = makeFloor(joeMany) spriteBatch = SpriteBatch() @@ -171,7 +171,7 @@ class Game: ApplicationAdapter() floorInstance = ModelInstance(floor) suzanneInstance = ModelInstance(assetManager.get("suzanne.g3db", Model::class.java)) val rock = assetManager.get("rock.g3db", Model::class.java) - val rand = RandomXS128(69 + 420 + 1919 + 916 + 42 + 911) + val rand = RandomXS128(69 + 420 + 1919 + 916 + 42 + 1) val randQuaternion = { rand: RandomXS128 -> var x: Float var y: Float @@ -184,14 +184,14 @@ class Game: ApplicationAdapter() val s = kotlin.math.sqrt((1.0f - z) / w) Quaternion(x, y, s * u, s * v) } - val rocks = Array(50) { i-> + val rocks = Array(75) { i-> ModelInstance(rock, Matrix4( Vector3( - rand.nextFloat(16.0f), - rand.nextFloat(-0.75f, 0.125f), - -rand.nextFloat(16.0f)), + rand.nextFloat(joeMany), + rand.nextFloat(-0.75f, 10.125f), + -rand.nextFloat(joeMany)), randQuaternion(rand), - Util.one * rand.nextFloat(0.6f, 1.2f))) + Util.one * rand.nextFloat(0.6f, 6.2f))) } rockBatch = ModelCache().apply { begin()