diff --git a/components/nvidia-widgets/doc/glfreetype/index-4.html b/components/nvidia-widgets/doc/glfreetype/index-4.html index 734c5073e..6a40b814b 100644 --- a/components/nvidia-widgets/doc/glfreetype/index-4.html +++ b/components/nvidia-widgets/doc/glfreetype/index-4.html @@ -2,7 +2,7 @@ -Reference for unit 'glFreeType': Classes +Reference for unit 'GLFreeType': Classes @@ -10,10 +10,10 @@ - +
[Overview][Classes][Index]Reference for unit 'glFreeType' (#nvidia-widgets)Reference for unit 'GLFreeType' (#nvidia-widgets)
-

Reference for unit 'glFreeType': Classes

+

Reference for unit 'GLFreeType': Classes

diff --git a/components/nvidia-widgets/doc/glfreetype/index-8.html b/components/nvidia-widgets/doc/glfreetype/index-8.html index 2c714dec2..17505b583 100644 --- a/components/nvidia-widgets/doc/glfreetype/index-8.html +++ b/components/nvidia-widgets/doc/glfreetype/index-8.html @@ -2,7 +2,7 @@ -Index of all identifiers in unit 'glFreeType' +Index of all identifiers in unit 'GLFreeType' @@ -10,10 +10,10 @@

TGLFreeTypeFont
- +
[Overview][Classes][Index]Reference for unit 'glFreeType' (#nvidia-widgets)Reference for unit 'GLFreeType' (#nvidia-widgets)
-

Index of all identifiers in unit 'glFreeType'

+

Index of all identifiers in unit 'GLFreeType'

diff --git a/components/nvidia-widgets/doc/glfreetype/index.html b/components/nvidia-widgets/doc/glfreetype/index.html index 0585df2cd..ba4ba0ed4 100644 --- a/components/nvidia-widgets/doc/glfreetype/index.html +++ b/components/nvidia-widgets/doc/glfreetype/index.html @@ -2,7 +2,7 @@ -Reference for unit 'glFreeType' +Reference for unit 'GLFreeType' @@ -10,10 +10,10 @@
T 
- +
[Overview][Classes][Index]Reference for unit 'glFreeType' (#nvidia-widgets)Reference for unit 'GLFreeType' (#nvidia-widgets)
-

Reference for unit 'glFreeType'

+

Reference for unit 'GLFreeType'

Free Type support for OpenGL

diff --git a/components/nvidia-widgets/doc/glfreetype/tglfreetypefont.clean.html b/components/nvidia-widgets/doc/glfreetype/tglfreetypefont.clean.html index 2c4d8d2a0..c3a19dd05 100644 --- a/components/nvidia-widgets/doc/glfreetype/tglfreetypefont.clean.html +++ b/components/nvidia-widgets/doc/glfreetype/tglfreetypefont.clean.html @@ -10,7 +10,7 @@
- +
[Overview][Classes][Index]Reference for unit 'glFreeType' (#nvidia-widgets)Reference for unit 'GLFreeType' (#nvidia-widgets)

TGLFreeTypeFont.Clean

diff --git a/components/nvidia-widgets/doc/glfreetype/tglfreetypefont.height.html b/components/nvidia-widgets/doc/glfreetype/tglfreetypefont.height.html index c244d3363..5e5d5b4d9 100644 --- a/components/nvidia-widgets/doc/glfreetype/tglfreetypefont.height.html +++ b/components/nvidia-widgets/doc/glfreetype/tglfreetypefont.height.html @@ -10,7 +10,7 @@ - +
[Overview][Classes][Index]Reference for unit 'glFreeType' (#nvidia-widgets)Reference for unit 'GLFreeType' (#nvidia-widgets)

TGLFreeTypeFont.Height

diff --git a/components/nvidia-widgets/doc/glfreetype/tglfreetypefont.html b/components/nvidia-widgets/doc/glfreetype/tglfreetypefont.html index 179fbc50a..aa9f8c4b8 100644 --- a/components/nvidia-widgets/doc/glfreetype/tglfreetypefont.html +++ b/components/nvidia-widgets/doc/glfreetype/tglfreetypefont.html @@ -10,7 +10,7 @@ - +
[Overview][Classes][Index]Reference for unit 'glFreeType' (#nvidia-widgets)Reference for unit 'GLFreeType' (#nvidia-widgets)

TGLFreeTypeFont

diff --git a/components/nvidia-widgets/doc/glfreetype/tglfreetypefont.init.html b/components/nvidia-widgets/doc/glfreetype/tglfreetypefont.init.html index 2c417e0ae..d41e2d902 100644 --- a/components/nvidia-widgets/doc/glfreetype/tglfreetypefont.init.html +++ b/components/nvidia-widgets/doc/glfreetype/tglfreetypefont.init.html @@ -10,7 +10,7 @@ - +
[Overview][Classes][Index]Reference for unit 'glFreeType' (#nvidia-widgets)Reference for unit 'GLFreeType' (#nvidia-widgets)

TGLFreeTypeFont.Init

diff --git a/components/nvidia-widgets/doc/glfreetype/tglfreetypefont.list_base.html b/components/nvidia-widgets/doc/glfreetype/tglfreetypefont.list_base.html index 069178612..c36206eab 100644 --- a/components/nvidia-widgets/doc/glfreetype/tglfreetypefont.list_base.html +++ b/components/nvidia-widgets/doc/glfreetype/tglfreetypefont.list_base.html @@ -10,7 +10,7 @@ - +
[Overview][Classes][Index]Reference for unit 'glFreeType' (#nvidia-widgets)Reference for unit 'GLFreeType' (#nvidia-widgets)

TGLFreeTypeFont.list_base

diff --git a/components/nvidia-widgets/doc/glfreetype/tglfreetypefont.print.html b/components/nvidia-widgets/doc/glfreetype/tglfreetypefont.print.html index cb1aa34d5..2a2e87d4e 100644 --- a/components/nvidia-widgets/doc/glfreetype/tglfreetypefont.print.html +++ b/components/nvidia-widgets/doc/glfreetype/tglfreetypefont.print.html @@ -10,7 +10,7 @@ - +
[Overview][Classes][Index]Reference for unit 'glFreeType' (#nvidia-widgets)Reference for unit 'GLFreeType' (#nvidia-widgets)

TGLFreeTypeFont.Print

diff --git a/components/nvidia-widgets/doc/glfreetype/tglfreetypefont.textures.html b/components/nvidia-widgets/doc/glfreetype/tglfreetypefont.textures.html index 7f1f8dbf5..c7d9f6d56 100644 --- a/components/nvidia-widgets/doc/glfreetype/tglfreetypefont.textures.html +++ b/components/nvidia-widgets/doc/glfreetype/tglfreetypefont.textures.html @@ -10,7 +10,7 @@ - +
[Overview][Classes][Index]Reference for unit 'glFreeType' (#nvidia-widgets)Reference for unit 'GLFreeType' (#nvidia-widgets)

TGLFreeTypeFont.textures

diff --git a/components/nvidia-widgets/doc/images/nvwidgets.png b/components/nvidia-widgets/doc/images/nvwidgets.png index 822d012ba..28a02a092 100644 Binary files a/components/nvidia-widgets/doc/images/nvwidgets.png and b/components/nvidia-widgets/doc/images/nvwidgets.png differ diff --git a/components/nvidia-widgets/doc/index-8.html b/components/nvidia-widgets/doc/index-8.html index 471ac7049..b79d7f93f 100644 --- a/components/nvidia-widgets/doc/index-8.html +++ b/components/nvidia-widgets/doc/index-8.html @@ -88,7 +88,7 @@

G

- + diff --git a/components/nvidia-widgets/doc/index.html b/components/nvidia-widgets/doc/index.html index c19d92de5..e42752c09 100644 --- a/components/nvidia-widgets/doc/index.html +++ b/components/nvidia-widgets/doc/index.html @@ -18,7 +18,7 @@

Units

glFreeTypeGLFreeType GroupFlags_GrowLeftFromBottom GroupFlags_LayoutNone
- + diff --git a/components/nvidia-widgets/doc/nvglwidgets/cbase.html b/components/nvidia-widgets/doc/nvglwidgets/cbase.html index 45d5f0f65..526a286dc 100644 --- a/components/nvidia-widgets/doc/nvglwidgets/cbase.html +++ b/components/nvidia-widgets/doc/nvglwidgets/cbase.html @@ -16,7 +16,7 @@

cBase

Declaration

-

Source position: nvglwidgets.pas line 18

+

Source position: nvglwidgets.pas line 19

glFreeType

GLFreeType

  

Free Type support for OpenGL
diff --git a/components/nvidia-widgets/doc/nvglwidgets/cbool.html b/components/nvidia-widgets/doc/nvglwidgets/cbool.html index 7b2ada2c5..073ae54d8 100644 --- a/components/nvidia-widgets/doc/nvglwidgets/cbool.html +++ b/components/nvidia-widgets/doc/nvglwidgets/cbool.html @@ -16,7 +16,7 @@

cBool

Declaration

-

Source position: nvglwidgets.pas line 19

+

Source position: nvglwidgets.pas line 20

const cBase = 0;
diff --git a/components/nvidia-widgets/doc/nvglwidgets/cfont.html b/components/nvidia-widgets/doc/nvglwidgets/cfont.html index 6b1ef1b10..ae14baf5c 100644 --- a/components/nvidia-widgets/doc/nvglwidgets/cfont.html +++ b/components/nvidia-widgets/doc/nvglwidgets/cfont.html @@ -16,7 +16,7 @@

cFont

Declaration

-

Source position: nvglwidgets.pas line 21

+

Source position: nvglwidgets.pas line 22

const cBool = 4;
diff --git a/components/nvidia-widgets/doc/nvglwidgets/cfontback.html b/components/nvidia-widgets/doc/nvglwidgets/cfontback.html index 2a46b4808..0c8b842a6 100644 --- a/components/nvidia-widgets/doc/nvglwidgets/cfontback.html +++ b/components/nvidia-widgets/doc/nvglwidgets/cfontback.html @@ -16,7 +16,7 @@

cFontBack

Declaration

-

Source position: nvglwidgets.pas line 22

+

Source position: nvglwidgets.pas line 23

const cFont = 12;
diff --git a/components/nvidia-widgets/doc/nvglwidgets/cnbcolors.html b/components/nvidia-widgets/doc/nvglwidgets/cnbcolors.html index 86103e5b2..0bbbb130b 100644 --- a/components/nvidia-widgets/doc/nvglwidgets/cnbcolors.html +++ b/components/nvidia-widgets/doc/nvglwidgets/cnbcolors.html @@ -16,7 +16,7 @@

cNbColors

Declaration

-

Source position: nvglwidgets.pas line 24

+

Source position: nvglwidgets.pas line 25

const cFontBack = 16;
diff --git a/components/nvidia-widgets/doc/nvglwidgets/coutline.html b/components/nvidia-widgets/doc/nvglwidgets/coutline.html index 22209bb5a..bde2f4725 100644 --- a/components/nvidia-widgets/doc/nvglwidgets/coutline.html +++ b/components/nvidia-widgets/doc/nvglwidgets/coutline.html @@ -16,7 +16,7 @@

cOutline

Declaration

-

Source position: nvglwidgets.pas line 20

+

Source position: nvglwidgets.pas line 21

const cNbColors = 24;
diff --git a/components/nvidia-widgets/doc/nvglwidgets/ctexviewwidgetfssource.html b/components/nvidia-widgets/doc/nvglwidgets/ctexviewwidgetfssource.html index 49ce9bb58..280e7031b 100644 --- a/components/nvidia-widgets/doc/nvglwidgets/ctexviewwidgetfssource.html +++ b/components/nvidia-widgets/doc/nvglwidgets/ctexviewwidgetfssource.html @@ -16,7 +16,7 @@

cTexViewWidgetFSSource

Declaration

-

Source position: nvglwidgets.pas line 95

+

Source position: nvglwidgets.pas line 96

const cOutline = 8;
diff --git a/components/nvidia-widgets/doc/nvglwidgets/ctranslucent.html b/components/nvidia-widgets/doc/nvglwidgets/ctranslucent.html index ece6ec28f..d015bc89e 100644 --- a/components/nvidia-widgets/doc/nvglwidgets/ctranslucent.html +++ b/components/nvidia-widgets/doc/nvglwidgets/ctranslucent.html @@ -16,7 +16,7 @@

cTranslucent

Declaration

-

Source position: nvglwidgets.pas line 23

+

Source position: nvglwidgets.pas line 24

const cTexViewWidgetFSSource = '#version 120' + LineEnding + 'uniform float mipLevel /*= 0*/;' + LineEnding + 'uniform float texelScale /*= 1.0*/;' + LineEnding + 'uniform float texelOffset /*= 0.0*/;' + LineEnding + 'uniform ivec4 texelSwizzling /*= ivec4( 0, 1, 2, 3)*/;' + LineEnding + 'uniform sampler2D samp;' + LineEnding + LineEnding + 'void main()' + LineEnding + '{' + LineEnding + ' vec4 texel;' + LineEnding + ' if (mipLevel > 0)' + LineEnding + ' texel = texture2DLod( samp, gl_TexCoord[0].xy, mipLevel);' + LineEnding + ' else' + LineEnding + ' texel = texture2D( samp, gl_TexCoord[0].xy);' + LineEnding + ' texel = texel * texelScale + texelOffset;' + LineEnding + ' gl_FragColor = texel.x * vec4( texelSwizzling.x == 0, texelSwizzling.y == 0, texelSwizzling.z == 0, texelSwizzling.w == 0 );' + LineEnding + ' gl_FragColor += texel.y * vec4( texelSwizzling.x == 1, texelSwizzling.y == 1, texelSwizzling.z == 1, texelSwizzling.w == 1 );' + LineEnding + ' gl_FragColor += texel.z * vec4( texelSwizzling.x == 2, texelSwizzling.y == 2, texelSwizzling.z == 2, texelSwizzling.w == 2 );' + LineEnding + ' gl_FragColor += texel.w * vec4( texelSwizzling.x == 3, texelSwizzling.y == 3, texelSwizzling.z == 3, texelSwizzling.w == 3 );' + LineEnding + '}';
diff --git a/components/nvidia-widgets/doc/nvglwidgets/cwidgetfssource.html b/components/nvidia-widgets/doc/nvglwidgets/cwidgetfssource.html index 3e6ead14c..58f628f5b 100644 --- a/components/nvidia-widgets/doc/nvglwidgets/cwidgetfssource.html +++ b/components/nvidia-widgets/doc/nvglwidgets/cwidgetfssource.html @@ -16,7 +16,7 @@

cWidgetFSSource

Declaration

-

Source position: nvglwidgets.pas line 75

+

Source position: nvglwidgets.pas line 76

const cTranslucent = 20;
diff --git a/components/nvidia-widgets/doc/nvglwidgets/cwidgetvssource.html b/components/nvidia-widgets/doc/nvglwidgets/cwidgetvssource.html index 259c0cee3..332142d1e 100644 --- a/components/nvidia-widgets/doc/nvglwidgets/cwidgetvssource.html +++ b/components/nvidia-widgets/doc/nvglwidgets/cwidgetvssource.html @@ -16,7 +16,7 @@

cWidgetVSSource

Declaration

-

Source position: nvglwidgets.pas line 65

+

Source position: nvglwidgets.pas line 66

const cWidgetFSSource = '#version 120' + LineEnding + 'uniform vec4 fillColor /*= vec4( 1.0, 0.0,0.0,1.0)*/;' + LineEnding + 'uniform vec4 borderColor /*= vec4( 1.0, 1.0,1.0,1.0)*/;' + LineEnding + 'uniform vec2 zones;' + LineEnding + LineEnding + 'void main()' + LineEnding + '{' + LineEnding + ' float doTurn = float(gl_TexCoord[0].y > 0);' + LineEnding + ' float radiusOffset = doTurn * abs( gl_TexCoord[0].z );' + LineEnding + ' float turnDir = sign( gl_TexCoord[0].z );' + LineEnding + ' vec2 uv = vec2(gl_TexCoord[0].x + turnDir*radiusOffset, gl_TexCoord[0].y);' + LineEnding + ' float l = abs( length(uv) - radiusOffset );' + LineEnding + ' float a = clamp( l - zones.x, 0.0, 2.0);' + LineEnding + ' float b = clamp( l - zones.y, 0.0, 2.0);' + LineEnding + ' b = exp2(-2.0*b*b);' + LineEnding + ' gl_FragColor = ( fillColor * b + (1.0-b)*borderColor );' + LineEnding + ' gl_FragColor.a *= exp2(-2.0*a*a);' + LineEnding + '}';
diff --git a/components/nvidia-widgets/doc/nvglwidgets/gluipainter-3.html b/components/nvidia-widgets/doc/nvglwidgets/gluipainter-3.html index 9c0ab4d19..f0be1e7d7 100644 --- a/components/nvidia-widgets/doc/nvglwidgets/gluipainter-3.html +++ b/components/nvidia-widgets/doc/nvglwidgets/gluipainter-3.html @@ -20,6 +20,11 @@ + + + + + diff --git a/components/nvidia-widgets/doc/nvglwidgets/gluipainter-4.html b/components/nvidia-widgets/doc/nvglwidgets/gluipainter-4.html index 393f6f8b3..19836e380 100644 --- a/components/nvidia-widgets/doc/nvglwidgets/gluipainter-4.html +++ b/components/nvidia-widgets/doc/nvglwidgets/gluipainter-4.html @@ -21,6 +21,11 @@ + + + + + diff --git a/components/nvidia-widgets/doc/nvglwidgets/gluipainter._begin.html b/components/nvidia-widgets/doc/nvglwidgets/gluipainter._begin.html index 4922ece63..c0f308d2b 100644 --- a/components/nvidia-widgets/doc/nvglwidgets/gluipainter._begin.html +++ b/components/nvidia-widgets/doc/nvglwidgets/gluipainter._begin.html @@ -16,7 +16,7 @@

GLUIPainter._begin

Declaration

-

Source position: nvglwidgets.pas line 127

+

Source position: nvglwidgets.pas line 129

const cWidgetVSSource = '#version 120' + LineEnding + LineEnding + 'void main()' + LineEnding + '{' + LineEnding + ' gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;' + LineEnding + ' gl_TexCoord[0] = gl_MultiTexCoord0;' + LineEnding + '}';

 

Destroy

 

_begin

 

Destroy (GLUIPainter)

 

drawBoolFrame (GLUIPainter)
diff --git a/components/nvidia-widgets/doc/nvglwidgets/gluipainter._end.html b/components/nvidia-widgets/doc/nvglwidgets/gluipainter._end.html index a2ede9431..95cfa008e 100644 --- a/components/nvidia-widgets/doc/nvglwidgets/gluipainter._end.html +++ b/components/nvidia-widgets/doc/nvglwidgets/gluipainter._end.html @@ -16,7 +16,7 @@

GLUIPainter._end

Declaration

-

Source position: nvglwidgets.pas line 128

+

Source position: nvglwidgets.pas line 130

public procedure GLUIPainter._begin(
diff --git a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.create.html b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.create.html index 33577e12a..a645ebeb1 100644 --- a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.create.html +++ b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.create.html @@ -16,7 +16,7 @@

GLUIPainter.Create

Declaration

-

Source position: nvglwidgets.pas line 125

+

Source position: nvglwidgets.pas line 126

public procedure GLUIPainter._end; override;
diff --git a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawboolframe.html b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawboolframe.html index 88fea72e6..064881dc5 100644 --- a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawboolframe.html +++ b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawboolframe.html @@ -16,7 +16,7 @@

GLUIPainter.drawBoolFrame

Draw bool frame primitive

Declaration

-

Source position: nvglwidgets.pas line 182

+

Source position: nvglwidgets.pas line 184

public constructor GLUIPainter.Create;
diff --git a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawbutton.html b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawbutton.html index e1a312c84..8fb476d3c 100644 --- a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawbutton.html +++ b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawbutton.html @@ -16,7 +16,7 @@

GLUIPainter.drawButton

Declaration

-

Source position: nvglwidgets.pas line 137

+

Source position: nvglwidgets.pas line 139

public procedure GLUIPainter.drawBoolFrame(
diff --git a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawcheckbutton.html b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawcheckbutton.html index a7dca958e..2726a6eef 100644 --- a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawcheckbutton.html +++ b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawcheckbutton.html @@ -16,7 +16,7 @@

GLUIPainter.drawCheckButton

Declaration

-

Source position: nvglwidgets.pas line 140

+

Source position: nvglwidgets.pas line 142

public procedure GLUIPainter.drawButton(
diff --git a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawcircle.html b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawcircle.html index e991beb4c..2dbd3e26e 100644 --- a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawcircle.html +++ b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawcircle.html @@ -16,7 +16,7 @@

GLUIPainter.drawCircle

Draw circle primitive

Declaration

-

Source position: nvglwidgets.pas line 187

+

Source position: nvglwidgets.pas line 189

public procedure GLUIPainter.drawCheckButton(
diff --git a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawcombobox.html b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawcombobox.html index 07359b357..52b2b090d 100644 --- a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawcombobox.html +++ b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawcombobox.html @@ -16,7 +16,7 @@

GLUIPainter.drawComboBox

Declaration

-

Source position: nvglwidgets.pas line 156

+

Source position: nvglwidgets.pas line 158

public procedure GLUIPainter.drawCircle(
diff --git a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawcombooptions.html b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawcombooptions.html index ecea288e8..61e148aa1 100644 --- a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawcombooptions.html +++ b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawcombooptions.html @@ -16,7 +16,7 @@

GLUIPainter.drawComboOptions

Declaration

-

Source position: nvglwidgets.pas line 157

+

Source position: nvglwidgets.pas line 159

public procedure GLUIPainter.drawComboBox(
diff --git a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawdebugrect.html b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawdebugrect.html index 96751f78d..ca8011244 100644 --- a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawdebugrect.html +++ b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawdebugrect.html @@ -16,7 +16,7 @@

GLUIPainter.drawDebugRect

Draw a rectangle for debugging purposes

Declaration

-

Source position: nvglwidgets.pas line 177

+

Source position: nvglwidgets.pas line 179

public procedure GLUIPainter.drawComboOptions(
diff --git a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawdownarrow.html b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawdownarrow.html index 0a5a1c050..32b059555 100644 --- a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawdownarrow.html +++ b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawdownarrow.html @@ -16,7 +16,7 @@

GLUIPainter.drawDownArrow

Draw down arrow primitive

Declaration

-

Source position: nvglwidgets.pas line 190

+

Source position: nvglwidgets.pas line 192

public procedure GLUIPainter.drawDebugRect(
diff --git a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawhorizontalslider.html b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawhorizontalslider.html index 571ad33fa..fc938d60d 100644 --- a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawhorizontalslider.html +++ b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawhorizontalslider.html @@ -16,7 +16,7 @@

GLUIPainter.drawHorizontalSlider

Declaration

-

Source position: nvglwidgets.pas line 146

+

Source position: nvglwidgets.pas line 148

public procedure GLUIPainter.drawDownArrow(
diff --git a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawlabel.html b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawlabel.html index 3d41af6cd..2661b3a6a 100644 --- a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawlabel.html +++ b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawlabel.html @@ -16,7 +16,7 @@

GLUIPainter.drawLabel

Declaration

-

Source position: nvglwidgets.pas line 134

+

Source position: nvglwidgets.pas line 136

public procedure GLUIPainter.drawHorizontalSlider(
diff --git a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawlineedit.html b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawlineedit.html index b0ec32e8b..72f67cf72 100644 --- a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawlineedit.html +++ b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawlineedit.html @@ -16,7 +16,7 @@

GLUIPainter.drawLineEdit

Declaration

-

Source position: nvglwidgets.pas line 160

+

Source position: nvglwidgets.pas line 162

public procedure GLUIPainter.drawLabel(
diff --git a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawlistbox.html b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawlistbox.html index 027c15fcf..6fa41cc87 100644 --- a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawlistbox.html +++ b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawlistbox.html @@ -16,7 +16,7 @@

GLUIPainter.drawListBox

Declaration

-

Source position: nvglwidgets.pas line 152

+

Source position: nvglwidgets.pas line 154

public procedure GLUIPainter.drawLineEdit(
diff --git a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawlistitem.html b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawlistitem.html index 27d19ecf5..de6dd97e7 100644 --- a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawlistitem.html +++ b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawlistitem.html @@ -16,7 +16,7 @@

GLUIPainter.drawListItem

Declaration

-

Source position: nvglwidgets.pas line 149

+

Source position: nvglwidgets.pas line 151

public procedure GLUIPainter.drawListBox(
diff --git a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawminus.html b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawminus.html index e85320a03..752b2253f 100644 --- a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawminus.html +++ b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawminus.html @@ -16,7 +16,7 @@

GLUIPainter.drawMinus

Draw minus primitive

Declaration

-

Source position: nvglwidgets.pas line 188

+

Source position: nvglwidgets.pas line 190

public procedure GLUIPainter.drawListItem(
diff --git a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawpanel.html b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawpanel.html index a595603ba..0b76aeb46 100644 --- a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawpanel.html +++ b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawpanel.html @@ -16,7 +16,7 @@

GLUIPainter.drawPanel

Declaration

-

Source position: nvglwidgets.pas line 163

+

Source position: nvglwidgets.pas line 165

public procedure GLUIPainter.drawMinus(
diff --git a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawplus.html b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawplus.html index bfa91310d..46627349d 100644 --- a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawplus.html +++ b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawplus.html @@ -16,7 +16,7 @@

GLUIPainter.drawPlus

Draw plus primitive

Declaration

-

Source position: nvglwidgets.pas line 189

+

Source position: nvglwidgets.pas line 191

public procedure GLUIPainter.drawPanel(
diff --git a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawradiobutton.html b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawradiobutton.html index ecfb3e312..d02a6bb42 100644 --- a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawradiobutton.html +++ b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawradiobutton.html @@ -16,7 +16,7 @@

GLUIPainter.drawRadioButton

Declaration

-

Source position: nvglwidgets.pas line 143

+

Source position: nvglwidgets.pas line 145

public procedure GLUIPainter.drawPlus(
diff --git a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawrect.html b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawrect.html index f2359d6af..9bd35dcb5 100644 --- a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawrect.html +++ b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawrect.html @@ -16,7 +16,7 @@

GLUIPainter.drawRect

Draw rectangle primitive

Declaration

-

Source position: nvglwidgets.pas line 184

+

Source position: nvglwidgets.pas line 186

public procedure GLUIPainter.drawRadioButton(
diff --git a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawroundedrect.html b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawroundedrect.html index a07d390c5..41d6dbc9a 100644 --- a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawroundedrect.html +++ b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawroundedrect.html @@ -16,7 +16,7 @@

GLUIPainter.drawRoundedRect

Draw rouded rectangle primitive

Declaration

-

Source position: nvglwidgets.pas line 185

+

Source position: nvglwidgets.pas line 187

public procedure GLUIPainter.drawRect(
diff --git a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawroundedrectoutline.html b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawroundedrectoutline.html index c961eac6c..701827ceb 100644 --- a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawroundedrectoutline.html +++ b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawroundedrectoutline.html @@ -16,7 +16,7 @@

GLUIPainter.drawRoundedRectOutline

Draw rouded rectangle outline primitive

Declaration

-

Source position: nvglwidgets.pas line 186

+

Source position: nvglwidgets.pas line 188

public procedure GLUIPainter.drawRoundedRect(
diff --git a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawstring.html b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawstring.html index 2ec6ccac2..a3649bb1a 100644 --- a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawstring.html +++ b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawstring.html @@ -16,7 +16,7 @@

GLUIPainter.drawString

Draw multi-line text primitive

Declaration

-

Source position: nvglwidgets.pas line 183

+

Source position: nvglwidgets.pas line 185

public procedure GLUIPainter.drawRoundedRectOutline(
diff --git a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawtext.html b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawtext.html index d3c02aa32..cbf91db89 100644 --- a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawtext.html +++ b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawtext.html @@ -16,7 +16,7 @@

GLUIPainter.drawText

Draw text with rectangle primitive

Declaration

-

Source position: nvglwidgets.pas line 180

+

Source position: nvglwidgets.pas line 182

public procedure GLUIPainter.drawString(
diff --git a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawtextureview.html b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawtextureview.html index 1d62f566c..1cd541793 100644 --- a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawtextureview.html +++ b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawtextureview.html @@ -16,7 +16,7 @@

GLUIPainter.drawTextureView

Declaration

-

Source position: nvglwidgets.pas line 166

+

Source position: nvglwidgets.pas line 168

public procedure GLUIPainter.drawText(
diff --git a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawuparrow.html b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawuparrow.html index ebae93065..2f1edd764 100644 --- a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawuparrow.html +++ b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawuparrow.html @@ -16,7 +16,7 @@

GLUIPainter.drawUpArrow

Draw up arrow primitive

Declaration

-

Source position: nvglwidgets.pas line 191

+

Source position: nvglwidgets.pas line 193

public procedure GLUIPainter.drawTextureView(
diff --git a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.getbuttonrect.html b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.getbuttonrect.html index 836cdb243..9be6eee30 100644 --- a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.getbuttonrect.html +++ b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.getbuttonrect.html @@ -16,7 +16,7 @@

GLUIPainter.getButtonRect

Declaration

-

Source position: nvglwidgets.pas line 136

+

Source position: nvglwidgets.pas line 138

public procedure GLUIPainter.drawUpArrow(
diff --git a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.getcanvasmargin.html b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.getcanvasmargin.html index 957204261..b7250a189 100644 --- a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.getcanvasmargin.html +++ b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.getcanvasmargin.html @@ -16,7 +16,7 @@

GLUIPainter.getCanvasMargin

Evaluate canvas margin

Declaration

-

Source position: nvglwidgets.pas line 169

+

Source position: nvglwidgets.pas line 171

public function GLUIPainter.getButtonRect(
diff --git a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.getcanvasspace.html b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.getcanvasspace.html index 5a1066e01..3f3de8f10 100644 --- a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.getcanvasspace.html +++ b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.getcanvasspace.html @@ -16,7 +16,7 @@

GLUIPainter.getCanvasSpace

Evaluate canvas space

Declaration

-

Source position: nvglwidgets.pas line 170

+

Source position: nvglwidgets.pas line 172

public function GLUIPainter.getCanvasMargin: Integer; override;
diff --git a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.getcheckrect.html b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.getcheckrect.html index 710d04247..26f5dc1c6 100644 --- a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.getcheckrect.html +++ b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.getcheckrect.html @@ -16,7 +16,7 @@

GLUIPainter.getCheckRect

Declaration

-

Source position: nvglwidgets.pas line 139

+

Source position: nvglwidgets.pas line 141

public function GLUIPainter.getCanvasSpace: Integer; override;
diff --git a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.getcombooptionsrect.html b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.getcombooptionsrect.html index ace99b781..9c1bb8bad 100644 --- a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.getcombooptionsrect.html +++ b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.getcombooptionsrect.html @@ -16,7 +16,7 @@

GLUIPainter.getComboOptionsRect

Declaration

-

Source position: nvglwidgets.pas line 155

+

Source position: nvglwidgets.pas line 157

public function GLUIPainter.getCheckRect(
diff --git a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.getcomborect.html b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.getcomborect.html index 4a633a76b..9f2eb4c54 100644 --- a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.getcomborect.html +++ b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.getcomborect.html @@ -16,7 +16,7 @@

GLUIPainter.getComboRect

Declaration

-

Source position: nvglwidgets.pas line 154

+

Source position: nvglwidgets.pas line 156

public function GLUIPainter.getComboOptionsRect(
diff --git a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.getfontheight.html b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.getfontheight.html index a6ae9c876..676b63125 100644 --- a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.getfontheight.html +++ b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.getfontheight.html @@ -16,7 +16,7 @@

GLUIPainter.getFontHeight

Evaluate font height

Declaration

-

Source position: nvglwidgets.pas line 171

+

Source position: nvglwidgets.pas line 173

public function GLUIPainter.getComboRect(
diff --git a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.gethorizontalsliderrect.html b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.gethorizontalsliderrect.html index 692143bd7..3e8da29c7 100644 --- a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.gethorizontalsliderrect.html +++ b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.gethorizontalsliderrect.html @@ -16,7 +16,7 @@

GLUIPainter.getHorizontalSliderRect

Declaration

-

Source position: nvglwidgets.pas line 145

+

Source position: nvglwidgets.pas line 147

public function GLUIPainter.getFontHeight: Integer; override;
diff --git a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.getitemrect.html b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.getitemrect.html index 7b32488e3..687cfccce 100644 --- a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.getitemrect.html +++ b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.getitemrect.html @@ -16,7 +16,7 @@

GLUIPainter.getItemRect

Declaration

-

Source position: nvglwidgets.pas line 148

+

Source position: nvglwidgets.pas line 150

public function GLUIPainter.getHorizontalSliderRect(
diff --git a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.getlabelrect.html b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.getlabelrect.html index 6629d152c..e3922eaa3 100644 --- a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.getlabelrect.html +++ b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.getlabelrect.html @@ -16,7 +16,7 @@

GLUIPainter.getLabelRect

Declaration

-

Source position: nvglwidgets.pas line 133

+

Source position: nvglwidgets.pas line 135

public function GLUIPainter.getItemRect(
diff --git a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.getlineeditrect.html b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.getlineeditrect.html index 565dfec8e..250f208d6 100644 --- a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.getlineeditrect.html +++ b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.getlineeditrect.html @@ -16,7 +16,7 @@

GLUIPainter.getLineEditRect

Declaration

-

Source position: nvglwidgets.pas line 159

+

Source position: nvglwidgets.pas line 161

public function GLUIPainter.getLabelRect(
diff --git a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.getlistrect.html b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.getlistrect.html index 1948ee7eb..2fda85013 100644 --- a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.getlistrect.html +++ b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.getlistrect.html @@ -16,7 +16,7 @@

GLUIPainter.getListRect

Declaration

-

Source position: nvglwidgets.pas line 151

+

Source position: nvglwidgets.pas line 153

public function GLUIPainter.getLineEditRect(
diff --git a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.getpanelrect.html b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.getpanelrect.html index 025660644..67074dcca 100644 --- a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.getpanelrect.html +++ b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.getpanelrect.html @@ -16,7 +16,7 @@

GLUIPainter.getPanelRect

Declaration

-

Source position: nvglwidgets.pas line 162

+

Source position: nvglwidgets.pas line 164

public function GLUIPainter.getListRect(
diff --git a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.getpickedcharnb.html b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.getpickedcharnb.html index 054006d2a..54fde77dc 100644 --- a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.getpickedcharnb.html +++ b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.getpickedcharnb.html @@ -16,7 +16,7 @@

GLUIPainter.getPickedCharNb

Declaration

-

Source position: nvglwidgets.pas line 175

+

Source position: nvglwidgets.pas line 177

public function GLUIPainter.getPanelRect(
diff --git a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.getradiorect.html b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.getradiorect.html index 0c29c6090..f32e558f2 100644 --- a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.getradiorect.html +++ b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.getradiorect.html @@ -16,7 +16,7 @@

GLUIPainter.getRadioRect

Declaration

-

Source position: nvglwidgets.pas line 142

+

Source position: nvglwidgets.pas line 144

public function GLUIPainter.getPickedCharNb(
diff --git a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.gettextlinewidth.html b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.gettextlinewidth.html index 611c6165e..ba1a7cfaf 100644 --- a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.gettextlinewidth.html +++ b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.gettextlinewidth.html @@ -16,7 +16,7 @@

GLUIPainter.getTextLineWidth

Evaluate text width

Declaration

-

Source position: nvglwidgets.pas line 172

+

Source position: nvglwidgets.pas line 174

public function GLUIPainter.getRadioRect(
diff --git a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.gettextlinewidthat.html b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.gettextlinewidthat.html index 92d1b5ec3..960914b4a 100644 --- a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.gettextlinewidthat.html +++ b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.gettextlinewidthat.html @@ -16,7 +16,7 @@

GLUIPainter.getTextLineWidthAt

Declaration

-

Source position: nvglwidgets.pas line 174

+

Source position: nvglwidgets.pas line 176

public function GLUIPainter.getTextLineWidth(
diff --git a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.gettextsize.html b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.gettextsize.html index eb9f8e858..206aa6e66 100644 --- a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.gettextsize.html +++ b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.gettextsize.html @@ -16,7 +16,7 @@

GLUIPainter.getTextSize

Evaluate text size

Declaration

-

Source position: nvglwidgets.pas line 173

+

Source position: nvglwidgets.pas line 175

public function GLUIPainter.getTextLineWidthAt(
diff --git a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.gettextureviewrect.html b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.gettextureviewrect.html index 70bb491df..51c42628e 100644 --- a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.gettextureviewrect.html +++ b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.gettextureviewrect.html @@ -16,7 +16,7 @@

GLUIPainter.getTextureViewRect

Declaration

-

Source position: nvglwidgets.pas line 165

+

Source position: nvglwidgets.pas line 167

public function GLUIPainter.getTextSize(
diff --git a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.html b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.html index 8a598531f..d996bf188 100644 --- a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.html +++ b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.html @@ -17,7 +17,7 @@

[Properties (by Name)] [Methods (by Name)] [Events (by Name)]

OpenGL painter class

Declaration

-

Source position: nvglwidgets.pas line 122

+

Source position: nvglwidgets.pas line 123

public function GLUIPainter.getTextureViewRect(
@@ -29,6 +29,9 @@ + + + diff --git a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.init.html b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.init.html index 8287112a8..854b8abd5 100644 --- a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.init.html +++ b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.init.html @@ -16,7 +16,7 @@

GLUIPainter.init

Initialization method of the painter class

Declaration

-

Source position: nvglwidgets.pas line 193

+

Source position: nvglwidgets.pas line 195

type GLUIPainter = class(UIPainter)

  constructor Create;

  destructor Destroy;

  procedure _begin(); override;
diff --git a/components/nvidia-widgets/doc/nvglwidgets/index.html b/components/nvidia-widgets/doc/nvglwidgets/index.html index 4da31e51f..997c3bdce 100644 --- a/components/nvidia-widgets/doc/nvglwidgets/index.html +++ b/components/nvidia-widgets/doc/nvglwidgets/index.html @@ -31,7 +31,18 @@ - + + + + + + + + + + + +

public procedure GLUIPainter.init; override;

User Interface library

  GL;

  GL,

  ftFont,

  FPCanvas,

  GLFreeType;

  

Free Type support for OpenGL
diff --git a/components/nvidia-widgets/doc/nvglwidgets/s_colors.html b/components/nvidia-widgets/doc/nvglwidgets/s_colors.html index 11477e214..3a923b05f 100644 --- a/components/nvidia-widgets/doc/nvglwidgets/s_colors.html +++ b/components/nvidia-widgets/doc/nvglwidgets/s_colors.html @@ -16,7 +16,7 @@

s_colors

Declaration

-

Source position: nvglwidgets.pas line 26

+

Source position: nvglwidgets.pas line 27

diff --git a/components/nvidia-widgets/doc/nvwidgets.chm b/components/nvidia-widgets/doc/nvwidgets.chm index c1d741845..128a10a93 100644 Binary files a/components/nvidia-widgets/doc/nvwidgets.chm and b/components/nvidia-widgets/doc/nvwidgets.chm differ diff --git a/components/nvidia-widgets/src/gl/glfreetype.pas b/components/nvidia-widgets/src/gl/glfreetype.pas index de5a8d83b..40bb49ab9 100644 --- a/components/nvidia-widgets/src/gl/glfreetype.pas +++ b/components/nvidia-widgets/src/gl/glfreetype.pas @@ -3,7 +3,7 @@ and distributed as part of a tutorial for nehe.gamedev.net. Sven Olsen, 2003 *) -unit glFreeType; +unit GLFreeType; {$mode objfpc}{$H+} @@ -44,7 +44,7 @@ function next_p2(a: integer): integer; inline; var rval: integer; begin - rval := 1; + rval := 2; while rval < a do rval := rval shl 1; Result := rval; @@ -100,23 +100,17 @@ begin //We use the ?: operator so that value which we use //will be 0 if we are in the padding zone, and whatever //is the the Freetype bitmap otherwise. - for j := 0 to Height - 1 do - begin - for i := 0 to Width - 1 do + for j:=0 to height -1 do + for i:=0 to width - 1 do begin - if (i >= bitmap.Width) or (j >= bitmap.rows) then - expanded_data[2 * (i + j * Width)] := 0 - else - expanded_data[2 * (i + j * Width)] := byte((bitmap.buffer + (i + bitmap.Width * j))^); + expanded_data[2*(i+j*width)] := 255; - //write(expanded_data[2 * (i + j * Width)]:3, ' '); - - expanded_data[2 * (i + j * Width) + 1] := expanded_data[2 * (i + j * Width)]; + if (i>=bitmap.width) or (j>=bitmap.rows) then + expanded_data[2*(i+j*width)+1] := 0 + else + expanded_data[2*(i+j*width)+1] := byte((bitmap.buffer + (i + bitmap.Width * j))^); end; - //writeln; - end; - glBindTexture(GL_TEXTURE_2D, tex_base[Ord(ch)]); //Now we just setup some texture paramaters. @@ -162,16 +156,15 @@ begin //so we need to link the texture to the quad //so that the result will be properly aligned. glBegin(GL_QUADS); - glTexCoord2d(0, 0); - glVertex2f(0, bitmap.rows); - glTexCoord2d(0, y); - glVertex2f(0, 0); - glTexCoord2d(x, y); - glVertex2f(bitmap.Width, 0); - glTexCoord2d(x, 0); - glVertex2f(bitmap.Width, bitmap.rows); + glTexCoord2d(0, 0); + glVertex2f(0, bitmap.rows); + glTexCoord2d(0, y); + glVertex2f(0, 0); + glTexCoord2d(x, y); + glVertex2f(bitmap.Width, 0); + glTexCoord2d(x, 0); + glVertex2f(bitmap.Width, bitmap.rows); glEnd; - glPopMatrix; glTranslatef(face^.glyph^.advance.x shr 6, 0, 0); @@ -181,6 +174,8 @@ begin //Finish the display list glEndList; + + FT_Done_Glyph(glyph); end; procedure TGLFreeTypeFont.Init(const fname: string; AHeight: cardinal); diff --git a/components/nvidia-widgets/src/nvwidgets/examples/example.lpi b/components/nvidia-widgets/src/nvwidgets/examples/example.lpi index 82e32c239..922facf49 100644 --- a/components/nvidia-widgets/src/nvwidgets/examples/example.lpi +++ b/components/nvidia-widgets/src/nvwidgets/examples/example.lpi @@ -62,7 +62,7 @@ - + diff --git a/components/nvidia-widgets/src/nvwidgets/examples/example.pp b/components/nvidia-widgets/src/nvwidgets/examples/example.pp index 94aa3b797..1327d20b2 100644 --- a/components/nvidia-widgets/src/nvwidgets/examples/example.pp +++ b/components/nvidia-widgets/src/nvwidgets/examples/example.pp @@ -5,7 +5,7 @@ program example; uses Classes, SysUtils, - GLut, GL, GLu, glFreeType, + GLut, GL, GLu, nvWidgets, nvGlutWidgets; type @@ -26,12 +26,10 @@ var compressionRate: double = 1; texture: GLuint = 0; let: string = 'linedit test'; - glFont: TGLFreeTypeFont; procedure closeapp; begin FreeAndNil(ui); - glFont.clean; halt(0); end; @@ -85,9 +83,6 @@ var c: integer; begin - glColor3ub(0, $ff, 0); - glFont.Print(10, 200, 'The quick brown fox jumps over the lazy dog'); - none.Rect(0, 0); ui._begin; @@ -175,8 +170,6 @@ begin glutInitDisplayMode(GLUT_DOUBLE or GLUT_DEPTH or GLUT_RGB); glutCreateWindow('UI example'); - glFont.Init('Ubuntu-R.ttf', 26); //Build the freetype font - ui := GlutUIContext.Create; if not ui.init(win_w, win_h) then diff --git a/components/nvidia-widgets/src/nvwidgets/examples/widget_test.lpi b/components/nvidia-widgets/src/nvwidgets/examples/widget_test.lpi new file mode 100644 index 000000000..e295770a4 --- /dev/null +++ b/components/nvidia-widgets/src/nvwidgets/examples/widget_test.lpi @@ -0,0 +1,76 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/components/nvidia-widgets/src/nvwidgets/examples/widget_test.pp b/components/nvidia-widgets/src/nvwidgets/examples/widget_test.pp new file mode 100644 index 000000000..6ed073c6c --- /dev/null +++ b/components/nvidia-widgets/src/nvwidgets/examples/widget_test.pp @@ -0,0 +1,223 @@ +program widget_test; + +{$mode objfpc}{$H+} + +uses + Classes, SysUtils, + GLut, GL, GLu, + nvWidgets, nvGlutWidgets; + +var + ui: GlutUIContext; + win_w: integer = 512; + win_h: integer = 512; + texture: GLuint = 0; + + procedure closeapp; + begin + FreeAndNil(ui); + halt(0); + end; + + procedure idle; cdecl; + begin + glutPostRedisplay; + end; + + procedure key(k: byte; x: integer; y: integer); cdecl; + begin + ui.keyboard(k, x, y); + + case k of + 27, Ord('q'): + closeapp; + end; + end; + + procedure special(key: integer; x: integer; y: integer); cdecl; + begin + ui.specialKeyboard(key, x, y); + end; + + procedure resize(w: integer; h: integer); cdecl; + begin + ui.reshape(w, h); + glViewport(0, 0, w, h); + + win_w := w; + win_h := h; + end; + + procedure mouse(button: integer; state: integer; x: integer; y: integer); cdecl; + begin + ui.mouse(button, state, x, y); + end; + + procedure motion(x: integer; y: integer); cdecl; + begin + ui.mouseMotion(x, y); + end; + + procedure doUI; + const + formatLabel: array [0..1] of string = ('Combobox item 1', 'Combobox item 2'); + lbOptions: array [0..2] of string = ('Listbox item 1', 'Listbox item 2', 'Listbox item 2'); + var + none: Rect; + formatIdx: integer = 1; + Text: string = 'line edit widget'; + textureRect: Rect; + state_false: boolean = false; + state_true: boolean = true; + val: integer = 1; + dval: double = 75; + begin + none.Rect(0, 0); + + ui._begin; + + //here follows the UI widget test code + //each of these tests, will demonstrate the visual of a widget + + ui.beginGroup(GroupFlags_GrowDownFromLeft); + + //label + ui.doLabel(none, 'Simple label (style=0)', 0); + ui.doLabel(none, 'Simple label (style=1)', 1); + + //button + ui.beginGroup(GroupFlags_GrowRightFromTop); + ui.doButton(none, 'button up', state_false); + ui.doButton(none, 'button down', state_true); + ui.endGroup; + + //checkbutton + ui.beginGroup(GroupFlags_GrowRightFromTop); + ui.doCheckButton(none, 'checkbutton up (style=0)', state_false, 0); + ui.doCheckButton(none, 'checkbutton down (style=0)', state_true, 0); + ui.endGroup; + ui.beginGroup(GroupFlags_GrowRightFromTop); + ui.doCheckButton(none, 'checkbutton up (style=1)', state_false, 1); + ui.doCheckButton(none, 'checkbutton down (style=1)', state_true, 1); + ui.endGroup; + + //radio button + ui.beginGroup(GroupFlags_GrowRightFromTop); + ui.doRadioButton(2, none, 'radiobutton up (style=0)', val, 0); + ui.doRadioButton(1, none, 'radiobutton down (style=0)', val, 0); + ui.endGroup; + ui.beginGroup(GroupFlags_GrowRightFromTop); + ui.doRadioButton(2, none, 'radiobutton up (style=1)', val, 1); + ui.doRadioButton(1, none, 'radiobutton down (style=1)', val, 1); + ui.endGroup; + + //horizontal slider + ui.doHorizontalSlider(none, 0, 100, dval, 0); + + ui.beginGroup(GroupFlags_GrowRightFromTop); + //listbox + val := 1; + ui.doListBox(none, 3, lbOptions, val); + + //combobox + ui.doComboBox(none, 2, formatLabel, formatIdx); + ui.endGroup; + + //line edit + val := 1; + ui.beginGroup(GroupFlags_GrowRightFromTop); + ui.doLineEdit(none, Text, 100, val); + ui.doLineEdit(none, Text, 100, val); + ui.endGroup; + + //panel + ui.beginGroup(GroupFlags_GrowRightFromTop); + ui.beginPanel(none, 'A folding panel', state_true); + ui.beginGroup(GroupFlags_GrowRightFromTop); + Text := './nvidia-widgets/trunk/src'; + ui.doLineEdit(none, Text, 100, val); + ui.doButton(none, 'Browse', state_false); + ui.endGroup; + ui.endPanel; + + //ui.beginPanel(none, 'Same panel but now folded', state_false); + // ui.beginGroup(GroupFlags_GrowRightFromTop); + // ui.doLabel(none, './nvidia-widgets/trunk/src', 1); + // ui.doButton(none, 'Browse', state_true, 0); + // ui.endGroup; + //ui.endPanel; + ui.endGroup; + + //frame + ui.beginGroup(GroupFlags_GrowDownFromLeft); + ui.doLabel(none, 'This is a frame'); + ui.beginFrame(GroupFlags_GrowRightFromTop, none); + ui.beginGroup(GroupFlags_GrowRightFromTop); + Text := './nvidia-widgets/trunk/src'; + ui.doLineEdit(none, Text, 100, val); + ui.doButton(none, 'Browse', state_false); + ui.endGroup; + ui.endFrame; + ui.endGroup; + + //listitem + ui.doListItem(1, none, 'List item 1', 1, 0); + ui.doListItem(2, none, 'List item 2', 1, 1); + ui.doListItem(3, none, 'List item 3', 1, 0); + ui.doListItem(4, none, 'List item 4', 1, 0); + + //textureview + textureRect.Rect(0, 0, 100, 100); + ui.doTextureView(textureRect, texture, textureRect); + + ui.endGroup; + + ui._end; + end; + + procedure display; cdecl; + begin + glClear(GL_COLOR_BUFFER_BIT or GL_DEPTH_BUFFER_BIT); + glMatrixMode(GL_MODELVIEW); + + glLoadIdentity; + doUI; + glutSwapBuffers; + end; + +var + texture_data: array [0..3] of cardinal = ($FFFF0000, $FF0000FF, $FF00FF00, $FF00FF00); + +begin + glutInit(@argc, argv); + glutInitWindowSize(win_w, win_h); + glutInitDisplayMode(GLUT_DOUBLE or GLUT_DEPTH or GLUT_RGB); + glutCreateWindow('UI example'); + + ui := GlutUIContext.Create; + + if not ui.init(win_w, win_h) then + begin + writeln('UI initialization failed'); + closeapp; + end; + + glutReportErrors; + + glGenTextures(1, @texture); + glBindTexture(GL_TEXTURE_2D, texture); + gluBuild2DMipmaps(GL_TEXTURE_2D, GL_RGBA, 2, 2, GL_RGBA, GL_UNSIGNED_BYTE, @texture_data); + glEnable(GL_DEPTH_TEST); + glClearColor(0, 0, 0, 1); + glutDisplayFunc(@display); + + glutMouseFunc(@mouse); + glutMotionFunc(@motion); + glutPassiveMotionFunc(@motion); + glutIdleFunc(@idle); + glutKeyboardFunc(@key); + glutSpecialFunc(@special); + glutReshapeFunc(@resize); + glutMainLoop; +end. + diff --git a/components/nvidia-widgets/src/nvwidgets/nvglwidgets.pas b/components/nvidia-widgets/src/nvwidgets/nvglwidgets.pas index 509e1be77..75c832a1f 100644 --- a/components/nvidia-widgets/src/nvwidgets/nvglwidgets.pas +++ b/components/nvidia-widgets/src/nvwidgets/nvglwidgets.pas @@ -12,7 +12,8 @@ unit nvGLWidgets; interface uses - Classes, nvWidgets, GL; + Classes, nvWidgets, + GL, ftFont, FPCanvas, GLFreeType; const cBase = 0; @@ -123,6 +124,7 @@ type public constructor Create; + destructor Destroy; procedure _begin(const window: Rect); override; procedure _end; override; @@ -192,9 +194,10 @@ type procedure init; override; private + Font: TGLFreeTypeFont; + m_setupStateDL: integer; m_restoreStateDL: integer; - m_textListBase: integer; m_foregroundDL: integer; m_widgetProgram: integer; m_originUniform: integer; @@ -241,7 +244,6 @@ begin inherited; m_setupStateDL := 0; m_restoreStateDL := 0; - m_textListBase := 0; m_foregroundDL := 0; m_widgetProgram := 0; m_fillColorUniform := 0; @@ -252,6 +254,13 @@ begin m_texelScaleUniform := 0; m_texelOffsetUniform := 0; m_texelSwizzlingUniform := 0; + + Font.Init('Ubuntu-R.ttf', 10); +end; + +destructor GLUIPainter.Destroy; +begin + Font.Clean; end; procedure GLUIPainter._begin(const window: Rect); @@ -785,6 +794,8 @@ end; function GLUIPainter.getFontHeight: integer; begin + Result := Font.Height; + exit; Result := 12 + 4; end; @@ -918,26 +929,8 @@ begin end; procedure GLUIPainter.drawString(x: integer; y: integer; Text: string; nbLines: integer); -var - s: TStrings; - t: string; - i: Integer; begin - glListBase(m_textListBase); - - s := TStringList.Create; - try - s.Text := Text; - - for i := 0 to s.Count - 1 do - begin - t := s[s.Count - 1 - i]; - glRasterPos2i(x + 1, y + 4 + i * getFontHeight); - glCallLists(Length(t), GL_UNSIGNED_BYTE, @t[1]); - end; - finally - s.Free; - end; + Font.Print(x, y, Text); end; procedure GLUIPainter.drawRect(aRect: Rect; fillColorId: integer; borderColorId: integer); @@ -1099,67 +1092,71 @@ begin y3 := aRect.y + aRect.h; glBegin(GL_TRIANGLE_STRIP); - glTexCoord2f(xb, yb); - glVertex2f(x0, y0); - glTexCoord2f(0, yb); - glVertex2f(x1, y0); - glTexCoord2f(xb, 0); + glTexCoord2f(xb, yb); + glVertex2f(x0, y0); + glTexCoord2f(0, yb); + glVertex2f(x1, y0); + glTexCoord2f(xb, 0); - glVertex2f(x0, y1); - glTexCoord2f(0, 0); - glVertex2f(x1, y1); - glTexCoord2f(xb, 0); + glVertex2f(x0, y1); + glTexCoord2f(0, 0); + glVertex2f(x1, y1); + glTexCoord2f(xb, 0); - glVertex2f(x0, y2); - glTexCoord2f(0, 0); - glVertex2f(x1, y2); - glTexCoord2f(xb, yb); + glVertex2f(x0, y2); + glTexCoord2f(0, 0); + glVertex2f(x1, y2); + glTexCoord2f(xb, yb); - glVertex2f(x0, y3); - glTexCoord2f(0, yb); - glVertex2f(x1, y3); + glVertex2f(x0, y3); + glTexCoord2f(0, yb); + glVertex2f(x1, y3); glEnd; + glBegin(GL_TRIANGLE_STRIP); - glTexCoord2f(0, yb); - glVertex2f(x2, y0); - glTexCoord2f(xb, yb); - glVertex2f(x3, y0); - glTexCoord2f(0, 0); + glTexCoord2f(0, yb); + glVertex2f(x2, y0); + glTexCoord2f(xb, yb); + glVertex2f(x3, y0); + glTexCoord2f(0, 0); - glVertex2f(x2, y1); - glTexCoord2f(xb, 0); - glVertex2f(x3, y1); - glTexCoord2f(0, 0); + glVertex2f(x2, y1); + glTexCoord2f(xb, 0); + glVertex2f(x3, y1); + glTexCoord2f(0, 0); - glVertex2f(x2, y2); - glTexCoord2f(xb, 0); - glVertex2f(x3, y2); - glTexCoord2f(0, yb); - glVertex2f(x2, y3); - glTexCoord2f(xb, yb); - glVertex2f(x3, y3); + glVertex2f(x2, y2); + glTexCoord2f(xb, 0); + glVertex2f(x3, y2); + glTexCoord2f(0, yb); + glVertex2f(x2, y3); + glTexCoord2f(xb, yb); + glVertex2f(x3, y3); glEnd; + glBegin(GL_TRIANGLE_STRIP); - glTexCoord2f(0, yb); - glVertex2f(x1, y0); - glTexCoord2f(0, yb); - glVertex2f(x2, y0); - glTexCoord2f(0, 0); + glTexCoord2f(0, yb); + glVertex2f(x1, y0); + glTexCoord2f(0, yb); + glVertex2f(x2, y0); + glTexCoord2f(0, 0); - glVertex2f(x1, y1); - glTexCoord2f(0, 0); - glVertex2f(x2, y1); + glVertex2f(x1, y1); + glTexCoord2f(0, 0); + glVertex2f(x2, y1); glEnd; + glBegin(GL_TRIANGLE_STRIP); - glTexCoord2f(0, 0); - glVertex2f(x1, y2); - glTexCoord2f(0, 0); - glVertex2f(x2, y2); - glTexCoord2f(0, yb); - glVertex2f(x1, y3); - glTexCoord2f(0, yb); - glVertex2f(x2, y3); + glTexCoord2f(0, 0); + glVertex2f(x1, y2); + glTexCoord2f(0, 0); + glVertex2f(x2, y2); + glTexCoord2f(0, yb); + glVertex2f(x1, y3); + glTexCoord2f(0, yb); + glVertex2f(x2, y3); glEnd; + glUseProgram(0); end; @@ -1185,15 +1182,16 @@ begin y1 := aRect.y + aRect.h; glBegin(GL_TRIANGLE_STRIP); - glTexCoord2f(-xb, -yb); - glVertex2f(x0, y0); - glTexCoord2f(xb, -yb); - glVertex2f(x1, y0); - glTexCoord2f(-xb, yb); - glVertex2f(x0, y1); - glTexCoord2f(xb, yb); - glVertex2f(x1, y1); + glTexCoord2f(-xb, -yb); + glVertex2f(x0, y0); + glTexCoord2f(xb, -yb); + glVertex2f(x1, y0); + glTexCoord2f(-xb, yb); + glVertex2f(x0, y1); + glTexCoord2f(xb, yb); + glVertex2f(x1, y1); glEnd; + glUseProgram(0); end; @@ -1219,27 +1217,28 @@ begin glUniform4fv(m_fillColorUniform, 1, @s_colors[fillColorId]); glUniform4fv(m_borderColorUniform, 1, @s_colors[borderColorId]); glUniform2f(m_zonesUniform, (xb) - 1, (xb) - 2); + glBegin(GL_TRIANGLE_STRIP); + glTexCoord3f(-xb, -yb, 0); + glVertex2f(x0, y1 + yoff); + glTexCoord3f(xb, -yb, 0); + glVertex2f(x0, y1 - yoff); + glTexCoord3f(-xb, 0, 0); + glVertex2f(x0 + xoff, y1 + yoff); + glTexCoord3f(xb, 0, 0); + glVertex2f(x0 + xoff, y1 - yoff); + glTexCoord3f(-xb, 0, 0); - glTexCoord3f(-xb, -yb, 0); - glVertex2f(x0, y1 + yoff); - glTexCoord3f(xb, -yb, 0); - glVertex2f(x0, y1 - yoff); - glTexCoord3f(-xb, 0, 0); - glVertex2f(x0 + xoff, y1 + yoff); - glTexCoord3f(xb, 0, 0); - glVertex2f(x0 + xoff, y1 - yoff); - glTexCoord3f(-xb, 0, 0); + glVertex2f(x1 - xoff, y1 + yoff); + glTexCoord3f(xb, 0, 0); + glVertex2f(x1 - xoff, y1 - yoff); + glTexCoord3f(-xb, -yb, 0); - glVertex2f(x1 - xoff, y1 + yoff); - glTexCoord3f(xb, 0, 0); - glVertex2f(x1 - xoff, y1 - yoff); - glTexCoord3f(-xb, -yb, 0); - - glVertex2f(x1, y1 + yoff); - glTexCoord3f(xb, -yb, 0); - glVertex2f(x1, y1 - yoff); + glVertex2f(x1, y1 + yoff); + glTexCoord3f(xb, -yb, 0); + glVertex2f(x1, y1 - yoff); glEnd; + glUseProgram(0); end; @@ -1355,6 +1354,7 @@ begin glTexCoord3f(xb, -yb, 0); glVertex2f(x1 - yoff, y2); glEnd; + glUseProgram(0); end; @@ -1390,44 +1390,44 @@ begin glUniform4fv(m_fillColorUniform, 1, @s_colors[fillColorId]); glUniform4fv(m_borderColorUniform, 1, @s_colors[borderColorId]); glUniform2f(m_zonesUniform, (xb) - 1, (xb) - 2); + glBegin(GL_TRIANGLE_STRIP); + glTexCoord3f(-xb, -yb, 0); + glVertex2f(x0, y1 + yoff2); + glTexCoord3f(xb, -yb, 0); + glVertex2f(x0 - xoff2, y1); + glTexCoord3f(-xb, 0, 0); + glVertex2f(x0 + xoff, y1 + yoff); + glTexCoord3f(xb, 0, 0); + glVertex2f(x0 - xoff, y1 - yoff); + glTexCoord3f(-xb, 0, xb); - glTexCoord3f(-xb, -yb, 0); - glVertex2f(x0, y1 + yoff2); - glTexCoord3f(xb, -yb, 0); - glVertex2f(x0 - xoff2, y1); - glTexCoord3f(-xb, 0, 0); - glVertex2f(x0 + xoff, y1 + yoff); - glTexCoord3f(xb, 0, 0); - glVertex2f(x0 - xoff, y1 - yoff); - glTexCoord3f(-xb, 0, xb); + glVertex2f(x1, y0 + yoff2); + glTexCoord3f(xb, 0, xb); + glVertex2f(x1 - xoff2, y0); + glTexCoord3f(xb, 2 * yb, xb); - glVertex2f(x1, y0 + yoff2); - glTexCoord3f(xb, 0, xb); - glVertex2f(x1 - xoff2, y0); - glTexCoord3f(xb, 2 * yb, xb); - - glVertex2f(x1, y0 - yoff2); + glVertex2f(x1, y0 - yoff2); glEnd; glBegin(GL_TRIANGLE_STRIP); - glTexCoord3f(xb, -yb, 0); - glVertex2f(x2 + xoff2, y1); - glTexCoord3f(-xb, -yb, 0); - glVertex2f(x2, y1 + yoff2); - glTexCoord3f(xb, 0, xb); + glTexCoord3f(xb, -yb, 0); + glVertex2f(x2 + xoff2, y1); + glTexCoord3f(-xb, -yb, 0); + glVertex2f(x2, y1 + yoff2); + glTexCoord3f(xb, 0, xb); - glVertex2f(x2 + xoff, y1 - yoff); - glTexCoord3f(-xb, 0, xb); - glVertex2f(x2 - xoff, y1 + yoff); - glTexCoord3f(xb, 0, xb); + glVertex2f(x2 + xoff, y1 - yoff); + glTexCoord3f(-xb, 0, xb); + glVertex2f(x2 - xoff, y1 + yoff); + glTexCoord3f(xb, 0, xb); - glVertex2f(x1 + xoff2, y0); - glTexCoord3f(-xb, 0, xb); - glVertex2f(x1, y0 + yoff2); - glTexCoord3f(xb, 2 * yb, xb); + glVertex2f(x1 + xoff2, y0); + glTexCoord3f(-xb, 0, xb); + glVertex2f(x1, y0 + yoff2); + glTexCoord3f(xb, 2 * yb, xb); - glVertex2f(x1, y0 - yoff2); + glVertex2f(x1, y0 - yoff2); glEnd; glUseProgram(0); @@ -1465,44 +1465,44 @@ begin glUniform4fv(m_fillColorUniform, 1, @s_colors[fillColorId]); glUniform4fv(m_borderColorUniform, 1, @s_colors[borderColorId]); glUniform2f(m_zonesUniform, (xb) - 1, (xb) - 2); + glBegin(GL_TRIANGLE_STRIP); + glTexCoord3f(-xb, -yb, 0); + glVertex2f(x0, y1 + yoff2); + glTexCoord3f(xb, -yb, 0); + glVertex2f(x0 - xoff2, y1); + glTexCoord3f(-xb, 0, 0); + glVertex2f(x0 + xoff, y1 + yoff); + glTexCoord3f(xb, 0, 0); + glVertex2f(x0 - xoff, y1 - yoff); + glTexCoord3f(-xb, 0, xb); - glTexCoord3f(-xb, -yb, 0); - glVertex2f(x0, y1 + yoff2); - glTexCoord3f(xb, -yb, 0); - glVertex2f(x0 - xoff2, y1); - glTexCoord3f(-xb, 0, 0); - glVertex2f(x0 + xoff, y1 + yoff); - glTexCoord3f(xb, 0, 0); - glVertex2f(x0 - xoff, y1 - yoff); - glTexCoord3f(-xb, 0, xb); + glVertex2f(x1, y0 + yoff2); + glTexCoord3f(xb, 0, xb); + glVertex2f(x1 - xoff2, y0); + glTexCoord3f(xb, 2 * yb, xb); - glVertex2f(x1, y0 + yoff2); - glTexCoord3f(xb, 0, xb); - glVertex2f(x1 - xoff2, y0); - glTexCoord3f(xb, 2 * yb, xb); - - glVertex2f(x1, y0 - yoff2); + glVertex2f(x1, y0 - yoff2); glEnd; glBegin(GL_TRIANGLE_STRIP); - glTexCoord3f(xb, -yb, 0); - glVertex2f(x2 + xoff2, y1); - glTexCoord3f(-xb, -yb, 0); - glVertex2f(x2, y1 + yoff2); - glTexCoord3f(xb, 0, xb); + glTexCoord3f(xb, -yb, 0); + glVertex2f(x2 + xoff2, y1); + glTexCoord3f(-xb, -yb, 0); + glVertex2f(x2, y1 + yoff2); + glTexCoord3f(xb, 0, xb); - glVertex2f(x2 + xoff, y1 - yoff); - glTexCoord3f(-xb, 0, xb); - glVertex2f(x2 - xoff, y1 + yoff); - glTexCoord3f(xb, 0, xb); + glVertex2f(x2 + xoff, y1 - yoff); + glTexCoord3f(-xb, 0, xb); + glVertex2f(x2 - xoff, y1 + yoff); + glTexCoord3f(xb, 0, xb); - glVertex2f(x1 + xoff2, y0); - glTexCoord3f(-xb, 0, xb); - glVertex2f(x1, y0 + yoff2); - glTexCoord3f(xb, 2 * yb, xb); + glVertex2f(x1 + xoff2, y0); + glTexCoord3f(-xb, 0, xb); + glVertex2f(x1, y0 + yoff2); + glTexCoord3f(xb, 2 * yb, xb); - glVertex2f(x1, y0 - yoff2); + glVertex2f(x1, y0 - yoff2); glEnd; glUseProgram(0); @@ -1593,19 +1593,6 @@ begin end; glEndList; end; - - if m_textListBase = 0 then - begin - //just doing 7-bit ascii - m_textListBase := glGenLists(128); - - for ii := 0 to 127 do - begin - glNewList(m_textListBase + ii, GL_COMPILE); - glutBitmapCharacter(GLUT_BITMAP_HELVETICA_12, ii); - glEndList; - end; - end; end; end.

const s_colors: array [0..23,0..3] of GLfloat = ((89 / 255, 89 / 255, 89 / 255, 0.7), (166 / 255, 166 / 255, 166 / 255, 0.8), (212 / 255, 228 / 255, 60 / 255, 0.5), (227 / 255, 237 / 255, 127 / 255, 0.5), (99 / 255, 37 / 255, 35 / 255, 1.0), (149 / 255, 55 / 255, 53 / 255, 1.0), (212 / 255, 228 / 255, 60 / 255, 1.0), (227 / 255, 237 / 255, 127 / 255, 1.0), (255 / 255, 255 / 255, 255 / 255, 1.0), (255 / 255, 255 / 255, 255 / 255, 1.0), (255 / 255, 255 / 255, 255 / 255, 1.0), (255 / 255, 255 / 255, 255 / 255, 1.0), (255 / 255, 255 / 255, 255 / 255, 1.0), (255 / 255, 255 / 255, 255 / 255, 1.0), (255 / 255, 255 / 255, 255 / 255, 1.0), (255 / 255, 255 / 255, 255 / 255, 1.0), (79 / 255, 129 / 255, 189 / 255, 1.0), (79 / 255, 129 / 255, 189 / 255, 1.0), (128 / 255, 100 / 255, 162 / 255, 1.0), (128 / 255, 100 / 255, 162 / 255, 1.0), (0 / 255, 0 / 255, 0 / 255, 0.0), (0 / 255, 0 / 255, 0 / 255, 0.0), (0 / 255, 0 / 255, 0 / 255, 0.0), (0 / 255, 0 / 255, 0 / 255, 0.0));