Merge pull request #2601 from mdcutone/gltools-vao

NF/EN: Better support for VAO/VBOs, GPU timer/sampling queries, more robust OBJ loading, and much more ...
psychopy · Sep 12, 2019 · 74b58d4 · 74b58d4
2 parents f0b81fe + 7125adb
commit 74b58d4
Show file tree

Hide file tree

Showing 4 changed files with 1,217 additions and 265 deletions.
diff --git a/docs/source/api/tools/gltools.rst b/docs/source/api/tools/gltools.rst
@@ -3,29 +3,36 @@
 
 .. automodule:: psychopy.tools.gltools
 .. currentmodule:: psychopy.tools.gltools
-
-.. autosummary:: 
-
+
+Overview
+~~~~~~~~
+
+.. autosummary::
     createProgram
-    compileShader
-    deleteObject
-    attachShader
-    detachShader
-    linkProgram
-    validateProgram
-    useProgram
     createProgramObjectARB
+    compileShader
     compileShaderObjectARB
     embedShaderSourceDefs
+    deleteObject
     deleteObjectARB
+    attachShader
     attachObjectARB
+    detachShader
     detachObjectARB
+    linkProgram
     linkProgramObjectARB
+    validateProgram
     validateProgramARB
+    useProgram
     useProgramObjectARB
     getInfoLog
     getUniformLocations
     getAttribLocations
+    createQueryObject
+    beginQuery
+    endQuery
+    getQuery
+    getAbsTimeGPU
     createFBO
     attach
     isComplete
@@ -51,43 +58,49 @@
     setVertexAttribPointer
     enableVertexAttribArray
     disableVertexAttribArray
-    drawVAO
-    deleteVBO
-    deleteVAO
     createMaterial
     useMaterial
     createLight
     useLights
     setAmbientLight
+    ObjMeshInfo
     loadObjFile
     loadMtlFile
+    createUVSphere
+    createPlane
     getIntegerv
     getFloatv
     getString
     getOpenGLInfo
 
-Function details
-~~~~~~~~~~~~~~~~~~~~~~~
+Details
+~~~~~~~
 
 .. autofunction:: createProgram
-.. autofunction:: compileShader
-.. autofunction:: deleteObject
-.. autofunction:: attachShader
-.. autofunction:: detachShader
-.. autofunction:: linkProgram
-.. autofunction:: validateProgram
-.. autofunction:: useProgram
 .. autofunction:: createProgramObjectARB
+.. autofunction:: compileShader
 .. autofunction:: compileShaderObjectARB
+.. autofunction:: embedShaderSourceDefs
+.. autofunction:: deleteObject
 .. autofunction:: deleteObjectARB
+.. autofunction:: attachShader
 .. autofunction:: attachObjectARB
+.. autofunction:: detachShader
 .. autofunction:: detachObjectARB
+.. autofunction:: linkProgram
 .. autofunction:: linkProgramObjectARB
+.. autofunction:: validateProgram
 .. autofunction:: validateProgramARB
+.. autofunction:: useProgram
 .. autofunction:: useProgramObjectARB
 .. autofunction:: getInfoLog
 .. autofunction:: getUniformLocations
 .. autofunction:: getAttribLocations
+.. autofunction:: createQueryObject
+.. autofunction:: beginQuery
+.. autofunction:: endQuery
+.. autofunction:: getQuery
+.. autofunction:: getAbsTimeGPU
 .. autofunction:: createFBO
 .. autofunction:: attach
 .. autofunction:: isComplete
@@ -99,11 +112,9 @@ Function details
 .. autofunction:: createTexImage2D
 .. autofunction:: createTexImage2DMultisample
 .. autofunction:: deleteTexture
-.. autofunction:: VertexArrayInfo
 .. autofunction:: createVAO
 .. autofunction:: drawVAO
 .. autofunction:: deleteVAO
-.. autofunction:: VertexBufferInfo
 .. autofunction:: createVBO
 .. autofunction:: bindVBO
 .. autofunction:: unbindVBO
@@ -120,13 +131,16 @@ Function details
 .. autofunction:: setAmbientLight
 .. autofunction:: loadObjFile
 .. autofunction:: loadMtlFile
+.. autofunction:: createUVSphere
+.. autofunction:: createPlane
 .. autofunction:: getIntegerv
 .. autofunction:: getFloatv
 .. autofunction:: getString
 .. autofunction:: getOpenGLInfo
 
+
 Examples
-~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~
 **Working with Framebuffer Objects (FBOs):**
 
 Creating an empty framebuffer with no attachments::

diff --git a/docs/source/api/tools/mathtools.rst b/docs/source/api/tools/mathtools.rst
@@ -77,25 +77,30 @@ Overview
     dot
     cross
     project
+    perp
     lerp
     distance
     angleTo
     surfaceNormal
     surfaceBitangent
     surfaceTangent
     vertexNormal
+    intersectRayPlane
+    ortho3Dto2D
     slerp
     quatToAxisAngle
     quatFromAxisAngle
     quatMagnitude
     multQuat
     invertQuat
     applyQuat
-    matrixFromQuat
+    quatToMatrix
     scaleMatrix
     rotationMatrix
     translationMatrix
     invertMatrix
+    isOrthogonal
+    isAffine
     concatenate
     applyMatrix
     posOriToMatrix
@@ -111,25 +116,30 @@ Details
 .. autofunction:: dot
 .. autofunction:: cross
 .. autofunction:: project
+.. autofunction:: perp
 .. autofunction:: lerp
 .. autofunction:: distance
 .. autofunction:: angleTo
 .. autofunction:: surfaceNormal
 .. autofunction:: surfaceBitangent
 .. autofunction:: surfaceTangent
 .. autofunction:: vertexNormal
+.. autofunction:: intersectRayPlane
+.. autofunction:: ortho3Dto2D
 .. autofunction:: slerp
 .. autofunction:: quatToAxisAngle
 .. autofunction:: quatFromAxisAngle
 .. autofunction:: quatMagnitude
 .. autofunction:: multQuat
 .. autofunction:: invertQuat
 .. autofunction:: applyQuat
-.. autofunction:: matrixFromQuat
+.. autofunction:: quatToMatrix
 .. autofunction:: scaleMatrix
 .. autofunction:: rotationMatrix
 .. autofunction:: translationMatrix
 .. autofunction:: invertMatrix
+.. autofunction:: isOrthogonal
+.. autofunction:: isAffine
 .. autofunction:: concatenate
 .. autofunction:: applyMatrix
 .. autofunction:: rigidBodyToMatrix