diff --git a/src/main/kotlin/Game.kt b/src/main/kotlin/Game.kt index bab5db7..6a443ee 100644 --- a/src/main/kotlin/Game.kt +++ b/src/main/kotlin/Game.kt @@ -39,7 +39,6 @@ class Game: ApplicationAdapter() private lateinit var cubeInstance: ModelInstance private lateinit var floorInstance: ModelInstance private lateinit var suzanneInstance: ModelInstance - private lateinit var rockBatch: ModelCache private lateinit var knux: ModelInstance private lateinit var toyboxInstance: ModelInstance @@ -178,21 +177,6 @@ class Game: ApplicationAdapter() cubeInstance = ModelInstance(cube) floorInstance = ModelInstance(floor) suzanneInstance = ModelInstance(assetManager.get("suzanne.g3db", Model::class.java)) - val rock = assetManager.get("rock.g3db", Model::class.java) - val rocks = Array(75) { i-> - ModelInstance(rock, Matrix4( - Vector3( - rand.nextFloat(joeMany), - rand.nextFloat(-0.75f, 10.125f), - -rand.nextFloat(joeMany)), - rand.nextQuaternion(), - Util.one * rand.nextFloat(0.6f, 6.2f))) - } - rockBatch = ModelCache().apply { - begin() - add(rocks.asIterable()) - end() - } suzanneInstance.transform = Matrix4().translate(3.0f, 1.0f, -3.5f) knux = ModelInstance(assetManager.get("knux.g3db", Model::class.java)) @@ -262,7 +246,6 @@ class Game: ApplicationAdapter() modelBatch.begin(colin.camera) modelBatch.render(floorInstance, env) - modelBatch.render(rockBatch, env) modelBatch.render(cubeInstance, env) modelBatch.render(suzanneInstance, env) modelBatch.render(knux, env) @@ -280,7 +263,6 @@ class Game: ApplicationAdapter() override fun dispose() { - rockBatch.dispose() floor.dispose() cube.dispose() modelBatch.dispose() diff --git a/src/main/kotlin/Resources.kt b/src/main/kotlin/Resources.kt index 799efc2..586514d 100644 --- a/src/main/kotlin/Resources.kt +++ b/src/main/kotlin/Resources.kt @@ -56,7 +56,6 @@ class Resources private constructor() assetManager.load("cobblestone.png", Texture::class.java, linearMipped) assetManager.load("cobblestone_normal.png", Texture::class.java, linearMipped) assetManager.load("cobblestone_specular.png", Texture::class.java, linearMipped) - assetManager.load("rock.g3db", Model::class.java) assetManager.load("knux.g3db", Model::class.java) assetManager.load("toybox.g3db", Model::class.java) assetManager.load("cobblestone_bump.png", Texture::class.java, linearMipped) diff --git a/src/main/resources/rock.g3db b/src/main/resources/rock.g3db deleted file mode 100644 index 2e1ab12..0000000 Binary files a/src/main/resources/rock.g3db and /dev/null differ diff --git a/src/main/resources/rock.png b/src/main/resources/rock.png deleted file mode 100644 index 33a66c1..0000000 Binary files a/src/main/resources/rock.png and /dev/null differ diff --git a/src/main/resources/rocknorm.png b/src/main/resources/rocknorm.png deleted file mode 100644 index 2c32637..0000000 Binary files a/src/main/resources/rocknorm.png and /dev/null differ