Merge remote-tracking branch 'upstream/master' into turkish_keywords_2.13.x

Author: bulent2k2

installer.i4j/kojo.install4j

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <install4j version="10.0.6" transformSequenceNumber="10">
   <directoryPresets config="/home/lalit/work/kojo/installer/icons" />
-  <application name="Kojo Learning Environment" applicationId="0071-0523-9450-8404" mediaDir="/home/lalit/kojo_installers/install4j" mediaFilePattern="${compiler:sys.shortName}_${compiler:sys.platform}_${compiler:sys.version}${compiler:sys.withJre}" shortName="Kojo" publisher="Kogics Foundation" publisherWeb="www.kogics.net/kojo" version="2.9.29" macVolumeId="41bac862080108f9" javaMinVersion="1.8" javaMaxVersion="17" jdkMode="jdk" jdkName="JDK 1.8">
+  <application name="Kojo Learning Environment" applicationId="0071-0523-9450-8404" mediaDir="/home/lalit/kojo_installers/install4j" mediaFilePattern="${compiler:sys.shortName}_${compiler:sys.platform}_${compiler:sys.version}${compiler:sys.withJre}" shortName="Kojo" publisher="Kogics Foundation" publisherWeb="www.kogics.net/kojo" version="2.9.30" macVolumeId="41bac862080108f9" javaMinVersion="1.8" javaMaxVersion="17" jdkMode="jdk" jdkName="JDK 1.8">
     <searchSequence>
       <registry />
       <envVar name="JAVA_HOME" />

installer/examples/tiledgame/game.kojo.installed

@@ -3,7 +3,7 @@ clearOutput()
 cleari()
 disablePanAndZoom()
 
-println("To win the game, find and drink the red-ball potion and then return to the starting point to drink the (initially covered) green-ball potion.")
+println("To win the game, find and drink the red-ball potion and then return to the starting point to drink the (initially covered) green-star potion.")
 println(s"\nTo modify the game layout, change '$installDir/examples/tiledgame/level1.tmx' using the Tiled editor from www.mapeditor.org")
 
 scroll(-canvasBounds.x, canvasBounds.y)
