File tree Expand file tree Collapse file tree 9 files changed +19
-19
lines changed Expand file tree Collapse file tree 9 files changed +19
-19
lines changed Original file line number Diff line number Diff line change @@ -11,7 +11,7 @@ apply plugin: 'com.github.johnrengelman.shadow'
11
11
12
12
buildscript {
13
13
14
- ext. kotlinVersion = ' 1.2.50 '
14
+ ext. kotlinVersion = ' 1.2.51 '
15
15
16
16
repositories {
17
17
jcenter() // shadow
@@ -21,7 +21,7 @@ buildscript {
21
21
}
22
22
dependencies {
23
23
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 '
25
25
classpath " org.junit.platform:junit-platform-gradle-plugin:1.1.0"
26
26
}
27
27
}
@@ -30,7 +30,7 @@ dependencies {
30
30
31
31
implementation " org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion "
32
32
33
- implementation ' com.github.kotlin-graphics:kotlin-unsigned:0f6b48ccb2adb3a0c30e811cd75b4f2e66e1660b '
33
+ implementation ' com.github.kotlin-graphics:kotlin-unsigned:a455438 '
34
34
35
35
testImplementation ' io.kotlintest:kotlintest-runner-junit5:3.0.6'
36
36
Original file line number Diff line number Diff line change @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
3
3
distributionPath =wrapper/dists
4
4
zipStoreBase =GRADLE_USER_HOME
5
5
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
Original file line number Diff line number Diff line change @@ -146,5 +146,5 @@ val GLM_VERSION_MAJOR = 0
146
146
val GLM_VERSION_MINOR = 9
147
147
val GLM_VERSION_PATCH = 9
148
148
val GLM_VERSION_REVISION = 0
149
- val GLM_VERSION_BUILD = 5
149
+ val GLM_VERSION_BUILD = 6
150
150
val GLM_VERSION = GLM_VERSION_MAJOR * 1_000 + GLM_VERSION_MINOR * 100 + GLM_VERSION_PATCH * 10 + GLM_VERSION_REVISION + GLM_VERSION_BUILD / 10f
Original file line number Diff line number Diff line change @@ -22,8 +22,8 @@ interface gtxFastTrigonometry {
22
22
fun fastSin (angle : Float ) = fastCos(HPIf - angle)
23
23
24
24
/* * 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_ )
27
27
28
28
return when {
29
29
angle < HPIf -> detail.cos52s(angle)
Original file line number Diff line number Diff line change @@ -97,10 +97,10 @@ interface gtxInteger {
97
97
98
98
// Henry Gordon Dietz: http://aggregate.org/MAGIC/
99
99
interface detail_gtxInteger {
100
- fun ones32 (x : uint): uint {
100
+ fun ones32 (x_ : uint): uint {
101
101
/* 32-bit recursive reduction using SWAR...
102
102
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_
104
104
x - = (x ushr 1 ) and 0x55555555
105
105
x = ((x ushr 2 ) and 0x33333333 ) + (x and 0x33333333 )
106
106
x = ((x ushr 4 ) + x) and 0x0f0f0f0f
Original file line number Diff line number Diff line change @@ -7,10 +7,10 @@ import glm_.vec2.Vec2ul.Companion.minus
7
7
import glm_.vec2.Vec2ul.Companion.plus
8
8
import glm_.vec2.Vec2ul.Companion.rem
9
9
import glm_.vec2.Vec2ul.Companion.times
10
- import udiv
10
+ import unsigned. udiv
11
11
import unsigned.Ulong
12
12
import unsigned.toULong
13
- import urem
13
+ import unsigned. urem
14
14
15
15
/* *
16
16
* Created by elect on 09/11/16.
Original file line number Diff line number Diff line change @@ -7,11 +7,11 @@ import glm_.vec3.Vec3ul.Companion.minus
7
7
import glm_.vec3.Vec3ul.Companion.plus
8
8
import glm_.vec3.Vec3ul.Companion.rem
9
9
import glm_.vec3.Vec3ul.Companion.times
10
- import udiv
10
+ import unsigned. udiv
11
11
import unsigned.Ulong
12
12
import unsigned.udiv
13
13
import unsigned.urem
14
- import urem
14
+ import unsigned. urem
15
15
16
16
/* *
17
17
* Created by elect on 09/11/16.
Original file line number Diff line number Diff line change @@ -7,11 +7,11 @@ import glm_.vec4.Vec4ul.Companion.minus
7
7
import glm_.vec4.Vec4ul.Companion.plus
8
8
import glm_.vec4.Vec4ul.Companion.rem
9
9
import glm_.vec4.Vec4ul.Companion.times
10
- import udiv
10
+ import unsigned. udiv
11
11
import unsigned.Ulong
12
12
import unsigned.udiv
13
13
import unsigned.urem
14
- import urem
14
+ import unsigned. urem
15
15
16
16
/* *
17
17
* Created by elect on 09/11/16.
Original file line number Diff line number Diff line change @@ -120,8 +120,8 @@ class testCoreFuncInteger : StringSpec() {
120
120
121
121
" uint bitfield reverse uint" {
122
122
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 )
125
125
x = ((x and 0x33333333 ) shl 2 ) or ((x and 0xCCCCCCCC .i) ushr 2 )
126
126
x = ((x and 0x0F0F0F0F ) shl 4 ) or ((x and 0xF0F0F0F0 .i) ushr 4 )
127
127
x = ((x and 0x00FF00FF ) shl 8 ) or ((x and 0xFF00FF00 .i) ushr 8 )
@@ -209,8 +209,8 @@ class testCoreFuncInteger : StringSpec() {
209
209
210
210
" ulong bitfield reverse ulong" {
211
211
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 )
214
214
x = ((x and 0x3333333333333333 ) shl 2 ) or ((x and " CCCCCCCCCCCCCCCC" .parseUnsignedLong(16 )) ushr 2 )
215
215
x = ((x and 0x0F0F0F0F0F0F0F0F ) shl 4 ) or ((x and " F0F0F0F0F0F0F0F0" .parseUnsignedLong(16 )) ushr 4 )
216
216
x = ((x and 0x00FF00FF00FF00FF ) shl 8 ) or ((x and " FF00FF00FF00FF00" .parseUnsignedLong(16 )) ushr 8 )
You can’t perform that action at this time.
0 commit comments