@@ -65,7 +65,7 @@ enum UniformSemantic {
6565CI_API class Context * context ();
6666CI_API class Environment * env ();
6767
68- // ! Ovewrites the local static environment variable, only useful from external (dll) plugins.
68+ // ! Overwrites the local static environment variable, only useful from external (dll) plugins.
6969CI_API void setEnvironment ( Environment* environment );
7070
7171CI_API void enableVerticalSync ( bool enable = true );
@@ -377,25 +377,121 @@ CI_API inline void compatColor( const Color8u &color ) { glColor3ubv( &color.r )
377377CI_API inline void compatColor ( const ColorA8u &color ) { glColor4ubv ( &color.r ); }
378378
379379// NV_path_rendering extension
380- CI_API inline GLuint genPathsNV ( GLsizei range ) { return glGenPathsNV ( range ); }
381- CI_API inline void deletePathsNV ( GLuint path, GLsizei range ) { glDeletePathsNV ( path, range ); }
380+ CI_API inline GLuint genPathsNV ( GLsizei range ) { return glGenPathsNV ( range ); }
381+ CI_API inline void deletePathsNV ( GLuint path, GLsizei range ) { glDeletePathsNV ( path, range ); }
382+ CI_API inline GLboolean isPathNV ( GLuint path ) { return glIsPathNV ( path ); }
383+ CI_API inline void pathCommandsNV ( GLuint path, GLsizei numCommands, const GLubyte *commands, GLsizei numCoords, GLenum coordType, const void *coords ) { glPathCommandsNV ( path, numCommands, commands, numCoords, coordType, coords ); }
384+ CI_API inline void pathCoordsNV ( GLuint path, GLsizei numCoords, GLenum coordType, const void *coords ) { glPathCoordsNV ( path, numCoords, coordType, coords ); }
385+ CI_API inline void pathSubCommandsNV ( GLuint path, GLsizei commandStart, GLsizei commandsToDelete, GLsizei numCommands, const GLubyte *commands, GLsizei numCoords, GLenum coordType, const void *coords )
386+ {
387+ glPathSubCommandsNV ( path, commandStart, commandsToDelete, numCommands, commands, numCoords, coordType, coords );
388+ }
389+ CI_API inline void pathSubCoordsNV ( GLuint path, GLsizei coordStart, GLsizei numCoords, GLenum coordType, const void *coords ) { glPathSubCoordsNV ( path, coordStart, numCoords, coordType, coords ); }
382390CI_API inline void pathStringNV ( GLuint path, GLenum format, GLsizei length, const void *pathString ) { glPathStringNV ( path, format, length, pathString ); }
383- CI_API inline void pathCommandsNV ( GLuint path, GLsizei numCommands, const GLubyte *commands, GLsizei numCoords, GLenum coordType, const void *coords )
384- { glPathCommandsNV ( path, numCommands, commands, numCoords, coordType, coords); }
391+ CI_API inline void pathGlyphsNV ( GLuint firstPathName, GLenum fontTarget, const void *fontName, GLbitfield fontStyle, GLsizei numGlyphs, GLenum type, const void *charcodes, //
392+ GLenum handleMissingGlyphs, GLuint pathParameterTemplate, GLfloat emScale )
393+ {
394+ glPathGlyphsNV ( firstPathName, fontTarget, fontName, fontStyle, numGlyphs, type, charcodes, handleMissingGlyphs, pathParameterTemplate, emScale );
395+ }
396+ CI_API inline void pathGlyphRangeNV ( GLuint firstPathName, GLenum fontTarget, const void *fontName, GLbitfield fontStyle, GLuint firstGlyph, GLsizei numGlyphs, //
397+ GLenum handleMissingGlyphs, GLuint pathParameterTemplate, GLfloat emScale )
398+ {
399+ glPathGlyphRangeNV ( firstPathName, fontTarget, fontName, fontStyle, firstGlyph, numGlyphs, handleMissingGlyphs, pathParameterTemplate, emScale );
400+ }
401+ CI_API inline void weightPathsNV ( GLuint resultPath, GLsizei numPaths, const GLuint *paths, const GLfloat *weights ) { glWeightPathsNV ( resultPath, numPaths, paths, weights ); }
402+ CI_API inline void copyPathNV ( GLuint resultPath, GLuint srcPath ) { glCopyPathNV ( resultPath, srcPath ); }
403+ CI_API inline void interpolatePathsNV ( GLuint resultPath, GLuint pathA, GLuint pathB, GLfloat weight ) { glInterpolatePathsNV ( resultPath, pathA, pathB, weight ); }
404+ CI_API inline void transformPathNV ( GLuint resultPath, GLuint srcPath, GLenum transformType, const GLfloat *transformValues ) { glTransformPathNV ( resultPath, srcPath, transformType, transformValues ); }
405+ CI_API inline void pathParameterivNV ( GLuint path, GLenum pname, const GLint *value ) { glPathParameterivNV ( path, pname, value ); }
385406CI_API inline void pathParameteriNV ( GLuint path, GLenum pname, GLint value ) { glPathParameteriNV ( path, pname, value ); }
407+ CI_API inline void pathParameterfvNV ( GLuint path, GLenum pname, const GLfloat *value ) { glPathParameterfvNV ( path, pname, value ); }
386408CI_API inline void pathParameterfNV ( GLuint path, GLenum pname, GLfloat value ) { glPathParameterfNV ( path, pname, value ); }
387- CI_API inline void pathTexGenNV ( GLenum texCoordSet, GLenum genMode, int components, const float *coeffs ) { glPathTexGenNV ( texCoordSet, genMode, components, coeffs ); }
388- CI_API inline void pathColorGenNV ( GLenum color, GLenum genMode, GLenum colorMode, const float *coeffs ) { glPathColorGenNV ( color, genMode, colorMode, coeffs ); }
389- CI_API inline void getPathParameterfvNV ( GLuint path, GLenum pname, GLfloat *value ) { glGetPathParameterfvNV ( path, pname, value ); }
390- CI_API inline void pathCoverDepthFuncNV ( GLenum zfunc ) { glPathCoverDepthFuncNV ( zfunc ); }
409+ CI_API inline void pathDashArrayNV ( GLuint path, GLsizei dashCount, const GLfloat *dashArray ) { glPathDashArrayNV ( path, dashCount, dashArray ); }
410+ CI_API inline void pathStencilFuncNV ( GLenum func, GLint ref, GLuint mask ) { glPathStencilFuncNV ( func, ref, mask ); }
411+ CI_API inline void pathStencilDepthOffsetNV ( GLfloat factor, GLfloat units ) { glPathStencilDepthOffsetNV ( factor, units ); }
391412CI_API inline void stencilFillPathNV ( GLuint path, GLenum fillMode, GLuint mask ) { glStencilFillPathNV ( path, fillMode, mask ); }
392- CI_API inline void stencilStrokePathNV ( GLuint path, int reference, GLuint mask ) { glStencilStrokePathNV ( path, reference, mask ); }
413+ CI_API inline void stencilStrokePathNV ( GLuint path, GLint reference, GLuint mask ) { glStencilStrokePathNV ( path, reference, mask ); }
414+ CI_API inline void stencilFillPathInstancedNV ( GLsizei numPaths, GLenum pathNameType, const void *paths, GLuint pathBase, GLenum fillMode, GLuint mask, GLenum transformType, const GLfloat *transformValues )
415+ {
416+ glStencilFillPathInstancedNV ( numPaths, pathNameType, paths, pathBase, fillMode, mask, transformType, transformValues );
417+ }
418+ CI_API inline void stencilStrokePathInstancedNV ( GLsizei numPaths, GLenum pathNameType, const void *paths, GLuint pathBase, GLint reference, GLuint mask, GLenum transformType, const GLfloat *transformValues )
419+ {
420+ glStencilStrokePathInstancedNV ( numPaths, pathNameType, paths, pathBase, reference, mask, transformType, transformValues );
421+ }
422+ CI_API inline void pathCoverDepthFuncNV ( GLenum func ) { glPathCoverDepthFuncNV ( func ); }
393423CI_API inline void coverFillPathNV ( GLuint path, GLenum coverMode ) { glCoverFillPathNV ( path, coverMode ); }
394424CI_API inline void coverStrokePathNV ( GLuint path, GLenum coverMode ) { glCoverStrokePathNV ( path, coverMode ); }
395- CI_API inline void stencilFillPathInstancedNV ( GLsizei numPaths, GLenum pathNameType, const void *paths, GLuint pathBase, GLenum fillMode, GLuint mask, GLenum transformType, const float *transformValues )
396- { glStencilFillPathInstancedNV ( numPaths, pathNameType, paths, pathBase, fillMode, mask, transformType, transformValues ); }
397- CI_API inline void coverFillPathInstancedNV ( GLsizei numPaths, GLenum pathNameType, const void *paths, GLuint pathBase, GLenum coverMode, GLenum transformType, const float *transformValues )
398- { glCoverFillPathInstancedNV ( numPaths, pathNameType, paths, pathBase, coverMode, transformType, transformValues ); }
425+ CI_API inline void coverFillPathInstancedNV ( GLsizei numPaths, GLenum pathNameType, const void *paths, GLuint pathBase, GLenum coverMode, GLenum transformType, const GLfloat *transformValues )
426+ {
427+ glCoverFillPathInstancedNV ( numPaths, pathNameType, paths, pathBase, coverMode, transformType, transformValues );
428+ }
429+ CI_API inline void coverStrokePathInstancedNV ( GLsizei numPaths, GLenum pathNameType, const void *paths, GLuint pathBase, GLenum coverMode, GLenum transformType, const GLfloat *transformValues )
430+ {
431+ glCoverStrokePathInstancedNV ( numPaths, pathNameType, paths, pathBase, coverMode, transformType, transformValues );
432+ }
433+ CI_API inline void getPathParameterivNV ( GLuint path, GLenum pname, GLint *value ) { glGetPathParameterivNV ( path, pname, value ); }
434+ CI_API inline void getPathParameterfvNV ( GLuint path, GLenum pname, GLfloat *value ) { glGetPathParameterfvNV ( path, pname, value ); }
435+ CI_API inline void getPathCommandsNV ( GLuint path, GLubyte *commands ) { glGetPathCommandsNV ( path, commands ); }
436+ CI_API inline void getPathCoordsNV ( GLuint path, GLfloat *coords ) { glGetPathCoordsNV ( path, coords ); }
437+ CI_API inline void getPathDashArrayNV ( GLuint path, GLfloat *dashArray ) { glGetPathDashArrayNV ( path, dashArray ); }
438+ CI_API inline void getPathMetricsNV ( GLbitfield metricQueryMask, GLsizei numPaths, GLenum pathNameType, const void *paths, GLuint pathBase, GLsizei stride, GLfloat *metrics )
439+ {
440+ glGetPathMetricsNV ( metricQueryMask, numPaths, pathNameType, paths, pathBase, stride, metrics );
441+ }
442+ CI_API inline void getPathMetricRangeNV ( GLbitfield metricQueryMask, GLuint firstPathName, GLsizei numPaths, GLsizei stride, GLfloat *metrics ) { glGetPathMetricRangeNV ( metricQueryMask, firstPathName, numPaths, stride, metrics ); }
443+ CI_API inline void getPathSpacingNV ( GLenum pathListMode, GLsizei numPaths, GLenum pathNameType, const void *paths, GLuint pathBase, GLfloat advanceScale, GLfloat kerningScale, GLenum transformType, GLfloat *returnedSpacing )
444+ {
445+ glGetPathSpacingNV ( pathListMode, numPaths, pathNameType, paths, pathBase, advanceScale, kerningScale, transformType, returnedSpacing );
446+ }
447+ CI_API inline GLboolean isPointInFillPathNV ( GLuint path, GLuint mask, GLfloat x, GLfloat y ) { return glIsPointInFillPathNV ( path, mask, x, y ); }
448+ CI_API inline GLboolean isPointInStrokePathNV ( GLuint path, GLfloat x, GLfloat y ) { return glIsPointInStrokePathNV ( path, x, y ); }
449+ CI_API inline GLfloat getPathLengthNV ( GLuint path, GLsizei startSegment, GLsizei numSegments ) { return glGetPathLengthNV ( path, startSegment, numSegments ); }
450+ CI_API inline GLboolean pointAlongPathNV ( GLuint path, GLsizei startSegment, GLsizei numSegments, GLfloat distance, GLfloat *x, GLfloat *y, GLfloat *tangentX, GLfloat *tangentY )
451+ {
452+ return glPointAlongPathNV ( path, startSegment, numSegments, distance, x, y, tangentX, tangentY );
453+ }
454+ CI_API inline void matrixLoad3x2fNV ( GLenum matrixMode, const GLfloat *m ) { glMatrixLoad3x2fNV ( matrixMode, m ); }
455+ CI_API inline void matrixLoad3x3fNV ( GLenum matrixMode, const GLfloat *m ) { glMatrixLoad3x3fNV ( matrixMode, m ); }
456+ CI_API inline void matrixLoadTranspose3x3fNV ( GLenum matrixMode, const GLfloat *m ) { glMatrixLoadTranspose3x3fNV ( matrixMode, m ); }
457+ CI_API inline void matrixMult3x2fNV ( GLenum matrixMode, const GLfloat *m ) { glMatrixMult3x2fNV ( matrixMode, m ); }
458+ CI_API inline void matrixMult3x3fNV ( GLenum matrixMode, const GLfloat *m ) { glMatrixMult3x3fNV ( matrixMode, m ); }
459+ CI_API inline void matrixMultTranspose3x3fNV ( GLenum matrixMode, const GLfloat *m ) { glMatrixMultTranspose3x3fNV ( matrixMode, m ); }
460+ CI_API inline void stencilThenCoverFillPathNV ( GLuint path, GLenum fillMode, GLuint mask, GLenum coverMode ) { glStencilThenCoverFillPathNV ( path, fillMode, mask, coverMode ); }
461+ CI_API inline void stencilThenCoverStrokePathNV ( GLuint path, GLint reference, GLuint mask, GLenum coverMode ) { glStencilThenCoverStrokePathNV ( path, reference, mask, coverMode ); }
462+ CI_API inline void stencilThenCoverFillPathInstancedNV ( GLsizei numPaths, GLenum pathNameType, const void *paths, GLuint pathBase, GLenum fillMode, GLuint mask, GLenum coverMode, GLenum transformType, const GLfloat *transformValues )
463+ {
464+ glStencilThenCoverFillPathInstancedNV ( numPaths, pathNameType, paths, pathBase, fillMode, mask, coverMode, transformType, transformValues );
465+ }
466+ CI_API inline void stencilThenCoverStrokePathInstancedNV ( GLsizei numPaths, GLenum pathNameType, const void *paths, GLuint pathBase, GLint reference, GLuint mask, GLenum coverMode, GLenum transformType, const GLfloat *transformValues )
467+ {
468+ glStencilThenCoverStrokePathInstancedNV ( numPaths, pathNameType, paths, pathBase, reference, mask, coverMode, transformType, transformValues );
469+ }
470+ CI_API inline GLenum pathGlyphIndexRangeNV ( GLenum fontTarget, const void *fontName, GLbitfield fontStyle, GLuint pathParameterTemplate, GLfloat emScale, GLuint baseAndCount[2 ] )
471+ {
472+ return glPathGlyphIndexRangeNV ( fontTarget, fontName, fontStyle, pathParameterTemplate, emScale, baseAndCount );
473+ }
474+ CI_API inline GLenum pathGlyphIndexArrayNV ( GLuint firstPathName, GLenum fontTarget, const void *fontName, GLbitfield fontStyle, GLuint firstGlyphIndex, GLsizei numGlyphs, GLuint pathParameterTemplate, GLfloat emScale )
475+ {
476+ return glPathGlyphIndexArrayNV ( firstPathName, fontTarget, fontName, fontStyle, firstGlyphIndex, numGlyphs, pathParameterTemplate, emScale );
477+ }
478+ CI_API inline GLenum pathMemoryGlyphIndexArrayNV (
479+ GLuint firstPathName, GLenum fontTarget, GLsizeiptr fontSize, const void *fontData, GLsizei faceIndex, GLuint firstGlyphIndex, GLsizei numGlyphs, GLuint pathParameterTemplate, GLfloat emScale )
480+ {
481+ return glPathMemoryGlyphIndexArrayNV ( firstPathName, fontTarget, fontSize, fontData, faceIndex, firstGlyphIndex, numGlyphs, pathParameterTemplate, emScale );
482+ }
483+ CI_API inline void programPathFragmentInputGenNV ( GLuint program, GLint location, GLenum genMode, GLint components, const GLfloat *coeffs ) { glProgramPathFragmentInputGenNV ( program, location, genMode, components, coeffs ); }
484+ CI_API inline void getProgramResourcefvNV ( GLuint program, GLenum programInterface, GLuint index, GLsizei propCount, const GLenum *props, GLsizei count, GLsizei *length, GLfloat *params )
485+ {
486+ glGetProgramResourcefvNV ( program, programInterface, index, propCount, props, count, length, params );
487+ }
488+ CI_API inline void pathColorGenNV ( GLenum color, GLenum genMode, GLenum colorFormat, const GLfloat *coeffs ) { glPathColorGenNV ( color, genMode, colorFormat, coeffs ); }
489+ CI_API inline void pathTexGenNV ( GLenum texCoordSet, GLenum genMode, GLint components, const GLfloat *coeffs ) { glPathTexGenNV ( texCoordSet, genMode, components, coeffs ); }
490+ CI_API inline void pathFogGenNV ( GLenum genMode ) { glPathFogGenNV ( genMode ); }
491+ CI_API inline void getPathColorGenivNV ( GLenum color, GLenum pname, GLint *value ) { glGetPathColorGenivNV ( color, pname, value ); }
492+ CI_API inline void getPathColorGenfvNV ( GLenum color, GLenum pname, GLfloat *value ) { glGetPathColorGenfvNV ( color, pname, value ); }
493+ CI_API inline void getPathTexGenivNV ( GLenum texCoordSet, GLenum pname, GLint *value ) { glGetPathTexGenivNV ( texCoordSet, pname, value ); }
494+ CI_API inline void getPathTexGenfvNV ( GLenum texCoordSet, GLenum pname, GLfloat *value ) { glGetPathTexGenfvNV ( texCoordSet, pname, value ); }
399495CI_API inline void matrixLoadfEXT ( GLenum matrixMode, const float *m ) { glMatrixLoadfEXT ( matrixMode, m ); }
400496#endif // defined( CINDER_GL_HAS_NV_PATH )
401497
0 commit comments