@@ -18,7 +18,11 @@ class Player(tx: Int, ty: Int, world: TileWorld) {
 
     // player images are 30x40
     // scale the player down to fit into a 24 pixel wide tile
-    def playerPicture(img: Image) = scale(0.8) -> Picture.image(img)
+    def playerPicture(img: Image) = {
+        val pic = Picture.image(img)
+        pic.scale(0.8)
+        pic
+    }
 
     val stillRight = picBatch(playerPicture(sheet.imageAt(0, 0)))
     val stillLeft = picBatch(playerPicture(sheet.imageAt(0, 1)))
@@ -181,7 +185,12 @@ class AttackerUpDown(tx: Int, ty: Int, world: TileWorld) {
     val sheet = SpriteSheet("tiles.png", 24, 24)
     // make attacker slighty smaller than a tile - to prevent picture based collision
     // with the player in an adjacent tile
-    def attackerPicture(img: Image) = scale(0.98) * trans(0.2, 0.2) -> Picture.image(img)
+    def attackerPicture(img: Image) = {
+        val pic = Picture.image(img)
+        pic.translate(0.2, 0.2)
+        pic.scale(0.98)
+        pic
+    }
 
     var currentPic = picBatch(List(
         sheet.imageAt(0, 6),
@@ -236,17 +245,25 @@ val attackers = List(
     new AttackerUpDown(35, 3, tileWorld)
 )
 
-val goal = trans(12, 12) * fillColor(cm.greenYellow) * penColor(black) -> Picture.circle(10)
+val goal = {
+    val pic = Picture.image("target.png")
+    pic.scale(0.3)
+    pic
+}
 goal.setPosition(tileWorld.tileToKojo(TileXY(9, 2)))
-goal.setOpacity(0.2)
-draw(goal)
+goal.setOpacity(0.4)
 
-val halfwayGoal = trans(12, 12) * fillColor(cm.red) * penColor(black) -> Picture.circle(10)
+val halfwayGoal = {
+    val pic = Picture.image("halfway-target.png")
+    pic.scale(0.5)
+    pic
+}
 halfwayGoal.setPosition(tileWorld.tileToKojo(TileXY(41, 15)))
-draw(halfwayGoal)
 
 tileWorld.draw()
 player.draw()
+draw(goal)
+draw(halfwayGoal)
 attackers.foreach { attacker =>
     attacker.draw()
 }

installer/examples/tiledgame/halfway-target.png

@@ -146,6 +146,7 @@ S_InstructionPalette=Instruction Palette
 S_TurtleController=Turtle Controller
 S_ArduinoProgramming=Arduino Programming
 S_StartingChallenges=Beginner Challenges
+S_SpriteBoundaryPolygon=Sprite Boundary Editor
 
 S_Help=Help
 S_KojoDocs=Kojo Documentation

installer/examples/tiledgame/target.png

@@ -127,6 +127,7 @@ S_InstructionPalette=Riferimento
 S_TurtleController=Comandi Tartaruga
 S_ArduinoProgramming=Programmazione per Arduino
 S_StartingChallenges=Sfide per i principianti
+S_SpriteBoundaryPolygon=Editor dell'area dello Sprite
 
 S_Help=Aiuto
 S_KojoOverview=Panoramica su Kojo
@@ -312,3 +313,4 @@ S_Dimension_Height=Altezza
 S_Dimension_Width=Larghezza
 S_WorksheetPragma=foglio di lavoro
 S_IncludePragma=includi
+S_ExecPragma=execute

src/main/resources/net/kogics/kojo/lite/Bundle.properties

@@ -128,6 +128,7 @@ S_InstructionPalette=Klicka p
 S_TurtleController=Styra paddan
 S_ArduinoProgramming=Arduino-programmering
 S_StartingChallenges=Övningar för nybörjare
+S_SpriteBoundaryPolygon=Editera sprite-avgränsning
 
 S_Help=Hjälp
 S_KojoOverview=Kojo översikt

src/main/resources/net/kogics/kojo/lite/Bundle_it.properties

@@ -8,15 +8,21 @@ val cb = canvasBounds
 drawStage(ColorMaker.hsl(240, 0.20, 0.16))
 
 def xCenteredPosition(picWidth: Double) = {
-    cb.x + (cb.width - picWidth) / 2
+    cb.x + (cb.width - picWidth) / 2 + picWidth / 2
 }
 
 class Lander {
     val bodyWidth = 40; val bodyHeight = 70
     val thrusterWidth = 20; val thrusterHeight = 35
-    val body = fillColor(red) -> Picture.rectangle(bodyWidth, bodyHeight)
+    val body = {
+        val pic = Picture.rectangle(bodyWidth, bodyHeight); pic.setFillColor(red)
+        pic
+    }
     body.setPosition(xCenteredPosition(bodyWidth), cb.y + cb.height - bodyHeight - 10)
-    val thruster = fillColor(orange) -> Picture.rectangle(thrusterWidth, thrusterHeight)
+    val thruster = {
+        val pic = Picture.rectangle(thrusterWidth, thrusterHeight); pic.setFillColor(orange)
+        pic
+    }
     setThrusterPosition()
 
     val gravity = Vector2D(0, -0.1)
@@ -68,15 +74,12 @@ class Lander {
 }
 
 class Moon {
-    val pic = Picture {
-        setPenColor(cm.lightBlue)
-        setFillColor(cm.darkGray)
-        right(45)
-        right(90, 500)
-    }
+    val pic = Picture.ellipse(350, 150)
+    pic.setPenColor(cm.lightBlue)
+    pic.setFillColor(cm.darkGray)
 
     // width of the moon is around 710 pixels
-    pic.setPosition(xCenteredPosition(710), cb.y)
+    pic.setPosition(xCenteredPosition(710), cb.y - 50)
 
     def draw() {
         pic.draw()
@@ -106,4 +109,4 @@ animate {
     l.step()
     m.check(l)
 }
-activateCanvas()
+activateCanvas()

src/main/resources/net/kogics/kojo/lite/Bundle_sv.properties

@@ -9,14 +9,26 @@ val PaddleW = 25
 val BallR = 15
 val Height = canvasBounds.height
 val Width = canvasBounds.width
-val PaddleSpeed = 5
+val PaddleSpeed = 400
 val pScaleFactor = 1.01
-val BallSpeed = 5
+val BallSpeed = 400
 val bScaleFactor = 1.001
 
-def paddle = penColor(darkGray) * fillColor(red) -> Picture.rectangle(PaddleW, PaddleH)
-def vline = penColor(white) -> Picture.vline(Height)
-def ball = penColor(cm.rgb(0, 230, 0)) * fillColor(cm.rgb(0, 230, 0)) -> Picture.circle(BallR)
+def paddle: Picture = {
+    val pic = Picture.rectangle(PaddleW, PaddleH)
+    pic.setPenColor(darkGray); pic.setFillColor(red)
+    pic
+}
+def vline = {
+    val pic = Picture.rectangle(0, Height)
+    pic.setPenColor(white)
+    pic
+}
+def ball = {
+    val pic = Picture.circle(BallR)
+    pic.setPenColor(cm.rgb(0, 230, 0)); pic.setFillColor(cm.rgb(0, 230, 0))
+    pic
+}
 
 class PaddleVelocity(speed0: Double, lastUp0: Boolean) {
     var speed = speed0
@@ -35,28 +47,42 @@ class Score(score0: Int, left0: Boolean) {
     var score = score0
     var left = left0
     val xt = if (left) -50 else 50
-    val pScore = Picture.textu(score, 20)
+    val pScore = Picture.text(score.toString, 20, cm.lightSteelBlue)
     pScore.translate(xt, Height / 2 - 10)
-    pScore.setPenColor(cm.lightSteelBlue)
     def incrScore() {
         score += 1
-        pScore.update(score)
+        pScore.setText(score.toString)
     }
 }
 
 val topbot = Seq(stageTop, stageBot)
-val paddle1 = trans(-Width / 2, 0) -> paddle
-val paddle2 = trans(Width / 2 - PaddleW, 0) -> paddle
-val centerLine = trans(0, -Height / 2) -> vline
-val leftGutter = trans(-Width / 2 + PaddleW, -Height / 2) -> vline
-val rightGutter = trans(Width / 2 - PaddleW, -Height / 2) -> vline
+val paddle1 = {
+    val pic = paddle; pic.translate(-Width / 2, 0)
+    pic
+}
+val paddle2 = {
+    val pic = paddle; pic.translate(Width / 2 - PaddleW, 0)
+    pic
+}
+val centerLine = {
+    val pic = vline; pic.translate(0, -Height / 2)
+    pic
+}
+val leftGutter = {
+    val pic = vline; pic.translate(-Width / 2 + PaddleW, -Height / 2)
+    pic
+}
+val rightGutter = {
+    val pic = vline; pic.translate(Width / 2 - PaddleW, -Height / 2)
+    pic
+}
 val gutters = Seq(leftGutter, rightGutter)
 val paddles = Seq(paddle1, paddle2)
 val gameBall = ball
 
 draw(paddle1, paddle2, centerLine, leftGutter, rightGutter, gameBall)
 
-val ballVel = Vector2D(BallSpeed, 3)
+val ballVel = Vector2D(BallSpeed, BallSpeed * 0.65)
 var currBallVel: Vector2D = ballVel
 
 val paddleVelocity = Map(
@@ -71,12 +97,14 @@ draw(scores(paddle1).pScore)
 draw(scores(paddle2).pScore)
 
 animate {
-    gameBall.translate(currBallVel)
+    val dt = frameDeltaTime
+    gameBall.translate(currBallVel * dt)
 
     if (gameBall.collision(paddles).isDefined) {
         currBallVel = Vector2D(-currBallVel.x, currBallVel.y)
     }
     else if (gameBall.collision(topbot).isDefined) {
+        gameBall.translate(-currBallVel * dt)
         currBallVel = Vector2D(currBallVel.x, -currBallVel.y)
     }
     else if (gameBall.collidesWith(leftGutter)) {
@@ -90,13 +118,13 @@ animate {
         scores(paddle1).incrScore()
     }
     else {
-        currBallVel = (currBallVel * bScaleFactor).limit(11)
+        currBallVel = (currBallVel * bScaleFactor).limit(800)
     }
-    paddleBehavior(paddle1, Kc.VK_A, Kc.VK_Z)
-    paddleBehavior(paddle2, Kc.VK_UP, Kc.VK_DOWN)
+    paddleBehavior(paddle1, Kc.VK_A, Kc.VK_Z, dt)
+    paddleBehavior(paddle2, Kc.VK_UP, Kc.VK_DOWN, dt)
 }
 
-def paddleBehavior(paddle: Picture, upkey: Int, downkey: Int) {
+def paddleBehavior(paddle: Picture, upkey: Int, downkey: Int, dt: Double) {
     val pVel = paddleVelocity(paddle)
     if (isKeyPressed(upkey) && !paddle.collidesWith(stageTop)) {
         if (pVel.lastUp) {
@@ -105,7 +133,7 @@ def paddleBehavior(paddle: Picture, upkey: Int, downkey: Int) {
         else {
             pVel.reset(!pVel.lastUp)
         }
-        paddle.translate(0, pVel.speed)
+        paddle.translate(0, pVel.speed * dt)
     }
     else if (isKeyPressed(downkey) && !paddle.collidesWith(stageBot)) {
         if (!pVel.lastUp) {
@@ -114,7 +142,7 @@ def paddleBehavior(paddle: Picture, upkey: Int, downkey: Int) {
         else {
             pVel.reset(!pVel.lastUp)
         }
-        paddle.translate(0, -pVel.speed)
+        paddle.translate(0, -pVel.speed * dt)
     }
     else {
         pVel.reset(pVel.lastUp)

src/main/resources/samples/lunar-lander.kojo

@@ -0,0 +1,62 @@
+cleari()
+clearOutput()
+
+val sprite = Picture.image(Costume.womanWaving)
+// Make the sprite point to your own image via the following:
+// val assetsDir = "/your/asset/folder"
+// val sprite = Picture.image(s"$assetsDir/your-sprite.png")
+
+draw(sprite)
+
+// double or float array to be printed
+val doubleArray = true
+
+println("Load your own sprite image above by changing the code as described at the start of the script.\n")
+println("Then click around the sprite image to create a polygonal boundary for the sprite (and feel free to zoom in while doing this).\n")
+println("Click twice (slowly) at the same point to finish off the boundary.\n")
+println("The last point (that you clicked twice at) is connected to the first point to create the boundary.\n")
+
+var points = ArrayBuffer.empty[Point]
+var pointsPic: Picture = Picture.rectangle(0, 0)
+pointsPic.draw()
+
+def updateBoundary() {
+    val pt = points.head
+    val pointsPic2 = picStack(
+        Picture.circle(5)
+            .withPenColor(blue).withFillColor(blue).withPosition(pt.x, pt.y),
+        Picture.fromVertexShape { s =>
+            s.beginShape()
+            points.foreach { pt =>
+                s.vertex(pt.x, pt.y)
+            }
+            s.endShape()
+        }.withPenColor(blue).withPenThickness(5)
+    )
+    pointsPic2.draw()
+    pointsPic.erase()
+    pointsPic = pointsPic2
+    pointsPic.tnode.repaint()
+}
+
+onMouseClick { (x, y) =>
+    points.append(Point(x, y))
+    updateBoundary()
+
+    val len = points.length
+    if (points(len - 2) == points(len - 1)) {
+        points.remove(len - 1)
+        points.append(points.head)
+        val pts = points
+            .flatMap(pt => Array(pt.x, pt.y))
+            .map(n => if (doubleArray) f"${n}%.1f" else f"${n}%.1ff")
+
+        println("Boundary Array:\n")
+        println(pts.mkString("Array(", ", ", ")"))
+        println("\nCopy the above array into your code as required.")
+        updateBoundary()
+        points = ArrayBuffer.empty[Point]
+    }
+}
+
+activateCanvas()

src/main/resources/samples/pong.kojo

@@ -63,6 +63,7 @@ trait Picture extends InputAware {
   def intersection(other: Picture): Geometry
   def contains(other: Picture): Boolean
   def distanceTo(other: Picture): Double
+  def isCloser(other: Picture, distance: Double): Boolean = distanceTo(other) < distance
   def area: Double
   def perimeter: Double
   def picGeom: Geometry

src/main/resources/samples/sprite-boundary-polygon.kojo

@@ -79,4 +79,5 @@ trait TSCanvasFeatures {
   def onAnimationStop(fn: => Unit): Unit
   def resetPanAndZoom(): Unit
   def disablePanAndZoom(): Unit
+  def frameDeltaTime: Double
 }

src/main/scala/net/kogics/kojo/core/Picture.scala

@@ -428,6 +428,7 @@ trait AppMenu {
     toolsMenu.add(menuItemFor("S_TurtleController", "turtle-controller.kojo"))
     toolsMenu.add(menuItemFor("S_ArduinoProgramming", "arduino-prog.kojo"))
     toolsMenu.add(menuItemFor("S_StartingChallenges", "get-started.kojo", "/challenge/"))
+    toolsMenu.add(menuItemFor("S_SpriteBoundaryPolygon", "sprite-boundary-polygon.kojo"))
     menuBar.add(toolsMenu)
 
     val helpMenu = newJMenu(Utils.loadString("S_Help"))