Merge pull request #43 from matejsemancik/feature/libs-migration

Migrate core and contributed libraries
matejsemancik · Nov 15, 2019 · f130ea0 · f130ea0
2 parents 6541afa + 2ba8197
commit f130ea0
Show file tree

Hide file tree

Showing 49 changed files with 37 additions and 35 deletions.
diff --git a/build.gradle b/build.gradle
@@ -7,6 +7,7 @@ buildscript {
     ext.kotlin_version = '1.3.50'
     ext.koin_version = '2.0.0-beta-1'
     ext.lib_dir = properties.getProperty('libraries.dir')
+    ext.processing_core_dir = properties.getProperty('processing_core.dir')
 
     repositories {
         mavenCentral()
@@ -30,16 +31,14 @@ repositories {
 dependencies {
     compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
 
-    // Processing libs
-    compile fileTree(dir: 'library', include: '*.jar')
-    compile fileTree(dir: 'library/minim/library', include: '*.jar')
-    compile fileTree(dir: 'library/serial/library', include: '*.jar')
-    compile fileTree(dir: 'library/controlP5/library', include: '*.jar')
-    compile fileTree(dir: 'library/themidibus/library', include: '*.jar')
-    compile fileTree(dir: 'library/videoexport/library', include: '*.jar')
-    compile fileTree(dir: 'library/box2d_processing/library', include: '*.jar')
-    compile fileTree(dir: 'library/video/library', include: '*.jar')
-    compile fileTree(dir: 'library/extruder/library', include: '*.jar')
+    // Processing
+    compile fileTree(dir: "$processing_core_dir", include: '*.jar')
+    compile fileTree(dir: "$lib_dir/minim/library", include: '*.jar')
+    compile fileTree(dir: "$lib_dir/themidibus/library", include: '*.jar')
+    compile fileTree(dir: "$lib_dir/VideoExport/library", include: '*.jar')
+    compile fileTree(dir: "$lib_dir/box2d_processing/library", include: '*.jar')
+    compile fileTree(dir: "$lib_dir/video/library", include: '*.jar')
+    compile fileTree(dir: "$lib_dir/extruder/library", include: '*.jar')
     compile fileTree(dir: "$lib_dir/geomerative/library", include: '*.jar')
     compile fileTree(dir: "$lib_dir/PostFX/library", include: '*.jar')
 

diff --git a/library/box2d_processing/library/box2d_processing.jar b/library/box2d_processing/library/box2d_processing.jar
diff --git a/library/box2d_processing/library/jbox2d-library-2.2.1-ds.jar b/library/box2d_processing/library/jbox2d-library-2.2.1-ds.jar
diff --git a/library/controlP5/library/controlP5.jar b/library/controlP5/library/controlP5.jar
diff --git a/library/core.jar b/library/core.jar
diff --git a/library/export.txt b/library/export.txt
diff --git a/library/extruder/library/extruder.jar b/library/extruder/library/extruder.jar
diff --git a/library/gluegen-rt-natives-linux-aarch64.jar b/library/gluegen-rt-natives-linux-aarch64.jar
diff --git a/library/gluegen-rt-natives-linux-amd64.jar b/library/gluegen-rt-natives-linux-amd64.jar
diff --git a/library/gluegen-rt-natives-linux-armv6hf.jar b/library/gluegen-rt-natives-linux-armv6hf.jar
diff --git a/library/gluegen-rt-natives-linux-i586.jar b/library/gluegen-rt-natives-linux-i586.jar
diff --git a/library/gluegen-rt-natives-macosx-universal.jar b/library/gluegen-rt-natives-macosx-universal.jar
diff --git a/library/gluegen-rt-natives-windows-amd64.jar b/library/gluegen-rt-natives-windows-amd64.jar
diff --git a/library/gluegen-rt-natives-windows-i586.jar b/library/gluegen-rt-natives-windows-i586.jar
diff --git a/library/gluegen-rt.jar b/library/gluegen-rt.jar
diff --git a/library/jogl-all-natives-linux-aarch64.jar b/library/jogl-all-natives-linux-aarch64.jar
diff --git a/library/jogl-all-natives-linux-amd64.jar b/library/jogl-all-natives-linux-amd64.jar
diff --git a/library/jogl-all-natives-linux-armv6hf.jar b/library/jogl-all-natives-linux-armv6hf.jar
diff --git a/library/jogl-all-natives-linux-i586.jar b/library/jogl-all-natives-linux-i586.jar
diff --git a/library/jogl-all-natives-macosx-universal.jar b/library/jogl-all-natives-macosx-universal.jar
diff --git a/library/jogl-all-natives-windows-amd64.jar b/library/jogl-all-natives-windows-amd64.jar
diff --git a/library/jogl-all-natives-windows-i586.jar b/library/jogl-all-natives-windows-i586.jar
diff --git a/library/jogl-all.jar b/library/jogl-all.jar
diff --git a/library/minim/library/export.txt b/library/minim/library/export.txt
diff --git a/library/minim/library/jl1.0.1.jar b/library/minim/library/jl1.0.1.jar
diff --git a/library/minim/library/jsminim.jar b/library/minim/library/jsminim.jar
diff --git a/library/minim/library/minim.jar b/library/minim/library/minim.jar
diff --git a/library/minim/library/mp3spi1.9.5.jar b/library/minim/library/mp3spi1.9.5.jar
diff --git a/library/minim/library/tritonus_aos.jar b/library/minim/library/tritonus_aos.jar
diff --git a/library/minim/library/tritonus_share.jar b/library/minim/library/tritonus_share.jar
diff --git a/library/serial/library/jssc.jar b/library/serial/library/jssc.jar
diff --git a/library/serial/library/jssc.txt b/library/serial/library/jssc.txt
diff --git a/library/serial/library/linux-arm64/libjSSC-2.8.so b/library/serial/library/linux-arm64/libjSSC-2.8.so
diff --git a/library/serial/library/linux-armv6hf/libjSSC-2.8.so b/library/serial/library/linux-armv6hf/libjSSC-2.8.so
diff --git a/library/serial/library/linux32/libjSSC-2.8.so b/library/serial/library/linux32/libjSSC-2.8.so
diff --git a/library/serial/library/linux64/libjSSC-2.8.so b/library/serial/library/linux64/libjSSC-2.8.so
diff --git a/library/serial/library/macosx/libjSSC-2.8.jnilib b/library/serial/library/macosx/libjSSC-2.8.jnilib
diff --git a/library/serial/library/serial.jar b/library/serial/library/serial.jar
diff --git a/library/serial/library/windows32/jSSC-2.8.dll b/library/serial/library/windows32/jSSC-2.8.dll
diff --git a/library/serial/library/windows64/jSSC-2.8.dll b/library/serial/library/windows64/jSSC-2.8.dll
diff --git a/library/themidibus/library/themidibus.jar b/library/themidibus/library/themidibus.jar
diff --git a/library/videoexport/library/VideoExport.jar b/library/videoexport/library/VideoExport.jar
diff --git a/library/videoexport/library/jna-platform.jar b/library/videoexport/library/jna-platform.jar
diff --git a/library/videoexport/library/jna.jar b/library/videoexport/library/jna.jar
diff --git a/src/main/kotlin/dev/matsem/astral/Main.kt b/src/main/kotlin/dev/matsem/astral/Main.kt
@@ -4,6 +4,11 @@ import dev.matsem.astral.di.appModule
 import org.koin.core.context.startKoin
 
 fun main(args: Array<String>) {
+    println("args:")
+    args.forEach {
+        println(it)
+    }
+
     startKoin {
         logger()
         modules(appModule)

diff --git a/src/main/kotlin/dev/matsem/astral/di/koin_modules.kt b/src/main/kotlin/dev/matsem/astral/di/koin_modules.kt
@@ -1,7 +1,6 @@
 package dev.matsem.astral.di
 
 import com.hamoid.VideoExport
-import controlP5.ControlP5
 import ddf.minim.Minim
 import dev.matsem.astral.Config
 import dev.matsem.astral.sketches.SketchLoader
@@ -41,7 +40,6 @@ val appModule = module {
     // Controllers
     single { KontrolF1() }
     single { Galaxy() }
-    single { ControlP5(get()).apply { isAutoDraw = false } }
 
     // Midi tools
     single { MidiFileParser(get()) }

diff --git a/src/main/kotlin/dev/matsem/astral/sketches/SketchLoader.kt b/src/main/kotlin/dev/matsem/astral/sketches/SketchLoader.kt
@@ -39,6 +39,7 @@ import processing.core.PConstants
 import processing.core.PVector
 import processing.event.KeyEvent
 import java.io.BufferedReader
+import java.io.File
 import java.io.IOException
 import java.io.PrintWriter
 
@@ -437,7 +438,7 @@ class SketchLoader : PApplet(), KoinComponent {
             // The first L and R values in each row are low frequencies (bass)
             // and they go towards high frequency as we advance towards
             // the end of the line.
-            val msg = StringBuilder(PApplet.nf(chunkStartIndex / sampleRate, 0, 3).replace(',', '.'))
+            val msg = StringBuilder(nf(chunkStartIndex / sampleRate, 0, 3).replace(',', '.'))
             val beat = when {
                 beatDetect.isKick -> 1
                 beatDetect.isSnare -> 2
@@ -456,6 +457,22 @@ class SketchLoader : PApplet(), KoinComponent {
         track.close()
         output.flush()
         output.close()
-        PApplet.println("Sound analysis done")
+        println("Sound analysis done")
+    }
+
+    /**
+     * Sketch data path override. It's wrong when using local Processing installation core jars.
+     * Sketch folder path cannot be passed as an argument, does not play well with DI.
+     */
+    override fun dataPath(where: String): String {
+        return System.getProperty("user.dir") + "/data/" + where
+    }
+
+    /**
+     * Sketch data path override. It's wrong when using local Processing installation core jars.
+     * Sketch folder path cannot be passed as an argument, does not play well with DI.
+     */
+    override fun dataFile(where: String): File {
+        return File(System.getProperty("user.dir") + "/data/" + where)
     }
 }
diff --git a/src/main/kotlin/dev/matsem/astral/sketches/gameoflife/GameOfLifeSketch.kt b/src/main/kotlin/dev/matsem/astral/sketches/gameoflife/GameOfLifeSketch.kt
@@ -1,6 +1,5 @@
 package dev.matsem.astral.sketches.gameoflife
 
-import controlP5.ControlP5Constants.CENTER
 import dev.matsem.astral.Config
 import dev.matsem.astral.sketches.BaseSketch
 import dev.matsem.astral.sketches.SketchLoader
@@ -16,6 +15,7 @@ import org.koin.core.inject
 import processing.core.PApplet.constrain
 import processing.core.PApplet.lerp
 import processing.core.PConstants
+import processing.core.PConstants.CENTER
 import processing.core.PFont
 import processing.core.PGraphics
 import processing.core.PImage

diff --git a/src/main/kotlin/dev/matsem/astral/sketches/video/VideoSketch.kt b/src/main/kotlin/dev/matsem/astral/sketches/video/VideoSketch.kt
@@ -15,9 +15,9 @@ class VideoSketch : BaseSketch() {
     private val audioProcessor: AudioProcessor by inject()
     private val galaxy: Galaxy by inject()
 
-    private val movie1 = Movie(sketch, "movies/astral03_BACKGROUND.mp4")
-    private val movie2 = Movie(sketch, "movies/astral04_BACKGROUND.mp4")
-    private val astralLogo = sketch.loadImage("images/astrallogo_clean.png").apply {
+    private val movie1 = Movie(sketch, sketch.dataPath("movies/astral03_BACKGROUND.mp4"))
+    private val movie2 = Movie(sketch, sketch.dataPath("movies/astral04_BACKGROUND.mp4"))
+    private val astralLogo = sketch.loadImage(sketch.dataPath("images/astrallogo_clean.png")).apply {
         resizeRatioAware(height = sketch.shorterDimension() / 2)
     }