diff --git a/src/main/scala/net/kogics/kojo/lite/Versions.scala b/src/main/scala/net/kogics/kojo/lite/Versions.scala index 35786b72a..320494f93 100644 --- a/src/main/scala/net/kogics/kojo/lite/Versions.scala +++ b/src/main/scala/net/kogics/kojo/lite/Versions.scala @@ -3,8 +3,8 @@ package net.kogics.kojo.lite object Versions { val KojoMajorVersion = "2.9" val KojoVersion = "2.9.09" - val KojoRevision = "r2" - val KojoBuildDate = "15 January 2020" + val KojoRevision = "r3" + val KojoBuildDate = "6 February 2021" val JavaVersion = { val jrv = System.getProperty("java.runtime.version") val arch = System.getProperty("os.arch") diff --git a/src/main/scala/net/kogics/kojo/picture/pics.scala b/src/main/scala/net/kogics/kojo/picture/pics.scala index 27ff10b0a..d0ba4b83c 100644 --- a/src/main/scala/net/kogics/kojo/picture/pics.scala +++ b/src/main/scala/net/kogics/kojo/picture/pics.scala @@ -872,23 +872,26 @@ class BatchPics(pics: List[Picture]) extends BasePicList(pics) { } } - var currPic = 0 + var currPicIndex = 0 var lastDraw = System.currentTimeMillis + + def currentPicture = pics(currPicIndex) + override def showNext(gap: Long) = Utils.runInSwingThread { val currTime = System.currentTimeMillis if (currTime - lastDraw > gap) { - pics(currPic).invisible() - currPic += 1 - if (currPic == pics.size) { - currPic = 0 + pics(currPicIndex).invisible() + currPicIndex += 1 + if (currPicIndex == pics.size) { + currPicIndex = 0 } - pics(currPic).visible() + pics(currPicIndex).visible() lastDraw = currTime } } override def picGeom: Geometry = Utils.runInSwingThreadAndWait { - pgTransform.transform(pics(currPic).picGeom) + pgTransform.transform(pics(currPicIndex).picGeom) } def copy = BatchPics(picsCopy).withGap(padding)