Skip to content

Commit 08ecacf

Browse files
committed
remove useless classes
1 parent 611ab1b commit 08ecacf

File tree

6 files changed

+7
-127
lines changed

6 files changed

+7
-127
lines changed

src/main/kotlin/solve/rendering/engine/components/Component.kt

Lines changed: 0 additions & 25 deletions
This file was deleted.

src/main/kotlin/solve/rendering/engine/components/SpriteRenderer.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
package solve.rendering.engine.components
22

33
import solve.rendering.engine.core.texture.Texture2D
4+
import solve.rendering.engine.scene.Transform
45
import solve.rendering.engine.structures.Color
56

6-
class SpriteRenderer() : Component() {
7+
class SpriteRenderer(val transform: Transform = Transform()) {
78
var color = Color.white
89
private set
910
var sprite: Sprite? = null

src/main/kotlin/solve/rendering/engine/core/renderers/Renderer.kt

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import org.lwjgl.opengl.GL11.glDrawElements
55
import solve.rendering.engine.Window
66
import solve.rendering.engine.core.batch.RenderBatch
77
import solve.rendering.engine.core.texture.Texture2D
8-
import solve.rendering.engine.scene.RenderObject
98
import solve.rendering.engine.shader.ShaderProgram
109

1110
abstract class Renderer(protected val window: Window) {
@@ -46,10 +45,6 @@ abstract class Renderer(protected val window: Window) {
4645
shaderProgram.delete()
4746
}
4847

49-
open fun addRenderObject(renderObject: RenderObject) { }
50-
51-
open fun removeRenderObject(renderObject: RenderObject): Boolean = false
52-
5348
protected fun getAvailableBatch(texture: Texture2D?, requiredZIndex: Int): RenderBatch {
5449
batches.forEach { batch ->
5550
if (batch.isFull || batch.zIndex != requiredZIndex) {

src/main/kotlin/solve/rendering/engine/core/renderers/SpritesRenderer.kt

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import solve.rendering.engine.Window
88
import solve.rendering.engine.components.SpriteRenderer
99
import solve.rendering.engine.core.batch.PrimitiveType
1010
import solve.rendering.engine.core.batch.RenderBatch
11-
import solve.rendering.engine.scene.RenderObject
1211
import solve.rendering.engine.shader.ShaderAttributeType
1312
import solve.rendering.engine.shader.ShaderProgram
1413
import solve.rendering.engine.shader.ShaderType
@@ -59,14 +58,13 @@ class SpritesRenderer(
5958
override fun updateBatchesData() {
6059
spriteRenderers.forEach { spriteRenderer ->
6160
val sprite = spriteRenderer.sprite ?: return@forEach
62-
val gameObject = spriteRenderer.renderObject ?: return@forEach
6361

6462
val texture = sprite.texture
6563
val textureSidesRatio = texture.width.toFloat() / texture.height.toFloat()
66-
val batch = getAvailableBatch(texture, gameObject.transform.zIndex)
64+
val batch = getAvailableBatch(texture, spriteRenderer.transform.zIndex)
6765
val textureID = batch.getTextureLocalID(texture)
68-
val scale = gameObject.transform.scale
69-
val position = gameObject.transform.position
66+
val scale = spriteRenderer.transform.scale
67+
val position = spriteRenderer.transform.position
7068
val color = spriteRenderer.color
7169
val uvCoordinates = sprite.uvCoordinates
7270

@@ -84,19 +82,11 @@ class SpritesRenderer(
8482
}
8583
}
8684

87-
override fun addRenderObject(renderObject: RenderObject) {
88-
val spriteRenderer = renderObject.getComponentOfType<SpriteRenderer>()
89-
if (spriteRenderer == null) {
90-
println("The adding gameobject does not has a sprite renderer component!")
91-
return
92-
}
93-
85+
fun addSpriteRenderer(spriteRenderer: SpriteRenderer) {
9486
spriteRenderers.add(spriteRenderer)
9587
}
9688

97-
override fun removeRenderObject(renderObject: RenderObject): Boolean {
98-
val spriteRenderer = renderObject.getComponentOfType<SpriteRenderer>() ?: return false
99-
89+
fun removeSpriteRenderer(spriteRenderer: SpriteRenderer): Boolean {
10090
return spriteRenderers.remove(spriteRenderer)
10191
}
10292

src/main/kotlin/solve/rendering/engine/scene/RenderObject.kt

Lines changed: 0 additions & 73 deletions
This file was deleted.

src/main/kotlin/solve/rendering/engine/scene/SceneData.kt

Lines changed: 0 additions & 8 deletions
This file was deleted.

0 commit comments

Comments
 (0)