Skip to content

Commit 6865d40

Browse files
elect86elect86
committed
gl buffers moved under /gl
1 parent ab05afe commit 6865d40

File tree

14 files changed

+129
-118
lines changed

14 files changed

+129
-118
lines changed

‎src/main/kotlin/uno/caps/caps.kt‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,11 @@ package uno.caps
22

33
import com.jogamp.opengl.GLES1.GL_ETC1_RGB8_OES
44
import glm_.vec2.Vec2
5+
import org.lwjgl.opengl.ATITextureCompression3DC.GL_COMPRESSED_LUMINANCE_ALPHA_3DC_ATI
56
import org.lwjgl.opengl.EXTTextureCompressionLATC.*
67
import org.lwjgl.opengl.EXTTextureCompressionS3TC.*
78
import org.lwjgl.opengl.EXTTextureFilterAnisotropic.GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT
9+
import org.lwjgl.opengl.EXTTextureSRGB.*
810
import org.lwjgl.opengl.GL
911
import org.lwjgl.opengl.GL11.*
1012
import org.lwjgl.opengl.GL12.*
@@ -25,23 +27,16 @@ import org.lwjgl.opengl.GL45.GL_MAX_CULL_DISTANCES
2527
import org.lwjgl.opengl.KHRTextureCompressionASTCLDR.*
2628
import org.lwjgl.opengl.NVDeepTexture3D.GL_MAX_DEEP_3D_TEXTURE_DEPTH_NV
2729
import org.lwjgl.opengl.NVDeepTexture3D.GL_MAX_DEEP_3D_TEXTURE_WIDTH_HEIGHT_NV
28-
import org.lwjgl.opengl.ATITextureCompression3DC.GL_COMPRESSED_LUMINANCE_ALPHA_3DC_ATI
29-
import org.lwjgl.opengl.EXTTextureSRGB.GL_COMPRESSED_SRGB_S3TC_DXT1_EXT
30-
import org.lwjgl.opengl.EXTTextureSRGB.GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT
31-
import org.lwjgl.opengl.EXTTextureSRGB.GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT
32-
import org.lwjgl.opengl.EXTTextureSRGB.GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT
3330
import uno.buffer.destroy
3431
import uno.buffer.intBufferBig
3532
import uno.gl.*
3633
import uno.glfw.GlfwWindow
3734
import uno.glfw.glfw
35+
import uno.gln.glGetVec2
3836
import java.io.File
3937
import java.io.PrintWriter
40-
import java.lang.reflect.Field
41-
import kotlin.properties.Delegates
4238
import kotlin.reflect.KVisibility
4339
import kotlin.reflect.full.memberProperties
44-
import kotlin.reflect.full.starProjectedType
4540

