Skip to content

Commit bd9f9c6

Browse files
committed
feat: introduce md2 frame index
1 parent 0840c19 commit bd9f9c6

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

cake/core/src/main/java/org/demoth/cake/stages/Game3dScreen.kt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -218,16 +218,17 @@ class Game3dScreen : KtxScreen, InputProcessor, ServerMessageProcessor {
218218
for (i in startIndex .. MAX_MODELS) {
219219
gameConfig[i]?.let { config ->
220220
config.value.let {
221-
config.resource = Md2ModelLoader(locator).loadMd2Model(it, skinIndex = 0)
221+
config.resource = Md2ModelLoader(locator).loadMd2Model(it, skinIndex = 0, frameIndex = 0)
222222
}
223223
}
224224
}
225225

226226
// temporary: load one fixed player model
227227
playerModel = Md2ModelLoader(locator).loadMd2Model(
228-
playerModelPath,
228+
modelName = playerModelPath,
229229
playerSkin = playerSkinPath,
230-
0
230+
skinIndex = 0,
231+
frameIndex = 0
231232
)!!
232233

233234
gameConfig.getSounds().forEach { config ->

cake/core/src/main/kotlin/org/demoth/cake/modelviewer/Md2ModelLoader.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ class Md2ModelLoader(val locator: ResourceLocator) {
1919
modelName: String,
2020
playerSkin: String? = null,
2121
skinIndex: Int,
22+
frameIndex: Int,
2223
): Model? {
2324
val findModel = locator.findModel(modelName)
2425
?: return null
@@ -28,7 +29,7 @@ class Md2ModelLoader(val locator: ResourceLocator) {
2829
locator.findSkin(it)
2930
}
3031

31-
val first = md2Model.frames.first()
32+
val first = md2Model.frames[frameIndex]
3233

3334
val vertexBuffer = md2Model.glCommands.flatMap {
3435
it.toFloats(first.points)

0 commit comments

Comments
 (0)