Skip to content

Commit fb0b292

Browse files
committed
0.9.9.0-6
kotlin 1.2.51 gradle 4.9 shadow 2.0.4
1 parent a33ad87 commit fb0b292

File tree

9 files changed

+19
-19
lines changed

9 files changed

+19
-19
lines changed

build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ apply plugin: 'com.github.johnrengelman.shadow'
1111

1212
buildscript {
1313

14-
ext.kotlinVersion = '1.2.50'
14+
ext.kotlinVersion = '1.2.51'
1515

1616
repositories {
1717
jcenter() // shadow
@@ -21,7 +21,7 @@ buildscript {
2121
}
2222
dependencies {
2323
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
24-
classpath 'com.github.jengelman.gradle.plugins:shadow:2.0.3'
24+
classpath 'com.github.jengelman.gradle.plugins:shadow:2.0.4'
2525
classpath "org.junit.platform:junit-platform-gradle-plugin:1.1.0"
2626
}
2727
}
@@ -30,7 +30,7 @@ dependencies {
3030

3131
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
3232

33-
implementation 'com.github.kotlin-graphics:kotlin-unsigned:0f6b48ccb2adb3a0c30e811cd75b4f2e66e1660b'
33+
implementation 'com.github.kotlin-graphics:kotlin-unsigned:a455438'
3434

3535
testImplementation 'io.kotlintest:kotlintest-runner-junit5:3.0.6'
3636

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.7-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-all.zip

src/main/kotlin/glm_/glm.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,5 +146,5 @@ val GLM_VERSION_MAJOR = 0
146146
val GLM_VERSION_MINOR = 9
147147
val GLM_VERSION_PATCH = 9
148148
val GLM_VERSION_REVISION = 0
149-
val GLM_VERSION_BUILD = 5
149+
val GLM_VERSION_BUILD = 6
150150
val GLM_VERSION = GLM_VERSION_MAJOR * 1_000 + GLM_VERSION_MINOR * 100 + GLM_VERSION_PATCH * 10 + GLM_VERSION_REVISION + GLM_VERSION_BUILD / 10f

src/main/kotlin/glm_/gtx/gtxFastTrigonometry.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ interface gtxFastTrigonometry {
2222
fun fastSin(angle: Float) = fastCos(HPIf - angle)
2323

2424
/** Faster than the common cos function but less accurate. */
25-
fun fastCos(angle: Float): Float {
26-
val angle = wrapAngle(angle)
25+
fun fastCos(angle_: Float): Float {
26+
val angle = wrapAngle(angle_)
2727

2828
return when {
2929
angle < HPIf -> detail.cos52s(angle)

src/main/kotlin/glm_/gtx/gtxInteger.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,10 +97,10 @@ interface gtxInteger {
9797

9898
// Henry Gordon Dietz: http://aggregate.org/MAGIC/
9999
interface detail_gtxInteger {
100-
fun ones32(x: uint): uint {
100+
fun ones32(x_: uint): uint {
101101
/* 32-bit recursive reduction using SWAR...
102102
but first step is mapping 2-bit values into sum of 2 1-bit values in sneaky way */
103-
var x = x
103+
var x = x_
104104
x -= (x ushr 1) and 0x55555555
105105
x = ((x ushr 2) and 0x33333333) + (x and 0x33333333)
106106
x = ((x ushr 4) + x) and 0x0f0f0f0f

src/main/kotlin/glm_/vec2/operators/opVec2ul.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ import glm_.vec2.Vec2ul.Companion.minus
77
import glm_.vec2.Vec2ul.Companion.plus
88
import glm_.vec2.Vec2ul.Companion.rem
99
import glm_.vec2.Vec2ul.Companion.times
10-
import udiv
10+
import unsigned.udiv
1111
import unsigned.Ulong
1212
import unsigned.toULong
13-
import urem
13+
import unsigned.urem
1414

1515
/**
1616
* Created by elect on 09/11/16.

src/main/kotlin/glm_/vec3/operators/vec3ul_operators.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ import glm_.vec3.Vec3ul.Companion.minus
77
import glm_.vec3.Vec3ul.Companion.plus
88
import glm_.vec3.Vec3ul.Companion.rem
99
import glm_.vec3.Vec3ul.Companion.times
10-
import udiv
10+
import unsigned.udiv
1111
import unsigned.Ulong
1212
import unsigned.udiv
1313
import unsigned.urem
14-
import urem
14+
import unsigned.urem
1515

1616
/**
1717
* Created by elect on 09/11/16.

src/main/kotlin/glm_/vec4/operators/vec4ul_operators.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ import glm_.vec4.Vec4ul.Companion.minus
77
import glm_.vec4.Vec4ul.Companion.plus
88
import glm_.vec4.Vec4ul.Companion.rem
99
import glm_.vec4.Vec4ul.Companion.times
10-
import udiv
10+
import unsigned.udiv
1111
import unsigned.Ulong
1212
import unsigned.udiv
1313
import unsigned.urem
14-
import urem
14+
import unsigned.urem
1515

1616
/**
1717
* Created by elect on 09/11/16.

src/test/kotlin/glm_/testCoreFuncInteger.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,8 @@ class testCoreFuncInteger : StringSpec() {
120120

121121
"uint bitfield reverse uint" {
122122

123-
fun bitfieldReverseUint32(x: uint): uint {
124-
var x = ((x and 0x55555555) shl 1) or ((x and 0xAAAAAAAA.i) ushr 1)
123+
fun bitfieldReverseUint32(x_: uint): uint {
124+
var x = ((x_ and 0x55555555) shl 1) or ((x_ and 0xAAAAAAAA.i) ushr 1)
125125
x = ((x and 0x33333333) shl 2) or ((x and 0xCCCCCCCC.i) ushr 2)
126126
x = ((x and 0x0F0F0F0F) shl 4) or ((x and 0xF0F0F0F0.i) ushr 4)
127127
x = ((x and 0x00FF00FF) shl 8) or ((x and 0xFF00FF00.i) ushr 8)
@@ -209,8 +209,8 @@ class testCoreFuncInteger : StringSpec() {
209209

210210
"ulong bitfield reverse ulong" {
211211

212-
fun bitfieldReverseUlong64(x: ulong): ulong {
213-
var x = ((x and 0x5555555555555555) shl 1) or ((x and "AAAAAAAAAAAAAAAA".parseUnsignedLong(16)) ushr 1)
212+
fun bitfieldReverseUlong64(x_: ulong): ulong {
213+
var x = ((x_ and 0x5555555555555555) shl 1) or ((x_ and "AAAAAAAAAAAAAAAA".parseUnsignedLong(16)) ushr 1)
214214
x = ((x and 0x3333333333333333) shl 2) or ((x and "CCCCCCCCCCCCCCCC".parseUnsignedLong(16)) ushr 2)
215215
x = ((x and 0x0F0F0F0F0F0F0F0F) shl 4) or ((x and "F0F0F0F0F0F0F0F0".parseUnsignedLong(16)) ushr 4)
216216
x = ((x and 0x00FF00FF00FF00FF) shl 8) or ((x and "FF00FF00FF00FF00".parseUnsignedLong(16)) ushr 8)

0 commit comments

Comments
 (0)