Skip to content

scala 3 port #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jportway wants to merge 1 commit into
base: master
Choose a base branch
from
Open

scala 3 port #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 12 additions & 9 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
import xerial.sbt.Sonatype.GitHubHosting

val scalaParallelCollectionsVersion = "1.0.3"
val lwjglVersion = "3.2.3"
val scalaTestVersion = "3.2.9"
val scalaParallelCollectionsVersion = "1.0.4"
val lwjglVersion = "3.3.2"
val scalaTestVersion = "3.2.15"
val logbackClassicVersion = "1.2.3"
val scalaLoggingVersion = "3.9.3"
val spireVersion = "0.17.0"
val scalaLoggingVersion = "3.9.5"
val spireVersion = "0.18.0"

val scala213 = "2.13.6"
val scala3 = "3.2.2"
lazy val supportedScalaVersions = List(scala213, scala3)

val scalaOptions =
Seq(
Expand All @@ -25,15 +27,16 @@ val scalaOptions =
lazy val commonSettings =
Seq(
organization := "com.github.simerplaha",
version := "0.1.0",
version := "0.1.1",
scalaVersion := scalaVersion.value,
scalaVersion in ThisBuild := scala213,
parallelExecution in ThisBuild := false,
ThisBuild/scalaVersion := scala3,
crossScalaVersions := supportedScalaVersions,
ThisBuild/parallelExecution := false,
scalacOptions ++= scalaOptions
)

val publishSettings = Seq[Setting[_]](
crossScalaVersions := Seq(scala213),
crossScalaVersions := supportedScalaVersions,
sonatypeProfileName := "com.github.simerplaha",
publishMavenStyle := true,
licenses := Seq("APL2" -> url("http://www.apache.org/licenses/LICENSE-2.0.txt")),
Expand Down
8 changes: 4 additions & 4 deletions graphics/src/main/scala/slack3d/graphics/shape/Box.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ object Box {
)

val front =
back.setFlipNormal(false) + Vector3(0, 0, 2 * widths.z)
back.setFlipNormal(false) + Vector3[Double](0, 0, 2 * widths.z)

val left =
Plane(
Expand All @@ -55,7 +55,7 @@ object Box {
)

val right =
left.setFlipNormal(true) + Vector3(2 * widths.x, 0, 0)
left.setFlipNormal(true) + Vector3[Double](2 * widths.x, 0, 0)

val top =
Plane(
Expand All @@ -68,7 +68,7 @@ object Box {
)

val bottom =
top.setFlipNormal(true) + Vector3(0, -(2 * widths.y), 0)
top.setFlipNormal(true) + Vector3[Double](0, -(2 * widths.y), 0)

new Box(
back = back,
Expand Down Expand Up @@ -115,7 +115,7 @@ case class Box(back: Plane,
Array(back, front, left, right, top, bottom)

def center() =
(back.center() + front.center() + left.center() + right.center() + top.center() + bottom.center()) / 6
(back.center + front.center + left.center + right.center + top.center + bottom.center) / 6

def updateColour(colour: Colour): Box =
mapPlanes(_.updateColour(colour))
Expand Down
Loading