4641
/**
4742
* Created by GBarbieri on 10.03.2017.

‎src/main/kotlin/uno/gl/gl.kt‎

Lines changed: 28 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,10 @@
11
package uno.gl
22

33
import com.jogamp.newt.opengl.GLWindow
4-
import com.jogamp.opengl.GL
5-
import com.jogamp.opengl.GL.*
64
import com.jogamp.opengl.GL3
7-
import com.jogamp.opengl.GLException
8-
import glm_.vec2.Vec2
9-
import glm_.vec2.Vec2i
10-
import glm_.vec4.Vec4
11-
import glm_.vec4.Vec4i
12-
import org.lwjgl.opengl.GL11
13-
import org.lwjgl.opengl.GL11.glGetFloatv
14-
import org.lwjgl.opengl.GL11.glGetIntegerv
15-
import uno.gln.vec2Buffer
16-
import uno.gln.vec2iBuffer
17-
import uno.gln.vec4Buffer
18-
import uno.gln.vec4iBuffer
5+
import uno.buffer.doubleBufferBig
6+
import uno.buffer.floatBufferBig
7+
import uno.buffer.intBufferBig
198

209
/**
2110
* Created by elect on 05/03/17.
@@ -54,56 +43,33 @@ inline infix fun GLWindow.gl3(crossinline inject: GL3.() -> Unit) {
5443
}
5544
}
5645

57-
fun checkError(gl: GL, location: String) {
5846

59-
val error = gl.glGetError()
60-
if (error != GL_NO_ERROR) {
61-
val errorString: String
62-
when (error) {
63-
GL_INVALID_ENUM -> errorString = "GL_INVALID_ENUM"
64-
GL_INVALID_VALUE -> errorString = "GL_INVALID_VALUE"
65-
GL_INVALID_OPERATION -> errorString = "GL_INVALID_OPERATION"
66-
GL_INVALID_FRAMEBUFFER_OPERATION -> errorString = "GL_INVALID_FRAMEBUFFER_OPERATION"
67-
GL_OUT_OF_MEMORY -> errorString = "GL_OUT_OF_MEMORY"
68-
else -> errorString = "UNKNOWN"
69-
}
70-
throw Error("OpenGL Error($errorString): $location")
71-
}
72-
}
47+
val floatBuffer = floatBufferBig(1)
48+
val intBuffer = intBufferBig(1)
7349

74-
fun checkError(location: String) {
50+
val vec2Buffer = floatBufferBig(2)
51+
val vec3Buffer = floatBufferBig(3)
52+
val vec4Buffer = floatBufferBig(4)
7553

76-
val error = GL11.glGetError()
77-
if (error != GL_NO_ERROR) {
78-
val errorString: String
79-
when (error) {
80-
GL_INVALID_ENUM -> errorString = "GL_INVALID_ENUM"
81-
GL_INVALID_VALUE -> errorString = "GL_INVALID_VALUE"
82-
GL_INVALID_OPERATION -> errorString = "GL_INVALID_OPERATION"
83-
GL_INVALID_FRAMEBUFFER_OPERATION -> errorString = "GL_INVALID_FRAMEBUFFER_OPERATION"
84-
GL_OUT_OF_MEMORY -> errorString = "GL_OUT_OF_MEMORY"
85-
else -> errorString = "UNKNOWN"
86-
}
87-
throw Error("OpenGL Error($errorString): $location")
88-
}
89-
}
54+
val vec2iBuffer = intBufferBig(2)
55+
val vec4iBuffer = intBufferBig(4)
9056

91-
fun glGetVec2(pname: Int): Vec2 {
92-
glGetFloatv(pname, vec2Buffer)
93-
return Vec2(vec2Buffer)
94-
}
95-
96-
fun glGetVec2i(pname: Int): Vec2i {
97-
glGetIntegerv(pname, vec2iBuffer)
98-
return Vec2i(vec2iBuffer)
99-
}
100-
101-
fun glGetVec4(pname: Int): Vec4 {
102-
glGetFloatv(pname, vec4Buffer)
103-
return Vec4(vec4Buffer)
104-
}
57+
val mat2Buffer = floatBufferBig(2 * 2)
58+
val mat2x3Buffer = floatBufferBig(2 * 3)
59+
val mat2x4Buffer = floatBufferBig(2 * 4)
60+
val mat3x2Buffer = floatBufferBig(3 * 2)
61+
val mat3Buffer = floatBufferBig(3 * 3)
62+
val mat3x4Buffer = floatBufferBig(3 * 4)
63+
val mat4x2Buffer = floatBufferBig(4 * 2)
64+
val mat4x3Buffer = floatBufferBig(4 * 3)
65+
val mat4Buffer = floatBufferBig(4 * 4)
10566

106-
fun glGetVec4i(pname: Int): Vec4i {
107-
glGetIntegerv(pname, vec4iBuffer)
108-
return Vec4i(vec4iBuffer)
109-
}
67+
val mat2dBuffer = doubleBufferBig(2 * 2)
68+
val mat2x3dBuffer = doubleBufferBig(2 * 3)
69+
val mat2x4dBuffer = doubleBufferBig(2 * 4)
70+
val mat3x2dBuffer = doubleBufferBig(3 * 2)
71+
val mat3dBuffer = doubleBufferBig(3 * 3)
72+
val mat3x4dBuffer = doubleBufferBig(3 * 4)
73+
val mat4x2dBuffer = doubleBufferBig(4 * 2)
74+
val mat4x3dBuffer = doubleBufferBig(4 * 3)
75+
val mat4dBuffer = doubleBufferBig(4 * 4)

‎src/main/kotlin/uno/gln/buffer.kt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ import org.lwjgl.opengl.GL15
88
import org.lwjgl.opengl.GL15.*
99
import org.lwjgl.opengl.GL30.*
1010
import org.lwjgl.system.MemoryUtil.NULL
11+
import uno.gl.intBuffer
12+
import uno.gl.mat4Buffer
1113
import java.nio.*
1214

1315
/**

‎src/main/kotlin/uno/gln/clear.kt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ import glm_.vec1.Vec1
66
import glm_.vec4.Vec4
77
import org.lwjgl.opengl.GL11
88
import org.lwjgl.opengl.GL30
9+
import uno.gl.floatBuffer
10+
import uno.gl.mat4Buffer
911

1012
/**
1113
* Created by GBarbieri on 21.04.2017.

‎src/main/kotlin/uno/gln/jogl/buffer.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import glm_.L
88
import glm_.mat4x4.Mat4
99
import glm_.set
1010
import glm_.size
11-
import uno.gln.intBuffer
12-
import uno.gln.mat4Buffer
11+
import uno.gl.intBuffer
12+
import uno.gl.mat4Buffer
1313
import java.nio.*
1414

1515
/**

‎src/main/kotlin/uno/gln/jogl/misc.kt‎

Lines changed: 39 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ import com.jogamp.opengl.GL
44
import com.jogamp.opengl.GL2ES3
55
import com.jogamp.opengl.GL3
66
import glm_.f
7+
import glm_.vec2.Vec2
78
import glm_.vec2.Vec2i
9+
import glm_.vec4.Vec4
810
import glm_.vec4.Vec4i
9-
import uno.gl.checkError
10-
import uno.gln.intBuffer
11-
import uno.gln.mat4Buffer
11+
import uno.gl.*
1212

1313

1414
fun GL3.glViewport(size: Vec2i) = glViewport(0, 0, size.x, size.y)
@@ -93,3 +93,39 @@ fun GL3.checkError(location: String) = checkError(gl, location)
9393

9494

9595

96+
fun GL3.glGetVec2(pname: Int): Vec2 {
97+
glGetFloatv(pname, vec2Buffer)
98+
return Vec2(vec2Buffer)
99+
}
100+
101+
fun GL3.glGetVec2i(pname: Int): Vec2i {
102+
glGetIntegerv(pname, vec2iBuffer)
103+
return Vec2i(vec2iBuffer)
104+
}
105+
106+
fun GL3.glGetVec4(pname: Int): Vec4 {
107+
glGetFloatv(pname, vec4Buffer)
108+
return Vec4(vec4Buffer)
109+
}
110+
111+
fun GL3.glGetVec4i(pname: Int): Vec4i {
112+
glGetIntegerv(pname, vec4iBuffer)
113+
return Vec4i(vec4iBuffer)
114+
}
115+
116+
fun checkError(gl: GL, location: String) {
117+
118+
val error = gl.glGetError()
119+
if (error != GL.GL_NO_ERROR) {
120+
val errorString: String
121+
when (error) {
122+
GL.GL_INVALID_ENUM -> errorString = "GL_INVALID_ENUM"
123+
GL.GL_INVALID_VALUE -> errorString = "GL_INVALID_VALUE"
124+
GL.GL_INVALID_OPERATION -> errorString = "GL_INVALID_OPERATION"
125+
GL.GL_INVALID_FRAMEBUFFER_OPERATION -> errorString = "GL_INVALID_FRAMEBUFFER_OPERATION"
126+
GL.GL_OUT_OF_MEMORY -> errorString = "GL_OUT_OF_MEMORY"
127+
else -> errorString = "UNKNOWN"
128+
}
129+
throw Error("OpenGL Error($errorString): $location")
130+
}
131+
}

‎src/main/kotlin/uno/gln/jogl/program.kt‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,9 @@ package uno.gln.jogl
22

33
import com.jogamp.opengl.GL2ES2
44
import com.jogamp.opengl.GL3
5-
import glm_.mat2x2.Mat2
6-
import glm_.mat3x3.Mat3
7-
import glm_.mat4x4.Mat4
8-
import glm_.vec2.Vec2
9-
import glm_.vec3.Vec3
10-
import glm_.vec4.Vec4
115
import uno.buffer.byteBufferOf
126
import uno.buffer.destroy
13-
import uno.gln.*
7+
import uno.gl.intBuffer
148
import uno.glsl.Program
159

1610
fun GL3.glGetProgram(program: Int, pname: Int): Int {

‎src/main/kotlin/uno/gln/jogl/shader.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import com.jogamp.opengl.GL3
55
import glm_.set
66
import uno.buffer.byteBufferOf
77
import uno.buffer.destroy
8-
import uno.gln.intBuffer
8+
import uno.gl.intBuffer
99

1010

1111
fun GL3.glShaderSource(shader: Int, source: String) {

‎src/main/kotlin/uno/gln/jogl/texture.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import com.jogamp.opengl.GL2GL3.*
77
import com.jogamp.opengl.GL3
88
import glm_.set
99
import glm_.vec2.Vec2i
10-
import uno.gln.intBuffer
10+
import uno.gl.intBuffer
1111
import java.nio.ByteBuffer
1212
import java.nio.IntBuffer
1313

‎src/main/kotlin/uno/gln/jogl/uniforms.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import glm_.vec4.Vec4
2828
import glm_.vec4.Vec4bool
2929
import glm_.vec4.Vec4i
3030
import glm_.vec4.Vec4t
31-
import uno.gln.*
31+
import uno.gl.*
3232

3333
// ----------------------------------------- vec -----------------------------------------------------------------------
3434
// inferred length and type

0 commit comments

Comments
 (0)