Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit e288934

Browse filesBrowse files
elect86elect86
committed
up
1 parent e3647b6 commit e288934
Copy full SHA for e288934
Expand file treeCollapse file tree

40 files changed

+797
-108
lines changed

‎build.gradle

Copy file name to clipboardExpand all lines: build.gradle
+3-3Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ dependencies {
2222

2323
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
2424

25-
compile 'com.github.kotlin-graphics:glm:3417cb89758b0a78fc3a11b05d925bbf73fa2d19'
25+
compile 'com.github.kotlin-graphics:glm:058335f9da130e6ee96e70aeaae97a396acaa92b'
2626

27-
compile 'com.github.kotlin-graphics:uno-sdk:80560b5a853a816befe72de4051e8827e7949527'
27+
compile 'com.github.kotlin-graphics:uno-sdk:a0c1cefec9565661c0540ae8ce838600a9c4d559'
2828

2929
// testCompile("io.kotlintest:kotlintest:2.0.0")
3030

@@ -56,7 +56,7 @@ dependencies {
5656

5757
repositories {
5858
mavenCentral()
59-
maven { url 'https://jitpack.io' }
6059
maven { url "https://dl.bintray.com/kotlin/kotlin-dev" }
6160
maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
61+
maven { url 'https://jitpack.io' }
6262
}

‎src/main/kotlin/learnOpenGL/A_gettingStarted/01_hello-window.kt renamed to ‎src/main/kotlin/learnOpenGL/a_gettingStarted/01_hello-window.kt

Copy file name to clipboardExpand all lines: src/main/kotlin/learnOpenGL/a_gettingStarted/01_hello-window.kt
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package learnOpenGL.A_gettingStarted
1+
package learnOpenGL.a_gettingStarted
22

33
import learnOpenGL.common.GlfwWindow
44
import learnOpenGL.common.glfw

‎src/main/kotlin/learnOpenGL/A_gettingStarted/02_hello-window-clear.kt renamed to ‎src/main/kotlin/learnOpenGL/a_gettingStarted/02_hello-window-clear.kt

Copy file name to clipboardExpand all lines: src/main/kotlin/learnOpenGL/a_gettingStarted/02_hello-window-clear.kt
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package learnOpenGL.A_gettingStarted
1+
package learnOpenGL.a_gettingStarted
22

33
/**
44
* Created by GBarbieri on 24.04.2017.

‎src/main/kotlin/learnOpenGL/A_gettingStarted/03_hello-triangle.kt renamed to ‎src/main/kotlin/learnOpenGL/a_gettingStarted/03_hello-triangle.kt

Copy file name to clipboardExpand all lines: src/main/kotlin/learnOpenGL/a_gettingStarted/03_hello-triangle.kt
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package learnOpenGL.A_gettingStarted
1+
package learnOpenGL.a_gettingStarted
22

33
/**
44
* Created by GBarbieri on 24.04.2017.

‎src/main/kotlin/learnOpenGL/A_gettingStarted/04_hello-triangle-indexed.kt renamed to ‎src/main/kotlin/learnOpenGL/a_gettingStarted/04_hello-triangle-indexed.kt

Copy file name to clipboardExpand all lines: src/main/kotlin/learnOpenGL/a_gettingStarted/04_hello-triangle-indexed.kt
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package learnOpenGL.A_gettingStarted
1+
package learnOpenGL.a_gettingStarted
22

33
/**
44
* Created by GBarbieri on 24.04.2017.

‎src/main/kotlin/learnOpenGL/A_gettingStarted/05_shaders-uniform.kt renamed to ‎src/main/kotlin/learnOpenGL/a_gettingStarted/05_shaders-uniform.kt

Copy file name to clipboardExpand all lines: src/main/kotlin/learnOpenGL/a_gettingStarted/05_shaders-uniform.kt
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package learnOpenGL.A_gettingStarted
1+
package learnOpenGL.a_gettingStarted
22

33
/**
44
* Created by GBarbieri on 24.04.2017.

‎src/main/kotlin/learnOpenGL/A_gettingStarted/06_shaders-interpolation.kt renamed to ‎src/main/kotlin/learnOpenGL/a_gettingStarted/06_shaders-interpolation.kt

Copy file name to clipboardExpand all lines: src/main/kotlin/learnOpenGL/a_gettingStarted/06_shaders-interpolation.kt
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package learnOpenGL.A_gettingStarted
1+
package learnOpenGL.a_gettingStarted
22

33
/**
44
* Created by GBarbieri on 24.04.2017.
@@ -15,7 +15,7 @@ import uno.glf.semantic
1515

1616
fun main(args: Array<String>) {
1717

18-
with(learnOpenGL.A_gettingStarted.ShadersInterpolation()) {
18+
with(learnOpenGL.a_gettingStarted.ShadersInterpolation()) {
1919

2020
run()
2121
end()

‎src/main/kotlin/learnOpenGL/A_gettingStarted/07_shaders-class.kt renamed to ‎src/main/kotlin/learnOpenGL/a_gettingStarted/07_shaders-class.kt

Copy file name to clipboardExpand all lines: src/main/kotlin/learnOpenGL/a_gettingStarted/07_shaders-class.kt
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package learnOpenGL.A_gettingStarted
1+
package learnOpenGL.a_gettingStarted
22

33
/**
44
* Created by elect on 24/04/17.
@@ -83,7 +83,7 @@ private class ShadersClass {
8383

8484

8585
// build and compile our shader program
86-
ourShader = Shader("shaders/A_07", "shader") // you can name your shader files however you like
86+
ourShader = Shader("shaders/a/_07", "shader") // you can name your shader files however you like
8787

8888

8989
// set up vertex data (and buffer(s)) and configure vertex attributes

‎src/main/kotlin/learnOpenGL/A_gettingStarted/08_textures.kt renamed to ‎src/main/kotlin/learnOpenGL/a_gettingStarted/08_textures.kt

Copy file name to clipboardExpand all lines: src/main/kotlin/learnOpenGL/a_gettingStarted/08_textures.kt
+5-5Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package learnOpenGL.A_gettingStarted
1+
package learnOpenGL.a_gettingStarted
22

33
/**
44
* Created by elect on 24/04/17.
@@ -22,7 +22,7 @@ import uno.gln.glVertexAttribPointer
2222

2323
fun main(args: Array<String>) {
2424

25-
with(learnOpenGL.A_gettingStarted.Textures()) {
25+
with(learnOpenGL.a_gettingStarted.Textures()) {
2626

2727
run()
2828
end()
@@ -92,7 +92,7 @@ private class Textures {
9292

9393

9494
// build and compile our shader program
95-
ourShader = learnOpenGL.common.Shader("shaders/A_08", "texture") // you can name your shader files however you like
95+
ourShader = learnOpenGL.common.Shader("shaders/a/_08", "texture") // you can name your shader files however you like
9696

9797

9898
// set up vertex data (and buffer(s)) and configure vertex attributes
@@ -102,10 +102,10 @@ private class Textures {
102102
// bind the Vertex Array Object first, then bind and set vertex buffer(s), and then configure vertex attributes(s).
103103
glBindVertexArray(vao)
104104

105-
glBindBuffer(GL_ARRAY_BUFFER, buffers[learnOpenGL.A_gettingStarted.Textures.Buffer.Vertex])
105+
glBindBuffer(GL_ARRAY_BUFFER, buffers[learnOpenGL.a_gettingStarted.Textures.Buffer.Vertex])
106106
glBufferData(GL_ARRAY_BUFFER, vertices, GL_STATIC_DRAW)
107107

108-
glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, buffers[learnOpenGL.A_gettingStarted.Textures.Buffer.Element])
108+
glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, buffers[learnOpenGL.a_gettingStarted.Textures.Buffer.Element])
109109
glBufferData(GL_ELEMENT_ARRAY_BUFFER, indices, GL_STATIC_DRAW)
110110

111111
// position attribute

‎src/main/kotlin/learnOpenGL/A_gettingStarted/09_textures-combined.kt renamed to ‎src/main/kotlin/learnOpenGL/a_gettingStarted/09_textures-combined.kt

Copy file name to clipboardExpand all lines: src/main/kotlin/learnOpenGL/a_gettingStarted/09_textures-combined.kt
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package learnOpenGL.A_gettingStarted
1+
package learnOpenGL.a_gettingStarted
22

33
/**
44
* Created by GBarbieri on 25.04.2017.
@@ -105,7 +105,7 @@ private class TexturesCombined {
105105

106106

107107
// build and compile our shader program, you can name your shader files however you like
108-
ourShader = shaderOf(this::class, "shaders/A_09", "texture")
108+
ourShader = shaderOf(this::class, "shaders/a/_09", "texture")
109109

110110

111111
// set up vertex data (and buffer(s)) and configure vertex attributes

‎src/main/kotlin/learnOpenGL/A_gettingStarted/10_transformations.kt renamed to ‎src/main/kotlin/learnOpenGL/a_gettingStarted/10_transformations.kt

Copy file name to clipboardExpand all lines: src/main/kotlin/learnOpenGL/a_gettingStarted/10_transformations.kt
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package learnOpenGL.A_gettingStarted
1+
package learnOpenGL.a_gettingStarted
22

33
/**
44
* Created by GBarbieri on 25.04.2017.
@@ -104,7 +104,7 @@ private class Transformations {
104104

105105

106106
// build and compile our shader program, you can name your shader files however you like
107-
ourShader = shaderOf(this::class, "shaders/A_10", "transform")
107+
ourShader = shaderOf(this::class, "shaders/a/_10", "transform")
108108

109109

110110
// set up vertex data (and buffer(s)) and configure vertex attributes

‎src/main/kotlin/learnOpenGL/A_gettingStarted/11_coordinateSystems.kt renamed to ‎src/main/kotlin/learnOpenGL/a_gettingStarted/11_coordinate-systems.kt

Copy file name to clipboardExpand all lines: src/main/kotlin/learnOpenGL/a_gettingStarted/11_coordinate-systems.kt
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package learnOpenGL.A_gettingStarted
1+
package learnOpenGL.a_gettingStarted
22

33
/**
44
* Created by GBarbieri on 25.04.2017.
@@ -105,7 +105,7 @@ private class CoordinateSystems {
105105

106106

107107
// build and compile our shader program, you can name your shader files however you like
108-
ourShader = shaderOf(this::class, "shaders/A_11", "coordinate-systems")
108+
ourShader = shaderOf(this::class, "shaders/a/_11", "coordinate-systems")
109109

110110

111111
// set up vertex data (and buffer(s)) and configure vertex attributes

‎src/main/kotlin/learnOpenGL/A_gettingStarted/12_coordinate-systems-depth.kt renamed to ‎src/main/kotlin/learnOpenGL/a_gettingStarted/12_coordinate-systems-depth.kt

Copy file name to clipboardExpand all lines: src/main/kotlin/learnOpenGL/a_gettingStarted/12_coordinate-systems-depth.kt
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package learnOpenGL.A_gettingStarted
1+
package learnOpenGL.a_gettingStarted
22

33
/**
44
* Created by GBarbieri on 25.04.2017.
@@ -135,7 +135,7 @@ private class CoordinateSystemsDepth {
135135

136136

137137
// build and compile our shader program, you can name your shader files however you like
138-
ourShader = shaderOf(this::class, "shaders/A_12", "coordinate-systems")
138+
ourShader = shaderOf(this::class, "shaders/a/_12", "coordinate-systems")
139139

140140

141141
// set up vertex data (and buffer(s)) and configure vertex attributes

‎src/main/kotlin/learnOpenGL/A_gettingStarted/13_coordinate-systems-multiple-objects.kt renamed to ‎src/main/kotlin/learnOpenGL/a_gettingStarted/13_coordinate-systems-multiple-objects.kt

Copy file name to clipboardExpand all lines: src/main/kotlin/learnOpenGL/a_gettingStarted/13_coordinate-systems-multiple-objects.kt
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package learnOpenGL.A_gettingStarted
1+
package learnOpenGL.a_gettingStarted
22

33
/**
44
* Created by GBarbieri on 25.04.2017.
@@ -150,7 +150,7 @@ private class CoordinateSystemsMultipleObjects {
150150

151151

152152
// build and compile our shader program, you can name your shader files however you like
153-
ourShader = shaderOf(this::class, "shaders/A_12", "coordinate-systems")
153+
ourShader = shaderOf(this::class, "shaders/a/_12", "coordinate-systems")
154154

155155

156156
// set up vertex data (and buffer(s)) and configure vertex attributes

‎src/main/kotlin/learnOpenGL/A_gettingStarted/14_camera-circle.kt renamed to ‎src/main/kotlin/learnOpenGL/a_gettingStarted/14_camera-circle.kt

Copy file name to clipboardExpand all lines: src/main/kotlin/learnOpenGL/a_gettingStarted/14_camera-circle.kt
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package learnOpenGL.A_gettingStarted
1+
package learnOpenGL.a_gettingStarted
22

33
/**
44
* Created by elect on 26/04/17.
@@ -152,7 +152,7 @@ private class CameraCircle {
152152

153153

154154
// build and compile our shader program, you can name your shader files however you like
155-
ourShader = shaderOf(this::class, "shaders/A_14", "camera")
155+
ourShader = shaderOf(this::class, "shaders/a/_14", "camera")
156156

157157

158158
// set up vertex data (and buffer(s)) and configure vertex attributes

‎src/main/kotlin/learnOpenGL/A_gettingStarted/15_camera-keyboard-dt.kt renamed to ‎src/main/kotlin/learnOpenGL/a_gettingStarted/15_camera-keyboard-dt.kt

Copy file name to clipboardExpand all lines: src/main/kotlin/learnOpenGL/a_gettingStarted/15_camera-keyboard-dt.kt
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package learnOpenGL.A_gettingStarted
1+
package learnOpenGL.a_gettingStarted
22

33
/**
44
* Created by elect on 26/04/17.
@@ -160,7 +160,7 @@ private class CameraKeyboardDt {
160160

161161

162162
// build and compile our shader program, you can name your shader files however you like
163-
ourShader = shaderOf(this::class, "shaders/A_15", "camera")
163+
ourShader = shaderOf(this::class, "shaders/a/_14", "camera")
164164

165165

166166
// set up vertex data (and buffer(s)) and configure vertex attributes

‎src/main/kotlin/learnOpenGL/A_gettingStarted/16_camera-mouse-zoom.kt renamed to ‎src/main/kotlin/learnOpenGL/a_gettingStarted/16_camera-mouse-zoom.kt

Copy file name to clipboardExpand all lines: src/main/kotlin/learnOpenGL/a_gettingStarted/16_camera-mouse-zoom.kt
+3-3Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package learnOpenGL.A_gettingStarted
1+
package learnOpenGL.a_gettingStarted
22

33
/**
44
* Created by elect on 26/04/17.
@@ -127,7 +127,7 @@ private class CameraMouseZoom {
127127
var yaw = -90.0f
128128
var pitch = 0.0f
129129
var lastX = 800.0f / 2.0
130-
var lastY = 600.0 / 2
130+
var lastY = 600.0 / 2.0
131131
var fov = 45.0f
132132

133133
var deltaTime = 0.0f // time between current frame and last frame
@@ -176,7 +176,7 @@ private class CameraMouseZoom {
176176

177177

178178
// build and compile our shader program, you can name your shader files however you like
179-
ourShader = shaderOf(this::class, "shaders/A_15", "camera")
179+
ourShader = shaderOf(this::class, "shaders/a/_14", "camera")
180180

181181

182182
// set up vertex data (and buffer(s)) and configure vertex attributes

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.