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 d8cac4d

Browse filesBrowse files
elect86elect86
committed
up
1 parent 19a9582 commit d8cac4d
Copy full SHA for d8cac4d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Dismiss banner
Expand file treeCollapse file tree

43 files changed

+1696
-186
lines changed

‎build.gradle

Copy file name to clipboardExpand all lines: build.gradle
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ dependencies {
2222

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

25-
compile 'com.github.kotlin-graphics:uno-sdk:fbaa3beb44ae7af4729d4d3d99dd632cb517ef2c'
25+
compile 'com.github.kotlin-graphics:uno-sdk:c504019d580474208d3db0ad73d4d03061ce4578'
2626
compile 'com.github.java-graphics:assimp:f9c6be4727d339abe0117273b6d5670386789469'
2727

2828
switch ( OperatingSystem.current() ) {

‎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-1Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ private class ShadersClass {
8181
and makes the OpenGL bindings available for use. */
8282
GL.createCapabilities()
8383

84+
val a = ClassLoader.getSystemResource("shaders/a/_07/shader.vert")
8485

8586
// build and compile our shader program, we can simply use it as int for the moment
8687
program = ProgramA("shaders/a/_07", "shader").name
@@ -108,7 +109,7 @@ private class ShadersClass {
108109
//glBindVertexArray()
109110
}
110111

111-
class ProgramA(root: String, shader: String) : Program(ShadersClass::class.java, root, "$shader.vert", "$shader.frag")
112+
class ProgramA(root: String, shader: String) : Program(root, "$shader.vert", "$shader.frag")
112113

113114
fun run() {
114115

‎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
+2-5Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,7 @@ import org.lwjgl.opengl.GL20.*
1818
import org.lwjgl.opengl.GL30.*
1919
import uno.buffer.*
2020
import uno.glf.semantic
21-
import uno.gln.glBindTexture
22-
import uno.gln.glBindVertexArray
23-
import uno.gln.glDrawElements
24-
import uno.gln.glVertexAttribPointer
21+
import uno.gln.*
2522
import uno.glsl.Program
2623

2724
fun main(args: Array<String>) {
@@ -147,7 +144,7 @@ private class Textures {
147144
//glBindVertexArray()
148145
}
149146

150-
class ProgramA(root: String, shader: String) : Program(Textures::class.java, root, "$shader.vert", "$shader.frag") {
147+
class ProgramA(root: String, shader: String) : Program(root, "$shader.vert", "$shader.frag") {
151148
init {
152149
glUniform1i(
153150
glGetUniformLocation(name, "textureA"),

‎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-5Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,7 @@ import org.lwjgl.opengl.GL20.*
1919
import org.lwjgl.opengl.GL30.*
2020
import uno.buffer.*
2121
import uno.glf.semantic
22-
import uno.gln.glBindVertexArray
23-
import uno.gln.glDrawElements
24-
import uno.gln.glVertexAttribPointer
25-
import uno.gln.usingProgram
22+
import uno.gln.*
2623
import uno.glsl.Program
2724

2825
fun main(args: Array<String>) {
@@ -177,7 +174,7 @@ private class TexturesCombined {
177174
//glBindVertexArray()
178175
}
179176

180-
inner class ProgramA(root: String, shader: String) : Program(TexturesCombined::class.java, root, "$shader.vert", "$shader.frag") {
177+
inner class ProgramA(root: String, shader: String) : Program(root, "$shader.vert", "$shader.frag") {
181178
init {
182179
/* Tell opengl for each sampler to which texture unit it belongs to (only has to be done once)
183180
Code passed to usingProgram() {..] is executed using the given program, which at the end gets unbound */

‎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
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ private class Transformations {
178178

179179
}
180180

181-
inner class ProgramA(root: String, shader: String) : Program(Transformations::class.java, root, "$shader.vert", "$shader.frag") {
181+
inner class ProgramA(root: String, shader: String) : Program(root, "$shader.vert", "$shader.frag") {
182182

183183
val transform = glGetUniformLocation(name, "transform") // get matrix's uniform location
184184

‎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
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ private class CoordinateSystems {
177177
//glBindVertexArray()
178178
}
179179

180-
inner class ProgramA(root: String, shader: String) : Program(CoordinateSystems::class.java, root, "$shader.vert", "$shader.frag") {
180+
inner class ProgramA(root: String, shader: String) : Program(root, "$shader.vert", "$shader.frag") {
181181

182182
val model = glGetUniformLocation(name, "model")
183183
val view = glGetUniformLocation(name, "view")

‎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
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ private class CoordinateSystemsDepth {
204204
//glBindVertexArray()
205205
}
206206

207-
inner class ProgramA(root: String, shader: String) : Program(CoordinateSystemsDepth::class.java, root, "$shader.vert", "$shader.frag") {
207+
inner class ProgramA(root: String, shader: String) : Program(root, "$shader.vert", "$shader.frag") {
208208

209209
val model = glGetUniformLocation(name, "model")
210210
val view = glGetUniformLocation(name, "view")

‎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
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ private class CoordinateSystemsMultipleObjects {
220220
//glBindVertexArray()
221221
}
222222

223-
inner class ProgramA(root: String, shader: String) : Program(CoordinateSystemsMultipleObjects::class.java, root, "$shader.vert", "$shader.frag") {
223+
inner class ProgramA(root: String, shader: String) : Program(root, "$shader.vert", "$shader.frag") {
224224

225225
val model = glGetUniformLocation(name, "model")
226226
val view = glGetUniformLocation(name, "view")

‎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
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ private class CameraCircle {
222222
//glBindVertexArray()
223223
}
224224

225-
inner class ProgramA(root: String, shader: String) : Program(CameraCircle::class.java, root, "$shader.vert", "$shader.frag") {
225+
inner class ProgramA(root: String, shader: String) : Program(root, "$shader.vert", "$shader.frag") {
226226

227227
val model = glGetUniformLocation(name, "model")
228228
val view = glGetUniformLocation(name, "view")

‎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
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ private class CameraKeyboardDt {
230230
//glBindVertexArray()
231231
}
232232

233-
inner class ProgramA(root: String, shader: String) : Program(CameraKeyboardDt::class.java, root, "$shader.vert", "$shader.frag") {
233+
inner class ProgramA(root: String, shader: String) : Program(root, "$shader.vert", "$shader.frag") {
234234

235235
val model = glGetUniformLocation(name, "model")
236236
val view = glGetUniformLocation(name, "view")

‎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
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ private class CameraMouseZoom {
246246
//glBindVertexArray()
247247
}
248248

249-
inner class ProgramA(root: String, shader: String) : Program(CameraMouseZoom::class.java, root, "$shader.vert", "$shader.frag") {
249+
inner class ProgramA(root: String, shader: String) : Program(root, "$shader.vert", "$shader.frag") {
250250

251251
val model = glGetUniformLocation(name, "model")
252252
val view = glGetUniformLocation(name, "view")

‎src/main/kotlin/learnOpenGL/a_gettingStarted/17_camera-class.kt

Copy file name to clipboardExpand all lines: src/main/kotlin/learnOpenGL/a_gettingStarted/17_camera-class.kt
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ private class CameraClass {
237237
//glBindVertexArray()
238238
}
239239

240-
inner class ProgramA(root: String, shader: String) : Program(CameraClass::class.java, root, "$shader.vert", "$shader.frag") {
240+
inner class ProgramA(root: String, shader: String) : Program(root, "$shader.vert", "$shader.frag") {
241241

242242
val model = glGetUniformLocation(name, "model")
243243
val view = glGetUniformLocation(name, "view")

‎src/main/kotlin/learnOpenGL/b_lighting/01_colors.kt

Copy file name to clipboardExpand all lines: src/main/kotlin/learnOpenGL/b_lighting/01_colors.kt
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ private class Colors {
185185
val lgtCol = glGetUniformLocation(name, "lightColor")
186186
}
187187

188-
inner open class Lamp(root: String, shader: String) : Program(Colors::class.java, root, "$shader.vert", "$shader.frag") {
188+
inner open class Lamp(root: String, shader: String) : Program(root, "$shader.vert", "$shader.frag") {
189189

190190
val model = glGetUniformLocation(name, "model")
191191
val view = glGetUniformLocation(name, "view")

‎src/main/kotlin/learnOpenGL/b_lighting/02_basic-lighting-diffuse.kt

Copy file name to clipboardExpand all lines: src/main/kotlin/learnOpenGL/b_lighting/02_basic-lighting-diffuse.kt
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ private class BasicLightingDiffuse {
190190
val lgtPos = glGetUniformLocation(name, "lightPos")
191191
}
192192

193-
inner open class Lamp(root: String, shader: String) : Program(BasicLightingDiffuse::class.java, root, "$shader.vert", "$shader.frag") {
193+
inner open class Lamp(root: String, shader: String) : Program(root, "$shader.vert", "$shader.frag") {
194194

195195
val model = glGetUniformLocation(name, "model")
196196
val view = glGetUniformLocation(name, "view")

‎src/main/kotlin/learnOpenGL/b_lighting/03_basic-lighting-specular.kt

Copy file name to clipboardExpand all lines: src/main/kotlin/learnOpenGL/b_lighting/03_basic-lighting-specular.kt
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ private class BasicLightingSpecular {
191191
val viewPos = glGetUniformLocation(name, "viewPos")
192192
}
193193

194-
inner open class Lamp(root: String, shader: String) : Program(BasicLightingSpecular::class.java, root, "$shader.vert", "$shader.frag") {
194+
inner open class Lamp(root: String, shader: String) : Program(root, "$shader.vert", "$shader.frag") {
195195

196196
val model = glGetUniformLocation(name, "model")
197197
val view = glGetUniformLocation(name, "view")

‎src/main/kotlin/learnOpenGL/b_lighting/04_materials.kt

Copy file name to clipboardExpand all lines: src/main/kotlin/learnOpenGL/b_lighting/04_materials.kt
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ private class Materials {
205205
}
206206
}
207207

208-
inner open class Lamp(root: String, shader: String) : Program(Materials::class.java, root, "$shader.vert", "$shader.frag") {
208+
inner open class Lamp(root: String, shader: String) : Program(root, "$shader.vert", "$shader.frag") {
209209

210210
val model = glGetUniformLocation(name, "model")
211211
val view = glGetUniformLocation(name, "view")

‎src/main/kotlin/learnOpenGL/b_lighting/05_lighting-maps-diffuse.kt

Copy file name to clipboardExpand all lines: src/main/kotlin/learnOpenGL/b_lighting/05_lighting-maps-diffuse.kt
+2-22Lines changed: 2 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import learnOpenGL.common.Camera.Movement.*
1515
import learnOpenGL.common.GlfwWindow
1616
import learnOpenGL.common.GlfwWindow.Cursor.Disabled
1717
import learnOpenGL.common.glfw
18+
import learnOpenGL.common.loadTexture
1819
import org.lwjgl.glfw.GLFW.*
1920
import org.lwjgl.opengl.GL
2021
import org.lwjgl.opengl.GL11.*
@@ -215,34 +216,13 @@ private class LightingMapsDiffuse {
215216
}
216217
}
217218

218-
inner open class Lamp(root: String, shader: String) : Program(LightingMapsDiffuse::class.java, root, "$shader.vert", "$shader.frag") {
219+
inner open class Lamp(root: String, shader: String) : Program(root, "$shader.vert", "$shader.frag") {
219220

220221
val model = glGetUniformLocation(name, "model")
221222
val view = glGetUniformLocation(name, "view")
222223
val proj = glGetUniformLocation(name, "projection")
223224
}
224225

225-
fun loadTexture(path: String): Int {
226-
227-
val textureID = glGenTextures()
228-
229-
val texture = gli.load(path)
230-
val format = gli.gl.translate(texture.format, texture.swizzles)
231-
232-
glBindTexture(GL_TEXTURE_2D, textureID)
233-
glTexImage2D(format, texture)
234-
glGenerateMipmap(GL_TEXTURE_2D)
235-
236-
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT)
237-
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT)
238-
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR)
239-
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR)
240-
241-
texture.dispose()
242-
243-
return textureID
244-
}
245-
246226
fun run() {
247227

248228
// render loop

‎src/main/kotlin/learnOpenGL/b_lighting/06_lighting-maps-specular.kt

Copy file name to clipboardExpand all lines: src/main/kotlin/learnOpenGL/b_lighting/06_lighting-maps-specular.kt
+2-22Lines changed: 2 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import learnOpenGL.common.Camera.Movement.*
1515
import learnOpenGL.common.GlfwWindow
1616
import learnOpenGL.common.GlfwWindow.Cursor.Disabled
1717
import learnOpenGL.common.glfw
18+
import learnOpenGL.common.loadTexture
1819
import org.lwjgl.glfw.GLFW.*
1920
import org.lwjgl.opengl.GL
2021
import org.lwjgl.opengl.GL11.*
@@ -227,34 +228,13 @@ private class LightingMapsSpecular {
227228
}
228229
}
229230

230-
inner open class Lamp(root: String, shader: String) : Program(LightingMapsSpecular::class.java, root, "$shader.vert", "$shader.frag") {
231+
inner open class Lamp(root: String, shader: String) : Program(root, "$shader.vert", "$shader.frag") {
231232

232233
val model = glGetUniformLocation(name, "model")
233234
val view = glGetUniformLocation(name, "view")
234235
val proj = glGetUniformLocation(name, "projection")
235236
}
236237

237-
fun loadTexture(path: String): Int {
238-
239-
val textureID = glGenTextures()
240-
241-
val texture = gli.load(path)
242-
val format = gli.gl.translate(texture.format, texture.swizzles)
243-
244-
glBindTexture(GL_TEXTURE_2D, textureID)
245-
glTexImage2D(format, texture)
246-
glGenerateMipmap(GL_TEXTURE_2D)
247-
248-
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT)
249-
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT)
250-
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR)
251-
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR)
252-
253-
texture.dispose()
254-
255-
return textureID
256-
}
257-
258238
fun run() {
259239

260240
// render loop

‎src/main/kotlin/learnOpenGL/b_lighting/07_light-casters-directional.kt

Copy file name to clipboardExpand all lines: src/main/kotlin/learnOpenGL/b_lighting/07_light-casters-directional.kt
+2-22Lines changed: 2 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import learnOpenGL.common.Camera.Movement.*
1515
import learnOpenGL.common.GlfwWindow
1616
import learnOpenGL.common.GlfwWindow.Cursor.Disabled
1717
import learnOpenGL.common.glfw
18+
import learnOpenGL.common.loadTexture
1819
import org.lwjgl.glfw.GLFW.*
1920
import org.lwjgl.opengl.GL
2021
import org.lwjgl.opengl.GL11.*
@@ -237,34 +238,13 @@ private class LightCastersDirectional {
237238
}
238239
}
239240

240-
inner open class Lamp(root: String, shader: String) : Program(LightCastersDirectional::class.java, root, "$shader.vert", "$shader.frag") {
241+
inner open class Lamp(root: String, shader: String) : Program(root, "$shader.vert", "$shader.frag") {
241242

242243
val model = glGetUniformLocation(name, "model")
243244
val view = glGetUniformLocation(name, "view")
244245
val proj = glGetUniformLocation(name, "projection")
245246
}
246247

247-
fun loadTexture(path: String): Int {
248-
249-
val textureID = glGenTextures()
250-
251-
val texture = gli.load(path)
252-
val format = gli.gl.translate(texture.format, texture.swizzles)
253-
254-
glBindTexture(GL_TEXTURE_2D, textureID)
255-
glTexImage2D(format, texture)
256-
glGenerateMipmap(GL_TEXTURE_2D)
257-
258-
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT)
259-
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT)
260-
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR)
261-
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR)
262-
263-
texture.dispose()
264-
265-
return textureID
266-
}
267-
268248
fun run() {
269249

270250
// render loop

‎src/main/kotlin/learnOpenGL/b_lighting/08_light-casters-point.kt

Copy file name to clipboardExpand all lines: src/main/kotlin/learnOpenGL/b_lighting/08_light-casters-point.kt
+2-22Lines changed: 2 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import learnOpenGL.common.Camera.Movement.*
1515
import learnOpenGL.common.GlfwWindow
1616
import learnOpenGL.common.GlfwWindow.Cursor.Disabled
1717
import learnOpenGL.common.glfw
18+
import learnOpenGL.common.loadTexture
1819
import org.lwjgl.glfw.GLFW.*
1920
import org.lwjgl.opengl.GL
2021
import org.lwjgl.opengl.GL11.*
@@ -243,34 +244,13 @@ private class LightCastersPoint {
243244
}
244245
}
245246

246-
inner open class Lamp(root: String, shader: String) : Program(LightCastersPoint::class.java, root, "$shader.vert", "$shader.frag") {
247+
inner open class Lamp(root: String, shader: String) : Program(root, "$shader.vert", "$shader.frag") {
247248

248249
val model = glGetUniformLocation(name, "model")
249250
val view = glGetUniformLocation(name, "view")
250251
val proj = glGetUniformLocation(name, "projection")
251252
}
252253

253-
fun loadTexture(path: String): Int {
254-
255-
val textureID = glGenTextures()
256-
257-
val texture = gli.load(path)
258-
val format = gli.gl.translate(texture.format, texture.swizzles)
259-
260-
glBindTexture(GL_TEXTURE_2D, textureID)
261-
glTexImage2D(format, texture)
262-
glGenerateMipmap(GL_TEXTURE_2D)
263-
264-
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT)
265-
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT)
266-
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR)
267-
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR)
268-
269-
texture.dispose()
270-
271-
return textureID
272-
}
273-
274254
fun run() {
275255

276256
// render loop

‎src/main/kotlin/learnOpenGL/b_lighting/09_light-casters-spot.kt

Copy file name to clipboardExpand all lines: src/main/kotlin/learnOpenGL/b_lighting/09_light-casters-spot.kt
+2-22Lines changed: 2 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import learnOpenGL.common.Camera.Movement.*
1212
import learnOpenGL.common.GlfwWindow
1313
import learnOpenGL.common.GlfwWindow.Cursor.Disabled
1414
import learnOpenGL.common.glfw
15+
import learnOpenGL.common.loadTexture
1516
import org.lwjgl.glfw.GLFW.*
1617
import org.lwjgl.opengl.GL
1718
import org.lwjgl.opengl.GL11.*
@@ -239,34 +240,13 @@ private class LightCastersSpot {
239240
}
240241
}
241242

242-
inner open class Lamp(root: String, shader: String) : Program(LightCastersSpot::class.java, root, "$shader.vert", "$shader.frag") {
243+
inner open class Lamp(root: String, shader: String) : Program(root, "$shader.vert", "$shader.frag") {
243244

244245
val model = glGetUniformLocation(name, "model")
245246
val view = glGetUniformLocation(name, "view")
246247
val proj = glGetUniformLocation(name, "projection")
247248
}
248249

249-
fun loadTexture(path: String): Int {
250-
251-
val textureID = glGenTextures()
252-
253-
val texture = gli.load(path)
254-
val format = gli.gl.translate(texture.format, texture.swizzles)
255-
256-
glBindTexture(GL_TEXTURE_2D, textureID)
257-
glTexImage2D(format, texture)
258-
glGenerateMipmap(GL_TEXTURE_2D)
259-
260-
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT)
261-
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT)
262-
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR)
263-
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR)
264-
265-
texture.dispose()
266-
267-
return textureID
268-
}
269-
270250
fun run() {
271251

272252
// render loop

0 commit comments

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