kaze/orx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reduce duplication in orx build scripts. (#240)

Browse Source 
Co-authored-by: hamoid <abe@hamoid.com>
This commit is contained in:
Vechro
2022-06-19 09:06:16 +03:00
committed by GitHub
parent 88719292e9
commit 9f7a4899fa
74 changed files with 646 additions and 812 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
orx-jvm/orx-dnk3/build.gradle
View File

@@ -9,7 +9,7 @@ sourceSets {
}
dependencies {
implementation "com.google.code.gson:gson:$gsonVersion"
implementation libs.gson
implementation(project(":orx-fx"))
implementation(project(":orx-jvm:orx-keyframer"))
implementation(project(":orx-easing"))
@@ -20,11 +20,11 @@ dependencies {
demoImplementation(project(":orx-mesh-generators"))
demoImplementation(project(":orx-noise"))
demoImplementation("org.openrndr:openrndr-application:$openrndrVersion")
demoImplementation("org.openrndr:openrndr-extensions:$openrndrVersion")
demoImplementation("org.openrndr:openrndr-ffmpeg:$openrndrVersion")
demoImplementation("org.openrndr:openrndr-filter:$openrndrVersion")
demoRuntimeOnly("org.openrndr:openrndr-gl3:$openrndrVersion")
demoRuntimeOnly("org.openrndr:openrndr-gl3-natives-$openrndrOS:$openrndrVersion")
demoImplementation(libs.openrndr.application)
demoImplementation(libs.openrndr.extensions)
demoImplementation(libs.openrndr.ffmpeg)
demoImplementation(libs.openrndr.filter)
demoRuntimeOnly(libs.openrndr.gl3)
demoRuntimeOnly(libs.openrndr.gl3.natives)
demoImplementation(sourceSets.getByName("main").output)
}

4
orx-jvm/orx-dnk3/src/main/kotlin/PBRMaterial.kt
View File

@@ -598,6 +598,7 @@ class PBRMaterial : Material {
shadeStyle.parameter("textureNoise", noise128)
}
}
else -> {}
}
when (val source = texture.source) {
is Triplanar -> {
@@ -605,6 +606,7 @@ class PBRMaterial : Material {
shadeStyle.parameter("textureTriplanarScale$index", source.scale)
shadeStyle.parameter("textureTriplanarOffset$index", source.offset)
}
else -> {}
}
if (texture.target is TextureTarget.Height) {
val target = texture.target as TextureTarget.Height
@@ -691,6 +693,7 @@ class PBRMaterial : Material {
if (texture.target is TextureTarget.Height) {
when (val source = texture.source) {
is TextureFromColorBuffer -> shadeStyle.parameter("texture$index", source.texture)
else -> {}
}
when (val source = texture.source) {
is Triplanar -> {
@@ -698,6 +701,7 @@ class PBRMaterial : Material {
shadeStyle.parameter("textureTriplanarScale$index", source.scale)
shadeStyle.parameter("textureTriplanarOffset$index", source.offset)
}
else -> {}
}
val target = texture.target as TextureTarget.Height
shadeStyle.parameter("textureHeightScale$index", target.scale)

1
orx-jvm/orx-dnk3/src/main/kotlin/SceneRenderer.kt
View File

@@ -107,6 +107,7 @@ class SceneRenderer {
blur.spread = 1.0
blur.apply(target.colorBuffer(0), target.colorBuffer(0))
}
else -> {}
}
}
}