diff --git a/CMakeLists.txt b/CMakeLists.txt index 4fa51eb..178a57b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -29,7 +29,7 @@ if (NOT raylib_FOUND) FetchContent_Declare( raylib GIT_REPOSITORY https://github.com/raysan5/raylib.git - GIT_TAG 4.5.0 + GIT_TAG 5.0 GIT_SHALLOW TRUE ) FetchContent_GetProperties(raylib) diff --git a/docs/API.md b/docs/API.md index ab2e930..edee1b1 100644 --- a/docs/API.md +++ b/docs/API.md @@ -4,12 +4,12 @@
InitWindow(width, height, title)undefined

Initialize window and OpenGL context

-
WindowShouldClose()boolean
-

Check if KEY_ESCAPE pressed or Close icon pressed

-
CloseWindow()undefined

Close window and unload OpenGL context

+
WindowShouldClose()boolean
+

Check if application should close (KEY_ESCAPE pressed or windows close icon clicked)

+
IsWindowReady()boolean

Check if window has been initialized successfully

@@ -43,6 +43,9 @@
ToggleFullscreen()undefined

Toggle window state: fullscreen/windowed (only PLATFORM_DESKTOP)

+
ToggleBorderlessWindowed()undefined
+

Toggle window state: borderless windowed (only PLATFORM_DESKTOP)

+
MaximizeWindow()undefined

Set window state: maximized, if resizable (only PLATFORM_DESKTOP)

@@ -59,23 +62,29 @@

Set icon for window (multiple images, RGBA 32bit, only PLATFORM_DESKTOP)

SetWindowTitle(title)undefined
-

Set title for window (only PLATFORM_DESKTOP)

+

Set title for window (only PLATFORM_DESKTOP and PLATFORM_WEB)

SetWindowPosition(x, y)undefined

Set window position on screen (only PLATFORM_DESKTOP)

SetWindowMonitor(monitor)undefined
-

Set monitor for the current window (fullscreen mode)

+

Set monitor for the current window

SetWindowMinSize(width, height)undefined

Set window minimum dimensions (for FLAG_WINDOW_RESIZABLE)

+
SetWindowMaxSize(width, height)undefined
+

Set window maximum dimensions (for FLAG_WINDOW_RESIZABLE)

+
SetWindowSize(width, height)undefined

Set window dimensions

SetWindowOpacity(opacity)undefined

Set window opacity [0.0f..1.0f] (only PLATFORM_DESKTOP)

+
SetWindowFocused()undefined
+

Set window focused (only PLATFORM_DESKTOP)

+
GetWindowHandle()number

Get native window handle

@@ -122,7 +131,7 @@

Get window scale DPI factor

GetMonitorName(monitor)string
-

Get the human-readable, UTF-8 encoded name of the primary monitor

+

Get the human-readable, UTF-8 encoded name of the specified monitor

SetClipboardText(text)undefined

Set clipboard text content

@@ -136,15 +145,6 @@
DisableEventWaiting()undefined

Disable waiting for events on EndDrawing(), automatic events polling

-
SwapScreenBuffer()undefined
-

Swap back buffer with front buffer (screen drawing)

-
-
PollInputEvents()undefined
-

Register all input events

-
-
WaitTime(seconds)undefined
-

Wait for some time (halt program execution)

-
ShowCursor()undefined

Shows cursor

@@ -259,27 +259,45 @@
SetTargetFPS(fps)undefined

Set target FPS (maximum)

-
GetFPS()number
-

Get current FPS

-
GetFrameTime()number

Get time in seconds for last frame drawn (delta time)

GetTime()number

Get elapsed time in seconds since InitWindow()

-
GetRandomValue(min, max)number
-

Get a random value between min and max (both included)

+
GetFPS()number
+

Get current FPS

+
+
SwapScreenBuffer()undefined
+

Swap back buffer with front buffer (screen drawing)

+
+
PollInputEvents()undefined
+

Register all input events

+
+
WaitTime(seconds)undefined
+

Wait for some time (halt program execution)

SetRandomSeed(seed)undefined

Set the seed for the random number generator

+
GetRandomValue(min, max)number
+

Get a random value between min and max (both included)

+
+
LoadRandomSequence(count, min, max)number
+

Load random values sequence, no values repeated

+
+
UnloadRandomSequence(sequence)undefined
+

Unload random values sequence

+
TakeScreenshot(fileName)undefined

Takes a screenshot of current screen (filename extension defines format)

SetConfigFlags(flags)undefined

Setup init configuration flags (view FLAGS)

+
OpenURL(url)undefined
+

Open URL with default system browser (if available)

+
SetTraceLogLevel(logLevel)undefined

Set the current threshold (minimum) log level

@@ -292,19 +310,16 @@
MemFree(ptr)undefined

Internal memory free

-
OpenURL(url)undefined
-

Open URL with default system browser (if available)

-
-
LoadFileData(fileName, bytesRead)Buffer
+
LoadFileData(fileName, dataSize)Buffer

Load file data as byte array (read)

UnloadFileData(data)undefined

Unload file data allocated by LoadFileData()

-
SaveFileData(fileName, data, bytesToWrite)boolean
+
SaveFileData(fileName, data, dataSize)boolean

Save data to file from byte array (write), returns true on success

-
ExportDataAsCode(data, size, fileName)boolean
+
ExportDataAsCode(data, dataSize, fileName)boolean

Export data to code (.h), returns true on success

LoadFileText(fileName)string
@@ -347,7 +362,7 @@

Get current working directory (uses static string)

GetApplicationDirectory()string
-

Get the directory if the running application (uses static string)

+

Get the directory of the running application (uses static string)

ChangeDirectory(dir)boolean

Change working directory, return true on success

@@ -388,9 +403,36 @@
DecodeDataBase64(data, outputSize)Buffer

Decode Base64 string data, memory must be MemFree()

+
LoadAutomationEventList(fileName)AutomationEventList
+

Load automation events list from file, NULL for empty list, capacity = MAX_AUTOMATION_EVENTS

+
+
UnloadAutomationEventList(list)undefined
+

Unload automation events list from file

+
+
ExportAutomationEventList(list, fileName)boolean
+

Export automation events list as text file

+
+
SetAutomationEventList(list)undefined
+

Set automation event list to record to

+
+
SetAutomationEventBaseFrame(frame)undefined
+

Set automation event internal base frame to start recording

+
+
StartAutomationEventRecording()undefined
+

Start recording automation events (AutomationEventList must be set)

+
+
StopAutomationEventRecording()undefined
+

Stop recording automation events

+
+
PlayAutomationEvent(event)undefined
+

Play a recorded automation event

+
IsKeyPressed(key)boolean

Check if a key has been pressed once

+
IsKeyPressedRepeat(key)boolean
+

Check if a key has been pressed again (Only PLATFORM_DESKTOP)

+
IsKeyDown(key)boolean

Check if a key is being pressed

@@ -400,15 +442,15 @@
IsKeyUp(key)boolean

Check if a key is NOT being pressed

-
SetExitKey(key)undefined
-

Set a custom key to exit program (default is ESC)

-
GetKeyPressed()number

Get key pressed (keycode), call it multiple times for keys queued, returns 0 when the queue is empty

GetCharPressed()number

Get char pressed (unicode), call it multiple times for chars queued, returns 0 when the queue is empty

+
SetExitKey(key)undefined
+

Set a custom key to exit program (default is ESC)

+
IsGamepadAvailable(gamepad)boolean

Check if a gamepad is available

@@ -536,22 +578,16 @@

Draw a line

DrawLineV(startPos, endPos, color)undefined
-

Draw a line (Vector version)

+

Draw a line (using gl lines)

DrawLineEx(startPos, endPos, thick, color)undefined
-

Draw a line defining thickness

-
-
DrawLineBezier(startPos, endPos, thick, color)undefined
-

Draw a line using cubic-bezier curves in-out

-
-
DrawLineBezierQuad(startPos, endPos, controlPos, thick, color)undefined
-

Draw line using quadratic bezier curves with a control point

-
-
DrawLineBezierCubic(startPos, endPos, startControlPos, endControlPos, thick, color)undefined
-

Draw line using cubic bezier curves with 2 control points

+

Draw a line (using triangles/quads)

DrawLineStrip(points, pointCount, color)undefined
-

Draw lines sequence

+

Draw lines sequence (using gl lines)

+
+
DrawLineBezier(startPos, endPos, thick, color)undefined
+

Draw line segment cubic-bezier in-out interpolation

DrawCircle(centerX, centerY, radius, color)undefined

Draw a color-filled circle

@@ -571,6 +607,9 @@
DrawCircleLines(centerX, centerY, radius, color)undefined

Draw circle outline

+
DrawCircleLinesV(center, radius, color)undefined
+

Draw circle outline (Vector version)

+
DrawEllipse(centerX, centerY, radiusH, radiusV, color)undefined

Draw ellipse

@@ -637,6 +676,51 @@
DrawPolyLinesEx(center, sides, radius, rotation, lineThick, color)undefined

Draw a polygon outline of n sides with extended parameters

+
DrawSplineLinear(points, pointCount, thick, color)undefined
+

Draw spline: Linear, minimum 2 points

+
+
DrawSplineBasis(points, pointCount, thick, color)undefined
+

Draw spline: B-Spline, minimum 4 points

+
+
DrawSplineCatmullRom(points, pointCount, thick, color)undefined
+

Draw spline: Catmull-Rom, minimum 4 points

+
+
DrawSplineBezierQuadratic(points, pointCount, thick, color)undefined
+

Draw spline: Quadratic Bezier, minimum 3 points (1 control point): [p1, c2, p3, c4...]

+
+
DrawSplineBezierCubic(points, pointCount, thick, color)undefined
+

Draw spline: Cubic Bezier, minimum 4 points (2 control points): [p1, c2, c3, p4, c5, c6...]

+
+
DrawSplineSegmentLinear(p1, p2, thick, color)undefined
+

Draw spline segment: Linear, 2 points

+
+
DrawSplineSegmentBasis(p1, p2, p3, p4, thick, color)undefined
+

Draw spline segment: B-Spline, 4 points

+
+
DrawSplineSegmentCatmullRom(p1, p2, p3, p4, thick, color)undefined
+

Draw spline segment: Catmull-Rom, 4 points

+
+
DrawSplineSegmentBezierQuadratic(p1, c2, p3, thick, color)undefined
+

Draw spline segment: Quadratic Bezier, 2 points, 1 control point

+
+
DrawSplineSegmentBezierCubic(p1, c2, c3, p4, thick, color)undefined
+

Draw spline segment: Cubic Bezier, 2 points, 2 control points

+
+
GetSplinePointLinear(startPos, endPos, t)Vector2
+

Get (evaluate) spline point: Linear

+
+
GetSplinePointBasis(p1, p2, p3, p4, t)Vector2
+

Get (evaluate) spline point: B-Spline

+
+
GetSplinePointCatmullRom(p1, p2, p3, p4, t)Vector2
+

Get (evaluate) spline point: Catmull-Rom

+
+
GetSplinePointBezierQuad(p1, c2, p3, t)Vector2
+

Get (evaluate) spline point: Quadratic Bezier

+
+
GetSplinePointBezierCubic(p1, c2, c3, p4, t)Vector2
+

Get (evaluate) spline point: Cubic Bezier

+
CheckCollisionRecs(rec1, rec2)boolean

Check collision between two rectangles

@@ -673,6 +757,9 @@
LoadImageRaw(fileName, width, height, format, headerSize)Image

Load image from RAW file data

+
LoadImageSvg(fileNameOrString, width, height)Image
+

Load image from SVG file data or string with specified size

+
LoadImageAnim(fileName, frames)Image

Load image sequence from file (frames appended to image.data)

@@ -694,21 +781,24 @@
ExportImage(image, fileName)boolean

Export image data to file, returns true on success

+
ExportImageToMemory(image, fileType, fileSize)Buffer
+

Export image to memory buffer

+
ExportImageAsCode(image, fileName)boolean

Export image as code file defining an array of bytes, returns true on success

GenImageColor(width, height, color)Image

Generate image: plain color

-
GenImageGradientV(width, height, top, bottom)Image
-

Generate image: vertical gradient

-
-
GenImageGradientH(width, height, left, right)Image
-

Generate image: horizontal gradient

+
GenImageGradientLinear(width, height, direction, start, end)Image
+

Generate image: linear gradient, direction in degrees [0..360], 0=Vertical gradient

GenImageGradientRadial(width, height, density, inner, outer)Image

Generate image: radial gradient

+
GenImageGradientSquare(width, height, density, inner, outer)Image
+

Generate image: square gradient

+
GenImageChecked(width, height, checksX, checksY, col1, col2)Image

Generate image: checked

@@ -739,6 +829,9 @@
ImageBlurGaussian(image, blurSize)undefined

Apply Gaussian blur using a box blur approximation

+
ImageRotate(image, degrees)undefined
+

Rotate image by input angle in degrees (-359 to 359)

+
LoadImageColors(image)number

Load color data from image as a Color array (RGBA - 32bit)

@@ -868,25 +961,25 @@
LoadFont(fileName)Font

Load font from file into GPU memory (VRAM)

-
LoadFontEx(fileName, fontSize, fontChars, glyphCount)Font
-

Load font from file with extended parameters, use NULL for fontChars and 0 for glyphCount to load the default character set

+
LoadFontEx(fileName, fontSize, codepoints, codepointCount)Font
+

Load font from file with extended parameters, use NULL for codepoints and 0 for codepointCount to load the default character setFont

LoadFontFromImage(image, key, firstChar)Font

Load font from Image (XNA style)

-
LoadFontFromMemory(fileType, fileData, dataSize, fontSize, fontChars, glyphCount)Font
+
LoadFontFromMemory(fileType, fileData, dataSize, fontSize, codepoints, codepointCount)Font

Load font from memory buffer, fileType refers to extension: i.e. '.ttf'

IsFontReady(font)boolean

Check if a font is ready

-
LoadFontData(fileData, dataSize, fontSize, fontChars, glyphCount, type)number
+
LoadFontData(fileData, dataSize, fontSize, codepoints, codepointCount, type)number

Load font data for further use

-
GenImageFontAtlas(chars, recs, glyphCount, fontSize, padding, packMethod)Image
+
GenImageFontAtlas(glyphs, glyphRecs, glyphCount, fontSize, padding, packMethod)Image

Generate image font atlas using chars info

-
UnloadFontData(chars, glyphCount)undefined
+
UnloadFontData(glyphs, glyphCount)undefined

Unload font chars info data (RAM)

UnloadFont(font)undefined
@@ -910,9 +1003,12 @@
DrawTextCodepoint(font, codepoint, position, fontSize, tint)undefined

Draw one character (codepoint)

-
DrawTextCodepoints(font, codepoints, count, position, fontSize, spacing, tint)undefined
+
DrawTextCodepoints(font, codepoints, codepointCount, position, fontSize, spacing, tint)undefined

Draw multiple character (codepoint)

+
SetTextLineSpacing(spacing)undefined
+

Set vertical line spacing when drawing with line-breaks

+
MeasureText(text, fontSize)number

Measure string width for default font

@@ -1153,7 +1249,7 @@
UnloadModelAnimation(anim)undefined

Unload animation data

-
UnloadModelAnimations(animations, count)undefined
+
UnloadModelAnimations(animations, animCount)undefined

Unload animation array data

IsModelAnimationValid(model, anim)boolean
@@ -1195,6 +1291,9 @@
SetMasterVolume(volume)undefined

Set master volume (listener)

+
GetMasterVolume()number
+

Get master volume (listener)

+
LoadWave(fileName)Wave

Load wave data from file

@@ -1210,6 +1309,9 @@
LoadSoundFromWave(wave)Sound

Load sound from wave data

+
LoadSoundAlias(source)Sound
+

Create a new sound that shares the same sample data as the source sound, does not own the sound data

+
IsSoundReady(sound)boolean

Checks if a sound is ready

@@ -1222,6 +1324,9 @@
UnloadSound(sound)undefined

Unload sound

+
UnloadSoundAlias(alias)undefined
+

Unload a sound alias (does not deallocate sample data)

+
ExportWave(wave, fileName)boolean

Export wave data to file, returns true on success

@@ -1450,7 +1555,7 @@
GuiIsLocked()boolean

Check if gui is locked (global state)

-
GuiFade(alpha)undefined
+
GuiSetAlpha(alpha)undefined

Set gui controls alpha (global state), alpha goes from 0.0f to 1.0f

GuiSetState(state)undefined
@@ -1471,60 +1576,90 @@
GuiGetStyle(control, property)number

Get one style property

-
GuiWindowBox(bounds, title)boolean
+
GuiLoadStyle(fileName)undefined
+

Load style file over global style variable (.rgs)

+
+
GuiLoadStyleDefault()undefined
+

Load style default over global style

+
+
GuiEnableTooltip()undefined
+

Enable gui tooltips (global state)

+
+
GuiDisableTooltip()undefined
+

Disable gui tooltips (global state)

+
+
GuiSetTooltip(tooltip)undefined
+

Set tooltip string

+
+
GuiIconText(iconId, text)string
+

Get text with icon id prepended (if supported)

+
+
GuiSetIconScale(scale)undefined
+

Set default icon drawing size

+
+
GuiGetIcons()number
+

Get raygui icons data pointer

+
+
GuiLoadIcons(fileName, loadIconsName)number
+

Load raygui icons file (.rgi) into internal icons data

+
+
GuiDrawIcon(iconId, posX, posY, pixelSize, color)undefined
+

Draw icon using pixel size at specified position

+
+
GuiWindowBox(bounds, title)number

Window Box control, shows a window that can be closed

-
GuiGroupBox(bounds, text)undefined
+
GuiGroupBox(bounds, text)number

Group Box control with text name

-
GuiLine(bounds, text)undefined
+
GuiLine(bounds, text)number

Line separator control, could contain text

-
GuiPanel(bounds, text)undefined
+
GuiPanel(bounds, text)number

Panel control, useful to group controls

GuiTabBar(bounds, text, count, active)number

Tab Bar control, returns TAB to be closed or -1

-
GuiScrollPanel(bounds, text, content, scroll)Rectangle
+
GuiScrollPanel(bounds, text, content, scroll, view)number

Scroll Panel control

-
GuiLabel(bounds, text)undefined
+
GuiLabel(bounds, text)number

Label control, shows text

-
GuiButton(bounds, text)boolean
+
GuiButton(bounds, text)number

Button control, returns true when clicked

-
GuiLabelButton(bounds, text)boolean
+
GuiLabelButton(bounds, text)number

Label button control, show true when clicked

-
GuiToggle(bounds, text, active)boolean
+
GuiToggle(bounds, text, active)number

Toggle Button control, returns true when active

GuiToggleGroup(bounds, text, active)number

Toggle Group control, returns active toggle index

-
GuiCheckBox(bounds, text, checked)boolean
+
GuiToggleSlider(bounds, text, active)number
+

Toggle Slider control, returns true when clicked

+
+
GuiCheckBox(bounds, text, checked)number

Check Box control, returns true when active

GuiComboBox(bounds, text, active)number

Combo Box control, returns selected item index

-
GuiDropdownBox(bounds, text, active, editMode)boolean
+
GuiDropdownBox(bounds, text, active, editMode)number

Dropdown Box control, returns selected item

-
GuiSpinner(bounds, text, value, minValue, maxValue, editMode)boolean
+
GuiSpinner(bounds, text, value, minValue, maxValue, editMode)number

Spinner control, returns selected value

-
GuiValueBox(bounds, text, value, minValue, maxValue, editMode)boolean
+
GuiValueBox(bounds, text, value, minValue, maxValue, editMode)number

Value Box control, updates input text with numbers

-
GuiTextBox(bounds, text, textSize, editMode)boolean
+
GuiTextBox(bounds, text, textSize, editMode)number

Text Box control, updates input text

-
GuiTextBoxMulti(bounds, text, textSize, editMode)boolean
-

Text Box control with multiple lines

-
GuiSlider(bounds, textLeft, textRight, value, minValue, maxValue)number

Slider control, returns selected value

@@ -1534,19 +1669,19 @@
GuiProgressBar(bounds, textLeft, textRight, value, minValue, maxValue)number

Progress Bar control, shows current progress value

-
GuiStatusBar(bounds, text)undefined
+
GuiStatusBar(bounds, text)number

Status Bar control, shows info text

-
GuiDummyRec(bounds, text)undefined
+
GuiDummyRec(bounds, text)number

Dummy control for placeholders

-
GuiGrid(bounds, text, spacing, subdivs)Vector2
+
GuiGrid(bounds, text, spacing, subdivs, mouseCell)number

Grid control, returns mouse cell position

GuiListView(bounds, text, scrollIndex, active)number

List View control, returns selected list item index

-
GuiListViewEx(bounds, text, count, focus, scrollIndex, active)number
+
GuiListViewEx(bounds, text, count, scrollIndex, active, focus)number

List View with extended parameters

GuiMessageBox(bounds, title, message, buttons)number
@@ -1555,10 +1690,10 @@
GuiTextInputBox(bounds, title, message, buttons, text, textMaxSize, secretViewActive)number

Text Input Box control, ask for text, supports secret

-
GuiColorPicker(bounds, text, color)Color
+
GuiColorPicker(bounds, text, color)number

Color Picker control (multiple color controls)

-
GuiColorPanel(bounds, text, color)Color
+
GuiColorPanel(bounds, text, color)number

Color Panel control

GuiColorBarAlpha(bounds, text, alpha)number
@@ -1567,32 +1702,11 @@
GuiColorBarHue(bounds, text, value)number

Color Bar Hue control

-
GuiLoadStyle(fileName)undefined
-

Load style file over global style variable (.rgs)

-
-
GuiLoadStyleDefault()undefined
-

Load style default over global style

-
-
GuiEnableTooltip()undefined
-

Enable gui tooltips (global state)

-
-
GuiDisableTooltip()undefined
-

Disable gui tooltips (global state)

-
-
GuiSetTooltip(tooltip)undefined
-

Set tooltip string

-
-
GuiIconText(iconId, text)string
-

Get text with icon id prepended (if supported)

-
-
GuiGetIcons()number
-

Get raygui icons data pointer

-
-
GuiLoadIcons(fileName, loadIconsName)number
-

Load raygui icons file (.rgi) into internal icons data

+
GuiColorPickerHSV(bounds, text, colorHsv)number
+

Color Picker control that avoids conversion to RGB on each call (multiple color controls)

-
GuiSetIconScale(scale)undefined
-

Set icon drawing size

+
GuiColorPanelHSV(bounds, text, colorHsv)number
+

Color Panel control that returns HSV color value, used by GuiColorPickerHSV()

rlMatrixMode(mode)undefined

Choose the current matrix to be transformed

@@ -1711,6 +1825,9 @@
rlActiveDrawBuffers(count)undefined

Activate multiple draw color buffers

+
rlBlitFramebuffer(srcX, srcY, srcWidth, srcHeight, dstX, dstY, dstWidth, dstHeight, bufferMask)undefined
+

Blit active framebuffer to main framebuffer

+
rlEnableColorBlend()undefined

Enable color blending

@@ -1750,8 +1867,11 @@
rlEnableWireMode()undefined

Enable wire mode

+
rlEnablePointMode()undefined
+

Enable point mode

+
rlDisableWireMode()undefined
-

Disable wire mode

+

Disable wire mode ( and point ) maybe rename

rlSetLineWidth(width)undefined

Set the line drawing width

@@ -2179,19 +2299,19 @@ Initialize window and OpenGL context | height | number | | title | string | - - -## WindowShouldClose() ⇒ boolean -Check if KEY_ESCAPE pressed or Close icon pressed - -**Kind**: global function -**Returns**: boolean - The resulting bool. ## CloseWindow() ⇒ undefined Close window and unload OpenGL context **Kind**: global function + + +## WindowShouldClose() ⇒ boolean +Check if application should close (KEY_ESCAPE pressed or windows close icon clicked) + +**Kind**: global function +**Returns**: boolean - The resulting bool. ## IsWindowReady() ⇒ boolean @@ -2280,6 +2400,12 @@ Clear window configuration state flags ## ToggleFullscreen() ⇒ undefined Toggle window state: fullscreen/windowed (only PLATFORM_DESKTOP) +**Kind**: global function + + +## ToggleBorderlessWindowed() ⇒ undefined +Toggle window state: borderless windowed (only PLATFORM_DESKTOP) + **Kind**: global function @@ -2325,7 +2451,7 @@ Set icon for window (multiple images, RGBA 32bit, only PLATFORM_DESKTOP) ## SetWindowTitle(title) ⇒ undefined -Set title for window (only PLATFORM_DESKTOP) +Set title for window (only PLATFORM_DESKTOP and PLATFORM_WEB) **Kind**: global function @@ -2348,7 +2474,7 @@ Set window position on screen (only PLATFORM_DESKTOP) ## SetWindowMonitor(monitor) ⇒ undefined -Set monitor for the current window (fullscreen mode) +Set monitor for the current window **Kind**: global function @@ -2368,6 +2494,18 @@ Set window minimum dimensions (for FLAG_WINDOW_RESIZABLE) | width | number | | height | number | + + +## SetWindowMaxSize(width, height) ⇒ undefined +Set window maximum dimensions (for FLAG_WINDOW_RESIZABLE) + +**Kind**: global function + +| Param | Type | +| --- | --- | +| width | number | +| height | number | + ## SetWindowSize(width, height) ⇒ undefined @@ -2391,6 +2529,12 @@ Set window opacity [0.0f..1.0f] (only PLATFORM_DESKTOP) | --- | --- | | opacity | number | + + +## SetWindowFocused() ⇒ undefined +Set window focused (only PLATFORM_DESKTOP) + +**Kind**: global function ## GetWindowHandle() ⇒ number @@ -2529,7 +2673,7 @@ Get window scale DPI factor ## GetMonitorName(monitor) ⇒ string -Get the human-readable, UTF-8 encoded name of the primary monitor +Get the human-readable, UTF-8 encoded name of the specified monitor **Kind**: global function **Returns**: string - The resulting const char *. @@ -2568,29 +2712,6 @@ Enable waiting for events on EndDrawing(), no automatic event polling Disable waiting for events on EndDrawing(), automatic events polling **Kind**: global function - - -## SwapScreenBuffer() ⇒ undefined -Swap back buffer with front buffer (screen drawing) - -**Kind**: global function - - -## PollInputEvents() ⇒ undefined -Register all input events - -**Kind**: global function - - -## WaitTime(seconds) ⇒ undefined -Wait for some time (halt program execution) - -**Kind**: global function - -| Param | Type | -| --- | --- | -| seconds | number | - ## ShowCursor() ⇒ undefined @@ -2966,13 +3087,6 @@ Set target FPS (maximum) | --- | --- | | fps | number | - - -## GetFPS() ⇒ number -Get current FPS - -**Kind**: global function -**Returns**: number - The resulting int. ## GetFrameTime() ⇒ number @@ -2987,18 +3101,35 @@ Get elapsed time in seconds since InitWindow() **Kind**: global function **Returns**: number - The resulting double. - + -## GetRandomValue(min, max) ⇒ number -Get a random value between min and max (both included) +## GetFPS() ⇒ number +Get current FPS **Kind**: global function **Returns**: number - The resulting int. + + +## SwapScreenBuffer() ⇒ undefined +Swap back buffer with front buffer (screen drawing) + +**Kind**: global function + + +## PollInputEvents() ⇒ undefined +Register all input events + +**Kind**: global function + + +## WaitTime(seconds) ⇒ undefined +Wait for some time (halt program execution) + +**Kind**: global function | Param | Type | | --- | --- | -| min | number | -| max | number | +| seconds | number | @@ -3011,43 +3142,92 @@ Set the seed for the random number generator | --- | --- | | seed | number | - + -## TakeScreenshot(fileName) ⇒ undefined -Takes a screenshot of current screen (filename extension defines format) +## GetRandomValue(min, max) ⇒ number +Get a random value between min and max (both included) **Kind**: global function +**Returns**: number - The resulting int. | Param | Type | | --- | --- | -| fileName | string | +| min | number | +| max | number | - + -## SetConfigFlags(flags) ⇒ undefined -Setup init configuration flags (view FLAGS) +## LoadRandomSequence(count, min, max) ⇒ number +Load random values sequence, no values repeated **Kind**: global function +**Returns**: number - The resulting int *. | Param | Type | | --- | --- | -| flags | number | +| count | number | +| min | number | +| max | number | - + -## SetTraceLogLevel(logLevel) ⇒ undefined -Set the current threshold (minimum) log level +## UnloadRandomSequence(sequence) ⇒ undefined +Unload random values sequence **Kind**: global function | Param | Type | | --- | --- | -| logLevel | number | +| sequence | number | - + -## MemAlloc(size) ⇒ number -Internal memory allocator +## TakeScreenshot(fileName) ⇒ undefined +Takes a screenshot of current screen (filename extension defines format) + +**Kind**: global function + +| Param | Type | +| --- | --- | +| fileName | string | + + + +## SetConfigFlags(flags) ⇒ undefined +Setup init configuration flags (view FLAGS) + +**Kind**: global function + +| Param | Type | +| --- | --- | +| flags | number | + + + +## OpenURL(url) ⇒ undefined +Open URL with default system browser (if available) + +**Kind**: global function + +| Param | Type | +| --- | --- | +| url | string | + + + +## SetTraceLogLevel(logLevel) ⇒ undefined +Set the current threshold (minimum) log level + +**Kind**: global function + +| Param | Type | +| --- | --- | +| logLevel | number | + + + +## MemAlloc(size) ⇒ number +Internal memory allocator **Kind**: global function **Returns**: number - The resulting void *. @@ -3080,20 +3260,9 @@ Internal memory free | --- | --- | | ptr | number | - - -## OpenURL(url) ⇒ undefined -Open URL with default system browser (if available) - -**Kind**: global function - -| Param | Type | -| --- | --- | -| url | string | - -## LoadFileData(fileName, bytesRead) ⇒ Buffer +## LoadFileData(fileName, dataSize) ⇒ Buffer Load file data as byte array (read) **Kind**: global function @@ -3102,7 +3271,7 @@ Load file data as byte array (read) | Param | Type | | --- | --- | | fileName | string | -| bytesRead | number | +| dataSize | number | @@ -3117,7 +3286,7 @@ Unload file data allocated by LoadFileData() -## SaveFileData(fileName, data, bytesToWrite) ⇒ boolean +## SaveFileData(fileName, data, dataSize) ⇒ boolean Save data to file from byte array (write), returns true on success **Kind**: global function @@ -3127,11 +3296,11 @@ Save data to file from byte array (write), returns true on success | --- | --- | | fileName | string | | data | number | -| bytesToWrite | number | +| dataSize | number | -## ExportDataAsCode(data, size, fileName) ⇒ boolean +## ExportDataAsCode(data, dataSize, fileName) ⇒ boolean Export data to code (.h), returns true on success **Kind**: global function @@ -3140,7 +3309,7 @@ Export data to code (.h), returns true on success | Param | Type | | --- | --- | | data | Buffer | -| size | number | +| dataSize | number | | fileName | string | @@ -3298,7 +3467,7 @@ Get current working directory (uses static string) ## GetApplicationDirectory() ⇒ string -Get the directory if the running application (uses static string) +Get the directory of the running application (uses static string) **Kind**: global function **Returns**: string - The resulting const char *. @@ -3455,6 +3624,87 @@ Decode Base64 string data, memory must be MemFree() | data | Buffer | | outputSize | number | + + +## LoadAutomationEventList(fileName) ⇒ AutomationEventList +Load automation events list from file, NULL for empty list, capacity = MAX_AUTOMATION_EVENTS + +**Kind**: global function +**Returns**: AutomationEventList - The resulting AutomationEventList. + +| Param | Type | +| --- | --- | +| fileName | string | + + + +## UnloadAutomationEventList(list) ⇒ undefined +Unload automation events list from file + +**Kind**: global function + +| Param | Type | +| --- | --- | +| list | number | + + + +## ExportAutomationEventList(list, fileName) ⇒ boolean +Export automation events list as text file + +**Kind**: global function +**Returns**: boolean - The resulting bool. + +| Param | Type | +| --- | --- | +| list | AutomationEventList | +| fileName | string | + + + +## SetAutomationEventList(list) ⇒ undefined +Set automation event list to record to + +**Kind**: global function + +| Param | Type | +| --- | --- | +| list | number | + + + +## SetAutomationEventBaseFrame(frame) ⇒ undefined +Set automation event internal base frame to start recording + +**Kind**: global function + +| Param | Type | +| --- | --- | +| frame | number | + + + +## StartAutomationEventRecording() ⇒ undefined +Start recording automation events (AutomationEventList must be set) + +**Kind**: global function + + +## StopAutomationEventRecording() ⇒ undefined +Stop recording automation events + +**Kind**: global function + + +## PlayAutomationEvent(event) ⇒ undefined +Play a recorded automation event + +**Kind**: global function + +| Param | Type | +| --- | --- | +| event | AutomationEvent | + ## IsKeyPressed(key) ⇒ boolean @@ -3467,6 +3717,18 @@ Check if a key has been pressed once | --- | --- | | key | number | + + +## IsKeyPressedRepeat(key) ⇒ boolean +Check if a key has been pressed again (Only PLATFORM_DESKTOP) + +**Kind**: global function +**Returns**: boolean - The resulting bool. + +| Param | Type | +| --- | --- | +| key | number | + ## IsKeyDown(key) ⇒ boolean @@ -3503,17 +3765,6 @@ Check if a key is NOT being pressed | --- | --- | | key | number | - - -## SetExitKey(key) ⇒ undefined -Set a custom key to exit program (default is ESC) - -**Kind**: global function - -| Param | Type | -| --- | --- | -| key | number | - ## GetKeyPressed() ⇒ number @@ -3528,6 +3779,17 @@ Get char pressed (unicode), call it multiple times for chars queued, returns 0 w **Kind**: global function **Returns**: number - The resulting int. + + +## SetExitKey(key) ⇒ undefined +Set a custom key to exit program (default is ESC) + +**Kind**: global function + +| Param | Type | +| --- | --- | +| key | number | + ## IsGamepadAvailable(gamepad) ⇒ boolean @@ -3964,7 +4226,7 @@ Draw a line ## DrawLineV(startPos, endPos, color) ⇒ undefined -Draw a line (Vector version) +Draw a line (using gl lines) **Kind**: global function @@ -3977,21 +4239,7 @@ Draw a line (Vector version) ## DrawLineEx(startPos, endPos, thick, color) ⇒ undefined -Draw a line defining thickness - -**Kind**: global function - -| Param | Type | -| --- | --- | -| startPos | [Vector2](#Vector2) | -| endPos | [Vector2](#Vector2) | -| thick | number | -| color | [Color](#Color) | - - - -## DrawLineBezier(startPos, endPos, thick, color) ⇒ undefined -Draw a line using cubic-bezier curves in-out +Draw a line (using triangles/quads) **Kind**: global function @@ -4002,25 +4250,23 @@ Draw a line using cubic-bezier curves in-out | thick | number | | color | [Color](#Color) | - + -## DrawLineBezierQuad(startPos, endPos, controlPos, thick, color) ⇒ undefined -Draw line using quadratic bezier curves with a control point +## DrawLineStrip(points, pointCount, color) ⇒ undefined +Draw lines sequence (using gl lines) **Kind**: global function | Param | Type | | --- | --- | -| startPos | [Vector2](#Vector2) | -| endPos | [Vector2](#Vector2) | -| controlPos | [Vector2](#Vector2) | -| thick | number | +| points | number | +| pointCount | number | | color | [Color](#Color) | - + -## DrawLineBezierCubic(startPos, endPos, startControlPos, endControlPos, thick, color) ⇒ undefined -Draw line using cubic bezier curves with 2 control points +## DrawLineBezier(startPos, endPos, thick, color) ⇒ undefined +Draw line segment cubic-bezier in-out interpolation **Kind**: global function @@ -4028,24 +4274,9 @@ Draw line using cubic bezier curves with 2 control points | --- | --- | | startPos | [Vector2](#Vector2) | | endPos | [Vector2](#Vector2) | -| startControlPos | [Vector2](#Vector2) | -| endControlPos | [Vector2](#Vector2) | | thick | number | | color | [Color](#Color) | - - -## DrawLineStrip(points, pointCount, color) ⇒ undefined -Draw lines sequence - -**Kind**: global function - -| Param | Type | -| --- | --- | -| points | number | -| pointCount | number | -| color | [Color](#Color) | - ## DrawCircle(centerX, centerY, radius, color) ⇒ undefined @@ -4134,6 +4365,19 @@ Draw circle outline | radius | number | | color | [Color](#Color) | + + +## DrawCircleLinesV(center, radius, color) ⇒ undefined +Draw circle outline (Vector version) + +**Kind**: global function + +| Param | Type | +| --- | --- | +| center | [Vector2](#Vector2) | +| radius | number | +| color | [Color](#Color) | + ## DrawEllipse(centerX, centerY, radiusH, radiusV, color) ⇒ undefined @@ -4456,6 +4700,230 @@ Draw a polygon outline of n sides with extended parameters | lineThick | number | | color | [Color](#Color) | + + +## DrawSplineLinear(points, pointCount, thick, color) ⇒ undefined +Draw spline: Linear, minimum 2 points + +**Kind**: global function + +| Param | Type | +| --- | --- | +| points | number | +| pointCount | number | +| thick | number | +| color | [Color](#Color) | + + + +## DrawSplineBasis(points, pointCount, thick, color) ⇒ undefined +Draw spline: B-Spline, minimum 4 points + +**Kind**: global function + +| Param | Type | +| --- | --- | +| points | number | +| pointCount | number | +| thick | number | +| color | [Color](#Color) | + + + +## DrawSplineCatmullRom(points, pointCount, thick, color) ⇒ undefined +Draw spline: Catmull-Rom, minimum 4 points + +**Kind**: global function + +| Param | Type | +| --- | --- | +| points | number | +| pointCount | number | +| thick | number | +| color | [Color](#Color) | + + + +## DrawSplineBezierQuadratic(points, pointCount, thick, color) ⇒ undefined +Draw spline: Quadratic Bezier, minimum 3 points (1 control point): [p1, c2, p3, c4...] + +**Kind**: global function + +| Param | Type | +| --- | --- | +| points | number | +| pointCount | number | +| thick | number | +| color | [Color](#Color) | + + + +## DrawSplineBezierCubic(points, pointCount, thick, color) ⇒ undefined +Draw spline: Cubic Bezier, minimum 4 points (2 control points): [p1, c2, c3, p4, c5, c6...] + +**Kind**: global function + +| Param | Type | +| --- | --- | +| points | number | +| pointCount | number | +| thick | number | +| color | [Color](#Color) | + + + +## DrawSplineSegmentLinear(p1, p2, thick, color) ⇒ undefined +Draw spline segment: Linear, 2 points + +**Kind**: global function + +| Param | Type | +| --- | --- | +| p1 | [Vector2](#Vector2) | +| p2 | [Vector2](#Vector2) | +| thick | number | +| color | [Color](#Color) | + + + +## DrawSplineSegmentBasis(p1, p2, p3, p4, thick, color) ⇒ undefined +Draw spline segment: B-Spline, 4 points + +**Kind**: global function + +| Param | Type | +| --- | --- | +| p1 | [Vector2](#Vector2) | +| p2 | [Vector2](#Vector2) | +| p3 | [Vector2](#Vector2) | +| p4 | [Vector2](#Vector2) | +| thick | number | +| color | [Color](#Color) | + + + +## DrawSplineSegmentCatmullRom(p1, p2, p3, p4, thick, color) ⇒ undefined +Draw spline segment: Catmull-Rom, 4 points + +**Kind**: global function + +| Param | Type | +| --- | --- | +| p1 | [Vector2](#Vector2) | +| p2 | [Vector2](#Vector2) | +| p3 | [Vector2](#Vector2) | +| p4 | [Vector2](#Vector2) | +| thick | number | +| color | [Color](#Color) | + + + +## DrawSplineSegmentBezierQuadratic(p1, c2, p3, thick, color) ⇒ undefined +Draw spline segment: Quadratic Bezier, 2 points, 1 control point + +**Kind**: global function + +| Param | Type | +| --- | --- | +| p1 | [Vector2](#Vector2) | +| c2 | [Vector2](#Vector2) | +| p3 | [Vector2](#Vector2) | +| thick | number | +| color | [Color](#Color) | + + + +## DrawSplineSegmentBezierCubic(p1, c2, c3, p4, thick, color) ⇒ undefined +Draw spline segment: Cubic Bezier, 2 points, 2 control points + +**Kind**: global function + +| Param | Type | +| --- | --- | +| p1 | [Vector2](#Vector2) | +| c2 | [Vector2](#Vector2) | +| c3 | [Vector2](#Vector2) | +| p4 | [Vector2](#Vector2) | +| thick | number | +| color | [Color](#Color) | + + + +## GetSplinePointLinear(startPos, endPos, t) ⇒ [Vector2](#Vector2) +Get (evaluate) spline point: Linear + +**Kind**: global function +**Returns**: [Vector2](#Vector2) - The resulting Vector2. + +| Param | Type | +| --- | --- | +| startPos | [Vector2](#Vector2) | +| endPos | [Vector2](#Vector2) | +| t | number | + + + +## GetSplinePointBasis(p1, p2, p3, p4, t) ⇒ [Vector2](#Vector2) +Get (evaluate) spline point: B-Spline + +**Kind**: global function +**Returns**: [Vector2](#Vector2) - The resulting Vector2. + +| Param | Type | +| --- | --- | +| p1 | [Vector2](#Vector2) | +| p2 | [Vector2](#Vector2) | +| p3 | [Vector2](#Vector2) | +| p4 | [Vector2](#Vector2) | +| t | number | + + + +## GetSplinePointCatmullRom(p1, p2, p3, p4, t) ⇒ [Vector2](#Vector2) +Get (evaluate) spline point: Catmull-Rom + +**Kind**: global function +**Returns**: [Vector2](#Vector2) - The resulting Vector2. + +| Param | Type | +| --- | --- | +| p1 | [Vector2](#Vector2) | +| p2 | [Vector2](#Vector2) | +| p3 | [Vector2](#Vector2) | +| p4 | [Vector2](#Vector2) | +| t | number | + + + +## GetSplinePointBezierQuad(p1, c2, p3, t) ⇒ [Vector2](#Vector2) +Get (evaluate) spline point: Quadratic Bezier + +**Kind**: global function +**Returns**: [Vector2](#Vector2) - The resulting Vector2. + +| Param | Type | +| --- | --- | +| p1 | [Vector2](#Vector2) | +| c2 | [Vector2](#Vector2) | +| p3 | [Vector2](#Vector2) | +| t | number | + + + +## GetSplinePointBezierCubic(p1, c2, c3, p4, t) ⇒ [Vector2](#Vector2) +Get (evaluate) spline point: Cubic Bezier + +**Kind**: global function +**Returns**: [Vector2](#Vector2) - The resulting Vector2. + +| Param | Type | +| --- | --- | +| p1 | [Vector2](#Vector2) | +| c2 | [Vector2](#Vector2) | +| c3 | [Vector2](#Vector2) | +| p4 | [Vector2](#Vector2) | +| t | number | + ## CheckCollisionRecs(rec1, rec2) ⇒ boolean @@ -4626,6 +5094,20 @@ Load image from RAW file data | format | number | | headerSize | number | + + +## LoadImageSvg(fileNameOrString, width, height) ⇒ Image +Load image from SVG file data or string with specified size + +**Kind**: global function +**Returns**: Image - The resulting Image. + +| Param | Type | +| --- | --- | +| fileNameOrString | string | +| width | number | +| height | number | + ## LoadImageAnim(fileName, frames) ⇒ Image @@ -4708,6 +5190,20 @@ Export image data to file, returns true on success | image | Image | | fileName | string | + + +## ExportImageToMemory(image, fileType, fileSize) ⇒ Buffer +Export image to memory buffer + +**Kind**: global function +**Returns**: Buffer - The resulting unsigned char *. + +| Param | Type | +| --- | --- | +| image | Image | +| fileType | string | +| fileSize | number | + ## ExportImageAsCode(image, fileName) ⇒ boolean @@ -4735,10 +5231,10 @@ Generate image: plain color | height | number | | color | [Color](#Color) | - + -## GenImageGradientV(width, height, top, bottom) ⇒ Image -Generate image: vertical gradient +## GenImageGradientLinear(width, height, direction, start, end) ⇒ Image +Generate image: linear gradient, direction in degrees [0..360], 0=Vertical gradient **Kind**: global function **Returns**: Image - The resulting Image. @@ -4747,13 +5243,14 @@ Generate image: vertical gradient | --- | --- | | width | number | | height | number | -| top | [Color](#Color) | -| bottom | [Color](#Color) | +| direction | number | +| start | [Color](#Color) | +| end | [Color](#Color) | - + -## GenImageGradientH(width, height, left, right) ⇒ Image -Generate image: horizontal gradient +## GenImageGradientRadial(width, height, density, inner, outer) ⇒ Image +Generate image: radial gradient **Kind**: global function **Returns**: Image - The resulting Image. @@ -4762,13 +5259,14 @@ Generate image: horizontal gradient | --- | --- | | width | number | | height | number | -| left | [Color](#Color) | -| right | [Color](#Color) | +| density | number | +| inner | [Color](#Color) | +| outer | [Color](#Color) | - + -## GenImageGradientRadial(width, height, density, inner, outer) ⇒ Image -Generate image: radial gradient +## GenImageGradientSquare(width, height, density, inner, outer) ⇒ Image +Generate image: square gradient **Kind**: global function **Returns**: Image - The resulting Image. @@ -4923,6 +5421,18 @@ Apply Gaussian blur using a box blur approximation | image | number | | blurSize | number | + + +## ImageRotate(image, degrees) ⇒ undefined +Rotate image by input angle in degrees (-359 to 359) + +**Kind**: global function + +| Param | Type | +| --- | --- | +| image | number | +| degrees | number | + ## LoadImageColors(image) ⇒ number @@ -5474,8 +5984,8 @@ Load font from file into GPU memory (VRAM) -## LoadFontEx(fileName, fontSize, fontChars, glyphCount) ⇒ Font -Load font from file with extended parameters, use NULL for fontChars and 0 for glyphCount to load the default character set +## LoadFontEx(fileName, fontSize, codepoints, codepointCount) ⇒ Font +Load font from file with extended parameters, use NULL for codepoints and 0 for codepointCount to load the default character setFont **Kind**: global function **Returns**: Font - The resulting Font. @@ -5484,8 +5994,8 @@ Load font from file with extended parameters, use NULL for fontChars and 0 for g | --- | --- | | fileName | string | | fontSize | number | -| fontChars | number | -| glyphCount | number | +| codepoints | number | +| codepointCount | number | @@ -5503,7 +6013,7 @@ Load font from Image (XNA style) -## LoadFontFromMemory(fileType, fileData, dataSize, fontSize, fontChars, glyphCount) ⇒ Font +## LoadFontFromMemory(fileType, fileData, dataSize, fontSize, codepoints, codepointCount) ⇒ Font Load font from memory buffer, fileType refers to extension: i.e. '.ttf' **Kind**: global function @@ -5515,8 +6025,8 @@ Load font from memory buffer, fileType refers to extension: i.e. '.ttf' | fileData | Buffer | | dataSize | number | | fontSize | number | -| fontChars | number | -| glyphCount | number | +| codepoints | number | +| codepointCount | number | @@ -5532,7 +6042,7 @@ Check if a font is ready -## LoadFontData(fileData, dataSize, fontSize, fontChars, glyphCount, type) ⇒ number +## LoadFontData(fileData, dataSize, fontSize, codepoints, codepointCount, type) ⇒ number Load font data for further use **Kind**: global function @@ -5543,13 +6053,13 @@ Load font data for further use | fileData | Buffer | | dataSize | number | | fontSize | number | -| fontChars | number | -| glyphCount | number | +| codepoints | number | +| codepointCount | number | | type | number | -## GenImageFontAtlas(chars, recs, glyphCount, fontSize, padding, packMethod) ⇒ Image +## GenImageFontAtlas(glyphs, glyphRecs, glyphCount, fontSize, padding, packMethod) ⇒ Image Generate image font atlas using chars info **Kind**: global function @@ -5557,8 +6067,8 @@ Generate image font atlas using chars info | Param | Type | | --- | --- | -| chars | number | -| recs | number | +| glyphs | number | +| glyphRecs | number | | glyphCount | number | | fontSize | number | | padding | number | @@ -5566,14 +6076,14 @@ Generate image font atlas using chars info -## UnloadFontData(chars, glyphCount) ⇒ undefined +## UnloadFontData(glyphs, glyphCount) ⇒ undefined Unload font chars info data (RAM) **Kind**: global function | Param | Type | | --- | --- | -| chars | number | +| glyphs | number | | glyphCount | number | @@ -5678,7 +6188,7 @@ Draw one character (codepoint) -## DrawTextCodepoints(font, codepoints, count, position, fontSize, spacing, tint) ⇒ undefined +## DrawTextCodepoints(font, codepoints, codepointCount, position, fontSize, spacing, tint) ⇒ undefined Draw multiple character (codepoint) **Kind**: global function @@ -5687,12 +6197,23 @@ Draw multiple character (codepoint) | --- | --- | | font | Font | | codepoints | number | -| count | number | +| codepointCount | number | | position | [Vector2](#Vector2) | | fontSize | number | | spacing | number | | tint | [Color](#Color) | + + +## SetTextLineSpacing(spacing) ⇒ undefined +Set vertical line spacing when drawing with line-breaks + +**Kind**: global function + +| Param | Type | +| --- | --- | +| spacing | number | + ## MeasureText(text, fontSize) ⇒ number @@ -6778,7 +7299,7 @@ Unload animation data -## UnloadModelAnimations(animations, count) ⇒ undefined +## UnloadModelAnimations(animations, animCount) ⇒ undefined Unload animation array data **Kind**: global function @@ -6786,7 +7307,7 @@ Unload animation array data | Param | Type | | --- | --- | | animations | number | -| count | number | +| animCount | number | @@ -6945,6 +7466,13 @@ Set master volume (listener) | --- | --- | | volume | number | + + +## GetMasterVolume() ⇒ number +Get master volume (listener) + +**Kind**: global function +**Returns**: number - The resulting float. ## LoadWave(fileName) ⇒ Wave @@ -7005,7 +7533,19 @@ Load sound from wave data | Param | Type | | --- | --- | -| wave | Wave | +| wave | Wave | + + + +## LoadSoundAlias(source) ⇒ Sound +Create a new sound that shares the same sample data as the source sound, does not own the sound data + +**Kind**: global function +**Returns**: Sound - The resulting Sound. + +| Param | Type | +| --- | --- | +| source | Sound | @@ -7054,6 +7594,17 @@ Unload sound | --- | --- | | sound | Sound | + + +## UnloadSoundAlias(alias) ⇒ undefined +Unload a sound alias (does not deallocate sample data) + +**Kind**: global function + +| Param | Type | +| --- | --- | +| alias | Sound | + ## ExportWave(wave, fileName) ⇒ boolean @@ -8011,9 +8562,9 @@ Check if gui is locked (global state) **Kind**: global function **Returns**: boolean - The resulting bool. - + -## GuiFade(alpha) ⇒ undefined +## GuiSetAlpha(alpha) ⇒ undefined Set gui controls alpha (global state), alpha goes from 0.0f to 1.0f **Kind**: global function @@ -8084,13 +8635,112 @@ Get one style property | control | number | | property | number | + + +## GuiLoadStyle(fileName) ⇒ undefined +Load style file over global style variable (.rgs) + +**Kind**: global function + +| Param | Type | +| --- | --- | +| fileName | string | + + + +## GuiLoadStyleDefault() ⇒ undefined +Load style default over global style + +**Kind**: global function + + +## GuiEnableTooltip() ⇒ undefined +Enable gui tooltips (global state) + +**Kind**: global function + + +## GuiDisableTooltip() ⇒ undefined +Disable gui tooltips (global state) + +**Kind**: global function + + +## GuiSetTooltip(tooltip) ⇒ undefined +Set tooltip string + +**Kind**: global function + +| Param | Type | +| --- | --- | +| tooltip | string | + + + +## GuiIconText(iconId, text) ⇒ string +Get text with icon id prepended (if supported) + +**Kind**: global function +**Returns**: string - The resulting const char *. + +| Param | Type | +| --- | --- | +| iconId | number | +| text | string | + + + +## GuiSetIconScale(scale) ⇒ undefined +Set default icon drawing size + +**Kind**: global function + +| Param | Type | +| --- | --- | +| scale | number | + + + +## GuiGetIcons() ⇒ number +Get raygui icons data pointer + +**Kind**: global function +**Returns**: number - The resulting unsigned int *. + + +## GuiLoadIcons(fileName, loadIconsName) ⇒ number +Load raygui icons file (.rgi) into internal icons data + +**Kind**: global function +**Returns**: number - The resulting char **. + +| Param | Type | +| --- | --- | +| fileName | string | +| loadIconsName | boolean | + + + +## GuiDrawIcon(iconId, posX, posY, pixelSize, color) ⇒ undefined +Draw icon using pixel size at specified position + +**Kind**: global function + +| Param | Type | +| --- | --- | +| iconId | number | +| posX | number | +| posY | number | +| pixelSize | number | +| color | [Color](#Color) | + -## GuiWindowBox(bounds, title) ⇒ boolean +## GuiWindowBox(bounds, title) ⇒ number Window Box control, shows a window that can be closed **Kind**: global function -**Returns**: boolean - The resulting bool. +**Returns**: number - The resulting int. | Param | Type | | --- | --- | @@ -8099,10 +8749,11 @@ Window Box control, shows a window that can be closed -## GuiGroupBox(bounds, text) ⇒ undefined +## GuiGroupBox(bounds, text) ⇒ number Group Box control with text name **Kind**: global function +**Returns**: number - The resulting int. | Param | Type | | --- | --- | @@ -8111,10 +8762,11 @@ Group Box control with text name -## GuiLine(bounds, text) ⇒ undefined +## GuiLine(bounds, text) ⇒ number Line separator control, could contain text **Kind**: global function +**Returns**: number - The resulting int. | Param | Type | | --- | --- | @@ -8123,10 +8775,11 @@ Line separator control, could contain text -## GuiPanel(bounds, text) ⇒ undefined +## GuiPanel(bounds, text) ⇒ number Panel control, useful to group controls **Kind**: global function +**Returns**: number - The resulting int. | Param | Type | | --- | --- | @@ -8150,11 +8803,11 @@ Tab Bar control, returns TAB to be closed or -1 -## GuiScrollPanel(bounds, text, content, scroll) ⇒ [Rectangle](#Rectangle) +## GuiScrollPanel(bounds, text, content, scroll, view) ⇒ number Scroll Panel control **Kind**: global function -**Returns**: [Rectangle](#Rectangle) - The resulting Rectangle. +**Returns**: number - The resulting int. | Param | Type | | --- | --- | @@ -8162,13 +8815,15 @@ Scroll Panel control | text | string | | content | [Rectangle](#Rectangle) | | scroll | number | +| view | number | -## GuiLabel(bounds, text) ⇒ undefined +## GuiLabel(bounds, text) ⇒ number Label control, shows text **Kind**: global function +**Returns**: number - The resulting int. | Param | Type | | --- | --- | @@ -8177,11 +8832,11 @@ Label control, shows text -## GuiButton(bounds, text) ⇒ boolean +## GuiButton(bounds, text) ⇒ number Button control, returns true when clicked **Kind**: global function -**Returns**: boolean - The resulting bool. +**Returns**: number - The resulting int. | Param | Type | | --- | --- | @@ -8190,11 +8845,11 @@ Button control, returns true when clicked -## GuiLabelButton(bounds, text) ⇒ boolean +## GuiLabelButton(bounds, text) ⇒ number Label button control, show true when clicked **Kind**: global function -**Returns**: boolean - The resulting bool. +**Returns**: number - The resulting int. | Param | Type | | --- | --- | @@ -8203,17 +8858,17 @@ Label button control, show true when clicked -## GuiToggle(bounds, text, active) ⇒ boolean +## GuiToggle(bounds, text, active) ⇒ number Toggle Button control, returns true when active **Kind**: global function -**Returns**: boolean - The resulting bool. +**Returns**: number - The resulting int. | Param | Type | | --- | --- | | bounds | [Rectangle](#Rectangle) | | text | string | -| active | boolean | +| active | number | @@ -8229,19 +8884,33 @@ Toggle Group control, returns active toggle index | text | string | | active | number | + + +## GuiToggleSlider(bounds, text, active) ⇒ number +Toggle Slider control, returns true when clicked + +**Kind**: global function +**Returns**: number - The resulting int. + +| Param | Type | +| --- | --- | +| bounds | [Rectangle](#Rectangle) | +| text | string | +| active | number | + -## GuiCheckBox(bounds, text, checked) ⇒ boolean +## GuiCheckBox(bounds, text, checked) ⇒ number Check Box control, returns true when active **Kind**: global function -**Returns**: boolean - The resulting bool. +**Returns**: number - The resulting int. | Param | Type | | --- | --- | | bounds | [Rectangle](#Rectangle) | | text | string | -| checked | boolean | +| checked | number | @@ -8259,11 +8928,11 @@ Combo Box control, returns selected item index -## GuiDropdownBox(bounds, text, active, editMode) ⇒ boolean +## GuiDropdownBox(bounds, text, active, editMode) ⇒ number Dropdown Box control, returns selected item **Kind**: global function -**Returns**: boolean - The resulting bool. +**Returns**: number - The resulting int. | Param | Type | | --- | --- | @@ -8274,11 +8943,11 @@ Dropdown Box control, returns selected item -## GuiSpinner(bounds, text, value, minValue, maxValue, editMode) ⇒ boolean +## GuiSpinner(bounds, text, value, minValue, maxValue, editMode) ⇒ number Spinner control, returns selected value **Kind**: global function -**Returns**: boolean - The resulting bool. +**Returns**: number - The resulting int. | Param | Type | | --- | --- | @@ -8291,11 +8960,11 @@ Spinner control, returns selected value -## GuiValueBox(bounds, text, value, minValue, maxValue, editMode) ⇒ boolean +## GuiValueBox(bounds, text, value, minValue, maxValue, editMode) ⇒ number Value Box control, updates input text with numbers **Kind**: global function -**Returns**: boolean - The resulting bool. +**Returns**: number - The resulting int. | Param | Type | | --- | --- | @@ -8308,26 +8977,11 @@ Value Box control, updates input text with numbers -## GuiTextBox(bounds, text, textSize, editMode) ⇒ boolean +## GuiTextBox(bounds, text, textSize, editMode) ⇒ number Text Box control, updates input text **Kind**: global function -**Returns**: boolean - The resulting bool. - -| Param | Type | -| --- | --- | -| bounds | [Rectangle](#Rectangle) | -| text | string | -| textSize | number | -| editMode | boolean | - - - -## GuiTextBoxMulti(bounds, text, textSize, editMode) ⇒ boolean -Text Box control with multiple lines - -**Kind**: global function -**Returns**: boolean - The resulting bool. +**Returns**: number - The resulting int. | Param | Type | | --- | --- | @@ -8342,7 +8996,7 @@ Text Box control with multiple lines Slider control, returns selected value **Kind**: global function -**Returns**: number - The resulting float. +**Returns**: number - The resulting int. | Param | Type | | --- | --- | @@ -8359,7 +9013,7 @@ Slider control, returns selected value Slider Bar control, returns selected value **Kind**: global function -**Returns**: number - The resulting float. +**Returns**: number - The resulting int. | Param | Type | | --- | --- | @@ -8376,7 +9030,7 @@ Slider Bar control, returns selected value Progress Bar control, shows current progress value **Kind**: global function -**Returns**: number - The resulting float. +**Returns**: number - The resulting int. | Param | Type | | --- | --- | @@ -8389,10 +9043,11 @@ Progress Bar control, shows current progress value -## GuiStatusBar(bounds, text) ⇒ undefined +## GuiStatusBar(bounds, text) ⇒ number Status Bar control, shows info text **Kind**: global function +**Returns**: number - The resulting int. | Param | Type | | --- | --- | @@ -8401,10 +9056,11 @@ Status Bar control, shows info text -## GuiDummyRec(bounds, text) ⇒ undefined +## GuiDummyRec(bounds, text) ⇒ number Dummy control for placeholders **Kind**: global function +**Returns**: number - The resulting int. | Param | Type | | --- | --- | @@ -8413,11 +9069,11 @@ Dummy control for placeholders -## GuiGrid(bounds, text, spacing, subdivs) ⇒ [Vector2](#Vector2) +## GuiGrid(bounds, text, spacing, subdivs, mouseCell) ⇒ number Grid control, returns mouse cell position **Kind**: global function -**Returns**: [Vector2](#Vector2) - The resulting Vector2. +**Returns**: number - The resulting int. | Param | Type | | --- | --- | @@ -8425,6 +9081,7 @@ Grid control, returns mouse cell position | text | string | | spacing | number | | subdivs | number | +| mouseCell | number | @@ -8443,7 +9100,7 @@ List View control, returns selected list item index -## GuiListViewEx(bounds, text, count, focus, scrollIndex, active) ⇒ number +## GuiListViewEx(bounds, text, count, scrollIndex, active, focus) ⇒ number List View with extended parameters **Kind**: global function @@ -8454,9 +9111,9 @@ List View with extended parameters | bounds | [Rectangle](#Rectangle) | | text | number | | count | number | -| focus | number | | scrollIndex | number | | active | number | +| focus | number | @@ -8493,31 +9150,31 @@ Text Input Box control, ask for text, supports secret -## GuiColorPicker(bounds, text, color) ⇒ [Color](#Color) +## GuiColorPicker(bounds, text, color) ⇒ number Color Picker control (multiple color controls) **Kind**: global function -**Returns**: [Color](#Color) - The resulting Color. +**Returns**: number - The resulting int. | Param | Type | | --- | --- | | bounds | [Rectangle](#Rectangle) | | text | string | -| color | [Color](#Color) | +| color | number | -## GuiColorPanel(bounds, text, color) ⇒ [Color](#Color) +## GuiColorPanel(bounds, text, color) ⇒ number Color Panel control **Kind**: global function -**Returns**: [Color](#Color) - The resulting Color. +**Returns**: number - The resulting int. | Param | Type | | --- | --- | | bounds | [Rectangle](#Rectangle) | | text | string | -| color | [Color](#Color) | +| color | number | @@ -8525,7 +9182,7 @@ Color Panel control Color Bar Alpha control **Kind**: global function -**Returns**: number - The resulting float. +**Returns**: number - The resulting int. | Param | Type | | --- | --- | @@ -8539,7 +9196,7 @@ Color Bar Alpha control Color Bar Hue control **Kind**: global function -**Returns**: number - The resulting float. +**Returns**: number - The resulting int. | Param | Type | | --- | --- | @@ -8547,89 +9204,33 @@ Color Bar Hue control | text | string | | value | number | - - -## GuiLoadStyle(fileName) ⇒ undefined -Load style file over global style variable (.rgs) - -**Kind**: global function - -| Param | Type | -| --- | --- | -| fileName | string | - - - -## GuiLoadStyleDefault() ⇒ undefined -Load style default over global style - -**Kind**: global function - - -## GuiEnableTooltip() ⇒ undefined -Enable gui tooltips (global state) - -**Kind**: global function - - -## GuiDisableTooltip() ⇒ undefined -Disable gui tooltips (global state) - -**Kind**: global function - - -## GuiSetTooltip(tooltip) ⇒ undefined -Set tooltip string - -**Kind**: global function + -| Param | Type | -| --- | --- | -| tooltip | string | - - - -## GuiIconText(iconId, text) ⇒ string -Get text with icon id prepended (if supported) +## GuiColorPickerHSV(bounds, text, colorHsv) ⇒ number +Color Picker control that avoids conversion to RGB on each call (multiple color controls) **Kind**: global function -**Returns**: string - The resulting const char *. +**Returns**: number - The resulting int. | Param | Type | | --- | --- | -| iconId | number | +| bounds | [Rectangle](#Rectangle) | | text | string | +| colorHsv | number | - - -## GuiGetIcons() ⇒ number -Get raygui icons data pointer - -**Kind**: global function -**Returns**: number - The resulting unsigned int *. - - -## GuiLoadIcons(fileName, loadIconsName) ⇒ number -Load raygui icons file (.rgi) into internal icons data - -**Kind**: global function -**Returns**: number - The resulting char **. - -| Param | Type | -| --- | --- | -| fileName | string | -| loadIconsName | boolean | - - + -## GuiSetIconScale(scale) ⇒ undefined -Set icon drawing size +## GuiColorPanelHSV(bounds, text, colorHsv) ⇒ number +Color Panel control that returns HSV color value, used by GuiColorPickerHSV() **Kind**: global function +**Returns**: number - The resulting int. | Param | Type | | --- | --- | -| scale | number | +| bounds | [Rectangle](#Rectangle) | +| text | string | +| colorHsv | number | @@ -9035,6 +9636,25 @@ Activate multiple draw color buffers | --- | --- | | count | number | + + +## rlBlitFramebuffer(srcX, srcY, srcWidth, srcHeight, dstX, dstY, dstWidth, dstHeight, bufferMask) ⇒ undefined +Blit active framebuffer to main framebuffer + +**Kind**: global function + +| Param | Type | +| --- | --- | +| srcX | number | +| srcY | number | +| srcWidth | number | +| srcHeight | number | +| dstX | number | +| dstY | number | +| dstWidth | number | +| dstHeight | number | +| bufferMask | number | + ## rlEnableColorBlend() ⇒ undefined @@ -9125,11 +9745,17 @@ Scissor test ## rlEnableWireMode() ⇒ undefined Enable wire mode +**Kind**: global function + + +## rlEnablePointMode() ⇒ undefined +Enable point mode + **Kind**: global function ## rlDisableWireMode() ⇒ undefined -Disable wire mode +Disable wire mode ( and point ) maybe rename **Kind**: global function diff --git a/package-lock.json b/package-lock.json index 6ed9173..bc71075 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "raylib", - "version": "0.14.0", + "version": "0.15.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "raylib", - "version": "0.14.0", + "version": "0.15.0", "hasInstallScript": true, "license": "Zlib", "dependencies": { @@ -17,7 +17,7 @@ "raylib": "bin/node-raylib" }, "devDependencies": { - "@raylib/api": "~4.5.0", + "@raylib/api": "^5.0.0", "@vitest/ui": "^0.29.7", "archiver": "^5.3.1", "jsdoc-to-markdown": "^8.0.0", @@ -29,6 +29,15 @@ "node": ">=10" } }, + "node_modules/@aashutoshrathi/word-wrap": { + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz", + "integrity": "sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/@babel/generator": { "version": "7.18.2", "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.18.2.tgz", @@ -44,27 +53,27 @@ } }, "node_modules/@babel/helper-string-parser": { - "version": "7.19.4", - "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz", - "integrity": "sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz", + "integrity": "sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==", "dev": true, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-validator-identifier": { - "version": "7.19.1", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz", - "integrity": "sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==", + "version": "7.22.20", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz", + "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==", "dev": true, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/parser": { - "version": "7.21.3", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.21.3.tgz", - "integrity": "sha512-lobG0d7aOfQRXh8AyklEAgZGvA4FShxo6xQbUrrT/cNBPUdIDojlokwJsQyCC/eKia7ifqM0yP+2DRZ4WKw2RQ==", + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.3.tgz", + "integrity": "sha512-uVsWNvlVsIninV2prNz/3lHCb+5CJ+e+IUBfbjToAHODtfGYLfCFuY4AU7TskI+dAKk+njsPiBjq1gKTvZOBaw==", "dev": true, "bin": { "parser": "bin/babel-parser.js" @@ -88,9 +97,9 @@ } }, "node_modules/@esbuild/android-arm": { - "version": "0.17.13", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.17.13.tgz", - "integrity": "sha512-5tZZ/hLIfBmt7E8JsE5KbsknoAFmoElkg+A/gjyPtmSQvJjPf+9GsSJihid8VMa08lrsYyaEXOT9RLh3xXQONw==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.18.20.tgz", + "integrity": "sha512-fyi7TDI/ijKKNZTUJAQqiG5T7YjJXgnzkURqmGj13C6dCqckZBLdl4h7bkhHt/t0WP+zO9/zwroDvANaOqO5Sw==", "cpu": [ "arm" ], @@ -104,9 +113,9 @@ } }, "node_modules/@esbuild/android-arm64": { - "version": "0.17.13", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.17.13.tgz", - "integrity": "sha512-F5DgvJMV2ZEpLNpPCO7FEk1wy8O5tg6cikWSB6uvvncsgE1xgbPlm+Boio/4820C2/mj713X83X1h01v0qoeHg==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.18.20.tgz", + "integrity": "sha512-Nz4rJcchGDtENV0eMKUNa6L12zz2zBDXuhj/Vjh18zGqB44Bi7MBMSXjgunJgjRhCmKOjnPuZp4Mb6OKqtMHLQ==", "cpu": [ "arm64" ], @@ -120,9 +129,9 @@ } }, "node_modules/@esbuild/android-x64": { - "version": "0.17.13", - "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.17.13.tgz", - "integrity": "sha512-5m1UUslzpfVrumG3m3Zv2x9VNAcvMOQWJy009y6jt10tcHpzIq2/b0I0k4fz0QYqGSNS1GteRIhVPN4H7OyCXg==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.18.20.tgz", + "integrity": "sha512-8GDdlePJA8D6zlZYJV/jnrRAi6rOiNaCC/JclcXpB+KIuvfBN4owLtgzY2bsxnx666XjJx2kDPUmnTtR8qKQUg==", "cpu": [ "x64" ], @@ -136,9 +145,9 @@ } }, "node_modules/@esbuild/darwin-arm64": { - "version": "0.17.13", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.17.13.tgz", - "integrity": "sha512-TXbXp/05r7heRsG8yWwbHw9diay+wXIyRNcIHFoNARRIGahYbTW/qwJzE37zkfxLIUPHgR/SyLTUlnTICg14ag==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.18.20.tgz", + "integrity": "sha512-bxRHW5kHU38zS2lPTPOyuyTm+S+eobPUnTNkdJEfAddYgEcll4xkT8DB9d2008DtTbl7uJag2HuE5NZAZgnNEA==", "cpu": [ "arm64" ], @@ -152,9 +161,9 @@ } }, "node_modules/@esbuild/darwin-x64": { - "version": "0.17.13", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.17.13.tgz", - "integrity": "sha512-Ku9Db2sblCxFvQdEO7X9nBaLR/S81uch81e2Q2+Os5z1NcnsFjuqhIYH0Gm6KNNpIKaEbC7gCLbiIPbLLMX4Pg==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.18.20.tgz", + "integrity": "sha512-pc5gxlMDxzm513qPGbCbDukOdsGtKhfxD1zJKXjCCcU7ju50O7MeAZ8c4krSJcOIJGFR+qx21yMMVYwiQvyTyQ==", "cpu": [ "x64" ], @@ -168,9 +177,9 @@ } }, "node_modules/@esbuild/freebsd-arm64": { - "version": "0.17.13", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.17.13.tgz", - "integrity": "sha512-t1T5/nIf2j+FdSf1Fa3dcU0cXycr0nK4xJe52qjWa+1I249mM5NBY1ODjiabZxZ0x3CG05y4fd9bxfDLy9kQtA==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.18.20.tgz", + "integrity": "sha512-yqDQHy4QHevpMAaxhhIwYPMv1NECwOvIpGCZkECn8w2WFHXjEwrBn3CeNIYsibZ/iZEUemj++M26W3cNR5h+Tw==", "cpu": [ "arm64" ], @@ -184,9 +193,9 @@ } }, "node_modules/@esbuild/freebsd-x64": { - "version": "0.17.13", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.17.13.tgz", - "integrity": "sha512-/zbkgEO4gY2qGZr9UNAGI38w/FwUY4bx4EC88k9VeiCKNr3ukNgwH/oIgB5Z9/OqpkNLlcS4w9e2d/MIiy5fbw==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.18.20.tgz", + "integrity": "sha512-tgWRPPuQsd3RmBZwarGVHZQvtzfEBOreNuxEMKFcd5DaDn2PbBxfwLcj4+aenoh7ctXcbXmOQIn8HI6mCSw5MQ==", "cpu": [ "x64" ], @@ -200,9 +209,9 @@ } }, "node_modules/@esbuild/linux-arm": { - "version": "0.17.13", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.17.13.tgz", - "integrity": "sha512-RrhjzrCF6aCDH248nUAQoldnRmN7nHMxv85GOj5AH+qkxxYvcig7fnUmgANngntRu4btXhN9WKHMgQ5seERDMw==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.18.20.tgz", + "integrity": "sha512-/5bHkMWnq1EgKr1V+Ybz3s1hWXok7mDFUMQ4cG10AfW3wL02PSZi5kFpYKrptDsgb2WAJIvRcDm+qIvXf/apvg==", "cpu": [ "arm" ], @@ -216,9 +225,9 @@ } }, "node_modules/@esbuild/linux-arm64": { - "version": "0.17.13", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.17.13.tgz", - "integrity": "sha512-siu3QZrQ7eGrSttvFaRKyjT7kNRbUuHEKzCCyqRh19MbpGokGY13jbIsBEjx6JmH3T50hds325oweS9Ey2ihAQ==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.18.20.tgz", + "integrity": "sha512-2YbscF+UL7SQAVIpnWvYwM+3LskyDmPhe31pE7/aoTMFKKzIc9lLbyGUpmmb8a8AixOL61sQ/mFh3jEjHYFvdA==", "cpu": [ "arm64" ], @@ -232,9 +241,9 @@ } }, "node_modules/@esbuild/linux-ia32": { - "version": "0.17.13", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.17.13.tgz", - "integrity": "sha512-ADHA1PqP5gIegehVP0RvxMmNPxpLgetI8QCwYOjUheGXKIKWSdUN8ZS3rusQv3NGZmFCpYdMZzFoI0QtzzGAdw==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.18.20.tgz", + "integrity": "sha512-P4etWwq6IsReT0E1KHU40bOnzMHoH73aXp96Fs8TIT6z9Hu8G6+0SHSw9i2isWrD2nbx2qo5yUqACgdfVGx7TA==", "cpu": [ "ia32" ], @@ -248,9 +257,9 @@ } }, "node_modules/@esbuild/linux-loong64": { - "version": "0.17.13", - "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.17.13.tgz", - "integrity": "sha512-n1JQPxETmR0brkpWlJHeohReEPLH+m00bnJdNnFyHN3zLBt1QypevuZSmnmFWsC+7r7HTwWILj3lBDjtPH3ydg==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.18.20.tgz", + "integrity": "sha512-nXW8nqBTrOpDLPgPY9uV+/1DjxoQ7DoB2N8eocyq8I9XuqJ7BiAMDMf9n1xZM9TgW0J8zrquIb/A7s3BJv7rjg==", "cpu": [ "loong64" ], @@ -264,9 +273,9 @@ } }, "node_modules/@esbuild/linux-mips64el": { - "version": "0.17.13", - "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.17.13.tgz", - "integrity": "sha512-d0pnD/j5KKQ43xtSIvOD+wNIy6D/Vh9GbXVRa3u4zCyiJMYWjxkPkbBzlEgNjdDmUM+5gBFen9k7B8Xscy+Myg==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.18.20.tgz", + "integrity": "sha512-d5NeaXZcHp8PzYy5VnXV3VSd2D328Zb+9dEq5HE6bw6+N86JVPExrA6O68OPwobntbNJ0pzCpUFZTo3w0GyetQ==", "cpu": [ "mips64el" ], @@ -280,9 +289,9 @@ } }, "node_modules/@esbuild/linux-ppc64": { - "version": "0.17.13", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.17.13.tgz", - "integrity": "sha512-C9sMpa/VcGLjVtsT01sXtzZNS7bAZ+icUclkKkiUwBQ9hzT+J+/Xpj+EykI5hB3KgtxQVo4XUahanFoZNxbQ1g==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.18.20.tgz", + "integrity": "sha512-WHPyeScRNcmANnLQkq6AfyXRFr5D6N2sKgkFo2FqguP44Nw2eyDlbTdZwd9GYk98DZG9QItIiTlFLHJHjxP3FA==", "cpu": [ "ppc64" ], @@ -296,9 +305,9 @@ } }, "node_modules/@esbuild/linux-riscv64": { - "version": "0.17.13", - "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.17.13.tgz", - "integrity": "sha512-jYkc5EpNpvjccAHNYekiAtklusVGWftR0VVLtng7dJzDyy+5adAsf1fOG3LllP0WALxS55/w6boLE/728J/bXw==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.18.20.tgz", + "integrity": "sha512-WSxo6h5ecI5XH34KC7w5veNnKkju3zBRLEQNY7mv5mtBmrP/MjNBCAlsM2u5hDBlS3NGcTQpoBvRzqBcRtpq1A==", "cpu": [ "riscv64" ], @@ -312,9 +321,9 @@ } }, "node_modules/@esbuild/linux-s390x": { - "version": "0.17.13", - "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.17.13.tgz", - "integrity": "sha512-4jAJI5O6E/hATL4lsrG2A+noDjZ377KlATVFKwV3SWaNHj+OvoXe/T84ScQIXEtPI7ndJyLkMYruXj8RR5Ilyw==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.18.20.tgz", + "integrity": "sha512-+8231GMs3mAEth6Ja1iK0a1sQ3ohfcpzpRLH8uuc5/KVDFneH6jtAJLFGafpzpMRO6DzJ6AvXKze9LfFMrIHVQ==", "cpu": [ "s390x" ], @@ -328,9 +337,9 @@ } }, "node_modules/@esbuild/linux-x64": { - "version": "0.17.13", - "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.17.13.tgz", - "integrity": "sha512-eFLQhJq98qijGRcv9je/9M4Mz1suZ+pOtj62ArsLd0gubNGhhQDz6T30X2X3f1KZ8lkKkr+zN5vtZzx1GAMoFw==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.18.20.tgz", + "integrity": "sha512-UYqiqemphJcNsFEskc73jQ7B9jgwjWrSayxawS6UVFZGWrAAtkzjxSqnoclCXxWtfwLdzU+vTpcNYhpn43uP1w==", "cpu": [ "x64" ], @@ -344,9 +353,9 @@ } }, "node_modules/@esbuild/netbsd-x64": { - "version": "0.17.13", - "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.17.13.tgz", - "integrity": "sha512-F8PXDeT+3eQpPjf4bmNJapPLu0SKKlWRGPQvBQqVS+YDGoMKnyyYp2UENLFMV8zT7kS39zKxZRZvUL3fMz/7Ww==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.18.20.tgz", + "integrity": "sha512-iO1c++VP6xUBUmltHZoMtCUdPlnPGdBom6IrO4gyKPFFVBKioIImVooR5I83nTew5UOYrk3gIJhbZh8X44y06A==", "cpu": [ "x64" ], @@ -360,9 +369,9 @@ } }, "node_modules/@esbuild/openbsd-x64": { - "version": "0.17.13", - "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.17.13.tgz", - "integrity": "sha512-9jWfzbFCnIZdHjNs+00KQHArUbp7kjQDNmiuqkwGOQFs67m4/dKNupBv2DP5hTqVlQY4tW4RG3qpb6Y3zOHJeA==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.18.20.tgz", + "integrity": "sha512-e5e4YSsuQfX4cxcygw/UCPIEP6wbIL+se3sxPdCiMbFLBWu0eiZOJ7WoD+ptCLrmjZBK1Wk7I6D/I3NglUGOxg==", "cpu": [ "x64" ], @@ -376,9 +385,9 @@ } }, "node_modules/@esbuild/sunos-x64": { - "version": "0.17.13", - "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.17.13.tgz", - "integrity": "sha512-ALbOMlTIBkAVi6KqYjONa7u2oH95RN7OpetFqMtjufFLBiSaayRuwUzhs2yuR9CfGT4qi0jv6HQDav+EG314TQ==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.18.20.tgz", + "integrity": "sha512-kDbFRFp0YpTQVVrqUd5FTYmWo45zGaXe0X8E1G/LKFC0v8x0vWrhOWSLITcCn63lmZIxfOMXtCfti/RxN/0wnQ==", "cpu": [ "x64" ], @@ -392,9 +401,9 @@ } }, "node_modules/@esbuild/win32-arm64": { - "version": "0.17.13", - "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.17.13.tgz", - "integrity": "sha512-FJBLYL4PkrZGeuHzEqme+0DjNetxkJ+XbB+Aoeow7aQ53JCwsA0/mo8sS5aPkDHgCnMkN4A5GLoFTlDj3BKDrQ==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.18.20.tgz", + "integrity": "sha512-ddYFR6ItYgoaq4v4JmQQaAI5s7npztfV4Ag6NrhiaW0RrnOXqBkgwZLofVTlq1daVTQNhtI5oieTvkRPfZrePg==", "cpu": [ "arm64" ], @@ -408,9 +417,9 @@ } }, "node_modules/@esbuild/win32-ia32": { - "version": "0.17.13", - "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.17.13.tgz", - "integrity": "sha512-Qrvst9RkLz4qgi3hqswNliYuKW92/HGJnd7xLWkGaGPa8S4qsONf81FW0ebDc5iUHb0I7QJwQATutvghTabnFA==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.18.20.tgz", + "integrity": "sha512-Wv7QBi3ID/rROT08SABTS7eV4hX26sVduqDOTe1MvGMjNd3EjOz4b7zeexIR62GTIEKrfJXKL9LFxTYgkyeu7g==", "cpu": [ "ia32" ], @@ -424,9 +433,9 @@ } }, "node_modules/@esbuild/win32-x64": { - "version": "0.17.13", - "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.17.13.tgz", - "integrity": "sha512-pZ/NIgz861XaUPlIkPFjP55nJ4PJa0o/CD4zgeRb1Q9FVE+8GvdB6ifJcK05jRhny5hKExhnRFIdgHmmCYH8vg==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.18.20.tgz", + "integrity": "sha512-kTdfRcSiDfQca/y9QIkng02avJ+NCaQvrMejlsB3RRv5sE9rRoeBPISaZpKxHELzRxZyLvNts1P27W3wV+8geQ==", "cpu": [ "x64" ], @@ -455,23 +464,23 @@ } }, "node_modules/@eslint-community/regexpp": { - "version": "4.4.1", - "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.4.1.tgz", - "integrity": "sha512-BISJ6ZE4xQsuL/FmsyRaiffpq977bMlsKfGHTQrOGFErfByxIe6iZTxPf/00Zon9b9a7iUykfQwejN3s2ZW/Bw==", + "version": "4.10.0", + "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.10.0.tgz", + "integrity": "sha512-Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA==", "dev": true, "engines": { "node": "^12.0.0 || ^14.0.0 || >=16.0.0" } }, "node_modules/@eslint/eslintrc": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.0.1.tgz", - "integrity": "sha512-eFRmABvW2E5Ho6f5fHLqgena46rOj7r7OKHYfLElqcBfGFHHpjBhivyi5+jOEQuSpdc/1phIZJlbC2te+tZNIw==", + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.3.tgz", + "integrity": "sha512-yZzuIG+jnVu6hNSzFEN07e8BxF3uAzYtQb6uDkaYZLo6oYZDCq454c5kB8zxnzfCYyP4MIuyBn10L0DqwujTmA==", "dev": true, "dependencies": { "ajv": "^6.12.4", "debug": "^4.3.2", - "espree": "^9.5.0", + "espree": "^9.6.0", "globals": "^13.19.0", "ignore": "^5.2.0", "import-fresh": "^3.2.1", @@ -487,21 +496,21 @@ } }, "node_modules/@eslint/js": { - "version": "8.36.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.36.0.tgz", - "integrity": "sha512-lxJ9R5ygVm8ZWgYdUweoq5ownDlJ4upvoWmO4eLxBYHdMo+vZ/Rx0EN6MbKWDJOSUGrqJy2Gt+Dyv/VKml0fjg==", + "version": "8.54.0", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.54.0.tgz", + "integrity": "sha512-ut5V+D+fOoWPgGGNj83GGjnntO39xDy6DWxO0wb7Jp3DcMX0TfIqdzHF85VTQkerdyGmuuMD9AKAo5KiNlf/AQ==", "dev": true, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" } }, "node_modules/@humanwhocodes/config-array": { - "version": "0.11.8", - "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.8.tgz", - "integrity": "sha512-UybHIJzJnR5Qc/MsD9Kr+RpO2h+/P1GhOwdiLPXK5TWk5sgTdu88bTD9UP+CKbPPh5Rni1u0GjAdYQLemG8g+g==", + "version": "0.11.13", + "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.13.tgz", + "integrity": "sha512-JSBDMiDKSzQVngfRjOdFXgFfklaXI4K9nLF49Auh21lmBWRLIK3+xTErTWD4KU54pb6coM6ESE7Awz/FNU3zgQ==", "dev": true, "dependencies": { - "@humanwhocodes/object-schema": "^1.2.1", + "@humanwhocodes/object-schema": "^2.0.1", "debug": "^4.1.1", "minimatch": "^3.0.5" }, @@ -523,15 +532,15 @@ } }, "node_modules/@humanwhocodes/object-schema": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz", - "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.1.tgz", + "integrity": "sha512-dvuCeX5fC9dXgJn9t+X5atfmgQAzUOWqS1254Gh0m6i8wKd10ebXkfNKiRK+1GWi/yTvvLDHpoxLr0xxxeslWw==", "dev": true }, "node_modules/@jridgewell/gen-mapping": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz", - "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==", + "version": "0.3.3", + "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz", + "integrity": "sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==", "dev": true, "dependencies": { "@jridgewell/set-array": "^1.0.1", @@ -543,9 +552,9 @@ } }, "node_modules/@jridgewell/resolve-uri": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz", - "integrity": "sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz", + "integrity": "sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA==", "dev": true, "engines": { "node": ">=6.0.0" @@ -561,25 +570,25 @@ } }, "node_modules/@jridgewell/sourcemap-codec": { - "version": "1.4.14", - "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz", - "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==", + "version": "1.4.15", + "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz", + "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==", "dev": true }, "node_modules/@jridgewell/trace-mapping": { - "version": "0.3.17", - "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.17.tgz", - "integrity": "sha512-MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g==", + "version": "0.3.20", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.20.tgz", + "integrity": "sha512-R8LcPeWZol2zR8mmH3JeKQ6QRCFb7XgUhV9ZlGhHLGyg4wpPiPZNQOOWhFZhxKw8u//yTbNGI42Bx/3paXEQ+Q==", "dev": true, "dependencies": { - "@jridgewell/resolve-uri": "3.1.0", - "@jridgewell/sourcemap-codec": "1.4.14" + "@jridgewell/resolve-uri": "^3.1.0", + "@jridgewell/sourcemap-codec": "^1.4.14" } }, "node_modules/@jsdoc/salty": { - "version": "0.2.5", - "resolved": "https://registry.npmjs.org/@jsdoc/salty/-/salty-0.2.5.tgz", - "integrity": "sha512-TfRP53RqunNe2HBobVBJ0VLhK1HbfvBYeTC1ahnN64PWvyYyGebmMiPkuwvD9fpw2ZbkoPb8Q7mwy0aR8Z9rvw==", + "version": "0.2.6", + "resolved": "https://registry.npmjs.org/@jsdoc/salty/-/salty-0.2.6.tgz", + "integrity": "sha512-aA+awb5yoml8TQ3CzI5Ue7sM3VMRC4l1zJJW4fgZ8OCL1wshJZhNzaf0PL85DSnOUw6QuFgeHGD/eq/xwwAF2g==", "dev": true, "dependencies": { "lodash": "^4.17.21" @@ -624,27 +633,27 @@ } }, "node_modules/@polka/url": { - "version": "1.0.0-next.21", - "resolved": "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.21.tgz", - "integrity": "sha512-a5Sab1C4/icpTZVzZc5Ghpz88yQtGOyNqYXcZgOssB2uuAr+wF/MvN6bgtW32q7HHrvBki+BsZ0OuNv6EV3K9g==", + "version": "1.0.0-next.23", + "resolved": "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.23.tgz", + "integrity": "sha512-C16M+IYz0rgRhWZdCmK+h58JMv8vijAA61gmz2rspCSwKwzBebpdcsiUmwrtJRdphuY30i6BSLEOP8ppbNLyLg==", "dev": true }, "node_modules/@raylib/api": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/@raylib/api/-/api-4.5.0.tgz", - "integrity": "sha512-T2jRHIHV2QNERbqgZFPkRGtyAnLDXSd3jOEV7SKIORcHp40k4W/pbqbscIsdF+LfC3e9dmilgNTRRGkJafo3Tg==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/@raylib/api/-/api-5.0.0.tgz", + "integrity": "sha512-zpPsQqfurgHLf+W4kdsYNSs5RoOgs4x8YkmjDQ5ZsXUT8lPDDTekoryBf5W9pqlK5P9oXdP2AIrortx2JvzEtw==", "dev": true }, "node_modules/@types/chai": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.3.4.tgz", - "integrity": "sha512-KnRanxnpfpjUTqTCXslZSEdLfXExwgNxYPdiO2WGUj8+HDjFi8R3k5RVKPeSCzLjCcshCAtVO2QBbVuAV4kTnw==", + "version": "4.3.10", + "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.3.10.tgz", + "integrity": "sha512-of+ICnbqjmFCiixUnqRulbylyXQrPqIGf/B3Jax1wIF3DvSheysQxAWvqHhZiW3IQrycvokcLcFQlveGp+vyNg==", "dev": true }, "node_modules/@types/chai-subset": { - "version": "1.3.3", - "resolved": "https://registry.npmjs.org/@types/chai-subset/-/chai-subset-1.3.3.tgz", - "integrity": "sha512-frBecisrNGz+F4T6bcc+NLeolfiojh5FxW2klu669+8BARtyQv2C/GkNW6FUodVe4BroGMP/wER/YDGc7rEllw==", + "version": "1.3.5", + "resolved": "https://registry.npmjs.org/@types/chai-subset/-/chai-subset-1.3.5.tgz", + "integrity": "sha512-c2mPnw+xHtXDoHmdtcCXGwyLMiauiAyxWMzhGpqHC4nqI/Y5G2XhTampslK2rb59kpcuHon03UH8W6iYUzw88A==", "dev": true, "dependencies": { "@types/chai": "*" @@ -657,9 +666,9 @@ "dev": true }, "node_modules/@types/linkify-it": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/@types/linkify-it/-/linkify-it-3.0.2.tgz", - "integrity": "sha512-HZQYqbiFVWufzCwexrvh694SOim8z2d+xJl5UNamcvQFejLY/2YUtzXHYi3cHdI7PMlS8ejH2slRAOJQ32aNbA==", + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/@types/linkify-it/-/linkify-it-3.0.5.tgz", + "integrity": "sha512-yg6E+u0/+Zjva+buc3EIb+29XEg4wltq7cSmd4Uc2EE/1nUVmxyzpX6gUXD0V8jIrG0r7YeOGVIbYRkxeooCtw==", "dev": true }, "node_modules/@types/markdown-it": { @@ -673,35 +682,44 @@ } }, "node_modules/@types/mdurl": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/@types/mdurl/-/mdurl-1.0.2.tgz", - "integrity": "sha512-eC4U9MlIcu2q0KQmXszyn5Akca/0jrQmwDRgpAMJai7qBWq4amIQhZyNau4VYGtCeALvW1/NtjzJJ567aZxfKA==", + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/@types/mdurl/-/mdurl-1.0.5.tgz", + "integrity": "sha512-6L6VymKTzYSrEf4Nev4Xa1LCHKrlTlYCBMTlQKFuddo1CvQcE52I0mwfOJayueUC7MJuXOeHTcIU683lzd0cUA==", "dev": true }, "node_modules/@types/node": { - "version": "18.15.10", - "resolved": "https://registry.npmjs.org/@types/node/-/node-18.15.10.tgz", - "integrity": "sha512-9avDaQJczATcXgfmMAW3MIWArOO7A+m90vuCFLr8AotWf8igO/mRoYukrk2cqZVtv38tHs33retzHEilM7FpeQ==", + "version": "20.9.2", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.9.2.tgz", + "integrity": "sha512-WHZXKFCEyIUJzAwh3NyyTHYSR35SevJ6mZ1nWwJafKtiQbqRTIKSRcw3Ma3acqgsent3RRDqeVwpHntMk+9irg==", + "dev": true, + "dependencies": { + "undici-types": "~5.26.4" + } + }, + "node_modules/@ungap/structured-clone": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz", + "integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==", "dev": true }, "node_modules/@vitest/expect": { - "version": "0.29.7", - "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-0.29.7.tgz", - "integrity": "sha512-UtG0tW0DP6b3N8aw7PHmweKDsvPv4wjGvrVZW7OSxaFg76ShtVdMiMcUkZJgCE8QWUmhwaM0aQhbbVLo4F4pkA==", + "version": "0.29.8", + "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-0.29.8.tgz", + "integrity": "sha512-xlcVXn5I5oTq6NiZSY3ykyWixBxr5mG8HYtjvpgg6KaqHm0mvhX18xuwl5YGxIRNt/A5jidd7CWcNHrSvgaQqQ==", "dev": true, "dependencies": { - "@vitest/spy": "0.29.7", - "@vitest/utils": "0.29.7", + "@vitest/spy": "0.29.8", + "@vitest/utils": "0.29.8", "chai": "^4.3.7" } }, "node_modules/@vitest/runner": { - "version": "0.29.7", - "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-0.29.7.tgz", - "integrity": "sha512-Yt0+csM945+odOx4rjZSjibQfl2ymxqVsmYz6sO2fiO5RGPYDFCo60JF6tLL9pz4G/kjY4irUxadeB1XT+H1jg==", + "version": "0.29.8", + "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-0.29.8.tgz", + "integrity": "sha512-FzdhnRDwEr/A3Oo1jtIk/B952BBvP32n1ObMEb23oEJNO+qO5cBet6M2XWIDQmA7BDKGKvmhUf2naXyp/2JEwQ==", "dev": true, "dependencies": { - "@vitest/utils": "0.29.7", + "@vitest/utils": "0.29.8", "p-limit": "^4.0.0", "pathe": "^1.1.0" } @@ -734,18 +752,18 @@ } }, "node_modules/@vitest/spy": { - "version": "0.29.7", - "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-0.29.7.tgz", - "integrity": "sha512-IalL0iO6A6Xz8hthR8sctk6ZS//zVBX48EiNwQguYACdgdei9ZhwMaBFV70mpmeYAFCRAm+DpoFHM5470Im78A==", + "version": "0.29.8", + "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-0.29.8.tgz", + "integrity": "sha512-VdjBe9w34vOMl5I5mYEzNX8inTxrZ+tYUVk9jxaZJmHFwmDFC/GV3KBFTA/JKswr3XHvZL+FE/yq5EVhb6pSAw==", "dev": true, "dependencies": { "tinyspy": "^1.0.2" } }, "node_modules/@vitest/ui": { - "version": "0.29.7", - "resolved": "https://registry.npmjs.org/@vitest/ui/-/ui-0.29.7.tgz", - "integrity": "sha512-KeOztcAldlFU5i8DKCQcmGrih1dVowurZy/9iPz5JyQdPJzej+nW1nI4nYvc4ZmUtA8+IAe9uViqnU7IXc1RNw==", + "version": "0.29.8", + "resolved": "https://registry.npmjs.org/@vitest/ui/-/ui-0.29.8.tgz", + "integrity": "sha512-+vbLd+c1R/XUWfzJsWeyjeiw13fwJ95I5tguxaqXRg61y9iYUKesVljg7Pttp2uo7VK+kAjvY91J41NZ1Vx3vg==", "dev": true, "dependencies": { "fast-glob": "^3.2.12", @@ -756,9 +774,9 @@ } }, "node_modules/@vitest/utils": { - "version": "0.29.7", - "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-0.29.7.tgz", - "integrity": "sha512-vNgGadp2eE5XKCXtZXL5UyNEDn68npSct75OC9AlELenSK0DiV1Mb9tfkwJHKjRb69iek+e79iipoJx8+s3SdA==", + "version": "0.29.8", + "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-0.29.8.tgz", + "integrity": "sha512-qGzuf3vrTbnoY+RjjVVIBYfuWMjn3UMUqyQtdGNZ6ZIIyte7B37exj6LaVkrZiUTvzSadVvO/tJm8AEgbGCBPg==", "dev": true, "dependencies": { "cli-truncate": "^3.1.0", @@ -768,9 +786,9 @@ } }, "node_modules/acorn": { - "version": "8.8.2", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.2.tgz", - "integrity": "sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==", + "version": "8.11.2", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.11.2.tgz", + "integrity": "sha512-nc0Axzp/0FILLEVsm4fNwLCwMttvhEI263QtVPQcbpfZZ3ts0hLsZGOpE6czNlid7CJ9MlyH8reXkpsf3YUY4w==", "dev": true, "bin": { "acorn": "bin/acorn" @@ -789,9 +807,9 @@ } }, "node_modules/acorn-walk": { - "version": "8.2.0", - "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz", - "integrity": "sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==", + "version": "8.3.0", + "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.0.tgz", + "integrity": "sha512-FS7hV565M5l1R08MXqo8odwMTB02C2UqzB17RVgu9EyuYFBqJZ3/ZY97sQD5FewVu1UyDFc1yztUDrAwT0EypA==", "dev": true, "engines": { "node": ">=0.4.0" @@ -871,16 +889,16 @@ } }, "node_modules/archiver": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/archiver/-/archiver-5.3.1.tgz", - "integrity": "sha512-8KyabkmbYrH+9ibcTScQ1xCJC/CGcugdVIwB+53f5sZziXgwUh3iXlAlANMxcZyDEfTHMe6+Z5FofV8nopXP7w==", + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/archiver/-/archiver-5.3.2.tgz", + "integrity": "sha512-+25nxyyznAXF7Nef3y0EbBeqmGZgeN/BxHX29Rs39djAfaFalmQ89SE6CWyDCHzGL0yt/ycBtNOmGTW0FyGWNw==", "dev": true, "dependencies": { "archiver-utils": "^2.1.0", - "async": "^3.2.3", + "async": "^3.2.4", "buffer-crc32": "^0.2.1", "readable-stream": "^3.6.0", - "readdir-glob": "^1.0.0", + "readdir-glob": "^1.1.2", "tar-stream": "^2.2.0", "zip-stream": "^4.1.0" }, @@ -909,6 +927,12 @@ "node": ">= 6" } }, + "node_modules/archiver-utils/node_modules/isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==", + "dev": true + }, "node_modules/archiver-utils/node_modules/readable-stream": { "version": "2.3.8", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz", @@ -968,15 +992,15 @@ } }, "node_modules/array-includes": { - "version": "3.1.6", - "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.6.tgz", - "integrity": "sha512-sgTbLvL6cNnw24FnbaDyjmvddQ2ML8arZsgaJhoABMoplz/4QRhtrYS+alr1BUM1Bwp6dhx8vVCBSLG+StwOFw==", + "version": "3.1.7", + "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.7.tgz", + "integrity": "sha512-dlcsNBIiWhPkHdOEEKnehA+RNUWDc4UqFtnIXU4uuYDPtA4LDkr7qip2p0VvFAEXNDr0yWZ9PJyIRiGjRLQzwQ==", "dev": true, "dependencies": { "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4", - "get-intrinsic": "^1.1.3", + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1", + "get-intrinsic": "^1.2.1", "is-string": "^1.0.7" }, "engines": { @@ -995,15 +1019,34 @@ "node": ">=8" } }, + "node_modules/array.prototype.findlastindex": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.3.tgz", + "integrity": "sha512-LzLoiOMAxvy+Gd3BAq3B7VeIgPdo+Q8hthvKtXybMvRV0jrXfJM/t8mw7nNlpEcVlVUnCnM2KSX4XU5HmpodOA==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1", + "es-shim-unscopables": "^1.0.0", + "get-intrinsic": "^1.2.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/array.prototype.flat": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.1.tgz", - "integrity": "sha512-roTU0KWIOmJ4DRLmwKd19Otg0/mT3qPNt0Qb3GWW8iObuZXxrjB/pzn0R3hqpRSWg4HCwqx+0vwOnWnvlOyeIA==", + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.2.tgz", + "integrity": "sha512-djYB+Zx2vLewY8RWlNCUdHjDXs2XOgm602S9E7P/UpHgfeHL00cRiIF+IN/G/aUJ7kGPb6yO/ErDI5V2s8iycA==", "dev": true, "dependencies": { "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4", + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1", "es-shim-unscopables": "^1.0.0" }, "engines": { @@ -1014,14 +1057,14 @@ } }, "node_modules/array.prototype.flatmap": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.1.tgz", - "integrity": "sha512-8UGn9O1FDVvMNB0UlLv4voxRMze7+FpHyF5mSMRjWHUMlpoDViniy05870VlxhfgTnLbpuwTzvD76MTtWxB/mQ==", + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.2.tgz", + "integrity": "sha512-Ewyx0c9PmpcsByhSW4r+9zDU7sGjFc86qf/kKtuSCRdhfbk0SNLLkaT5qvcHnRGgc5NP/ly/y+qkXkqONX54CQ==", "dev": true, "dependencies": { "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4", + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1", "es-shim-unscopables": "^1.0.0" }, "engines": { @@ -1032,16 +1075,37 @@ } }, "node_modules/array.prototype.tosorted": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/array.prototype.tosorted/-/array.prototype.tosorted-1.1.1.tgz", - "integrity": "sha512-pZYPXPRl2PqWcsUs6LOMn+1f1532nEoPTYowBtqLwAW+W8vSVhkIGnmOX1t/UQjD6YGI0vcD2B1U7ZFGQH9jnQ==", + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/array.prototype.tosorted/-/array.prototype.tosorted-1.1.2.tgz", + "integrity": "sha512-HuQCHOlk1Weat5jzStICBCd83NxiIMwqDg/dHEsoefabn/hJRj5pVdWcPUSpRrwhwxZOsQassMpgN/xRYFBMIg==", "dev": true, "dependencies": { "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4", + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1", "es-shim-unscopables": "^1.0.0", - "get-intrinsic": "^1.1.3" + "get-intrinsic": "^1.2.1" + } + }, + "node_modules/arraybuffer.prototype.slice": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.2.tgz", + "integrity": "sha512-yMBKppFur/fbHu9/6USUe03bZ4knMYiwFBcyiaXB8Go0qNehwX6inYPzK9U0NeQvGxKthcmHcaR8P5MStSRBAw==", + "dev": true, + "dependencies": { + "array-buffer-byte-length": "^1.0.0", + "call-bind": "^1.0.2", + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1", + "get-intrinsic": "^1.2.1", + "is-array-buffer": "^3.0.2", + "is-shared-array-buffer": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, "node_modules/assertion-error": { @@ -1054,11 +1118,20 @@ } }, "node_modules/async": { - "version": "3.2.4", - "resolved": "https://registry.npmjs.org/async/-/async-3.2.4.tgz", - "integrity": "sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ==", + "version": "3.2.5", + "resolved": "https://registry.npmjs.org/async/-/async-3.2.5.tgz", + "integrity": "sha512-baNZyqaaLhyLVKm/DlvdW051MSgO6b8eVfIezl9E5PqWxFgzLm/wQntEW4zOytVburDEr0JlALEpdOFwvErLsg==", "dev": true }, + "node_modules/asynciterator.prototype": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/asynciterator.prototype/-/asynciterator.prototype-1.0.0.tgz", + "integrity": "sha512-wwHYEIS0Q80f5mosx3L/dfG5t5rjEa9Ft51GTaNt862EnpyGHpgz2RkZvLPp1oF5TnAiTohkEKVEu8pQPJI7Vg==", + "dev": true, + "dependencies": { + "has-symbols": "^1.0.3" + } + }, "node_modules/at-least-node": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz", @@ -1220,13 +1293,14 @@ } }, "node_modules/call-bind": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz", - "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==", + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.5.tgz", + "integrity": "sha512-C3nQxfFZxFRVoJoGKKI8y3MOEo129NQ+FgQ08iye+Mk4zNZZGdjfs06bVTr+DBSlA66Q2VEcMki/cUCP4SercQ==", "dev": true, "dependencies": { - "function-bind": "^1.1.1", - "get-intrinsic": "^1.0.2" + "function-bind": "^1.1.2", + "get-intrinsic": "^1.2.1", + "set-function-length": "^1.1.1" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -1254,18 +1328,18 @@ } }, "node_modules/chai": { - "version": "4.3.7", - "resolved": "https://registry.npmjs.org/chai/-/chai-4.3.7.tgz", - "integrity": "sha512-HLnAzZ2iupm25PlN0xFreAlBA5zaBSv3og0DdeGA4Ar6h6rJ3A0rolRUKJhSF2V10GZKDgWF/VmAEsNWjCRB+A==", + "version": "4.3.10", + "resolved": "https://registry.npmjs.org/chai/-/chai-4.3.10.tgz", + "integrity": "sha512-0UXG04VuVbruMUYbJ6JctvH0YnC/4q3/AkT18q4NaITo91CUm0liMS9VqzT9vZhVQ/1eqPanMWjBM+Juhfb/9g==", "dev": true, "dependencies": { "assertion-error": "^1.1.0", - "check-error": "^1.0.2", - "deep-eql": "^4.1.2", - "get-func-name": "^2.0.0", - "loupe": "^2.3.1", + "check-error": "^1.0.3", + "deep-eql": "^4.1.3", + "get-func-name": "^2.0.2", + "loupe": "^2.3.6", "pathval": "^1.1.1", - "type-detect": "^4.0.5" + "type-detect": "^4.0.8" }, "engines": { "node": ">=4" @@ -1288,10 +1362,13 @@ } }, "node_modules/check-error": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz", - "integrity": "sha512-BrgHpW9NURQgzoNyjfq0Wu6VFO6D7IZEmJNdtgNqpzGG8RuNFHt2jQxWlAs4HMe119chBnv+34syEZtc6IhLtA==", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.3.tgz", + "integrity": "sha512-iKEoDYaRmd1mxM90a2OEfWhjsjPpYPuQ+lMYsoxB126+t8fw7ySEO48nmDg5COTjxDI65/Y2OWpeEHk3ZOe8zg==", "dev": true, + "dependencies": { + "get-func-name": "^2.0.2" + }, "engines": { "node": "*" } @@ -1318,65 +1395,44 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/cli-truncate/node_modules/ansi-regex": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", - "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", + "node_modules/cliui": { + "version": "7.0.4", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz", + "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==", "dev": true, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/ansi-regex?sponsor=1" + "dependencies": { + "string-width": "^4.2.0", + "strip-ansi": "^6.0.0", + "wrap-ansi": "^7.0.0" } }, - "node_modules/cli-truncate/node_modules/emoji-regex": { - "version": "9.2.2", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", - "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==", + "node_modules/cliui/node_modules/emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", "dev": true }, - "node_modules/cli-truncate/node_modules/string-width": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz", - "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==", + "node_modules/cliui/node_modules/is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", "dev": true, - "dependencies": { - "eastasianwidth": "^0.2.0", - "emoji-regex": "^9.2.2", - "strip-ansi": "^7.0.1" - }, "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "node": ">=8" } }, - "node_modules/cli-truncate/node_modules/strip-ansi": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.0.1.tgz", - "integrity": "sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw==", + "node_modules/cliui/node_modules/string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", "dev": true, "dependencies": { - "ansi-regex": "^6.0.1" + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" }, "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/strip-ansi?sponsor=1" - } - }, - "node_modules/cliui": { - "version": "7.0.4", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz", - "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==", - "dev": true, - "dependencies": { - "string-width": "^4.2.0", - "strip-ansi": "^6.0.0", - "wrap-ansi": "^7.0.0" + "node": ">=8" } }, "node_modules/collect-all": { @@ -1508,9 +1564,9 @@ } }, "node_modules/compress-commons": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/compress-commons/-/compress-commons-4.1.1.tgz", - "integrity": "sha512-QLdDLCKNV2dtoTorqgxngQCMA+gWXkM/Nwu7FpeBhk/RdkzimqC3jueb/FDmaZeXh+uby1jkBqE3xArsLBE5wQ==", + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/compress-commons/-/compress-commons-4.1.2.tgz", + "integrity": "sha512-D3uMHtGc/fcO1Gt1/L7i1e33VOvD4A9hfQLP+6ewd+BvG/gQ84Yh4oftEhAdjSMgBgwGL+jsppT7JYNpo6MHHg==", "dev": true, "dependencies": { "buffer-crc32": "^0.2.13", @@ -1565,9 +1621,9 @@ } }, "node_modules/crc32-stream": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/crc32-stream/-/crc32-stream-4.0.2.tgz", - "integrity": "sha512-DxFZ/Hk473b/muq1VJ///PMNLj0ZMnzye9thBpmjpJKCc5eMgB95aK8zCGrGfQ90cWo561Te6HK9D+j4KPdM6w==", + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/crc32-stream/-/crc32-stream-4.0.3.tgz", + "integrity": "sha512-NT7w2JVU7DFroFdYkeq8cywxrgjPHWkdX1wjpRQXPX5Asews3tA+Ght6lddQO5Mkumffp3X7GEqku3epj2toIw==", "dev": true, "dependencies": { "crc-32": "^1.2.0", @@ -1578,11 +1634,11 @@ } }, "node_modules/cross-fetch": { - "version": "3.1.5", - "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.5.tgz", - "integrity": "sha512-lvb1SBsI0Z7GDwmuid+mU3kWVBwTVUbe7S0H52yaaAdQOXq2YktTCZdlAcNKFzE6QtRz0snpw9bNiPeOIkkQvw==", + "version": "3.1.8", + "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.8.tgz", + "integrity": "sha512-cvA+JwZoU0Xq+h6WkMvAUqPEYy92Obet6UdKLfW60qn99ftItKjB5T+BkyWOFWe2pUyfQ+IJHmpOTznqk1M6Kg==", "dependencies": { - "node-fetch": "2.6.7" + "node-fetch": "^2.6.12" } }, "node_modules/cross-spawn": { @@ -1658,12 +1714,27 @@ "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==", "dev": true }, + "node_modules/define-data-property": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.1.tgz", + "integrity": "sha512-E7uGkTzkk1d0ByLeSc6ZsFS79Axg+m1P/VsgYsxHgiuc3tFSj+MjMIwe90FC4lOAZzNBdY7kkO2P2wKdsQ1vgQ==", + "dev": true, + "dependencies": { + "get-intrinsic": "^1.2.1", + "gopd": "^1.0.1", + "has-property-descriptors": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/define-properties": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.0.tgz", - "integrity": "sha512-xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA==", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.1.tgz", + "integrity": "sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==", "dev": true, "dependencies": { + "define-data-property": "^1.0.1", "has-property-descriptors": "^1.0.0", "object-keys": "^1.1.1" }, @@ -1675,9 +1746,9 @@ } }, "node_modules/detect-libc": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.1.tgz", - "integrity": "sha512-463v3ZeIrcWtdgIg6vI6XUncguvr2TnGl4SzDXinkt9mSLpBJKXT3mW6xT3VQdDN11+WVs29pgvivTc4Lp8v+w==", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.2.tgz", + "integrity": "sha512-UX6sGumvvqSaXgdKGUsgZWqcUyIXZ/vZTrlRT/iobiKhGL0zL4d3osHj3uqllWJK+i+sixDS/3COVEOFbupFyw==", "dev": true, "engines": { "node": ">=8" @@ -1746,9 +1817,9 @@ "dev": true }, "node_modules/emoji-regex": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "version": "9.2.2", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", + "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==", "dev": true }, "node_modules/end-of-stream": { @@ -1779,25 +1850,26 @@ } }, "node_modules/es-abstract": { - "version": "1.21.2", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.21.2.tgz", - "integrity": "sha512-y/B5POM2iBnIxCiernH1G7rC9qQoM77lLIMQLuob0zhp8C56Po81+2Nj0WFKnd0pNReDTnkYryc+zhOzpEIROg==", + "version": "1.22.3", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.22.3.tgz", + "integrity": "sha512-eiiY8HQeYfYH2Con2berK+To6GrK2RxbPawDkGq4UiCQQfZHb6wX9qQqkbpPqaxQFcl8d9QzZqo0tGE0VcrdwA==", "dev": true, "dependencies": { "array-buffer-byte-length": "^1.0.0", + "arraybuffer.prototype.slice": "^1.0.2", "available-typed-arrays": "^1.0.5", - "call-bind": "^1.0.2", + "call-bind": "^1.0.5", "es-set-tostringtag": "^2.0.1", "es-to-primitive": "^1.2.1", - "function.prototype.name": "^1.1.5", - "get-intrinsic": "^1.2.0", + "function.prototype.name": "^1.1.6", + "get-intrinsic": "^1.2.2", "get-symbol-description": "^1.0.0", "globalthis": "^1.0.3", "gopd": "^1.0.1", - "has": "^1.0.3", "has-property-descriptors": "^1.0.0", "has-proto": "^1.0.1", "has-symbols": "^1.0.3", + "hasown": "^2.0.0", "internal-slot": "^1.0.5", "is-array-buffer": "^3.0.2", "is-callable": "^1.2.7", @@ -1805,19 +1877,23 @@ "is-regex": "^1.1.4", "is-shared-array-buffer": "^1.0.2", "is-string": "^1.0.7", - "is-typed-array": "^1.1.10", + "is-typed-array": "^1.1.12", "is-weakref": "^1.0.2", - "object-inspect": "^1.12.3", + "object-inspect": "^1.13.1", "object-keys": "^1.1.1", "object.assign": "^4.1.4", - "regexp.prototype.flags": "^1.4.3", + "regexp.prototype.flags": "^1.5.1", + "safe-array-concat": "^1.0.1", "safe-regex-test": "^1.0.0", - "string.prototype.trim": "^1.2.7", - "string.prototype.trimend": "^1.0.6", - "string.prototype.trimstart": "^1.0.6", + "string.prototype.trim": "^1.2.8", + "string.prototype.trimend": "^1.0.7", + "string.prototype.trimstart": "^1.0.7", + "typed-array-buffer": "^1.0.0", + "typed-array-byte-length": "^1.0.0", + "typed-array-byte-offset": "^1.0.0", "typed-array-length": "^1.0.4", "unbox-primitive": "^1.0.2", - "which-typed-array": "^1.1.9" + "which-typed-array": "^1.1.13" }, "engines": { "node": ">= 0.4" @@ -1826,27 +1902,49 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/es-iterator-helpers": { + "version": "1.0.15", + "resolved": "https://registry.npmjs.org/es-iterator-helpers/-/es-iterator-helpers-1.0.15.tgz", + "integrity": "sha512-GhoY8uYqd6iwUl2kgjTm4CZAf6oo5mHK7BPqx3rKgx893YSsy0LGHV6gfqqQvZt/8xM8xeOnfXBCfqclMKkJ5g==", + "dev": true, + "dependencies": { + "asynciterator.prototype": "^1.0.0", + "call-bind": "^1.0.2", + "define-properties": "^1.2.1", + "es-abstract": "^1.22.1", + "es-set-tostringtag": "^2.0.1", + "function-bind": "^1.1.1", + "get-intrinsic": "^1.2.1", + "globalthis": "^1.0.3", + "has-property-descriptors": "^1.0.0", + "has-proto": "^1.0.1", + "has-symbols": "^1.0.3", + "internal-slot": "^1.0.5", + "iterator.prototype": "^1.1.2", + "safe-array-concat": "^1.0.1" + } + }, "node_modules/es-set-tostringtag": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.1.tgz", - "integrity": "sha512-g3OMbtlwY3QewlqAiMLI47KywjWZoEytKr8pf6iTC8uJq5bIAH52Z9pnQ8pVL6whrCto53JZDuUIsifGeLorTg==", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.2.tgz", + "integrity": "sha512-BuDyupZt65P9D2D2vA/zqcI3G5xRsklm5N3xCwuiy+/vKy8i0ifdsQP1sLgO4tZDSCaQUSnmC48khknGMV3D2Q==", "dev": true, "dependencies": { - "get-intrinsic": "^1.1.3", - "has": "^1.0.3", - "has-tostringtag": "^1.0.0" + "get-intrinsic": "^1.2.2", + "has-tostringtag": "^1.0.0", + "hasown": "^2.0.0" }, "engines": { "node": ">= 0.4" } }, "node_modules/es-shim-unscopables": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz", - "integrity": "sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.2.tgz", + "integrity": "sha512-J3yBRXCzDu4ULnQwxyToo/OjdMx6akgVC7K6few0a7F/0wLtmKKN7I73AH5T2836UuXRqN7Qg+IIUw/+YJksRw==", "dev": true, "dependencies": { - "has": "^1.0.3" + "hasown": "^2.0.0" } }, "node_modules/es-to-primitive": { @@ -1867,9 +1965,9 @@ } }, "node_modules/esbuild": { - "version": "0.17.13", - "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.17.13.tgz", - "integrity": "sha512-4ixMwdErBcQHgTBeoxnowENCPKWFAGxgTyKHMK8gqn9sZaC7ZNWFKtim16g2rzQ2b/FYyy3lIUUJboFtjolhqg==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.18.20.tgz", + "integrity": "sha512-ceqxoedUrcayh7Y7ZX6NdbbDzGROiyVBgC4PriJThBKSVPWnnFHZAkfI1lJT8QFkOwH4qOS2SJkS4wvpGl8BpA==", "dev": true, "hasInstallScript": true, "bin": { @@ -1879,28 +1977,28 @@ "node": ">=12" }, "optionalDependencies": { - "@esbuild/android-arm": "0.17.13", - "@esbuild/android-arm64": "0.17.13", - "@esbuild/android-x64": "0.17.13", - "@esbuild/darwin-arm64": "0.17.13", - "@esbuild/darwin-x64": "0.17.13", - "@esbuild/freebsd-arm64": "0.17.13", - "@esbuild/freebsd-x64": "0.17.13", - "@esbuild/linux-arm": "0.17.13", - "@esbuild/linux-arm64": "0.17.13", - "@esbuild/linux-ia32": "0.17.13", - "@esbuild/linux-loong64": "0.17.13", - "@esbuild/linux-mips64el": "0.17.13", - "@esbuild/linux-ppc64": "0.17.13", - "@esbuild/linux-riscv64": "0.17.13", - "@esbuild/linux-s390x": "0.17.13", - "@esbuild/linux-x64": "0.17.13", - "@esbuild/netbsd-x64": "0.17.13", - "@esbuild/openbsd-x64": "0.17.13", - "@esbuild/sunos-x64": "0.17.13", - "@esbuild/win32-arm64": "0.17.13", - "@esbuild/win32-ia32": "0.17.13", - "@esbuild/win32-x64": "0.17.13" + "@esbuild/android-arm": "0.18.20", + "@esbuild/android-arm64": "0.18.20", + "@esbuild/android-x64": "0.18.20", + "@esbuild/darwin-arm64": "0.18.20", + "@esbuild/darwin-x64": "0.18.20", + "@esbuild/freebsd-arm64": "0.18.20", + "@esbuild/freebsd-x64": "0.18.20", + "@esbuild/linux-arm": "0.18.20", + "@esbuild/linux-arm64": "0.18.20", + "@esbuild/linux-ia32": "0.18.20", + "@esbuild/linux-loong64": "0.18.20", + "@esbuild/linux-mips64el": "0.18.20", + "@esbuild/linux-ppc64": "0.18.20", + "@esbuild/linux-riscv64": "0.18.20", + "@esbuild/linux-s390x": "0.18.20", + "@esbuild/linux-x64": "0.18.20", + "@esbuild/netbsd-x64": "0.18.20", + "@esbuild/openbsd-x64": "0.18.20", + "@esbuild/sunos-x64": "0.18.20", + "@esbuild/win32-arm64": "0.18.20", + "@esbuild/win32-ia32": "0.18.20", + "@esbuild/win32-x64": "0.18.20" } }, "node_modules/escalade": { @@ -1922,27 +2020,28 @@ } }, "node_modules/eslint": { - "version": "8.36.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.36.0.tgz", - "integrity": "sha512-Y956lmS7vDqomxlaaQAHVmeb4tNMp2FWIvU/RnU5BD3IKMD/MJPr76xdyr68P8tV1iNMvN2mRK0yy3c+UjL+bw==", + "version": "8.54.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.54.0.tgz", + "integrity": "sha512-NY0DfAkM8BIZDVl6PgSa1ttZbx3xHgJzSNJKYcQglem6CppHyMhRIQkBVSSMaSRnLhig3jsDbEzOjwCVt4AmmA==", "dev": true, "dependencies": { "@eslint-community/eslint-utils": "^4.2.0", - "@eslint-community/regexpp": "^4.4.0", - "@eslint/eslintrc": "^2.0.1", - "@eslint/js": "8.36.0", - "@humanwhocodes/config-array": "^0.11.8", + "@eslint-community/regexpp": "^4.6.1", + "@eslint/eslintrc": "^2.1.3", + "@eslint/js": "8.54.0", + "@humanwhocodes/config-array": "^0.11.13", "@humanwhocodes/module-importer": "^1.0.1", "@nodelib/fs.walk": "^1.2.8", - "ajv": "^6.10.0", + "@ungap/structured-clone": "^1.2.0", + "ajv": "^6.12.4", "chalk": "^4.0.0", "cross-spawn": "^7.0.2", "debug": "^4.3.2", "doctrine": "^3.0.0", "escape-string-regexp": "^4.0.0", - "eslint-scope": "^7.1.1", - "eslint-visitor-keys": "^3.3.0", - "espree": "^9.5.0", + "eslint-scope": "^7.2.2", + "eslint-visitor-keys": "^3.4.3", + "espree": "^9.6.1", "esquery": "^1.4.2", "esutils": "^2.0.2", "fast-deep-equal": "^3.1.3", @@ -1950,22 +2049,19 @@ "find-up": "^5.0.0", "glob-parent": "^6.0.2", "globals": "^13.19.0", - "grapheme-splitter": "^1.0.4", + "graphemer": "^1.4.0", "ignore": "^5.2.0", - "import-fresh": "^3.0.0", "imurmurhash": "^0.1.4", "is-glob": "^4.0.0", "is-path-inside": "^3.0.3", - "js-sdsl": "^4.1.4", "js-yaml": "^4.1.0", "json-stable-stringify-without-jsonify": "^1.0.1", "levn": "^0.4.1", "lodash.merge": "^4.6.2", "minimatch": "^3.1.2", "natural-compare": "^1.4.0", - "optionator": "^0.9.1", + "optionator": "^0.9.3", "strip-ansi": "^6.0.1", - "strip-json-comments": "^3.1.0", "text-table": "^0.2.0" }, "bin": { @@ -1979,9 +2075,9 @@ } }, "node_modules/eslint-config-standard": { - "version": "17.0.0", - "resolved": "https://registry.npmjs.org/eslint-config-standard/-/eslint-config-standard-17.0.0.tgz", - "integrity": "sha512-/2ks1GKyqSOkH7JFvXJicu0iMpoojkwB+f5Du/1SC0PtBL+s8v30k9njRZ21pm2drKYm2342jFnGWzttxPmZVg==", + "version": "17.1.0", + "resolved": "https://registry.npmjs.org/eslint-config-standard/-/eslint-config-standard-17.1.0.tgz", + "integrity": "sha512-IwHwmaBNtDK4zDHQukFDW5u/aTb8+meQWZvNFWkiGmbWjD6bqyuSSBxxXKkCftCUzc1zwCH2m/baCNDLGmuO5Q==", "dev": true, "funding": [ { @@ -1997,10 +2093,13 @@ "url": "https://feross.org/support" } ], + "engines": { + "node": ">=12.0.0" + }, "peerDependencies": { "eslint": "^8.0.1", "eslint-plugin-import": "^2.25.2", - "eslint-plugin-n": "^15.0.0", + "eslint-plugin-n": "^15.0.0 || ^16.0.0 ", "eslint-plugin-promise": "^6.0.0" } }, @@ -2029,14 +2128,14 @@ } }, "node_modules/eslint-import-resolver-node": { - "version": "0.3.7", - "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.7.tgz", - "integrity": "sha512-gozW2blMLJCeFpBwugLTGyvVjNoeo1knonXAcatC6bjPBZitotxdWf7Gimr25N4c0AAOo4eOUfaG82IJPDpqCA==", + "version": "0.3.9", + "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.9.tgz", + "integrity": "sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==", "dev": true, "dependencies": { "debug": "^3.2.7", - "is-core-module": "^2.11.0", - "resolve": "^1.22.1" + "is-core-module": "^2.13.0", + "resolve": "^1.22.4" } }, "node_modules/eslint-import-resolver-node/node_modules/debug": { @@ -2049,21 +2148,21 @@ } }, "node_modules/eslint-import-resolver-node/node_modules/is-core-module": { - "version": "2.11.0", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.11.0.tgz", - "integrity": "sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==", + "version": "2.13.1", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.1.tgz", + "integrity": "sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==", "dev": true, "dependencies": { - "has": "^1.0.3" + "hasown": "^2.0.0" }, "funding": { "url": "https://github.com/sponsors/ljharb" } }, "node_modules/eslint-module-utils": { - "version": "2.7.4", - "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.7.4.tgz", - "integrity": "sha512-j4GT+rqzCoRKHwURX7pddtIPGySnX9Si/cgMI5ztrcqOPtk5dDEeZ34CQVPphnqkJytlc97Vuk05Um2mJ3gEQA==", + "version": "2.8.0", + "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.8.0.tgz", + "integrity": "sha512-aWajIYfsqCKRDgUfjEXNN/JlrzauMuSEy5sbd7WXbtW3EH6A6MpwEh42c7qD+MqQo9QMJ6fWLAeIJynx0g6OAw==", "dev": true, "dependencies": { "debug": "^3.2.7" @@ -2130,26 +2229,28 @@ } }, "node_modules/eslint-plugin-import": { - "version": "2.27.5", - "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.27.5.tgz", - "integrity": "sha512-LmEt3GVofgiGuiE+ORpnvP+kAm3h6MLZJ4Q5HCyHADofsb4VzXFsRiWj3c0OFiV+3DWFh0qg3v9gcPlfc3zRow==", + "version": "2.29.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.29.0.tgz", + "integrity": "sha512-QPOO5NO6Odv5lpoTkddtutccQjysJuFxoPS7fAHO+9m9udNHvTCPSAMW9zGAYj8lAIdr40I8yPCdUYrncXtrwg==", "dev": true, "dependencies": { - "array-includes": "^3.1.6", - "array.prototype.flat": "^1.3.1", - "array.prototype.flatmap": "^1.3.1", + "array-includes": "^3.1.7", + "array.prototype.findlastindex": "^1.2.3", + "array.prototype.flat": "^1.3.2", + "array.prototype.flatmap": "^1.3.2", "debug": "^3.2.7", "doctrine": "^2.1.0", - "eslint-import-resolver-node": "^0.3.7", - "eslint-module-utils": "^2.7.4", - "has": "^1.0.3", - "is-core-module": "^2.11.0", + "eslint-import-resolver-node": "^0.3.9", + "eslint-module-utils": "^2.8.0", + "hasown": "^2.0.0", + "is-core-module": "^2.13.1", "is-glob": "^4.0.3", "minimatch": "^3.1.2", - "object.values": "^1.1.6", - "resolve": "^1.22.1", - "semver": "^6.3.0", - "tsconfig-paths": "^3.14.1" + "object.fromentries": "^2.0.7", + "object.groupby": "^1.0.1", + "object.values": "^1.1.7", + "semver": "^6.3.1", + "tsconfig-paths": "^3.14.2" }, "engines": { "node": ">=4" @@ -2180,30 +2281,30 @@ } }, "node_modules/eslint-plugin-import/node_modules/is-core-module": { - "version": "2.11.0", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.11.0.tgz", - "integrity": "sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==", + "version": "2.13.1", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.1.tgz", + "integrity": "sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==", "dev": true, "dependencies": { - "has": "^1.0.3" + "hasown": "^2.0.0" }, "funding": { "url": "https://github.com/sponsors/ljharb" } }, "node_modules/eslint-plugin-import/node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "dev": true, "bin": { "semver": "bin/semver.js" } }, "node_modules/eslint-plugin-n": { - "version": "15.6.1", - "resolved": "https://registry.npmjs.org/eslint-plugin-n/-/eslint-plugin-n-15.6.1.tgz", - "integrity": "sha512-R9xw9OtCRxxaxaszTQmQAlPgM+RdGjaL1akWuY/Fv9fRAi8Wj4CUKc6iYVG8QNRjRuo8/BqVYIpfqberJUEacA==", + "version": "15.7.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-n/-/eslint-plugin-n-15.7.0.tgz", + "integrity": "sha512-jDex9s7D/Qial8AGVIHq4W7NswpUD5DPDL2RH8Lzd9EloWUuvUkHfv4FRLMipH5q2UtyurorBkPeNi1wVWNh3Q==", "dev": true, "dependencies": { "builtins": "^5.0.1", @@ -2226,12 +2327,12 @@ } }, "node_modules/eslint-plugin-n/node_modules/is-core-module": { - "version": "2.11.0", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.11.0.tgz", - "integrity": "sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==", + "version": "2.13.1", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.1.tgz", + "integrity": "sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==", "dev": true, "dependencies": { - "has": "^1.0.3" + "hasown": "^2.0.0" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -2250,15 +2351,16 @@ } }, "node_modules/eslint-plugin-react": { - "version": "7.32.2", - "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.32.2.tgz", - "integrity": "sha512-t2fBMa+XzonrrNkyVirzKlvn5RXzzPwRHtMvLAtVZrt8oxgnTQaYbU6SXTOO1mwQgp1y5+toMSKInnzGr0Knqg==", + "version": "7.33.2", + "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.33.2.tgz", + "integrity": "sha512-73QQMKALArI8/7xGLNI/3LylrEYrlKZSb5C9+q3OtOewTnMQi5cT+aE9E41sLCmli3I9PGGmD1yiZydyo4FEPw==", "dev": true, "dependencies": { "array-includes": "^3.1.6", "array.prototype.flatmap": "^1.3.1", "array.prototype.tosorted": "^1.1.1", "doctrine": "^2.1.0", + "es-iterator-helpers": "^1.0.12", "estraverse": "^5.3.0", "jsx-ast-utils": "^2.4.1 || ^3.0.0", "minimatch": "^3.1.2", @@ -2268,7 +2370,7 @@ "object.values": "^1.1.6", "prop-types": "^15.8.1", "resolve": "^2.0.0-next.4", - "semver": "^6.3.0", + "semver": "^6.3.1", "string.prototype.matchall": "^4.0.8" }, "engines": { @@ -2290,13 +2392,25 @@ "node": ">=0.10.0" } }, + "node_modules/eslint-plugin-react/node_modules/is-core-module": { + "version": "2.13.1", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.1.tgz", + "integrity": "sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==", + "dev": true, + "dependencies": { + "hasown": "^2.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/eslint-plugin-react/node_modules/resolve": { - "version": "2.0.0-next.4", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.4.tgz", - "integrity": "sha512-iMDbmAWtfU+MHpxt/I5iWI7cY6YVEZUQ3MBgPQ++XD1PELuJHIl82xBmObyP2KyQmkNB2dsqF7seoQQiAn5yDQ==", + "version": "2.0.0-next.5", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.5.tgz", + "integrity": "sha512-U7WjGVG9sH8tvjW5SmGbQuui75FiyjAX72HX15DwBBwF9dNiQZRQAg9nnPhYy+TUnE0+VcrttuvNI8oSxZcocA==", "dev": true, "dependencies": { - "is-core-module": "^2.9.0", + "is-core-module": "^2.13.0", "path-parse": "^1.0.7", "supports-preserve-symlinks-flag": "^1.0.0" }, @@ -2308,18 +2422,18 @@ } }, "node_modules/eslint-plugin-react/node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "dev": true, "bin": { "semver": "bin/semver.js" } }, "node_modules/eslint-scope": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.1.tgz", - "integrity": "sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==", + "version": "7.2.2", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz", + "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==", "dev": true, "dependencies": { "esrecurse": "^4.3.0", @@ -2327,6 +2441,9 @@ }, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" } }, "node_modules/eslint-utils": { @@ -2357,12 +2474,15 @@ } }, "node_modules/eslint-visitor-keys": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz", - "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==", + "version": "3.4.3", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", + "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", "dev": true, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" } }, "node_modules/eslint/node_modules/escape-string-regexp": { @@ -2390,14 +2510,14 @@ } }, "node_modules/espree": { - "version": "9.5.0", - "resolved": "https://registry.npmjs.org/espree/-/espree-9.5.0.tgz", - "integrity": "sha512-JPbJGhKc47++oo4JkEoTe2wjy4fmMwvFpgJT9cQzmfXKp22Dr6Hf1tdCteLz1h0P3t+mGvWZ+4Uankvh8+c6zw==", + "version": "9.6.1", + "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz", + "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==", "dev": true, "dependencies": { - "acorn": "^8.8.0", + "acorn": "^8.9.0", "acorn-jsx": "^5.3.2", - "eslint-visitor-keys": "^3.3.0" + "eslint-visitor-keys": "^3.4.1" }, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" @@ -2464,9 +2584,9 @@ "dev": true }, "node_modules/fast-glob": { - "version": "3.2.12", - "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.12.tgz", - "integrity": "sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==", + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz", + "integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==", "dev": true, "dependencies": { "@nodelib/fs.stat": "^2.0.2", @@ -2584,12 +2704,13 @@ } }, "node_modules/flat-cache": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz", - "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.2.0.tgz", + "integrity": "sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==", "dev": true, "dependencies": { - "flatted": "^3.1.0", + "flatted": "^3.2.9", + "keyv": "^4.5.3", "rimraf": "^3.0.2" }, "engines": { @@ -2597,9 +2718,9 @@ } }, "node_modules/flatted": { - "version": "3.2.7", - "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz", - "integrity": "sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==", + "version": "3.2.9", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.9.tgz", + "integrity": "sha512-36yxDn5H7OFZQla0/jFJmbIKTdZAQHngCedGxiMmpNfEZM0sdEeT+WczLQrjK6D7o2aiyLYDnkw0R3JK0Qv1RQ==", "dev": true }, "node_modules/for-each": { @@ -2621,6 +2742,12 @@ "readable-stream": "^2.0.0" } }, + "node_modules/from2/node_modules/isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==", + "dev": true + }, "node_modules/from2/node_modules/readable-stream": { "version": "2.3.8", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz", @@ -2688,9 +2815,9 @@ "dev": true }, "node_modules/fsevents": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", - "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", + "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", "dev": true, "hasInstallScript": true, "optional": true, @@ -2702,21 +2829,24 @@ } }, "node_modules/function-bind": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", - "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==", - "dev": true + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", + "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==", + "dev": true, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } }, "node_modules/function.prototype.name": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.5.tgz", - "integrity": "sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==", + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.6.tgz", + "integrity": "sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg==", "dev": true, "dependencies": { "call-bind": "^1.0.2", - "define-properties": "^1.1.3", - "es-abstract": "^1.19.0", - "functions-have-names": "^1.2.2" + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1", + "functions-have-names": "^1.2.3" }, "engines": { "node": ">= 0.4" @@ -2744,23 +2874,24 @@ } }, "node_modules/get-func-name": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.0.tgz", - "integrity": "sha512-Hm0ixYtaSZ/V7C8FJrtZIuBBI+iSgL+1Aq82zSu8VQNB4S3Gk8e7Qs3VwBDJAhmRZcFqkl3tQu36g/Foh5I5ig==", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.2.tgz", + "integrity": "sha512-8vXOvuE167CtIc3OyItco7N/dpRtBbYOsPsXCz7X/PMnlGjYjSGuZJgM1Y7mmew7BKf9BqvLX2tnOVy1BBUsxQ==", "dev": true, "engines": { "node": "*" } }, "node_modules/get-intrinsic": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.0.tgz", - "integrity": "sha512-L049y6nFOuom5wGyRc3/gdTLO94dySVKRACj1RmJZBQXlbTMhtNIgkWkUHq+jYmZvKf14EW1EoJnnjbmoHij0Q==", + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.2.tgz", + "integrity": "sha512-0gSo4ml/0j98Y3lngkFEot/zhiCeWsbYIlZ+uZOVgzLyLaUw7wxUL+nCTP0XJvJg1AXulJRI3UJi8GsbDuxdGA==", "dev": true, "dependencies": { - "function-bind": "^1.1.1", - "has": "^1.0.3", - "has-symbols": "^1.0.3" + "function-bind": "^1.1.2", + "has-proto": "^1.0.1", + "has-symbols": "^1.0.3", + "hasown": "^2.0.0" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -2833,9 +2964,9 @@ } }, "node_modules/globals": { - "version": "13.20.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-13.20.0.tgz", - "integrity": "sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==", + "version": "13.23.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-13.23.0.tgz", + "integrity": "sha512-XAmF0RjlrjY23MA51q3HltdlGxUpXPvg0GioKiD9X6HD28iMjo2dKC8Vqwm7lne4GNr78+RHTfliktR6ZH09wA==", "dev": true, "dependencies": { "type-fest": "^0.20.2" @@ -2900,20 +3031,20 @@ "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==", "dev": true }, - "node_modules/grapheme-splitter": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz", - "integrity": "sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==", + "node_modules/graphemer": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz", + "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==", "dev": true }, "node_modules/handlebars": { - "version": "4.7.7", - "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.7.tgz", - "integrity": "sha512-aAcXm5OAfE/8IXkcZvCepKU3VzW1/39Fb5ZuqMtgI/hT8X2YgoMvBY5dLhq/cpOvw7Lk1nK/UF71aLG/ZnVYRA==", + "version": "4.7.8", + "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.8.tgz", + "integrity": "sha512-vafaFqs8MZkRrSX7sFVUdo3ap/eNiLnb4IakshzvP56X5Nr1iGKAIqdX6tMlm6HcNRIkr6AxO5jFEoJzzpT8aQ==", "dev": true, "dependencies": { "minimist": "^1.2.5", - "neo-async": "^2.6.0", + "neo-async": "^2.6.2", "source-map": "^0.6.1", "wordwrap": "^1.0.0" }, @@ -2928,13 +3059,10 @@ } }, "node_modules/has": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", - "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/has/-/has-1.0.4.tgz", + "integrity": "sha512-qdSAmqLF6209RFj4VVItywPMbm3vWylknmB3nvNiUIs72xAimcM8nVYxYr7ncvZq5qzk9MKIZR8ijqD/1QuYjQ==", "dev": true, - "dependencies": { - "function-bind": "^1.1.1" - }, "engines": { "node": ">= 0.4.0" } @@ -2958,12 +3086,12 @@ } }, "node_modules/has-property-descriptors": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz", - "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.1.tgz", + "integrity": "sha512-VsX8eaIewvas0xnvinAe9bw4WfIeODpGYikiWYLH+dma0Jw6KHYqWiWfhQlgOVK8D6PvjubK5Uc4P0iIhIcNVg==", "dev": true, "dependencies": { - "get-intrinsic": "^1.1.1" + "get-intrinsic": "^1.2.2" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -3008,8 +3136,20 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/https-proxy-agent": { - "version": "5.0.1", + "node_modules/hasown": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.0.tgz", + "integrity": "sha512-vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA==", + "dev": true, + "dependencies": { + "function-bind": "^1.1.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/https-proxy-agent": { + "version": "5.0.1", "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz", "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==", "dev": true, @@ -3042,9 +3182,9 @@ ] }, "node_modules/ignore": { - "version": "5.2.4", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz", - "integrity": "sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==", + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.0.tgz", + "integrity": "sha512-g7dmpshy+gD7mh88OC9NwSGTKoc3kyLAZQRU1mt53Aw/vnvfXnbC+F/7F7QoYVKbV+KNvJx8wArewKy1vXMtlg==", "dev": true, "engines": { "node": ">= 4" @@ -3098,13 +3238,13 @@ "dev": true }, "node_modules/internal-slot": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.5.tgz", - "integrity": "sha512-Y+R5hJrzs52QCG2laLn4udYVnxsfny9CpOhNhUvk/SSSVyF6T27FzRbF0sroPidSu3X8oEAkOn2K804mjpt6UQ==", + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.6.tgz", + "integrity": "sha512-Xj6dv+PsbtwyPpEflsejS+oIZxmMlV44zAhG479uYu89MsjcYOhCFnNyKrkJrihbsiasQyY0afoCl/9BLR65bg==", "dev": true, "dependencies": { - "get-intrinsic": "^1.2.0", - "has": "^1.0.3", + "get-intrinsic": "^1.2.2", + "hasown": "^2.0.0", "side-channel": "^1.0.4" }, "engines": { @@ -3147,6 +3287,21 @@ "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==", "dev": true }, + "node_modules/is-async-function": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-async-function/-/is-async-function-2.0.0.tgz", + "integrity": "sha512-Y1JXKrfykRJGdlDwdKlLpLyMIiWqWvuSd17TvZk68PLAOGOoF4Xyav1z0Xhoi+gCYjZVeC5SI+hYFOfvXmGRCA==", + "dev": true, + "dependencies": { + "has-tostringtag": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/is-bigint": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz", @@ -3223,13 +3378,43 @@ "node": ">=0.10.0" } }, + "node_modules/is-finalizationregistry": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-finalizationregistry/-/is-finalizationregistry-1.0.2.tgz", + "integrity": "sha512-0by5vtUJs8iFQb5TYUHHPudOR+qXYIMKtiUzvLIZITZUjknFmziyBJuLhVRc+Ds0dREFlskDNJKYIdIzu/9pfw==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/is-fullwidth-code-point": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-4.0.0.tgz", + "integrity": "sha512-O4L094N2/dZ7xqVdrXhh9r1KODPJpFms8B5sGdJLPy664AgvXsreZUyCQQNItZRDlYug4xStLjNp/sz3HvBowQ==", "dev": true, "engines": { - "node": ">=8" + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/is-generator-function": { + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.0.10.tgz", + "integrity": "sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A==", + "dev": true, + "dependencies": { + "has-tostringtag": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, "node_modules/is-glob": { @@ -3244,6 +3429,15 @@ "node": ">=0.10.0" } }, + "node_modules/is-map": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.2.tgz", + "integrity": "sha512-cOZFQQozTha1f4MxLFzlgKYPTyj26picdZTx82hbc/Xf4K/tZOOXSCkMvU4pKioRXGDLJRn0GM7Upe7kR721yg==", + "dev": true, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/is-negative-zero": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz", @@ -3305,6 +3499,15 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/is-set": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.2.tgz", + "integrity": "sha512-+2cnTEZeY5z/iXGbLhPrOAaK/Mau5k5eXq9j14CpRTftq0pAJu2MwVRSZhyZWBzx3o6X795Lz6Bpb6R0GKf37g==", + "dev": true, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/is-shared-array-buffer": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz", @@ -3348,16 +3551,12 @@ } }, "node_modules/is-typed-array": { - "version": "1.1.10", - "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.10.tgz", - "integrity": "sha512-PJqgEHiWZvMpaFZ3uTc8kHPM4+4ADTlDniuQL7cU/UDA0Ql7F70yGfHph3cLNe+c9toaigv+DFzTJKhc2CtO6A==", + "version": "1.1.12", + "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.12.tgz", + "integrity": "sha512-Z14TF2JNG8Lss5/HMqt0//T9JeHXttXy5pH/DBU4vi98ozO2btxzq9MwYDZYnKwU8nRsz/+GVFVRDq3DkVuSPg==", "dev": true, "dependencies": { - "available-typed-arrays": "^1.0.5", - "call-bind": "^1.0.2", - "for-each": "^0.3.3", - "gopd": "^1.0.1", - "has-tostringtag": "^1.0.0" + "which-typed-array": "^1.1.11" }, "engines": { "node": ">= 0.4" @@ -3366,6 +3565,15 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/is-weakmap": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.1.tgz", + "integrity": "sha512-NSBR4kH5oVj1Uwvv970ruUkCV7O1mzgVFO4/rev2cLRda9Tm9HrL70ZPut4rOHgY0FNrUu9BCbXA2sdQ+x0chA==", + "dev": true, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/is-weakref": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz", @@ -3378,10 +3586,23 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/is-weakset": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.2.tgz", + "integrity": "sha512-t2yVvttHkQktwnNNmBQ98AhENLdPUTDTE21uPqAQ0ARwQfGeQKRVS0NNurH7bTf7RrvcVn1OOge45CnBeHCSmg==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "get-intrinsic": "^1.1.1" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/isarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==", + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz", + "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==", "dev": true }, "node_modules/isexe": { @@ -3390,14 +3611,17 @@ "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", "dev": true }, - "node_modules/js-sdsl": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.4.0.tgz", - "integrity": "sha512-FfVSdx6pJ41Oa+CF7RDaFmTnCaFhua+SNYQX74riGOpl96x+2jQCqEfQ2bnXu/5DPCqlRuiqyvTJM0Qjz26IVg==", + "node_modules/iterator.prototype": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/iterator.prototype/-/iterator.prototype-1.1.2.tgz", + "integrity": "sha512-DR33HMMr8EzwuRL8Y9D3u2BMj8+RqSE850jfGu59kS7tbmPLzGkZmVSfyCFSDxuZiEY6Rzt3T2NA/qU+NwVj1w==", "dev": true, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/js-sdsl" + "dependencies": { + "define-properties": "^1.2.1", + "get-intrinsic": "^1.2.1", + "has-symbols": "^1.0.3", + "reflect.getprototypeof": "^1.0.4", + "set-function-name": "^2.0.1" } }, "node_modules/js-tokens": { @@ -3526,6 +3750,12 @@ "node": ">=4" } }, + "node_modules/json-buffer": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz", + "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==", + "dev": true + }, "node_modules/json-parse-better-errors": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz", @@ -3575,18 +3805,29 @@ } }, "node_modules/jsx-ast-utils": { - "version": "3.3.3", - "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.3.3.tgz", - "integrity": "sha512-fYQHZTZ8jSfmWZ0iyzfwiU4WDX4HpHbMCZ3gPlWYiCl3BoeOTsqKBqnTVfH2rYT7eP5c3sVbeSPHnnJOaTrWiw==", + "version": "3.3.5", + "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.3.5.tgz", + "integrity": "sha512-ZZow9HBI5O6EPgSJLUb8n2NKgmVWTwCvHGwFuJlMjvLFqlGG6pjirPhtdsseaLZjSibD8eegzmYpUZwoIlj2cQ==", "dev": true, "dependencies": { - "array-includes": "^3.1.5", - "object.assign": "^4.1.3" + "array-includes": "^3.1.6", + "array.prototype.flat": "^1.3.1", + "object.assign": "^4.1.4", + "object.values": "^1.1.6" }, "engines": { "node": ">=4.0" } }, + "node_modules/keyv": { + "version": "4.5.4", + "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz", + "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==", + "dev": true, + "dependencies": { + "json-buffer": "3.0.1" + } + }, "node_modules/klaw": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/klaw/-/klaw-3.0.0.tgz", @@ -3608,6 +3849,12 @@ "node": ">= 0.6.3" } }, + "node_modules/lazystream/node_modules/isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==", + "dev": true + }, "node_modules/lazystream/node_modules/readable-stream": { "version": "2.3.8", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz", @@ -3791,12 +4038,12 @@ } }, "node_modules/loupe": { - "version": "2.3.6", - "resolved": "https://registry.npmjs.org/loupe/-/loupe-2.3.6.tgz", - "integrity": "sha512-RaPMZKiMy8/JruncMU5Bt6na1eftNoo++R4Y+N2FrxkDVTrGvcyzFTsaGif4QTeKESheMGegbhw6iUAq+5A8zA==", + "version": "2.3.7", + "resolved": "https://registry.npmjs.org/loupe/-/loupe-2.3.7.tgz", + "integrity": "sha512-zSMINGVYkdpYSOBmLi0D1Uo7JU9nVdQKrHxC8eYlV+9YKK9WePqAlL7lSlorG/U2Fw1w0hTBmaa/jrQ3UbPHtA==", "dev": true, "dependencies": { - "get-func-name": "^2.0.0" + "get-func-name": "^2.0.1" } }, "node_modules/lru-cache": { @@ -3935,21 +4182,21 @@ "dev": true }, "node_modules/mlly": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/mlly/-/mlly-1.2.0.tgz", - "integrity": "sha512-+c7A3CV0KGdKcylsI6khWyts/CYrGTrRVo4R/I7u/cUsy0Conxa6LUhiEzVKIw14lc2L5aiO4+SeVe4TeGRKww==", + "version": "1.4.2", + "resolved": "https://registry.npmjs.org/mlly/-/mlly-1.4.2.tgz", + "integrity": "sha512-i/Ykufi2t1EZ6NaPLdfnZk2AX8cs0d+mTzVKuPfqPKPatxLApaBoxJQ9x1/uckXtrS/U5oisPMDkNs0yQTaBRg==", "dev": true, "dependencies": { - "acorn": "^8.8.2", - "pathe": "^1.1.0", - "pkg-types": "^1.0.2", - "ufo": "^1.1.1" + "acorn": "^8.10.0", + "pathe": "^1.1.1", + "pkg-types": "^1.0.3", + "ufo": "^1.3.0" } }, "node_modules/module-alias": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/module-alias/-/module-alias-2.2.2.tgz", - "integrity": "sha512-A/78XjoX2EmNvppVWEhM2oGk3x4lLxnkEA4jTbaK97QKSDjkIoOsKQlfylt/d3kKKi596Qy3NP5XrXJ6fZIC9Q==" + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/module-alias/-/module-alias-2.2.3.tgz", + "integrity": "sha512-23g5BFj4zdQL/b6tor7Ji+QY4pEfNH784BMslY9Qb0UnJWRAt+lQGLYmRaM0KDBwIG23ffEBELhZDP2rhi9f/Q==" }, "node_modules/mrmime": { "version": "1.0.1", @@ -3991,9 +4238,9 @@ } }, "node_modules/nanoid": { - "version": "3.3.6", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.6.tgz", - "integrity": "sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==", + "version": "3.3.7", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz", + "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==", "dev": true, "funding": [ { @@ -4027,9 +4274,9 @@ "dev": true }, "node_modules/node-abi": { - "version": "3.33.0", - "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.33.0.tgz", - "integrity": "sha512-7GGVawqyHF4pfd0YFybhv/eM9JwTtPqx0mAanQ146O3FlSh3pA24zf9IRQTOsfTSqXTNzPSP5iagAJ94jjuVog==", + "version": "3.51.0", + "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.51.0.tgz", + "integrity": "sha512-SQkEP4hmNWjlniS5zdnfIXTk1x7Ome85RDzHlTbBtzE97Gfwz/Ipw4v/Ryk20DWIy3yCNVLVlGKApCnmvYoJbA==", "dev": true, "dependencies": { "semver": "^7.3.5" @@ -4039,9 +4286,9 @@ } }, "node_modules/node-fetch": { - "version": "2.6.7", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz", - "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==", + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz", + "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==", "dependencies": { "whatwg-url": "^5.0.0" }, @@ -4082,9 +4329,9 @@ "dev": true }, "node_modules/object-inspect": { - "version": "1.12.3", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz", - "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==", + "version": "1.13.1", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.1.tgz", + "integrity": "sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==", "dev": true, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -4127,28 +4374,28 @@ } }, "node_modules/object.entries": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.6.tgz", - "integrity": "sha512-leTPzo4Zvg3pmbQ3rDK69Rl8GQvIqMWubrkxONG9/ojtFE2rD9fjMKfSI5BxW3osRH1m6VdzmqK8oAY9aT4x5w==", + "version": "1.1.7", + "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.7.tgz", + "integrity": "sha512-jCBs/0plmPsOnrKAfFQXRG2NFjlhZgjjcBLSmTnEhU8U6vVTsVe8ANeQJCHTl3gSsI4J+0emOoCgoKlmQPMgmA==", "dev": true, "dependencies": { "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4" + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1" }, "engines": { "node": ">= 0.4" } }, "node_modules/object.fromentries": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.6.tgz", - "integrity": "sha512-VciD13dswC4j1Xt5394WR4MzmAQmlgN72phd/riNp9vtD7tp4QQWJ0R4wvclXcafgcYK8veHRed2W6XeGBvcfg==", + "version": "2.0.7", + "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.7.tgz", + "integrity": "sha512-UPbPHML6sL8PI/mOqPwsH4G6iyXcCGzLin8KvEPenOZN5lpCNBZZQ+V62vdjB1mQHrmqGQt5/OJzemUA+KJmEA==", "dev": true, "dependencies": { "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4" + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1" }, "engines": { "node": ">= 0.4" @@ -4157,28 +4404,40 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/object.groupby": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/object.groupby/-/object.groupby-1.0.1.tgz", + "integrity": "sha512-HqaQtqLnp/8Bn4GL16cj+CUYbnpe1bh0TtEaWvybszDG4tgxCJuRpV8VGuvNaI1fAnI4lUJzDG55MXcOH4JZcQ==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1", + "get-intrinsic": "^1.2.1" + } + }, "node_modules/object.hasown": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/object.hasown/-/object.hasown-1.1.2.tgz", - "integrity": "sha512-B5UIT3J1W+WuWIU55h0mjlwaqxiE5vYENJXIXZ4VFe05pNYrkKuK0U/6aFcb0pKywYJh7IhfoqUfKVmrJJHZHw==", + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/object.hasown/-/object.hasown-1.1.3.tgz", + "integrity": "sha512-fFI4VcYpRHvSLXxP7yiZOMAd331cPfd2p7PFDVbgUsYOfCT3tICVqXWngbjr4m49OvsBwUBQ6O2uQoJvy3RexA==", "dev": true, "dependencies": { - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4" + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1" }, "funding": { "url": "https://github.com/sponsors/ljharb" } }, "node_modules/object.values": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.6.tgz", - "integrity": "sha512-FVVTkD1vENCsAcwNs9k6jea2uHC/X0+JcjG8YA60FN5CMaJmG95wT9jek/xX9nornqGRrBkKtzuAu2wuHpKqvw==", + "version": "1.1.7", + "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.7.tgz", + "integrity": "sha512-aU6xnDFYT3x17e/f0IiiwlGPTy2jzMySGfUB4fq6z7CV8l85CWHDk5ErhyhpfDHhrOMwGFhSQkhMGHaIotA6Ng==", "dev": true, "dependencies": { "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4" + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1" }, "engines": { "node": ">= 0.4" @@ -4197,17 +4456,17 @@ } }, "node_modules/optionator": { - "version": "0.9.1", - "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz", - "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==", + "version": "0.9.3", + "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.3.tgz", + "integrity": "sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==", "dev": true, "dependencies": { + "@aashutoshrathi/word-wrap": "^1.2.3", "deep-is": "^0.1.3", "fast-levenshtein": "^2.0.6", "levn": "^0.4.1", "prelude-ls": "^1.2.1", - "type-check": "^0.4.0", - "word-wrap": "^1.2.3" + "type-check": "^0.4.0" }, "engines": { "node": ">= 0.8.0" @@ -4329,9 +4588,9 @@ } }, "node_modules/pathe": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/pathe/-/pathe-1.1.0.tgz", - "integrity": "sha512-ODbEPR0KKHqECXW1GoxdDb+AZvULmXjVPy4rt+pGo2+TnjJTIPJQSVS6N63n8T2Ip+syHhbn52OewKicV0373w==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/pathe/-/pathe-1.1.1.tgz", + "integrity": "sha512-d+RQGp0MAYTIaDBIMmOfMwz3E+LOZnxx1HZd5R18mmCZY0QBlK0LDZfPc8FW8Ed2DlvsuE6PRjroDY+wg4+j/Q==", "dev": true }, "node_modules/pathval": { @@ -4497,13 +4756,13 @@ } }, "node_modules/pkg-types": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/pkg-types/-/pkg-types-1.0.2.tgz", - "integrity": "sha512-hM58GKXOcj8WTqUXnsQyJYXdeAPbythQgEF3nTcEo+nkD49chjQ9IKm/QJy9xf6JakXptz86h7ecP2024rrLaQ==", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/pkg-types/-/pkg-types-1.0.3.tgz", + "integrity": "sha512-nN7pYi0AQqJnoLPC9eHFQ8AcyaixBUOwvqc5TDnIKCMEE6I0y8P7OKA7fPexsXGCGxQDl/cmrLAp26LhcwxZ4A==", "dev": true, "dependencies": { "jsonc-parser": "^3.2.0", - "mlly": "^1.1.1", + "mlly": "^1.2.0", "pathe": "^1.1.0" } }, @@ -4520,9 +4779,9 @@ } }, "node_modules/postcss": { - "version": "8.4.24", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.24.tgz", - "integrity": "sha512-M0RzbcI0sO/XJNucsGjvWU9ERWxb/ytp1w6dKtxTKgixdtQDq4rmx/g8W1hnaheq9jgwL/oyEdH5Bc4WwJKMqg==", + "version": "8.4.31", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz", + "integrity": "sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==", "dev": true, "funding": [ { @@ -4651,9 +4910,9 @@ } }, "node_modules/punycode": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz", - "integrity": "sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==", + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", + "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==", "dev": true, "engines": { "node": ">=6" @@ -4724,9 +4983,9 @@ } }, "node_modules/readdir-glob": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/readdir-glob/-/readdir-glob-1.1.2.tgz", - "integrity": "sha512-6RLVvwJtVwEDfPdn6X6Ille4/lxGl0ATOY4FN/B9nxQcgOazvvI0nodiD19ScKq0PvA/29VpaOQML36o5IzZWA==", + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/readdir-glob/-/readdir-glob-1.1.3.tgz", + "integrity": "sha512-v05I2k7xN8zXvPD9N+z/uhXPaj0sUFCe2rcWZIpBsqxfP7xXFQ0tipAd/wjj1YxWyWtUS5IDJpOG82JKt2EAVA==", "dev": true, "dependencies": { "minimatch": "^5.1.0" @@ -4845,15 +5104,35 @@ "node": ">=0.10.0" } }, + "node_modules/reflect.getprototypeof": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/reflect.getprototypeof/-/reflect.getprototypeof-1.0.4.tgz", + "integrity": "sha512-ECkTw8TmJwW60lOTR+ZkODISW6RQ8+2CL3COqtiJKLd6MmB45hN51HprHFziKLGkAuTGQhBb91V8cy+KHlaCjw==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1", + "get-intrinsic": "^1.2.1", + "globalthis": "^1.0.3", + "which-builtin-type": "^1.1.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/regexp.prototype.flags": { - "version": "1.4.3", - "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz", - "integrity": "sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==", + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.1.tgz", + "integrity": "sha512-sy6TXMN+hnP/wMy+ISxg3krXx7BAtWVO4UouuCN/ziM9UEne0euamVNafDfvC83bRNr95y0V5iijeDQFUNpvrg==", "dev": true, "dependencies": { "call-bind": "^1.0.2", - "define-properties": "^1.1.3", - "functions-have-names": "^1.2.2" + "define-properties": "^1.2.0", + "set-function-name": "^2.0.0" }, "engines": { "node": ">= 0.4" @@ -4893,12 +5172,12 @@ } }, "node_modules/resolve": { - "version": "1.22.1", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz", - "integrity": "sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==", + "version": "1.22.8", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz", + "integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==", "dev": true, "dependencies": { - "is-core-module": "^2.9.0", + "is-core-module": "^2.13.0", "path-parse": "^1.0.7", "supports-preserve-symlinks-flag": "^1.0.0" }, @@ -4918,6 +5197,18 @@ "node": ">=4" } }, + "node_modules/resolve/node_modules/is-core-module": { + "version": "2.13.1", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.1.tgz", + "integrity": "sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==", + "dev": true, + "dependencies": { + "hasown": "^2.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/reusify": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz", @@ -4944,9 +5235,9 @@ } }, "node_modules/rollup": { - "version": "3.23.1", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.23.1.tgz", - "integrity": "sha512-ybRdFVHOoljGEFILHLd2g/qateqUdjE6YS41WXq4p3C/WwD3xtWxV4FYWETA1u9TeXQc5K8L8zHE5d/scOvrOQ==", + "version": "3.29.4", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.29.4.tgz", + "integrity": "sha512-oWzmBZwvYrU0iJHtDmhsm662rC15FRXmcjCk1xD771dFDx5jJ02ufAQQTn0etB2emNk4J9EZg/yWKpsn9BWGRw==", "dev": true, "bin": { "rollup": "dist/bin/rollup" @@ -4982,6 +5273,24 @@ "queue-microtask": "^1.2.2" } }, + "node_modules/safe-array-concat": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.0.1.tgz", + "integrity": "sha512-6XbUAseYE2KtOuGueyeobCySj9L4+66Tn6KQMOPQJrAJEowYKW/YR/MGJZl7FdydUdaFu4LYyDZjxf4/Nmo23Q==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "get-intrinsic": "^1.2.1", + "has-symbols": "^1.0.3", + "isarray": "^2.0.5" + }, + "engines": { + "node": ">=0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/safe-buffer": { "version": "5.2.1", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", @@ -5017,9 +5326,9 @@ } }, "node_modules/semver": { - "version": "7.3.8", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz", - "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==", + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", + "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", "dev": true, "dependencies": { "lru-cache": "^6.0.0" @@ -5031,6 +5340,35 @@ "node": ">=10" } }, + "node_modules/set-function-length": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.1.1.tgz", + "integrity": "sha512-VoaqjbBJKiWtg4yRcKBQ7g7wnGnLV3M8oLvVWwOk2PdYY6PEFegR1vezXR0tw6fZGF9csVakIRjrJiy2veSBFQ==", + "dev": true, + "dependencies": { + "define-data-property": "^1.1.1", + "get-intrinsic": "^1.2.1", + "gopd": "^1.0.1", + "has-property-descriptors": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/set-function-name": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.1.tgz", + "integrity": "sha512-tMNCiqYVkXIZgc2Hnoy2IvC/f8ezc5koaRFkCjrpWzGpCd3qbZXPzVy9MAZzK1ch/X0jvSkojys3oqJN0qCmdA==", + "dev": true, + "dependencies": { + "define-data-property": "^1.0.1", + "functions-have-names": "^1.2.3", + "has-property-descriptors": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/shebang-command": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", @@ -5118,9 +5456,9 @@ } }, "node_modules/sirv": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/sirv/-/sirv-2.0.2.tgz", - "integrity": "sha512-4Qog6aE29nIjAOKe/wowFTxOdmbEZKb+3tsLljaBRzJwtqto0BChD2zzH0LhgCSXiI+V7X+Y45v14wBZQ1TK3w==", + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/sirv/-/sirv-2.0.3.tgz", + "integrity": "sha512-O9jm9BsID1P+0HOi81VpXPoDxYP374pkOLzACAoyUQ/3OUVndNpsz6wMnY2z+yOxzbllCKZrM+9QrWsv4THnyA==", "dev": true, "dependencies": { "@polka/url": "^1.0.0-next.20", @@ -5168,18 +5506,6 @@ "url": "https://github.com/chalk/ansi-styles?sponsor=1" } }, - "node_modules/slice-ansi/node_modules/is-fullwidth-code-point": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-4.0.0.tgz", - "integrity": "sha512-O4L094N2/dZ7xqVdrXhh9r1KODPJpFms8B5sGdJLPy664AgvXsreZUyCQQNItZRDlYug4xStLjNp/sz3HvBowQ==", - "dev": true, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/sort-array": { "version": "4.1.5", "resolved": "https://registry.npmjs.org/sort-array/-/sort-array-4.1.5.tgz", @@ -5236,9 +5562,9 @@ "dev": true }, "node_modules/standard": { - "version": "17.0.0", - "resolved": "https://registry.npmjs.org/standard/-/standard-17.0.0.tgz", - "integrity": "sha512-GlCM9nzbLUkr+TYR5I2WQoIah4wHA2lMauqbyPLV/oI5gJxqhHzhjl9EG2N0lr/nRqI3KCbCvm/W3smxvLaChA==", + "version": "17.1.0", + "resolved": "https://registry.npmjs.org/standard/-/standard-17.1.0.tgz", + "integrity": "sha512-jaDqlNSzLtWYW4lvQmU0EnxWMUGQiwHasZl5ZEIwx3S/ijZDjZOzs1y1QqKwKs5vqnFpGtizo4NOYX2s0Voq/g==", "dev": true, "funding": [ { @@ -5255,26 +5581,27 @@ } ], "dependencies": { - "eslint": "^8.13.0", - "eslint-config-standard": "17.0.0", + "eslint": "^8.41.0", + "eslint-config-standard": "17.1.0", "eslint-config-standard-jsx": "^11.0.0", - "eslint-plugin-import": "^2.26.0", - "eslint-plugin-n": "^15.1.0", - "eslint-plugin-promise": "^6.0.0", - "eslint-plugin-react": "^7.28.0", - "standard-engine": "^15.0.0" + "eslint-plugin-import": "^2.27.5", + "eslint-plugin-n": "^15.7.0", + "eslint-plugin-promise": "^6.1.1", + "eslint-plugin-react": "^7.32.2", + "standard-engine": "^15.0.0", + "version-guard": "^1.1.1" }, "bin": { - "standard": "bin/cmd.js" + "standard": "bin/cmd.cjs" }, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" } }, "node_modules/standard-engine": { - "version": "15.0.0", - "resolved": "https://registry.npmjs.org/standard-engine/-/standard-engine-15.0.0.tgz", - "integrity": "sha512-4xwUhJNo1g/L2cleysUqUv7/btn7GEbYJvmgKrQ2vd/8pkTmN8cpqAZg+BT8Z1hNeEH787iWUdOpL8fmApLtxA==", + "version": "15.1.0", + "resolved": "https://registry.npmjs.org/standard-engine/-/standard-engine-15.1.0.tgz", + "integrity": "sha512-VHysfoyxFu/ukT+9v49d4BRXIokFRZuH3z1VRxzFArZdjSCFpro6rEIU3ji7e4AoAtuSfKBkiOmsrDqKW5ZSRw==", "dev": true, "funding": [ { @@ -5301,9 +5628,9 @@ } }, "node_modules/std-env": { - "version": "3.3.2", - "resolved": "https://registry.npmjs.org/std-env/-/std-env-3.3.2.tgz", - "integrity": "sha512-uUZI65yrV2Qva5gqE0+A7uVAvO40iPo6jGhs7s8keRfHCmtg+uB2X6EiLGCI9IgL1J17xGhvoOqSz79lzICPTA==", + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/std-env/-/std-env-3.5.0.tgz", + "integrity": "sha512-JGUEaALvL0Mf6JCfYnJOTcobY+Nc7sG/TemDRBqCA0wEr4DER7zDchaaixTlmOxAjG1uRJmX82EQcxwTQTkqVA==", "dev": true }, "node_modules/stream-connect": { @@ -5339,6 +5666,12 @@ "readable-stream": "^2.1.4" } }, + "node_modules/stream-meter/node_modules/isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==", + "dev": true + }, "node_modules/stream-meter/node_modules/readable-stream": { "version": "2.3.8", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz", @@ -5388,32 +5721,63 @@ } }, "node_modules/string-width": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", - "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz", + "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==", "dev": true, "dependencies": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.1" + "eastasianwidth": "^0.2.0", + "emoji-regex": "^9.2.2", + "strip-ansi": "^7.0.1" }, "engines": { - "node": ">=8" + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/string-width/node_modules/ansi-regex": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", + "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", + "dev": true, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/ansi-regex?sponsor=1" + } + }, + "node_modules/string-width/node_modules/strip-ansi": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", + "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", + "dev": true, + "dependencies": { + "ansi-regex": "^6.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/strip-ansi?sponsor=1" } }, "node_modules/string.prototype.matchall": { - "version": "4.0.8", - "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.8.tgz", - "integrity": "sha512-6zOCOcJ+RJAQshcTvXPHoxoQGONa3e/Lqx90wUA+wEzX78sg5Bo+1tQo4N0pohS0erG9qtCqJDjNCQBjeWVxyg==", + "version": "4.0.10", + "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.10.tgz", + "integrity": "sha512-rGXbGmOEosIQi6Qva94HUjgPs9vKW+dkG7Y8Q5O2OYkWL6wFaTRZO8zM4mhP94uX55wgyrXzfS2aGtGzUL7EJQ==", "dev": true, "dependencies": { "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4", - "get-intrinsic": "^1.1.3", + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1", + "get-intrinsic": "^1.2.1", "has-symbols": "^1.0.3", - "internal-slot": "^1.0.3", - "regexp.prototype.flags": "^1.4.3", + "internal-slot": "^1.0.5", + "regexp.prototype.flags": "^1.5.0", + "set-function-name": "^2.0.0", "side-channel": "^1.0.4" }, "funding": { @@ -5421,14 +5785,14 @@ } }, "node_modules/string.prototype.trim": { - "version": "1.2.7", - "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.7.tgz", - "integrity": "sha512-p6TmeT1T3411M8Cgg9wBTMRtY2q9+PNy9EV1i2lIXUN/btt763oIfxwN3RR8VU6wHX8j/1CFy0L+YuThm6bgOg==", + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.8.tgz", + "integrity": "sha512-lfjY4HcixfQXOfaqCvcBuOIapyaroTXhbkfJN3gcB1OtyupngWK4sEET9Knd0cXd28kTUqu/kHoV4HKSJdnjiQ==", "dev": true, "dependencies": { "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4" + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1" }, "engines": { "node": ">= 0.4" @@ -5438,28 +5802,28 @@ } }, "node_modules/string.prototype.trimend": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz", - "integrity": "sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ==", + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.7.tgz", + "integrity": "sha512-Ni79DqeB72ZFq1uH/L6zJ+DKZTkOtPIHovb3YZHQViE+HDouuU4mBrLOLDn5Dde3RF8qw5qVETEjhu9locMLvA==", "dev": true, "dependencies": { "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4" + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1" }, "funding": { "url": "https://github.com/sponsors/ljharb" } }, "node_modules/string.prototype.trimstart": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz", - "integrity": "sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA==", + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.7.tgz", + "integrity": "sha512-NGhtDFu3jCEm7B4Fy0DpLewdJQOZcQ0rGbwQ/+stjnrp2i+rlKeCvos9hOIeCmqwratM47OBxY7uFZzjxHXmrg==", "dev": true, "dependencies": { "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4" + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -5499,12 +5863,12 @@ } }, "node_modules/strip-literal": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/strip-literal/-/strip-literal-1.0.1.tgz", - "integrity": "sha512-QZTsipNpa2Ppr6v1AmJHESqJ3Uz247MUS0OjrnnZjFAvEoWqxuyFuXn2xLgMtRnijJShAa1HL0gtJyUs7u7n3Q==", + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/strip-literal/-/strip-literal-1.3.0.tgz", + "integrity": "sha512-PugKzOsyXpArk0yWmUwqOZecSO0GH0bPoctLcqNDH9J04pVW3lflYE0ujElBGTloevcxF5MofAOZ7C5l2b+wLg==", "dev": true, "dependencies": { - "acorn": "^8.8.2" + "acorn": "^8.10.0" }, "funding": { "url": "https://github.com/sponsors/antfu" @@ -5628,9 +5992,9 @@ "dev": true }, "node_modules/tinybench": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/tinybench/-/tinybench-2.4.0.tgz", - "integrity": "sha512-iyziEiyFxX4kyxSp+MtY1oCH/lvjH3PxFN8PGCDeqcZWAJ/i+9y+nL85w99PxVzrIvew/GSkSbDYtiGVa85Afg==", + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/tinybench/-/tinybench-2.5.1.tgz", + "integrity": "sha512-65NKvSuAVDP/n4CqH+a9w2kTlLReS9vhsAP06MWx+/89nMinJyB2icyl58RIcqCmIggpojIGeuJGhjU1aGMBSg==", "dev": true }, "node_modules/tinypool": { @@ -5673,9 +6037,9 @@ } }, "node_modules/totalist": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/totalist/-/totalist-3.0.0.tgz", - "integrity": "sha512-eM+pCBxXO/njtF7vdFsHuqb+ElbxqtI4r5EAvk6grfAFyJ6IvWlSkfZ5T9ozC6xWw3Fj1fGoSmrl0gUs46JVIw==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/totalist/-/totalist-3.0.1.tgz", + "integrity": "sha512-sf4i37nQ2LBx4m3wB74y+ubopq6W/dIzXg0FDGjsYnZHVa1Da8FH853wlL2gtUhg+xJXjfk3kUZS3BRoQeoQBQ==", "dev": true, "engines": { "node": ">=6" @@ -5743,6 +6107,57 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/typed-array-buffer": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.0.tgz", + "integrity": "sha512-Y8KTSIglk9OZEr8zywiIHG/kmQ7KWyjseXs1CbSo8vC42w7hg2HgYTxSWwP0+is7bWDc1H+Fo026CpHFwm8tkw==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "get-intrinsic": "^1.2.1", + "is-typed-array": "^1.1.10" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/typed-array-byte-length": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.0.tgz", + "integrity": "sha512-Or/+kvLxNpeQ9DtSydonMxCx+9ZXOswtwJn17SNLvhptaXYDJvkFFP5zbfU/uLmvnBJlI4yrnXRxpdWH/M5tNA==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "for-each": "^0.3.3", + "has-proto": "^1.0.1", + "is-typed-array": "^1.1.10" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/typed-array-byte-offset": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.0.tgz", + "integrity": "sha512-RD97prjEt9EL8YgAgpOkf3O4IF9lhJFr9g0htQkm0rchFp/Vx7LW5Q8fSXXub7BXAODyUQohRMyOc3faCPd0hg==", + "dev": true, + "dependencies": { + "available-typed-arrays": "^1.0.5", + "call-bind": "^1.0.2", + "for-each": "^0.3.3", + "has-proto": "^1.0.1", + "is-typed-array": "^1.1.10" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/typed-array-length": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.4.tgz", @@ -5770,9 +6185,9 @@ "dev": true }, "node_modules/ufo": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/ufo/-/ufo-1.1.1.tgz", - "integrity": "sha512-MvlCc4GHrmZdAllBc0iUDowff36Q9Ndw/UzqmEKyrfSzokTd9ZCy1i+IIk5hrYKkjoYVQyNbrw7/F8XJ2rEwTg==", + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/ufo/-/ufo-1.3.2.tgz", + "integrity": "sha512-o+ORpgGwaYQXgqGDwd+hkS4PuZ3QnmqMMxRuajK/a38L6fTpcE5GPIfrf+L/KemFzfUpeUQc1rRS1iDBozvnFA==", "dev": true }, "node_modules/uglify-js": { @@ -5809,10 +6224,16 @@ "integrity": "sha512-+A5Sja4HP1M08MaXya7p5LvjuM7K6q/2EaC0+iovj/wOcMsTzMvDFbasi/oSapiwOlt252IqsKqPjCl7huKS0A==", "dev": true }, + "node_modules/undici-types": { + "version": "5.26.5", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz", + "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==", + "dev": true + }, "node_modules/universalify": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz", - "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", + "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", "dev": true, "engines": { "node": ">= 10.0.0" @@ -5833,15 +6254,24 @@ "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==", "dev": true }, + "node_modules/version-guard": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/version-guard/-/version-guard-1.1.1.tgz", + "integrity": "sha512-MGQLX89UxmYHgDvcXyjBI0cbmoW+t/dANDppNPrno64rYr8nH4SHSuElQuSYdXGEs0mUzdQe1BY+FhVPNsAmJQ==", + "dev": true, + "engines": { + "node": ">=0.10.48" + } + }, "node_modules/vite": { - "version": "4.3.9", - "resolved": "https://registry.npmjs.org/vite/-/vite-4.3.9.tgz", - "integrity": "sha512-qsTNZjO9NoJNW7KnOrgYwczm0WctJ8m/yqYAMAK9Lxt4SoySUfS5S8ia9K7JHpa3KEeMfyF8LoJ3c5NeBJy6pg==", + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/vite/-/vite-4.5.0.tgz", + "integrity": "sha512-ulr8rNLA6rkyFAlVWw2q5YJ91v098AFQ2R0PRFwPzREXOUJQPtFUG0t+/ZikhaOCDqFoDhN6/v8Sq0o4araFAw==", "dev": true, "dependencies": { - "esbuild": "^0.17.5", - "postcss": "^8.4.23", - "rollup": "^3.21.0" + "esbuild": "^0.18.10", + "postcss": "^8.4.27", + "rollup": "^3.27.1" }, "bin": { "vite": "bin/vite.js" @@ -5849,12 +6279,16 @@ "engines": { "node": "^14.18.0 || >=16.0.0" }, + "funding": { + "url": "https://github.com/vitejs/vite?sponsor=1" + }, "optionalDependencies": { "fsevents": "~2.3.2" }, "peerDependencies": { "@types/node": ">= 14", "less": "*", + "lightningcss": "^1.21.0", "sass": "*", "stylus": "*", "sugarss": "*", @@ -5867,6 +6301,9 @@ "less": { "optional": true }, + "lightningcss": { + "optional": true + }, "sass": { "optional": true }, @@ -5882,9 +6319,9 @@ } }, "node_modules/vite-node": { - "version": "0.29.7", - "resolved": "https://registry.npmjs.org/vite-node/-/vite-node-0.29.7.tgz", - "integrity": "sha512-PakCZLvz37yFfUPWBnLa1OYHPCGm5v4pmRrTcFN4V/N/T3I6tyP3z07S//9w+DdeL7vVd0VSeyMZuAh+449ZWw==", + "version": "0.29.8", + "resolved": "https://registry.npmjs.org/vite-node/-/vite-node-0.29.8.tgz", + "integrity": "sha512-b6OtCXfk65L6SElVM20q5G546yu10/kNrhg08afEoWlFRJXFq9/6glsvSVY+aI6YeC1tu2TtAqI2jHEQmOmsFw==", "dev": true, "dependencies": { "cac": "^6.7.14", @@ -5905,18 +6342,18 @@ } }, "node_modules/vitest": { - "version": "0.29.7", - "resolved": "https://registry.npmjs.org/vitest/-/vitest-0.29.7.tgz", - "integrity": "sha512-aWinOSOu4jwTuZHkb+cCyrqQ116Q9TXaJrNKTHudKBknIpR0VplzeaOUuDF9jeZcrbtQKZQt6yrtd+eakbaxHg==", + "version": "0.29.8", + "resolved": "https://registry.npmjs.org/vitest/-/vitest-0.29.8.tgz", + "integrity": "sha512-JIAVi2GK5cvA6awGpH0HvH/gEG9PZ0a/WoxdiV3PmqK+3CjQMf8c+J/Vhv4mdZ2nRyXFw66sAg6qz7VNkaHfDQ==", "dev": true, "dependencies": { "@types/chai": "^4.3.4", "@types/chai-subset": "^1.3.3", "@types/node": "*", - "@vitest/expect": "0.29.7", - "@vitest/runner": "0.29.7", - "@vitest/spy": "0.29.7", - "@vitest/utils": "0.29.7", + "@vitest/expect": "0.29.8", + "@vitest/runner": "0.29.8", + "@vitest/spy": "0.29.8", + "@vitest/utils": "0.29.8", "acorn": "^8.8.1", "acorn-walk": "^8.2.0", "cac": "^6.7.14", @@ -5932,7 +6369,7 @@ "tinypool": "^0.4.0", "tinyspy": "^1.0.2", "vite": "^3.0.0 || ^4.0.0", - "vite-node": "0.29.7", + "vite-node": "0.29.8", "why-is-node-running": "^2.2.2" }, "bin": { @@ -5949,7 +6386,10 @@ "@vitest/browser": "*", "@vitest/ui": "*", "happy-dom": "*", - "jsdom": "*" + "jsdom": "*", + "playwright": "*", + "safaridriver": "*", + "webdriverio": "*" }, "peerDependenciesMeta": { "@edge-runtime/vm": { @@ -5967,6 +6407,9 @@ "jsdom": { "optional": true }, + "playwright": { + "optional": true + }, "safaridriver": { "optional": true }, @@ -6029,18 +6472,58 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/which-builtin-type": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/which-builtin-type/-/which-builtin-type-1.1.3.tgz", + "integrity": "sha512-YmjsSMDBYsM1CaFiayOVT06+KJeXf0o5M/CAd4o1lTadFAtacTUM49zoYxr/oroopFDfhvN6iEcBxUyc3gvKmw==", + "dev": true, + "dependencies": { + "function.prototype.name": "^1.1.5", + "has-tostringtag": "^1.0.0", + "is-async-function": "^2.0.0", + "is-date-object": "^1.0.5", + "is-finalizationregistry": "^1.0.2", + "is-generator-function": "^1.0.10", + "is-regex": "^1.1.4", + "is-weakref": "^1.0.2", + "isarray": "^2.0.5", + "which-boxed-primitive": "^1.0.2", + "which-collection": "^1.0.1", + "which-typed-array": "^1.1.9" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/which-collection": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/which-collection/-/which-collection-1.0.1.tgz", + "integrity": "sha512-W8xeTUwaln8i3K/cY1nGXzdnVZlidBcagyNFtBdD5kxnb4TvGKR7FfSIS3mYpwWS1QUCutfKz8IY8RjftB0+1A==", + "dev": true, + "dependencies": { + "is-map": "^2.0.1", + "is-set": "^2.0.1", + "is-weakmap": "^2.0.1", + "is-weakset": "^2.0.1" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/which-typed-array": { - "version": "1.1.9", - "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.9.tgz", - "integrity": "sha512-w9c4xkx6mPidwp7180ckYWfMmvxpjlZuIudNtDf4N/tTAUB8VJbX25qZoAsrtGuYNnGw3pa0AXgbGKRB8/EceA==", + "version": "1.1.13", + "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.13.tgz", + "integrity": "sha512-P5Nra0qjSncduVPEAr7xhoF5guty49ArDTwzJ/yNuPIbZppyRxFQsRCWrocxIY+CnMVG+qfbU2FmDKyvSGClow==", "dev": true, "dependencies": { "available-typed-arrays": "^1.0.5", - "call-bind": "^1.0.2", + "call-bind": "^1.0.4", "for-each": "^0.3.3", "gopd": "^1.0.1", - "has-tostringtag": "^1.0.0", - "is-typed-array": "^1.1.10" + "has-tostringtag": "^1.0.0" }, "engines": { "node": ">= 0.4" @@ -6065,15 +6548,6 @@ "node": ">=8" } }, - "node_modules/word-wrap": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz", - "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/wordwrap": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz", @@ -6119,6 +6593,35 @@ "url": "https://github.com/chalk/wrap-ansi?sponsor=1" } }, + "node_modules/wrap-ansi/node_modules/emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "dev": true + }, + "node_modules/wrap-ansi/node_modules/is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/wrap-ansi/node_modules/string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dev": true, + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/wrappy": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", @@ -6182,6 +6685,35 @@ "node": ">=10" } }, + "node_modules/yargs/node_modules/emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "dev": true + }, + "node_modules/yargs/node_modules/is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/yargs/node_modules/string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dev": true, + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/yocto-queue": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", @@ -6195,13 +6727,34 @@ } }, "node_modules/zip-stream": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/zip-stream/-/zip-stream-4.1.0.tgz", - "integrity": "sha512-zshzwQW7gG7hjpBlgeQP9RuyPGNxvJdzR8SUM3QhxCnLjWN2E7j3dOvpeDcQoETfHx0urRS7EtmVToql7YpU4A==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/zip-stream/-/zip-stream-4.1.1.tgz", + "integrity": "sha512-9qv4rlDiopXg4E69k+vMHjNN63YFMe9sZMrdlvKnCjlCRWeCBswPPMPUfx+ipsAWq1LXHe70RcbaHdJJpS6hyQ==", "dev": true, "dependencies": { - "archiver-utils": "^2.1.0", - "compress-commons": "^4.1.0", + "archiver-utils": "^3.0.4", + "compress-commons": "^4.1.2", + "readable-stream": "^3.6.0" + }, + "engines": { + "node": ">= 10" + } + }, + "node_modules/zip-stream/node_modules/archiver-utils": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/archiver-utils/-/archiver-utils-3.0.4.tgz", + "integrity": "sha512-KVgf4XQVrTjhyWmx6cte4RxonPLR9onExufI1jhvw/MQ4BB6IsZD5gT8Lq+u/+pRkWna/6JoHpiQioaqFP5Rzw==", + "dev": true, + "dependencies": { + "glob": "^7.2.3", + "graceful-fs": "^4.2.0", + "lazystream": "^1.0.0", + "lodash.defaults": "^4.2.0", + "lodash.difference": "^4.5.0", + "lodash.flatten": "^4.4.0", + "lodash.isplainobject": "^4.0.6", + "lodash.union": "^4.6.0", + "normalize-path": "^3.0.0", "readable-stream": "^3.6.0" }, "engines": { @@ -6210,6 +6763,12 @@ } }, "dependencies": { + "@aashutoshrathi/word-wrap": { + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz", + "integrity": "sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==", + "dev": true + }, "@babel/generator": { "version": "7.18.2", "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.18.2.tgz", @@ -6222,21 +6781,21 @@ } }, "@babel/helper-string-parser": { - "version": "7.19.4", - "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz", - "integrity": "sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz", + "integrity": "sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==", "dev": true }, "@babel/helper-validator-identifier": { - "version": "7.19.1", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz", - "integrity": "sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==", + "version": "7.22.20", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz", + "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==", "dev": true }, "@babel/parser": { - "version": "7.21.3", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.21.3.tgz", - "integrity": "sha512-lobG0d7aOfQRXh8AyklEAgZGvA4FShxo6xQbUrrT/cNBPUdIDojlokwJsQyCC/eKia7ifqM0yP+2DRZ4WKw2RQ==", + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.3.tgz", + "integrity": "sha512-uVsWNvlVsIninV2prNz/3lHCb+5CJ+e+IUBfbjToAHODtfGYLfCFuY4AU7TskI+dAKk+njsPiBjq1gKTvZOBaw==", "dev": true }, "@babel/types": { @@ -6251,156 +6810,156 @@ } }, "@esbuild/android-arm": { - "version": "0.17.13", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.17.13.tgz", - "integrity": "sha512-5tZZ/hLIfBmt7E8JsE5KbsknoAFmoElkg+A/gjyPtmSQvJjPf+9GsSJihid8VMa08lrsYyaEXOT9RLh3xXQONw==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.18.20.tgz", + "integrity": "sha512-fyi7TDI/ijKKNZTUJAQqiG5T7YjJXgnzkURqmGj13C6dCqckZBLdl4h7bkhHt/t0WP+zO9/zwroDvANaOqO5Sw==", "dev": true, "optional": true }, "@esbuild/android-arm64": { - "version": "0.17.13", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.17.13.tgz", - "integrity": "sha512-F5DgvJMV2ZEpLNpPCO7FEk1wy8O5tg6cikWSB6uvvncsgE1xgbPlm+Boio/4820C2/mj713X83X1h01v0qoeHg==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.18.20.tgz", + "integrity": "sha512-Nz4rJcchGDtENV0eMKUNa6L12zz2zBDXuhj/Vjh18zGqB44Bi7MBMSXjgunJgjRhCmKOjnPuZp4Mb6OKqtMHLQ==", "dev": true, "optional": true }, "@esbuild/android-x64": { - "version": "0.17.13", - "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.17.13.tgz", - "integrity": "sha512-5m1UUslzpfVrumG3m3Zv2x9VNAcvMOQWJy009y6jt10tcHpzIq2/b0I0k4fz0QYqGSNS1GteRIhVPN4H7OyCXg==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.18.20.tgz", + "integrity": "sha512-8GDdlePJA8D6zlZYJV/jnrRAi6rOiNaCC/JclcXpB+KIuvfBN4owLtgzY2bsxnx666XjJx2kDPUmnTtR8qKQUg==", "dev": true, "optional": true }, "@esbuild/darwin-arm64": { - "version": "0.17.13", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.17.13.tgz", - "integrity": "sha512-TXbXp/05r7heRsG8yWwbHw9diay+wXIyRNcIHFoNARRIGahYbTW/qwJzE37zkfxLIUPHgR/SyLTUlnTICg14ag==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.18.20.tgz", + "integrity": "sha512-bxRHW5kHU38zS2lPTPOyuyTm+S+eobPUnTNkdJEfAddYgEcll4xkT8DB9d2008DtTbl7uJag2HuE5NZAZgnNEA==", "dev": true, "optional": true }, "@esbuild/darwin-x64": { - "version": "0.17.13", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.17.13.tgz", - "integrity": "sha512-Ku9Db2sblCxFvQdEO7X9nBaLR/S81uch81e2Q2+Os5z1NcnsFjuqhIYH0Gm6KNNpIKaEbC7gCLbiIPbLLMX4Pg==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.18.20.tgz", + "integrity": "sha512-pc5gxlMDxzm513qPGbCbDukOdsGtKhfxD1zJKXjCCcU7ju50O7MeAZ8c4krSJcOIJGFR+qx21yMMVYwiQvyTyQ==", "dev": true, "optional": true }, "@esbuild/freebsd-arm64": { - "version": "0.17.13", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.17.13.tgz", - "integrity": "sha512-t1T5/nIf2j+FdSf1Fa3dcU0cXycr0nK4xJe52qjWa+1I249mM5NBY1ODjiabZxZ0x3CG05y4fd9bxfDLy9kQtA==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.18.20.tgz", + "integrity": "sha512-yqDQHy4QHevpMAaxhhIwYPMv1NECwOvIpGCZkECn8w2WFHXjEwrBn3CeNIYsibZ/iZEUemj++M26W3cNR5h+Tw==", "dev": true, "optional": true }, "@esbuild/freebsd-x64": { - "version": "0.17.13", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.17.13.tgz", - "integrity": "sha512-/zbkgEO4gY2qGZr9UNAGI38w/FwUY4bx4EC88k9VeiCKNr3ukNgwH/oIgB5Z9/OqpkNLlcS4w9e2d/MIiy5fbw==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.18.20.tgz", + "integrity": "sha512-tgWRPPuQsd3RmBZwarGVHZQvtzfEBOreNuxEMKFcd5DaDn2PbBxfwLcj4+aenoh7ctXcbXmOQIn8HI6mCSw5MQ==", "dev": true, "optional": true }, "@esbuild/linux-arm": { - "version": "0.17.13", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.17.13.tgz", - "integrity": "sha512-RrhjzrCF6aCDH248nUAQoldnRmN7nHMxv85GOj5AH+qkxxYvcig7fnUmgANngntRu4btXhN9WKHMgQ5seERDMw==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.18.20.tgz", + "integrity": "sha512-/5bHkMWnq1EgKr1V+Ybz3s1hWXok7mDFUMQ4cG10AfW3wL02PSZi5kFpYKrptDsgb2WAJIvRcDm+qIvXf/apvg==", "dev": true, "optional": true }, "@esbuild/linux-arm64": { - "version": "0.17.13", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.17.13.tgz", - "integrity": "sha512-siu3QZrQ7eGrSttvFaRKyjT7kNRbUuHEKzCCyqRh19MbpGokGY13jbIsBEjx6JmH3T50hds325oweS9Ey2ihAQ==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.18.20.tgz", + "integrity": "sha512-2YbscF+UL7SQAVIpnWvYwM+3LskyDmPhe31pE7/aoTMFKKzIc9lLbyGUpmmb8a8AixOL61sQ/mFh3jEjHYFvdA==", "dev": true, "optional": true }, "@esbuild/linux-ia32": { - "version": "0.17.13", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.17.13.tgz", - "integrity": "sha512-ADHA1PqP5gIegehVP0RvxMmNPxpLgetI8QCwYOjUheGXKIKWSdUN8ZS3rusQv3NGZmFCpYdMZzFoI0QtzzGAdw==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.18.20.tgz", + "integrity": "sha512-P4etWwq6IsReT0E1KHU40bOnzMHoH73aXp96Fs8TIT6z9Hu8G6+0SHSw9i2isWrD2nbx2qo5yUqACgdfVGx7TA==", "dev": true, "optional": true }, "@esbuild/linux-loong64": { - "version": "0.17.13", - "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.17.13.tgz", - "integrity": "sha512-n1JQPxETmR0brkpWlJHeohReEPLH+m00bnJdNnFyHN3zLBt1QypevuZSmnmFWsC+7r7HTwWILj3lBDjtPH3ydg==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.18.20.tgz", + "integrity": "sha512-nXW8nqBTrOpDLPgPY9uV+/1DjxoQ7DoB2N8eocyq8I9XuqJ7BiAMDMf9n1xZM9TgW0J8zrquIb/A7s3BJv7rjg==", "dev": true, "optional": true }, "@esbuild/linux-mips64el": { - "version": "0.17.13", - "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.17.13.tgz", - "integrity": "sha512-d0pnD/j5KKQ43xtSIvOD+wNIy6D/Vh9GbXVRa3u4zCyiJMYWjxkPkbBzlEgNjdDmUM+5gBFen9k7B8Xscy+Myg==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.18.20.tgz", + "integrity": "sha512-d5NeaXZcHp8PzYy5VnXV3VSd2D328Zb+9dEq5HE6bw6+N86JVPExrA6O68OPwobntbNJ0pzCpUFZTo3w0GyetQ==", "dev": true, "optional": true }, "@esbuild/linux-ppc64": { - "version": "0.17.13", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.17.13.tgz", - "integrity": "sha512-C9sMpa/VcGLjVtsT01sXtzZNS7bAZ+icUclkKkiUwBQ9hzT+J+/Xpj+EykI5hB3KgtxQVo4XUahanFoZNxbQ1g==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.18.20.tgz", + "integrity": "sha512-WHPyeScRNcmANnLQkq6AfyXRFr5D6N2sKgkFo2FqguP44Nw2eyDlbTdZwd9GYk98DZG9QItIiTlFLHJHjxP3FA==", "dev": true, "optional": true }, "@esbuild/linux-riscv64": { - "version": "0.17.13", - "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.17.13.tgz", - "integrity": "sha512-jYkc5EpNpvjccAHNYekiAtklusVGWftR0VVLtng7dJzDyy+5adAsf1fOG3LllP0WALxS55/w6boLE/728J/bXw==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.18.20.tgz", + "integrity": "sha512-WSxo6h5ecI5XH34KC7w5veNnKkju3zBRLEQNY7mv5mtBmrP/MjNBCAlsM2u5hDBlS3NGcTQpoBvRzqBcRtpq1A==", "dev": true, "optional": true }, "@esbuild/linux-s390x": { - "version": "0.17.13", - "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.17.13.tgz", - "integrity": "sha512-4jAJI5O6E/hATL4lsrG2A+noDjZ377KlATVFKwV3SWaNHj+OvoXe/T84ScQIXEtPI7ndJyLkMYruXj8RR5Ilyw==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.18.20.tgz", + "integrity": "sha512-+8231GMs3mAEth6Ja1iK0a1sQ3ohfcpzpRLH8uuc5/KVDFneH6jtAJLFGafpzpMRO6DzJ6AvXKze9LfFMrIHVQ==", "dev": true, "optional": true }, "@esbuild/linux-x64": { - "version": "0.17.13", - "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.17.13.tgz", - "integrity": "sha512-eFLQhJq98qijGRcv9je/9M4Mz1suZ+pOtj62ArsLd0gubNGhhQDz6T30X2X3f1KZ8lkKkr+zN5vtZzx1GAMoFw==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.18.20.tgz", + "integrity": "sha512-UYqiqemphJcNsFEskc73jQ7B9jgwjWrSayxawS6UVFZGWrAAtkzjxSqnoclCXxWtfwLdzU+vTpcNYhpn43uP1w==", "dev": true, "optional": true }, "@esbuild/netbsd-x64": { - "version": "0.17.13", - "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.17.13.tgz", - "integrity": "sha512-F8PXDeT+3eQpPjf4bmNJapPLu0SKKlWRGPQvBQqVS+YDGoMKnyyYp2UENLFMV8zT7kS39zKxZRZvUL3fMz/7Ww==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.18.20.tgz", + "integrity": "sha512-iO1c++VP6xUBUmltHZoMtCUdPlnPGdBom6IrO4gyKPFFVBKioIImVooR5I83nTew5UOYrk3gIJhbZh8X44y06A==", "dev": true, "optional": true }, "@esbuild/openbsd-x64": { - "version": "0.17.13", - "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.17.13.tgz", - "integrity": "sha512-9jWfzbFCnIZdHjNs+00KQHArUbp7kjQDNmiuqkwGOQFs67m4/dKNupBv2DP5hTqVlQY4tW4RG3qpb6Y3zOHJeA==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.18.20.tgz", + "integrity": "sha512-e5e4YSsuQfX4cxcygw/UCPIEP6wbIL+se3sxPdCiMbFLBWu0eiZOJ7WoD+ptCLrmjZBK1Wk7I6D/I3NglUGOxg==", "dev": true, "optional": true }, "@esbuild/sunos-x64": { - "version": "0.17.13", - "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.17.13.tgz", - "integrity": "sha512-ALbOMlTIBkAVi6KqYjONa7u2oH95RN7OpetFqMtjufFLBiSaayRuwUzhs2yuR9CfGT4qi0jv6HQDav+EG314TQ==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.18.20.tgz", + "integrity": "sha512-kDbFRFp0YpTQVVrqUd5FTYmWo45zGaXe0X8E1G/LKFC0v8x0vWrhOWSLITcCn63lmZIxfOMXtCfti/RxN/0wnQ==", "dev": true, "optional": true }, "@esbuild/win32-arm64": { - "version": "0.17.13", - "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.17.13.tgz", - "integrity": "sha512-FJBLYL4PkrZGeuHzEqme+0DjNetxkJ+XbB+Aoeow7aQ53JCwsA0/mo8sS5aPkDHgCnMkN4A5GLoFTlDj3BKDrQ==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.18.20.tgz", + "integrity": "sha512-ddYFR6ItYgoaq4v4JmQQaAI5s7npztfV4Ag6NrhiaW0RrnOXqBkgwZLofVTlq1daVTQNhtI5oieTvkRPfZrePg==", "dev": true, "optional": true }, "@esbuild/win32-ia32": { - "version": "0.17.13", - "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.17.13.tgz", - "integrity": "sha512-Qrvst9RkLz4qgi3hqswNliYuKW92/HGJnd7xLWkGaGPa8S4qsONf81FW0ebDc5iUHb0I7QJwQATutvghTabnFA==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.18.20.tgz", + "integrity": "sha512-Wv7QBi3ID/rROT08SABTS7eV4hX26sVduqDOTe1MvGMjNd3EjOz4b7zeexIR62GTIEKrfJXKL9LFxTYgkyeu7g==", "dev": true, "optional": true }, "@esbuild/win32-x64": { - "version": "0.17.13", - "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.17.13.tgz", - "integrity": "sha512-pZ/NIgz861XaUPlIkPFjP55nJ4PJa0o/CD4zgeRb1Q9FVE+8GvdB6ifJcK05jRhny5hKExhnRFIdgHmmCYH8vg==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.18.20.tgz", + "integrity": "sha512-kTdfRcSiDfQca/y9QIkng02avJ+NCaQvrMejlsB3RRv5sE9rRoeBPISaZpKxHELzRxZyLvNts1P27W3wV+8geQ==", "dev": true, "optional": true }, @@ -6414,20 +6973,20 @@ } }, "@eslint-community/regexpp": { - "version": "4.4.1", - "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.4.1.tgz", - "integrity": "sha512-BISJ6ZE4xQsuL/FmsyRaiffpq977bMlsKfGHTQrOGFErfByxIe6iZTxPf/00Zon9b9a7iUykfQwejN3s2ZW/Bw==", + "version": "4.10.0", + "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.10.0.tgz", + "integrity": "sha512-Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA==", "dev": true }, "@eslint/eslintrc": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.0.1.tgz", - "integrity": "sha512-eFRmABvW2E5Ho6f5fHLqgena46rOj7r7OKHYfLElqcBfGFHHpjBhivyi5+jOEQuSpdc/1phIZJlbC2te+tZNIw==", + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.3.tgz", + "integrity": "sha512-yZzuIG+jnVu6hNSzFEN07e8BxF3uAzYtQb6uDkaYZLo6oYZDCq454c5kB8zxnzfCYyP4MIuyBn10L0DqwujTmA==", "dev": true, "requires": { "ajv": "^6.12.4", "debug": "^4.3.2", - "espree": "^9.5.0", + "espree": "^9.6.0", "globals": "^13.19.0", "ignore": "^5.2.0", "import-fresh": "^3.2.1", @@ -6437,18 +6996,18 @@ } }, "@eslint/js": { - "version": "8.36.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.36.0.tgz", - "integrity": "sha512-lxJ9R5ygVm8ZWgYdUweoq5ownDlJ4upvoWmO4eLxBYHdMo+vZ/Rx0EN6MbKWDJOSUGrqJy2Gt+Dyv/VKml0fjg==", + "version": "8.54.0", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.54.0.tgz", + "integrity": "sha512-ut5V+D+fOoWPgGGNj83GGjnntO39xDy6DWxO0wb7Jp3DcMX0TfIqdzHF85VTQkerdyGmuuMD9AKAo5KiNlf/AQ==", "dev": true }, "@humanwhocodes/config-array": { - "version": "0.11.8", - "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.8.tgz", - "integrity": "sha512-UybHIJzJnR5Qc/MsD9Kr+RpO2h+/P1GhOwdiLPXK5TWk5sgTdu88bTD9UP+CKbPPh5Rni1u0GjAdYQLemG8g+g==", + "version": "0.11.13", + "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.13.tgz", + "integrity": "sha512-JSBDMiDKSzQVngfRjOdFXgFfklaXI4K9nLF49Auh21lmBWRLIK3+xTErTWD4KU54pb6coM6ESE7Awz/FNU3zgQ==", "dev": true, "requires": { - "@humanwhocodes/object-schema": "^1.2.1", + "@humanwhocodes/object-schema": "^2.0.1", "debug": "^4.1.1", "minimatch": "^3.0.5" } @@ -6460,15 +7019,15 @@ "dev": true }, "@humanwhocodes/object-schema": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz", - "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.1.tgz", + "integrity": "sha512-dvuCeX5fC9dXgJn9t+X5atfmgQAzUOWqS1254Gh0m6i8wKd10ebXkfNKiRK+1GWi/yTvvLDHpoxLr0xxxeslWw==", "dev": true }, "@jridgewell/gen-mapping": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz", - "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==", + "version": "0.3.3", + "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz", + "integrity": "sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==", "dev": true, "requires": { "@jridgewell/set-array": "^1.0.1", @@ -6477,9 +7036,9 @@ } }, "@jridgewell/resolve-uri": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz", - "integrity": "sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz", + "integrity": "sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA==", "dev": true }, "@jridgewell/set-array": { @@ -6489,25 +7048,25 @@ "dev": true }, "@jridgewell/sourcemap-codec": { - "version": "1.4.14", - "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz", - "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==", + "version": "1.4.15", + "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz", + "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==", "dev": true }, "@jridgewell/trace-mapping": { - "version": "0.3.17", - "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.17.tgz", - "integrity": "sha512-MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g==", + "version": "0.3.20", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.20.tgz", + "integrity": "sha512-R8LcPeWZol2zR8mmH3JeKQ6QRCFb7XgUhV9ZlGhHLGyg4wpPiPZNQOOWhFZhxKw8u//yTbNGI42Bx/3paXEQ+Q==", "dev": true, "requires": { - "@jridgewell/resolve-uri": "3.1.0", - "@jridgewell/sourcemap-codec": "1.4.14" + "@jridgewell/resolve-uri": "^3.1.0", + "@jridgewell/sourcemap-codec": "^1.4.14" } }, "@jsdoc/salty": { - "version": "0.2.5", - "resolved": "https://registry.npmjs.org/@jsdoc/salty/-/salty-0.2.5.tgz", - "integrity": "sha512-TfRP53RqunNe2HBobVBJ0VLhK1HbfvBYeTC1ahnN64PWvyYyGebmMiPkuwvD9fpw2ZbkoPb8Q7mwy0aR8Z9rvw==", + "version": "0.2.6", + "resolved": "https://registry.npmjs.org/@jsdoc/salty/-/salty-0.2.6.tgz", + "integrity": "sha512-aA+awb5yoml8TQ3CzI5Ue7sM3VMRC4l1zJJW4fgZ8OCL1wshJZhNzaf0PL85DSnOUw6QuFgeHGD/eq/xwwAF2g==", "dev": true, "requires": { "lodash": "^4.17.21" @@ -6540,27 +7099,27 @@ } }, "@polka/url": { - "version": "1.0.0-next.21", - "resolved": "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.21.tgz", - "integrity": "sha512-a5Sab1C4/icpTZVzZc5Ghpz88yQtGOyNqYXcZgOssB2uuAr+wF/MvN6bgtW32q7HHrvBki+BsZ0OuNv6EV3K9g==", + "version": "1.0.0-next.23", + "resolved": "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.23.tgz", + "integrity": "sha512-C16M+IYz0rgRhWZdCmK+h58JMv8vijAA61gmz2rspCSwKwzBebpdcsiUmwrtJRdphuY30i6BSLEOP8ppbNLyLg==", "dev": true }, "@raylib/api": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/@raylib/api/-/api-4.5.0.tgz", - "integrity": "sha512-T2jRHIHV2QNERbqgZFPkRGtyAnLDXSd3jOEV7SKIORcHp40k4W/pbqbscIsdF+LfC3e9dmilgNTRRGkJafo3Tg==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/@raylib/api/-/api-5.0.0.tgz", + "integrity": "sha512-zpPsQqfurgHLf+W4kdsYNSs5RoOgs4x8YkmjDQ5ZsXUT8lPDDTekoryBf5W9pqlK5P9oXdP2AIrortx2JvzEtw==", "dev": true }, "@types/chai": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.3.4.tgz", - "integrity": "sha512-KnRanxnpfpjUTqTCXslZSEdLfXExwgNxYPdiO2WGUj8+HDjFi8R3k5RVKPeSCzLjCcshCAtVO2QBbVuAV4kTnw==", + "version": "4.3.10", + "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.3.10.tgz", + "integrity": "sha512-of+ICnbqjmFCiixUnqRulbylyXQrPqIGf/B3Jax1wIF3DvSheysQxAWvqHhZiW3IQrycvokcLcFQlveGp+vyNg==", "dev": true }, "@types/chai-subset": { - "version": "1.3.3", - "resolved": "https://registry.npmjs.org/@types/chai-subset/-/chai-subset-1.3.3.tgz", - "integrity": "sha512-frBecisrNGz+F4T6bcc+NLeolfiojh5FxW2klu669+8BARtyQv2C/GkNW6FUodVe4BroGMP/wER/YDGc7rEllw==", + "version": "1.3.5", + "resolved": "https://registry.npmjs.org/@types/chai-subset/-/chai-subset-1.3.5.tgz", + "integrity": "sha512-c2mPnw+xHtXDoHmdtcCXGwyLMiauiAyxWMzhGpqHC4nqI/Y5G2XhTampslK2rb59kpcuHon03UH8W6iYUzw88A==", "dev": true, "requires": { "@types/chai": "*" @@ -6573,9 +7132,9 @@ "dev": true }, "@types/linkify-it": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/@types/linkify-it/-/linkify-it-3.0.2.tgz", - "integrity": "sha512-HZQYqbiFVWufzCwexrvh694SOim8z2d+xJl5UNamcvQFejLY/2YUtzXHYi3cHdI7PMlS8ejH2slRAOJQ32aNbA==", + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/@types/linkify-it/-/linkify-it-3.0.5.tgz", + "integrity": "sha512-yg6E+u0/+Zjva+buc3EIb+29XEg4wltq7cSmd4Uc2EE/1nUVmxyzpX6gUXD0V8jIrG0r7YeOGVIbYRkxeooCtw==", "dev": true }, "@types/markdown-it": { @@ -6589,35 +7148,44 @@ } }, "@types/mdurl": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/@types/mdurl/-/mdurl-1.0.2.tgz", - "integrity": "sha512-eC4U9MlIcu2q0KQmXszyn5Akca/0jrQmwDRgpAMJai7qBWq4amIQhZyNau4VYGtCeALvW1/NtjzJJ567aZxfKA==", + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/@types/mdurl/-/mdurl-1.0.5.tgz", + "integrity": "sha512-6L6VymKTzYSrEf4Nev4Xa1LCHKrlTlYCBMTlQKFuddo1CvQcE52I0mwfOJayueUC7MJuXOeHTcIU683lzd0cUA==", "dev": true }, "@types/node": { - "version": "18.15.10", - "resolved": "https://registry.npmjs.org/@types/node/-/node-18.15.10.tgz", - "integrity": "sha512-9avDaQJczATcXgfmMAW3MIWArOO7A+m90vuCFLr8AotWf8igO/mRoYukrk2cqZVtv38tHs33retzHEilM7FpeQ==", + "version": "20.9.2", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.9.2.tgz", + "integrity": "sha512-WHZXKFCEyIUJzAwh3NyyTHYSR35SevJ6mZ1nWwJafKtiQbqRTIKSRcw3Ma3acqgsent3RRDqeVwpHntMk+9irg==", + "dev": true, + "requires": { + "undici-types": "~5.26.4" + } + }, + "@ungap/structured-clone": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz", + "integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==", "dev": true }, "@vitest/expect": { - "version": "0.29.7", - "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-0.29.7.tgz", - "integrity": "sha512-UtG0tW0DP6b3N8aw7PHmweKDsvPv4wjGvrVZW7OSxaFg76ShtVdMiMcUkZJgCE8QWUmhwaM0aQhbbVLo4F4pkA==", + "version": "0.29.8", + "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-0.29.8.tgz", + "integrity": "sha512-xlcVXn5I5oTq6NiZSY3ykyWixBxr5mG8HYtjvpgg6KaqHm0mvhX18xuwl5YGxIRNt/A5jidd7CWcNHrSvgaQqQ==", "dev": true, "requires": { - "@vitest/spy": "0.29.7", - "@vitest/utils": "0.29.7", + "@vitest/spy": "0.29.8", + "@vitest/utils": "0.29.8", "chai": "^4.3.7" } }, "@vitest/runner": { - "version": "0.29.7", - "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-0.29.7.tgz", - "integrity": "sha512-Yt0+csM945+odOx4rjZSjibQfl2ymxqVsmYz6sO2fiO5RGPYDFCo60JF6tLL9pz4G/kjY4irUxadeB1XT+H1jg==", + "version": "0.29.8", + "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-0.29.8.tgz", + "integrity": "sha512-FzdhnRDwEr/A3Oo1jtIk/B952BBvP32n1ObMEb23oEJNO+qO5cBet6M2XWIDQmA7BDKGKvmhUf2naXyp/2JEwQ==", "dev": true, "requires": { - "@vitest/utils": "0.29.7", + "@vitest/utils": "0.29.8", "p-limit": "^4.0.0", "pathe": "^1.1.0" }, @@ -6640,18 +7208,18 @@ } }, "@vitest/spy": { - "version": "0.29.7", - "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-0.29.7.tgz", - "integrity": "sha512-IalL0iO6A6Xz8hthR8sctk6ZS//zVBX48EiNwQguYACdgdei9ZhwMaBFV70mpmeYAFCRAm+DpoFHM5470Im78A==", + "version": "0.29.8", + "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-0.29.8.tgz", + "integrity": "sha512-VdjBe9w34vOMl5I5mYEzNX8inTxrZ+tYUVk9jxaZJmHFwmDFC/GV3KBFTA/JKswr3XHvZL+FE/yq5EVhb6pSAw==", "dev": true, "requires": { "tinyspy": "^1.0.2" } }, "@vitest/ui": { - "version": "0.29.7", - "resolved": "https://registry.npmjs.org/@vitest/ui/-/ui-0.29.7.tgz", - "integrity": "sha512-KeOztcAldlFU5i8DKCQcmGrih1dVowurZy/9iPz5JyQdPJzej+nW1nI4nYvc4ZmUtA8+IAe9uViqnU7IXc1RNw==", + "version": "0.29.8", + "resolved": "https://registry.npmjs.org/@vitest/ui/-/ui-0.29.8.tgz", + "integrity": "sha512-+vbLd+c1R/XUWfzJsWeyjeiw13fwJ95I5tguxaqXRg61y9iYUKesVljg7Pttp2uo7VK+kAjvY91J41NZ1Vx3vg==", "dev": true, "requires": { "fast-glob": "^3.2.12", @@ -6662,9 +7230,9 @@ } }, "@vitest/utils": { - "version": "0.29.7", - "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-0.29.7.tgz", - "integrity": "sha512-vNgGadp2eE5XKCXtZXL5UyNEDn68npSct75OC9AlELenSK0DiV1Mb9tfkwJHKjRb69iek+e79iipoJx8+s3SdA==", + "version": "0.29.8", + "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-0.29.8.tgz", + "integrity": "sha512-qGzuf3vrTbnoY+RjjVVIBYfuWMjn3UMUqyQtdGNZ6ZIIyte7B37exj6LaVkrZiUTvzSadVvO/tJm8AEgbGCBPg==", "dev": true, "requires": { "cli-truncate": "^3.1.0", @@ -6674,9 +7242,9 @@ } }, "acorn": { - "version": "8.8.2", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.2.tgz", - "integrity": "sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==", + "version": "8.11.2", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.11.2.tgz", + "integrity": "sha512-nc0Axzp/0FILLEVsm4fNwLCwMttvhEI263QtVPQcbpfZZ3ts0hLsZGOpE6czNlid7CJ9MlyH8reXkpsf3YUY4w==", "dev": true }, "acorn-jsx": { @@ -6687,9 +7255,9 @@ "requires": {} }, "acorn-walk": { - "version": "8.2.0", - "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz", - "integrity": "sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==", + "version": "8.3.0", + "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.0.tgz", + "integrity": "sha512-FS7hV565M5l1R08MXqo8odwMTB02C2UqzB17RVgu9EyuYFBqJZ3/ZY97sQD5FewVu1UyDFc1yztUDrAwT0EypA==", "dev": true }, "agent-base": { @@ -6746,16 +7314,16 @@ } }, "archiver": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/archiver/-/archiver-5.3.1.tgz", - "integrity": "sha512-8KyabkmbYrH+9ibcTScQ1xCJC/CGcugdVIwB+53f5sZziXgwUh3iXlAlANMxcZyDEfTHMe6+Z5FofV8nopXP7w==", + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/archiver/-/archiver-5.3.2.tgz", + "integrity": "sha512-+25nxyyznAXF7Nef3y0EbBeqmGZgeN/BxHX29Rs39djAfaFalmQ89SE6CWyDCHzGL0yt/ycBtNOmGTW0FyGWNw==", "dev": true, "requires": { "archiver-utils": "^2.1.0", - "async": "^3.2.3", + "async": "^3.2.4", "buffer-crc32": "^0.2.1", "readable-stream": "^3.6.0", - "readdir-glob": "^1.0.0", + "readdir-glob": "^1.1.2", "tar-stream": "^2.2.0", "zip-stream": "^4.1.0" } @@ -6778,6 +7346,12 @@ "readable-stream": "^2.0.0" }, "dependencies": { + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==", + "dev": true + }, "readable-stream": { "version": "2.3.8", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz", @@ -6833,15 +7407,15 @@ } }, "array-includes": { - "version": "3.1.6", - "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.6.tgz", - "integrity": "sha512-sgTbLvL6cNnw24FnbaDyjmvddQ2ML8arZsgaJhoABMoplz/4QRhtrYS+alr1BUM1Bwp6dhx8vVCBSLG+StwOFw==", + "version": "3.1.7", + "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.7.tgz", + "integrity": "sha512-dlcsNBIiWhPkHdOEEKnehA+RNUWDc4UqFtnIXU4uuYDPtA4LDkr7qip2p0VvFAEXNDr0yWZ9PJyIRiGjRLQzwQ==", "dev": true, "requires": { "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4", - "get-intrinsic": "^1.1.3", + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1", + "get-intrinsic": "^1.2.1", "is-string": "^1.0.7" } }, @@ -6851,41 +7425,69 @@ "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==", "dev": true }, + "array.prototype.findlastindex": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.3.tgz", + "integrity": "sha512-LzLoiOMAxvy+Gd3BAq3B7VeIgPdo+Q8hthvKtXybMvRV0jrXfJM/t8mw7nNlpEcVlVUnCnM2KSX4XU5HmpodOA==", + "dev": true, + "requires": { + "call-bind": "^1.0.2", + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1", + "es-shim-unscopables": "^1.0.0", + "get-intrinsic": "^1.2.1" + } + }, "array.prototype.flat": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.1.tgz", - "integrity": "sha512-roTU0KWIOmJ4DRLmwKd19Otg0/mT3qPNt0Qb3GWW8iObuZXxrjB/pzn0R3hqpRSWg4HCwqx+0vwOnWnvlOyeIA==", + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.2.tgz", + "integrity": "sha512-djYB+Zx2vLewY8RWlNCUdHjDXs2XOgm602S9E7P/UpHgfeHL00cRiIF+IN/G/aUJ7kGPb6yO/ErDI5V2s8iycA==", "dev": true, "requires": { "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4", + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1", "es-shim-unscopables": "^1.0.0" } }, "array.prototype.flatmap": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.1.tgz", - "integrity": "sha512-8UGn9O1FDVvMNB0UlLv4voxRMze7+FpHyF5mSMRjWHUMlpoDViniy05870VlxhfgTnLbpuwTzvD76MTtWxB/mQ==", + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.2.tgz", + "integrity": "sha512-Ewyx0c9PmpcsByhSW4r+9zDU7sGjFc86qf/kKtuSCRdhfbk0SNLLkaT5qvcHnRGgc5NP/ly/y+qkXkqONX54CQ==", "dev": true, "requires": { "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4", + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1", "es-shim-unscopables": "^1.0.0" } }, "array.prototype.tosorted": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/array.prototype.tosorted/-/array.prototype.tosorted-1.1.1.tgz", - "integrity": "sha512-pZYPXPRl2PqWcsUs6LOMn+1f1532nEoPTYowBtqLwAW+W8vSVhkIGnmOX1t/UQjD6YGI0vcD2B1U7ZFGQH9jnQ==", + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/array.prototype.tosorted/-/array.prototype.tosorted-1.1.2.tgz", + "integrity": "sha512-HuQCHOlk1Weat5jzStICBCd83NxiIMwqDg/dHEsoefabn/hJRj5pVdWcPUSpRrwhwxZOsQassMpgN/xRYFBMIg==", "dev": true, "requires": { "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4", + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1", "es-shim-unscopables": "^1.0.0", - "get-intrinsic": "^1.1.3" + "get-intrinsic": "^1.2.1" + } + }, + "arraybuffer.prototype.slice": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.2.tgz", + "integrity": "sha512-yMBKppFur/fbHu9/6USUe03bZ4knMYiwFBcyiaXB8Go0qNehwX6inYPzK9U0NeQvGxKthcmHcaR8P5MStSRBAw==", + "dev": true, + "requires": { + "array-buffer-byte-length": "^1.0.0", + "call-bind": "^1.0.2", + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1", + "get-intrinsic": "^1.2.1", + "is-array-buffer": "^3.0.2", + "is-shared-array-buffer": "^1.0.2" } }, "assertion-error": { @@ -6895,11 +7497,20 @@ "dev": true }, "async": { - "version": "3.2.4", - "resolved": "https://registry.npmjs.org/async/-/async-3.2.4.tgz", - "integrity": "sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ==", + "version": "3.2.5", + "resolved": "https://registry.npmjs.org/async/-/async-3.2.5.tgz", + "integrity": "sha512-baNZyqaaLhyLVKm/DlvdW051MSgO6b8eVfIezl9E5PqWxFgzLm/wQntEW4zOytVburDEr0JlALEpdOFwvErLsg==", "dev": true }, + "asynciterator.prototype": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/asynciterator.prototype/-/asynciterator.prototype-1.0.0.tgz", + "integrity": "sha512-wwHYEIS0Q80f5mosx3L/dfG5t5rjEa9Ft51GTaNt862EnpyGHpgz2RkZvLPp1oF5TnAiTohkEKVEu8pQPJI7Vg==", + "dev": true, + "requires": { + "has-symbols": "^1.0.3" + } + }, "at-least-node": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz", @@ -7011,13 +7622,14 @@ } }, "call-bind": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz", - "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==", + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.5.tgz", + "integrity": "sha512-C3nQxfFZxFRVoJoGKKI8y3MOEo129NQ+FgQ08iye+Mk4zNZZGdjfs06bVTr+DBSlA66Q2VEcMki/cUCP4SercQ==", "dev": true, "requires": { - "function-bind": "^1.1.1", - "get-intrinsic": "^1.0.2" + "function-bind": "^1.1.2", + "get-intrinsic": "^1.2.1", + "set-function-length": "^1.1.1" } }, "callsites": { @@ -7036,18 +7648,18 @@ } }, "chai": { - "version": "4.3.7", - "resolved": "https://registry.npmjs.org/chai/-/chai-4.3.7.tgz", - "integrity": "sha512-HLnAzZ2iupm25PlN0xFreAlBA5zaBSv3og0DdeGA4Ar6h6rJ3A0rolRUKJhSF2V10GZKDgWF/VmAEsNWjCRB+A==", + "version": "4.3.10", + "resolved": "https://registry.npmjs.org/chai/-/chai-4.3.10.tgz", + "integrity": "sha512-0UXG04VuVbruMUYbJ6JctvH0YnC/4q3/AkT18q4NaITo91CUm0liMS9VqzT9vZhVQ/1eqPanMWjBM+Juhfb/9g==", "dev": true, "requires": { "assertion-error": "^1.1.0", - "check-error": "^1.0.2", - "deep-eql": "^4.1.2", - "get-func-name": "^2.0.0", - "loupe": "^2.3.1", + "check-error": "^1.0.3", + "deep-eql": "^4.1.3", + "get-func-name": "^2.0.2", + "loupe": "^2.3.6", "pathval": "^1.1.1", - "type-detect": "^4.0.5" + "type-detect": "^4.0.8" } }, "chalk": { @@ -7061,10 +7673,13 @@ } }, "check-error": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz", - "integrity": "sha512-BrgHpW9NURQgzoNyjfq0Wu6VFO6D7IZEmJNdtgNqpzGG8RuNFHt2jQxWlAs4HMe119chBnv+34syEZtc6IhLtA==", - "dev": true + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.3.tgz", + "integrity": "sha512-iKEoDYaRmd1mxM90a2OEfWhjsjPpYPuQ+lMYsoxB126+t8fw7ySEO48nmDg5COTjxDI65/Y2OWpeEHk3ZOe8zg==", + "dev": true, + "requires": { + "get-func-name": "^2.0.2" + } }, "chownr": { "version": "1.1.4", @@ -7080,40 +7695,6 @@ "requires": { "slice-ansi": "^5.0.0", "string-width": "^5.0.0" - }, - "dependencies": { - "ansi-regex": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", - "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", - "dev": true - }, - "emoji-regex": { - "version": "9.2.2", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", - "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==", - "dev": true - }, - "string-width": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz", - "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==", - "dev": true, - "requires": { - "eastasianwidth": "^0.2.0", - "emoji-regex": "^9.2.2", - "strip-ansi": "^7.0.1" - } - }, - "strip-ansi": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.0.1.tgz", - "integrity": "sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw==", - "dev": true, - "requires": { - "ansi-regex": "^6.0.1" - } - } } }, "cliui": { @@ -7125,6 +7706,31 @@ "string-width": "^4.2.0", "strip-ansi": "^6.0.0", "wrap-ansi": "^7.0.0" + }, + "dependencies": { + "emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "dev": true + }, + "is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "dev": true + }, + "string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dev": true, + "requires": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + } + } } }, "collect-all": { @@ -7232,9 +7838,9 @@ "dev": true }, "compress-commons": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/compress-commons/-/compress-commons-4.1.1.tgz", - "integrity": "sha512-QLdDLCKNV2dtoTorqgxngQCMA+gWXkM/Nwu7FpeBhk/RdkzimqC3jueb/FDmaZeXh+uby1jkBqE3xArsLBE5wQ==", + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/compress-commons/-/compress-commons-4.1.2.tgz", + "integrity": "sha512-D3uMHtGc/fcO1Gt1/L7i1e33VOvD4A9hfQLP+6ewd+BvG/gQ84Yh4oftEhAdjSMgBgwGL+jsppT7JYNpo6MHHg==", "dev": true, "requires": { "buffer-crc32": "^0.2.13", @@ -7279,9 +7885,9 @@ "dev": true }, "crc32-stream": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/crc32-stream/-/crc32-stream-4.0.2.tgz", - "integrity": "sha512-DxFZ/Hk473b/muq1VJ///PMNLj0ZMnzye9thBpmjpJKCc5eMgB95aK8zCGrGfQ90cWo561Te6HK9D+j4KPdM6w==", + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/crc32-stream/-/crc32-stream-4.0.3.tgz", + "integrity": "sha512-NT7w2JVU7DFroFdYkeq8cywxrgjPHWkdX1wjpRQXPX5Asews3tA+Ght6lddQO5Mkumffp3X7GEqku3epj2toIw==", "dev": true, "requires": { "crc-32": "^1.2.0", @@ -7289,11 +7895,11 @@ } }, "cross-fetch": { - "version": "3.1.5", - "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.5.tgz", - "integrity": "sha512-lvb1SBsI0Z7GDwmuid+mU3kWVBwTVUbe7S0H52yaaAdQOXq2YktTCZdlAcNKFzE6QtRz0snpw9bNiPeOIkkQvw==", + "version": "3.1.8", + "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.8.tgz", + "integrity": "sha512-cvA+JwZoU0Xq+h6WkMvAUqPEYy92Obet6UdKLfW60qn99ftItKjB5T+BkyWOFWe2pUyfQ+IJHmpOTznqk1M6Kg==", "requires": { - "node-fetch": "2.6.7" + "node-fetch": "^2.6.12" } }, "cross-spawn": { @@ -7346,20 +7952,32 @@ "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==", "dev": true }, + "define-data-property": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.1.tgz", + "integrity": "sha512-E7uGkTzkk1d0ByLeSc6ZsFS79Axg+m1P/VsgYsxHgiuc3tFSj+MjMIwe90FC4lOAZzNBdY7kkO2P2wKdsQ1vgQ==", + "dev": true, + "requires": { + "get-intrinsic": "^1.2.1", + "gopd": "^1.0.1", + "has-property-descriptors": "^1.0.0" + } + }, "define-properties": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.0.tgz", - "integrity": "sha512-xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA==", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.1.tgz", + "integrity": "sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==", "dev": true, "requires": { + "define-data-property": "^1.0.1", "has-property-descriptors": "^1.0.0", "object-keys": "^1.1.1" } }, "detect-libc": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.1.tgz", - "integrity": "sha512-463v3ZeIrcWtdgIg6vI6XUncguvr2TnGl4SzDXinkt9mSLpBJKXT3mW6xT3VQdDN11+WVs29pgvivTc4Lp8v+w==", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.2.tgz", + "integrity": "sha512-UX6sGumvvqSaXgdKGUsgZWqcUyIXZ/vZTrlRT/iobiKhGL0zL4d3osHj3uqllWJK+i+sixDS/3COVEOFbupFyw==", "dev": true }, "diff": { @@ -7413,9 +8031,9 @@ "dev": true }, "emoji-regex": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "version": "9.2.2", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", + "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==", "dev": true }, "end-of-stream": { @@ -7443,25 +8061,26 @@ } }, "es-abstract": { - "version": "1.21.2", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.21.2.tgz", - "integrity": "sha512-y/B5POM2iBnIxCiernH1G7rC9qQoM77lLIMQLuob0zhp8C56Po81+2Nj0WFKnd0pNReDTnkYryc+zhOzpEIROg==", + "version": "1.22.3", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.22.3.tgz", + "integrity": "sha512-eiiY8HQeYfYH2Con2berK+To6GrK2RxbPawDkGq4UiCQQfZHb6wX9qQqkbpPqaxQFcl8d9QzZqo0tGE0VcrdwA==", "dev": true, "requires": { "array-buffer-byte-length": "^1.0.0", + "arraybuffer.prototype.slice": "^1.0.2", "available-typed-arrays": "^1.0.5", - "call-bind": "^1.0.2", + "call-bind": "^1.0.5", "es-set-tostringtag": "^2.0.1", "es-to-primitive": "^1.2.1", - "function.prototype.name": "^1.1.5", - "get-intrinsic": "^1.2.0", + "function.prototype.name": "^1.1.6", + "get-intrinsic": "^1.2.2", "get-symbol-description": "^1.0.0", "globalthis": "^1.0.3", "gopd": "^1.0.1", - "has": "^1.0.3", "has-property-descriptors": "^1.0.0", "has-proto": "^1.0.1", "has-symbols": "^1.0.3", + "hasown": "^2.0.0", "internal-slot": "^1.0.5", "is-array-buffer": "^3.0.2", "is-callable": "^1.2.7", @@ -7469,39 +8088,65 @@ "is-regex": "^1.1.4", "is-shared-array-buffer": "^1.0.2", "is-string": "^1.0.7", - "is-typed-array": "^1.1.10", + "is-typed-array": "^1.1.12", "is-weakref": "^1.0.2", - "object-inspect": "^1.12.3", + "object-inspect": "^1.13.1", "object-keys": "^1.1.1", "object.assign": "^4.1.4", - "regexp.prototype.flags": "^1.4.3", + "regexp.prototype.flags": "^1.5.1", + "safe-array-concat": "^1.0.1", "safe-regex-test": "^1.0.0", - "string.prototype.trim": "^1.2.7", - "string.prototype.trimend": "^1.0.6", - "string.prototype.trimstart": "^1.0.6", + "string.prototype.trim": "^1.2.8", + "string.prototype.trimend": "^1.0.7", + "string.prototype.trimstart": "^1.0.7", + "typed-array-buffer": "^1.0.0", + "typed-array-byte-length": "^1.0.0", + "typed-array-byte-offset": "^1.0.0", "typed-array-length": "^1.0.4", "unbox-primitive": "^1.0.2", - "which-typed-array": "^1.1.9" + "which-typed-array": "^1.1.13" + } + }, + "es-iterator-helpers": { + "version": "1.0.15", + "resolved": "https://registry.npmjs.org/es-iterator-helpers/-/es-iterator-helpers-1.0.15.tgz", + "integrity": "sha512-GhoY8uYqd6iwUl2kgjTm4CZAf6oo5mHK7BPqx3rKgx893YSsy0LGHV6gfqqQvZt/8xM8xeOnfXBCfqclMKkJ5g==", + "dev": true, + "requires": { + "asynciterator.prototype": "^1.0.0", + "call-bind": "^1.0.2", + "define-properties": "^1.2.1", + "es-abstract": "^1.22.1", + "es-set-tostringtag": "^2.0.1", + "function-bind": "^1.1.1", + "get-intrinsic": "^1.2.1", + "globalthis": "^1.0.3", + "has-property-descriptors": "^1.0.0", + "has-proto": "^1.0.1", + "has-symbols": "^1.0.3", + "internal-slot": "^1.0.5", + "iterator.prototype": "^1.1.2", + "safe-array-concat": "^1.0.1" } }, "es-set-tostringtag": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.1.tgz", - "integrity": "sha512-g3OMbtlwY3QewlqAiMLI47KywjWZoEytKr8pf6iTC8uJq5bIAH52Z9pnQ8pVL6whrCto53JZDuUIsifGeLorTg==", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.2.tgz", + "integrity": "sha512-BuDyupZt65P9D2D2vA/zqcI3G5xRsklm5N3xCwuiy+/vKy8i0ifdsQP1sLgO4tZDSCaQUSnmC48khknGMV3D2Q==", "dev": true, "requires": { - "get-intrinsic": "^1.1.3", - "has": "^1.0.3", - "has-tostringtag": "^1.0.0" + "get-intrinsic": "^1.2.2", + "has-tostringtag": "^1.0.0", + "hasown": "^2.0.0" } }, "es-shim-unscopables": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz", - "integrity": "sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.2.tgz", + "integrity": "sha512-J3yBRXCzDu4ULnQwxyToo/OjdMx6akgVC7K6few0a7F/0wLtmKKN7I73AH5T2836UuXRqN7Qg+IIUw/+YJksRw==", "dev": true, "requires": { - "has": "^1.0.3" + "hasown": "^2.0.0" } }, "es-to-primitive": { @@ -7516,33 +8161,33 @@ } }, "esbuild": { - "version": "0.17.13", - "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.17.13.tgz", - "integrity": "sha512-4ixMwdErBcQHgTBeoxnowENCPKWFAGxgTyKHMK8gqn9sZaC7ZNWFKtim16g2rzQ2b/FYyy3lIUUJboFtjolhqg==", - "dev": true, - "requires": { - "@esbuild/android-arm": "0.17.13", - "@esbuild/android-arm64": "0.17.13", - "@esbuild/android-x64": "0.17.13", - "@esbuild/darwin-arm64": "0.17.13", - "@esbuild/darwin-x64": "0.17.13", - "@esbuild/freebsd-arm64": "0.17.13", - "@esbuild/freebsd-x64": "0.17.13", - "@esbuild/linux-arm": "0.17.13", - "@esbuild/linux-arm64": "0.17.13", - "@esbuild/linux-ia32": "0.17.13", - "@esbuild/linux-loong64": "0.17.13", - "@esbuild/linux-mips64el": "0.17.13", - "@esbuild/linux-ppc64": "0.17.13", - "@esbuild/linux-riscv64": "0.17.13", - "@esbuild/linux-s390x": "0.17.13", - "@esbuild/linux-x64": "0.17.13", - "@esbuild/netbsd-x64": "0.17.13", - "@esbuild/openbsd-x64": "0.17.13", - "@esbuild/sunos-x64": "0.17.13", - "@esbuild/win32-arm64": "0.17.13", - "@esbuild/win32-ia32": "0.17.13", - "@esbuild/win32-x64": "0.17.13" + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.18.20.tgz", + "integrity": "sha512-ceqxoedUrcayh7Y7ZX6NdbbDzGROiyVBgC4PriJThBKSVPWnnFHZAkfI1lJT8QFkOwH4qOS2SJkS4wvpGl8BpA==", + "dev": true, + "requires": { + "@esbuild/android-arm": "0.18.20", + "@esbuild/android-arm64": "0.18.20", + "@esbuild/android-x64": "0.18.20", + "@esbuild/darwin-arm64": "0.18.20", + "@esbuild/darwin-x64": "0.18.20", + "@esbuild/freebsd-arm64": "0.18.20", + "@esbuild/freebsd-x64": "0.18.20", + "@esbuild/linux-arm": "0.18.20", + "@esbuild/linux-arm64": "0.18.20", + "@esbuild/linux-ia32": "0.18.20", + "@esbuild/linux-loong64": "0.18.20", + "@esbuild/linux-mips64el": "0.18.20", + "@esbuild/linux-ppc64": "0.18.20", + "@esbuild/linux-riscv64": "0.18.20", + "@esbuild/linux-s390x": "0.18.20", + "@esbuild/linux-x64": "0.18.20", + "@esbuild/netbsd-x64": "0.18.20", + "@esbuild/openbsd-x64": "0.18.20", + "@esbuild/sunos-x64": "0.18.20", + "@esbuild/win32-arm64": "0.18.20", + "@esbuild/win32-ia32": "0.18.20", + "@esbuild/win32-x64": "0.18.20" } }, "escalade": { @@ -7558,27 +8203,28 @@ "dev": true }, "eslint": { - "version": "8.36.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.36.0.tgz", - "integrity": "sha512-Y956lmS7vDqomxlaaQAHVmeb4tNMp2FWIvU/RnU5BD3IKMD/MJPr76xdyr68P8tV1iNMvN2mRK0yy3c+UjL+bw==", + "version": "8.54.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.54.0.tgz", + "integrity": "sha512-NY0DfAkM8BIZDVl6PgSa1ttZbx3xHgJzSNJKYcQglem6CppHyMhRIQkBVSSMaSRnLhig3jsDbEzOjwCVt4AmmA==", "dev": true, "requires": { "@eslint-community/eslint-utils": "^4.2.0", - "@eslint-community/regexpp": "^4.4.0", - "@eslint/eslintrc": "^2.0.1", - "@eslint/js": "8.36.0", - "@humanwhocodes/config-array": "^0.11.8", + "@eslint-community/regexpp": "^4.6.1", + "@eslint/eslintrc": "^2.1.3", + "@eslint/js": "8.54.0", + "@humanwhocodes/config-array": "^0.11.13", "@humanwhocodes/module-importer": "^1.0.1", "@nodelib/fs.walk": "^1.2.8", - "ajv": "^6.10.0", + "@ungap/structured-clone": "^1.2.0", + "ajv": "^6.12.4", "chalk": "^4.0.0", "cross-spawn": "^7.0.2", "debug": "^4.3.2", "doctrine": "^3.0.0", "escape-string-regexp": "^4.0.0", - "eslint-scope": "^7.1.1", - "eslint-visitor-keys": "^3.3.0", - "espree": "^9.5.0", + "eslint-scope": "^7.2.2", + "eslint-visitor-keys": "^3.4.3", + "espree": "^9.6.1", "esquery": "^1.4.2", "esutils": "^2.0.2", "fast-deep-equal": "^3.1.3", @@ -7586,22 +8232,19 @@ "find-up": "^5.0.0", "glob-parent": "^6.0.2", "globals": "^13.19.0", - "grapheme-splitter": "^1.0.4", + "graphemer": "^1.4.0", "ignore": "^5.2.0", - "import-fresh": "^3.0.0", "imurmurhash": "^0.1.4", "is-glob": "^4.0.0", "is-path-inside": "^3.0.3", - "js-sdsl": "^4.1.4", "js-yaml": "^4.1.0", "json-stable-stringify-without-jsonify": "^1.0.1", "levn": "^0.4.1", "lodash.merge": "^4.6.2", "minimatch": "^3.1.2", "natural-compare": "^1.4.0", - "optionator": "^0.9.1", + "optionator": "^0.9.3", "strip-ansi": "^6.0.1", - "strip-json-comments": "^3.1.0", "text-table": "^0.2.0" }, "dependencies": { @@ -7623,9 +8266,9 @@ } }, "eslint-config-standard": { - "version": "17.0.0", - "resolved": "https://registry.npmjs.org/eslint-config-standard/-/eslint-config-standard-17.0.0.tgz", - "integrity": "sha512-/2ks1GKyqSOkH7JFvXJicu0iMpoojkwB+f5Du/1SC0PtBL+s8v30k9njRZ21pm2drKYm2342jFnGWzttxPmZVg==", + "version": "17.1.0", + "resolved": "https://registry.npmjs.org/eslint-config-standard/-/eslint-config-standard-17.1.0.tgz", + "integrity": "sha512-IwHwmaBNtDK4zDHQukFDW5u/aTb8+meQWZvNFWkiGmbWjD6bqyuSSBxxXKkCftCUzc1zwCH2m/baCNDLGmuO5Q==", "dev": true, "requires": {} }, @@ -7637,14 +8280,14 @@ "requires": {} }, "eslint-import-resolver-node": { - "version": "0.3.7", - "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.7.tgz", - "integrity": "sha512-gozW2blMLJCeFpBwugLTGyvVjNoeo1knonXAcatC6bjPBZitotxdWf7Gimr25N4c0AAOo4eOUfaG82IJPDpqCA==", + "version": "0.3.9", + "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.9.tgz", + "integrity": "sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==", "dev": true, "requires": { "debug": "^3.2.7", - "is-core-module": "^2.11.0", - "resolve": "^1.22.1" + "is-core-module": "^2.13.0", + "resolve": "^1.22.4" }, "dependencies": { "debug": { @@ -7657,20 +8300,20 @@ } }, "is-core-module": { - "version": "2.11.0", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.11.0.tgz", - "integrity": "sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==", + "version": "2.13.1", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.1.tgz", + "integrity": "sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==", "dev": true, "requires": { - "has": "^1.0.3" + "hasown": "^2.0.0" } } } }, "eslint-module-utils": { - "version": "2.7.4", - "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.7.4.tgz", - "integrity": "sha512-j4GT+rqzCoRKHwURX7pddtIPGySnX9Si/cgMI5ztrcqOPtk5dDEeZ34CQVPphnqkJytlc97Vuk05Um2mJ3gEQA==", + "version": "2.8.0", + "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.8.0.tgz", + "integrity": "sha512-aWajIYfsqCKRDgUfjEXNN/JlrzauMuSEy5sbd7WXbtW3EH6A6MpwEh42c7qD+MqQo9QMJ6fWLAeIJynx0g6OAw==", "dev": true, "requires": { "debug": "^3.2.7" @@ -7715,26 +8358,28 @@ } }, "eslint-plugin-import": { - "version": "2.27.5", - "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.27.5.tgz", - "integrity": "sha512-LmEt3GVofgiGuiE+ORpnvP+kAm3h6MLZJ4Q5HCyHADofsb4VzXFsRiWj3c0OFiV+3DWFh0qg3v9gcPlfc3zRow==", + "version": "2.29.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.29.0.tgz", + "integrity": "sha512-QPOO5NO6Odv5lpoTkddtutccQjysJuFxoPS7fAHO+9m9udNHvTCPSAMW9zGAYj8lAIdr40I8yPCdUYrncXtrwg==", "dev": true, "requires": { - "array-includes": "^3.1.6", - "array.prototype.flat": "^1.3.1", - "array.prototype.flatmap": "^1.3.1", + "array-includes": "^3.1.7", + "array.prototype.findlastindex": "^1.2.3", + "array.prototype.flat": "^1.3.2", + "array.prototype.flatmap": "^1.3.2", "debug": "^3.2.7", "doctrine": "^2.1.0", - "eslint-import-resolver-node": "^0.3.7", - "eslint-module-utils": "^2.7.4", - "has": "^1.0.3", - "is-core-module": "^2.11.0", + "eslint-import-resolver-node": "^0.3.9", + "eslint-module-utils": "^2.8.0", + "hasown": "^2.0.0", + "is-core-module": "^2.13.1", "is-glob": "^4.0.3", "minimatch": "^3.1.2", - "object.values": "^1.1.6", - "resolve": "^1.22.1", - "semver": "^6.3.0", - "tsconfig-paths": "^3.14.1" + "object.fromentries": "^2.0.7", + "object.groupby": "^1.0.1", + "object.values": "^1.1.7", + "semver": "^6.3.1", + "tsconfig-paths": "^3.14.2" }, "dependencies": { "debug": { @@ -7756,26 +8401,26 @@ } }, "is-core-module": { - "version": "2.11.0", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.11.0.tgz", - "integrity": "sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==", + "version": "2.13.1", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.1.tgz", + "integrity": "sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==", "dev": true, "requires": { - "has": "^1.0.3" + "hasown": "^2.0.0" } }, "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "dev": true } } }, "eslint-plugin-n": { - "version": "15.6.1", - "resolved": "https://registry.npmjs.org/eslint-plugin-n/-/eslint-plugin-n-15.6.1.tgz", - "integrity": "sha512-R9xw9OtCRxxaxaszTQmQAlPgM+RdGjaL1akWuY/Fv9fRAi8Wj4CUKc6iYVG8QNRjRuo8/BqVYIpfqberJUEacA==", + "version": "15.7.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-n/-/eslint-plugin-n-15.7.0.tgz", + "integrity": "sha512-jDex9s7D/Qial8AGVIHq4W7NswpUD5DPDL2RH8Lzd9EloWUuvUkHfv4FRLMipH5q2UtyurorBkPeNi1wVWNh3Q==", "dev": true, "requires": { "builtins": "^5.0.1", @@ -7789,12 +8434,12 @@ }, "dependencies": { "is-core-module": { - "version": "2.11.0", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.11.0.tgz", - "integrity": "sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==", + "version": "2.13.1", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.1.tgz", + "integrity": "sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==", "dev": true, "requires": { - "has": "^1.0.3" + "hasown": "^2.0.0" } } } @@ -7807,15 +8452,16 @@ "requires": {} }, "eslint-plugin-react": { - "version": "7.32.2", - "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.32.2.tgz", - "integrity": "sha512-t2fBMa+XzonrrNkyVirzKlvn5RXzzPwRHtMvLAtVZrt8oxgnTQaYbU6SXTOO1mwQgp1y5+toMSKInnzGr0Knqg==", + "version": "7.33.2", + "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.33.2.tgz", + "integrity": "sha512-73QQMKALArI8/7xGLNI/3LylrEYrlKZSb5C9+q3OtOewTnMQi5cT+aE9E41sLCmli3I9PGGmD1yiZydyo4FEPw==", "dev": true, "requires": { "array-includes": "^3.1.6", "array.prototype.flatmap": "^1.3.1", "array.prototype.tosorted": "^1.1.1", "doctrine": "^2.1.0", + "es-iterator-helpers": "^1.0.12", "estraverse": "^5.3.0", "jsx-ast-utils": "^2.4.1 || ^3.0.0", "minimatch": "^3.1.2", @@ -7825,7 +8471,7 @@ "object.values": "^1.1.6", "prop-types": "^15.8.1", "resolve": "^2.0.0-next.4", - "semver": "^6.3.0", + "semver": "^6.3.1", "string.prototype.matchall": "^4.0.8" }, "dependencies": { @@ -7838,29 +8484,38 @@ "esutils": "^2.0.2" } }, + "is-core-module": { + "version": "2.13.1", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.1.tgz", + "integrity": "sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==", + "dev": true, + "requires": { + "hasown": "^2.0.0" + } + }, "resolve": { - "version": "2.0.0-next.4", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.4.tgz", - "integrity": "sha512-iMDbmAWtfU+MHpxt/I5iWI7cY6YVEZUQ3MBgPQ++XD1PELuJHIl82xBmObyP2KyQmkNB2dsqF7seoQQiAn5yDQ==", + "version": "2.0.0-next.5", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.5.tgz", + "integrity": "sha512-U7WjGVG9sH8tvjW5SmGbQuui75FiyjAX72HX15DwBBwF9dNiQZRQAg9nnPhYy+TUnE0+VcrttuvNI8oSxZcocA==", "dev": true, "requires": { - "is-core-module": "^2.9.0", + "is-core-module": "^2.13.0", "path-parse": "^1.0.7", "supports-preserve-symlinks-flag": "^1.0.0" } }, "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "dev": true } } }, "eslint-scope": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.1.tgz", - "integrity": "sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==", + "version": "7.2.2", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz", + "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==", "dev": true, "requires": { "esrecurse": "^4.3.0", @@ -7885,20 +8540,20 @@ } }, "eslint-visitor-keys": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz", - "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==", + "version": "3.4.3", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", + "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", "dev": true }, "espree": { - "version": "9.5.0", - "resolved": "https://registry.npmjs.org/espree/-/espree-9.5.0.tgz", - "integrity": "sha512-JPbJGhKc47++oo4JkEoTe2wjy4fmMwvFpgJT9cQzmfXKp22Dr6Hf1tdCteLz1h0P3t+mGvWZ+4Uankvh8+c6zw==", + "version": "9.6.1", + "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz", + "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==", "dev": true, "requires": { - "acorn": "^8.8.0", + "acorn": "^8.9.0", "acorn-jsx": "^5.3.2", - "eslint-visitor-keys": "^3.3.0" + "eslint-visitor-keys": "^3.4.1" } }, "esquery": { @@ -7944,9 +8599,9 @@ "dev": true }, "fast-glob": { - "version": "3.2.12", - "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.12.tgz", - "integrity": "sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==", + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz", + "integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==", "dev": true, "requires": { "@nodelib/fs.stat": "^2.0.2", @@ -8041,19 +8696,20 @@ } }, "flat-cache": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz", - "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.2.0.tgz", + "integrity": "sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==", "dev": true, "requires": { - "flatted": "^3.1.0", + "flatted": "^3.2.9", + "keyv": "^4.5.3", "rimraf": "^3.0.2" } }, "flatted": { - "version": "3.2.7", - "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz", - "integrity": "sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==", + "version": "3.2.9", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.9.tgz", + "integrity": "sha512-36yxDn5H7OFZQla0/jFJmbIKTdZAQHngCedGxiMmpNfEZM0sdEeT+WczLQrjK6D7o2aiyLYDnkw0R3JK0Qv1RQ==", "dev": true }, "for-each": { @@ -8075,6 +8731,12 @@ "readable-stream": "^2.0.0" }, "dependencies": { + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==", + "dev": true + }, "readable-stream": { "version": "2.3.8", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz", @@ -8138,28 +8800,28 @@ "dev": true }, "fsevents": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", - "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", + "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", "dev": true, "optional": true }, "function-bind": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", - "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==", + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", + "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==", "dev": true }, "function.prototype.name": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.5.tgz", - "integrity": "sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==", + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.6.tgz", + "integrity": "sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg==", "dev": true, "requires": { "call-bind": "^1.0.2", - "define-properties": "^1.1.3", - "es-abstract": "^1.19.0", - "functions-have-names": "^1.2.2" + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1", + "functions-have-names": "^1.2.3" } }, "functions-have-names": { @@ -8175,20 +8837,21 @@ "dev": true }, "get-func-name": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.0.tgz", - "integrity": "sha512-Hm0ixYtaSZ/V7C8FJrtZIuBBI+iSgL+1Aq82zSu8VQNB4S3Gk8e7Qs3VwBDJAhmRZcFqkl3tQu36g/Foh5I5ig==", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.2.tgz", + "integrity": "sha512-8vXOvuE167CtIc3OyItco7N/dpRtBbYOsPsXCz7X/PMnlGjYjSGuZJgM1Y7mmew7BKf9BqvLX2tnOVy1BBUsxQ==", "dev": true }, "get-intrinsic": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.0.tgz", - "integrity": "sha512-L049y6nFOuom5wGyRc3/gdTLO94dySVKRACj1RmJZBQXlbTMhtNIgkWkUHq+jYmZvKf14EW1EoJnnjbmoHij0Q==", + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.2.tgz", + "integrity": "sha512-0gSo4ml/0j98Y3lngkFEot/zhiCeWsbYIlZ+uZOVgzLyLaUw7wxUL+nCTP0XJvJg1AXulJRI3UJi8GsbDuxdGA==", "dev": true, "requires": { - "function-bind": "^1.1.1", - "has": "^1.0.3", - "has-symbols": "^1.0.3" + "function-bind": "^1.1.2", + "has-proto": "^1.0.1", + "has-symbols": "^1.0.3", + "hasown": "^2.0.0" } }, "get-stdin": { @@ -8237,9 +8900,9 @@ } }, "globals": { - "version": "13.20.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-13.20.0.tgz", - "integrity": "sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==", + "version": "13.23.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-13.23.0.tgz", + "integrity": "sha512-XAmF0RjlrjY23MA51q3HltdlGxUpXPvg0GioKiD9X6HD28iMjo2dKC8Vqwm7lne4GNr78+RHTfliktR6ZH09wA==", "dev": true, "requires": { "type-fest": "^0.20.2" @@ -8283,33 +8946,30 @@ "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==", "dev": true }, - "grapheme-splitter": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz", - "integrity": "sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==", + "graphemer": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz", + "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==", "dev": true }, "handlebars": { - "version": "4.7.7", - "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.7.tgz", - "integrity": "sha512-aAcXm5OAfE/8IXkcZvCepKU3VzW1/39Fb5ZuqMtgI/hT8X2YgoMvBY5dLhq/cpOvw7Lk1nK/UF71aLG/ZnVYRA==", + "version": "4.7.8", + "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.8.tgz", + "integrity": "sha512-vafaFqs8MZkRrSX7sFVUdo3ap/eNiLnb4IakshzvP56X5Nr1iGKAIqdX6tMlm6HcNRIkr6AxO5jFEoJzzpT8aQ==", "dev": true, "requires": { "minimist": "^1.2.5", - "neo-async": "^2.6.0", + "neo-async": "^2.6.2", "source-map": "^0.6.1", "uglify-js": "^3.1.4", "wordwrap": "^1.0.0" } }, "has": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", - "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", - "dev": true, - "requires": { - "function-bind": "^1.1.1" - } + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/has/-/has-1.0.4.tgz", + "integrity": "sha512-qdSAmqLF6209RFj4VVItywPMbm3vWylknmB3nvNiUIs72xAimcM8nVYxYr7ncvZq5qzk9MKIZR8ijqD/1QuYjQ==", + "dev": true }, "has-bigints": { "version": "1.0.2", @@ -8324,12 +8984,12 @@ "dev": true }, "has-property-descriptors": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz", - "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.1.tgz", + "integrity": "sha512-VsX8eaIewvas0xnvinAe9bw4WfIeODpGYikiWYLH+dma0Jw6KHYqWiWfhQlgOVK8D6PvjubK5Uc4P0iIhIcNVg==", "dev": true, "requires": { - "get-intrinsic": "^1.1.1" + "get-intrinsic": "^1.2.2" } }, "has-proto": { @@ -8353,6 +9013,15 @@ "has-symbols": "^1.0.2" } }, + "hasown": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.0.tgz", + "integrity": "sha512-vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA==", + "dev": true, + "requires": { + "function-bind": "^1.1.2" + } + }, "https-proxy-agent": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz", @@ -8370,9 +9039,9 @@ "dev": true }, "ignore": { - "version": "5.2.4", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz", - "integrity": "sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==", + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.0.tgz", + "integrity": "sha512-g7dmpshy+gD7mh88OC9NwSGTKoc3kyLAZQRU1mt53Aw/vnvfXnbC+F/7F7QoYVKbV+KNvJx8wArewKy1vXMtlg==", "dev": true }, "import-fresh": { @@ -8414,13 +9083,13 @@ "dev": true }, "internal-slot": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.5.tgz", - "integrity": "sha512-Y+R5hJrzs52QCG2laLn4udYVnxsfny9CpOhNhUvk/SSSVyF6T27FzRbF0sroPidSu3X8oEAkOn2K804mjpt6UQ==", + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.6.tgz", + "integrity": "sha512-Xj6dv+PsbtwyPpEflsejS+oIZxmMlV44zAhG479uYu89MsjcYOhCFnNyKrkJrihbsiasQyY0afoCl/9BLR65bg==", "dev": true, "requires": { - "get-intrinsic": "^1.2.0", - "has": "^1.0.3", + "get-intrinsic": "^1.2.2", + "hasown": "^2.0.0", "side-channel": "^1.0.4" } }, @@ -8451,6 +9120,15 @@ "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==", "dev": true }, + "is-async-function": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-async-function/-/is-async-function-2.0.0.tgz", + "integrity": "sha512-Y1JXKrfykRJGdlDwdKlLpLyMIiWqWvuSd17TvZk68PLAOGOoF4Xyav1z0Xhoi+gCYjZVeC5SI+hYFOfvXmGRCA==", + "dev": true, + "requires": { + "has-tostringtag": "^1.0.0" + } + }, "is-bigint": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz", @@ -8500,12 +9178,30 @@ "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", "dev": true }, + "is-finalizationregistry": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-finalizationregistry/-/is-finalizationregistry-1.0.2.tgz", + "integrity": "sha512-0by5vtUJs8iFQb5TYUHHPudOR+qXYIMKtiUzvLIZITZUjknFmziyBJuLhVRc+Ds0dREFlskDNJKYIdIzu/9pfw==", + "dev": true, + "requires": { + "call-bind": "^1.0.2" + } + }, "is-fullwidth-code-point": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-4.0.0.tgz", + "integrity": "sha512-O4L094N2/dZ7xqVdrXhh9r1KODPJpFms8B5sGdJLPy664AgvXsreZUyCQQNItZRDlYug4xStLjNp/sz3HvBowQ==", "dev": true }, + "is-generator-function": { + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.0.10.tgz", + "integrity": "sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A==", + "dev": true, + "requires": { + "has-tostringtag": "^1.0.0" + } + }, "is-glob": { "version": "4.0.3", "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", @@ -8515,6 +9211,12 @@ "is-extglob": "^2.1.1" } }, + "is-map": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.2.tgz", + "integrity": "sha512-cOZFQQozTha1f4MxLFzlgKYPTyj26picdZTx82hbc/Xf4K/tZOOXSCkMvU4pKioRXGDLJRn0GM7Upe7kR721yg==", + "dev": true + }, "is-negative-zero": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz", @@ -8552,6 +9254,12 @@ "has-tostringtag": "^1.0.0" } }, + "is-set": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.2.tgz", + "integrity": "sha512-+2cnTEZeY5z/iXGbLhPrOAaK/Mau5k5eXq9j14CpRTftq0pAJu2MwVRSZhyZWBzx3o6X795Lz6Bpb6R0GKf37g==", + "dev": true + }, "is-shared-array-buffer": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz", @@ -8580,18 +9288,20 @@ } }, "is-typed-array": { - "version": "1.1.10", - "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.10.tgz", - "integrity": "sha512-PJqgEHiWZvMpaFZ3uTc8kHPM4+4ADTlDniuQL7cU/UDA0Ql7F70yGfHph3cLNe+c9toaigv+DFzTJKhc2CtO6A==", + "version": "1.1.12", + "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.12.tgz", + "integrity": "sha512-Z14TF2JNG8Lss5/HMqt0//T9JeHXttXy5pH/DBU4vi98ozO2btxzq9MwYDZYnKwU8nRsz/+GVFVRDq3DkVuSPg==", "dev": true, "requires": { - "available-typed-arrays": "^1.0.5", - "call-bind": "^1.0.2", - "for-each": "^0.3.3", - "gopd": "^1.0.1", - "has-tostringtag": "^1.0.0" + "which-typed-array": "^1.1.11" } }, + "is-weakmap": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.1.tgz", + "integrity": "sha512-NSBR4kH5oVj1Uwvv970ruUkCV7O1mzgVFO4/rev2cLRda9Tm9HrL70ZPut4rOHgY0FNrUu9BCbXA2sdQ+x0chA==", + "dev": true + }, "is-weakref": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz", @@ -8601,10 +9311,20 @@ "call-bind": "^1.0.2" } }, + "is-weakset": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.2.tgz", + "integrity": "sha512-t2yVvttHkQktwnNNmBQ98AhENLdPUTDTE21uPqAQ0ARwQfGeQKRVS0NNurH7bTf7RrvcVn1OOge45CnBeHCSmg==", + "dev": true, + "requires": { + "call-bind": "^1.0.2", + "get-intrinsic": "^1.1.1" + } + }, "isarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==", + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz", + "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==", "dev": true }, "isexe": { @@ -8613,11 +9333,18 @@ "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", "dev": true }, - "js-sdsl": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.4.0.tgz", - "integrity": "sha512-FfVSdx6pJ41Oa+CF7RDaFmTnCaFhua+SNYQX74riGOpl96x+2jQCqEfQ2bnXu/5DPCqlRuiqyvTJM0Qjz26IVg==", - "dev": true + "iterator.prototype": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/iterator.prototype/-/iterator.prototype-1.1.2.tgz", + "integrity": "sha512-DR33HMMr8EzwuRL8Y9D3u2BMj8+RqSE850jfGu59kS7tbmPLzGkZmVSfyCFSDxuZiEY6Rzt3T2NA/qU+NwVj1w==", + "dev": true, + "requires": { + "define-properties": "^1.2.1", + "get-intrinsic": "^1.2.1", + "has-symbols": "^1.0.3", + "reflect.getprototypeof": "^1.0.4", + "set-function-name": "^2.0.1" + } }, "js-tokens": { "version": "4.0.0", @@ -8718,6 +9445,12 @@ "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==", "dev": true }, + "json-buffer": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz", + "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==", + "dev": true + }, "json-parse-better-errors": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz", @@ -8762,13 +9495,24 @@ } }, "jsx-ast-utils": { - "version": "3.3.3", - "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.3.3.tgz", - "integrity": "sha512-fYQHZTZ8jSfmWZ0iyzfwiU4WDX4HpHbMCZ3gPlWYiCl3BoeOTsqKBqnTVfH2rYT7eP5c3sVbeSPHnnJOaTrWiw==", + "version": "3.3.5", + "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.3.5.tgz", + "integrity": "sha512-ZZow9HBI5O6EPgSJLUb8n2NKgmVWTwCvHGwFuJlMjvLFqlGG6pjirPhtdsseaLZjSibD8eegzmYpUZwoIlj2cQ==", + "dev": true, + "requires": { + "array-includes": "^3.1.6", + "array.prototype.flat": "^1.3.1", + "object.assign": "^4.1.4", + "object.values": "^1.1.6" + } + }, + "keyv": { + "version": "4.5.4", + "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz", + "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==", "dev": true, "requires": { - "array-includes": "^3.1.5", - "object.assign": "^4.1.3" + "json-buffer": "3.0.1" } }, "klaw": { @@ -8789,6 +9533,12 @@ "readable-stream": "^2.0.5" }, "dependencies": { + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==", + "dev": true + }, "readable-stream": { "version": "2.3.8", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz", @@ -8952,12 +9702,12 @@ } }, "loupe": { - "version": "2.3.6", - "resolved": "https://registry.npmjs.org/loupe/-/loupe-2.3.6.tgz", - "integrity": "sha512-RaPMZKiMy8/JruncMU5Bt6na1eftNoo++R4Y+N2FrxkDVTrGvcyzFTsaGif4QTeKESheMGegbhw6iUAq+5A8zA==", + "version": "2.3.7", + "resolved": "https://registry.npmjs.org/loupe/-/loupe-2.3.7.tgz", + "integrity": "sha512-zSMINGVYkdpYSOBmLi0D1Uo7JU9nVdQKrHxC8eYlV+9YKK9WePqAlL7lSlorG/U2Fw1w0hTBmaa/jrQ3UbPHtA==", "dev": true, "requires": { - "get-func-name": "^2.0.0" + "get-func-name": "^2.0.1" } }, "lru-cache": { @@ -9057,21 +9807,21 @@ "dev": true }, "mlly": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/mlly/-/mlly-1.2.0.tgz", - "integrity": "sha512-+c7A3CV0KGdKcylsI6khWyts/CYrGTrRVo4R/I7u/cUsy0Conxa6LUhiEzVKIw14lc2L5aiO4+SeVe4TeGRKww==", + "version": "1.4.2", + "resolved": "https://registry.npmjs.org/mlly/-/mlly-1.4.2.tgz", + "integrity": "sha512-i/Ykufi2t1EZ6NaPLdfnZk2AX8cs0d+mTzVKuPfqPKPatxLApaBoxJQ9x1/uckXtrS/U5oisPMDkNs0yQTaBRg==", "dev": true, "requires": { - "acorn": "^8.8.2", - "pathe": "^1.1.0", - "pkg-types": "^1.0.2", - "ufo": "^1.1.1" + "acorn": "^8.10.0", + "pathe": "^1.1.1", + "pkg-types": "^1.0.3", + "ufo": "^1.3.0" } }, "module-alias": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/module-alias/-/module-alias-2.2.2.tgz", - "integrity": "sha512-A/78XjoX2EmNvppVWEhM2oGk3x4lLxnkEA4jTbaK97QKSDjkIoOsKQlfylt/d3kKKi596Qy3NP5XrXJ6fZIC9Q==" + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/module-alias/-/module-alias-2.2.3.tgz", + "integrity": "sha512-23g5BFj4zdQL/b6tor7Ji+QY4pEfNH784BMslY9Qb0UnJWRAt+lQGLYmRaM0KDBwIG23ffEBELhZDP2rhi9f/Q==" }, "mrmime": { "version": "1.0.1", @@ -9096,9 +9846,9 @@ } }, "nanoid": { - "version": "3.3.6", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.6.tgz", - "integrity": "sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==", + "version": "3.3.7", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz", + "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==", "dev": true }, "napi-build-utils": { @@ -9120,18 +9870,18 @@ "dev": true }, "node-abi": { - "version": "3.33.0", - "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.33.0.tgz", - "integrity": "sha512-7GGVawqyHF4pfd0YFybhv/eM9JwTtPqx0mAanQ146O3FlSh3pA24zf9IRQTOsfTSqXTNzPSP5iagAJ94jjuVog==", + "version": "3.51.0", + "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.51.0.tgz", + "integrity": "sha512-SQkEP4hmNWjlniS5zdnfIXTk1x7Ome85RDzHlTbBtzE97Gfwz/Ipw4v/Ryk20DWIy3yCNVLVlGKApCnmvYoJbA==", "dev": true, "requires": { "semver": "^7.3.5" } }, "node-fetch": { - "version": "2.6.7", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz", - "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==", + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz", + "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==", "requires": { "whatwg-url": "^5.0.0" } @@ -9155,9 +9905,9 @@ "dev": true }, "object-inspect": { - "version": "1.12.3", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz", - "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==", + "version": "1.13.1", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.1.tgz", + "integrity": "sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==", "dev": true }, "object-keys": { @@ -9185,46 +9935,58 @@ } }, "object.entries": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.6.tgz", - "integrity": "sha512-leTPzo4Zvg3pmbQ3rDK69Rl8GQvIqMWubrkxONG9/ojtFE2rD9fjMKfSI5BxW3osRH1m6VdzmqK8oAY9aT4x5w==", + "version": "1.1.7", + "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.7.tgz", + "integrity": "sha512-jCBs/0plmPsOnrKAfFQXRG2NFjlhZgjjcBLSmTnEhU8U6vVTsVe8ANeQJCHTl3gSsI4J+0emOoCgoKlmQPMgmA==", "dev": true, "requires": { "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4" + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1" } }, "object.fromentries": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.6.tgz", - "integrity": "sha512-VciD13dswC4j1Xt5394WR4MzmAQmlgN72phd/riNp9vtD7tp4QQWJ0R4wvclXcafgcYK8veHRed2W6XeGBvcfg==", + "version": "2.0.7", + "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.7.tgz", + "integrity": "sha512-UPbPHML6sL8PI/mOqPwsH4G6iyXcCGzLin8KvEPenOZN5lpCNBZZQ+V62vdjB1mQHrmqGQt5/OJzemUA+KJmEA==", "dev": true, "requires": { "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4" + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1" + } + }, + "object.groupby": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/object.groupby/-/object.groupby-1.0.1.tgz", + "integrity": "sha512-HqaQtqLnp/8Bn4GL16cj+CUYbnpe1bh0TtEaWvybszDG4tgxCJuRpV8VGuvNaI1fAnI4lUJzDG55MXcOH4JZcQ==", + "dev": true, + "requires": { + "call-bind": "^1.0.2", + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1", + "get-intrinsic": "^1.2.1" } }, "object.hasown": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/object.hasown/-/object.hasown-1.1.2.tgz", - "integrity": "sha512-B5UIT3J1W+WuWIU55h0mjlwaqxiE5vYENJXIXZ4VFe05pNYrkKuK0U/6aFcb0pKywYJh7IhfoqUfKVmrJJHZHw==", + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/object.hasown/-/object.hasown-1.1.3.tgz", + "integrity": "sha512-fFI4VcYpRHvSLXxP7yiZOMAd331cPfd2p7PFDVbgUsYOfCT3tICVqXWngbjr4m49OvsBwUBQ6O2uQoJvy3RexA==", "dev": true, "requires": { - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4" + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1" } }, "object.values": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.6.tgz", - "integrity": "sha512-FVVTkD1vENCsAcwNs9k6jea2uHC/X0+JcjG8YA60FN5CMaJmG95wT9jek/xX9nornqGRrBkKtzuAu2wuHpKqvw==", + "version": "1.1.7", + "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.7.tgz", + "integrity": "sha512-aU6xnDFYT3x17e/f0IiiwlGPTy2jzMySGfUB4fq6z7CV8l85CWHDk5ErhyhpfDHhrOMwGFhSQkhMGHaIotA6Ng==", "dev": true, "requires": { "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4" + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1" } }, "once": { @@ -9237,17 +9999,17 @@ } }, "optionator": { - "version": "0.9.1", - "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz", - "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==", + "version": "0.9.3", + "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.3.tgz", + "integrity": "sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==", "dev": true, "requires": { + "@aashutoshrathi/word-wrap": "^1.2.3", "deep-is": "^0.1.3", "fast-levenshtein": "^2.0.6", "levn": "^0.4.1", "prelude-ls": "^1.2.1", - "type-check": "^0.4.0", - "word-wrap": "^1.2.3" + "type-check": "^0.4.0" } }, "p-is-promise": { @@ -9330,9 +10092,9 @@ "dev": true }, "pathe": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/pathe/-/pathe-1.1.0.tgz", - "integrity": "sha512-ODbEPR0KKHqECXW1GoxdDb+AZvULmXjVPy4rt+pGo2+TnjJTIPJQSVS6N63n8T2Ip+syHhbn52OewKicV0373w==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/pathe/-/pathe-1.1.1.tgz", + "integrity": "sha512-d+RQGp0MAYTIaDBIMmOfMwz3E+LOZnxx1HZd5R18mmCZY0QBlK0LDZfPc8FW8Ed2DlvsuE6PRjroDY+wg4+j/Q==", "dev": true }, "pathval": { @@ -9461,20 +10223,20 @@ } }, "pkg-types": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/pkg-types/-/pkg-types-1.0.2.tgz", - "integrity": "sha512-hM58GKXOcj8WTqUXnsQyJYXdeAPbythQgEF3nTcEo+nkD49chjQ9IKm/QJy9xf6JakXptz86h7ecP2024rrLaQ==", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/pkg-types/-/pkg-types-1.0.3.tgz", + "integrity": "sha512-nN7pYi0AQqJnoLPC9eHFQ8AcyaixBUOwvqc5TDnIKCMEE6I0y8P7OKA7fPexsXGCGxQDl/cmrLAp26LhcwxZ4A==", "dev": true, "requires": { "jsonc-parser": "^3.2.0", - "mlly": "^1.1.1", + "mlly": "^1.2.0", "pathe": "^1.1.0" } }, "postcss": { - "version": "8.4.24", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.24.tgz", - "integrity": "sha512-M0RzbcI0sO/XJNucsGjvWU9ERWxb/ytp1w6dKtxTKgixdtQDq4rmx/g8W1hnaheq9jgwL/oyEdH5Bc4WwJKMqg==", + "version": "8.4.31", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz", + "integrity": "sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==", "dev": true, "requires": { "nanoid": "^3.3.6", @@ -9567,9 +10329,9 @@ } }, "punycode": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz", - "integrity": "sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==", + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", + "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==", "dev": true }, "queue-microtask": { @@ -9616,9 +10378,9 @@ } }, "readdir-glob": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/readdir-glob/-/readdir-glob-1.1.2.tgz", - "integrity": "sha512-6RLVvwJtVwEDfPdn6X6Ille4/lxGl0ATOY4FN/B9nxQcgOazvvI0nodiD19ScKq0PvA/29VpaOQML36o5IzZWA==", + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/readdir-glob/-/readdir-glob-1.1.3.tgz", + "integrity": "sha512-v05I2k7xN8zXvPD9N+z/uhXPaj0sUFCe2rcWZIpBsqxfP7xXFQ0tipAd/wjj1YxWyWtUS5IDJpOG82JKt2EAVA==", "dev": true, "requires": { "minimatch": "^5.1.0" @@ -9716,15 +10478,29 @@ } } }, + "reflect.getprototypeof": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/reflect.getprototypeof/-/reflect.getprototypeof-1.0.4.tgz", + "integrity": "sha512-ECkTw8TmJwW60lOTR+ZkODISW6RQ8+2CL3COqtiJKLd6MmB45hN51HprHFziKLGkAuTGQhBb91V8cy+KHlaCjw==", + "dev": true, + "requires": { + "call-bind": "^1.0.2", + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1", + "get-intrinsic": "^1.2.1", + "globalthis": "^1.0.3", + "which-builtin-type": "^1.1.3" + } + }, "regexp.prototype.flags": { - "version": "1.4.3", - "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz", - "integrity": "sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==", + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.1.tgz", + "integrity": "sha512-sy6TXMN+hnP/wMy+ISxg3krXx7BAtWVO4UouuCN/ziM9UEne0euamVNafDfvC83bRNr95y0V5iijeDQFUNpvrg==", "dev": true, "requires": { "call-bind": "^1.0.2", - "define-properties": "^1.1.3", - "functions-have-names": "^1.2.2" + "define-properties": "^1.2.0", + "set-function-name": "^2.0.0" } }, "regexpp": { @@ -9749,14 +10525,25 @@ } }, "resolve": { - "version": "1.22.1", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz", - "integrity": "sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==", + "version": "1.22.8", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz", + "integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==", "dev": true, "requires": { - "is-core-module": "^2.9.0", + "is-core-module": "^2.13.0", "path-parse": "^1.0.7", "supports-preserve-symlinks-flag": "^1.0.0" + }, + "dependencies": { + "is-core-module": { + "version": "2.13.1", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.1.tgz", + "integrity": "sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==", + "dev": true, + "requires": { + "hasown": "^2.0.0" + } + } } }, "resolve-from": { @@ -9781,9 +10568,9 @@ } }, "rollup": { - "version": "3.23.1", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.23.1.tgz", - "integrity": "sha512-ybRdFVHOoljGEFILHLd2g/qateqUdjE6YS41WXq4p3C/WwD3xtWxV4FYWETA1u9TeXQc5K8L8zHE5d/scOvrOQ==", + "version": "3.29.4", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.29.4.tgz", + "integrity": "sha512-oWzmBZwvYrU0iJHtDmhsm662rC15FRXmcjCk1xD771dFDx5jJ02ufAQQTn0etB2emNk4J9EZg/yWKpsn9BWGRw==", "dev": true, "requires": { "fsevents": "~2.3.2" @@ -9798,6 +10585,18 @@ "queue-microtask": "^1.2.2" } }, + "safe-array-concat": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.0.1.tgz", + "integrity": "sha512-6XbUAseYE2KtOuGueyeobCySj9L4+66Tn6KQMOPQJrAJEowYKW/YR/MGJZl7FdydUdaFu4LYyDZjxf4/Nmo23Q==", + "dev": true, + "requires": { + "call-bind": "^1.0.2", + "get-intrinsic": "^1.2.1", + "has-symbols": "^1.0.3", + "isarray": "^2.0.5" + } + }, "safe-buffer": { "version": "5.2.1", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", @@ -9816,14 +10615,37 @@ } }, "semver": { - "version": "7.3.8", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz", - "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==", + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", + "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", "dev": true, "requires": { "lru-cache": "^6.0.0" } }, + "set-function-length": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.1.1.tgz", + "integrity": "sha512-VoaqjbBJKiWtg4yRcKBQ7g7wnGnLV3M8oLvVWwOk2PdYY6PEFegR1vezXR0tw6fZGF9csVakIRjrJiy2veSBFQ==", + "dev": true, + "requires": { + "define-data-property": "^1.1.1", + "get-intrinsic": "^1.2.1", + "gopd": "^1.0.1", + "has-property-descriptors": "^1.0.0" + } + }, + "set-function-name": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.1.tgz", + "integrity": "sha512-tMNCiqYVkXIZgc2Hnoy2IvC/f8ezc5koaRFkCjrpWzGpCd3qbZXPzVy9MAZzK1ch/X0jvSkojys3oqJN0qCmdA==", + "dev": true, + "requires": { + "define-data-property": "^1.0.1", + "functions-have-names": "^1.2.3", + "has-property-descriptors": "^1.0.0" + } + }, "shebang-command": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", @@ -9874,9 +10696,9 @@ } }, "sirv": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/sirv/-/sirv-2.0.2.tgz", - "integrity": "sha512-4Qog6aE29nIjAOKe/wowFTxOdmbEZKb+3tsLljaBRzJwtqto0BChD2zzH0LhgCSXiI+V7X+Y45v14wBZQ1TK3w==", + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/sirv/-/sirv-2.0.3.tgz", + "integrity": "sha512-O9jm9BsID1P+0HOi81VpXPoDxYP374pkOLzACAoyUQ/3OUVndNpsz6wMnY2z+yOxzbllCKZrM+9QrWsv4THnyA==", "dev": true, "requires": { "@polka/url": "^1.0.0-next.20", @@ -9905,12 +10727,6 @@ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz", "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==", "dev": true - }, - "is-fullwidth-code-point": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-4.0.0.tgz", - "integrity": "sha512-O4L094N2/dZ7xqVdrXhh9r1KODPJpFms8B5sGdJLPy664AgvXsreZUyCQQNItZRDlYug4xStLjNp/sz3HvBowQ==", - "dev": true } } }, @@ -9957,25 +10773,26 @@ "dev": true }, "standard": { - "version": "17.0.0", - "resolved": "https://registry.npmjs.org/standard/-/standard-17.0.0.tgz", - "integrity": "sha512-GlCM9nzbLUkr+TYR5I2WQoIah4wHA2lMauqbyPLV/oI5gJxqhHzhjl9EG2N0lr/nRqI3KCbCvm/W3smxvLaChA==", + "version": "17.1.0", + "resolved": "https://registry.npmjs.org/standard/-/standard-17.1.0.tgz", + "integrity": "sha512-jaDqlNSzLtWYW4lvQmU0EnxWMUGQiwHasZl5ZEIwx3S/ijZDjZOzs1y1QqKwKs5vqnFpGtizo4NOYX2s0Voq/g==", "dev": true, "requires": { - "eslint": "^8.13.0", - "eslint-config-standard": "17.0.0", + "eslint": "^8.41.0", + "eslint-config-standard": "17.1.0", "eslint-config-standard-jsx": "^11.0.0", - "eslint-plugin-import": "^2.26.0", - "eslint-plugin-n": "^15.1.0", - "eslint-plugin-promise": "^6.0.0", - "eslint-plugin-react": "^7.28.0", - "standard-engine": "^15.0.0" + "eslint-plugin-import": "^2.27.5", + "eslint-plugin-n": "^15.7.0", + "eslint-plugin-promise": "^6.1.1", + "eslint-plugin-react": "^7.32.2", + "standard-engine": "^15.0.0", + "version-guard": "^1.1.1" } }, "standard-engine": { - "version": "15.0.0", - "resolved": "https://registry.npmjs.org/standard-engine/-/standard-engine-15.0.0.tgz", - "integrity": "sha512-4xwUhJNo1g/L2cleysUqUv7/btn7GEbYJvmgKrQ2vd/8pkTmN8cpqAZg+BT8Z1hNeEH787iWUdOpL8fmApLtxA==", + "version": "15.1.0", + "resolved": "https://registry.npmjs.org/standard-engine/-/standard-engine-15.1.0.tgz", + "integrity": "sha512-VHysfoyxFu/ukT+9v49d4BRXIokFRZuH3z1VRxzFArZdjSCFpro6rEIU3ji7e4AoAtuSfKBkiOmsrDqKW5ZSRw==", "dev": true, "requires": { "get-stdin": "^8.0.0", @@ -9985,9 +10802,9 @@ } }, "std-env": { - "version": "3.3.2", - "resolved": "https://registry.npmjs.org/std-env/-/std-env-3.3.2.tgz", - "integrity": "sha512-uUZI65yrV2Qva5gqE0+A7uVAvO40iPo6jGhs7s8keRfHCmtg+uB2X6EiLGCI9IgL1J17xGhvoOqSz79lzICPTA==", + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/std-env/-/std-env-3.5.0.tgz", + "integrity": "sha512-JGUEaALvL0Mf6JCfYnJOTcobY+Nc7sG/TemDRBqCA0wEr4DER7zDchaaixTlmOxAjG1uRJmX82EQcxwTQTkqVA==", "dev": true }, "stream-connect": { @@ -10019,6 +10836,12 @@ "readable-stream": "^2.1.4" }, "dependencies": { + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==", + "dev": true + }, "readable-stream": { "version": "2.3.8", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz", @@ -10067,63 +10890,81 @@ } }, "string-width": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", - "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz", + "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==", "dev": true, "requires": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.1" + "eastasianwidth": "^0.2.0", + "emoji-regex": "^9.2.2", + "strip-ansi": "^7.0.1" + }, + "dependencies": { + "ansi-regex": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", + "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", + "dev": true + }, + "strip-ansi": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", + "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", + "dev": true, + "requires": { + "ansi-regex": "^6.0.1" + } + } } }, "string.prototype.matchall": { - "version": "4.0.8", - "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.8.tgz", - "integrity": "sha512-6zOCOcJ+RJAQshcTvXPHoxoQGONa3e/Lqx90wUA+wEzX78sg5Bo+1tQo4N0pohS0erG9qtCqJDjNCQBjeWVxyg==", + "version": "4.0.10", + "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.10.tgz", + "integrity": "sha512-rGXbGmOEosIQi6Qva94HUjgPs9vKW+dkG7Y8Q5O2OYkWL6wFaTRZO8zM4mhP94uX55wgyrXzfS2aGtGzUL7EJQ==", "dev": true, "requires": { "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4", - "get-intrinsic": "^1.1.3", + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1", + "get-intrinsic": "^1.2.1", "has-symbols": "^1.0.3", - "internal-slot": "^1.0.3", - "regexp.prototype.flags": "^1.4.3", + "internal-slot": "^1.0.5", + "regexp.prototype.flags": "^1.5.0", + "set-function-name": "^2.0.0", "side-channel": "^1.0.4" } }, "string.prototype.trim": { - "version": "1.2.7", - "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.7.tgz", - "integrity": "sha512-p6TmeT1T3411M8Cgg9wBTMRtY2q9+PNy9EV1i2lIXUN/btt763oIfxwN3RR8VU6wHX8j/1CFy0L+YuThm6bgOg==", + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.8.tgz", + "integrity": "sha512-lfjY4HcixfQXOfaqCvcBuOIapyaroTXhbkfJN3gcB1OtyupngWK4sEET9Knd0cXd28kTUqu/kHoV4HKSJdnjiQ==", "dev": true, "requires": { "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4" + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1" } }, "string.prototype.trimend": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz", - "integrity": "sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ==", + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.7.tgz", + "integrity": "sha512-Ni79DqeB72ZFq1uH/L6zJ+DKZTkOtPIHovb3YZHQViE+HDouuU4mBrLOLDn5Dde3RF8qw5qVETEjhu9locMLvA==", "dev": true, "requires": { "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4" + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1" } }, "string.prototype.trimstart": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz", - "integrity": "sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA==", + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.7.tgz", + "integrity": "sha512-NGhtDFu3jCEm7B4Fy0DpLewdJQOZcQ0rGbwQ/+stjnrp2i+rlKeCvos9hOIeCmqwratM47OBxY7uFZzjxHXmrg==", "dev": true, "requires": { "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4" + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1" } }, "strip-ansi": { @@ -10148,12 +10989,12 @@ "dev": true }, "strip-literal": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/strip-literal/-/strip-literal-1.0.1.tgz", - "integrity": "sha512-QZTsipNpa2Ppr6v1AmJHESqJ3Uz247MUS0OjrnnZjFAvEoWqxuyFuXn2xLgMtRnijJShAa1HL0gtJyUs7u7n3Q==", + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/strip-literal/-/strip-literal-1.3.0.tgz", + "integrity": "sha512-PugKzOsyXpArk0yWmUwqOZecSO0GH0bPoctLcqNDH9J04pVW3lflYE0ujElBGTloevcxF5MofAOZ7C5l2b+wLg==", "dev": true, "requires": { - "acorn": "^8.8.2" + "acorn": "^8.10.0" } }, "supports-color": { @@ -10254,9 +11095,9 @@ "dev": true }, "tinybench": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/tinybench/-/tinybench-2.4.0.tgz", - "integrity": "sha512-iyziEiyFxX4kyxSp+MtY1oCH/lvjH3PxFN8PGCDeqcZWAJ/i+9y+nL85w99PxVzrIvew/GSkSbDYtiGVa85Afg==", + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/tinybench/-/tinybench-2.5.1.tgz", + "integrity": "sha512-65NKvSuAVDP/n4CqH+a9w2kTlLReS9vhsAP06MWx+/89nMinJyB2icyl58RIcqCmIggpojIGeuJGhjU1aGMBSg==", "dev": true }, "tinypool": { @@ -10287,9 +11128,9 @@ } }, "totalist": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/totalist/-/totalist-3.0.0.tgz", - "integrity": "sha512-eM+pCBxXO/njtF7vdFsHuqb+ElbxqtI4r5EAvk6grfAFyJ6IvWlSkfZ5T9ozC6xWw3Fj1fGoSmrl0gUs46JVIw==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/totalist/-/totalist-3.0.1.tgz", + "integrity": "sha512-sf4i37nQ2LBx4m3wB74y+ubopq6W/dIzXg0FDGjsYnZHVa1Da8FH853wlL2gtUhg+xJXjfk3kUZS3BRoQeoQBQ==", "dev": true }, "tr46": { @@ -10339,6 +11180,42 @@ "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", "dev": true }, + "typed-array-buffer": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.0.tgz", + "integrity": "sha512-Y8KTSIglk9OZEr8zywiIHG/kmQ7KWyjseXs1CbSo8vC42w7hg2HgYTxSWwP0+is7bWDc1H+Fo026CpHFwm8tkw==", + "dev": true, + "requires": { + "call-bind": "^1.0.2", + "get-intrinsic": "^1.2.1", + "is-typed-array": "^1.1.10" + } + }, + "typed-array-byte-length": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.0.tgz", + "integrity": "sha512-Or/+kvLxNpeQ9DtSydonMxCx+9ZXOswtwJn17SNLvhptaXYDJvkFFP5zbfU/uLmvnBJlI4yrnXRxpdWH/M5tNA==", + "dev": true, + "requires": { + "call-bind": "^1.0.2", + "for-each": "^0.3.3", + "has-proto": "^1.0.1", + "is-typed-array": "^1.1.10" + } + }, + "typed-array-byte-offset": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.0.tgz", + "integrity": "sha512-RD97prjEt9EL8YgAgpOkf3O4IF9lhJFr9g0htQkm0rchFp/Vx7LW5Q8fSXXub7BXAODyUQohRMyOc3faCPd0hg==", + "dev": true, + "requires": { + "available-typed-arrays": "^1.0.5", + "call-bind": "^1.0.2", + "for-each": "^0.3.3", + "has-proto": "^1.0.1", + "is-typed-array": "^1.1.10" + } + }, "typed-array-length": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.4.tgz", @@ -10363,9 +11240,9 @@ "dev": true }, "ufo": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/ufo/-/ufo-1.1.1.tgz", - "integrity": "sha512-MvlCc4GHrmZdAllBc0iUDowff36Q9Ndw/UzqmEKyrfSzokTd9ZCy1i+IIk5hrYKkjoYVQyNbrw7/F8XJ2rEwTg==", + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/ufo/-/ufo-1.3.2.tgz", + "integrity": "sha512-o+ORpgGwaYQXgqGDwd+hkS4PuZ3QnmqMMxRuajK/a38L6fTpcE5GPIfrf+L/KemFzfUpeUQc1rRS1iDBozvnFA==", "dev": true }, "uglify-js": { @@ -10393,10 +11270,16 @@ "integrity": "sha512-+A5Sja4HP1M08MaXya7p5LvjuM7K6q/2EaC0+iovj/wOcMsTzMvDFbasi/oSapiwOlt252IqsKqPjCl7huKS0A==", "dev": true }, + "undici-types": { + "version": "5.26.5", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz", + "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==", + "dev": true + }, "universalify": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz", - "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", + "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", "dev": true }, "uri-js": { @@ -10414,22 +11297,28 @@ "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==", "dev": true }, + "version-guard": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/version-guard/-/version-guard-1.1.1.tgz", + "integrity": "sha512-MGQLX89UxmYHgDvcXyjBI0cbmoW+t/dANDppNPrno64rYr8nH4SHSuElQuSYdXGEs0mUzdQe1BY+FhVPNsAmJQ==", + "dev": true + }, "vite": { - "version": "4.3.9", - "resolved": "https://registry.npmjs.org/vite/-/vite-4.3.9.tgz", - "integrity": "sha512-qsTNZjO9NoJNW7KnOrgYwczm0WctJ8m/yqYAMAK9Lxt4SoySUfS5S8ia9K7JHpa3KEeMfyF8LoJ3c5NeBJy6pg==", + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/vite/-/vite-4.5.0.tgz", + "integrity": "sha512-ulr8rNLA6rkyFAlVWw2q5YJ91v098AFQ2R0PRFwPzREXOUJQPtFUG0t+/ZikhaOCDqFoDhN6/v8Sq0o4araFAw==", "dev": true, "requires": { - "esbuild": "^0.17.5", + "esbuild": "^0.18.10", "fsevents": "~2.3.2", - "postcss": "^8.4.23", - "rollup": "^3.21.0" + "postcss": "^8.4.27", + "rollup": "^3.27.1" } }, "vite-node": { - "version": "0.29.7", - "resolved": "https://registry.npmjs.org/vite-node/-/vite-node-0.29.7.tgz", - "integrity": "sha512-PakCZLvz37yFfUPWBnLa1OYHPCGm5v4pmRrTcFN4V/N/T3I6tyP3z07S//9w+DdeL7vVd0VSeyMZuAh+449ZWw==", + "version": "0.29.8", + "resolved": "https://registry.npmjs.org/vite-node/-/vite-node-0.29.8.tgz", + "integrity": "sha512-b6OtCXfk65L6SElVM20q5G546yu10/kNrhg08afEoWlFRJXFq9/6glsvSVY+aI6YeC1tu2TtAqI2jHEQmOmsFw==", "dev": true, "requires": { "cac": "^6.7.14", @@ -10441,18 +11330,18 @@ } }, "vitest": { - "version": "0.29.7", - "resolved": "https://registry.npmjs.org/vitest/-/vitest-0.29.7.tgz", - "integrity": "sha512-aWinOSOu4jwTuZHkb+cCyrqQ116Q9TXaJrNKTHudKBknIpR0VplzeaOUuDF9jeZcrbtQKZQt6yrtd+eakbaxHg==", + "version": "0.29.8", + "resolved": "https://registry.npmjs.org/vitest/-/vitest-0.29.8.tgz", + "integrity": "sha512-JIAVi2GK5cvA6awGpH0HvH/gEG9PZ0a/WoxdiV3PmqK+3CjQMf8c+J/Vhv4mdZ2nRyXFw66sAg6qz7VNkaHfDQ==", "dev": true, "requires": { "@types/chai": "^4.3.4", "@types/chai-subset": "^1.3.3", "@types/node": "*", - "@vitest/expect": "0.29.7", - "@vitest/runner": "0.29.7", - "@vitest/spy": "0.29.7", - "@vitest/utils": "0.29.7", + "@vitest/expect": "0.29.8", + "@vitest/runner": "0.29.8", + "@vitest/spy": "0.29.8", + "@vitest/utils": "0.29.8", "acorn": "^8.8.1", "acorn-walk": "^8.2.0", "cac": "^6.7.14", @@ -10468,7 +11357,7 @@ "tinypool": "^0.4.0", "tinyspy": "^1.0.2", "vite": "^3.0.0 || ^4.0.0", - "vite-node": "0.29.7", + "vite-node": "0.29.8", "why-is-node-running": "^2.2.2" } }, @@ -10514,18 +11403,49 @@ "is-symbol": "^1.0.3" } }, + "which-builtin-type": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/which-builtin-type/-/which-builtin-type-1.1.3.tgz", + "integrity": "sha512-YmjsSMDBYsM1CaFiayOVT06+KJeXf0o5M/CAd4o1lTadFAtacTUM49zoYxr/oroopFDfhvN6iEcBxUyc3gvKmw==", + "dev": true, + "requires": { + "function.prototype.name": "^1.1.5", + "has-tostringtag": "^1.0.0", + "is-async-function": "^2.0.0", + "is-date-object": "^1.0.5", + "is-finalizationregistry": "^1.0.2", + "is-generator-function": "^1.0.10", + "is-regex": "^1.1.4", + "is-weakref": "^1.0.2", + "isarray": "^2.0.5", + "which-boxed-primitive": "^1.0.2", + "which-collection": "^1.0.1", + "which-typed-array": "^1.1.9" + } + }, + "which-collection": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/which-collection/-/which-collection-1.0.1.tgz", + "integrity": "sha512-W8xeTUwaln8i3K/cY1nGXzdnVZlidBcagyNFtBdD5kxnb4TvGKR7FfSIS3mYpwWS1QUCutfKz8IY8RjftB0+1A==", + "dev": true, + "requires": { + "is-map": "^2.0.1", + "is-set": "^2.0.1", + "is-weakmap": "^2.0.1", + "is-weakset": "^2.0.1" + } + }, "which-typed-array": { - "version": "1.1.9", - "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.9.tgz", - "integrity": "sha512-w9c4xkx6mPidwp7180ckYWfMmvxpjlZuIudNtDf4N/tTAUB8VJbX25qZoAsrtGuYNnGw3pa0AXgbGKRB8/EceA==", + "version": "1.1.13", + "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.13.tgz", + "integrity": "sha512-P5Nra0qjSncduVPEAr7xhoF5guty49ArDTwzJ/yNuPIbZppyRxFQsRCWrocxIY+CnMVG+qfbU2FmDKyvSGClow==", "dev": true, "requires": { "available-typed-arrays": "^1.0.5", - "call-bind": "^1.0.2", + "call-bind": "^1.0.4", "for-each": "^0.3.3", "gopd": "^1.0.1", - "has-tostringtag": "^1.0.0", - "is-typed-array": "^1.1.10" + "has-tostringtag": "^1.0.0" } }, "why-is-node-running": { @@ -10538,12 +11458,6 @@ "stackback": "0.0.2" } }, - "word-wrap": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz", - "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==", - "dev": true - }, "wordwrap": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz", @@ -10577,6 +11491,31 @@ "ansi-styles": "^4.0.0", "string-width": "^4.1.0", "strip-ansi": "^6.0.0" + }, + "dependencies": { + "emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "dev": true + }, + "is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "dev": true + }, + "string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dev": true, + "requires": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + } + } } }, "wrappy": { @@ -10622,6 +11561,31 @@ "string-width": "^4.2.0", "y18n": "^5.0.5", "yargs-parser": "^20.2.2" + }, + "dependencies": { + "emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "dev": true + }, + "is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "dev": true + }, + "string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dev": true, + "requires": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + } + } } }, "yargs-parser": { @@ -10637,14 +11601,34 @@ "dev": true }, "zip-stream": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/zip-stream/-/zip-stream-4.1.0.tgz", - "integrity": "sha512-zshzwQW7gG7hjpBlgeQP9RuyPGNxvJdzR8SUM3QhxCnLjWN2E7j3dOvpeDcQoETfHx0urRS7EtmVToql7YpU4A==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/zip-stream/-/zip-stream-4.1.1.tgz", + "integrity": "sha512-9qv4rlDiopXg4E69k+vMHjNN63YFMe9sZMrdlvKnCjlCRWeCBswPPMPUfx+ipsAWq1LXHe70RcbaHdJJpS6hyQ==", "dev": true, "requires": { - "archiver-utils": "^2.1.0", - "compress-commons": "^4.1.0", + "archiver-utils": "^3.0.4", + "compress-commons": "^4.1.2", "readable-stream": "^3.6.0" + }, + "dependencies": { + "archiver-utils": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/archiver-utils/-/archiver-utils-3.0.4.tgz", + "integrity": "sha512-KVgf4XQVrTjhyWmx6cte4RxonPLR9onExufI1jhvw/MQ4BB6IsZD5gT8Lq+u/+pRkWna/6JoHpiQioaqFP5Rzw==", + "dev": true, + "requires": { + "glob": "^7.2.3", + "graceful-fs": "^4.2.0", + "lazystream": "^1.0.0", + "lodash.defaults": "^4.2.0", + "lodash.difference": "^4.5.0", + "lodash.flatten": "^4.4.0", + "lodash.isplainobject": "^4.0.6", + "lodash.union": "^4.6.0", + "normalize-path": "^3.0.0", + "readable-stream": "^3.6.0" + } + } } } } diff --git a/package.json b/package.json index d4cbb3a..f82e41d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "raylib", - "version": "0.14.0", + "version": "0.15.0", "description": "Node.js bindings for raylib.", "main": "index.js", "types": "src/generated/node-raylib.d.ts", @@ -66,7 +66,7 @@ "module-alias": "^2.2.2" }, "devDependencies": { - "@raylib/api": "~4.5.0", + "@raylib/api": "^5.0.0", "@vitest/ui": "^0.29.7", "archiver": "^5.3.1", "jsdoc-to-markdown": "^8.0.0", diff --git a/src/extras/raygui.h b/src/extras/raygui.h index 833725d..987e221 100644 --- a/src/extras/raygui.h +++ b/src/extras/raygui.h @@ -1,32 +1,55 @@ /******************************************************************************************* * -* raygui v3.5-dev - A simple and easy-to-use immediate-mode gui library +* raygui v4.0 - A simple and easy-to-use immediate-mode gui library * * DESCRIPTION: +* raygui is a tools-dev-focused immediate-mode-gui library based on raylib but also +* available as a standalone library, as long as input and drawing functions are provided. * -* raygui is a tools-dev-focused immediate-mode-gui library based on raylib but also -* available as a standalone library, as long as input and drawing functions are provided. +* FEATURES: +* - Immediate-mode gui, minimal retained data +* - +25 controls provided (basic and advanced) +* - Styling system for colors, font and metrics +* - Icons supported, embedded as a 1-bit icons pack +* - Standalone mode option (custom input/graphics backend) +* - Multiple support tools provided for raygui development * -* Controls provided: +* POSSIBLE IMPROVEMENTS: +* - Better standalone mode API for easy plug of custom backends +* - Externalize required inputs, allow user easier customization * -* # Container/separators Controls +* LIMITATIONS: +* - No editable multi-line word-wraped text box supported +* - No auto-layout mechanism, up to the user to define controls position and size +* - Standalone mode requires library modification and some user work to plug another backend +* +* NOTES: +* - WARNING: GuiLoadStyle() and GuiLoadStyle{Custom}() functions, allocate memory for +* font atlas recs and glyphs, freeing that memory is (usually) up to the user, +* no unload function is explicitly provided... but note that GuiLoadStyleDefaulf() unloads +* by default any previously loaded font (texture, recs, glyphs). +* - Global UI alpha (guiAlpha) is applied inside GuiDrawRectangle() and GuiDrawText() functions +* +* CONTROLS PROVIDED: +* # Container/separators Controls * - WindowBox --> StatusBar, Panel * - GroupBox --> Line * - Line * - Panel --> StatusBar * - ScrollPanel --> StatusBar +* - TabBar --> Button * -* # Basic Controls +* # Basic Controls * - Label -* - Button * - LabelButton --> Label +* - Button * - Toggle * - ToggleGroup --> Toggle +* - ToggleSlider * - CheckBox * - ComboBox * - DropdownBox * - TextBox -* - TextBoxMulti * - ValueBox --> TextBox * - Spinner --> Button, ValueBox * - Slider @@ -36,88 +59,141 @@ * - DummyRec * - Grid * -* # Advance Controls +* # Advance Controls * - ListView * - ColorPicker --> ColorPanel, ColorBarHue * - MessageBox --> Window, Label, Button * - TextInputBox --> Window, Label, TextBox, Button * -* It also provides a set of functions for styling the controls based on its properties (size, color). +* It also provides a set of functions for styling the controls based on its properties (size, color). * * * RAYGUI STYLE (guiStyle): +* raygui uses a global data array for all gui style properties (allocated on data segment by default), +* when a new style is loaded, it is loaded over the global style... but a default gui style could always be +* recovered with GuiLoadStyleDefault() function, that overwrites the current style to the default one * -* raygui uses a global data array for all gui style properties (allocated on data segment by default), -* when a new style is loaded, it is loaded over the global style... but a default gui style could always be -* recovered with GuiLoadStyleDefault() function, that overwrites the current style to the default one +* The global style array size is fixed and depends on the number of controls and properties: * -* The global style array size is fixed and depends on the number of controls and properties: +* static unsigned int guiStyle[RAYGUI_MAX_CONTROLS*(RAYGUI_MAX_PROPS_BASE + RAYGUI_MAX_PROPS_EXTENDED)]; * -* static unsigned int guiStyle[RAYGUI_MAX_CONTROLS*(RAYGUI_MAX_PROPS_BASE + RAYGUI_MAX_PROPS_EXTENDED)]; +* guiStyle size is by default: 16*(16 + 8) = 384*4 = 1536 bytes = 1.5 KB * -* guiStyle size is by default: 16*(16 + 8) = 384*4 = 1536 bytes = 1.5 KB +* Note that the first set of BASE properties (by default guiStyle[0..15]) belong to the generic style +* used for all controls, when any of those base values is set, it is automatically populated to all +* controls, so, specific control values overwriting generic style should be set after base values. * -* Note that the first set of BASE properties (by default guiStyle[0..15]) belong to the generic style -* used for all controls, when any of those base values is set, it is automatically populated to all -* controls, so, specific control values overwriting generic style should be set after base values. +* After the first BASE set we have the EXTENDED properties (by default guiStyle[16..23]), those +* properties are actually common to all controls and can not be overwritten individually (like BASE ones) +* Some of those properties are: TEXT_SIZE, TEXT_SPACING, LINE_COLOR, BACKGROUND_COLOR * -* After the first BASE set we have the EXTENDED properties (by default guiStyle[16..23]), those -* properties are actually common to all controls and can not be overwritten individually (like BASE ones) -* Some of those properties are: TEXT_SIZE, TEXT_SPACING, LINE_COLOR, BACKGROUND_COLOR +* Custom control properties can be defined using the EXTENDED properties for each independent control. * -* Custom control properties can be defined using the EXTENDED properties for each independent control. -* -* TOOL: rGuiStyler is a visual tool to customize raygui style. +* TOOL: rGuiStyler is a visual tool to customize raygui style: github.com/raysan5/rguistyler * * * RAYGUI ICONS (guiIcons): +* raygui could use a global array containing icons data (allocated on data segment by default), +* a custom icons set could be loaded over this array using GuiLoadIcons(), but loaded icons set +* must be same RAYGUI_ICON_SIZE and no more than RAYGUI_ICON_MAX_ICONS will be loaded * -* raygui could use a global array containing icons data (allocated on data segment by default), -* a custom icons set could be loaded over this array using GuiLoadIcons(), but loaded icons set -* must be same RAYGUI_ICON_SIZE and no more than RAYGUI_ICON_MAX_ICONS will be loaded +* Every icon is codified in binary form, using 1 bit per pixel, so, every 16x16 icon +* requires 8 integers (16*16/32) to be stored in memory. * -* Every icon is codified in binary form, using 1 bit per pixel, so, every 16x16 icon -* requires 8 integers (16*16/32) to be stored in memory. +* When the icon is draw, actually one quad per pixel is drawn if the bit for that pixel is set. * -* When the icon is draw, actually one quad per pixel is drawn if the bit for that pixel is set. +* The global icons array size is fixed and depends on the number of icons and size: * -* The global icons array size is fixed and depends on the number of icons and size: +* static unsigned int guiIcons[RAYGUI_ICON_MAX_ICONS*RAYGUI_ICON_DATA_ELEMENTS]; * -* static unsigned int guiIcons[RAYGUI_ICON_MAX_ICONS*RAYGUI_ICON_DATA_ELEMENTS]; +* guiIcons size is by default: 256*(16*16/32) = 2048*4 = 8192 bytes = 8 KB * -* guiIcons size is by default: 256*(16*16/32) = 2048*4 = 8192 bytes = 8 KB +* TOOL: rGuiIcons is a visual tool to customize/create raygui icons: github.com/raysan5/rguiicons * -* TOOL: rGuiIcons is a visual tool to customize raygui icons and create new ones. +* RAYGUI LAYOUT: +* raygui currently does not provide an auto-layout mechanism like other libraries, +* layouts must be defined manually on controls drawing, providing the right bounds Rectangle for it. * +* TOOL: rGuiLayout is a visual tool to create raygui layouts: github.com/raysan5/rguilayout * * CONFIGURATION: +* #define RAYGUI_IMPLEMENTATION +* Generates the implementation of the library into the included file. +* If not defined, the library is in header only mode and can be included in other headers +* or source files without problems. But only ONE file should hold the implementation. * -* #define RAYGUI_IMPLEMENTATION -* Generates the implementation of the library into the included file. -* If not defined, the library is in header only mode and can be included in other headers -* or source files without problems. But only ONE file should hold the implementation. +* #define RAYGUI_STANDALONE +* Avoid raylib.h header inclusion in this file. Data types defined on raylib are defined +* internally in the library and input management and drawing functions must be provided by +* the user (check library implementation for further details). * -* #define RAYGUI_STANDALONE -* Avoid raylib.h header inclusion in this file. Data types defined on raylib are defined -* internally in the library and input management and drawing functions must be provided by -* the user (check library implementation for further details). +* #define RAYGUI_NO_ICONS +* Avoid including embedded ricons data (256 icons, 16x16 pixels, 1-bit per pixel, 2KB) * -* #define RAYGUI_NO_ICONS -* Avoid including embedded ricons data (256 icons, 16x16 pixels, 1-bit per pixel, 2KB) +* #define RAYGUI_CUSTOM_ICONS +* Includes custom ricons.h header defining a set of custom icons, +* this file can be generated using rGuiIcons tool * -* #define RAYGUI_CUSTOM_ICONS -* Includes custom ricons.h header defining a set of custom icons, -* this file can be generated using rGuiIcons tool +* #define RAYGUI_DEBUG_RECS_BOUNDS +* Draw control bounds rectangles for debug * +* #define RAYGUI_DEBUG_TEXT_BOUNDS +* Draw text bounds rectangles for debug * * VERSIONS HISTORY: -* 3.5 (xx-xxx-2022) ADDED: Multiple new icons, useful for code editing tools -* ADDED: GuiTabBar(), based on GuiToggle() +* 4.0 (12-Sep-2023) ADDED: GuiToggleSlider() +* ADDED: GuiColorPickerHSV() and GuiColorPanelHSV() +* ADDED: Multiple new icons, mostly compiler related +* ADDED: New DEFAULT properties: TEXT_LINE_SPACING, TEXT_ALIGNMENT_VERTICAL, TEXT_WRAP_MODE +* ADDED: New enum values: GuiTextAlignment, GuiTextAlignmentVertical, GuiTextWrapMode +* ADDED: Support loading styles with custom font charset from external file +* REDESIGNED: GuiTextBox(), support mouse cursor positioning +* REDESIGNED: GuiDrawText(), support multiline and word-wrap modes (read only) +* REDESIGNED: GuiProgressBar() to be more visual, progress affects border color +* REDESIGNED: Global alpha consideration moved to GuiDrawRectangle() and GuiDrawText() +* REDESIGNED: GuiScrollPanel(), get parameters by reference and return result value +* REDESIGNED: GuiToggleGroup(), get parameters by reference and return result value +* REDESIGNED: GuiComboBox(), get parameters by reference and return result value +* REDESIGNED: GuiCheckBox(), get parameters by reference and return result value +* REDESIGNED: GuiSlider(), get parameters by reference and return result value +* REDESIGNED: GuiSliderBar(), get parameters by reference and return result value +* REDESIGNED: GuiProgressBar(), get parameters by reference and return result value +* REDESIGNED: GuiListView(), get parameters by reference and return result value +* REDESIGNED: GuiColorPicker(), get parameters by reference and return result value +* REDESIGNED: GuiColorPanel(), get parameters by reference and return result value +* REDESIGNED: GuiColorBarAlpha(), get parameters by reference and return result value +* REDESIGNED: GuiColorBarHue(), get parameters by reference and return result value +* REDESIGNED: GuiGrid(), get parameters by reference and return result value +* REDESIGNED: GuiGrid(), added extra parameter +* REDESIGNED: GuiListViewEx(), change parameters order +* REDESIGNED: All controls return result as int value +* REVIEWED: GuiScrollPanel() to avoid smallish scroll-bars +* REVIEWED: All examples and specially controls_test_suite +* RENAMED: gui_file_dialog module to gui_window_file_dialog +* UPDATED: All styles to include ISO-8859-15 charset (as much as possible) +* +* 3.6 (10-May-2023) ADDED: New icon: SAND_TIMER +* ADDED: GuiLoadStyleFromMemory() (binary only) +* REVIEWED: GuiScrollBar() horizontal movement key +* REVIEWED: GuiTextBox() crash on cursor movement +* REVIEWED: GuiTextBox(), additional inputs support +* REVIEWED: GuiLabelButton(), avoid text cut +* REVIEWED: GuiTextInputBox(), password input +* REVIEWED: Local GetCodepointNext(), aligned with raylib +* REDESIGNED: GuiSlider*()/GuiScrollBar() to support out-of-bounds +* +* 3.5 (20-Apr-2023) ADDED: GuiTabBar(), based on GuiToggle() +* ADDED: Helper functions to split text in separate lines +* ADDED: Multiple new icons, useful for code editing tools * REMOVED: Unneeded icon editing functions -* REDESIGNED: GuiDrawText() to divide drawing by lines +* REMOVED: GuiTextBoxMulti(), very limited and broken * REMOVED: MeasureTextEx() dependency, logic directly implemented * REMOVED: DrawTextEx() dependency, logic directly implemented -* ADDED: Helper functions to split text in separate lines +* REVIEWED: GuiScrollBar(), improve mouse-click behaviour +* REVIEWED: Library header info, more info, better organized +* REDESIGNED: GuiTextBox() to support cursor movement +* REDESIGNED: GuiDrawText() to divide drawing by lines +* * 3.2 (22-May-2022) RENAMED: Some enum values, for unification, avoiding prefixes * REMOVED: GuiScrollBar(), only internal * REDESIGNED: GuiPanel() to support text parameter @@ -127,6 +203,7 @@ * REDESIGNED: GuiColorBarAlpha() to support text parameter * REDESIGNED: GuiColorBarHue() to support text parameter * REDESIGNED: GuiTextInputBox() to support password +* * 3.1 (12-Jan-2022) REVIEWED: Default style for consistency (aligned with rGuiLayout v2.5 tool) * REVIEWED: GuiLoadStyle() to support compressed font atlas image data and unload previous textures * REVIEWED: External icons usage logic @@ -134,10 +211,12 @@ * RENAMED: Multiple controls properties definitions to prepend RAYGUI_ * RENAMED: RICON_ references to RAYGUI_ICON_ for library consistency * Projects updated and multiple tweaks +* * 3.0 (04-Nov-2021) Integrated ricons data to avoid external file * REDESIGNED: GuiTextBoxMulti() * REMOVED: GuiImageButton*() * Multiple minor tweaks and bugs corrected +* * 2.9 (17-Mar-2021) REMOVED: Tooltip API * 2.8 (03-May-2020) Centralized rectangles drawing to GuiDrawRectangle() * 2.7 (20-Feb-2020) ADDED: Possible tooltips API @@ -147,6 +226,7 @@ * Replaced property INNER_PADDING by TEXT_PADDING, renamed some properties * ADDED: 8 new custom styles ready to use * Multiple minor tweaks and bugs corrected +* * 2.5 (28-May-2019) Implemented extended GuiTextBox(), GuiValueBox(), GuiSpinner() * 2.3 (29-Apr-2019) ADDED: rIcons auxiliar library and support for it, multiple controls reviewed * Refactor all controls drawing mechanism to use control state @@ -165,14 +245,44 @@ * 0.9 (07-Mar-2016) Reviewed and tested by Albert Martos, Ian Eito, Sergio Martinez and Ramon Santamaria. * 0.8 (27-Aug-2015) Initial release. Implemented by Kevin Gato, Daniel Nicolás and Ramon Santamaria. * +* DEPENDENCIES: +* raylib 5.0 - Inputs reading (keyboard/mouse), shapes drawing, font loading and text drawing * -* CONTRIBUTORS: +* STANDALONE MODE: +* By default raygui depends on raylib mostly for the inputs and the drawing functionality but that dependency can be disabled +* with the config flag RAYGUI_STANDALONE. In that case is up to the user to provide another backend to cover library needs. +* +* The following functions should be redefined for a custom backend: +* +* - Vector2 GetMousePosition(void); +* - float GetMouseWheelMove(void); +* - bool IsMouseButtonDown(int button); +* - bool IsMouseButtonPressed(int button); +* - bool IsMouseButtonReleased(int button); +* - bool IsKeyDown(int key); +* - bool IsKeyPressed(int key); +* - int GetCharPressed(void); // -- GuiTextBox(), GuiValueBox() +* +* - void DrawRectangle(int x, int y, int width, int height, Color color); // -- GuiDrawRectangle() +* - void DrawRectangleGradientEx(Rectangle rec, Color col1, Color col2, Color col3, Color col4); // -- GuiColorPicker() * +* - Font GetFontDefault(void); // -- GuiLoadStyleDefault() +* - Font LoadFontEx(const char *fileName, int fontSize, int *codepoints, int codepointCount); // -- GuiLoadStyle() +* - Texture2D LoadTextureFromImage(Image image); // -- GuiLoadStyle(), required to load texture from embedded font atlas image +* - void SetShapesTexture(Texture2D tex, Rectangle rec); // -- GuiLoadStyle(), required to set shapes rec to font white rec (optimization) +* - char *LoadFileText(const char *fileName); // -- GuiLoadStyle(), required to load charset data +* - void UnloadFileText(char *text); // -- GuiLoadStyle(), required to unload charset data +* - const char *GetDirectoryPath(const char *filePath); // -- GuiLoadStyle(), required to find charset/font file from text .rgs +* - int *LoadCodepoints(const char *text, int *count); // -- GuiLoadStyle(), required to load required font codepoints list +* - void UnloadCodepoints(int *codepoints); // -- GuiLoadStyle(), required to unload codepoints list +* - unsigned char *DecompressData(const unsigned char *compData, int compDataSize, int *dataSize); // -- GuiLoadStyle() +* +* CONTRIBUTORS: * Ramon Santamaria: Supervision, review, redesign, update and maintenance * Vlad Adrian: Complete rewrite of GuiTextBox() to support extended features (2019) * Sergio Martinez: Review, testing (2015) and redesign of multiple controls (2018) -* Adria Arranz: Testing and Implementation of additional controls (2018) -* Jordi Jorba: Testing and Implementation of additional controls (2018) +* Adria Arranz: Testing and implementation of additional controls (2018) +* Jordi Jorba: Testing and implementation of additional controls (2018) * Albert Martos: Review and testing of the library (2015) * Ian Eito: Review and testing of the library (2015) * Kevin Gato: Initial implementation of basic components (2014) @@ -203,7 +313,10 @@ #ifndef RAYGUI_H #define RAYGUI_H -#define RAYGUI_VERSION "3.2" +#define RAYGUI_VERSION_MAJOR 4 +#define RAYGUI_VERSION_MINOR 0 +#define RAYGUI_VERSION_PATCH 0 +#define RAYGUI_VERSION "4.0" #if !defined(RAYGUI_STANDALONE) #include "raylib.h" @@ -328,37 +441,69 @@ } Font; #endif + // Style property +// NOTE: Used when exporting style as code for convenience typedef struct GuiStyleProp { - unsigned short controlId; - unsigned short propertyId; - unsigned int propertyValue; + unsigned short controlId; // Control identifier + unsigned short propertyId; // Property identifier + int propertyValue; // Property value } GuiStyleProp; +/* +// Controls text style -NOT USED- +// NOTE: Text style is defined by control +typedef struct GuiTextStyle { + unsigned int size; + int charSpacing; + int lineSpacing; + int alignmentH; + int alignmentV; + int padding; +} GuiTextStyle; +*/ + // Gui control state typedef enum { STATE_NORMAL = 0, STATE_FOCUSED, STATE_PRESSED, - STATE_DISABLED, + STATE_DISABLED } GuiState; // Gui control text alignment typedef enum { TEXT_ALIGN_LEFT = 0, TEXT_ALIGN_CENTER, - TEXT_ALIGN_RIGHT, + TEXT_ALIGN_RIGHT } GuiTextAlignment; +// Gui control text alignment vertical +// NOTE: Text vertical position inside the text bounds +typedef enum { + TEXT_ALIGN_TOP = 0, + TEXT_ALIGN_MIDDLE, + TEXT_ALIGN_BOTTOM +} GuiTextAlignmentVertical; + +// Gui control text wrap mode +// NOTE: Useful for multiline text +typedef enum { + TEXT_WRAP_NONE = 0, + TEXT_WRAP_CHAR, + TEXT_WRAP_WORD +} GuiTextWrapMode; + // Gui controls typedef enum { // Default -> populates to all controls when set DEFAULT = 0, + // Basic controls LABEL, // Used also for: LABELBUTTON BUTTON, TOGGLE, // Used also for: TOGGLEGROUP - SLIDER, // Used also for: SLIDERBAR + SLIDER, // Used also for: SLIDERBAR, TOGGLESLIDER PROGRESSBAR, CHECKBOX, COMBOBOX, @@ -375,37 +520,55 @@ typedef enum { // Gui base properties for every control // NOTE: RAYGUI_MAX_PROPS_BASE properties (by default 16 properties) typedef enum { - BORDER_COLOR_NORMAL = 0, - BASE_COLOR_NORMAL, - TEXT_COLOR_NORMAL, - BORDER_COLOR_FOCUSED, - BASE_COLOR_FOCUSED, - TEXT_COLOR_FOCUSED, - BORDER_COLOR_PRESSED, - BASE_COLOR_PRESSED, - TEXT_COLOR_PRESSED, - BORDER_COLOR_DISABLED, - BASE_COLOR_DISABLED, - TEXT_COLOR_DISABLED, - BORDER_WIDTH, - TEXT_PADDING, - TEXT_ALIGNMENT, - RESERVED + BORDER_COLOR_NORMAL = 0, // Control border color in STATE_NORMAL + BASE_COLOR_NORMAL, // Control base color in STATE_NORMAL + TEXT_COLOR_NORMAL, // Control text color in STATE_NORMAL + BORDER_COLOR_FOCUSED, // Control border color in STATE_FOCUSED + BASE_COLOR_FOCUSED, // Control base color in STATE_FOCUSED + TEXT_COLOR_FOCUSED, // Control text color in STATE_FOCUSED + BORDER_COLOR_PRESSED, // Control border color in STATE_PRESSED + BASE_COLOR_PRESSED, // Control base color in STATE_PRESSED + TEXT_COLOR_PRESSED, // Control text color in STATE_PRESSED + BORDER_COLOR_DISABLED, // Control border color in STATE_DISABLED + BASE_COLOR_DISABLED, // Control base color in STATE_DISABLED + TEXT_COLOR_DISABLED, // Control text color in STATE_DISABLED + BORDER_WIDTH, // Control border size, 0 for no border + //TEXT_SIZE, // Control text size (glyphs max height) -> GLOBAL for all controls + //TEXT_SPACING, // Control text spacing between glyphs -> GLOBAL for all controls + //TEXT_LINE_SPACING // Control text spacing between lines -> GLOBAL for all controls + TEXT_PADDING, // Control text padding, not considering border + TEXT_ALIGNMENT, // Control text horizontal alignment inside control text bound (after border and padding) + //TEXT_WRAP_MODE // Control text wrap-mode inside text bounds -> GLOBAL for all controls } GuiControlProperty; +// TODO: Which text styling properties should be global or per-control? +// At this moment TEXT_PADDING and TEXT_ALIGNMENT is configured and saved per control while +// TEXT_SIZE, TEXT_SPACING, TEXT_LINE_SPACING, TEXT_ALIGNMENT_VERTICAL, TEXT_WRAP_MODE are global and +// should be configured by user as needed while defining the UI layout + + // Gui extended properties depend on control -// NOTE: RAYGUI_MAX_PROPS_EXTENDED properties (by default 8 properties) +// NOTE: RAYGUI_MAX_PROPS_EXTENDED properties (by default, max 8 properties) //---------------------------------------------------------------------------------- - // DEFAULT extended properties // NOTE: Those properties are common to all controls or global +// WARNING: We only have 8 slots for those properties by default!!! -> New global control: TEXT? typedef enum { TEXT_SIZE = 16, // Text size (glyphs max height) TEXT_SPACING, // Text spacing between glyphs LINE_COLOR, // Line control color BACKGROUND_COLOR, // Background color + TEXT_LINE_SPACING, // Text spacing between lines + TEXT_ALIGNMENT_VERTICAL, // Text vertical alignment inside text bounds (after border and padding) + TEXT_WRAP_MODE // Text wrap-mode inside text bounds + //TEXT_DECORATION // Text decoration: 0-None, 1-Underline, 2-Line-through, 3-Overline + //TEXT_DECORATION_THICK // Text decoration line thikness } GuiDefaultProperty; +// Other possible text properties: +// TEXT_WEIGHT // Normal, Italic, Bold -> Requires specific font change +// TEXT_INDENT // Text indentation -> Now using TEXT_PADDING... + // Label //typedef enum { } GuiLabelProperty; @@ -430,12 +593,12 @@ typedef enum { // ScrollBar typedef enum { - ARROWS_SIZE = 16, - ARROWS_VISIBLE, - SCROLL_SLIDER_PADDING, // (SLIDERBAR, SLIDER_PADDING) - SCROLL_SLIDER_SIZE, - SCROLL_PADDING, - SCROLL_SPEED, + ARROWS_SIZE = 16, // ScrollBar arrows size + ARROWS_VISIBLE, // ScrollBar arrows visible + SCROLL_SLIDER_PADDING, // ScrollBar slider internal padding + SCROLL_SLIDER_SIZE, // ScrollBar slider size + SCROLL_PADDING, // ScrollBar scroll padding from arrows + SCROLL_SPEED, // ScrollBar scrolling speed } GuiScrollBarProperty; // CheckBox @@ -457,8 +620,7 @@ typedef enum { // TextBox/TextBoxMulti/ValueBox/Spinner typedef enum { - TEXT_INNER_PADDING = 16, // TextBox/TextBoxMulti/ValueBox/Spinner inner text padding - TEXT_LINES_SPACING, // TextBoxMulti lines separation + TEXT_READONLY = 16, // TextBox in read-only mode: 0-text editable, 1-text no-editable } GuiTextBoxProperty; // Spinner @@ -472,7 +634,7 @@ typedef enum { LIST_ITEMS_HEIGHT = 16, // ListView items height LIST_ITEMS_SPACING, // ListView items separation SCROLLBAR_WIDTH, // ListView scrollbar size (usually width) - SCROLLBAR_SIDE, // ListView scrollbar side (0-left, 1-right) + SCROLLBAR_SIDE, // ListView scrollbar side (0-SCROLLBAR_LEFT_SIDE, 1-SCROLLBAR_RIGHT_SIDE) } GuiListViewProperty; // ColorPicker @@ -501,78 +663,89 @@ extern "C" { // Prevents name mangling of functions #endif // Global gui state control functions -RAYGUIAPI void GuiEnable(void); // Enable gui controls (global state) -RAYGUIAPI void GuiDisable(void); // Disable gui controls (global state) -RAYGUIAPI void GuiLock(void); // Lock gui controls (global state) -RAYGUIAPI void GuiUnlock(void); // Unlock gui controls (global state) -RAYGUIAPI bool GuiIsLocked(void); // Check if gui is locked (global state) -RAYGUIAPI void GuiFade(float alpha); // Set gui controls alpha (global state), alpha goes from 0.0f to 1.0f -RAYGUIAPI void GuiSetState(int state); // Set gui state (global state) -RAYGUIAPI int GuiGetState(void); // Get gui state (global state) +RAYGUIAPI void GuiEnable(void); // Enable gui controls (global state) +RAYGUIAPI void GuiDisable(void); // Disable gui controls (global state) +RAYGUIAPI void GuiLock(void); // Lock gui controls (global state) +RAYGUIAPI void GuiUnlock(void); // Unlock gui controls (global state) +RAYGUIAPI bool GuiIsLocked(void); // Check if gui is locked (global state) +RAYGUIAPI void GuiSetAlpha(float alpha); // Set gui controls alpha (global state), alpha goes from 0.0f to 1.0f +RAYGUIAPI void GuiSetState(int state); // Set gui state (global state) +RAYGUIAPI int GuiGetState(void); // Get gui state (global state) // Font set/get functions -RAYGUIAPI void GuiSetFont(Font font); // Set gui custom font (global state) -RAYGUIAPI Font GuiGetFont(void); // Get gui custom font (global state) +RAYGUIAPI void GuiSetFont(Font font); // Set gui custom font (global state) +RAYGUIAPI Font GuiGetFont(void); // Get gui custom font (global state) // Style set/get functions -RAYGUIAPI void GuiSetStyle(int control, int property, int value); // Set one style property -RAYGUIAPI int GuiGetStyle(int control, int property); // Get one style property - -// Container/separator controls, useful for controls organization -RAYGUIAPI bool GuiWindowBox(Rectangle bounds, const char *title); // Window Box control, shows a window that can be closed -RAYGUIAPI void GuiGroupBox(Rectangle bounds, const char *text); // Group Box control with text name -RAYGUIAPI void GuiLine(Rectangle bounds, const char *text); // Line separator control, could contain text -RAYGUIAPI void GuiPanel(Rectangle bounds, const char *text); // Panel control, useful to group controls -RAYGUIAPI int GuiTabBar(Rectangle bounds, const char **text, int count, int *active); // Tab Bar control, returns TAB to be closed or -1 -RAYGUIAPI Rectangle GuiScrollPanel(Rectangle bounds, const char *text, Rectangle content, Vector2 *scroll); // Scroll Panel control - -// Basic controls set -RAYGUIAPI void GuiLabel(Rectangle bounds, const char *text); // Label control, shows text -RAYGUIAPI bool GuiButton(Rectangle bounds, const char *text); // Button control, returns true when clicked -RAYGUIAPI bool GuiLabelButton(Rectangle bounds, const char *text); // Label button control, show true when clicked -RAYGUIAPI bool GuiToggle(Rectangle bounds, const char *text, bool active); // Toggle Button control, returns true when active -RAYGUIAPI int GuiToggleGroup(Rectangle bounds, const char *text, int active); // Toggle Group control, returns active toggle index -RAYGUIAPI bool GuiCheckBox(Rectangle bounds, const char *text, bool checked); // Check Box control, returns true when active -RAYGUIAPI int GuiComboBox(Rectangle bounds, const char *text, int active); // Combo Box control, returns selected item index -RAYGUIAPI bool GuiDropdownBox(Rectangle bounds, const char *text, int *active, bool editMode); // Dropdown Box control, returns selected item -RAYGUIAPI bool GuiSpinner(Rectangle bounds, const char *text, int *value, int minValue, int maxValue, bool editMode); // Spinner control, returns selected value -RAYGUIAPI bool GuiValueBox(Rectangle bounds, const char *text, int *value, int minValue, int maxValue, bool editMode); // Value Box control, updates input text with numbers -RAYGUIAPI bool GuiTextBox(Rectangle bounds, char *text, int textSize, bool editMode); // Text Box control, updates input text -RAYGUIAPI bool GuiTextBoxMulti(Rectangle bounds, char *text, int textSize, bool editMode); // Text Box control with multiple lines -RAYGUIAPI float GuiSlider(Rectangle bounds, const char *textLeft, const char *textRight, float value, float minValue, float maxValue); // Slider control, returns selected value -RAYGUIAPI float GuiSliderBar(Rectangle bounds, const char *textLeft, const char *textRight, float value, float minValue, float maxValue); // Slider Bar control, returns selected value -RAYGUIAPI float GuiProgressBar(Rectangle bounds, const char *textLeft, const char *textRight, float value, float minValue, float maxValue); // Progress Bar control, shows current progress value -RAYGUIAPI void GuiStatusBar(Rectangle bounds, const char *text); // Status Bar control, shows info text -RAYGUIAPI void GuiDummyRec(Rectangle bounds, const char *text); // Dummy control for placeholders -RAYGUIAPI Vector2 GuiGrid(Rectangle bounds, const char *text, float spacing, int subdivs); // Grid control, returns mouse cell position - -// Advance controls set -RAYGUIAPI int GuiListView(Rectangle bounds, const char *text, int *scrollIndex, int active); // List View control, returns selected list item index -RAYGUIAPI int GuiListViewEx(Rectangle bounds, const char **text, int count, int *focus, int *scrollIndex, int active); // List View with extended parameters -RAYGUIAPI int GuiMessageBox(Rectangle bounds, const char *title, const char *message, const char *buttons); // Message Box control, displays a message -RAYGUIAPI int GuiTextInputBox(Rectangle bounds, const char *title, const char *message, const char *buttons, char *text, int textMaxSize, int *secretViewActive); // Text Input Box control, ask for text, supports secret -RAYGUIAPI Color GuiColorPicker(Rectangle bounds, const char *text, Color color); // Color Picker control (multiple color controls) -RAYGUIAPI Color GuiColorPanel(Rectangle bounds, const char *text, Color color); // Color Panel control -RAYGUIAPI float GuiColorBarAlpha(Rectangle bounds, const char *text, float alpha); // Color Bar Alpha control -RAYGUIAPI float GuiColorBarHue(Rectangle bounds, const char *text, float value); // Color Bar Hue control +RAYGUIAPI void GuiSetStyle(int control, int property, int value); // Set one style property +RAYGUIAPI int GuiGetStyle(int control, int property); // Get one style property // Styles loading functions RAYGUIAPI void GuiLoadStyle(const char *fileName); // Load style file over global style variable (.rgs) RAYGUIAPI void GuiLoadStyleDefault(void); // Load style default over global style // Tooltips management functions -RAYGUIAPI void GuiEnableTooltip(void); // Enable gui tooltips (global state) -RAYGUIAPI void GuiDisableTooltip(void); // Disable gui tooltips (global state) -RAYGUIAPI void GuiSetTooltip(const char *tooltip); // Set tooltip string +RAYGUIAPI void GuiEnableTooltip(void); // Enable gui tooltips (global state) +RAYGUIAPI void GuiDisableTooltip(void); // Disable gui tooltips (global state) +RAYGUIAPI void GuiSetTooltip(const char *tooltip); // Set tooltip string // Icons functionality RAYGUIAPI const char *GuiIconText(int iconId, const char *text); // Get text with icon id prepended (if supported) - #if !defined(RAYGUI_NO_ICONS) +RAYGUIAPI void GuiSetIconScale(int scale); // Set default icon drawing size RAYGUIAPI unsigned int *GuiGetIcons(void); // Get raygui icons data pointer -RAYGUIAPI char **GuiLoadIcons(const char *fileName, bool loadIconsName); // Load raygui icons file (.rgi) into internal icons data -RAYGUIAPI void GuiDrawIcon(int iconId, int posX, int posY, int pixelSize, Color color); -RAYGUIAPI void GuiSetIconScale(int scale); // Set icon drawing size +RAYGUIAPI char **GuiLoadIcons(const char *fileName, bool loadIconsName); // Load raygui icons file (.rgi) into internal icons data +RAYGUIAPI void GuiDrawIcon(int iconId, int posX, int posY, int pixelSize, Color color); // Draw icon using pixel size at specified position +#endif + + +// Controls +//---------------------------------------------------------------------------------------------------------- +// Container/separator controls, useful for controls organization +RAYGUIAPI int GuiWindowBox(Rectangle bounds, const char *title); // Window Box control, shows a window that can be closed +RAYGUIAPI int GuiGroupBox(Rectangle bounds, const char *text); // Group Box control with text name +RAYGUIAPI int GuiLine(Rectangle bounds, const char *text); // Line separator control, could contain text +RAYGUIAPI int GuiPanel(Rectangle bounds, const char *text); // Panel control, useful to group controls +RAYGUIAPI int GuiTabBar(Rectangle bounds, const char **text, int count, int *active); // Tab Bar control, returns TAB to be closed or -1 +RAYGUIAPI int GuiScrollPanel(Rectangle bounds, const char *text, Rectangle content, Vector2 *scroll, Rectangle *view); // Scroll Panel control + +// Basic controls set +RAYGUIAPI int GuiLabel(Rectangle bounds, const char *text); // Label control, shows text +RAYGUIAPI int GuiButton(Rectangle bounds, const char *text); // Button control, returns true when clicked +RAYGUIAPI int GuiLabelButton(Rectangle bounds, const char *text); // Label button control, show true when clicked +RAYGUIAPI int GuiToggle(Rectangle bounds, const char *text, bool *active); // Toggle Button control, returns true when active +RAYGUIAPI int GuiToggleGroup(Rectangle bounds, const char *text, int *active); // Toggle Group control, returns active toggle index +RAYGUIAPI int GuiToggleSlider(Rectangle bounds, const char *text, int *active); // Toggle Slider control, returns true when clicked +RAYGUIAPI int GuiCheckBox(Rectangle bounds, const char *text, bool *checked); // Check Box control, returns true when active +RAYGUIAPI int GuiComboBox(Rectangle bounds, const char *text, int *active); // Combo Box control, returns selected item index + +RAYGUIAPI int GuiDropdownBox(Rectangle bounds, const char *text, int *active, bool editMode); // Dropdown Box control, returns selected item +RAYGUIAPI int GuiSpinner(Rectangle bounds, const char *text, int *value, int minValue, int maxValue, bool editMode); // Spinner control, returns selected value +RAYGUIAPI int GuiValueBox(Rectangle bounds, const char *text, int *value, int minValue, int maxValue, bool editMode); // Value Box control, updates input text with numbers +RAYGUIAPI int GuiTextBox(Rectangle bounds, char *text, int textSize, bool editMode); // Text Box control, updates input text + +RAYGUIAPI int GuiSlider(Rectangle bounds, const char *textLeft, const char *textRight, float *value, float minValue, float maxValue); // Slider control, returns selected value +RAYGUIAPI int GuiSliderBar(Rectangle bounds, const char *textLeft, const char *textRight, float *value, float minValue, float maxValue); // Slider Bar control, returns selected value +RAYGUIAPI int GuiProgressBar(Rectangle bounds, const char *textLeft, const char *textRight, float *value, float minValue, float maxValue); // Progress Bar control, shows current progress value +RAYGUIAPI int GuiStatusBar(Rectangle bounds, const char *text); // Status Bar control, shows info text +RAYGUIAPI int GuiDummyRec(Rectangle bounds, const char *text); // Dummy control for placeholders +RAYGUIAPI int GuiGrid(Rectangle bounds, const char *text, float spacing, int subdivs, Vector2 *mouseCell); // Grid control, returns mouse cell position + +// Advance controls set +RAYGUIAPI int GuiListView(Rectangle bounds, const char *text, int *scrollIndex, int *active); // List View control, returns selected list item index +RAYGUIAPI int GuiListViewEx(Rectangle bounds, const char **text, int count, int *scrollIndex, int *active, int *focus); // List View with extended parameters +RAYGUIAPI int GuiMessageBox(Rectangle bounds, const char *title, const char *message, const char *buttons); // Message Box control, displays a message +RAYGUIAPI int GuiTextInputBox(Rectangle bounds, const char *title, const char *message, const char *buttons, char *text, int textMaxSize, bool *secretViewActive); // Text Input Box control, ask for text, supports secret +RAYGUIAPI int GuiColorPicker(Rectangle bounds, const char *text, Color *color); // Color Picker control (multiple color controls) +RAYGUIAPI int GuiColorPanel(Rectangle bounds, const char *text, Color *color); // Color Panel control +RAYGUIAPI int GuiColorBarAlpha(Rectangle bounds, const char *text, float *alpha); // Color Bar Alpha control +RAYGUIAPI int GuiColorBarHue(Rectangle bounds, const char *text, float *value); // Color Bar Hue control +RAYGUIAPI int GuiColorPickerHSV(Rectangle bounds, const char *text, Vector3 *colorHsv); // Color Picker control that avoids conversion to RGB on each call (multiple color controls) +RAYGUIAPI int GuiColorPanelHSV(Rectangle bounds, const char *text, Vector3 *colorHsv); // Color Panel control that returns HSV color value, used by GuiColorPickerHSV() +//---------------------------------------------------------------------------------------------------------- + + +#if !defined(RAYGUI_NO_ICONS) #if !defined(RAYGUI_CUSTOM_ICONS) //---------------------------------------------------------------------------------- @@ -798,7 +971,7 @@ typedef enum { ICON_REG_EXP = 216, ICON_FOLDER = 217, ICON_FILE = 218, - ICON_219 = 219, + ICON_SAND_TIMER = 219, ICON_220 = 220, ICON_221 = 221, ICON_222 = 222, @@ -856,7 +1029,7 @@ typedef enum { #include // Required for: FILE, fopen(), fclose(), fprintf(), feof(), fscanf(), vsprintf() [GuiLoadStyle(), GuiLoadIcons()] #include // Required for: malloc(), calloc(), free() [GuiLoadStyle(), GuiLoadIcons()] -#include // Required for: strlen() [GuiTextBox(), GuiTextBoxMulti(), GuiValueBox()], memset(), memcpy() +#include // Required for: strlen() [GuiTextBox(), GuiValueBox()], memset(), memcpy() #include // Required for: va_list, va_start(), vfprintf(), va_end() [TextFormat()] #include // Required for: roundf() [GuiColorPicker()] @@ -866,6 +1039,11 @@ typedef enum { #define RAYGUI_CLITERAL(name) (name) #endif +// Check if two rectangles are equal, used to validate a slider bounds as an id +#ifndef CHECK_BOUNDS_ID + #define CHECK_BOUNDS_ID(src, dst) ((src.x == dst.x) && (src.y == dst.y) && (src.width == dst.width) && (src.height == dst.height)) +#endif + #if !defined(RAYGUI_NO_ICONS) && !defined(RAYGUI_CUSTOM_ICONS) // Embedded icons, no external file provided @@ -1056,11 +1234,11 @@ static unsigned int guiIcons[RAYGUI_ICON_MAX_ICONS*RAYGUI_ICON_DATA_ELEMENTS] = 0x78040000, 0x501f600e, 0x0ef44004, 0x12f41284, 0x0ef41284, 0x10140004, 0x7ffc300c, 0x10003000, // ICON_MODE_3D 0x7fe00000, 0x50286030, 0x47fe4804, 0x44224402, 0x44224422, 0x241275e2, 0x0c06140a, 0x000007fe, // ICON_CUBE 0x7fe00000, 0x5ff87ff0, 0x47fe4ffc, 0x44224402, 0x44224422, 0x241275e2, 0x0c06140a, 0x000007fe, // ICON_CUBE_FACE_TOP - 0x7fe00000, 0x50386030, 0x47fe483c, 0x443e443e, 0x443e443e, 0x241e75fe, 0x0c06140e, 0x000007fe, // ICON_CUBE_FACE_LEFT + 0x7fe00000, 0x50386030, 0x47c2483c, 0x443e443e, 0x443e443e, 0x241e75fe, 0x0c06140e, 0x000007fe, // ICON_CUBE_FACE_LEFT 0x7fe00000, 0x50286030, 0x47fe4804, 0x47fe47fe, 0x47fe47fe, 0x27fe77fe, 0x0ffe17fe, 0x000007fe, // ICON_CUBE_FACE_FRONT - 0x7fe00000, 0x50286030, 0x47fe4804, 0x44224402, 0x44224422, 0x3ff27fe2, 0x0ffe1ffa, 0x000007fe, // ICON_CUBE_FACE_BOTTOM + 0x7fe00000, 0x50286030, 0x47fe4804, 0x44224402, 0x44224422, 0x3bf27be2, 0x0bfe1bfa, 0x000007fe, // ICON_CUBE_FACE_BOTTOM 0x7fe00000, 0x70286030, 0x7ffe7804, 0x7c227c02, 0x7c227c22, 0x3c127de2, 0x0c061c0a, 0x000007fe, // ICON_CUBE_FACE_RIGHT - 0x7fe00000, 0x7fe87ff0, 0x7ffe7fe4, 0x7fe27fe2, 0x7fe27fe2, 0x24127fe2, 0x0c06140a, 0x000007fe, // ICON_CUBE_FACE_BACK + 0x7fe00000, 0x6fe85ff0, 0x781e77e4, 0x7be27be2, 0x7be27be2, 0x24127be2, 0x0c06140a, 0x000007fe, // ICON_CUBE_FACE_BACK 0x00000000, 0x2a0233fe, 0x22022602, 0x22022202, 0x2a022602, 0x00a033fe, 0x02080110, 0x00000000, // ICON_CAMERA 0x00000000, 0x200c3ffc, 0x000c000c, 0x3ffc000c, 0x30003000, 0x30003000, 0x3ffc3004, 0x00000000, // ICON_SPECIAL 0x00000000, 0x0022003e, 0x012201e2, 0x0100013e, 0x01000100, 0x79000100, 0x4f004900, 0x00007800, // ICON_LINK_NET @@ -1111,7 +1289,7 @@ static unsigned int guiIcons[RAYGUI_ICON_MAX_ICONS*RAYGUI_ICON_DATA_ELEMENTS] = 0x00000000, 0x02000000, 0x07000a80, 0x07001fc0, 0x02000a80, 0x00300030, 0x00000000, 0x00000000, // ICON_REG_EXP 0x00000000, 0x0042007e, 0x40027fc2, 0x40024002, 0x40024002, 0x40024002, 0x7ffe4002, 0x00000000, // ICON_FOLDER 0x3ff00000, 0x201c2010, 0x20042004, 0x20042004, 0x20042004, 0x20042004, 0x20042004, 0x00003ffc, // ICON_FILE - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, // ICON_219 + 0x1ff00000, 0x20082008, 0x17d02fe8, 0x05400ba0, 0x09200540, 0x23881010, 0x2fe827c8, 0x00001ff0, // ICON_SAND_TIMER 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, // ICON_220 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, // ICON_221 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, // ICON_222 @@ -1159,8 +1337,10 @@ static unsigned int *guiIconsPtr = guiIcons; #define RAYGUI_ICON_SIZE 0 #endif -#define RAYGUI_MAX_CONTROLS 16 // Maximum number of standard controls -#define RAYGUI_MAX_PROPS_BASE 16 // Maximum number of standard properties +// WARNING: Those values define the total size of the style data array, +// if changed, previous saved styles could become incompatible +#define RAYGUI_MAX_CONTROLS 16 // Maximum number of controls +#define RAYGUI_MAX_PROPS_BASE 16 // Maximum number of base properties #define RAYGUI_MAX_PROPS_EXTENDED 8 // Maximum number of extended properties //---------------------------------------------------------------------------------- @@ -1172,17 +1352,24 @@ typedef enum { BORDER = 0, BASE, TEXT, OTHER } GuiPropertyElement; //---------------------------------------------------------------------------------- // Global Variables Definition //---------------------------------------------------------------------------------- -static GuiState guiState = STATE_NORMAL; // Gui global state, if !STATE_NORMAL, forces defined state +static GuiState guiState = STATE_NORMAL; // Gui global state, if !STATE_NORMAL, forces defined state + +static Font guiFont = { 0 }; // Gui current font (WARNING: highly coupled to raylib) +static bool guiLocked = false; // Gui lock state (no inputs processed) +static float guiAlpha = 1.0f; // Gui controls transparency -static Font guiFont = { 0 }; // Gui current font (WARNING: highly coupled to raylib) -static bool guiLocked = false; // Gui lock state (no inputs processed) -static float guiAlpha = 1.0f; // Gui element transpacency on drawing +static unsigned int guiIconScale = 1; // Gui icon default scale (if icons enabled) -static unsigned int guiIconScale = 1; // Gui icon default scale (if icons enabled) +static bool guiTooltip = false; // Tooltip enabled/disabled +static const char *guiTooltipPtr = NULL; // Tooltip string pointer (string provided by user) -static bool guiTooltip = false; // Tooltip enabled/disabled -static const char *guiTooltipPtr = NULL; // Tooltip string pointer (string provided by user) +static bool guiSliderDragging = false; // Gui slider drag state (no inputs processed except dragged slider) +static Rectangle guiSliderActive = { 0 }; // Gui slider active bounds rectangle, used as an unique identifier +static int textBoxCursorIndex = 0; // Cursor index, shared by all GuiTextBox*() +//static int blinkCursorFrameCounter = 0; // Frame counter for cursor blinking +static int autoCursorCooldownCounter = 0; // Cooldown frame counter for automatic cursor movement on key-down +static int autoCursorDelayCounter = 0; // Delay frame counter for automatic cursor movement //---------------------------------------------------------------------------------- // Style data array for all gui style properties (allocated on data segment by default) @@ -1227,31 +1414,38 @@ static bool IsMouseButtonReleased(int button); static bool IsKeyDown(int key); static bool IsKeyPressed(int key); -static int GetCharPressed(void); // -- GuiTextBox(), GuiTextBoxMulti(), GuiValueBox() +static int GetCharPressed(void); // -- GuiTextBox(), GuiValueBox() //------------------------------------------------------------------------------- // Drawing required functions //------------------------------------------------------------------------------- -static void DrawRectangle(int x, int y, int width, int height, Color color); // -- GuiDrawRectangle(), GuiDrawIcon() - +static void DrawRectangle(int x, int y, int width, int height, Color color); // -- GuiDrawRectangle() static void DrawRectangleGradientEx(Rectangle rec, Color col1, Color col2, Color col3, Color col4); // -- GuiColorPicker() //------------------------------------------------------------------------------- // Text required functions //------------------------------------------------------------------------------- -static Font LoadFontEx(const char *fileName, int fontSize, int *fontChars, int glyphCount); // -- GuiLoadStyle() -static Font GetFontDefault(void); // -- GuiLoadStyleDefault() -static Texture2D LoadTextureFromImage(Image image); // -- GuiLoadStyle() -static void SetShapesTexture(Texture2D tex, Rectangle rec); // -- GuiLoadStyle() -static char *LoadFileText(const char *fileName); // -- GuiLoadStyle() -static const char *GetDirectoryPath(const char *filePath); // -- GuiLoadStyle() +static Font GetFontDefault(void); // -- GuiLoadStyleDefault() +static Font LoadFontEx(const char *fileName, int fontSize, int *codepoints, int codepointCount); // -- GuiLoadStyle(), load font + +static Texture2D LoadTextureFromImage(Image image); // -- GuiLoadStyle(), required to load texture from embedded font atlas image +static void SetShapesTexture(Texture2D tex, Rectangle rec); // -- GuiLoadStyle(), required to set shapes rec to font white rec (optimization) + +static char *LoadFileText(const char *fileName); // -- GuiLoadStyle(), required to load charset data +static void UnloadFileText(char *text); // -- GuiLoadStyle(), required to unload charset data + +static const char *GetDirectoryPath(const char *filePath); // -- GuiLoadStyle(), required to find charset/font file from text .rgs + +static int *LoadCodepoints(const char *text, int *count); // -- GuiLoadStyle(), required to load required font codepoints list +static void UnloadCodepoints(int *codepoints); // -- GuiLoadStyle(), required to unload codepoints list + +static unsigned char *DecompressData(const unsigned char *compData, int compDataSize, int *dataSize); // -- GuiLoadStyle() //------------------------------------------------------------------------------- // raylib functions already implemented in raygui //------------------------------------------------------------------------------- static Color GetColor(int hexValue); // Returns a Color struct from hexadecimal value static int ColorToInt(Color color); // Returns hexadecimal value for a Color -static Color Fade(Color color, float alpha); // Color fade-in or fade-out, alpha goes from 0.0f to 1.0f static bool CheckCollisionPointRec(Vector2 point, Rectangle rec); // Check if point is inside rectangle static const char *TextFormat(const char *text, ...); // Formatting of text with variables to 'embed' static const char **TextSplit(const char *text, char delimiter, int *count); // Split text into multiple strings @@ -1268,11 +1462,13 @@ static void DrawRectangleGradientV(int posX, int posY, int width, int height, Co //---------------------------------------------------------------------------------- // Module specific Functions Declaration //---------------------------------------------------------------------------------- +static void GuiLoadStyleFromMemory(const unsigned char *fileData, int dataSize); // Load style from memory (binary only) + static int GetTextWidth(const char *text); // Gui get text width using gui font and style static Rectangle GetTextBounds(int control, Rectangle bounds); // Get text bounds considering control bounds static const char *GetTextIcon(const char *text, int *iconId); // Get text icon if provided and move text cursor -static void GuiDrawText(const char *text, Rectangle bounds, int alignment, Color tint); // Gui draw text using default font +static void GuiDrawText(const char *text, Rectangle textBounds, int alignment, Color tint); // Gui draw text using default font static void GuiDrawRectangle(Rectangle rec, int borderWidth, Color borderColor, Color color); // Gui draw rectangle using default raygui style static const char **GuiTextSplit(const char *text, char delimiter, int *count, int *textRow); // Split controls text into multiple strings @@ -1282,6 +1478,7 @@ static Vector3 ConvertRGBtoHSV(Vector3 rgb); // Convert color static int GuiScrollBar(Rectangle bounds, int value, int minValue, int maxValue); // Scroll bar control, used by GuiScrollPanel() static void GuiTooltip(Rectangle controlRec); // Draw tooltip using control rec position +static Color GuiFade(Color color, float alpha); // Fade color by an alpha factor //---------------------------------------------------------------------------------- // Gui Setup Functions Definition @@ -1304,7 +1501,7 @@ void GuiUnlock(void) { guiLocked = false; } bool GuiIsLocked(void) { return guiLocked; } // Set gui controls alpha global state -void GuiFade(float alpha) +void GuiSetAlpha(float alpha) { if (alpha < 0.0f) alpha = 0.0f; else if (alpha > 1.0f) alpha = 1.0f; @@ -1330,7 +1527,6 @@ void GuiSetFont(Font font) if (!guiStyleLoaded) GuiLoadStyleDefault(); guiFont = font; - GuiSetStyle(DEFAULT, TEXT_SIZE, font.baseSize); } } @@ -1365,7 +1561,7 @@ int GuiGetStyle(int control, int property) //---------------------------------------------------------------------------------- // Window Box control -bool GuiWindowBox(Rectangle bounds, const char *title) +int GuiWindowBox(Rectangle bounds, const char *title) { // Window title bar height (including borders) // NOTE: This define is also used by GuiMessageBox() and GuiTextInputBox() @@ -1373,8 +1569,8 @@ bool GuiWindowBox(Rectangle bounds, const char *title) #define RAYGUI_WINDOWBOX_STATUSBAR_HEIGHT 24 #endif + int result = 0; //GuiState state = guiState; - bool clicked = false; int statusBarHeight = RAYGUI_WINDOWBOX_STATUSBAR_HEIGHT; @@ -1401,38 +1597,41 @@ bool GuiWindowBox(Rectangle bounds, const char *title) GuiSetStyle(BUTTON, BORDER_WIDTH, 1); GuiSetStyle(BUTTON, TEXT_ALIGNMENT, TEXT_ALIGN_CENTER); #if defined(RAYGUI_NO_ICONS) - clicked = GuiButton(closeButtonRec, "x"); + result = GuiButton(closeButtonRec, "x"); #else - clicked = GuiButton(closeButtonRec, GuiIconText(ICON_CROSS_SMALL, NULL)); + result = GuiButton(closeButtonRec, GuiIconText(ICON_CROSS_SMALL, NULL)); #endif GuiSetStyle(BUTTON, BORDER_WIDTH, tempBorderWidth); GuiSetStyle(BUTTON, TEXT_ALIGNMENT, tempTextAlignment); //-------------------------------------------------------------------- - return clicked; + return result; // Window close button clicked: result = 1 } // Group Box control with text name -void GuiGroupBox(Rectangle bounds, const char *text) +int GuiGroupBox(Rectangle bounds, const char *text) { #if !defined(RAYGUI_GROUPBOX_LINE_THICK) #define RAYGUI_GROUPBOX_LINE_THICK 1 #endif + int result = 0; GuiState state = guiState; // Draw control //-------------------------------------------------------------------- - GuiDrawRectangle(RAYGUI_CLITERAL(Rectangle){ bounds.x, bounds.y, RAYGUI_GROUPBOX_LINE_THICK, bounds.height }, 0, BLANK, Fade(GetColor(GuiGetStyle(DEFAULT, (state == STATE_DISABLED)? BORDER_COLOR_DISABLED : LINE_COLOR)), guiAlpha)); - GuiDrawRectangle(RAYGUI_CLITERAL(Rectangle){ bounds.x, bounds.y + bounds.height - 1, bounds.width, RAYGUI_GROUPBOX_LINE_THICK }, 0, BLANK, Fade(GetColor(GuiGetStyle(DEFAULT, (state == STATE_DISABLED)? BORDER_COLOR_DISABLED : LINE_COLOR)), guiAlpha)); - GuiDrawRectangle(RAYGUI_CLITERAL(Rectangle){ bounds.x + bounds.width - 1, bounds.y, RAYGUI_GROUPBOX_LINE_THICK, bounds.height }, 0, BLANK, Fade(GetColor(GuiGetStyle(DEFAULT, (state == STATE_DISABLED)? BORDER_COLOR_DISABLED : LINE_COLOR)), guiAlpha)); + GuiDrawRectangle(RAYGUI_CLITERAL(Rectangle){ bounds.x, bounds.y, RAYGUI_GROUPBOX_LINE_THICK, bounds.height }, 0, BLANK, GetColor(GuiGetStyle(DEFAULT, (state == STATE_DISABLED)? BORDER_COLOR_DISABLED : LINE_COLOR))); + GuiDrawRectangle(RAYGUI_CLITERAL(Rectangle){ bounds.x, bounds.y + bounds.height - 1, bounds.width, RAYGUI_GROUPBOX_LINE_THICK }, 0, BLANK, GetColor(GuiGetStyle(DEFAULT, (state == STATE_DISABLED)? BORDER_COLOR_DISABLED : LINE_COLOR))); + GuiDrawRectangle(RAYGUI_CLITERAL(Rectangle){ bounds.x + bounds.width - 1, bounds.y, RAYGUI_GROUPBOX_LINE_THICK, bounds.height }, 0, BLANK, GetColor(GuiGetStyle(DEFAULT, (state == STATE_DISABLED)? BORDER_COLOR_DISABLED : LINE_COLOR))); GuiLine(RAYGUI_CLITERAL(Rectangle){ bounds.x, bounds.y - GuiGetStyle(DEFAULT, TEXT_SIZE)/2, bounds.width, (float)GuiGetStyle(DEFAULT, TEXT_SIZE) }, text); //-------------------------------------------------------------------- + + return result; } // Line control -void GuiLine(Rectangle bounds, const char *text) +int GuiLine(Rectangle bounds, const char *text) { #if !defined(RAYGUI_LINE_ORIGIN_SIZE) #define RAYGUI_LINE_MARGIN_TEXT 12 @@ -1441,9 +1640,10 @@ void GuiLine(Rectangle bounds, const char *text) #define RAYGUI_LINE_TEXT_PADDING 4 #endif + int result = 0; GuiState state = guiState; - Color color = Fade(GetColor(GuiGetStyle(DEFAULT, (state == STATE_DISABLED)? BORDER_COLOR_DISABLED : LINE_COLOR)), guiAlpha); + Color color = GetColor(GuiGetStyle(DEFAULT, (state == STATE_DISABLED)? BORDER_COLOR_DISABLED : LINE_COLOR)); // Draw control //-------------------------------------------------------------------- @@ -1451,7 +1651,7 @@ void GuiLine(Rectangle bounds, const char *text) else { Rectangle textBounds = { 0 }; - textBounds.width = (float)GetTextWidth(text); + textBounds.width = (float)GetTextWidth(text) + 2; textBounds.height = bounds.height; textBounds.x = bounds.x + RAYGUI_LINE_MARGIN_TEXT; textBounds.y = bounds.y; @@ -1462,15 +1662,18 @@ void GuiLine(Rectangle bounds, const char *text) GuiDrawRectangle(RAYGUI_CLITERAL(Rectangle){ bounds.x + 12 + textBounds.width + 4, bounds.y + bounds.height/2, bounds.width - textBounds.width - RAYGUI_LINE_MARGIN_TEXT - RAYGUI_LINE_TEXT_PADDING, 1 }, 0, BLANK, color); } //-------------------------------------------------------------------- + + return result; } // Panel control -void GuiPanel(Rectangle bounds, const char *text) +int GuiPanel(Rectangle bounds, const char *text) { #if !defined(RAYGUI_PANEL_BORDER_WIDTH) #define RAYGUI_PANEL_BORDER_WIDTH 1 #endif + int result = 0; GuiState state = guiState; // Text will be drawn as a header bar (if provided) @@ -1481,16 +1684,18 @@ void GuiPanel(Rectangle bounds, const char *text) { // Move panel bounds after the header bar bounds.y += (float)RAYGUI_WINDOWBOX_STATUSBAR_HEIGHT - 1; - bounds.height -= (float)RAYGUI_WINDOWBOX_STATUSBAR_HEIGHT + 1; + bounds.height -= (float)RAYGUI_WINDOWBOX_STATUSBAR_HEIGHT - 1; } // Draw control //-------------------------------------------------------------------- if (text != NULL) GuiStatusBar(statusBar, text); // Draw panel header as status bar - GuiDrawRectangle(bounds, RAYGUI_PANEL_BORDER_WIDTH, Fade(GetColor(GuiGetStyle(DEFAULT, (state == STATE_DISABLED)? BORDER_COLOR_DISABLED: LINE_COLOR)), guiAlpha), - Fade(GetColor(GuiGetStyle(DEFAULT, (state == STATE_DISABLED)? BASE_COLOR_DISABLED : BACKGROUND_COLOR)), guiAlpha)); + GuiDrawRectangle(bounds, RAYGUI_PANEL_BORDER_WIDTH, GetColor(GuiGetStyle(DEFAULT, (state == STATE_DISABLED)? BORDER_COLOR_DISABLED: LINE_COLOR)), + GetColor(GuiGetStyle(DEFAULT, (state == STATE_DISABLED)? BASE_COLOR_DISABLED : BACKGROUND_COLOR))); //-------------------------------------------------------------------- + + return result; } // Tab Bar control @@ -1499,9 +1704,9 @@ int GuiTabBar(Rectangle bounds, const char **text, int count, int *active) { #define RAYGUI_TABBAR_ITEM_WIDTH 160 - GuiState state = guiState; + int result = -1; + //GuiState state = guiState; - int closing = -1; Rectangle tabBounds = { bounds.x, bounds.y, RAYGUI_TABBAR_ITEM_WIDTH, bounds.height }; if (*active < 0) *active = 0; @@ -1511,6 +1716,8 @@ int GuiTabBar(Rectangle bounds, const char **text, int count, int *active) offsetX = (*active + 2)*RAYGUI_TABBAR_ITEM_WIDTH - GetScreenWidth(); if (offsetX < 0) offsetX = 0; + bool toggle = false; // Required for individual toggles + // Draw control //-------------------------------------------------------------------- for (int i = 0; i < count; i++) @@ -1524,21 +1731,32 @@ int GuiTabBar(Rectangle bounds, const char **text, int count, int *active) int textPadding = GuiGetStyle(TOGGLE, TEXT_PADDING); GuiSetStyle(TOGGLE, TEXT_ALIGNMENT, TEXT_ALIGN_LEFT); GuiSetStyle(TOGGLE, TEXT_PADDING, 8); - if (i == *active) GuiToggle(tabBounds, GuiIconText(12, text[i]), true); - else if (GuiToggle(tabBounds, GuiIconText(12, text[i]), false) == true) *active = i; + + if (i == (*active)) + { + toggle = true; + GuiToggle(tabBounds, GuiIconText(12, text[i]), &toggle); + } + else + { + toggle = false; + GuiToggle(tabBounds, GuiIconText(12, text[i]), &toggle); + if (toggle) *active = i; + } + GuiSetStyle(TOGGLE, TEXT_PADDING, textPadding); GuiSetStyle(TOGGLE, TEXT_ALIGNMENT, textAlignment); // Draw tab close button - // NOTE: Only draw close button for curren tab: if (CheckCollisionPointRec(mousePoint, tabBounds)) + // NOTE: Only draw close button for current tab: if (CheckCollisionPointRec(mousePosition, tabBounds)) int tempBorderWidth = GuiGetStyle(BUTTON, BORDER_WIDTH); int tempTextAlignment = GuiGetStyle(BUTTON, TEXT_ALIGNMENT); GuiSetStyle(BUTTON, BORDER_WIDTH, 1); GuiSetStyle(BUTTON, TEXT_ALIGNMENT, TEXT_ALIGN_CENTER); #if defined(RAYGUI_NO_ICONS) - if (GuiButton(closeButtonRec, "x")) closing = i; + if (GuiButton(RAYGUI_CLITERAL(Rectangle){ tabBounds.x + tabBounds.width - 14 - 5, tabBounds.y + 5, 14, 14 }, "x")) result = i; #else - if (GuiButton(RAYGUI_CLITERAL(Rectangle){ tabBounds.x + tabBounds.width - 14 - 5, tabBounds.y + 5, 14, 14 }, GuiIconText(ICON_CROSS_SMALL, NULL))) closing = i; + if (GuiButton(RAYGUI_CLITERAL(Rectangle){ tabBounds.x + tabBounds.width - 14 - 5, tabBounds.y + 5, 14, 14 }, GuiIconText(ICON_CROSS_SMALL, NULL))) result = i; #endif GuiSetStyle(BUTTON, BORDER_WIDTH, tempBorderWidth); GuiSetStyle(BUTTON, TEXT_ALIGNMENT, tempTextAlignment); @@ -1549,13 +1767,21 @@ int GuiTabBar(Rectangle bounds, const char **text, int count, int *active) GuiDrawRectangle(RAYGUI_CLITERAL(Rectangle){ bounds.x, bounds.y + bounds.height - 1, bounds.width, 1 }, 0, BLANK, GetColor(GuiGetStyle(TOGGLE, BORDER_COLOR_NORMAL))); //-------------------------------------------------------------------- - return closing; // Return closing tab requested + return result; // Return as result the current TAB closing requested } // Scroll Panel control -Rectangle GuiScrollPanel(Rectangle bounds, const char *text, Rectangle content, Vector2 *scroll) +int GuiScrollPanel(Rectangle bounds, const char *text, Rectangle content, Vector2 *scroll, Rectangle *view) { + #define RAYGUI_MIN_SCROLLBAR_WIDTH 40 + #define RAYGUI_MIN_SCROLLBAR_HEIGHT 40 + + int result = 0; GuiState state = guiState; + float mouseWheelSpeed = 20.0f; // Default movement speed with mouse wheel + + Rectangle temp = { 0 }; + if (view == NULL) view = &temp; Vector2 scrollPos = { 0.0f, 0.0f }; if (scroll != NULL) scrollPos = *scroll; @@ -1580,17 +1806,40 @@ Rectangle GuiScrollPanel(Rectangle bounds, const char *text, Rectangle content, int horizontalScrollBarWidth = hasHorizontalScrollBar? GuiGetStyle(LISTVIEW, SCROLLBAR_WIDTH) : 0; int verticalScrollBarWidth = hasVerticalScrollBar? GuiGetStyle(LISTVIEW, SCROLLBAR_WIDTH) : 0; - Rectangle horizontalScrollBar = { (float)((GuiGetStyle(LISTVIEW, SCROLLBAR_SIDE) == SCROLLBAR_LEFT_SIDE)? (float)bounds.x + verticalScrollBarWidth : (float)bounds.x) + GuiGetStyle(DEFAULT, BORDER_WIDTH), (float)bounds.y + bounds.height - horizontalScrollBarWidth - GuiGetStyle(DEFAULT, BORDER_WIDTH), (float)bounds.width - verticalScrollBarWidth - 2*GuiGetStyle(DEFAULT, BORDER_WIDTH), (float)horizontalScrollBarWidth }; - Rectangle verticalScrollBar = { (float)((GuiGetStyle(LISTVIEW, SCROLLBAR_SIDE) == SCROLLBAR_LEFT_SIDE)? (float)bounds.x + GuiGetStyle(DEFAULT, BORDER_WIDTH) : (float)bounds.x + bounds.width - verticalScrollBarWidth - GuiGetStyle(DEFAULT, BORDER_WIDTH)), (float)bounds.y + GuiGetStyle(DEFAULT, BORDER_WIDTH), (float)verticalScrollBarWidth, (float)bounds.height - horizontalScrollBarWidth - 2*GuiGetStyle(DEFAULT, BORDER_WIDTH) }; + Rectangle horizontalScrollBar = { + (float)((GuiGetStyle(LISTVIEW, SCROLLBAR_SIDE) == SCROLLBAR_LEFT_SIDE)? (float)bounds.x + verticalScrollBarWidth : (float)bounds.x) + GuiGetStyle(DEFAULT, BORDER_WIDTH), + (float)bounds.y + bounds.height - horizontalScrollBarWidth - GuiGetStyle(DEFAULT, BORDER_WIDTH), + (float)bounds.width - verticalScrollBarWidth - 2*GuiGetStyle(DEFAULT, BORDER_WIDTH), + (float)horizontalScrollBarWidth + }; + Rectangle verticalScrollBar = { + (float)((GuiGetStyle(LISTVIEW, SCROLLBAR_SIDE) == SCROLLBAR_LEFT_SIDE)? (float)bounds.x + GuiGetStyle(DEFAULT, BORDER_WIDTH) : (float)bounds.x + bounds.width - verticalScrollBarWidth - GuiGetStyle(DEFAULT, BORDER_WIDTH)), + (float)bounds.y + GuiGetStyle(DEFAULT, BORDER_WIDTH), + (float)verticalScrollBarWidth, + (float)bounds.height - horizontalScrollBarWidth - 2*GuiGetStyle(DEFAULT, BORDER_WIDTH) + }; + + // Make sure scroll bars have a minimum width/height + // NOTE: If content >>> bounds, size could be very small or even 0 + if (horizontalScrollBar.width < RAYGUI_MIN_SCROLLBAR_WIDTH) + { + horizontalScrollBar.width = RAYGUI_MIN_SCROLLBAR_WIDTH; + mouseWheelSpeed = 30.0f; // TODO: Calculate speed increment based on content.height vs bounds.height + } + if (verticalScrollBar.height < RAYGUI_MIN_SCROLLBAR_HEIGHT) + { + verticalScrollBar.height = RAYGUI_MIN_SCROLLBAR_HEIGHT; + mouseWheelSpeed = 30.0f; // TODO: Calculate speed increment based on content.width vs bounds.width + } // Calculate view area (area without the scrollbars) - Rectangle view = (GuiGetStyle(LISTVIEW, SCROLLBAR_SIDE) == SCROLLBAR_LEFT_SIDE)? + *view = (GuiGetStyle(LISTVIEW, SCROLLBAR_SIDE) == SCROLLBAR_LEFT_SIDE)? RAYGUI_CLITERAL(Rectangle){ bounds.x + verticalScrollBarWidth + GuiGetStyle(DEFAULT, BORDER_WIDTH), bounds.y + GuiGetStyle(DEFAULT, BORDER_WIDTH), bounds.width - 2*GuiGetStyle(DEFAULT, BORDER_WIDTH) - verticalScrollBarWidth, bounds.height - 2*GuiGetStyle(DEFAULT, BORDER_WIDTH) - horizontalScrollBarWidth } : RAYGUI_CLITERAL(Rectangle){ bounds.x + GuiGetStyle(DEFAULT, BORDER_WIDTH), bounds.y + GuiGetStyle(DEFAULT, BORDER_WIDTH), bounds.width - 2*GuiGetStyle(DEFAULT, BORDER_WIDTH) - verticalScrollBarWidth, bounds.height - 2*GuiGetStyle(DEFAULT, BORDER_WIDTH) - horizontalScrollBarWidth }; // Clip view area to the actual content size - if (view.width > content.width) view.width = content.width; - if (view.height > content.height) view.height = content.height; + if (view->width > content.width) view->width = content.width; + if (view->height > content.height) view->height = content.height; float horizontalMin = hasHorizontalScrollBar? ((GuiGetStyle(LISTVIEW, SCROLLBAR_SIDE) == SCROLLBAR_LEFT_SIDE)? (float)-verticalScrollBarWidth : 0) - (float)GuiGetStyle(DEFAULT, BORDER_WIDTH) : (((float)GuiGetStyle(LISTVIEW, SCROLLBAR_SIDE) == SCROLLBAR_LEFT_SIDE)? (float)-verticalScrollBarWidth : 0) - (float)GuiGetStyle(DEFAULT, BORDER_WIDTH); float horizontalMax = hasHorizontalScrollBar? content.width - bounds.width + (float)verticalScrollBarWidth + GuiGetStyle(DEFAULT, BORDER_WIDTH) - (((float)GuiGetStyle(LISTVIEW, SCROLLBAR_SIDE) == SCROLLBAR_LEFT_SIDE)? (float)verticalScrollBarWidth : 0) : (float)-GuiGetStyle(DEFAULT, BORDER_WIDTH); @@ -1624,9 +1873,9 @@ Rectangle GuiScrollPanel(Rectangle bounds, const char *text, Rectangle content, #endif float wheelMove = GetMouseWheelMove(); - // Horizontal scroll (Shift + Mouse wheel) - if (hasHorizontalScrollBar && (IsKeyDown(KEY_LEFT_CONTROL) || IsKeyDown(KEY_RIGHT_SHIFT))) scrollPos.x += wheelMove*20; - else scrollPos.y += wheelMove*20; // Vertical scroll + // Horizontal and vertical scrolling with mouse wheel + if (hasHorizontalScrollBar && (IsKeyDown(KEY_LEFT_CONTROL) || IsKeyDown(KEY_LEFT_SHIFT))) scrollPos.x += wheelMove*mouseWheelSpeed; + else scrollPos.y += wheelMove*mouseWheelSpeed; // Vertical scroll } } @@ -1641,7 +1890,7 @@ Rectangle GuiScrollPanel(Rectangle bounds, const char *text, Rectangle content, //-------------------------------------------------------------------- if (text != NULL) GuiStatusBar(statusBar, text); // Draw panel header as status bar - GuiDrawRectangle(bounds, 0, BLANK, Fade(GetColor(GuiGetStyle(DEFAULT, BACKGROUND_COLOR)), guiAlpha)); // Draw background + GuiDrawRectangle(bounds, 0, BLANK, GetColor(GuiGetStyle(DEFAULT, BACKGROUND_COLOR))); // Draw background // Save size of the scrollbar slider const int slider = GuiGetStyle(SCROLLBAR, SCROLL_SLIDER_SIZE); @@ -1668,11 +1917,11 @@ Rectangle GuiScrollPanel(Rectangle bounds, const char *text, Rectangle content, if (hasHorizontalScrollBar && hasVerticalScrollBar) { Rectangle corner = { (GuiGetStyle(LISTVIEW, SCROLLBAR_SIDE) == SCROLLBAR_LEFT_SIDE)? (bounds.x + GuiGetStyle(DEFAULT, BORDER_WIDTH) + 2) : (horizontalScrollBar.x + horizontalScrollBar.width + 2), verticalScrollBar.y + verticalScrollBar.height + 2, (float)horizontalScrollBarWidth - 4, (float)verticalScrollBarWidth - 4 }; - GuiDrawRectangle(corner, 0, BLANK, Fade(GetColor(GuiGetStyle(LISTVIEW, TEXT + (state*3))), guiAlpha)); + GuiDrawRectangle(corner, 0, BLANK, GetColor(GuiGetStyle(LISTVIEW, TEXT + (state*3)))); } // Draw scrollbar lines depending on current state - GuiDrawRectangle(bounds, GuiGetStyle(DEFAULT, BORDER_WIDTH), Fade(GetColor(GuiGetStyle(LISTVIEW, BORDER + (state*3))), guiAlpha), BLANK); + GuiDrawRectangle(bounds, GuiGetStyle(DEFAULT, BORDER_WIDTH), GetColor(GuiGetStyle(LISTVIEW, BORDER + (state*3))), BLANK); // Set scrollbar slider size back to the way it was before GuiSetStyle(SCROLLBAR, SCROLL_SLIDER_SIZE, slider); @@ -1680,12 +1929,13 @@ Rectangle GuiScrollPanel(Rectangle bounds, const char *text, Rectangle content, if (scroll != NULL) *scroll = scrollPos; - return view; + return result; } // Label control -void GuiLabel(Rectangle bounds, const char *text) +int GuiLabel(Rectangle bounds, const char *text) { + int result = 0; GuiState state = guiState; // Update control @@ -1695,19 +1945,21 @@ void GuiLabel(Rectangle bounds, const char *text) // Draw control //-------------------------------------------------------------------- - GuiDrawText(text, GetTextBounds(LABEL, bounds), GuiGetStyle(LABEL, TEXT_ALIGNMENT), Fade(GetColor(GuiGetStyle(LABEL, TEXT + (state*3))), guiAlpha)); + GuiDrawText(text, GetTextBounds(LABEL, bounds), GuiGetStyle(LABEL, TEXT_ALIGNMENT), GetColor(GuiGetStyle(LABEL, TEXT + (state*3)))); //-------------------------------------------------------------------- + + return result; } // Button control, returns true when clicked -bool GuiButton(Rectangle bounds, const char *text) +int GuiButton(Rectangle bounds, const char *text) { + int result = 0; GuiState state = guiState; - bool pressed = false; // Update control //-------------------------------------------------------------------- - if ((state != STATE_DISABLED) && !guiLocked) + if ((state != STATE_DISABLED) && !guiLocked && !guiSliderDragging) { Vector2 mousePoint = GetMousePosition(); @@ -1717,35 +1969,35 @@ bool GuiButton(Rectangle bounds, const char *text) if (IsMouseButtonDown(MOUSE_LEFT_BUTTON)) state = STATE_PRESSED; else state = STATE_FOCUSED; - if (IsMouseButtonReleased(MOUSE_LEFT_BUTTON)) pressed = true; + if (IsMouseButtonReleased(MOUSE_LEFT_BUTTON)) result = 1; } } //-------------------------------------------------------------------- // Draw control //-------------------------------------------------------------------- - GuiDrawRectangle(bounds, GuiGetStyle(BUTTON, BORDER_WIDTH), Fade(GetColor(GuiGetStyle(BUTTON, BORDER + (state*3))), guiAlpha), Fade(GetColor(GuiGetStyle(BUTTON, BASE + (state*3))), guiAlpha)); - GuiDrawText(text, GetTextBounds(BUTTON, bounds), GuiGetStyle(BUTTON, TEXT_ALIGNMENT), Fade(GetColor(GuiGetStyle(BUTTON, TEXT + (state*3))), guiAlpha)); + GuiDrawRectangle(bounds, GuiGetStyle(BUTTON, BORDER_WIDTH), GetColor(GuiGetStyle(BUTTON, BORDER + (state*3))), GetColor(GuiGetStyle(BUTTON, BASE + (state*3)))); + GuiDrawText(text, GetTextBounds(BUTTON, bounds), GuiGetStyle(BUTTON, TEXT_ALIGNMENT), GetColor(GuiGetStyle(BUTTON, TEXT + (state*3)))); if (state == STATE_FOCUSED) GuiTooltip(bounds); //------------------------------------------------------------------ - return pressed; + return result; // Button pressed: result = 1 } // Label button control -bool GuiLabelButton(Rectangle bounds, const char *text) +int GuiLabelButton(Rectangle bounds, const char *text) { GuiState state = guiState; bool pressed = false; // NOTE: We force bounds.width to be all text float textWidth = (float)GetTextWidth(text); - if (bounds.width < textWidth) bounds.width = textWidth; + if ((bounds.width - 2*GuiGetStyle(LABEL, BORDER_WIDTH) - 2*GuiGetStyle(LABEL, TEXT_PADDING)) < textWidth) bounds.width = textWidth + 2*GuiGetStyle(LABEL, BORDER_WIDTH) + 2*GuiGetStyle(LABEL, TEXT_PADDING) + 2; // Update control //-------------------------------------------------------------------- - if ((state != STATE_DISABLED) && !guiLocked) + if ((state != STATE_DISABLED) && !guiLocked && !guiSliderDragging) { Vector2 mousePoint = GetMousePosition(); @@ -1762,20 +2014,24 @@ bool GuiLabelButton(Rectangle bounds, const char *text) // Draw control //-------------------------------------------------------------------- - GuiDrawText(text, GetTextBounds(LABEL, bounds), GuiGetStyle(LABEL, TEXT_ALIGNMENT), Fade(GetColor(GuiGetStyle(LABEL, TEXT + (state*3))), guiAlpha)); + GuiDrawText(text, GetTextBounds(LABEL, bounds), GuiGetStyle(LABEL, TEXT_ALIGNMENT), GetColor(GuiGetStyle(LABEL, TEXT + (state*3)))); //-------------------------------------------------------------------- return pressed; } // Toggle Button control, returns true when active -bool GuiToggle(Rectangle bounds, const char *text, bool active) +int GuiToggle(Rectangle bounds, const char *text, bool *active) { + int result = 0; GuiState state = guiState; + bool temp = false; + if (active == NULL) active = &temp; + // Update control //-------------------------------------------------------------------- - if ((state != STATE_DISABLED) && !guiLocked) + if ((state != STATE_DISABLED) && !guiLocked && !guiSliderDragging) { Vector2 mousePoint = GetMousePosition(); @@ -1786,7 +2042,7 @@ bool GuiToggle(Rectangle bounds, const char *text, bool active) else if (IsMouseButtonReleased(MOUSE_LEFT_BUTTON)) { state = STATE_NORMAL; - active = !active; + *active = !(*active); } else state = STATE_FOCUSED; } @@ -1797,30 +2053,36 @@ bool GuiToggle(Rectangle bounds, const char *text, bool active) //-------------------------------------------------------------------- if (state == STATE_NORMAL) { - GuiDrawRectangle(bounds, GuiGetStyle(TOGGLE, BORDER_WIDTH), Fade(GetColor(GuiGetStyle(TOGGLE, (active? BORDER_COLOR_PRESSED : (BORDER + state*3)))), guiAlpha), Fade(GetColor(GuiGetStyle(TOGGLE, (active? BASE_COLOR_PRESSED : (BASE + state*3)))), guiAlpha)); - GuiDrawText(text, GetTextBounds(TOGGLE, bounds), GuiGetStyle(TOGGLE, TEXT_ALIGNMENT), Fade(GetColor(GuiGetStyle(TOGGLE, (active? TEXT_COLOR_PRESSED : (TEXT + state*3)))), guiAlpha)); + GuiDrawRectangle(bounds, GuiGetStyle(TOGGLE, BORDER_WIDTH), GetColor(GuiGetStyle(TOGGLE, ((*active)? BORDER_COLOR_PRESSED : (BORDER + state*3)))), GetColor(GuiGetStyle(TOGGLE, ((*active)? BASE_COLOR_PRESSED : (BASE + state*3))))); + GuiDrawText(text, GetTextBounds(TOGGLE, bounds), GuiGetStyle(TOGGLE, TEXT_ALIGNMENT), GetColor(GuiGetStyle(TOGGLE, ((*active)? TEXT_COLOR_PRESSED : (TEXT + state*3))))); } else { - GuiDrawRectangle(bounds, GuiGetStyle(TOGGLE, BORDER_WIDTH), Fade(GetColor(GuiGetStyle(TOGGLE, BORDER + state*3)), guiAlpha), Fade(GetColor(GuiGetStyle(TOGGLE, BASE + state*3)), guiAlpha)); - GuiDrawText(text, GetTextBounds(TOGGLE, bounds), GuiGetStyle(TOGGLE, TEXT_ALIGNMENT), Fade(GetColor(GuiGetStyle(TOGGLE, TEXT + state*3)), guiAlpha)); + GuiDrawRectangle(bounds, GuiGetStyle(TOGGLE, BORDER_WIDTH), GetColor(GuiGetStyle(TOGGLE, BORDER + state*3)), GetColor(GuiGetStyle(TOGGLE, BASE + state*3))); + GuiDrawText(text, GetTextBounds(TOGGLE, bounds), GuiGetStyle(TOGGLE, TEXT_ALIGNMENT), GetColor(GuiGetStyle(TOGGLE, TEXT + state*3))); } if (state == STATE_FOCUSED) GuiTooltip(bounds); //-------------------------------------------------------------------- - return active; + return result; } // Toggle Group control, returns toggled button codepointIndex -int GuiToggleGroup(Rectangle bounds, const char *text, int active) +int GuiToggleGroup(Rectangle bounds, const char *text, int *active) { #if !defined(RAYGUI_TOGGLEGROUP_MAX_ITEMS) #define RAYGUI_TOGGLEGROUP_MAX_ITEMS 32 #endif + int result = 0; float initBoundsX = bounds.x; + int temp = 0; + if (active == NULL) active = &temp; + + bool toggle = false; // Required for individual toggles + // Get substrings items from text (items pointers) int rows[RAYGUI_TOGGLEGROUP_MAX_ITEMS] = { 0 }; int itemCount = 0; @@ -1837,26 +2099,111 @@ int GuiToggleGroup(Rectangle bounds, const char *text, int active) prevRow = rows[i]; } - if (i == active) GuiToggle(bounds, items[i], true); - else if (GuiToggle(bounds, items[i], false) == true) active = i; + if (i == (*active)) + { + toggle = true; + GuiToggle(bounds, items[i], &toggle); + } + else + { + toggle = false; + GuiToggle(bounds, items[i], &toggle); + if (toggle) *active = i; + } bounds.x += (bounds.width + GuiGetStyle(TOGGLE, GROUP_PADDING)); } - return active; + return result; } -// Check Box control, returns true when active -bool GuiCheckBox(Rectangle bounds, const char *text, bool checked) +// Toggle Slider control extended, returns true when clicked +int GuiToggleSlider(Rectangle bounds, const char *text, int *active) { + int result = 0; GuiState state = guiState; - Rectangle textBounds = { 0 }; + int temp = 0; + if (active == NULL) active = &temp; + + //bool toggle = false; // Required for individual toggles + + // Get substrings items from text (items pointers) + int itemCount = 0; + const char **items = GuiTextSplit(text, ';', &itemCount, NULL); + + Rectangle slider = { + 0, // Calculated later depending on the active toggle + bounds.y + GuiGetStyle(SLIDER, BORDER_WIDTH) + GuiGetStyle(SLIDER, SLIDER_PADDING), + (bounds.width - 2*GuiGetStyle(SLIDER, BORDER_WIDTH) - (itemCount + 1)*GuiGetStyle(SLIDER, SLIDER_PADDING))/itemCount, + bounds.height - 2*GuiGetStyle(SLIDER, BORDER_WIDTH) - 2*GuiGetStyle(SLIDER, SLIDER_PADDING) }; + + // Update control + //-------------------------------------------------------------------- + if ((state != STATE_DISABLED) && !guiLocked) + { + Vector2 mousePoint = GetMousePosition(); + + if (CheckCollisionPointRec(mousePoint, bounds)) + { + if (IsMouseButtonDown(MOUSE_LEFT_BUTTON)) state = STATE_PRESSED; + else if (IsMouseButtonReleased(MOUSE_LEFT_BUTTON)) + { + state = STATE_PRESSED; + (*active)++; + result = 1; + } + else state = STATE_FOCUSED; + } + + if ((*active) && (state != STATE_FOCUSED)) state = STATE_PRESSED; + } + + if (*active >= itemCount) *active = 0; + slider.x = bounds.x + GuiGetStyle(SLIDER, BORDER_WIDTH) + (*active + 1)*GuiGetStyle(SLIDER, SLIDER_PADDING) + (*active)*slider.width; + //-------------------------------------------------------------------- + + // Draw control + //-------------------------------------------------------------------- + GuiDrawRectangle(bounds, GuiGetStyle(SLIDER, BORDER_WIDTH), GetColor(GuiGetStyle(TOGGLE, BORDER + (state*3))), + GetColor(GuiGetStyle(TOGGLE, BASE_COLOR_NORMAL))); + + // Draw internal slider + if (state == STATE_NORMAL) GuiDrawRectangle(slider, 0, BLANK, GetColor(GuiGetStyle(SLIDER, BASE_COLOR_PRESSED))); + else if (state == STATE_FOCUSED) GuiDrawRectangle(slider, 0, BLANK, GetColor(GuiGetStyle(SLIDER, BASE_COLOR_FOCUSED))); + else if (state == STATE_PRESSED) GuiDrawRectangle(slider, 0, BLANK, GetColor(GuiGetStyle(SLIDER, BASE_COLOR_PRESSED))); + // Draw text in slider if (text != NULL) { + Rectangle textBounds = { 0 }; textBounds.width = (float)GetTextWidth(text); textBounds.height = (float)GuiGetStyle(DEFAULT, TEXT_SIZE); + textBounds.x = slider.x + slider.width/2 - textBounds.width/2; + textBounds.y = bounds.y + bounds.height/2 - GuiGetStyle(DEFAULT, TEXT_SIZE)/2; + + GuiDrawText(items[*active], textBounds, GuiGetStyle(TOGGLE, TEXT_ALIGNMENT), Fade(GetColor(GuiGetStyle(TOGGLE, TEXT + (state*3))), guiAlpha)); + } + //-------------------------------------------------------------------- + + return result; +} + +// Check Box control, returns 1 when state changed +int GuiCheckBox(Rectangle bounds, const char *text, bool *checked) +{ + int result = 0; + GuiState state = guiState; + + bool temp = false; + if (checked == NULL) checked = &temp; + + Rectangle textBounds = { 0 }; + + if (text != NULL) + { + textBounds.width = (float)GetTextWidth(text) + 2; + textBounds.height = (float)GuiGetStyle(DEFAULT, TEXT_SIZE); textBounds.x = bounds.x + bounds.width + GuiGetStyle(CHECKBOX, TEXT_PADDING); textBounds.y = bounds.y + bounds.height/2 - GuiGetStyle(DEFAULT, TEXT_SIZE)/2; if (GuiGetStyle(CHECKBOX, TEXT_ALIGNMENT) == TEXT_ALIGN_LEFT) textBounds.x = bounds.x - textBounds.width - GuiGetStyle(CHECKBOX, TEXT_PADDING); @@ -1864,7 +2211,7 @@ bool GuiCheckBox(Rectangle bounds, const char *text, bool checked) // Update control //-------------------------------------------------------------------- - if ((state != STATE_DISABLED) && !guiLocked) + if ((state != STATE_DISABLED) && !guiLocked && !guiSliderDragging) { Vector2 mousePoint = GetMousePosition(); @@ -1881,35 +2228,43 @@ bool GuiCheckBox(Rectangle bounds, const char *text, bool checked) if (IsMouseButtonDown(MOUSE_LEFT_BUTTON)) state = STATE_PRESSED; else state = STATE_FOCUSED; - if (IsMouseButtonReleased(MOUSE_LEFT_BUTTON)) checked = !checked; + if (IsMouseButtonReleased(MOUSE_LEFT_BUTTON)) + { + *checked = !(*checked); + result = 1; + } } } //-------------------------------------------------------------------- // Draw control //-------------------------------------------------------------------- - GuiDrawRectangle(bounds, GuiGetStyle(CHECKBOX, BORDER_WIDTH), Fade(GetColor(GuiGetStyle(CHECKBOX, BORDER + (state*3))), guiAlpha), BLANK); + GuiDrawRectangle(bounds, GuiGetStyle(CHECKBOX, BORDER_WIDTH), GetColor(GuiGetStyle(CHECKBOX, BORDER + (state*3))), BLANK); - if (checked) + if (*checked) { Rectangle check = { bounds.x + GuiGetStyle(CHECKBOX, BORDER_WIDTH) + GuiGetStyle(CHECKBOX, CHECK_PADDING), bounds.y + GuiGetStyle(CHECKBOX, BORDER_WIDTH) + GuiGetStyle(CHECKBOX, CHECK_PADDING), bounds.width - 2*(GuiGetStyle(CHECKBOX, BORDER_WIDTH) + GuiGetStyle(CHECKBOX, CHECK_PADDING)), bounds.height - 2*(GuiGetStyle(CHECKBOX, BORDER_WIDTH) + GuiGetStyle(CHECKBOX, CHECK_PADDING)) }; - GuiDrawRectangle(check, 0, BLANK, Fade(GetColor(GuiGetStyle(CHECKBOX, TEXT + state*3)), guiAlpha)); + GuiDrawRectangle(check, 0, BLANK, GetColor(GuiGetStyle(CHECKBOX, TEXT + state*3))); } - GuiDrawText(text, textBounds, (GuiGetStyle(CHECKBOX, TEXT_ALIGNMENT) == TEXT_ALIGN_RIGHT)? TEXT_ALIGN_LEFT : TEXT_ALIGN_RIGHT, Fade(GetColor(GuiGetStyle(LABEL, TEXT + (state*3))), guiAlpha)); + GuiDrawText(text, textBounds, (GuiGetStyle(CHECKBOX, TEXT_ALIGNMENT) == TEXT_ALIGN_RIGHT)? TEXT_ALIGN_LEFT : TEXT_ALIGN_RIGHT, GetColor(GuiGetStyle(LABEL, TEXT + (state*3)))); //-------------------------------------------------------------------- - return checked; + return result; } // Combo Box control, returns selected item codepointIndex -int GuiComboBox(Rectangle bounds, const char *text, int active) +int GuiComboBox(Rectangle bounds, const char *text, int *active) { + int result = 0; GuiState state = guiState; + int temp = 0; + if (active == NULL) active = &temp; + bounds.width -= (GuiGetStyle(COMBOBOX, COMBO_BUTTON_WIDTH) + GuiGetStyle(COMBOBOX, COMBO_BUTTON_SPACING)); Rectangle selector = { (float)bounds.x + bounds.width + GuiGetStyle(COMBOBOX, COMBO_BUTTON_SPACING), @@ -1919,12 +2274,12 @@ int GuiComboBox(Rectangle bounds, const char *text, int active) int itemCount = 0; const char **items = GuiTextSplit(text, ';', &itemCount, NULL); - if (active < 0) active = 0; - else if (active > itemCount - 1) active = itemCount - 1; + if (*active < 0) *active = 0; + else if (*active > (itemCount - 1)) *active = itemCount - 1; // Update control //-------------------------------------------------------------------- - if ((state != STATE_DISABLED) && !guiLocked && (itemCount > 1)) + if ((state != STATE_DISABLED) && !guiLocked && (itemCount > 1) && !guiSliderDragging) { Vector2 mousePoint = GetMousePosition(); @@ -1933,8 +2288,8 @@ int GuiComboBox(Rectangle bounds, const char *text, int active) { if (IsMouseButtonPressed(MOUSE_LEFT_BUTTON)) { - active += 1; - if (active >= itemCount) active = 0; + *active += 1; + if (*active >= itemCount) *active = 0; // Cyclic combobox } if (IsMouseButtonDown(MOUSE_LEFT_BUTTON)) state = STATE_PRESSED; @@ -1946,8 +2301,8 @@ int GuiComboBox(Rectangle bounds, const char *text, int active) // Draw control //-------------------------------------------------------------------- // Draw combo box main - GuiDrawRectangle(bounds, GuiGetStyle(COMBOBOX, BORDER_WIDTH), Fade(GetColor(GuiGetStyle(COMBOBOX, BORDER + (state*3))), guiAlpha), Fade(GetColor(GuiGetStyle(COMBOBOX, BASE + (state*3))), guiAlpha)); - GuiDrawText(items[active], GetTextBounds(COMBOBOX, bounds), GuiGetStyle(COMBOBOX, TEXT_ALIGNMENT), Fade(GetColor(GuiGetStyle(COMBOBOX, TEXT + (state*3))), guiAlpha)); + GuiDrawRectangle(bounds, GuiGetStyle(COMBOBOX, BORDER_WIDTH), GetColor(GuiGetStyle(COMBOBOX, BORDER + (state*3))), GetColor(GuiGetStyle(COMBOBOX, BASE + (state*3)))); + GuiDrawText(items[*active], GetTextBounds(COMBOBOX, bounds), GuiGetStyle(COMBOBOX, TEXT_ALIGNMENT), GetColor(GuiGetStyle(COMBOBOX, TEXT + (state*3)))); // Draw selector using a custom button // NOTE: BORDER_WIDTH and TEXT_ALIGNMENT forced values @@ -1956,20 +2311,22 @@ int GuiComboBox(Rectangle bounds, const char *text, int active) GuiSetStyle(BUTTON, BORDER_WIDTH, 1); GuiSetStyle(BUTTON, TEXT_ALIGNMENT, TEXT_ALIGN_CENTER); - GuiButton(selector, TextFormat("%i/%i", active + 1, itemCount)); + GuiButton(selector, TextFormat("%i/%i", *active + 1, itemCount)); GuiSetStyle(BUTTON, TEXT_ALIGNMENT, tempTextAlign); GuiSetStyle(BUTTON, BORDER_WIDTH, tempBorderWidth); //-------------------------------------------------------------------- - return active; + return result; } // Dropdown Box control // NOTE: Returns mouse click -bool GuiDropdownBox(Rectangle bounds, const char *text, int *active, bool editMode) +int GuiDropdownBox(Rectangle bounds, const char *text, int *active, bool editMode) { + int result = 0; GuiState state = guiState; + int itemSelected = *active; int itemFocused = -1; @@ -1982,11 +2339,9 @@ bool GuiDropdownBox(Rectangle bounds, const char *text, int *active, bool editMo Rectangle itemBounds = bounds; - bool pressed = false; // Check mouse button pressed - // Update control //-------------------------------------------------------------------- - if ((state != STATE_DISABLED) && (editMode || !guiLocked) && (itemCount > 1)) + if ((state != STATE_DISABLED) && (editMode || !guiLocked) && (itemCount > 1) && !guiSliderDragging) { Vector2 mousePoint = GetMousePosition(); @@ -1997,11 +2352,11 @@ bool GuiDropdownBox(Rectangle bounds, const char *text, int *active, bool editMo // Check if mouse has been pressed or released outside limits if (!CheckCollisionPointRec(mousePoint, boundsOpen)) { - if (IsMouseButtonPressed(MOUSE_LEFT_BUTTON) || IsMouseButtonReleased(MOUSE_LEFT_BUTTON)) pressed = true; + if (IsMouseButtonPressed(MOUSE_LEFT_BUTTON) || IsMouseButtonReleased(MOUSE_LEFT_BUTTON)) result = 1; } // Check if already selected item has been pressed again - if (CheckCollisionPointRec(mousePoint, bounds) && IsMouseButtonPressed(MOUSE_LEFT_BUTTON)) pressed = true; + if (CheckCollisionPointRec(mousePoint, bounds) && IsMouseButtonPressed(MOUSE_LEFT_BUTTON)) result = 1; // Check focused and selected item for (int i = 0; i < itemCount; i++) @@ -2015,7 +2370,7 @@ bool GuiDropdownBox(Rectangle bounds, const char *text, int *active, bool editMo if (IsMouseButtonReleased(MOUSE_LEFT_BUTTON)) { itemSelected = i; - pressed = true; // Item selected, change to editMode = false + result = 1; // Item selected } break; } @@ -2029,7 +2384,7 @@ bool GuiDropdownBox(Rectangle bounds, const char *text, int *active, bool editMo { if (IsMouseButtonPressed(MOUSE_LEFT_BUTTON)) { - pressed = true; + result = 1; state = STATE_PRESSED; } else state = STATE_FOCUSED; @@ -2042,8 +2397,8 @@ bool GuiDropdownBox(Rectangle bounds, const char *text, int *active, bool editMo //-------------------------------------------------------------------- if (editMode) GuiPanel(boundsOpen, NULL); - GuiDrawRectangle(bounds, GuiGetStyle(DROPDOWNBOX, BORDER_WIDTH), Fade(GetColor(GuiGetStyle(DROPDOWNBOX, BORDER + state*3)), guiAlpha), Fade(GetColor(GuiGetStyle(DROPDOWNBOX, BASE + state*3)), guiAlpha)); - GuiDrawText(items[itemSelected], GetTextBounds(DEFAULT, bounds), GuiGetStyle(DROPDOWNBOX, TEXT_ALIGNMENT), Fade(GetColor(GuiGetStyle(DROPDOWNBOX, TEXT + state*3)), guiAlpha)); + GuiDrawRectangle(bounds, GuiGetStyle(DROPDOWNBOX, BORDER_WIDTH), GetColor(GuiGetStyle(DROPDOWNBOX, BORDER + state*3)), GetColor(GuiGetStyle(DROPDOWNBOX, BASE + state*3))); + GuiDrawText(items[itemSelected], GetTextBounds(DROPDOWNBOX, bounds), GuiGetStyle(DROPDOWNBOX, TEXT_ALIGNMENT), GetColor(GuiGetStyle(DROPDOWNBOX, TEXT + state*3))); if (editMode) { @@ -2055,102 +2410,284 @@ bool GuiDropdownBox(Rectangle bounds, const char *text, int *active, bool editMo if (i == itemSelected) { - GuiDrawRectangle(itemBounds, GuiGetStyle(DROPDOWNBOX, BORDER_WIDTH), Fade(GetColor(GuiGetStyle(DROPDOWNBOX, BORDER_COLOR_PRESSED)), guiAlpha), Fade(GetColor(GuiGetStyle(DROPDOWNBOX, BASE_COLOR_PRESSED)), guiAlpha)); - GuiDrawText(items[i], GetTextBounds(DEFAULT, itemBounds), GuiGetStyle(DROPDOWNBOX, TEXT_ALIGNMENT), Fade(GetColor(GuiGetStyle(DROPDOWNBOX, TEXT_COLOR_PRESSED)), guiAlpha)); + GuiDrawRectangle(itemBounds, GuiGetStyle(DROPDOWNBOX, BORDER_WIDTH), GetColor(GuiGetStyle(DROPDOWNBOX, BORDER_COLOR_PRESSED)), GetColor(GuiGetStyle(DROPDOWNBOX, BASE_COLOR_PRESSED))); + GuiDrawText(items[i], GetTextBounds(DROPDOWNBOX, itemBounds), GuiGetStyle(DROPDOWNBOX, TEXT_ALIGNMENT), GetColor(GuiGetStyle(DROPDOWNBOX, TEXT_COLOR_PRESSED))); } else if (i == itemFocused) { - GuiDrawRectangle(itemBounds, GuiGetStyle(DROPDOWNBOX, BORDER_WIDTH), Fade(GetColor(GuiGetStyle(DROPDOWNBOX, BORDER_COLOR_FOCUSED)), guiAlpha), Fade(GetColor(GuiGetStyle(DROPDOWNBOX, BASE_COLOR_FOCUSED)), guiAlpha)); - GuiDrawText(items[i], GetTextBounds(DEFAULT, itemBounds), GuiGetStyle(DROPDOWNBOX, TEXT_ALIGNMENT), Fade(GetColor(GuiGetStyle(DROPDOWNBOX, TEXT_COLOR_FOCUSED)), guiAlpha)); + GuiDrawRectangle(itemBounds, GuiGetStyle(DROPDOWNBOX, BORDER_WIDTH), GetColor(GuiGetStyle(DROPDOWNBOX, BORDER_COLOR_FOCUSED)), GetColor(GuiGetStyle(DROPDOWNBOX, BASE_COLOR_FOCUSED))); + GuiDrawText(items[i], GetTextBounds(DROPDOWNBOX, itemBounds), GuiGetStyle(DROPDOWNBOX, TEXT_ALIGNMENT), GetColor(GuiGetStyle(DROPDOWNBOX, TEXT_COLOR_FOCUSED))); } - else GuiDrawText(items[i], GetTextBounds(DEFAULT, itemBounds), GuiGetStyle(DROPDOWNBOX, TEXT_ALIGNMENT), Fade(GetColor(GuiGetStyle(DROPDOWNBOX, TEXT_COLOR_NORMAL)), guiAlpha)); + else GuiDrawText(items[i], GetTextBounds(DROPDOWNBOX, itemBounds), GuiGetStyle(DROPDOWNBOX, TEXT_ALIGNMENT), GetColor(GuiGetStyle(DROPDOWNBOX, TEXT_COLOR_NORMAL))); } } // Draw arrows (using icon if available) #if defined(RAYGUI_NO_ICONS) GuiDrawText("v", RAYGUI_CLITERAL(Rectangle){ bounds.x + bounds.width - GuiGetStyle(DROPDOWNBOX, ARROW_PADDING), bounds.y + bounds.height/2 - 2, 10, 10 }, - TEXT_ALIGN_CENTER, Fade(GetColor(GuiGetStyle(DROPDOWNBOX, TEXT + (state*3))), guiAlpha)); + TEXT_ALIGN_CENTER, GetColor(GuiGetStyle(DROPDOWNBOX, TEXT + (state*3)))); #else GuiDrawText("#120#", RAYGUI_CLITERAL(Rectangle){ bounds.x + bounds.width - GuiGetStyle(DROPDOWNBOX, ARROW_PADDING), bounds.y + bounds.height/2 - 6, 10, 10 }, - TEXT_ALIGN_CENTER, Fade(GetColor(GuiGetStyle(DROPDOWNBOX, TEXT + (state*3))), guiAlpha)); // ICON_ARROW_DOWN_FILL + TEXT_ALIGN_CENTER, GetColor(GuiGetStyle(DROPDOWNBOX, TEXT + (state*3)))); // ICON_ARROW_DOWN_FILL #endif //-------------------------------------------------------------------- *active = itemSelected; - return pressed; + + // TODO: Use result to return more internal states: mouse-press out-of-bounds, mouse-press over selected-item... + return result; // Mouse click: result = 1 } -// Text Box control, updates input text -// NOTE 2: Returns if KEY_ENTER pressed (useful for data validation) -bool GuiTextBox(Rectangle bounds, char *text, int textSize, bool editMode) +// Text Box control +// NOTE: Returns true on ENTER pressed (useful for data validation) +int GuiTextBox(Rectangle bounds, char *text, int bufferSize, bool editMode) { + #if !defined(RAYGUI_TEXTBOX_AUTO_CURSOR_COOLDOWN) + #define RAYGUI_TEXTBOX_AUTO_CURSOR_COOLDOWN 40 // Frames to wait for autocursor movement + #endif + #if !defined(RAYGUI_TEXTBOX_AUTO_CURSOR_DELAY) + #define RAYGUI_TEXTBOX_AUTO_CURSOR_DELAY 1 // Frames delay for autocursor movement + #endif + + int result = 0; GuiState state = guiState; - Rectangle textBounds = GetTextBounds(TEXTBOX, bounds); - bool pressed = false; - int textWidth = GetTextWidth(text); + bool multiline = false; // TODO: Consider multiline text input + int wrapMode = GuiGetStyle(DEFAULT, TEXT_WRAP_MODE); + Rectangle textBounds = GetTextBounds(TEXTBOX, bounds); + int textWidth = GetTextWidth(text) - GetTextWidth(text + textBoxCursorIndex); + int textIndexOffset = 0; // Text index offset to start drawing in the box + + // Cursor rectangle + // NOTE: Position X value should be updated Rectangle cursor = { - bounds.x + GuiGetStyle(TEXTBOX, TEXT_PADDING) + textWidth + 2, - bounds.y + bounds.height/2 - GuiGetStyle(DEFAULT, TEXT_SIZE), - 4, + textBounds.x + textWidth + GuiGetStyle(DEFAULT, TEXT_SPACING), + textBounds.y + textBounds.height/2 - GuiGetStyle(DEFAULT, TEXT_SIZE), + 2, (float)GuiGetStyle(DEFAULT, TEXT_SIZE)*2 }; if (cursor.height >= bounds.height) cursor.height = bounds.height - GuiGetStyle(TEXTBOX, BORDER_WIDTH)*2; if (cursor.y < (bounds.y + GuiGetStyle(TEXTBOX, BORDER_WIDTH))) cursor.y = bounds.y + GuiGetStyle(TEXTBOX, BORDER_WIDTH); + // Mouse cursor rectangle + // NOTE: Initialized outside of screen + Rectangle mouseCursor = cursor; + mouseCursor.x = -1; + mouseCursor.width = 1; + + // Auto-cursor movement logic + // NOTE: Cursor moves automatically when key down after some time + if (IsKeyDown(KEY_LEFT) || IsKeyDown(KEY_RIGHT) || IsKeyDown(KEY_UP) || IsKeyDown(KEY_DOWN) || IsKeyDown(KEY_BACKSPACE) || IsKeyDown(KEY_DELETE)) autoCursorCooldownCounter++; + else + { + autoCursorCooldownCounter = 0; // GLOBAL: Cursor cooldown counter + autoCursorDelayCounter = 0; // GLOBAL: Cursor delay counter + } + + // Blink-cursor frame counter + //if (!autoCursorMode) blinkCursorFrameCounter++; + //else blinkCursorFrameCounter = 0; + // Update control //-------------------------------------------------------------------- - if ((state != STATE_DISABLED) && !guiLocked) + // WARNING: Text editing is only supported under certain conditions: + if ((state != STATE_DISABLED) && // Control not disabled + !GuiGetStyle(TEXTBOX, TEXT_READONLY) && // TextBox not on read-only mode + !guiLocked && // Gui not locked + !guiSliderDragging && // No gui slider on dragging + (wrapMode == TEXT_WRAP_NONE)) // No wrap mode { - Vector2 mousePoint = GetMousePosition(); + Vector2 mousePosition = GetMousePosition(); if (editMode) { state = STATE_PRESSED; - int key = GetCharPressed(); // Returns codepoint as Unicode - int keyCount = (int)strlen(text); - int byteSize = 0; - const char *textUTF8 = CodepointToUTF8(key, &byteSize); + // If text does not fit in the textbox and current cursor position is out of bounds, + // we add an index offset to text for drawing only what requires depending on cursor + while (textWidth >= textBounds.width) + { + int nextCodepointSize = 0; + GetCodepointNext(text + textIndexOffset, &nextCodepointSize); + + textIndexOffset += nextCodepointSize; + + textWidth = GetTextWidth(text + textIndexOffset) - GetTextWidth(text + textBoxCursorIndex); + } + + int textLength = (int)strlen(text); // Get current text length + int codepoint = GetCharPressed(); // Get Unicode codepoint + if (multiline && IsKeyPressed(KEY_ENTER)) codepoint = (int)'\n'; + + if (textBoxCursorIndex > textLength) textBoxCursorIndex = textLength; + + // Encode codepoint as UTF-8 + int codepointSize = 0; + const char *charEncoded = CodepointToUTF8(codepoint, &codepointSize); + + // Add codepoint to text, at current cursor position + // NOTE: Make sure we do not overflow buffer size + if (((multiline && (codepoint == (int)'\n')) || (codepoint >= 32)) && ((textLength + codepointSize) < bufferSize)) + { + // Move forward data from cursor position + for (int i = (textLength + codepointSize); i > textBoxCursorIndex; i--) text[i] = text[i - codepointSize]; + + // Add new codepoint in current cursor position + for (int i = 0; i < codepointSize; i++) text[textBoxCursorIndex + i] = charEncoded[i]; + + textBoxCursorIndex += codepointSize; + textLength += codepointSize; + + // Make sure text last character is EOL + text[textLength] = '\0'; + } + + // Move cursor to start + if ((textLength > 0) && IsKeyPressed(KEY_HOME)) textBoxCursorIndex = 0; + + // Move cursor to end + if ((textLength > textBoxCursorIndex) && IsKeyPressed(KEY_END)) textBoxCursorIndex = textLength; + + // Delete codepoint from text, after current cursor position + if ((textLength > textBoxCursorIndex) && (IsKeyPressed(KEY_DELETE) || (IsKeyDown(KEY_DELETE) && (autoCursorCooldownCounter >= RAYGUI_TEXTBOX_AUTO_CURSOR_COOLDOWN)))) + { + autoCursorDelayCounter++; + + if (IsKeyPressed(KEY_DELETE) || (autoCursorDelayCounter%RAYGUI_TEXTBOX_AUTO_CURSOR_DELAY) == 0) // Delay every movement some frames + { + int nextCodepointSize = 0; + GetCodepointNext(text + textBoxCursorIndex, &nextCodepointSize); + + // Move backward text from cursor position + for (int i = textBoxCursorIndex; i < textLength; i++) text[i] = text[i + nextCodepointSize]; + + textLength -= codepointSize; - // Only allow keys in range [32..125] - if ((keyCount + byteSize) < textSize) + // Make sure text last character is EOL + text[textLength] = '\0'; + } + } + + // Delete codepoint from text, before current cursor position + if ((textLength > 0) && (IsKeyPressed(KEY_BACKSPACE) || (IsKeyDown(KEY_BACKSPACE) && (autoCursorCooldownCounter >= RAYGUI_TEXTBOX_AUTO_CURSOR_COOLDOWN)))) { - //float maxWidth = (bounds.width - (GuiGetStyle(TEXTBOX, TEXT_INNER_PADDING)*2)); + autoCursorDelayCounter++; - if (key >= 32) + if (IsKeyPressed(KEY_BACKSPACE) || (autoCursorDelayCounter%RAYGUI_TEXTBOX_AUTO_CURSOR_DELAY) == 0) // Delay every movement some frames { - for (int i = 0; i < byteSize; i++) + int prevCodepointSize = 0; + GetCodepointPrevious(text + textBoxCursorIndex, &prevCodepointSize); + + // Move backward text from cursor position + for (int i = (textBoxCursorIndex - prevCodepointSize); i < textLength; i++) text[i] = text[i + prevCodepointSize]; + + // Prevent cursor index from decrementing past 0 + if (textBoxCursorIndex > 0) { - text[keyCount] = textUTF8[i]; - keyCount++; + textBoxCursorIndex -= codepointSize; + textLength -= codepointSize; } - text[keyCount] = '\0'; + // Make sure text last character is EOL + text[textLength] = '\0'; } } - // Delete text - if (keyCount > 0) + // Move cursor position with keys + if (IsKeyPressed(KEY_LEFT) || (IsKeyDown(KEY_LEFT) && (autoCursorCooldownCounter > RAYGUI_TEXTBOX_AUTO_CURSOR_COOLDOWN))) { - if (IsKeyPressed(KEY_BACKSPACE)) + autoCursorDelayCounter++; + + if (IsKeyPressed(KEY_LEFT) || (autoCursorDelayCounter%RAYGUI_TEXTBOX_AUTO_CURSOR_DELAY) == 0) // Delay every movement some frames + { + int prevCodepointSize = 0; + GetCodepointPrevious(text + textBoxCursorIndex, &prevCodepointSize); + + if (textBoxCursorIndex >= prevCodepointSize) textBoxCursorIndex -= prevCodepointSize; + } + } + else if (IsKeyPressed(KEY_RIGHT) || (IsKeyDown(KEY_RIGHT) && (autoCursorCooldownCounter > RAYGUI_TEXTBOX_AUTO_CURSOR_COOLDOWN))) + { + autoCursorDelayCounter++; + + if (IsKeyPressed(KEY_RIGHT) || (autoCursorDelayCounter%RAYGUI_TEXTBOX_AUTO_CURSOR_DELAY) == 0) // Delay every movement some frames + { + int nextCodepointSize = 0; + GetCodepointNext(text + textBoxCursorIndex, &nextCodepointSize); + + if ((textBoxCursorIndex + nextCodepointSize) <= textLength) textBoxCursorIndex += nextCodepointSize; + } + } + + // Move cursor position with mouse + if (CheckCollisionPointRec(mousePosition, textBounds)) // Mouse hover text + { + float scaleFactor = (float)GuiGetStyle(DEFAULT, TEXT_SIZE)/(float)guiFont.baseSize; + int codepointIndex = 0; + float glyphWidth = 0.0f; + float widthToMouseX = 0; + int mouseCursorIndex = 0; + + for (int i = textIndexOffset; i < textLength; i++) + { + codepoint = GetCodepointNext(&text[i], &codepointSize); + codepointIndex = GetGlyphIndex(guiFont, codepoint); + + if (guiFont.glyphs[codepointIndex].advanceX == 0) glyphWidth = ((float)guiFont.recs[codepointIndex].width*scaleFactor); + else glyphWidth = ((float)guiFont.glyphs[codepointIndex].advanceX*scaleFactor); + + if (mousePosition.x <= (textBounds.x + (widthToMouseX + glyphWidth/2))) + { + mouseCursor.x = textBounds.x + widthToMouseX; + mouseCursorIndex = i; + break; + } + + widthToMouseX += (glyphWidth + (float)GuiGetStyle(DEFAULT, TEXT_SPACING)); + } + + // Check if mouse cursor is at the last position + int textEndWidth = GetTextWidth(text + textIndexOffset); + if (GetMousePosition().x >= (textBounds.x + textEndWidth - glyphWidth/2)) + { + mouseCursor.x = textBounds.x + textEndWidth; + mouseCursorIndex = (int)strlen(text); + } + + // Place cursor at required index on mouse click + if ((mouseCursor.x >= 0) && IsMouseButtonPressed(MOUSE_LEFT_BUTTON)) { - while ((keyCount > 0) && ((text[--keyCount] & 0xc0) == 0x80)); - text[keyCount] = '\0'; + cursor.x = mouseCursor.x; + textBoxCursorIndex = mouseCursorIndex; } } + else mouseCursor.x = -1; - if (IsKeyPressed(KEY_ENTER) || (!CheckCollisionPointRec(mousePoint, bounds) && IsMouseButtonPressed(MOUSE_LEFT_BUTTON))) pressed = true; + // Recalculate cursor position.y depending on textBoxCursorIndex + cursor.x = bounds.x + GuiGetStyle(TEXTBOX, TEXT_PADDING) + GetTextWidth(text + textIndexOffset) - GetTextWidth(text + textBoxCursorIndex) + GuiGetStyle(DEFAULT, TEXT_SPACING); + //if (multiline) cursor.y = GetTextLines() + + // Finish text editing on ENTER or mouse click outside bounds + if ((!multiline && IsKeyPressed(KEY_ENTER)) || + (!CheckCollisionPointRec(mousePosition, bounds) && IsMouseButtonPressed(MOUSE_LEFT_BUTTON))) + { + textBoxCursorIndex = 0; // GLOBAL: Reset the shared cursor index + result = 1; + } } else { - if (CheckCollisionPointRec(mousePoint, bounds)) + if (CheckCollisionPointRec(mousePosition, bounds)) { state = STATE_FOCUSED; - if (IsMouseButtonPressed(MOUSE_LEFT_BUTTON)) pressed = true; + + if (IsMouseButtonPressed(MOUSE_LEFT_BUTTON)) + { + textBoxCursorIndex = (int)strlen(text); // GLOBAL: Place cursor index to the end of current text + result = 1; + } } } } @@ -2160,44 +2697,61 @@ bool GuiTextBox(Rectangle bounds, char *text, int textSize, bool editMode) //-------------------------------------------------------------------- if (state == STATE_PRESSED) { - GuiDrawRectangle(bounds, GuiGetStyle(TEXTBOX, BORDER_WIDTH), Fade(GetColor(GuiGetStyle(TEXTBOX, BORDER + (state*3))), guiAlpha), Fade(GetColor(GuiGetStyle(TEXTBOX, BASE_COLOR_PRESSED)), guiAlpha)); + GuiDrawRectangle(bounds, GuiGetStyle(TEXTBOX, BORDER_WIDTH), GetColor(GuiGetStyle(TEXTBOX, BORDER + (state*3))), GetColor(GuiGetStyle(TEXTBOX, BASE_COLOR_PRESSED))); } else if (state == STATE_DISABLED) { - GuiDrawRectangle(bounds, GuiGetStyle(TEXTBOX, BORDER_WIDTH), Fade(GetColor(GuiGetStyle(TEXTBOX, BORDER + (state*3))), guiAlpha), Fade(GetColor(GuiGetStyle(TEXTBOX, BASE_COLOR_DISABLED)), guiAlpha)); - } - else GuiDrawRectangle(bounds, GuiGetStyle(TEXTBOX, BORDER_WIDTH), Fade(GetColor(GuiGetStyle(TEXTBOX, BORDER + (state*3))), guiAlpha), BLANK); - - if (editMode) - { - // In case we edit and text does not fit in the textbox, - // we move text pointer to a position it fits inside the text box - while ((textWidth >= textBounds.width) && (text[0] != '\0')) - { - int codepointSize = 0; - GetCodepointNext(text, &codepointSize); - text += codepointSize; - textWidth = GetTextWidth(text); - cursor.x = textBounds.x + textWidth + 2; - } + GuiDrawRectangle(bounds, GuiGetStyle(TEXTBOX, BORDER_WIDTH), GetColor(GuiGetStyle(TEXTBOX, BORDER + (state*3))), GetColor(GuiGetStyle(TEXTBOX, BASE_COLOR_DISABLED))); } + else GuiDrawRectangle(bounds, GuiGetStyle(TEXTBOX, BORDER_WIDTH), GetColor(GuiGetStyle(TEXTBOX, BORDER + (state*3))), BLANK); - GuiDrawText(text, textBounds, GuiGetStyle(TEXTBOX, TEXT_ALIGNMENT), Fade(GetColor(GuiGetStyle(TEXTBOX, TEXT + (state*3))), guiAlpha)); + // Draw text considering index offset if required + // NOTE: Text index offset depends on cursor position + GuiDrawText(text + textIndexOffset, textBounds, GuiGetStyle(TEXTBOX, TEXT_ALIGNMENT), GetColor(GuiGetStyle(TEXTBOX, TEXT + (state*3)))); // Draw cursor - if (editMode) GuiDrawRectangle(cursor, 0, BLANK, Fade(GetColor(GuiGetStyle(TEXTBOX, BORDER_COLOR_PRESSED)), guiAlpha)); + if (editMode && !GuiGetStyle(TEXTBOX, TEXT_READONLY)) + { + //if (autoCursorMode || ((blinkCursorFrameCounter/40)%2 == 0)) + GuiDrawRectangle(cursor, 0, BLANK, GetColor(GuiGetStyle(TEXTBOX, BORDER_COLOR_PRESSED))); + + // Draw mouse position cursor (if required) + if (mouseCursor.x >= 0) GuiDrawRectangle(mouseCursor, 0, BLANK, GetColor(GuiGetStyle(TEXTBOX, BORDER_COLOR_PRESSED))); + } else if (state == STATE_FOCUSED) GuiTooltip(bounds); //-------------------------------------------------------------------- + return result; // Mouse button pressed: result = 1 +} + +/* +// Text Box control with multiple lines and word-wrap +// NOTE: This text-box is readonly, no editing supported by default +bool GuiTextBoxMulti(Rectangle bounds, char *text, int bufferSize, bool editMode) +{ + bool pressed = false; + + GuiSetStyle(TEXTBOX, TEXT_READONLY, 1); + GuiSetStyle(DEFAULT, TEXT_WRAP_MODE, TEXT_WRAP_WORD); // WARNING: If wrap mode enabled, text editing is not supported + GuiSetStyle(DEFAULT, TEXT_ALIGNMENT_VERTICAL, TEXT_ALIGN_TOP); + + // TODO: Implement methods to calculate cursor position properly + pressed = GuiTextBox(bounds, text, bufferSize, editMode); + + GuiSetStyle(DEFAULT, TEXT_ALIGNMENT_VERTICAL, TEXT_ALIGN_MIDDLE); + GuiSetStyle(DEFAULT, TEXT_WRAP_MODE, TEXT_WRAP_NONE); + GuiSetStyle(TEXTBOX, TEXT_READONLY, 0); + return pressed; } +*/ // Spinner control, returns selected value -bool GuiSpinner(Rectangle bounds, const char *text, int *value, int minValue, int maxValue, bool editMode) +int GuiSpinner(Rectangle bounds, const char *text, int *value, int minValue, int maxValue, bool editMode) { + int result = 1; GuiState state = guiState; - bool pressed = false; int tempValue = *value; Rectangle spinner = { bounds.x + GuiGetStyle(SPINNER, SPIN_BUTTON_WIDTH) + GuiGetStyle(SPINNER, SPIN_BUTTON_SPACING), bounds.y, @@ -2208,7 +2762,7 @@ bool GuiSpinner(Rectangle bounds, const char *text, int *value, int minValue, in Rectangle textBounds = { 0 }; if (text != NULL) { - textBounds.width = (float)GetTextWidth(text); + textBounds.width = (float)GetTextWidth(text) + 2; textBounds.height = (float)GuiGetStyle(DEFAULT, TEXT_SIZE); textBounds.x = bounds.x + bounds.width + GuiGetStyle(SPINNER, TEXT_PADDING); textBounds.y = bounds.y + bounds.height/2 - GuiGetStyle(DEFAULT, TEXT_SIZE)/2; @@ -2217,7 +2771,7 @@ bool GuiSpinner(Rectangle bounds, const char *text, int *value, int minValue, in // Update control //-------------------------------------------------------------------- - if ((state != STATE_DISABLED) && !guiLocked) + if ((state != STATE_DISABLED) && !guiLocked && !guiSliderDragging) { Vector2 mousePoint = GetMousePosition(); @@ -2246,8 +2800,7 @@ bool GuiSpinner(Rectangle bounds, const char *text, int *value, int minValue, in // Draw control //-------------------------------------------------------------------- - // TODO: Set Spinner properties for ValueBox - pressed = GuiValueBox(spinner, NULL, &tempValue, minValue, maxValue, editMode); + result = GuiValueBox(spinner, NULL, &tempValue, minValue, maxValue, editMode); // Draw value selector custom buttons // NOTE: BORDER_WIDTH and TEXT_ALIGNMENT forced values @@ -2260,23 +2813,23 @@ bool GuiSpinner(Rectangle bounds, const char *text, int *value, int minValue, in GuiSetStyle(BUTTON, BORDER_WIDTH, tempBorderWidth); // Draw text label if provided - GuiDrawText(text, textBounds, (GuiGetStyle(SPINNER, TEXT_ALIGNMENT) == TEXT_ALIGN_RIGHT)? TEXT_ALIGN_LEFT : TEXT_ALIGN_RIGHT, Fade(GetColor(GuiGetStyle(LABEL, TEXT + (state*3))), guiAlpha)); + GuiDrawText(text, textBounds, (GuiGetStyle(SPINNER, TEXT_ALIGNMENT) == TEXT_ALIGN_RIGHT)? TEXT_ALIGN_LEFT : TEXT_ALIGN_RIGHT, GetColor(GuiGetStyle(LABEL, TEXT + (state*3)))); //-------------------------------------------------------------------- *value = tempValue; - return pressed; + return result; } // Value Box control, updates input text with numbers // NOTE: Requires static variables: frameCounter -bool GuiValueBox(Rectangle bounds, const char *text, int *value, int minValue, int maxValue, bool editMode) +int GuiValueBox(Rectangle bounds, const char *text, int *value, int minValue, int maxValue, bool editMode) { #if !defined(RAYGUI_VALUEBOX_MAX_CHARS) #define RAYGUI_VALUEBOX_MAX_CHARS 32 #endif + int result = 0; GuiState state = guiState; - bool pressed = false; char textValue[RAYGUI_VALUEBOX_MAX_CHARS + 1] = "\0"; sprintf(textValue, "%i", *value); @@ -2284,7 +2837,7 @@ bool GuiValueBox(Rectangle bounds, const char *text, int *value, int minValue, i Rectangle textBounds = { 0 }; if (text != NULL) { - textBounds.width = (float)GetTextWidth(text); + textBounds.width = (float)GetTextWidth(text) + 2; textBounds.height = (float)GuiGetStyle(DEFAULT, TEXT_SIZE); textBounds.x = bounds.x + bounds.width + GuiGetStyle(VALUEBOX, TEXT_PADDING); textBounds.y = bounds.y + bounds.height/2 - GuiGetStyle(DEFAULT, TEXT_SIZE)/2; @@ -2293,7 +2846,7 @@ bool GuiValueBox(Rectangle bounds, const char *text, int *value, int minValue, i // Update control //-------------------------------------------------------------------- - if ((state != STATE_DISABLED) && !guiLocked) + if ((state != STATE_DISABLED) && !guiLocked && !guiSliderDragging) { Vector2 mousePoint = GetMousePosition(); @@ -2337,7 +2890,7 @@ bool GuiValueBox(Rectangle bounds, const char *text, int *value, int minValue, i //if (*value > maxValue) *value = maxValue; //else if (*value < minValue) *value = minValue; - if (IsKeyPressed(KEY_ENTER) || (!CheckCollisionPointRec(mousePoint, bounds) && IsMouseButtonPressed(MOUSE_LEFT_BUTTON))) pressed = true; + if (IsKeyPressed(KEY_ENTER) || (!CheckCollisionPointRec(mousePoint, bounds) && IsMouseButtonPressed(MOUSE_LEFT_BUTTON))) result = 1; } else { @@ -2347,7 +2900,7 @@ bool GuiValueBox(Rectangle bounds, const char *text, int *value, int minValue, i if (CheckCollisionPointRec(mousePoint, bounds)) { state = STATE_FOCUSED; - if (IsMouseButtonPressed(MOUSE_LEFT_BUTTON)) pressed = true; + if (IsMouseButtonPressed(MOUSE_LEFT_BUTTON)) result = 1; } } } @@ -2359,208 +2912,36 @@ bool GuiValueBox(Rectangle bounds, const char *text, int *value, int minValue, i if (state == STATE_PRESSED) baseColor = GetColor(GuiGetStyle(VALUEBOX, BASE_COLOR_PRESSED)); else if (state == STATE_DISABLED) baseColor = GetColor(GuiGetStyle(VALUEBOX, BASE_COLOR_DISABLED)); - // WARNING: BLANK color does not work properly with Fade() - GuiDrawRectangle(bounds, GuiGetStyle(VALUEBOX, BORDER_WIDTH), Fade(GetColor(GuiGetStyle(VALUEBOX, BORDER + (state*3))), guiAlpha), baseColor); - GuiDrawText(textValue, GetTextBounds(VALUEBOX, bounds), TEXT_ALIGN_CENTER, Fade(GetColor(GuiGetStyle(VALUEBOX, TEXT + (state*3))), guiAlpha)); + GuiDrawRectangle(bounds, GuiGetStyle(VALUEBOX, BORDER_WIDTH), GetColor(GuiGetStyle(VALUEBOX, BORDER + (state*3))), baseColor); + GuiDrawText(textValue, GetTextBounds(VALUEBOX, bounds), TEXT_ALIGN_CENTER, GetColor(GuiGetStyle(VALUEBOX, TEXT + (state*3)))); // Draw cursor if (editMode) { // NOTE: ValueBox internal text is always centered Rectangle cursor = { bounds.x + GetTextWidth(textValue)/2 + bounds.width/2 + 1, bounds.y + 2*GuiGetStyle(VALUEBOX, BORDER_WIDTH), 4, bounds.height - 4*GuiGetStyle(VALUEBOX, BORDER_WIDTH) }; - GuiDrawRectangle(cursor, 0, BLANK, Fade(GetColor(GuiGetStyle(VALUEBOX, BORDER_COLOR_PRESSED)), guiAlpha)); + GuiDrawRectangle(cursor, 0, BLANK, GetColor(GuiGetStyle(VALUEBOX, BORDER_COLOR_PRESSED))); } // Draw text label if provided - GuiDrawText(text, textBounds, (GuiGetStyle(VALUEBOX, TEXT_ALIGNMENT) == TEXT_ALIGN_RIGHT)? TEXT_ALIGN_LEFT : TEXT_ALIGN_RIGHT, Fade(GetColor(GuiGetStyle(LABEL, TEXT + (state*3))), guiAlpha)); - //-------------------------------------------------------------------- - - return pressed; -} - -// Text Box control with multiple lines -bool GuiTextBoxMulti(Rectangle bounds, char *text, int textSize, bool editMode) -{ - GuiState state = guiState; - bool pressed = false; - - Rectangle textAreaBounds = { - bounds.x + GuiGetStyle(TEXTBOX, BORDER_WIDTH) + GuiGetStyle(TEXTBOX, TEXT_INNER_PADDING), - bounds.y + GuiGetStyle(TEXTBOX, BORDER_WIDTH) + GuiGetStyle(TEXTBOX, TEXT_INNER_PADDING), - bounds.width - 2*(GuiGetStyle(TEXTBOX, BORDER_WIDTH) + GuiGetStyle(TEXTBOX, TEXT_INNER_PADDING)), - bounds.height - 2*(GuiGetStyle(TEXTBOX, BORDER_WIDTH) + GuiGetStyle(TEXTBOX, TEXT_INNER_PADDING)) - }; - - // Cursor position, [x, y] values should be updated - Rectangle cursor = { 0, -1, 4, (float)GuiGetStyle(DEFAULT, TEXT_SIZE) + 2 }; - - float scaleFactor = (float)GuiGetStyle(DEFAULT, TEXT_SIZE)/(float)guiFont.baseSize; // Character rectangle scaling factor - - // Update control - //-------------------------------------------------------------------- - if ((state != STATE_DISABLED) && !guiLocked) - { - Vector2 mousePoint = GetMousePosition(); - - if (editMode) - { - state = STATE_PRESSED; - - // We get an Unicode codepoint - int codepoint = GetCharPressed(); - int textLength = (int)strlen(text); // Length in bytes (UTF-8 string) - int byteSize = 0; - const char *textUTF8 = CodepointToUTF8(codepoint, &byteSize); - - // Introduce characters - if ((textLength + byteSize) < textSize) - { - if (IsKeyPressed(KEY_ENTER)) - { - text[textLength] = '\n'; - textLength++; - } - else if (codepoint >= 32) - { - // Supports Unicode inputs -> Encoded to UTF-8 - int charUTF8Length = 0; - const char *charEncoded = CodepointToUTF8(codepoint, &charUTF8Length); - memcpy(text + textLength, charEncoded, charUTF8Length); - textLength += charUTF8Length; - } - } - - // Delete characters - if (textLength > 0) - { - if (IsKeyPressed(KEY_BACKSPACE)) - { - if ((unsigned char)text[textLength - 1] < 127) - { - // Remove ASCII equivalent character (1 byte) - textLength--; - text[textLength] = '\0'; - } - else - { - // Remove latest UTF-8 unicode character introduced (n bytes) - int charUTF8Length = 0; - while ((charUTF8Length < textLength) && ((unsigned char)text[textLength - 1 - charUTF8Length] & 0b01000000) == 0) charUTF8Length++; - - textLength -= (charUTF8Length + 1); - text[textLength] = '\0'; - } - } - } - - // Exit edit mode - if (!CheckCollisionPointRec(mousePoint, bounds) && IsMouseButtonPressed(MOUSE_LEFT_BUTTON)) pressed = true; - } - else - { - if (CheckCollisionPointRec(mousePoint, bounds)) - { - state = STATE_FOCUSED; - if (IsMouseButtonPressed(MOUSE_LEFT_BUTTON)) pressed = true; - } - } - } - //-------------------------------------------------------------------- - - // Draw control - //-------------------------------------------------------------------- - if (state == STATE_PRESSED) - { - GuiDrawRectangle(bounds, GuiGetStyle(TEXTBOX, BORDER_WIDTH), Fade(GetColor(GuiGetStyle(TEXTBOX, BORDER + (state*3))), guiAlpha), Fade(GetColor(GuiGetStyle(TEXTBOX, BASE_COLOR_PRESSED)), guiAlpha)); - } - else if (state == STATE_DISABLED) - { - GuiDrawRectangle(bounds, GuiGetStyle(TEXTBOX, BORDER_WIDTH), Fade(GetColor(GuiGetStyle(TEXTBOX, BORDER + (state*3))), guiAlpha), Fade(GetColor(GuiGetStyle(TEXTBOX, BASE_COLOR_DISABLED)), guiAlpha)); - } - else GuiDrawRectangle(bounds, GuiGetStyle(TEXTBOX, BORDER_WIDTH), Fade(GetColor(GuiGetStyle(TEXTBOX, BORDER + (state*3))), guiAlpha), BLANK); - - int wrapMode = 1; // 0-No wrap, 1-Char wrap, 2-Word wrap - Vector2 cursorPos = { textAreaBounds.x, textAreaBounds.y }; - - //int lastSpacePos = 0; - //int lastSpaceWidth = 0; - //int lastSpaceCursorPos = 0; - - for (int i = 0, codepointSize = 0; (text != NULL) && (text[i] != '\0'); i += codepointSize) - { - int codepoint = GetCodepointNext(text + i, &codepointSize); - int index = GetGlyphIndex(guiFont, codepoint); // If requested codepoint is not found, we get '?' (0x3f) - Rectangle atlasRec = guiFont.recs[index]; - GlyphInfo glyphInfo = guiFont.glyphs[index]; // Glyph measures - - if ((codepointSize == 1) && (codepoint == '\n')) - { - cursorPos.y += (guiFont.baseSize*scaleFactor + GuiGetStyle(TEXTBOX, TEXT_LINES_SPACING)); // Line feed - cursorPos.x = textAreaBounds.x; // Carriage return - } - else - { - if (wrapMode == 1) - { - int glyphWidth = 0; - if (glyphInfo.advanceX != 0) glyphWidth += glyphInfo.advanceX; - else glyphWidth += (int)(atlasRec.width + glyphInfo.offsetX); - - // Jump line if the end of the text box area has been reached - if ((cursorPos.x + (glyphWidth*scaleFactor)) > (textAreaBounds.x + textAreaBounds.width)) - { - cursorPos.y += (guiFont.baseSize*scaleFactor + GuiGetStyle(TEXTBOX, TEXT_LINES_SPACING)); // Line feed - cursorPos.x = textAreaBounds.x; // Carriage return - } - } - else if (wrapMode == 2) - { - /* - if ((codepointSize == 1) && (codepoint == ' ')) - { - lastSpacePos = i; - lastSpaceWidth = 0; - lastSpaceCursorPos = cursorPos.x; - } - - // Jump line if last word reaches end of text box area - if ((lastSpaceCursorPos + lastSpaceWidth) > (textAreaBounds.x + textAreaBounds.width)) - { - cursorPos.y += 12; // Line feed - cursorPos.x = textAreaBounds.x; // Carriage return - } - */ - } - - // Draw current character glyph - DrawTextCodepoint(guiFont, codepoint, cursorPos, (float)GuiGetStyle(DEFAULT, TEXT_SIZE), Fade(GetColor(GuiGetStyle(TEXTBOX, TEXT + (state*3))), guiAlpha)); - - int glyphWidth = 0; - if (glyphInfo.advanceX != 0) glyphWidth += glyphInfo.advanceX; - else glyphWidth += (int)(atlasRec.width + glyphInfo.offsetX); - - cursorPos.x += (glyphWidth*scaleFactor + (float)GuiGetStyle(DEFAULT, TEXT_SPACING)); - //if (i > lastSpacePos) lastSpaceWidth += (atlasRec.width + (float)GuiGetStyle(DEFAULT, TEXT_SPACING)); - } - } - - cursor.x = cursorPos.x; - cursor.y = cursorPos.y; - - // Draw cursor position considering text glyphs - if (editMode) GuiDrawRectangle(cursor, 0, BLANK, Fade(GetColor(GuiGetStyle(TEXTBOX, BORDER_COLOR_PRESSED)), guiAlpha)); + GuiDrawText(text, textBounds, (GuiGetStyle(VALUEBOX, TEXT_ALIGNMENT) == TEXT_ALIGN_RIGHT)? TEXT_ALIGN_LEFT : TEXT_ALIGN_RIGHT, GetColor(GuiGetStyle(LABEL, TEXT + (state*3)))); //-------------------------------------------------------------------- - return pressed; + return result; } // Slider control with pro parameters // NOTE: Other GuiSlider*() controls use this one -float GuiSliderPro(Rectangle bounds, const char *textLeft, const char *textRight, float value, float minValue, float maxValue, int sliderWidth) +int GuiSliderPro(Rectangle bounds, const char *textLeft, const char *textRight, float *value, float minValue, float maxValue, int sliderWidth) { + int result = 0; + float oldValue = *value; GuiState state = guiState; - int sliderValue = (int)(((value - minValue)/(maxValue - minValue))*(bounds.width - 2*GuiGetStyle(SLIDER, BORDER_WIDTH))); + float temp = (maxValue - minValue)/2.0f; + if (value == NULL) value = &temp; + + int sliderValue = (int)(((*value - minValue)/(maxValue - minValue))*(bounds.width - 2*GuiGetStyle(SLIDER, BORDER_WIDTH))); Rectangle slider = { bounds.x, bounds.y + GuiGetStyle(SLIDER, BORDER_WIDTH) + GuiGetStyle(SLIDER, SLIDER_PADDING), 0, bounds.height - 2*GuiGetStyle(SLIDER, BORDER_WIDTH) - 2*GuiGetStyle(SLIDER, SLIDER_PADDING) }; @@ -2582,25 +2963,52 @@ float GuiSliderPro(Rectangle bounds, const char *textLeft, const char *textRight { Vector2 mousePoint = GetMousePosition(); - if (CheckCollisionPointRec(mousePoint, bounds)) + if (guiSliderDragging) // Keep dragging outside of bounds + { + if (IsMouseButtonDown(MOUSE_LEFT_BUTTON)) + { + if (CHECK_BOUNDS_ID(bounds, guiSliderActive)) + { + state = STATE_PRESSED; + + // Get equivalent value and slider position from mousePosition.x + *value = ((maxValue - minValue)*(mousePoint.x - (float)(bounds.x + sliderWidth/2)))/(float)(bounds.width - sliderWidth) + minValue; + } + } + else + { + guiSliderDragging = false; + guiSliderActive = RAYGUI_CLITERAL(Rectangle){ 0, 0, 0, 0 }; + } + } + else if (CheckCollisionPointRec(mousePoint, bounds)) { if (IsMouseButtonDown(MOUSE_LEFT_BUTTON)) { state = STATE_PRESSED; + guiSliderDragging = true; + guiSliderActive = bounds; // Store bounds as an identifier when dragging starts - // Get equivalent value and slider position from mousePoint.x - value = ((maxValue - minValue)*(mousePoint.x - (float)(bounds.x + sliderWidth/2)))/(float)(bounds.width - sliderWidth) + minValue; + if (!CheckCollisionPointRec(mousePoint, slider)) + { + // Get equivalent value and slider position from mousePosition.x + *value = ((maxValue - minValue)*(mousePoint.x - (float)(bounds.x + sliderWidth/2)))/(float)(bounds.width - sliderWidth) + minValue; - if (sliderWidth > 0) slider.x = mousePoint.x - slider.width/2; // Slider - else if (sliderWidth == 0) slider.width = (float)sliderValue; // SliderBar + if (sliderWidth > 0) slider.x = mousePoint.x - slider.width/2; // Slider + else if (sliderWidth == 0) slider.width = (float)sliderValue; // SliderBar + } } else state = STATE_FOCUSED; } - if (value > maxValue) value = maxValue; - else if (value < minValue) value = minValue; + if (*value > maxValue) *value = maxValue; + else if (*value < minValue) *value = minValue; } + // Control value change check + if(oldValue == *value) result = 0; + else result = 1; + // Bar limits check if (sliderWidth > 0) // Slider { @@ -2615,11 +3023,12 @@ float GuiSliderPro(Rectangle bounds, const char *textLeft, const char *textRight // Draw control //-------------------------------------------------------------------- - GuiDrawRectangle(bounds, GuiGetStyle(SLIDER, BORDER_WIDTH), Fade(GetColor(GuiGetStyle(SLIDER, BORDER + (state*3))), guiAlpha), Fade(GetColor(GuiGetStyle(SLIDER, (state != STATE_DISABLED)? BASE_COLOR_NORMAL : BASE_COLOR_DISABLED)), guiAlpha)); + GuiDrawRectangle(bounds, GuiGetStyle(SLIDER, BORDER_WIDTH), GetColor(GuiGetStyle(SLIDER, BORDER + (state*3))), GetColor(GuiGetStyle(SLIDER, (state != STATE_DISABLED)? BASE_COLOR_NORMAL : BASE_COLOR_DISABLED))); // Draw slider internal bar (depends on state) - if ((state == STATE_NORMAL) || (state == STATE_PRESSED)) GuiDrawRectangle(slider, 0, BLANK, Fade(GetColor(GuiGetStyle(SLIDER, BASE_COLOR_PRESSED)), guiAlpha)); - else if (state == STATE_FOCUSED) GuiDrawRectangle(slider, 0, BLANK, Fade(GetColor(GuiGetStyle(SLIDER, TEXT_COLOR_FOCUSED)), guiAlpha)); + if (state == STATE_NORMAL) GuiDrawRectangle(slider, 0, BLANK, GetColor(GuiGetStyle(SLIDER, BASE_COLOR_PRESSED))); + else if (state == STATE_FOCUSED) GuiDrawRectangle(slider, 0, BLANK, GetColor(GuiGetStyle(SLIDER, TEXT_COLOR_FOCUSED))); + else if (state == STATE_PRESSED) GuiDrawRectangle(slider, 0, BLANK, GetColor(GuiGetStyle(SLIDER, TEXT_COLOR_PRESSED))); // Draw left/right text if provided if (textLeft != NULL) @@ -2630,7 +3039,7 @@ float GuiSliderPro(Rectangle bounds, const char *textLeft, const char *textRight textBounds.x = bounds.x - textBounds.width - GuiGetStyle(SLIDER, TEXT_PADDING); textBounds.y = bounds.y + bounds.height/2 - GuiGetStyle(DEFAULT, TEXT_SIZE)/2; - GuiDrawText(textLeft, textBounds, TEXT_ALIGN_RIGHT, Fade(GetColor(GuiGetStyle(SLIDER, TEXT + (state*3))), guiAlpha)); + GuiDrawText(textLeft, textBounds, TEXT_ALIGN_RIGHT, GetColor(GuiGetStyle(SLIDER, TEXT + (state*3)))); } if (textRight != NULL) @@ -2641,48 +3050,76 @@ float GuiSliderPro(Rectangle bounds, const char *textLeft, const char *textRight textBounds.x = bounds.x + bounds.width + GuiGetStyle(SLIDER, TEXT_PADDING); textBounds.y = bounds.y + bounds.height/2 - GuiGetStyle(DEFAULT, TEXT_SIZE)/2; - GuiDrawText(textRight, textBounds, TEXT_ALIGN_LEFT, Fade(GetColor(GuiGetStyle(SLIDER, TEXT + (state*3))), guiAlpha)); + GuiDrawText(textRight, textBounds, TEXT_ALIGN_LEFT, GetColor(GuiGetStyle(SLIDER, TEXT + (state*3)))); } //-------------------------------------------------------------------- - return value; + return result; } // Slider control extended, returns selected value and has text -float GuiSlider(Rectangle bounds, const char *textLeft, const char *textRight, float value, float minValue, float maxValue) +int GuiSlider(Rectangle bounds, const char *textLeft, const char *textRight, float *value, float minValue, float maxValue) { return GuiSliderPro(bounds, textLeft, textRight, value, minValue, maxValue, GuiGetStyle(SLIDER, SLIDER_WIDTH)); } // Slider Bar control extended, returns selected value -float GuiSliderBar(Rectangle bounds, const char *textLeft, const char *textRight, float value, float minValue, float maxValue) +int GuiSliderBar(Rectangle bounds, const char *textLeft, const char *textRight, float *value, float minValue, float maxValue) { return GuiSliderPro(bounds, textLeft, textRight, value, minValue, maxValue, 0); } // Progress Bar control extended, shows current progress value -float GuiProgressBar(Rectangle bounds, const char *textLeft, const char *textRight, float value, float minValue, float maxValue) +int GuiProgressBar(Rectangle bounds, const char *textLeft, const char *textRight, float *value, float minValue, float maxValue) { + int result = 0; GuiState state = guiState; + float temp = (maxValue - minValue)/2.0f; + if (value == NULL) value = &temp; + + // Progress bar Rectangle progress = { bounds.x + GuiGetStyle(PROGRESSBAR, BORDER_WIDTH), bounds.y + GuiGetStyle(PROGRESSBAR, BORDER_WIDTH) + GuiGetStyle(PROGRESSBAR, PROGRESS_PADDING), 0, bounds.height - 2*GuiGetStyle(PROGRESSBAR, BORDER_WIDTH) - 2*GuiGetStyle(PROGRESSBAR, PROGRESS_PADDING) }; // Update control //-------------------------------------------------------------------- - if (value > maxValue) value = maxValue; + if (*value > maxValue) *value = maxValue; - if (state != STATE_DISABLED) progress.width = ((float)(value/(maxValue - minValue))*(float)(bounds.width - 2*GuiGetStyle(PROGRESSBAR, BORDER_WIDTH))); + // WARNING: Working with floats could lead to rounding issues + if ((state != STATE_DISABLED)) progress.width = (float)(*value/(maxValue - minValue))*bounds.width - ((*value >= maxValue)? (float)(2*GuiGetStyle(PROGRESSBAR, BORDER_WIDTH)) : 0.0f); //-------------------------------------------------------------------- // Draw control //-------------------------------------------------------------------- - GuiDrawRectangle(bounds, GuiGetStyle(PROGRESSBAR, BORDER_WIDTH), Fade(GetColor(GuiGetStyle(PROGRESSBAR, BORDER + (state*3))), guiAlpha), BLANK); + if (state == STATE_DISABLED) + { + GuiDrawRectangle(bounds, GuiGetStyle(PROGRESSBAR, BORDER_WIDTH), GetColor(GuiGetStyle(PROGRESSBAR, BORDER + (state*3))), BLANK); + } + else + { + if (*value > minValue) + { + // Draw progress bar with colored border, more visual + GuiDrawRectangle(RAYGUI_CLITERAL(Rectangle){ bounds.x, bounds.y, (int)progress.width + (float)GuiGetStyle(PROGRESSBAR, BORDER_WIDTH), (float)GuiGetStyle(PROGRESSBAR, BORDER_WIDTH) }, 0, BLANK, GetColor(GuiGetStyle(PROGRESSBAR, BORDER_COLOR_FOCUSED))); + GuiDrawRectangle(RAYGUI_CLITERAL(Rectangle){ bounds.x, bounds.y + 1, (float)GuiGetStyle(PROGRESSBAR, BORDER_WIDTH), bounds.height - 2 }, 0, BLANK, GetColor(GuiGetStyle(PROGRESSBAR, BORDER_COLOR_FOCUSED))); + GuiDrawRectangle(RAYGUI_CLITERAL(Rectangle){ bounds.x, bounds.y + bounds.height - 1, (int)progress.width + (float)GuiGetStyle(PROGRESSBAR, BORDER_WIDTH), (float)GuiGetStyle(PROGRESSBAR, BORDER_WIDTH) }, 0, BLANK, GetColor(GuiGetStyle(PROGRESSBAR, BORDER_COLOR_FOCUSED))); + } + else GuiDrawRectangle(RAYGUI_CLITERAL(Rectangle){ bounds.x, bounds.y, (float)GuiGetStyle(PROGRESSBAR, BORDER_WIDTH), bounds.height }, 0, BLANK, GetColor(GuiGetStyle(PROGRESSBAR, BORDER_COLOR_NORMAL))); + + if (*value >= maxValue) GuiDrawRectangle(RAYGUI_CLITERAL(Rectangle){ bounds.x + progress.width + 1, bounds.y, (float)GuiGetStyle(PROGRESSBAR, BORDER_WIDTH), bounds.height }, 0, BLANK, GetColor(GuiGetStyle(PROGRESSBAR, BORDER_COLOR_FOCUSED))); + else + { + // Draw borders not yet reached by value + GuiDrawRectangle(RAYGUI_CLITERAL(Rectangle){ bounds.x + (int)progress.width + 1, bounds.y, bounds.width - (int)progress.width - 1, (float)GuiGetStyle(PROGRESSBAR, BORDER_WIDTH) }, 0, BLANK, GetColor(GuiGetStyle(PROGRESSBAR, BORDER_COLOR_NORMAL))); + GuiDrawRectangle(RAYGUI_CLITERAL(Rectangle){ bounds.x + (int)progress.width + 1, bounds.y + bounds.height - 1, bounds.width - (int)progress.width - 1, (float)GuiGetStyle(PROGRESSBAR, BORDER_WIDTH) }, 0, BLANK, GetColor(GuiGetStyle(PROGRESSBAR, BORDER_COLOR_NORMAL))); + GuiDrawRectangle(RAYGUI_CLITERAL(Rectangle){ bounds.x + bounds.width - 1, bounds.y + 1, (float)GuiGetStyle(PROGRESSBAR, BORDER_WIDTH), bounds.height - 2 }, 0, BLANK, GetColor(GuiGetStyle(PROGRESSBAR, BORDER_COLOR_NORMAL))); + } - // Draw slider internal progress bar (depends on state) - if ((state == STATE_NORMAL) || (state == STATE_PRESSED)) GuiDrawRectangle(progress, 0, BLANK, Fade(GetColor(GuiGetStyle(PROGRESSBAR, BASE_COLOR_PRESSED)), guiAlpha)); - else if (state == STATE_FOCUSED) GuiDrawRectangle(progress, 0, BLANK, Fade(GetColor(GuiGetStyle(PROGRESSBAR, TEXT_COLOR_FOCUSED)), guiAlpha)); + // Draw slider internal progress bar (depends on state) + GuiDrawRectangle(progress, 0, BLANK, GetColor(GuiGetStyle(PROGRESSBAR, BASE_COLOR_PRESSED))); + } // Draw left/right text if provided if (textLeft != NULL) @@ -2693,7 +3130,7 @@ float GuiProgressBar(Rectangle bounds, const char *textLeft, const char *textRig textBounds.x = bounds.x - textBounds.width - GuiGetStyle(PROGRESSBAR, TEXT_PADDING); textBounds.y = bounds.y + bounds.height/2 - GuiGetStyle(DEFAULT, TEXT_SIZE)/2; - GuiDrawText(textLeft, textBounds, TEXT_ALIGN_RIGHT, Fade(GetColor(GuiGetStyle(PROGRESSBAR, TEXT + (state*3))), guiAlpha)); + GuiDrawText(textLeft, textBounds, TEXT_ALIGN_RIGHT, GetColor(GuiGetStyle(PROGRESSBAR, TEXT + (state*3)))); } if (textRight != NULL) @@ -2704,34 +3141,37 @@ float GuiProgressBar(Rectangle bounds, const char *textLeft, const char *textRig textBounds.x = bounds.x + bounds.width + GuiGetStyle(PROGRESSBAR, TEXT_PADDING); textBounds.y = bounds.y + bounds.height/2 - GuiGetStyle(DEFAULT, TEXT_SIZE)/2; - GuiDrawText(textRight, textBounds, TEXT_ALIGN_LEFT, Fade(GetColor(GuiGetStyle(PROGRESSBAR, TEXT + (state*3))), guiAlpha)); + GuiDrawText(textRight, textBounds, TEXT_ALIGN_LEFT, GetColor(GuiGetStyle(PROGRESSBAR, TEXT + (state*3)))); } //-------------------------------------------------------------------- - return value; + return result; } // Status Bar control -void GuiStatusBar(Rectangle bounds, const char *text) +int GuiStatusBar(Rectangle bounds, const char *text) { + int result = 0; GuiState state = guiState; // Draw control //-------------------------------------------------------------------- - GuiDrawRectangle(bounds, GuiGetStyle(STATUSBAR, BORDER_WIDTH), Fade(GetColor(GuiGetStyle(STATUSBAR, (state != STATE_DISABLED)? BORDER_COLOR_NORMAL : BORDER_COLOR_DISABLED)), guiAlpha), - Fade(GetColor(GuiGetStyle(STATUSBAR, (state != STATE_DISABLED)? BASE_COLOR_NORMAL : BASE_COLOR_DISABLED)), guiAlpha)); - GuiDrawText(text, GetTextBounds(STATUSBAR, bounds), GuiGetStyle(STATUSBAR, TEXT_ALIGNMENT), Fade(GetColor(GuiGetStyle(STATUSBAR, (state != STATE_DISABLED)? TEXT_COLOR_NORMAL : TEXT_COLOR_DISABLED)), guiAlpha)); + GuiDrawRectangle(bounds, GuiGetStyle(STATUSBAR, BORDER_WIDTH), GetColor(GuiGetStyle(STATUSBAR, BORDER + (state*3))), GetColor(GuiGetStyle(STATUSBAR, BASE + (state*3)))); + GuiDrawText(text, GetTextBounds(STATUSBAR, bounds), GuiGetStyle(STATUSBAR, TEXT_ALIGNMENT), GetColor(GuiGetStyle(STATUSBAR, TEXT + (state*3)))); //-------------------------------------------------------------------- + + return result; } // Dummy rectangle control, intended for placeholding -void GuiDummyRec(Rectangle bounds, const char *text) +int GuiDummyRec(Rectangle bounds, const char *text) { + int result = 0; GuiState state = guiState; // Update control //-------------------------------------------------------------------- - if ((state != STATE_DISABLED) && !guiLocked) + if ((state != STATE_DISABLED) && !guiLocked && !guiSliderDragging) { Vector2 mousePoint = GetMousePosition(); @@ -2746,28 +3186,35 @@ void GuiDummyRec(Rectangle bounds, const char *text) // Draw control //-------------------------------------------------------------------- - GuiDrawRectangle(bounds, 0, BLANK, Fade(GetColor(GuiGetStyle(DEFAULT, (state != STATE_DISABLED)? BASE_COLOR_NORMAL : BASE_COLOR_DISABLED)), guiAlpha)); - GuiDrawText(text, GetTextBounds(DEFAULT, bounds), TEXT_ALIGN_CENTER, Fade(GetColor(GuiGetStyle(BUTTON, (state != STATE_DISABLED)? TEXT_COLOR_NORMAL : TEXT_COLOR_DISABLED)), guiAlpha)); + GuiDrawRectangle(bounds, 0, BLANK, GetColor(GuiGetStyle(DEFAULT, (state != STATE_DISABLED)? BASE_COLOR_NORMAL : BASE_COLOR_DISABLED))); + GuiDrawText(text, GetTextBounds(DEFAULT, bounds), TEXT_ALIGN_CENTER, GetColor(GuiGetStyle(BUTTON, (state != STATE_DISABLED)? TEXT_COLOR_NORMAL : TEXT_COLOR_DISABLED))); //------------------------------------------------------------------ + + return result; } // List View control -int GuiListView(Rectangle bounds, const char *text, int *scrollIndex, int active) +int GuiListView(Rectangle bounds, const char *text, int *scrollIndex, int *active) { + int result = 0; int itemCount = 0; const char **items = NULL; if (text != NULL) items = GuiTextSplit(text, ';', &itemCount, NULL); - return GuiListViewEx(bounds, items, itemCount, NULL, scrollIndex, active); + result = GuiListViewEx(bounds, items, itemCount, scrollIndex, active, NULL); + + return result; } // List View control with extended parameters -int GuiListViewEx(Rectangle bounds, const char **text, int count, int *focus, int *scrollIndex, int active) +int GuiListViewEx(Rectangle bounds, const char **text, int count, int *scrollIndex, int *active, int *focus) { + int result = 0; GuiState state = guiState; + int itemFocused = (focus == NULL)? -1 : *focus; - int itemSelected = active; + int itemSelected = (active == NULL)? -1 : *active; // Check if we need a scroll bar bool useScrollBar = false; @@ -2791,7 +3238,7 @@ int GuiListViewEx(Rectangle bounds, const char **text, int count, int *focus, in // Update control //-------------------------------------------------------------------- - if ((state != STATE_DISABLED) && !guiLocked) + if ((state != STATE_DISABLED) && !guiLocked && !guiSliderDragging) { Vector2 mousePoint = GetMousePosition(); @@ -2839,35 +3286,35 @@ int GuiListViewEx(Rectangle bounds, const char **text, int count, int *focus, in // Draw control //-------------------------------------------------------------------- - GuiDrawRectangle(bounds, GuiGetStyle(DEFAULT, BORDER_WIDTH), Fade(GetColor(GuiGetStyle(LISTVIEW, BORDER + state*3)), guiAlpha), GetColor(GuiGetStyle(DEFAULT, BACKGROUND_COLOR))); // Draw background + GuiDrawRectangle(bounds, GuiGetStyle(DEFAULT, BORDER_WIDTH), GetColor(GuiGetStyle(LISTVIEW, BORDER + state*3)), GetColor(GuiGetStyle(DEFAULT, BACKGROUND_COLOR))); // Draw background // Draw visible items for (int i = 0; ((i < visibleItems) && (text != NULL)); i++) { if (state == STATE_DISABLED) { - if ((startIndex + i) == itemSelected) GuiDrawRectangle(itemBounds, GuiGetStyle(LISTVIEW, BORDER_WIDTH), Fade(GetColor(GuiGetStyle(LISTVIEW, BORDER_COLOR_DISABLED)), guiAlpha), Fade(GetColor(GuiGetStyle(LISTVIEW, BASE_COLOR_DISABLED)), guiAlpha)); + if ((startIndex + i) == itemSelected) GuiDrawRectangle(itemBounds, GuiGetStyle(LISTVIEW, BORDER_WIDTH), GetColor(GuiGetStyle(LISTVIEW, BORDER_COLOR_DISABLED)), GetColor(GuiGetStyle(LISTVIEW, BASE_COLOR_DISABLED))); - GuiDrawText(text[startIndex + i], GetTextBounds(DEFAULT, itemBounds), GuiGetStyle(LISTVIEW, TEXT_ALIGNMENT), Fade(GetColor(GuiGetStyle(LISTVIEW, TEXT_COLOR_DISABLED)), guiAlpha)); + GuiDrawText(text[startIndex + i], GetTextBounds(DEFAULT, itemBounds), GuiGetStyle(LISTVIEW, TEXT_ALIGNMENT), GetColor(GuiGetStyle(LISTVIEW, TEXT_COLOR_DISABLED))); } else { - if ((startIndex + i) == itemSelected) + if (((startIndex + i) == itemSelected) && (active != NULL)) { // Draw item selected - GuiDrawRectangle(itemBounds, GuiGetStyle(LISTVIEW, BORDER_WIDTH), Fade(GetColor(GuiGetStyle(LISTVIEW, BORDER_COLOR_PRESSED)), guiAlpha), Fade(GetColor(GuiGetStyle(LISTVIEW, BASE_COLOR_PRESSED)), guiAlpha)); - GuiDrawText(text[startIndex + i], GetTextBounds(DEFAULT, itemBounds), GuiGetStyle(LISTVIEW, TEXT_ALIGNMENT), Fade(GetColor(GuiGetStyle(LISTVIEW, TEXT_COLOR_PRESSED)), guiAlpha)); + GuiDrawRectangle(itemBounds, GuiGetStyle(LISTVIEW, BORDER_WIDTH), GetColor(GuiGetStyle(LISTVIEW, BORDER_COLOR_PRESSED)), GetColor(GuiGetStyle(LISTVIEW, BASE_COLOR_PRESSED))); + GuiDrawText(text[startIndex + i], GetTextBounds(DEFAULT, itemBounds), GuiGetStyle(LISTVIEW, TEXT_ALIGNMENT), GetColor(GuiGetStyle(LISTVIEW, TEXT_COLOR_PRESSED))); } - else if ((startIndex + i) == itemFocused) + else if (((startIndex + i) == itemFocused)) // && (focus != NULL)) // NOTE: We want items focused, despite not returned! { // Draw item focused - GuiDrawRectangle(itemBounds, GuiGetStyle(LISTVIEW, BORDER_WIDTH), Fade(GetColor(GuiGetStyle(LISTVIEW, BORDER_COLOR_FOCUSED)), guiAlpha), Fade(GetColor(GuiGetStyle(LISTVIEW, BASE_COLOR_FOCUSED)), guiAlpha)); - GuiDrawText(text[startIndex + i], GetTextBounds(DEFAULT, itemBounds), GuiGetStyle(LISTVIEW, TEXT_ALIGNMENT), Fade(GetColor(GuiGetStyle(LISTVIEW, TEXT_COLOR_FOCUSED)), guiAlpha)); + GuiDrawRectangle(itemBounds, GuiGetStyle(LISTVIEW, BORDER_WIDTH), GetColor(GuiGetStyle(LISTVIEW, BORDER_COLOR_FOCUSED)), GetColor(GuiGetStyle(LISTVIEW, BASE_COLOR_FOCUSED))); + GuiDrawText(text[startIndex + i], GetTextBounds(DEFAULT, itemBounds), GuiGetStyle(LISTVIEW, TEXT_ALIGNMENT), GetColor(GuiGetStyle(LISTVIEW, TEXT_COLOR_FOCUSED))); } else { // Draw item normal - GuiDrawText(text[startIndex + i], GetTextBounds(DEFAULT, itemBounds), GuiGetStyle(LISTVIEW, TEXT_ALIGNMENT), Fade(GetColor(GuiGetStyle(LISTVIEW, TEXT_COLOR_NORMAL)), guiAlpha)); + GuiDrawText(text[startIndex + i], GetTextBounds(DEFAULT, itemBounds), GuiGetStyle(LISTVIEW, TEXT_ALIGNMENT), GetColor(GuiGetStyle(LISTVIEW, TEXT_COLOR_NORMAL))); } } @@ -2899,29 +3346,30 @@ int GuiListViewEx(Rectangle bounds, const char **text, int count, int *focus, in } //-------------------------------------------------------------------- + if (active != NULL) *active = itemSelected; if (focus != NULL) *focus = itemFocused; if (scrollIndex != NULL) *scrollIndex = startIndex; - return itemSelected; + return result; } // Color Panel control -Color GuiColorPanel(Rectangle bounds, const char *text, Color color) +int GuiColorPanel(Rectangle bounds, const char *text, Color *color) { - const Color colWhite = { 255, 255, 255, 255 }; - const Color colBlack = { 0, 0, 0, 255 }; - + int result = 0; GuiState state = guiState; Vector2 pickerSelector = { 0 }; - Vector3 vcolor = { (float)color.r/255.0f, (float)color.g/255.0f, (float)color.b/255.0f }; + const Color colWhite = { 255, 255, 255, 255 }; + const Color colBlack = { 0, 0, 0, 255 }; + + Vector3 vcolor = { (float)color->r/255.0f, (float)color->g/255.0f, (float)color->b/255.0f }; Vector3 hsv = ConvertRGBtoHSV(vcolor); pickerSelector.x = bounds.x + (float)hsv.y*bounds.width; // HSV: Saturation pickerSelector.y = bounds.y + (1.0f - (float)hsv.z)*bounds.height; // HSV: Value - float hue = -1.0f; - Vector3 maxHue = { hue >= 0.0f ? hue : hsv.x, 1.0f, 1.0f }; + Vector3 maxHue = { hsv.x, 1.0f, 1.0f }; Vector3 rgbHue = ConvertHSVtoRGB(maxHue); Color maxHueCol = { (unsigned char)(255.0f*rgbHue.x), (unsigned char)(255.0f*rgbHue.y), @@ -2929,7 +3377,7 @@ Color GuiColorPanel(Rectangle bounds, const char *text, Color color) // Update control //-------------------------------------------------------------------- - if ((state != STATE_DISABLED) && !guiLocked) + if ((state != STATE_DISABLED) && !guiLocked && !guiSliderDragging) { Vector2 mousePoint = GetMousePosition(); @@ -2952,10 +3400,10 @@ Color GuiColorPanel(Rectangle bounds, const char *text, Color color) Vector3 rgb = ConvertHSVtoRGB(hsv); // NOTE: Vector3ToColor() only available on raylib 1.8.1 - color = RAYGUI_CLITERAL(Color){ (unsigned char)(255.0f*rgb.x), + *color = RAYGUI_CLITERAL(Color){ (unsigned char)(255.0f*rgb.x), (unsigned char)(255.0f*rgb.y), (unsigned char)(255.0f*rgb.z), - (unsigned char)(255.0f*(float)color.a/255.0f) }; + (unsigned char)(255.0f*(float)color->a/255.0f) }; } else state = STATE_FOCUSED; @@ -2972,29 +3420,30 @@ Color GuiColorPanel(Rectangle bounds, const char *text, Color color) // Draw color picker: selector Rectangle selector = { pickerSelector.x - GuiGetStyle(COLORPICKER, COLOR_SELECTOR_SIZE)/2, pickerSelector.y - GuiGetStyle(COLORPICKER, COLOR_SELECTOR_SIZE)/2, (float)GuiGetStyle(COLORPICKER, COLOR_SELECTOR_SIZE), (float)GuiGetStyle(COLORPICKER, COLOR_SELECTOR_SIZE) }; - GuiDrawRectangle(selector, 0, BLANK, Fade(colWhite, guiAlpha)); + GuiDrawRectangle(selector, 0, BLANK, colWhite); } else { DrawRectangleGradientEx(bounds, Fade(Fade(GetColor(GuiGetStyle(COLORPICKER, BASE_COLOR_DISABLED)), 0.1f), guiAlpha), Fade(Fade(colBlack, 0.6f), guiAlpha), Fade(Fade(colBlack, 0.6f), guiAlpha), Fade(Fade(GetColor(GuiGetStyle(COLORPICKER, BORDER_COLOR_DISABLED)), 0.6f), guiAlpha)); } - GuiDrawRectangle(bounds, GuiGetStyle(COLORPICKER, BORDER_WIDTH), Fade(GetColor(GuiGetStyle(COLORPICKER, BORDER + state*3)), guiAlpha), BLANK); + GuiDrawRectangle(bounds, GuiGetStyle(COLORPICKER, BORDER_WIDTH), GetColor(GuiGetStyle(COLORPICKER, BORDER + state*3)), BLANK); //-------------------------------------------------------------------- - return color; + return result; } // Color Bar Alpha control // NOTE: Returns alpha value normalized [0..1] -float GuiColorBarAlpha(Rectangle bounds, const char *text, float alpha) +int GuiColorBarAlpha(Rectangle bounds, const char *text, float *alpha) { #if !defined(RAYGUI_COLORBARALPHA_CHECKED_SIZE) #define RAYGUI_COLORBARALPHA_CHECKED_SIZE 10 #endif + int result = 0; GuiState state = guiState; - Rectangle selector = { (float)bounds.x + alpha*bounds.width - GuiGetStyle(COLORPICKER, HUEBAR_SELECTOR_HEIGHT)/2, (float)bounds.y - GuiGetStyle(COLORPICKER, HUEBAR_SELECTOR_OVERFLOW), (float)GuiGetStyle(COLORPICKER, HUEBAR_SELECTOR_HEIGHT), (float)bounds.height + GuiGetStyle(COLORPICKER, HUEBAR_SELECTOR_OVERFLOW)*2 }; + Rectangle selector = { (float)bounds.x + (*alpha)*bounds.width - GuiGetStyle(COLORPICKER, HUEBAR_SELECTOR_HEIGHT)/2, (float)bounds.y - GuiGetStyle(COLORPICKER, HUEBAR_SELECTOR_OVERFLOW), (float)GuiGetStyle(COLORPICKER, HUEBAR_SELECTOR_HEIGHT), (float)bounds.height + GuiGetStyle(COLORPICKER, HUEBAR_SELECTOR_OVERFLOW)*2 }; // Update control //-------------------------------------------------------------------- @@ -3002,16 +3451,36 @@ float GuiColorBarAlpha(Rectangle bounds, const char *text, float alpha) { Vector2 mousePoint = GetMousePosition(); - if (CheckCollisionPointRec(mousePoint, bounds) || - CheckCollisionPointRec(mousePoint, selector)) + if (guiSliderDragging) // Keep dragging outside of bounds + { + if (IsMouseButtonDown(MOUSE_LEFT_BUTTON)) + { + if (CHECK_BOUNDS_ID(bounds, guiSliderActive)) + { + state = STATE_PRESSED; + + *alpha = (mousePoint.x - bounds.x)/bounds.width; + if (*alpha <= 0.0f) *alpha = 0.0f; + if (*alpha >= 1.0f) *alpha = 1.0f; + } + } + else + { + guiSliderDragging = false; + guiSliderActive = RAYGUI_CLITERAL(Rectangle){ 0, 0, 0, 0 }; + } + } + else if (CheckCollisionPointRec(mousePoint, bounds) || CheckCollisionPointRec(mousePoint, selector)) { if (IsMouseButtonDown(MOUSE_LEFT_BUTTON)) { state = STATE_PRESSED; + guiSliderDragging = true; + guiSliderActive = bounds; // Store bounds as an identifier when dragging starts - alpha = (mousePoint.x - bounds.x)/bounds.width; - if (alpha <= 0.0f) alpha = 0.0f; - if (alpha >= 1.0f) alpha = 1.0f; + *alpha = (mousePoint.x - bounds.x)/bounds.width; + if (*alpha <= 0.0f) *alpha = 0.0f; + if (*alpha >= 1.0f) *alpha = 1.0f; //selector.x = bounds.x + (int)(((alpha - 0)/(100 - 0))*(bounds.width - 2*GuiGetStyle(SLIDER, BORDER_WIDTH))) - selector.width/2; } else state = STATE_FOCUSED; @@ -3033,7 +3502,7 @@ float GuiColorBarAlpha(Rectangle bounds, const char *text, float alpha) for (int y = 0; y < checksY; y++) { Rectangle check = { bounds.x + x*RAYGUI_COLORBARALPHA_CHECKED_SIZE, bounds.y + y*RAYGUI_COLORBARALPHA_CHECKED_SIZE, RAYGUI_COLORBARALPHA_CHECKED_SIZE, RAYGUI_COLORBARALPHA_CHECKED_SIZE }; - GuiDrawRectangle(check, 0, BLANK, ((x + y)%2)? Fade(Fade(GetColor(GuiGetStyle(COLORPICKER, BORDER_COLOR_DISABLED)), 0.4f), guiAlpha) : Fade(Fade(GetColor(GuiGetStyle(COLORPICKER, BASE_COLOR_DISABLED)), 0.4f), guiAlpha)); + GuiDrawRectangle(check, 0, BLANK, ((x + y)%2)? Fade(GetColor(GuiGetStyle(COLORPICKER, BORDER_COLOR_DISABLED)), 0.4f) : Fade(GetColor(GuiGetStyle(COLORPICKER, BASE_COLOR_DISABLED)), 0.4f)); } } @@ -3041,13 +3510,13 @@ float GuiColorBarAlpha(Rectangle bounds, const char *text, float alpha) } else DrawRectangleGradientEx(bounds, Fade(GetColor(GuiGetStyle(COLORPICKER, BASE_COLOR_DISABLED)), 0.1f), Fade(GetColor(GuiGetStyle(COLORPICKER, BASE_COLOR_DISABLED)), 0.1f), Fade(GetColor(GuiGetStyle(COLORPICKER, BORDER_COLOR_DISABLED)), guiAlpha), Fade(GetColor(GuiGetStyle(COLORPICKER, BORDER_COLOR_DISABLED)), guiAlpha)); - GuiDrawRectangle(bounds, GuiGetStyle(COLORPICKER, BORDER_WIDTH), Fade(GetColor(GuiGetStyle(COLORPICKER, BORDER + state*3)), guiAlpha), BLANK); + GuiDrawRectangle(bounds, GuiGetStyle(COLORPICKER, BORDER_WIDTH), GetColor(GuiGetStyle(COLORPICKER, BORDER + state*3)), BLANK); // Draw alpha bar: selector - GuiDrawRectangle(selector, 0, BLANK, Fade(GetColor(GuiGetStyle(COLORPICKER, BORDER + state*3)), guiAlpha)); + GuiDrawRectangle(selector, 0, BLANK, GetColor(GuiGetStyle(COLORPICKER, BORDER + state*3))); //-------------------------------------------------------------------- - return alpha; + return result; } // Color Bar Hue control @@ -3056,10 +3525,11 @@ float GuiColorBarAlpha(Rectangle bounds, const char *text, float alpha) // Color GuiColorBarSat() [WHITE->color] // Color GuiColorBarValue() [BLACK->color], HSV/HSL // float GuiColorBarLuminance() [BLACK->WHITE] -float GuiColorBarHue(Rectangle bounds, const char *text, float hue) +int GuiColorBarHue(Rectangle bounds, const char *text, float *hue) { + int result = 0; GuiState state = guiState; - Rectangle selector = { (float)bounds.x - GuiGetStyle(COLORPICKER, HUEBAR_SELECTOR_OVERFLOW), (float)bounds.y + hue/360.0f*bounds.height - GuiGetStyle(COLORPICKER, HUEBAR_SELECTOR_HEIGHT)/2, (float)bounds.width + GuiGetStyle(COLORPICKER, HUEBAR_SELECTOR_OVERFLOW)*2, (float)GuiGetStyle(COLORPICKER, HUEBAR_SELECTOR_HEIGHT) }; + Rectangle selector = { (float)bounds.x - GuiGetStyle(COLORPICKER, HUEBAR_SELECTOR_OVERFLOW), (float)bounds.y + (*hue)/360.0f*bounds.height - GuiGetStyle(COLORPICKER, HUEBAR_SELECTOR_HEIGHT)/2, (float)bounds.width + GuiGetStyle(COLORPICKER, HUEBAR_SELECTOR_OVERFLOW)*2, (float)GuiGetStyle(COLORPICKER, HUEBAR_SELECTOR_HEIGHT) }; // Update control //-------------------------------------------------------------------- @@ -3067,16 +3537,36 @@ float GuiColorBarHue(Rectangle bounds, const char *text, float hue) { Vector2 mousePoint = GetMousePosition(); - if (CheckCollisionPointRec(mousePoint, bounds) || - CheckCollisionPointRec(mousePoint, selector)) + if (guiSliderDragging) // Keep dragging outside of bounds + { + if (IsMouseButtonDown(MOUSE_LEFT_BUTTON)) + { + if (CHECK_BOUNDS_ID(bounds, guiSliderActive)) + { + state = STATE_PRESSED; + + *hue = (mousePoint.y - bounds.y)*360/bounds.height; + if (*hue <= 0.0f) *hue = 0.0f; + if (*hue >= 359.0f) *hue = 359.0f; + } + } + else + { + guiSliderDragging = false; + guiSliderActive = RAYGUI_CLITERAL(Rectangle){ 0, 0, 0, 0 }; + } + } + else if (CheckCollisionPointRec(mousePoint, bounds) || CheckCollisionPointRec(mousePoint, selector)) { if (IsMouseButtonDown(MOUSE_LEFT_BUTTON)) { state = STATE_PRESSED; + guiSliderDragging = true; + guiSliderActive = bounds; // Store bounds as an identifier when dragging starts - hue = (mousePoint.y - bounds.y)*360/bounds.height; - if (hue <= 0.0f) hue = 0.0f; - if (hue >= 359.0f) hue = 359.0f; + *hue = (mousePoint.y - bounds.y)*360/bounds.height; + if (*hue <= 0.0f) *hue = 0.0f; + if (*hue >= 359.0f) *hue = 359.0f; } else state = STATE_FOCUSED; @@ -3100,7 +3590,8 @@ float GuiColorBarHue(Rectangle bounds, const char *text, float hue) if (state != STATE_DISABLED) { // Draw hue bar:color bars - DrawRectangleGradientV((int)bounds.x, (int)(bounds.y), (int)bounds.width, (int)ceilf(bounds.height/6), Fade(RAYGUI_CLITERAL(Color){ 255, 0, 0, 255 }, guiAlpha), Fade(RAYGUI_CLITERAL(Color){ 255, 255, 0, 255 }, guiAlpha)); + // TODO: Use directly DrawRectangleGradientEx(bounds, color1, color2, color2, color1); + DrawRectangleGradientV((int)bounds.x, (int)(bounds.y), (int)bounds.width, (int)ceilf(bounds.height/6), Fade(RAYGUI_CLITERAL(Color){ 255, 0, 0, 255 }, guiAlpha), Fade(RAYGUI_CLITERAL(Color){ 255, 255, 0, 255 }, guiAlpha)); DrawRectangleGradientV((int)bounds.x, (int)(bounds.y + bounds.height/6), (int)bounds.width, (int)ceilf(bounds.height/6), Fade(RAYGUI_CLITERAL(Color){ 255, 255, 0, 255 }, guiAlpha), Fade(RAYGUI_CLITERAL(Color){ 0, 255, 0, 255 }, guiAlpha)); DrawRectangleGradientV((int)bounds.x, (int)(bounds.y + 2*(bounds.height/6)), (int)bounds.width, (int)ceilf(bounds.height/6), Fade(RAYGUI_CLITERAL(Color){ 0, 255, 0, 255 }, guiAlpha), Fade(RAYGUI_CLITERAL(Color){ 0, 255, 255, 255 }, guiAlpha)); DrawRectangleGradientV((int)bounds.x, (int)(bounds.y + 3*(bounds.height/6)), (int)bounds.width, (int)ceilf(bounds.height/6), Fade(RAYGUI_CLITERAL(Color){ 0, 255, 255, 255 }, guiAlpha), Fade(RAYGUI_CLITERAL(Color){ 0, 0, 255, 255 }, guiAlpha)); @@ -3109,13 +3600,13 @@ float GuiColorBarHue(Rectangle bounds, const char *text, float hue) } else DrawRectangleGradientV((int)bounds.x, (int)bounds.y, (int)bounds.width, (int)bounds.height, Fade(Fade(GetColor(GuiGetStyle(COLORPICKER, BASE_COLOR_DISABLED)), 0.1f), guiAlpha), Fade(GetColor(GuiGetStyle(COLORPICKER, BORDER_COLOR_DISABLED)), guiAlpha)); - GuiDrawRectangle(bounds, GuiGetStyle(COLORPICKER, BORDER_WIDTH), Fade(GetColor(GuiGetStyle(COLORPICKER, BORDER + state*3)), guiAlpha), BLANK); + GuiDrawRectangle(bounds, GuiGetStyle(COLORPICKER, BORDER_WIDTH), GetColor(GuiGetStyle(COLORPICKER, BORDER + state*3)), BLANK); // Draw hue bar: selector - GuiDrawRectangle(selector, 0, BLANK, Fade(GetColor(GuiGetStyle(COLORPICKER, BORDER + state*3)), guiAlpha)); + GuiDrawRectangle(selector, 0, BLANK, GetColor(GuiGetStyle(COLORPICKER, BORDER + state*3))); //-------------------------------------------------------------------- - return hue; + return result; } // Color Picker control @@ -3124,21 +3615,126 @@ float GuiColorBarHue(Rectangle bounds, const char *text, float hue) // float GuiColorBarAlpha(Rectangle bounds, float alpha) // float GuiColorBarHue(Rectangle bounds, float value) // NOTE: bounds define GuiColorPanel() size -Color GuiColorPicker(Rectangle bounds, const char *text, Color color) +int GuiColorPicker(Rectangle bounds, const char *text, Color *color) { - color = GuiColorPanel(bounds, NULL, color); + int result = 0; + + Color temp = { 200, 0, 0, 255 }; + if (color == NULL) color = &temp; + + GuiColorPanel(bounds, NULL, color); Rectangle boundsHue = { (float)bounds.x + bounds.width + GuiGetStyle(COLORPICKER, HUEBAR_PADDING), (float)bounds.y, (float)GuiGetStyle(COLORPICKER, HUEBAR_WIDTH), (float)bounds.height }; //Rectangle boundsAlpha = { bounds.x, bounds.y + bounds.height + GuiGetStyle(COLORPICKER, BARS_PADDING), bounds.width, GuiGetStyle(COLORPICKER, BARS_THICK) }; - Vector3 hsv = ConvertRGBtoHSV(RAYGUI_CLITERAL(Vector3){ color.r/255.0f, color.g/255.0f, color.b/255.0f }); - hsv.x = GuiColorBarHue(boundsHue, NULL, hsv.x); + Vector3 hsv = ConvertRGBtoHSV(RAYGUI_CLITERAL(Vector3){ (*color).r/255.0f, (*color).g/255.0f, (*color).b/255.0f }); + + GuiColorBarHue(boundsHue, NULL, &hsv.x); + //color.a = (unsigned char)(GuiColorBarAlpha(boundsAlpha, (float)color.a/255.0f)*255.0f); Vector3 rgb = ConvertHSVtoRGB(hsv); - color = RAYGUI_CLITERAL(Color){ (unsigned char)roundf(rgb.x*255.0f), (unsigned char)roundf(rgb.y*255.0f), (unsigned char)roundf(rgb.z*255.0f), color.a }; + *color = RAYGUI_CLITERAL(Color){ (unsigned char)roundf(rgb.x*255.0f), (unsigned char)roundf(rgb.y*255.0f), (unsigned char)roundf(rgb.z*255.0f), (*color).a }; - return color; + return result; +} + +// Color Picker control that avoids conversion to RGB and back to HSV on each call, thus avoiding jittering. +// The user can call ConvertHSVtoRGB() to convert *colorHsv value to RGB. +// NOTE: It's divided in multiple controls: +// int GuiColorPanelHSV(Rectangle bounds, const char *text, Vector3 *colorHsv) +// int GuiColorBarAlpha(Rectangle bounds, const char *text, float *alpha) +// float GuiColorBarHue(Rectangle bounds, float value) +// NOTE: bounds define GuiColorPanelHSV() size +int GuiColorPickerHSV(Rectangle bounds, const char *text, Vector3 *colorHsv) +{ + int result = 0; + + Vector3 tempHsv = { 0 }; + + if (colorHsv == NULL) + { + const Vector3 tempColor = { 200.0f/255.0f, 0.0f, 0.0f }; + tempHsv = ConvertRGBtoHSV(tempColor); + colorHsv = &tempHsv; + } + + GuiColorPanelHSV(bounds, NULL, colorHsv); + + const Rectangle boundsHue = { (float)bounds.x + bounds.width + GuiGetStyle(COLORPICKER, HUEBAR_PADDING), (float)bounds.y, (float)GuiGetStyle(COLORPICKER, HUEBAR_WIDTH), (float)bounds.height }; + + GuiColorBarHue(boundsHue, NULL, &colorHsv->x); + + return result; +} + +// Color Panel control, returns HSV color value in *colorHsv. +// Used by GuiColorPickerHSV() +int GuiColorPanelHSV(Rectangle bounds, const char *text, Vector3 *colorHsv) +{ + int result = 0; + GuiState state = guiState; + Vector2 pickerSelector = { 0 }; + + const Color colWhite = { 255, 255, 255, 255 }; + const Color colBlack = { 0, 0, 0, 255 }; + + pickerSelector.x = bounds.x + (float)colorHsv->y*bounds.width; // HSV: Saturation + pickerSelector.y = bounds.y + (1.0f - (float)colorHsv->z)*bounds.height; // HSV: Value + + Vector3 maxHue = { colorHsv->x, 1.0f, 1.0f }; + Vector3 rgbHue = ConvertHSVtoRGB(maxHue); + Color maxHueCol = { (unsigned char)(255.0f*rgbHue.x), + (unsigned char)(255.0f*rgbHue.y), + (unsigned char)(255.0f*rgbHue.z), 255 }; + + // Update control + //-------------------------------------------------------------------- + if ((state != STATE_DISABLED) && !guiLocked && !guiSliderDragging) + { + Vector2 mousePoint = GetMousePosition(); + + if (CheckCollisionPointRec(mousePoint, bounds)) + { + if (IsMouseButtonDown(MOUSE_LEFT_BUTTON)) + { + state = STATE_PRESSED; + pickerSelector = mousePoint; + + // Calculate color from picker + Vector2 colorPick = { pickerSelector.x - bounds.x, pickerSelector.y - bounds.y }; + + colorPick.x /= (float)bounds.width; // Get normalized value on x + colorPick.y /= (float)bounds.height; // Get normalized value on y + + colorHsv->y = colorPick.x; + colorHsv->z = 1.0f - colorPick.y; + } + else state = STATE_FOCUSED; + } + } + //-------------------------------------------------------------------- + + // Draw control + //-------------------------------------------------------------------- + if (state != STATE_DISABLED) + { + DrawRectangleGradientEx(bounds, Fade(colWhite, guiAlpha), Fade(colWhite, guiAlpha), Fade(maxHueCol, guiAlpha), Fade(maxHueCol, guiAlpha)); + DrawRectangleGradientEx(bounds, Fade(colBlack, 0), Fade(colBlack, guiAlpha), Fade(colBlack, guiAlpha), Fade(colBlack, 0)); + + // Draw color picker: selector + Rectangle selector = { pickerSelector.x - GuiGetStyle(COLORPICKER, COLOR_SELECTOR_SIZE)/2, pickerSelector.y - GuiGetStyle(COLORPICKER, COLOR_SELECTOR_SIZE)/2, (float)GuiGetStyle(COLORPICKER, COLOR_SELECTOR_SIZE), (float)GuiGetStyle(COLORPICKER, COLOR_SELECTOR_SIZE) }; + GuiDrawRectangle(selector, 0, BLANK, colWhite); + } + else + { + DrawRectangleGradientEx(bounds, Fade(Fade(GetColor(GuiGetStyle(COLORPICKER, BASE_COLOR_DISABLED)), 0.1f), guiAlpha), Fade(Fade(colBlack, 0.6f), guiAlpha), Fade(Fade(colBlack, 0.6f), guiAlpha), Fade(Fade(GetColor(GuiGetStyle(COLORPICKER, BORDER_COLOR_DISABLED)), 0.6f), guiAlpha)); + } + + GuiDrawRectangle(bounds, GuiGetStyle(COLORPICKER, BORDER_WIDTH), GetColor(GuiGetStyle(COLORPICKER, BORDER + state*3)), BLANK); + //-------------------------------------------------------------------- + + return result; } // Message Box control @@ -3151,7 +3747,7 @@ int GuiMessageBox(Rectangle bounds, const char *title, const char *message, cons #define RAYGUI_MESSAGEBOX_BUTTON_PADDING 12 #endif - int clicked = -1; // Returns clicked button from buttons list, 0 refers to closed window button + int result = -1; // Returns clicked button from buttons list, 0 refers to closed window button int buttonCount = 0; const char **buttonsText = GuiTextSplit(buttons, ';', &buttonCount, NULL); @@ -3161,7 +3757,7 @@ int GuiMessageBox(Rectangle bounds, const char *title, const char *message, cons buttonBounds.width = (bounds.width - RAYGUI_MESSAGEBOX_BUTTON_PADDING*(buttonCount + 1))/buttonCount; buttonBounds.height = RAYGUI_MESSAGEBOX_BUTTON_HEIGHT; - int textWidth = GetTextWidth(message); + int textWidth = GetTextWidth(message) + 2; Rectangle textBounds = { 0 }; textBounds.x = bounds.x + bounds.width/2 - textWidth/2; @@ -3171,7 +3767,7 @@ int GuiMessageBox(Rectangle bounds, const char *title, const char *message, cons // Draw control //-------------------------------------------------------------------- - if (GuiWindowBox(bounds, title)) clicked = 0; + if (GuiWindowBox(bounds, title)) result = 0; int prevTextAlignment = GuiGetStyle(LABEL, TEXT_ALIGNMENT); GuiSetStyle(LABEL, TEXT_ALIGNMENT, TEXT_ALIGN_CENTER); @@ -3183,18 +3779,18 @@ int GuiMessageBox(Rectangle bounds, const char *title, const char *message, cons for (int i = 0; i < buttonCount; i++) { - if (GuiButton(buttonBounds, buttonsText[i])) clicked = i + 1; + if (GuiButton(buttonBounds, buttonsText[i])) result = i + 1; buttonBounds.x += (buttonBounds.width + RAYGUI_MESSAGEBOX_BUTTON_PADDING); } GuiSetStyle(BUTTON, TEXT_ALIGNMENT, prevTextAlignment); //-------------------------------------------------------------------- - return clicked; + return result; } // Text Input Box control, ask for text -int GuiTextInputBox(Rectangle bounds, const char *title, const char *message, const char *buttons, char *text, int textMaxSize, int *secretViewActive) +int GuiTextInputBox(Rectangle bounds, const char *title, const char *message, const char *buttons, char *text, int textMaxSize, bool *secretViewActive) { #if !defined(RAYGUI_TEXTINPUTBOX_BUTTON_HEIGHT) #define RAYGUI_TEXTINPUTBOX_BUTTON_HEIGHT 24 @@ -3210,7 +3806,7 @@ int GuiTextInputBox(Rectangle bounds, const char *title, const char *message, co // WARNING: No more than one GuiTextInputBox() should be open at the same time static bool textEditMode = false; - int btnIndex = -1; + int result = -1; int buttonCount = 0; const char **buttonsText = GuiTextSplit(buttons, ';', &buttonCount, NULL); @@ -3225,7 +3821,7 @@ int GuiTextInputBox(Rectangle bounds, const char *title, const char *message, co Rectangle textBounds = { 0 }; if (message != NULL) { - int textSize = GetTextWidth(message); + int textSize = GetTextWidth(message) + 2; textBounds.x = bounds.x + bounds.width/2 - textSize/2; textBounds.y = bounds.y + RAYGUI_WINDOWBOX_STATUSBAR_HEIGHT + messageInputHeight/4 - (float)GuiGetStyle(DEFAULT, TEXT_SIZE)/2; @@ -3243,7 +3839,7 @@ int GuiTextInputBox(Rectangle bounds, const char *title, const char *message, co // Draw control //-------------------------------------------------------------------- - if (GuiWindowBox(bounds, title)) btnIndex = 0; + if (GuiWindowBox(bounds, title)) result = 0; // Draw message if available if (message != NULL) @@ -3260,7 +3856,7 @@ int GuiTextInputBox(Rectangle bounds, const char *title, const char *message, co if (GuiTextBox(RAYGUI_CLITERAL(Rectangle){ textBoxBounds.x, textBoxBounds.y, textBoxBounds.width - 4 - RAYGUI_TEXTINPUTBOX_HEIGHT, textBoxBounds.height }, ((*secretViewActive == 1) || textEditMode)? text : stars, textMaxSize, textEditMode)) textEditMode = !textEditMode; - *secretViewActive = GuiToggle(RAYGUI_CLITERAL(Rectangle){ textBoxBounds.x + textBoxBounds.width - RAYGUI_TEXTINPUTBOX_HEIGHT, textBoxBounds.y, RAYGUI_TEXTINPUTBOX_HEIGHT, RAYGUI_TEXTINPUTBOX_HEIGHT }, (*secretViewActive == 1)? "#44#" : "#45#", *secretViewActive); + GuiToggle(RAYGUI_CLITERAL(Rectangle){ textBoxBounds.x + textBoxBounds.width - RAYGUI_TEXTINPUTBOX_HEIGHT, textBoxBounds.y, RAYGUI_TEXTINPUTBOX_HEIGHT, RAYGUI_TEXTINPUTBOX_HEIGHT }, (*secretViewActive == 1)? "#44#" : "#45#", secretViewActive); } else { @@ -3272,77 +3868,77 @@ int GuiTextInputBox(Rectangle bounds, const char *title, const char *message, co for (int i = 0; i < buttonCount; i++) { - if (GuiButton(buttonBounds, buttonsText[i])) btnIndex = i + 1; + if (GuiButton(buttonBounds, buttonsText[i])) result = i + 1; buttonBounds.x += (buttonBounds.width + RAYGUI_MESSAGEBOX_BUTTON_PADDING); } + if (result >= 0) textEditMode = false; + GuiSetStyle(BUTTON, TEXT_ALIGNMENT, prevBtnTextAlignment); //-------------------------------------------------------------------- - return btnIndex; + return result; // Result is the pressed button index } // Grid control // NOTE: Returns grid mouse-hover selected cell // About drawing lines at subpixel spacing, simple put, not easy solution: // https://stackoverflow.com/questions/4435450/2d-opengl-drawing-lines-that-dont-exactly-fit-pixel-raster -Vector2 GuiGrid(Rectangle bounds, const char *text, float spacing, int subdivs) +int GuiGrid(Rectangle bounds, const char *text, float spacing, int subdivs, Vector2 *mouseCell) { // Grid lines alpha amount #if !defined(RAYGUI_GRID_ALPHA) #define RAYGUI_GRID_ALPHA 0.15f #endif + int result = 0; GuiState state = guiState; + Vector2 mousePoint = GetMousePosition(); - Vector2 currentCell = { -1, -1 }; + Vector2 currentMouseCell = { -1, -1 }; - int linesV = ((int)(bounds.width/spacing))*subdivs + 1; - int linesH = ((int)(bounds.height/spacing))*subdivs + 1; + float spaceWidth = spacing/(float)subdivs; + int linesV = (int)(bounds.width/spaceWidth) + 1; + int linesH = (int)(bounds.height/spaceWidth) + 1; + + int color = GuiGetStyle(DEFAULT, LINE_COLOR); // Update control //-------------------------------------------------------------------- - if ((state != STATE_DISABLED) && !guiLocked) + if ((state != STATE_DISABLED) && !guiLocked && !guiSliderDragging) { if (CheckCollisionPointRec(mousePoint, bounds)) { // NOTE: Cell values must be the upper left of the cell the mouse is in - currentCell.x = floorf((mousePoint.x - bounds.x)/spacing); - currentCell.y = floorf((mousePoint.y - bounds.y)/spacing); + currentMouseCell.x = floorf((mousePoint.x - bounds.x)/spacing); + currentMouseCell.y = floorf((mousePoint.y - bounds.y)/spacing); } } //-------------------------------------------------------------------- // Draw control //-------------------------------------------------------------------- + if (state == STATE_DISABLED) color = GuiGetStyle(DEFAULT, BORDER_COLOR_DISABLED); - // TODO: Draw background panel? - - switch (state) + if (subdivs > 0) { - case STATE_NORMAL: + // Draw vertical grid lines + for (int i = 0; i < linesV; i++) { - if (subdivs > 0) - { - // Draw vertical grid lines - for (int i = 0; i < linesV; i++) - { - Rectangle lineV = { bounds.x + spacing*i/subdivs, bounds.y, 1, bounds.height }; - GuiDrawRectangle(lineV, 0, BLANK, ((i%subdivs) == 0) ? Fade(GetColor(GuiGetStyle(DEFAULT, LINE_COLOR)), RAYGUI_GRID_ALPHA*4) : Fade(GetColor(GuiGetStyle(DEFAULT, LINE_COLOR)), RAYGUI_GRID_ALPHA)); - } + Rectangle lineV = { bounds.x + spacing*i/subdivs, bounds.y, 1, bounds.height }; + GuiDrawRectangle(lineV, 0, BLANK, ((i%subdivs) == 0)? GuiFade(GetColor(color), RAYGUI_GRID_ALPHA*4) : GuiFade(GetColor(color), RAYGUI_GRID_ALPHA)); + } - // Draw horizontal grid lines - for (int i = 0; i < linesH; i++) - { - Rectangle lineH = { bounds.x, bounds.y + spacing*i/subdivs, bounds.width, 1 }; - GuiDrawRectangle(lineH, 0, BLANK, ((i%subdivs) == 0) ? Fade(GetColor(GuiGetStyle(DEFAULT, LINE_COLOR)), RAYGUI_GRID_ALPHA*4) : Fade(GetColor(GuiGetStyle(DEFAULT, LINE_COLOR)), RAYGUI_GRID_ALPHA)); - } - } - } break; - default: break; + // Draw horizontal grid lines + for (int i = 0; i < linesH; i++) + { + Rectangle lineH = { bounds.x, bounds.y + spacing*i/subdivs, bounds.width, 1 }; + GuiDrawRectangle(lineH, 0, BLANK, ((i%subdivs) == 0)? GuiFade(GetColor(color), RAYGUI_GRID_ALPHA*4) : GuiFade(GetColor(color), RAYGUI_GRID_ALPHA)); + } } - return currentCell; + if (mouseCell != NULL) *mouseCell = currentMouseCell; + return result; } //---------------------------------------------------------------------------------- @@ -3408,34 +4004,37 @@ void GuiLoadStyle(const char *fileName) sscanf(buffer, "f %d %s %[^\r\n]s", &fontSize, charmapFileName, fontFileName); Font font = { 0 }; + int *codepoints = NULL; + int codepointCount = 0; if (charmapFileName[0] != '0') { - // Load characters from charmap file, - // expected '\n' separated list of integer values - char *charValues = LoadFileText(charmapFileName); - if (charValues != NULL) - { - int glyphCount = 0; - const char **chars = TextSplit(charValues, '\n', &glyphCount); - - int *values = (int *)RAYGUI_MALLOC(glyphCount*sizeof(int)); - for (int i = 0; i < glyphCount; i++) values[i] = TextToInteger(chars[i]); - - if (font.texture.id != GetFontDefault().texture.id) UnloadTexture(font.texture); - font = LoadFontEx(TextFormat("%s/%s", GetDirectoryPath(fileName), fontFileName), fontSize, values, glyphCount); - if (font.texture.id == 0) font = GetFontDefault(); - - RAYGUI_FREE(values); - } + // Load text data from file + // NOTE: Expected an UTF-8 array of codepoints, no separation + char *textData = LoadFileText(TextFormat("%s/%s", GetDirectoryPath(fileName), charmapFileName)); + codepoints = LoadCodepoints(textData, &codepointCount); + UnloadFileText(textData); } - else + + if (fontFileName[0] != '\0') { + // In case a font is already loaded and it is not default internal font, unload it if (font.texture.id != GetFontDefault().texture.id) UnloadTexture(font.texture); - font = LoadFontEx(TextFormat("%s/%s", GetDirectoryPath(fileName), fontFileName), fontSize, NULL, 0); - if (font.texture.id == 0) font = GetFontDefault(); + + if (codepointCount > 0) font = LoadFontEx(TextFormat("%s/%s", GetDirectoryPath(fileName), fontFileName), fontSize, codepoints, codepointCount); + else font = LoadFontEx(TextFormat("%s/%s", GetDirectoryPath(fileName), fontFileName), fontSize, NULL, 0); // Default to 95 standard codepoints } + // If font texture not properly loaded, revert to default font and size/spacing + if (font.texture.id == 0) + { + font = GetFontDefault(); + GuiSetStyle(DEFAULT, TEXT_SIZE, 10); + GuiSetStyle(DEFAULT, TEXT_SPACING, 1); + } + + UnloadCodepoints(codepoints); + if ((font.texture.id > 0) && (font.glyphCount > 0)) GuiSetFont(font); } break; @@ -3454,125 +4053,24 @@ void GuiLoadStyle(const char *fileName) { rgsFile = fopen(fileName, "rb"); - if (rgsFile == NULL) return; - - char signature[5] = { 0 }; - short version = 0; - short reserved = 0; - int propertyCount = 0; - - fread(signature, 1, 4, rgsFile); - fread(&version, sizeof(short), 1, rgsFile); - fread(&reserved, sizeof(short), 1, rgsFile); - fread(&propertyCount, sizeof(int), 1, rgsFile); - - if ((signature[0] == 'r') && - (signature[1] == 'G') && - (signature[2] == 'S') && - (signature[3] == ' ')) + if (rgsFile != NULL) { - short controlId = 0; - short propertyId = 0; - unsigned int propertyValue = 0; + fseek(rgsFile, 0, SEEK_END); + int fileDataSize = ftell(rgsFile); + fseek(rgsFile, 0, SEEK_SET); - for (int i = 0; i < propertyCount; i++) + if (fileDataSize > 0) { - fread(&controlId, sizeof(short), 1, rgsFile); - fread(&propertyId, sizeof(short), 1, rgsFile); - fread(&propertyValue, sizeof(unsigned int), 1, rgsFile); + unsigned char *fileData = (unsigned char *)RAYGUI_MALLOC(fileDataSize*sizeof(unsigned char)); + fread(fileData, sizeof(unsigned char), fileDataSize, rgsFile); - if (controlId == 0) // DEFAULT control - { - // If a DEFAULT property is loaded, it is propagated to all controls - // NOTE: All DEFAULT properties should be defined first in the file - GuiSetStyle(0, (int)propertyId, propertyValue); + GuiLoadStyleFromMemory(fileData, fileDataSize); - if (propertyId < RAYGUI_MAX_PROPS_BASE) for (int i = 1; i < RAYGUI_MAX_CONTROLS; i++) GuiSetStyle(i, (int)propertyId, propertyValue); - } - else GuiSetStyle((int)controlId, (int)propertyId, propertyValue); + RAYGUI_FREE(fileData); } - // Font loading is highly dependant on raylib API to load font data and image -#if !defined(RAYGUI_STANDALONE) - // Load custom font if available - int fontDataSize = 0; - fread(&fontDataSize, sizeof(int), 1, rgsFile); - - if (fontDataSize > 0) - { - Font font = { 0 }; - int fontType = 0; // 0-Normal, 1-SDF - Rectangle whiteRec = { 0 }; - - fread(&font.baseSize, sizeof(int), 1, rgsFile); - fread(&font.glyphCount, sizeof(int), 1, rgsFile); - fread(&fontType, sizeof(int), 1, rgsFile); - - // Load font white rectangle - fread(&whiteRec, sizeof(Rectangle), 1, rgsFile); - - // Load font image parameters - int fontImageUncompSize = 0; - int fontImageCompSize = 0; - fread(&fontImageUncompSize, sizeof(int), 1, rgsFile); - fread(&fontImageCompSize, sizeof(int), 1, rgsFile); - - Image imFont = { 0 }; - imFont.mipmaps = 1; - fread(&imFont.width, sizeof(int), 1, rgsFile); - fread(&imFont.height, sizeof(int), 1, rgsFile); - fread(&imFont.format, sizeof(int), 1, rgsFile); - - if (fontImageCompSize < fontImageUncompSize) - { - // Compressed font atlas image data (DEFLATE), it requires DecompressData() - int dataUncompSize = 0; - unsigned char *compData = (unsigned char *)RAYGUI_MALLOC(fontImageCompSize); - fread(compData, 1, fontImageCompSize, rgsFile); - imFont.data = DecompressData(compData, fontImageCompSize, &dataUncompSize); - - // Security check, dataUncompSize must match the provided fontImageUncompSize - if (dataUncompSize != fontImageUncompSize) RAYGUI_LOG("WARNING: Uncompressed font atlas image data could be corrupted"); - - RAYGUI_FREE(compData); - } - else - { - // Font atlas image data is not compressed - imFont.data = (unsigned char *)RAYGUI_MALLOC(fontImageUncompSize); - fread(imFont.data, 1, fontImageUncompSize, rgsFile); - } - - if (font.texture.id != GetFontDefault().texture.id) UnloadTexture(font.texture); - font.texture = LoadTextureFromImage(imFont); - if (font.texture.id == 0) font = GetFontDefault(); - - RAYGUI_FREE(imFont.data); - - // Load font recs data - font.recs = (Rectangle *)RAYGUI_CALLOC(font.glyphCount, sizeof(Rectangle)); - for (int i = 0; i < font.glyphCount; i++) fread(&font.recs[i], sizeof(Rectangle), 1, rgsFile); - - // Load font chars info data - font.glyphs = (GlyphInfo *)RAYGUI_CALLOC(font.glyphCount, sizeof(GlyphInfo)); - for (int i = 0; i < font.glyphCount; i++) - { - fread(&font.glyphs[i].value, sizeof(int), 1, rgsFile); - fread(&font.glyphs[i].offsetX, sizeof(int), 1, rgsFile); - fread(&font.glyphs[i].offsetY, sizeof(int), 1, rgsFile); - fread(&font.glyphs[i].advanceX, sizeof(int), 1, rgsFile); - } - - GuiSetFont(font); - - // Set font texture source rectangle to be used as white texture to draw shapes - // NOTE: This way, all gui can be draw using a single draw call - if ((whiteRec.width != 0) && (whiteRec.height != 0)) SetShapesTexture(font.texture, whiteRec); - } -#endif + fclose(rgsFile); } - - fclose(rgsFile); } } @@ -3584,6 +4082,8 @@ void GuiLoadStyleDefault(void) guiStyleLoaded = true; // Initialize default LIGHT style property values + // WARNING: Default value are applied to all controls on set but + // they can be overwritten later on for every custom control GuiSetStyle(DEFAULT, BORDER_COLOR_NORMAL, 0x838383ff); GuiSetStyle(DEFAULT, BASE_COLOR_NORMAL, 0xc9c9c9ff); GuiSetStyle(DEFAULT, TEXT_COLOR_NORMAL, 0x686868ff); @@ -3596,17 +4096,29 @@ void GuiLoadStyleDefault(void) GuiSetStyle(DEFAULT, BORDER_COLOR_DISABLED, 0xb5c1c2ff); GuiSetStyle(DEFAULT, BASE_COLOR_DISABLED, 0xe6e9e9ff); GuiSetStyle(DEFAULT, TEXT_COLOR_DISABLED, 0xaeb7b8ff); - GuiSetStyle(DEFAULT, BORDER_WIDTH, 1); // WARNING: Some controls use other values - GuiSetStyle(DEFAULT, TEXT_PADDING, 0); // WARNING: Some controls use other values - GuiSetStyle(DEFAULT, TEXT_ALIGNMENT, TEXT_ALIGN_CENTER); // WARNING: Some controls use other values + GuiSetStyle(DEFAULT, BORDER_WIDTH, 1); + GuiSetStyle(DEFAULT, TEXT_PADDING, 0); + GuiSetStyle(DEFAULT, TEXT_ALIGNMENT, TEXT_ALIGN_CENTER); + + // Initialize default extended property values + // NOTE: By default, extended property values are initialized to 0 + GuiSetStyle(DEFAULT, TEXT_SIZE, 10); // DEFAULT, shared by all controls + GuiSetStyle(DEFAULT, TEXT_SPACING, 1); // DEFAULT, shared by all controls + GuiSetStyle(DEFAULT, LINE_COLOR, 0x90abb5ff); // DEFAULT specific property + GuiSetStyle(DEFAULT, BACKGROUND_COLOR, 0xf5f5f5ff); // DEFAULT specific property + GuiSetStyle(DEFAULT, TEXT_LINE_SPACING, 15); // DEFAULT, 15 pixels between lines + GuiSetStyle(DEFAULT, TEXT_ALIGNMENT_VERTICAL, TEXT_ALIGN_MIDDLE); // DEFAULT, text aligned vertically to middle of text-bounds // Initialize control-specific property values // NOTE: Those properties are in default list but require specific values by control type GuiSetStyle(LABEL, TEXT_ALIGNMENT, TEXT_ALIGN_LEFT); GuiSetStyle(BUTTON, BORDER_WIDTH, 2); GuiSetStyle(SLIDER, TEXT_PADDING, 4); + GuiSetStyle(PROGRESSBAR, TEXT_PADDING, 4); GuiSetStyle(CHECKBOX, TEXT_PADDING, 4); GuiSetStyle(CHECKBOX, TEXT_ALIGNMENT, TEXT_ALIGN_RIGHT); + GuiSetStyle(DROPDOWNBOX, TEXT_PADDING, 0); + GuiSetStyle(DROPDOWNBOX, TEXT_ALIGNMENT, TEXT_ALIGN_CENTER); GuiSetStyle(TEXTBOX, TEXT_PADDING, 4); GuiSetStyle(TEXTBOX, TEXT_ALIGNMENT, TEXT_ALIGN_LEFT); GuiSetStyle(VALUEBOX, TEXT_PADDING, 0); @@ -3618,10 +4130,6 @@ void GuiLoadStyleDefault(void) // Initialize extended property values // NOTE: By default, extended property values are initialized to 0 - GuiSetStyle(DEFAULT, TEXT_SIZE, 10); // DEFAULT, shared by all controls - GuiSetStyle(DEFAULT, TEXT_SPACING, 1); // DEFAULT, shared by all controls - GuiSetStyle(DEFAULT, LINE_COLOR, 0x90abb5ff); // DEFAULT specific property - GuiSetStyle(DEFAULT, BACKGROUND_COLOR, 0xf5f5f5ff); // DEFAULT specific property GuiSetStyle(TOGGLE, GROUP_PADDING, 2); GuiSetStyle(SLIDER, SLIDER_WIDTH, 16); GuiSetStyle(SLIDER, SLIDER_PADDING, 1); @@ -3631,8 +4139,6 @@ void GuiLoadStyleDefault(void) GuiSetStyle(COMBOBOX, COMBO_BUTTON_SPACING, 2); GuiSetStyle(DROPDOWNBOX, ARROW_PADDING, 16); GuiSetStyle(DROPDOWNBOX, DROPDOWN_ITEMS_SPACING, 2); - GuiSetStyle(TEXTBOX, TEXT_LINES_SPACING, 4); - GuiSetStyle(TEXTBOX, TEXT_INNER_PADDING, 4); GuiSetStyle(SPINNER, SPIN_BUTTON_WIDTH, 24); GuiSetStyle(SPINNER, SPIN_BUTTON_SPACING, 2); GuiSetStyle(SCROLLBAR, BORDER_WIDTH, 0); @@ -3656,13 +4162,19 @@ void GuiLoadStyleDefault(void) { // Unload previous font texture UnloadTexture(guiFont.texture); + RL_FREE(guiFont.recs); + RL_FREE(guiFont.glyphs); + guiFont.recs = NULL; + guiFont.glyphs = NULL; // Setup default raylib font guiFont = GetFontDefault(); - // Setup default raylib font rectangle - Rectangle whiteChar = { 41, 46, 2, 8 }; - SetShapesTexture(guiFont.texture, whiteChar); + // NOTE: Default raylib font character 95 is a white square + Rectangle whiteChar = guiFont.recs[95]; + + // NOTE: We set up a 1px padding on char rectangle to avoid pixel bleeding on MSAA filtering + SetShapesTexture(guiFont.texture, RAYGUI_CLITERAL(Rectangle){ whiteChar.x + 1, whiteChar.y + 1, whiteChar.width - 2, whiteChar.height - 2 }); } } @@ -3675,7 +4187,7 @@ const char *GuiIconText(int iconId, const char *text) return NULL; #else static char buffer[1024] = { 0 }; - static char iconBuffer[6] = { 0 }; + static char iconBuffer[16] = { 0 }; if (text != NULL) { @@ -3692,7 +4204,7 @@ const char *GuiIconText(int iconId, const char *text) } else { - sprintf(iconBuffer, "#%03i#", iconId & 0x1ff); + sprintf(iconBuffer, "#%03i#", iconId); return iconBuffer; } @@ -3789,7 +4301,7 @@ void GuiDrawIcon(int iconId, int posX, int posY, int pixelSize, Color color) if (BIT_CHECK(guiIconsPtr[iconId*RAYGUI_ICON_DATA_ELEMENTS + i], k)) { #if !defined(RAYGUI_STANDALONE) - DrawRectangle(posX + (k%RAYGUI_ICON_SIZE)*pixelSize, posY + y*pixelSize, pixelSize, pixelSize, color); + GuiDrawRectangle(RAYGUI_CLITERAL(Rectangle){ (float)posX + (k%RAYGUI_ICON_SIZE)*pixelSize, (float)posY + y*pixelSize, (float)pixelSize, (float)pixelSize }, 0, BLANK, color); #endif } @@ -3809,6 +4321,229 @@ void GuiSetIconScale(int scale) //---------------------------------------------------------------------------------- // Module specific Functions Definition //---------------------------------------------------------------------------------- + +// Load style from memory +// WARNING: Binary files only +static void GuiLoadStyleFromMemory(const unsigned char *fileData, int dataSize) +{ + unsigned char *fileDataPtr = (unsigned char *)fileData; + + char signature[5] = { 0 }; + short version = 0; + short reserved = 0; + int propertyCount = 0; + + memcpy(signature, fileDataPtr, 4); + memcpy(&version, fileDataPtr + 4, sizeof(short)); + memcpy(&reserved, fileDataPtr + 4 + 2, sizeof(short)); + memcpy(&propertyCount, fileDataPtr + 4 + 2 + 2, sizeof(int)); + fileDataPtr += 12; + + if ((signature[0] == 'r') && + (signature[1] == 'G') && + (signature[2] == 'S') && + (signature[3] == ' ')) + { + short controlId = 0; + short propertyId = 0; + unsigned int propertyValue = 0; + + for (int i = 0; i < propertyCount; i++) + { + memcpy(&controlId, fileDataPtr, sizeof(short)); + memcpy(&propertyId, fileDataPtr + 2, sizeof(short)); + memcpy(&propertyValue, fileDataPtr + 2 + 2, sizeof(unsigned int)); + fileDataPtr += 8; + + if (controlId == 0) // DEFAULT control + { + // If a DEFAULT property is loaded, it is propagated to all controls + // NOTE: All DEFAULT properties should be defined first in the file + GuiSetStyle(0, (int)propertyId, propertyValue); + + if (propertyId < RAYGUI_MAX_PROPS_BASE) for (int i = 1; i < RAYGUI_MAX_CONTROLS; i++) GuiSetStyle(i, (int)propertyId, propertyValue); + } + else GuiSetStyle((int)controlId, (int)propertyId, propertyValue); + } + + // Font loading is highly dependant on raylib API to load font data and image + +#if !defined(RAYGUI_STANDALONE) + // Load custom font if available + int fontDataSize = 0; + memcpy(&fontDataSize, fileDataPtr, sizeof(int)); + fileDataPtr += 4; + + if (fontDataSize > 0) + { + Font font = { 0 }; + int fontType = 0; // 0-Normal, 1-SDF + + memcpy(&font.baseSize, fileDataPtr, sizeof(int)); + memcpy(&font.glyphCount, fileDataPtr + 4, sizeof(int)); + memcpy(&fontType, fileDataPtr + 4 + 4, sizeof(int)); + fileDataPtr += 12; + + // Load font white rectangle + Rectangle fontWhiteRec = { 0 }; + memcpy(&fontWhiteRec, fileDataPtr, sizeof(Rectangle)); + fileDataPtr += 16; + + // Load font image parameters + int fontImageUncompSize = 0; + int fontImageCompSize = 0; + memcpy(&fontImageUncompSize, fileDataPtr, sizeof(int)); + memcpy(&fontImageCompSize, fileDataPtr + 4, sizeof(int)); + fileDataPtr += 8; + + Image imFont = { 0 }; + imFont.mipmaps = 1; + memcpy(&imFont.width, fileDataPtr, sizeof(int)); + memcpy(&imFont.height, fileDataPtr + 4, sizeof(int)); + memcpy(&imFont.format, fileDataPtr + 4 + 4, sizeof(int)); + fileDataPtr += 12; + + if ((fontImageCompSize > 0) && (fontImageCompSize != fontImageUncompSize)) + { + // Compressed font atlas image data (DEFLATE), it requires DecompressData() + int dataUncompSize = 0; + unsigned char *compData = (unsigned char *)RAYGUI_MALLOC(fontImageCompSize); + memcpy(compData, fileDataPtr, fontImageCompSize); + fileDataPtr += fontImageCompSize; + + imFont.data = DecompressData(compData, fontImageCompSize, &dataUncompSize); + + // Security check, dataUncompSize must match the provided fontImageUncompSize + if (dataUncompSize != fontImageUncompSize) RAYGUI_LOG("WARNING: Uncompressed font atlas image data could be corrupted"); + + RAYGUI_FREE(compData); + } + else + { + // Font atlas image data is not compressed + imFont.data = (unsigned char *)RAYGUI_MALLOC(fontImageUncompSize); + memcpy(imFont.data, fileDataPtr, fontImageUncompSize); + fileDataPtr += fontImageUncompSize; + } + + if (font.texture.id != GetFontDefault().texture.id) UnloadTexture(font.texture); + font.texture = LoadTextureFromImage(imFont); + + RAYGUI_FREE(imFont.data); + + // Validate font atlas texture was loaded correctly + if (font.texture.id != 0) + { + // Load font recs data + int recsDataSize = font.glyphCount*sizeof(Rectangle); + int recsDataCompressedSize = 0; + + // WARNING: Version 400 adds the compression size parameter + if (version >= 400) + { + // RGS files version 400 support compressed recs data + memcpy(&recsDataCompressedSize, fileDataPtr, sizeof(int)); + fileDataPtr += sizeof(int); + } + + if ((recsDataCompressedSize > 0) && (recsDataCompressedSize != recsDataSize)) + { + // Recs data is compressed, uncompress it + unsigned char *recsDataCompressed = (unsigned char *)RAYGUI_MALLOC(recsDataCompressedSize); + + memcpy(recsDataCompressed, fileDataPtr, recsDataCompressedSize); + fileDataPtr += recsDataCompressedSize; + + int recsDataUncompSize = 0; + font.recs = (Rectangle *)DecompressData(recsDataCompressed, recsDataCompressedSize, &recsDataUncompSize); + + // Security check, data uncompressed size must match the expected original data size + if (recsDataUncompSize != recsDataSize) RAYGUI_LOG("WARNING: Uncompressed font recs data could be corrupted"); + + RAYGUI_FREE(recsDataCompressed); + } + else + { + // Recs data is uncompressed + font.recs = (Rectangle *)RAYGUI_CALLOC(font.glyphCount, sizeof(Rectangle)); + for (int i = 0; i < font.glyphCount; i++) + { + memcpy(&font.recs[i], fileDataPtr, sizeof(Rectangle)); + fileDataPtr += sizeof(Rectangle); + } + } + + // Load font glyphs info data + int glyphsDataSize = font.glyphCount*16; // 16 bytes data per glyph + int glyphsDataCompressedSize = 0; + + // WARNING: Version 400 adds the compression size parameter + if (version >= 400) + { + // RGS files version 400 support compressed glyphs data + memcpy(&glyphsDataCompressedSize, fileDataPtr, sizeof(int)); + fileDataPtr += sizeof(int); + } + + // Allocate required glyphs space to fill with data + font.glyphs = (GlyphInfo *)RAYGUI_CALLOC(font.glyphCount, sizeof(GlyphInfo)); + + if ((glyphsDataCompressedSize > 0) && (glyphsDataCompressedSize != glyphsDataSize)) + { + // Glyphs data is compressed, uncompress it + unsigned char *glypsDataCompressed = (unsigned char *)RAYGUI_MALLOC(glyphsDataCompressedSize); + + memcpy(glypsDataCompressed, fileDataPtr, glyphsDataCompressedSize); + fileDataPtr += glyphsDataCompressedSize; + + int glyphsDataUncompSize = 0; + unsigned char *glyphsDataUncomp = DecompressData(glypsDataCompressed, glyphsDataCompressedSize, &glyphsDataUncompSize); + + // Security check, data uncompressed size must match the expected original data size + if (glyphsDataUncompSize != glyphsDataSize) RAYGUI_LOG("WARNING: Uncompressed font glyphs data could be corrupted"); + + unsigned char *glyphsDataUncompPtr = glyphsDataUncomp; + + for (int i = 0; i < font.glyphCount; i++) + { + memcpy(&font.glyphs[i].value, glyphsDataUncompPtr, sizeof(int)); + memcpy(&font.glyphs[i].offsetX, glyphsDataUncompPtr + 4, sizeof(int)); + memcpy(&font.glyphs[i].offsetY, glyphsDataUncompPtr + 8, sizeof(int)); + memcpy(&font.glyphs[i].advanceX, glyphsDataUncompPtr + 12, sizeof(int)); + glyphsDataUncompPtr += 16; + } + + RAYGUI_FREE(glypsDataCompressed); + RAYGUI_FREE(glyphsDataUncomp); + } + else + { + // Glyphs data is uncompressed + for (int i = 0; i < font.glyphCount; i++) + { + memcpy(&font.glyphs[i].value, fileDataPtr, sizeof(int)); + memcpy(&font.glyphs[i].offsetX, fileDataPtr + 4, sizeof(int)); + memcpy(&font.glyphs[i].offsetY, fileDataPtr + 8, sizeof(int)); + memcpy(&font.glyphs[i].advanceX, fileDataPtr + 12, sizeof(int)); + fileDataPtr += 16; + } + } + } + else font = GetFontDefault(); // Fallback in case of errors loading font atlas texture + + GuiSetFont(font); + + // Set font texture source rectangle to be used as white texture to draw shapes + // NOTE: It makes possible to draw shapes and text (full UI) in a single draw call + if ((fontWhiteRec.x > 0) && + (fontWhiteRec.y > 0) && + (fontWhiteRec.width > 0) && + (fontWhiteRec.height > 0)) SetShapesTexture(font.texture, fontWhiteRec); + } +#endif + } +} + // Gui get text width considering icon static int GetTextWidth(const char *text) { @@ -3823,7 +4558,7 @@ static int GetTextWidth(const char *text) { if (text[0] == '#') { - for (int i = 1; (text[i] != '\0') && (i < 5); i++) + for (int i = 1; (i < 5) && (text[i] != '\0'); i++) { if (text[i] == '#') { @@ -3858,10 +4593,10 @@ static int GetTextWidth(const char *text) int codepoint = GetCodepointNext(&text[i], &codepointSize); int codepointIndex = GetGlyphIndex(guiFont, codepoint); - if (guiFont.glyphs[codepointIndex].advanceX == 0) glyphWidth = ((float)guiFont.recs[codepointIndex].width*scaleFactor + (float)GuiGetStyle(DEFAULT, TEXT_SPACING)); - else glyphWidth = ((float)guiFont.glyphs[codepointIndex].advanceX*scaleFactor + GuiGetStyle(DEFAULT, TEXT_SPACING)); + if (guiFont.glyphs[codepointIndex].advanceX == 0) glyphWidth = ((float)guiFont.recs[codepointIndex].width*scaleFactor); + else glyphWidth = ((float)guiFont.glyphs[codepointIndex].advanceX*scaleFactor); - textSize.x += glyphWidth; + textSize.x += (glyphWidth + (float)GuiGetStyle(DEFAULT, TEXT_SPACING)); } } @@ -3877,27 +4612,31 @@ static Rectangle GetTextBounds(int control, Rectangle bounds) Rectangle textBounds = bounds; textBounds.x = bounds.x + GuiGetStyle(control, BORDER_WIDTH); - textBounds.y = bounds.y + GuiGetStyle(control, BORDER_WIDTH); + textBounds.y = bounds.y + GuiGetStyle(control, BORDER_WIDTH) + GuiGetStyle(control, TEXT_PADDING); textBounds.width = bounds.width - 2*GuiGetStyle(control, BORDER_WIDTH) - 2*GuiGetStyle(control, TEXT_PADDING); - textBounds.height = bounds.height - 2*GuiGetStyle(control, BORDER_WIDTH); + textBounds.height = bounds.height - 2*GuiGetStyle(control, BORDER_WIDTH) - 2*GuiGetStyle(control, TEXT_PADDING); // NOTE: Text is processed line per line! - // Consider TEXT_PADDING properly, depends on control type and TEXT_ALIGNMENT + // Depending on control, TEXT_PADDING and TEXT_ALIGNMENT properties could affect the text-bounds switch (control) { - case COMBOBOX: textBounds.width -= (GuiGetStyle(control, COMBO_BUTTON_WIDTH) + GuiGetStyle(control, COMBO_BUTTON_SPACING)); break; - //case VALUEBOX: break; // NOTE: ValueBox text value always centered, text padding applies to label + case COMBOBOX: + case DROPDOWNBOX: + case LISTVIEW: + // TODO: Special cases (no label): COMBOBOX, DROPDOWNBOX, LISTVIEW + case SLIDER: + case CHECKBOX: + case VALUEBOX: + case SPINNER: + // TODO: More special cases (label on side): SLIDER, CHECKBOX, VALUEBOX, SPINNER default: { + // TODO: WARNING: TEXT_ALIGNMENT is already considered in GuiDrawText() if (GuiGetStyle(control, TEXT_ALIGNMENT) == TEXT_ALIGN_RIGHT) textBounds.x -= GuiGetStyle(control, TEXT_PADDING); else textBounds.x += GuiGetStyle(control, TEXT_PADDING); - textBounds.width -= 2 * GuiGetStyle(control, TEXT_PADDING); } break; } - // TODO: Special cases (no label): COMBOBOX, DROPDOWNBOX, LISTVIEW (scrollbar?) - // More special cases (label on side): CHECKBOX, SLIDER, VALUEBOX, SPINNER - return textBounds; } @@ -3945,13 +4684,13 @@ const char **GetTextLines(const char *text, int *count) lines[0] = text; int len = 0; *count = 1; - int lineSize = 0; // Stores current line size, not returned + //int lineSize = 0; // Stores current line size, not returned for (int i = 0, k = 0; (i < textSize) && (*count < RAYGUI_MAX_TEXT_LINES); i++) { if (text[i] == '\n') { - lineSize = len; + //lineSize = len; k++; lines[k] = &text[i + 1]; // WARNING: next value is valid? len = 0; @@ -3965,8 +4704,37 @@ const char **GetTextLines(const char *text, int *count) return lines; } +// Get text width to next space for provided string +static float GetNextSpaceWidth(const char *text, int *nextSpaceIndex) +{ + float width = 0; + int codepointByteCount = 0; + int codepoint = 0; + int index = 0; + float glyphWidth = 0; + float scaleFactor = (float)GuiGetStyle(DEFAULT, TEXT_SIZE)/guiFont.baseSize; + + for (int i = 0; text[i] != '\0'; i++) + { + if (text[i] != ' ') + { + codepoint = GetCodepoint(&text[i], &codepointByteCount); + index = GetGlyphIndex(guiFont, codepoint); + glyphWidth = (guiFont.glyphs[index].advanceX == 0)? guiFont.recs[index].width*scaleFactor : guiFont.glyphs[index].advanceX*scaleFactor; + width += (glyphWidth + (float)GuiGetStyle(DEFAULT, TEXT_SPACING)); + } + else + { + *nextSpaceIndex = i; + break; + } + } + + return width; +} + // Gui draw text using default font -static void GuiDrawText(const char *text, Rectangle bounds, int alignment, Color tint) +static void GuiDrawText(const char *text, Rectangle textBounds, int alignment, Color tint) { #define TEXT_VALIGN_PIXEL_OFFSET(h) ((int)h%2) // Vertical alignment for pixel perfect @@ -3974,118 +4742,191 @@ static void GuiDrawText(const char *text, Rectangle bounds, int alignment, Color #define ICON_TEXT_PADDING 4 #endif - // We process the text lines one by one - if ((text != NULL) && (text[0] != '\0')) + if ((text == NULL) || (text[0] == '\0')) return; // Security check + + // PROCEDURE: + // - Text is processed line per line + // - For every line, horizontal alignment is defined + // - For all text, vertical alignment is defined (multiline text only) + // - For every line, wordwrap mode is checked (useful for GuitextBox(), read-only) + + // Get text lines (using '\n' as delimiter) to be processed individually + // WARNING: We can't use GuiTextSplit() function because it can be already used + // before the GuiDrawText() call and its buffer is static, it would be overriden :( + int lineCount = 0; + const char **lines = GetTextLines(text, &lineCount); + + // Text style variables + //int alignment = GuiGetStyle(DEFAULT, TEXT_ALIGNMENT); + int alignmentVertical = GuiGetStyle(DEFAULT, TEXT_ALIGNMENT_VERTICAL); + int wrapMode = GuiGetStyle(DEFAULT, TEXT_WRAP_MODE); // Wrap-mode only available in read-only mode, no for text editing + + // TODO: WARNING: This totalHeight is not valid for vertical alignment in case of word-wrap + float totalHeight = (float)(lineCount*GuiGetStyle(DEFAULT, TEXT_SIZE) + (lineCount - 1)*GuiGetStyle(DEFAULT, TEXT_SIZE)/2); + float posOffsetY = 0.0f; + + for (int i = 0; i < lineCount; i++) { - // Get text lines ('\n' delimiter) to process lines individually - // NOTE: We can't use GuiTextSplit() because it can be already use before calling - // GuiDrawText() and static buffer would be overriden :( - int lineCount = 0; - const char **lines = GetTextLines(text, &lineCount); + int iconId = 0; + lines[i] = GetTextIcon(lines[i], &iconId); // Check text for icon and move cursor - //Rectangle textBounds = GetTextBounds(LABEL, bounds); - float totalHeight = (float)(lineCount*GuiGetStyle(DEFAULT, TEXT_SIZE) + (lineCount - 1)*GuiGetStyle(DEFAULT, TEXT_SIZE)/2); - float posOffsetY = 0; + // Get text position depending on alignment and iconId + //--------------------------------------------------------------------------------- + Vector2 textBoundsPosition = { textBounds.x, textBounds.y }; - for (int i = 0; i < lineCount; i++) + // NOTE: We get text size after icon has been processed + // WARNING: GetTextWidth() also processes text icon to get width! -> Really needed? + int textSizeX = GetTextWidth(lines[i]); + + // If text requires an icon, add size to measure + if (iconId >= 0) { - int iconId = 0; - lines[i] = GetTextIcon(lines[i], &iconId); // Check text for icon and move cursor + textSizeX += RAYGUI_ICON_SIZE*guiIconScale; - // Get text position depending on alignment and iconId - //--------------------------------------------------------------------------------- - Vector2 position = { bounds.x, bounds.y }; + // WARNING: If only icon provided, text could be pointing to EOF character: '\0' +#if !defined(RAYGUI_NO_ICONS) + if ((lines[i] != NULL) && (lines[i][0] != '\0')) textSizeX += ICON_TEXT_PADDING; +#endif + } - // TODO: We get text size after icon has been processed - // WARNING: GetTextWidth() also processes text icon to get width! -> Really needed? - int textSizeX = GetTextWidth(lines[i]); + // Check guiTextAlign global variables + switch (alignment) + { + case TEXT_ALIGN_LEFT: textBoundsPosition.x = textBounds.x; break; + case TEXT_ALIGN_CENTER: textBoundsPosition.x = textBounds.x + textBounds.width/2 - textSizeX/2; break; + case TEXT_ALIGN_RIGHT: textBoundsPosition.x = textBounds.x + textBounds.width - textSizeX; break; + default: break; + } - // If text requires an icon, add size to measure - if (iconId >= 0) - { - textSizeX += RAYGUI_ICON_SIZE*guiIconScale; + switch (alignmentVertical) + { + // Only valid in case of wordWrap = 0; + case TEXT_ALIGN_TOP: textBoundsPosition.y = textBounds.y + posOffsetY; break; + case TEXT_ALIGN_MIDDLE: textBoundsPosition.y = textBounds.y + posOffsetY + textBounds.height/2 - totalHeight/2 + TEXT_VALIGN_PIXEL_OFFSET(textBounds.height); break; + case TEXT_ALIGN_BOTTOM: textBoundsPosition.y = textBounds.y + posOffsetY + textBounds.height - totalHeight + TEXT_VALIGN_PIXEL_OFFSET(textBounds.height); break; + default: break; + } - // WARNING: If only icon provided, text could be pointing to EOF character: '\0' - if ((lines[i] != NULL) && (lines[i][0] != '\0')) textSizeX += ICON_TEXT_PADDING; - } + // NOTE: Make sure we get pixel-perfect coordinates, + // In case of decimals we got weird text positioning + textBoundsPosition.x = (float)((int)textBoundsPosition.x); + textBoundsPosition.y = (float)((int)textBoundsPosition.y); + //--------------------------------------------------------------------------------- - // Check guiTextAlign global variables - switch (alignment) - { - case TEXT_ALIGN_LEFT: - { - position.x = bounds.x; - position.y = bounds.y + posOffsetY + bounds.height/2 - totalHeight/2 + TEXT_VALIGN_PIXEL_OFFSET(bounds.height); - } break; - case TEXT_ALIGN_CENTER: - { - position.x = bounds.x + bounds.width/2 - textSizeX/2; - position.y = bounds.y + posOffsetY + bounds.height/2 - totalHeight/2 + TEXT_VALIGN_PIXEL_OFFSET(bounds.height); - } break; - case TEXT_ALIGN_RIGHT: - { - position.x = bounds.x + bounds.width - textSizeX; - position.y = bounds.y + posOffsetY + bounds.height/2 - totalHeight/2 + TEXT_VALIGN_PIXEL_OFFSET(bounds.height); - } break; - default: break; - } + // Draw text (with icon if available) + //--------------------------------------------------------------------------------- +#if !defined(RAYGUI_NO_ICONS) + if (iconId >= 0) + { + // NOTE: We consider icon height, probably different than text size + GuiDrawIcon(iconId, (int)textBoundsPosition.x, (int)(textBounds.y + textBounds.height/2 - RAYGUI_ICON_SIZE*guiIconScale/2 + TEXT_VALIGN_PIXEL_OFFSET(textBounds.height)), guiIconScale, tint); + textBoundsPosition.x += (RAYGUI_ICON_SIZE*guiIconScale + ICON_TEXT_PADDING); + } +#endif + // Get size in bytes of text, + // considering end of line and line break + int lineSize = 0; + for (int c = 0; (lines[i][c] != '\0') && (lines[i][c] != '\n') && (lines[i][c] != '\r'); c++, lineSize++){ } + float scaleFactor = (float)GuiGetStyle(DEFAULT, TEXT_SIZE)/guiFont.baseSize; + + int lastSpaceIndex = 0; + bool tempWrapCharMode = false; + + int textOffsetY = 0; + float textOffsetX = 0.0f; + float glyphWidth = 0; + for (int c = 0, codepointSize = 0; c < lineSize; c += codepointSize) + { + int codepoint = GetCodepointNext(&lines[i][c], &codepointSize); + int index = GetGlyphIndex(guiFont, codepoint); - // NOTE: Make sure we get pixel-perfect coordinates, - // In case of decimals we got weird text positioning - position.x = (float)((int)position.x); - position.y = (float)((int)position.y); - //--------------------------------------------------------------------------------- + // NOTE: Normally we exit the decoding sequence as soon as a bad byte is found (and return 0x3f) + // but we need to draw all of the bad bytes using the '?' symbol moving one byte + if (codepoint == 0x3f) codepointSize = 1; // TODO: Review not recognized codepoints size - // Draw text (with icon if available) - //--------------------------------------------------------------------------------- -#if !defined(RAYGUI_NO_ICONS) - if (iconId >= 0) + // Wrap mode text measuring, to validate if + // it can be drawn or a new line is required + if (wrapMode == TEXT_WRAP_CHAR) { - // NOTE: We consider icon height, probably different than text size - GuiDrawIcon(iconId, (int)position.x, (int)(bounds.y + bounds.height/2 - RAYGUI_ICON_SIZE*guiIconScale/2 + TEXT_VALIGN_PIXEL_OFFSET(bounds.height)), guiIconScale, tint); - position.x += (RAYGUI_ICON_SIZE*guiIconScale + ICON_TEXT_PADDING); - } -#endif - //DrawTextEx(guiFont, text, position, (float)GuiGetStyle(DEFAULT, TEXT_SIZE), (float)GuiGetStyle(DEFAULT, TEXT_SPACING), tint); + // Get glyph width to check if it goes out of bounds + if (guiFont.glyphs[index].advanceX == 0) glyphWidth = ((float)guiFont.recs[index].width*scaleFactor); + else glyphWidth = (float)guiFont.glyphs[index].advanceX*scaleFactor; - // Get size in bytes of text, - // considering end of line and line break - int size = 0; - for (int c = 0; (lines[i][c] != '\0') && (lines[i][c] != '\n'); c++, size++){ } - float scaleFactor = (float)GuiGetStyle(DEFAULT, TEXT_SIZE)/guiFont.baseSize; + // Jump to next line if current character reach end of the box limits + if ((textOffsetX + glyphWidth) > textBounds.width) + { + textOffsetX = 0.0f; + textOffsetY += GuiGetStyle(DEFAULT, TEXT_LINE_SPACING); - int textOffsetY = 0; - float textOffsetX = 0.0f; - for (int c = 0, codepointSize = 0; c < size; c += codepointSize) + if (tempWrapCharMode) // Wrap at char level when too long words + { + wrapMode = TEXT_WRAP_WORD; + tempWrapCharMode = false; + } + } + } + else if (wrapMode == TEXT_WRAP_WORD) { - int codepoint = GetCodepointNext(&lines[i][c], &codepointSize); - int index = GetGlyphIndex(guiFont, codepoint); + if (codepoint == 32) lastSpaceIndex = c; - // NOTE: Normally we exit the decoding sequence as soon as a bad byte is found (and return 0x3f) - // but we need to draw all of the bad bytes using the '?' symbol moving one byte - if (codepoint == 0x3f) codepointSize = 1; + // Get width to next space in line + int nextSpaceIndex = 0; + float nextSpaceWidth = GetNextSpaceWidth(lines[i] + c, &nextSpaceIndex); - if (codepoint == '\n') break; // WARNING: Lines are already processed manually, no need to keep drawing after this codepoint - else + int nextSpaceIndex2 = 0; + float nextWordSize = GetNextSpaceWidth(lines[i] + lastSpaceIndex + 1, &nextSpaceIndex2); + + if (nextWordSize > textBounds.width) + { + // Considering the case the next word is longer than bounds + tempWrapCharMode = true; + wrapMode = TEXT_WRAP_CHAR; + } + else if ((textOffsetX + nextSpaceWidth) > textBounds.width) + { + textOffsetX = 0.0f; + textOffsetY += GuiGetStyle(DEFAULT, TEXT_LINE_SPACING); + } + } + + if (codepoint == '\n') break; // WARNING: Lines are already processed manually, no need to keep drawing after this codepoint + else + { + // TODO: There are multiple types of spaces in Unicode, + // maybe it's a good idea to add support for more: http://jkorpela.fi/chars/spaces.html + if ((codepoint != ' ') && (codepoint != '\t')) // Do not draw codepoints with no glyph { - if ((codepoint != ' ') && (codepoint != '\t')) + if (wrapMode == TEXT_WRAP_NONE) { - // TODO: Draw only required text glyphs fitting the bounds.width, '...' can be appended at the end of the text - if (textOffsetX < bounds.width) + // Draw only required text glyphs fitting the textBounds.width + if (textOffsetX <= (textBounds.width - glyphWidth)) { - DrawTextCodepoint(guiFont, codepoint, RAYGUI_CLITERAL(Vector2){ position.x + textOffsetX, position.y + textOffsetY }, (float)GuiGetStyle(DEFAULT, TEXT_SIZE), tint); + DrawTextCodepoint(guiFont, codepoint, RAYGUI_CLITERAL(Vector2){ textBoundsPosition.x + textOffsetX, textBoundsPosition.y + textOffsetY }, (float)GuiGetStyle(DEFAULT, TEXT_SIZE), GuiFade(tint, guiAlpha)); + } + } + else if ((wrapMode == TEXT_WRAP_CHAR) || (wrapMode == TEXT_WRAP_WORD)) + { + // Draw only glyphs inside the bounds + if ((textBoundsPosition.y + textOffsetY) <= (textBounds.y + textBounds.height - GuiGetStyle(DEFAULT, TEXT_SIZE))) + { + DrawTextCodepoint(guiFont, codepoint, RAYGUI_CLITERAL(Vector2){ textBoundsPosition.x + textOffsetX, textBoundsPosition.y + textOffsetY }, (float)GuiGetStyle(DEFAULT, TEXT_SIZE), GuiFade(tint, guiAlpha)); } } - - if (guiFont.glyphs[index].advanceX == 0) textOffsetX += ((float)guiFont.recs[index].width*scaleFactor + (float)GuiGetStyle(DEFAULT, TEXT_SPACING)); - else textOffsetX += ((float)guiFont.glyphs[index].advanceX*scaleFactor + (float)GuiGetStyle(DEFAULT, TEXT_SPACING)); } - } - posOffsetY += (float)GuiGetStyle(DEFAULT, TEXT_SIZE)*1.5f; // TODO: GuiGetStyle(DEFAULT, TEXT_LINE_SPACING)? - //--------------------------------------------------------------------------------- + if (guiFont.glyphs[index].advanceX == 0) textOffsetX += ((float)guiFont.recs[index].width*scaleFactor + (float)GuiGetStyle(DEFAULT, TEXT_SPACING)); + else textOffsetX += ((float)guiFont.glyphs[index].advanceX*scaleFactor + (float)GuiGetStyle(DEFAULT, TEXT_SPACING)); + } } + + if (wrapMode == TEXT_WRAP_NONE) posOffsetY += (float)GuiGetStyle(DEFAULT, TEXT_LINE_SPACING); + else if ((wrapMode == TEXT_WRAP_CHAR) || (wrapMode == TEXT_WRAP_WORD)) posOffsetY += (textOffsetY + (float)GuiGetStyle(DEFAULT, TEXT_LINE_SPACING)); + //--------------------------------------------------------------------------------- } + +#if defined(RAYGUI_DEBUG_TEXT_BOUNDS) + GuiDrawRectangle(textBounds, 0, WHITE, Fade(BLUE, 0.4f)); +#endif } // Gui draw rectangle using default raygui plain style with borders @@ -4094,25 +4935,29 @@ static void GuiDrawRectangle(Rectangle rec, int borderWidth, Color borderColor, if (color.a > 0) { // Draw rectangle filled with color - DrawRectangle((int)rec.x, (int)rec.y, (int)rec.width, (int)rec.height, color); + DrawRectangle((int)rec.x, (int)rec.y, (int)rec.width, (int)rec.height, GuiFade(color, guiAlpha)); } if (borderWidth > 0) { // Draw rectangle border lines with color - DrawRectangle((int)rec.x, (int)rec.y, (int)rec.width, borderWidth, borderColor); - DrawRectangle((int)rec.x, (int)rec.y + borderWidth, borderWidth, (int)rec.height - 2*borderWidth, borderColor); - DrawRectangle((int)rec.x + (int)rec.width - borderWidth, (int)rec.y + borderWidth, borderWidth, (int)rec.height - 2*borderWidth, borderColor); - DrawRectangle((int)rec.x, (int)rec.y + (int)rec.height - borderWidth, (int)rec.width, borderWidth, borderColor); + DrawRectangle((int)rec.x, (int)rec.y, (int)rec.width, borderWidth, GuiFade(borderColor, guiAlpha)); + DrawRectangle((int)rec.x, (int)rec.y + borderWidth, borderWidth, (int)rec.height - 2*borderWidth, GuiFade(borderColor, guiAlpha)); + DrawRectangle((int)rec.x + (int)rec.width - borderWidth, (int)rec.y + borderWidth, borderWidth, (int)rec.height - 2*borderWidth, GuiFade(borderColor, guiAlpha)); + DrawRectangle((int)rec.x, (int)rec.y + (int)rec.height - borderWidth, (int)rec.width, borderWidth, GuiFade(borderColor, guiAlpha)); } + +#if defined(RAYGUI_DEBUG_RECS_BOUNDS) + DrawRectangle((int)rec.x, (int)rec.y, (int)rec.width, (int)rec.height, Fade(RED, 0.4f)); +#endif } // Draw tooltip using control bounds static void GuiTooltip(Rectangle controlRec) { - if (!guiLocked && guiTooltip && (guiTooltipPtr != NULL)) + if (!guiLocked && guiTooltip && (guiTooltipPtr != NULL) && !guiSliderDragging) { - Vector2 textSize = MeasureTextEx(GuiGetFont(), guiTooltipPtr, GuiGetStyle(DEFAULT, TEXT_SIZE), GuiGetStyle(DEFAULT, TEXT_SPACING)); + Vector2 textSize = MeasureTextEx(GuiGetFont(), guiTooltipPtr, (float)GuiGetStyle(DEFAULT, TEXT_SIZE), (float)GuiGetStyle(DEFAULT, TEXT_SPACING)); if ((controlRec.x + textSize.x + 16) > GetScreenWidth()) controlRec.x -= (textSize.x + 16 - controlRec.width); @@ -4139,7 +4984,7 @@ static const char **GuiTextSplit(const char *text, char delimiter, int *count, i // 2. Maximum size of text to split is RAYGUI_TEXTSPLIT_MAX_TEXT_SIZE // NOTE: Those definitions could be externally provided if required - // WARNING: HACK: TODO: Review! + // TODO: HACK: GuiTextSplit() - Review how textRows are returned to user // textRow is an externally provided array of integers that stores row number for every splitted string #if !defined(RAYGUI_TEXTSPLIT_MAX_ITEMS) @@ -4336,7 +5181,7 @@ static int GuiScrollBar(Rectangle bounds, int value, int minValue, int maxValue) if (value > maxValue) value = maxValue; if (value < minValue) value = minValue; - const int range = maxValue - minValue; + const int valueRange = maxValue - minValue; int sliderSize = GuiGetStyle(SCROLLBAR, SCROLL_SLIDER_SIZE); // Calculate rectangles for all of the components @@ -4349,15 +5194,27 @@ static int GuiScrollBar(Rectangle bounds, int value, int minValue, int maxValue) { arrowDownRight = RAYGUI_CLITERAL(Rectangle){ (float)bounds.x + GuiGetStyle(SCROLLBAR, BORDER_WIDTH), (float)bounds.y + bounds.height - spinnerSize - GuiGetStyle(SCROLLBAR, BORDER_WIDTH), (float)spinnerSize, (float)spinnerSize }; scrollbar = RAYGUI_CLITERAL(Rectangle){ bounds.x + GuiGetStyle(SCROLLBAR, BORDER_WIDTH) + GuiGetStyle(SCROLLBAR, SCROLL_PADDING), arrowUpLeft.y + arrowUpLeft.height, bounds.width - 2*(GuiGetStyle(SCROLLBAR, BORDER_WIDTH) + GuiGetStyle(SCROLLBAR, SCROLL_PADDING)), bounds.height - arrowUpLeft.height - arrowDownRight.height - 2*GuiGetStyle(SCROLLBAR, BORDER_WIDTH) }; - sliderSize = (sliderSize >= scrollbar.height)? ((int)scrollbar.height - 2) : sliderSize; // Make sure the slider won't get outside of the scrollbar - slider = RAYGUI_CLITERAL(Rectangle){ (float)bounds.x + GuiGetStyle(SCROLLBAR, BORDER_WIDTH) + GuiGetStyle(SCROLLBAR, SCROLL_SLIDER_PADDING), (float)scrollbar.y + (int)(((float)(value - minValue)/range)*(scrollbar.height - sliderSize)), (float)bounds.width - 2*(GuiGetStyle(SCROLLBAR, BORDER_WIDTH) + GuiGetStyle(SCROLLBAR, SCROLL_SLIDER_PADDING)), (float)sliderSize }; + + // Make sure the slider won't get outside of the scrollbar + sliderSize = (sliderSize >= scrollbar.height)? ((int)scrollbar.height - 2) : sliderSize; + slider = RAYGUI_CLITERAL(Rectangle){ + bounds.x + GuiGetStyle(SCROLLBAR, BORDER_WIDTH) + GuiGetStyle(SCROLLBAR, SCROLL_SLIDER_PADDING), + scrollbar.y + (int)(((float)(value - minValue)/valueRange)*(scrollbar.height - sliderSize)), + bounds.width - 2*(GuiGetStyle(SCROLLBAR, BORDER_WIDTH) + GuiGetStyle(SCROLLBAR, SCROLL_SLIDER_PADDING)), + (float)sliderSize }; } else // horizontal { arrowDownRight = RAYGUI_CLITERAL(Rectangle){ (float)bounds.x + bounds.width - spinnerSize - GuiGetStyle(SCROLLBAR, BORDER_WIDTH), (float)bounds.y + GuiGetStyle(SCROLLBAR, BORDER_WIDTH), (float)spinnerSize, (float)spinnerSize }; scrollbar = RAYGUI_CLITERAL(Rectangle){ arrowUpLeft.x + arrowUpLeft.width, bounds.y + GuiGetStyle(SCROLLBAR, BORDER_WIDTH) + GuiGetStyle(SCROLLBAR, SCROLL_PADDING), bounds.width - arrowUpLeft.width - arrowDownRight.width - 2*GuiGetStyle(SCROLLBAR, BORDER_WIDTH), bounds.height - 2*(GuiGetStyle(SCROLLBAR, BORDER_WIDTH) + GuiGetStyle(SCROLLBAR, SCROLL_PADDING)) }; - sliderSize = (sliderSize >= scrollbar.width)? ((int)scrollbar.width - 2) : sliderSize; // Make sure the slider won't get outside of the scrollbar - slider = RAYGUI_CLITERAL(Rectangle){ (float)scrollbar.x + (int)(((float)(value - minValue)/range)*(scrollbar.width - sliderSize)), (float)bounds.y + GuiGetStyle(SCROLLBAR, BORDER_WIDTH) + GuiGetStyle(SCROLLBAR, SCROLL_SLIDER_PADDING), (float)sliderSize, (float)bounds.height - 2*(GuiGetStyle(SCROLLBAR, BORDER_WIDTH) + GuiGetStyle(SCROLLBAR, SCROLL_SLIDER_PADDING)) }; + + // Make sure the slider won't get outside of the scrollbar + sliderSize = (sliderSize >= scrollbar.width)? ((int)scrollbar.width - 2) : sliderSize; + slider = RAYGUI_CLITERAL(Rectangle){ + scrollbar.x + (int)(((float)(value - minValue)/valueRange)*(scrollbar.width - sliderSize)), + bounds.y + GuiGetStyle(SCROLLBAR, BORDER_WIDTH) + GuiGetStyle(SCROLLBAR, SCROLL_SLIDER_PADDING), + (float)sliderSize, + bounds.height - 2*(GuiGetStyle(SCROLLBAR, BORDER_WIDTH) + GuiGetStyle(SCROLLBAR, SCROLL_SLIDER_PADDING)) }; } // Update control @@ -4366,7 +5223,27 @@ static int GuiScrollBar(Rectangle bounds, int value, int minValue, int maxValue) { Vector2 mousePoint = GetMousePosition(); - if (CheckCollisionPointRec(mousePoint, bounds)) + if (guiSliderDragging) // Keep dragging outside of bounds + { + if (IsMouseButtonDown(MOUSE_LEFT_BUTTON) && + !CheckCollisionPointRec(mousePoint, arrowUpLeft) && + !CheckCollisionPointRec(mousePoint, arrowDownRight)) + { + if (CHECK_BOUNDS_ID(bounds, guiSliderActive)) + { + state = STATE_PRESSED; + + if (isVertical) value = (int)(((float)(mousePoint.y - scrollbar.y - slider.height/2)*valueRange)/(scrollbar.height - slider.height) + minValue); + else value = (int)(((float)(mousePoint.x - scrollbar.x - slider.width/2)*valueRange)/(scrollbar.width - slider.width) + minValue); + } + } + else + { + guiSliderDragging = false; + guiSliderActive = RAYGUI_CLITERAL(Rectangle){ 0, 0, 0, 0 }; + } + } + else if (CheckCollisionPointRec(mousePoint, bounds)) { state = STATE_FOCUSED; @@ -4374,26 +5251,38 @@ static int GuiScrollBar(Rectangle bounds, int value, int minValue, int maxValue) int wheel = (int)GetMouseWheelMove(); if (wheel != 0) value += wheel; + // Handle mouse button down if (IsMouseButtonPressed(MOUSE_LEFT_BUTTON)) { - if (CheckCollisionPointRec(mousePoint, arrowUpLeft)) value -= range/GuiGetStyle(SCROLLBAR, SCROLL_SPEED); - else if (CheckCollisionPointRec(mousePoint, arrowDownRight)) value += range/GuiGetStyle(SCROLLBAR, SCROLL_SPEED); + guiSliderDragging = true; + guiSliderActive = bounds; // Store bounds as an identifier when dragging starts + + // Check arrows click + if (CheckCollisionPointRec(mousePoint, arrowUpLeft)) value -= valueRange/GuiGetStyle(SCROLLBAR, SCROLL_SPEED); + else if (CheckCollisionPointRec(mousePoint, arrowDownRight)) value += valueRange/GuiGetStyle(SCROLLBAR, SCROLL_SPEED); + else if (!CheckCollisionPointRec(mousePoint, slider)) + { + // If click on scrollbar position but not on slider, place slider directly on that position + if (isVertical) value = (int)(((float)(mousePoint.y - scrollbar.y - slider.height/2)*valueRange)/(scrollbar.height - slider.height) + minValue); + else value = (int)(((float)(mousePoint.x - scrollbar.x - slider.width/2)*valueRange)/(scrollbar.width - slider.width) + minValue); + } state = STATE_PRESSED; } - else if (IsMouseButtonDown(MOUSE_LEFT_BUTTON)) + + // Keyboard control on mouse hover scrollbar + /* + if (isVertical) { - if (!isVertical) - { - Rectangle scrollArea = { arrowUpLeft.x + arrowUpLeft.width, arrowUpLeft.y, scrollbar.width, bounds.height - 2*GuiGetStyle(SCROLLBAR, BORDER_WIDTH) }; - if (CheckCollisionPointRec(mousePoint, scrollArea)) value = (int)(((float)(mousePoint.x - scrollArea.x - slider.width/2)*range)/(scrollArea.width - slider.width) + minValue); - } - else - { - Rectangle scrollArea = { arrowUpLeft.x, arrowUpLeft.y+arrowUpLeft.height, bounds.width - 2*GuiGetStyle(SCROLLBAR, BORDER_WIDTH), scrollbar.height }; - if (CheckCollisionPointRec(mousePoint, scrollArea)) value = (int)(((float)(mousePoint.y - scrollArea.y - slider.height/2)*range)/(scrollArea.height - slider.height) + minValue); - } + if (IsKeyDown(KEY_DOWN)) value += 5; + else if (IsKeyDown(KEY_UP)) value -= 5; } + else + { + if (IsKeyDown(KEY_RIGHT)) value += 5; + else if (IsKeyDown(KEY_LEFT)) value -= 5; + } + */ } // Normalize value @@ -4404,10 +5293,10 @@ static int GuiScrollBar(Rectangle bounds, int value, int minValue, int maxValue) // Draw control //-------------------------------------------------------------------- - GuiDrawRectangle(bounds, GuiGetStyle(SCROLLBAR, BORDER_WIDTH), Fade(GetColor(GuiGetStyle(LISTVIEW, BORDER + state*3)), guiAlpha), Fade(GetColor(GuiGetStyle(DEFAULT, BORDER_COLOR_DISABLED)), guiAlpha)); // Draw the background + GuiDrawRectangle(bounds, GuiGetStyle(SCROLLBAR, BORDER_WIDTH), GetColor(GuiGetStyle(LISTVIEW, BORDER + state*3)), GetColor(GuiGetStyle(DEFAULT, BORDER_COLOR_DISABLED))); // Draw the background - GuiDrawRectangle(scrollbar, 0, BLANK, Fade(GetColor(GuiGetStyle(BUTTON, BASE_COLOR_NORMAL)), guiAlpha)); // Draw the scrollbar active area background - GuiDrawRectangle(slider, 0, BLANK, Fade(GetColor(GuiGetStyle(SLIDER, BORDER + state*3)), guiAlpha)); // Draw the slider bar + GuiDrawRectangle(scrollbar, 0, BLANK, GetColor(GuiGetStyle(BUTTON, BASE_COLOR_NORMAL))); // Draw the scrollbar active area background + GuiDrawRectangle(slider, 0, BLANK, GetColor(GuiGetStyle(SLIDER, BORDER + state*3))); // Draw the slider bar // Draw arrows (using icon if available) if (GuiGetStyle(SCROLLBAR, ARROWS_VISIBLE)) @@ -4415,17 +5304,17 @@ static int GuiScrollBar(Rectangle bounds, int value, int minValue, int maxValue) #if defined(RAYGUI_NO_ICONS) GuiDrawText(isVertical? "^" : "<", RAYGUI_CLITERAL(Rectangle){ arrowUpLeft.x, arrowUpLeft.y, isVertical? bounds.width : bounds.height, isVertical? bounds.width : bounds.height }, - TEXT_ALIGN_CENTER, Fade(GetColor(GuiGetStyle(DROPDOWNBOX, TEXT + (state*3))), guiAlpha)); + TEXT_ALIGN_CENTER, GetColor(GuiGetStyle(DROPDOWNBOX, TEXT + (state*3)))); GuiDrawText(isVertical? "v" : ">", RAYGUI_CLITERAL(Rectangle){ arrowDownRight.x, arrowDownRight.y, isVertical? bounds.width : bounds.height, isVertical? bounds.width : bounds.height }, - TEXT_ALIGN_CENTER, Fade(GetColor(GuiGetStyle(DROPDOWNBOX, TEXT + (state*3))), guiAlpha)); + TEXT_ALIGN_CENTER, GetColor(GuiGetStyle(DROPDOWNBOX, TEXT + (state*3)))); #else GuiDrawText(isVertical? "#121#" : "#118#", RAYGUI_CLITERAL(Rectangle){ arrowUpLeft.x, arrowUpLeft.y, isVertical? bounds.width : bounds.height, isVertical? bounds.width : bounds.height }, - TEXT_ALIGN_CENTER, Fade(GetColor(GuiGetStyle(SCROLLBAR, TEXT + state*3)), guiAlpha)); // ICON_ARROW_UP_FILL / ICON_ARROW_LEFT_FILL + TEXT_ALIGN_CENTER, GetColor(GuiGetStyle(SCROLLBAR, TEXT + state*3))); // ICON_ARROW_UP_FILL / ICON_ARROW_LEFT_FILL GuiDrawText(isVertical? "#120#" : "#119#", RAYGUI_CLITERAL(Rectangle){ arrowDownRight.x, arrowDownRight.y, isVertical? bounds.width : bounds.height, isVertical? bounds.width : bounds.height }, - TEXT_ALIGN_CENTER, Fade(GetColor(GuiGetStyle(SCROLLBAR, TEXT + state*3)), guiAlpha)); // ICON_ARROW_DOWN_FILL / ICON_ARROW_RIGHT_FILL + TEXT_ALIGN_CENTER, GetColor(GuiGetStyle(SCROLLBAR, TEXT + state*3))); // ICON_ARROW_DOWN_FILL / ICON_ARROW_RIGHT_FILL #endif } //-------------------------------------------------------------------- @@ -4433,6 +5322,18 @@ static int GuiScrollBar(Rectangle bounds, int value, int minValue, int maxValue) return value; } +// Color fade-in or fade-out, alpha goes from 0.0f to 1.0f +// WARNING: It multiplies current alpha by alpha scale factor +static Color GuiFade(Color color, float alpha) +{ + if (alpha < 0.0f) alpha = 0.0f; + else if (alpha > 1.0f) alpha = 1.0f; + + Color result = { color.r, color.g, color.b, (unsigned char)(color.a*alpha) }; + + return result; +} + #if defined(RAYGUI_STANDALONE) // Returns a Color struct from hexadecimal value static Color GetColor(int hexValue) @@ -4464,17 +5365,6 @@ static bool CheckCollisionPointRec(Vector2 point, Rectangle rec) return collision; } -// Color fade-in or fade-out, alpha goes from 0.0f to 1.0f -static Color Fade(Color color, float alpha) -{ - if (alpha < 0.0f) alpha = 0.0f; - else if (alpha > 1.0f) alpha = 1.0f; - - Color result = { color.r, color.g, color.b, (unsigned char)(255.0f*alpha) }; - - return result; -} - // Formatting of text with variables to 'embed' static const char *TextFormat(const char *text, ...) { @@ -4510,7 +5400,7 @@ const char **TextSplit(const char *text, char delimiter, int *count) // 2. Maximum size of text to split is RAYGUI_TEXTSPLIT_MAX_TEXT_SIZE #if !defined(RAYGUI_TEXTSPLIT_MAX_ITEMS) - #define RAYGUI_TEXTSPLIT_MAX_ITEMS 128 + #define RAYGUI_TEXTSPLIT_MAX_ITEMS 128 #endif #if !defined(RAYGUI_TEXTSPLIT_MAX_TEXT_SIZE) #define RAYGUI_TEXTSPLIT_MAX_TEXT_SIZE 1024 @@ -4612,34 +5502,38 @@ static int GetCodepointNext(const char *text, int *codepointSize) { const char *ptr = text; int codepoint = 0x3f; // Codepoint (defaults to '?') - *codepointSize = 0; + *codepointSize = 1; // Get current codepoint and bytes processed if (0xf0 == (0xf8 & ptr[0])) { // 4 byte UTF-8 codepoint + if(((ptr[1] & 0xC0) ^ 0x80) || ((ptr[2] & 0xC0) ^ 0x80) || ((ptr[3] & 0xC0) ^ 0x80)) { return codepoint; } //10xxxxxx checks codepoint = ((0x07 & ptr[0]) << 18) | ((0x3f & ptr[1]) << 12) | ((0x3f & ptr[2]) << 6) | (0x3f & ptr[3]); *codepointSize = 4; } else if (0xe0 == (0xf0 & ptr[0])) { // 3 byte UTF-8 codepoint */ + if(((ptr[1] & 0xC0) ^ 0x80) || ((ptr[2] & 0xC0) ^ 0x80)) { return codepoint; } //10xxxxxx checks codepoint = ((0x0f & ptr[0]) << 12) | ((0x3f & ptr[1]) << 6) | (0x3f & ptr[2]); *codepointSize = 3; } else if (0xc0 == (0xe0 & ptr[0])) { // 2 byte UTF-8 codepoint + if((ptr[1] & 0xC0) ^ 0x80) { return codepoint; } //10xxxxxx checks codepoint = ((0x1f & ptr[0]) << 6) | (0x3f & ptr[1]); *codepointSize = 2; } - else + else if (0x00 == (0x80 & ptr[0])) { // 1 byte UTF-8 codepoint codepoint = ptr[0]; *codepointSize = 1; } + return codepoint; } #endif // RAYGUI_STANDALONE diff --git a/src/extras/rlgl.h b/src/extras/rlgl.h index 86208de..6cf9c7e 100644 --- a/src/extras/rlgl.h +++ b/src/extras/rlgl.h @@ -2,82 +2,83 @@ * * rlgl v4.5 - A multi-OpenGL abstraction layer with an immediate-mode style API * -* An abstraction layer for multiple OpenGL versions (1.1, 2.1, 3.3 Core, 4.3 Core, ES 2.0) -* that provides a pseudo-OpenGL 1.1 immediate-mode style API (rlVertex, rlTranslate, rlRotate...) +* DESCRIPTION: +* An abstraction layer for multiple OpenGL versions (1.1, 2.1, 3.3 Core, 4.3 Core, ES 2.0) +* that provides a pseudo-OpenGL 1.1 immediate-mode style API (rlVertex, rlTranslate, rlRotate...) * -* When choosing an OpenGL backend different than OpenGL 1.1, some internal buffer are -* initialized on rlglInit() to accumulate vertex data. +* ADDITIONAL NOTES: +* When choosing an OpenGL backend different than OpenGL 1.1, some internal buffer are +* initialized on rlglInit() to accumulate vertex data. * -* When an internal state change is required all the stored vertex data is renderer in batch, -* additionally, rlDrawRenderBatchActive() could be called to force flushing of the batch. +* When an internal state change is required all the stored vertex data is renderer in batch, +* additionally, rlDrawRenderBatchActive() could be called to force flushing of the batch. * -* Some additional resources are also loaded for convenience, here the complete list: -* - Default batch (RLGL.defaultBatch): RenderBatch system to accumulate vertex data -* - Default texture (RLGL.defaultTextureId): 1x1 white pixel R8G8B8A8 -* - Default shader (RLGL.State.defaultShaderId, RLGL.State.defaultShaderLocs) -* -* Internal buffer (and additional resources) must be manually unloaded calling rlglClose(). +* Some resources are also loaded for convenience, here the complete list: +* - Default batch (RLGL.defaultBatch): RenderBatch system to accumulate vertex data +* - Default texture (RLGL.defaultTextureId): 1x1 white pixel R8G8B8A8 +* - Default shader (RLGL.State.defaultShaderId, RLGL.State.defaultShaderLocs) * +* Internal buffer (and resources) must be manually unloaded calling rlglClose(). * * CONFIGURATION: +* #define GRAPHICS_API_OPENGL_11 +* #define GRAPHICS_API_OPENGL_21 +* #define GRAPHICS_API_OPENGL_33 +* #define GRAPHICS_API_OPENGL_43 +* #define GRAPHICS_API_OPENGL_ES2 +* #define GRAPHICS_API_OPENGL_ES3 +* Use selected OpenGL graphics backend, should be supported by platform +* Those preprocessor defines are only used on rlgl module, if OpenGL version is +* required by any other module, use rlGetVersion() to check it * -* #define GRAPHICS_API_OPENGL_11 -* #define GRAPHICS_API_OPENGL_21 -* #define GRAPHICS_API_OPENGL_33 -* #define GRAPHICS_API_OPENGL_43 -* #define GRAPHICS_API_OPENGL_ES2 -* Use selected OpenGL graphics backend, should be supported by platform -* Those preprocessor defines are only used on rlgl module, if OpenGL version is -* required by any other module, use rlGetVersion() to check it -* -* #define RLGL_IMPLEMENTATION -* Generates the implementation of the library into the included file. -* If not defined, the library is in header only mode and can be included in other headers -* or source files without problems. But only ONE file should hold the implementation. +* #define RLGL_IMPLEMENTATION +* Generates the implementation of the library into the included file. +* If not defined, the library is in header only mode and can be included in other headers +* or source files without problems. But only ONE file should hold the implementation. * -* #define RLGL_RENDER_TEXTURES_HINT -* Enable framebuffer objects (fbo) support (enabled by default) -* Some GPUs could not support them despite the OpenGL version +* #define RLGL_RENDER_TEXTURES_HINT +* Enable framebuffer objects (fbo) support (enabled by default) +* Some GPUs could not support them despite the OpenGL version * -* #define RLGL_SHOW_GL_DETAILS_INFO -* Show OpenGL extensions and capabilities detailed logs on init +* #define RLGL_SHOW_GL_DETAILS_INFO +* Show OpenGL extensions and capabilities detailed logs on init * -* #define RLGL_ENABLE_OPENGL_DEBUG_CONTEXT -* Enable debug context (only available on OpenGL 4.3) +* #define RLGL_ENABLE_OPENGL_DEBUG_CONTEXT +* Enable debug context (only available on OpenGL 4.3) * -* rlgl capabilities could be customized just defining some internal -* values before library inclusion (default values listed): +* rlgl capabilities could be customized just defining some internal +* values before library inclusion (default values listed): * -* #define RL_DEFAULT_BATCH_BUFFER_ELEMENTS 8192 // Default internal render batch elements limits -* #define RL_DEFAULT_BATCH_BUFFERS 1 // Default number of batch buffers (multi-buffering) -* #define RL_DEFAULT_BATCH_DRAWCALLS 256 // Default number of batch draw calls (by state changes: mode, texture) -* #define RL_DEFAULT_BATCH_MAX_TEXTURE_UNITS 4 // Maximum number of textures units that can be activated on batch drawing (SetShaderValueTexture()) +* #define RL_DEFAULT_BATCH_BUFFER_ELEMENTS 8192 // Default internal render batch elements limits +* #define RL_DEFAULT_BATCH_BUFFERS 1 // Default number of batch buffers (multi-buffering) +* #define RL_DEFAULT_BATCH_DRAWCALLS 256 // Default number of batch draw calls (by state changes: mode, texture) +* #define RL_DEFAULT_BATCH_MAX_TEXTURE_UNITS 4 // Maximum number of textures units that can be activated on batch drawing (SetShaderValueTexture()) * -* #define RL_MAX_MATRIX_STACK_SIZE 32 // Maximum size of internal Matrix stack -* #define RL_MAX_SHADER_LOCATIONS 32 // Maximum number of shader locations supported -* #define RL_CULL_DISTANCE_NEAR 0.01 // Default projection matrix near cull distance -* #define RL_CULL_DISTANCE_FAR 1000.0 // Default projection matrix far cull distance +* #define RL_MAX_MATRIX_STACK_SIZE 32 // Maximum size of internal Matrix stack +* #define RL_MAX_SHADER_LOCATIONS 32 // Maximum number of shader locations supported +* #define RL_CULL_DISTANCE_NEAR 0.01 // Default projection matrix near cull distance +* #define RL_CULL_DISTANCE_FAR 1000.0 // Default projection matrix far cull distance * -* When loading a shader, the following vertex attribute and uniform -* location names are tried to be set automatically: +* When loading a shader, the following vertex attributes and uniform +* location names are tried to be set automatically: * -* #define RL_DEFAULT_SHADER_ATTRIB_NAME_POSITION "vertexPosition" // Bound by default to shader location: 0 -* #define RL_DEFAULT_SHADER_ATTRIB_NAME_TEXCOORD "vertexTexCoord" // Bound by default to shader location: 1 -* #define RL_DEFAULT_SHADER_ATTRIB_NAME_NORMAL "vertexNormal" // Bound by default to shader location: 2 -* #define RL_DEFAULT_SHADER_ATTRIB_NAME_COLOR "vertexColor" // Bound by default to shader location: 3 -* #define RL_DEFAULT_SHADER_ATTRIB_NAME_TANGENT "vertexTangent" // Bound by default to shader location: 4 -* #define RL_DEFAULT_SHADER_UNIFORM_NAME_MVP "mvp" // model-view-projection matrix -* #define RL_DEFAULT_SHADER_UNIFORM_NAME_VIEW "matView" // view matrix -* #define RL_DEFAULT_SHADER_UNIFORM_NAME_PROJECTION "matProjection" // projection matrix -* #define RL_DEFAULT_SHADER_UNIFORM_NAME_MODEL "matModel" // model matrix -* #define RL_DEFAULT_SHADER_UNIFORM_NAME_NORMAL "matNormal" // normal matrix (transpose(inverse(matModelView)) -* #define RL_DEFAULT_SHADER_UNIFORM_NAME_COLOR "colDiffuse" // color diffuse (base tint color, multiplied by texture color) -* #define RL_DEFAULT_SHADER_SAMPLER2D_NAME_TEXTURE0 "texture0" // texture0 (texture slot active 0) -* #define RL_DEFAULT_SHADER_SAMPLER2D_NAME_TEXTURE1 "texture1" // texture1 (texture slot active 1) -* #define RL_DEFAULT_SHADER_SAMPLER2D_NAME_TEXTURE2 "texture2" // texture2 (texture slot active 2) +* #define RL_DEFAULT_SHADER_ATTRIB_NAME_POSITION "vertexPosition" // Bound by default to shader location: 0 +* #define RL_DEFAULT_SHADER_ATTRIB_NAME_TEXCOORD "vertexTexCoord" // Bound by default to shader location: 1 +* #define RL_DEFAULT_SHADER_ATTRIB_NAME_NORMAL "vertexNormal" // Bound by default to shader location: 2 +* #define RL_DEFAULT_SHADER_ATTRIB_NAME_COLOR "vertexColor" // Bound by default to shader location: 3 +* #define RL_DEFAULT_SHADER_ATTRIB_NAME_TANGENT "vertexTangent" // Bound by default to shader location: 4 +* #define RL_DEFAULT_SHADER_ATTRIB_NAME_TEXCOORD2 "vertexTexCoord2" // Bound by default to shader location: 5 +* #define RL_DEFAULT_SHADER_UNIFORM_NAME_MVP "mvp" // model-view-projection matrix +* #define RL_DEFAULT_SHADER_UNIFORM_NAME_VIEW "matView" // view matrix +* #define RL_DEFAULT_SHADER_UNIFORM_NAME_PROJECTION "matProjection" // projection matrix +* #define RL_DEFAULT_SHADER_UNIFORM_NAME_MODEL "matModel" // model matrix +* #define RL_DEFAULT_SHADER_UNIFORM_NAME_NORMAL "matNormal" // normal matrix (transpose(inverse(matModelView)) +* #define RL_DEFAULT_SHADER_UNIFORM_NAME_COLOR "colDiffuse" // color diffuse (base tint color, multiplied by texture color) +* #define RL_DEFAULT_SHADER_SAMPLER2D_NAME_TEXTURE0 "texture0" // texture0 (texture slot active 0) +* #define RL_DEFAULT_SHADER_SAMPLER2D_NAME_TEXTURE1 "texture1" // texture1 (texture slot active 1) +* #define RL_DEFAULT_SHADER_SAMPLER2D_NAME_TEXTURE2 "texture2" // texture2 (texture slot active 2) * * DEPENDENCIES: -* * - OpenGL libraries (depending on platform and OpenGL version selected) * - GLAD OpenGL extensions loading library (only for OpenGL 3.3 Core, 4.3 Core) * @@ -148,7 +149,8 @@ !defined(GRAPHICS_API_OPENGL_21) && \ !defined(GRAPHICS_API_OPENGL_33) && \ !defined(GRAPHICS_API_OPENGL_43) && \ - !defined(GRAPHICS_API_OPENGL_ES2) + !defined(GRAPHICS_API_OPENGL_ES2) && \ + !defined(GRAPHICS_API_OPENGL_ES3) #define GRAPHICS_API_OPENGL_33 #endif @@ -179,6 +181,11 @@ #define GRAPHICS_API_OPENGL_33 #endif +// OpenGL ES 3.0 uses OpenGL ES 2.0 functionality (and more) +#if defined(GRAPHICS_API_OPENGL_ES3) + #define GRAPHICS_API_OPENGL_ES2 +#endif + // Support framebuffer objects by default // NOTE: Some driver implementation do not support it, despite they should #define RLGL_RENDER_TEXTURES_HINT @@ -383,7 +390,8 @@ typedef enum { RL_OPENGL_21, // OpenGL 2.1 (GLSL 120) RL_OPENGL_33, // OpenGL 3.3 (GLSL 330) RL_OPENGL_43, // OpenGL 4.3 (using GLSL 330) - RL_OPENGL_ES_20 // OpenGL ES 2.0 (GLSL 100) + RL_OPENGL_ES_20, // OpenGL ES 2.0 (GLSL 100) + RL_OPENGL_ES_30 // OpenGL ES 3.0 (GLSL 300 es) } rlGlVersion; // Trace log level @@ -412,6 +420,9 @@ typedef enum { RL_PIXELFORMAT_UNCOMPRESSED_R32, // 32 bpp (1 channel - float) RL_PIXELFORMAT_UNCOMPRESSED_R32G32B32, // 32*3 bpp (3 channels - float) RL_PIXELFORMAT_UNCOMPRESSED_R32G32B32A32, // 32*4 bpp (4 channels - float) + RL_PIXELFORMAT_UNCOMPRESSED_R16, // 16 bpp (1 channel - half float) + RL_PIXELFORMAT_UNCOMPRESSED_R16G16B16, // 16*3 bpp (3 channels - half float) + RL_PIXELFORMAT_UNCOMPRESSED_R16G16B16A16, // 16*4 bpp (4 channels - half float) RL_PIXELFORMAT_COMPRESSED_DXT1_RGB, // 4 bpp (no alpha) RL_PIXELFORMAT_COMPRESSED_DXT1_RGBA, // 4 bpp (1 bit alpha) RL_PIXELFORMAT_COMPRESSED_DXT3_RGBA, // 8 bpp @@ -506,28 +517,28 @@ typedef enum { // Framebuffer attachment type // NOTE: By default up to 8 color channels defined, but it can be more typedef enum { - RL_ATTACHMENT_COLOR_CHANNEL0 = 0, // Framebuffer attachment type: color 0 - RL_ATTACHMENT_COLOR_CHANNEL1, // Framebuffer attachment type: color 1 - RL_ATTACHMENT_COLOR_CHANNEL2, // Framebuffer attachment type: color 2 - RL_ATTACHMENT_COLOR_CHANNEL3, // Framebuffer attachment type: color 3 - RL_ATTACHMENT_COLOR_CHANNEL4, // Framebuffer attachment type: color 4 - RL_ATTACHMENT_COLOR_CHANNEL5, // Framebuffer attachment type: color 5 - RL_ATTACHMENT_COLOR_CHANNEL6, // Framebuffer attachment type: color 6 - RL_ATTACHMENT_COLOR_CHANNEL7, // Framebuffer attachment type: color 7 - RL_ATTACHMENT_DEPTH = 100, // Framebuffer attachment type: depth - RL_ATTACHMENT_STENCIL = 200, // Framebuffer attachment type: stencil + RL_ATTACHMENT_COLOR_CHANNEL0 = 0, // Framebuffer attachment type: color 0 + RL_ATTACHMENT_COLOR_CHANNEL1 = 1, // Framebuffer attachment type: color 1 + RL_ATTACHMENT_COLOR_CHANNEL2 = 2, // Framebuffer attachment type: color 2 + RL_ATTACHMENT_COLOR_CHANNEL3 = 3, // Framebuffer attachment type: color 3 + RL_ATTACHMENT_COLOR_CHANNEL4 = 4, // Framebuffer attachment type: color 4 + RL_ATTACHMENT_COLOR_CHANNEL5 = 5, // Framebuffer attachment type: color 5 + RL_ATTACHMENT_COLOR_CHANNEL6 = 6, // Framebuffer attachment type: color 6 + RL_ATTACHMENT_COLOR_CHANNEL7 = 7, // Framebuffer attachment type: color 7 + RL_ATTACHMENT_DEPTH = 100, // Framebuffer attachment type: depth + RL_ATTACHMENT_STENCIL = 200, // Framebuffer attachment type: stencil } rlFramebufferAttachType; // Framebuffer texture attachment type typedef enum { - RL_ATTACHMENT_CUBEMAP_POSITIVE_X = 0, // Framebuffer texture attachment type: cubemap, +X side - RL_ATTACHMENT_CUBEMAP_NEGATIVE_X, // Framebuffer texture attachment type: cubemap, -X side - RL_ATTACHMENT_CUBEMAP_POSITIVE_Y, // Framebuffer texture attachment type: cubemap, +Y side - RL_ATTACHMENT_CUBEMAP_NEGATIVE_Y, // Framebuffer texture attachment type: cubemap, -Y side - RL_ATTACHMENT_CUBEMAP_POSITIVE_Z, // Framebuffer texture attachment type: cubemap, +Z side - RL_ATTACHMENT_CUBEMAP_NEGATIVE_Z, // Framebuffer texture attachment type: cubemap, -Z side - RL_ATTACHMENT_TEXTURE2D = 100, // Framebuffer texture attachment type: texture2d - RL_ATTACHMENT_RENDERBUFFER = 200, // Framebuffer texture attachment type: renderbuffer + RL_ATTACHMENT_CUBEMAP_POSITIVE_X = 0, // Framebuffer texture attachment type: cubemap, +X side + RL_ATTACHMENT_CUBEMAP_NEGATIVE_X = 1, // Framebuffer texture attachment type: cubemap, -X side + RL_ATTACHMENT_CUBEMAP_POSITIVE_Y = 2, // Framebuffer texture attachment type: cubemap, +Y side + RL_ATTACHMENT_CUBEMAP_NEGATIVE_Y = 3, // Framebuffer texture attachment type: cubemap, -Y side + RL_ATTACHMENT_CUBEMAP_POSITIVE_Z = 4, // Framebuffer texture attachment type: cubemap, +Z side + RL_ATTACHMENT_CUBEMAP_NEGATIVE_Z = 5, // Framebuffer texture attachment type: cubemap, -Z side + RL_ATTACHMENT_TEXTURE2D = 100, // Framebuffer texture attachment type: texture2d + RL_ATTACHMENT_RENDERBUFFER = 200, // Framebuffer texture attachment type: renderbuffer } rlFramebufferAttachTextureType; // Face culling mode @@ -607,6 +618,7 @@ RLAPI void rlDisableShader(void); // Disable shader progra RLAPI void rlEnableFramebuffer(unsigned int id); // Enable render texture (fbo) RLAPI void rlDisableFramebuffer(void); // Disable render texture (fbo), return to default framebuffer RLAPI void rlActiveDrawBuffers(int count); // Activate multiple draw color buffers +RLAPI void rlBlitFramebuffer(int srcX, int srcY, int srcWidth, int srcHeight, int dstX, int dstY, int dstWidth, int dstHeight, int bufferMask); // Blit active framebuffer to main framebuffer // General render state RLAPI void rlEnableColorBlend(void); // Enable color blending @@ -622,7 +634,8 @@ RLAPI void rlEnableScissorTest(void); // Enable scissor test RLAPI void rlDisableScissorTest(void); // Disable scissor test RLAPI void rlScissor(int x, int y, int width, int height); // Scissor test RLAPI void rlEnableWireMode(void); // Enable wire mode -RLAPI void rlDisableWireMode(void); // Disable wire mode +RLAPI void rlEnablePointMode(void); // Enable point mode +RLAPI void rlDisableWireMode(void); // Disable wire mode ( and point ) maybe rename RLAPI void rlSetLineWidth(float width); // Set the line drawing width RLAPI float rlGetLineWidth(void); // Get the line drawing width RLAPI void rlEnableSmoothLines(void); // Enable line aliasing @@ -787,13 +800,17 @@ RLAPI void rlLoadDrawQuad(void); // Load and draw a quad #define GLAD_FREE RL_FREE #define GLAD_GL_IMPLEMENTATION - #include "external/glad.h" // GLAD extensions loading library, includes OpenGL headers + #include "external/glad.h" // GLAD extensions loading library, includes OpenGL headers #endif -#if defined(GRAPHICS_API_OPENGL_ES2) +#if defined(GRAPHICS_API_OPENGL_ES3) + #include // OpenGL ES 3.0 library + #define GL_GLEXT_PROTOTYPES + #include // OpenGL ES 2.0 extensions library +#elif defined(GRAPHICS_API_OPENGL_ES2) // NOTE: OpenGL ES 2.0 can be enabled on PLATFORM_DESKTOP, // in that case, functions are loaded from a custom glad for OpenGL ES 2.0 - #if defined(PLATFORM_DESKTOP) + #if defined(PLATFORM_DESKTOP) || defined(PLATFORM_DESKTOP_SDL) #define GLAD_GLES2_IMPLEMENTATION #include "external/glad_gles2.h" #else @@ -805,7 +822,7 @@ RLAPI void rlLoadDrawQuad(void); // Load and draw a quad // It seems OpenGL ES 2.0 instancing entry points are not defined on Raspberry Pi // provided headers (despite being defined in official Khronos GLES2 headers) - #if defined(PLATFORM_RPI) || defined(PLATFORM_DRM) + #if defined(PLATFORM_DRM) typedef void (GL_APIENTRYP PFNGLDRAWARRAYSINSTANCEDEXTPROC) (GLenum mode, GLint start, GLsizei count, GLsizei primcount); typedef void (GL_APIENTRYP PFNGLDRAWELEMENTSINSTANCEDEXTPROC) (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei primcount); typedef void (GL_APIENTRYP PFNGLVERTEXATTRIBDIVISOREXTPROC) (GLuint index, GLuint divisor); @@ -887,8 +904,10 @@ RLAPI void rlLoadDrawQuad(void); // Load and draw a quad #if defined(GRAPHICS_API_OPENGL_ES2) #define glClearDepth glClearDepthf - #define GL_READ_FRAMEBUFFER GL_FRAMEBUFFER - #define GL_DRAW_FRAMEBUFFER GL_FRAMEBUFFER + #if !defined(GRAPHICS_API_OPENGL_ES3) + #define GL_READ_FRAMEBUFFER GL_FRAMEBUFFER + #define GL_DRAW_FRAMEBUFFER GL_FRAMEBUFFER + #endif #endif // Default shader vertex attribute names to set location points @@ -999,6 +1018,7 @@ typedef struct rlglData { bool texDepth; // Depth textures supported (GL_ARB_depth_texture, GL_OES_depth_texture) bool texDepthWebGL; // Depth textures supported WebGL specific (GL_WEBGL_depth_texture) bool texFloat32; // float textures support (32 bit per channel) (GL_OES_texture_float) + bool texFloat16; // half float textures support (16 bit per channel) (GL_OES_texture_half_float) bool texCompDXT; // DDS texture compression support (GL_EXT_texture_compression_s3tc, GL_WEBGL_compressed_texture_s3tc, GL_WEBKIT_WEBGL_compressed_texture_s3tc) bool texCompETC1; // ETC1 texture compression support (GL_OES_compressed_ETC1_RGB8_texture, GL_WEBGL_compressed_texture_etc1) bool texCompETC2; // ETC2/EAC texture compression support (GL_ARB_ES3_compatibility) @@ -1026,7 +1046,7 @@ typedef void *(*rlglLoadProc)(const char *name); // OpenGL extension functions static rlglData RLGL = { 0 }; #endif // GRAPHICS_API_OPENGL_33 || GRAPHICS_API_OPENGL_ES2 -#if defined(GRAPHICS_API_OPENGL_ES2) +#if defined(GRAPHICS_API_OPENGL_ES2) && !defined(GRAPHICS_API_OPENGL_ES3) // NOTE: VAO functionality is exposed through extensions (OES) static PFNGLGENVERTEXARRAYSOESPROC glGenVertexArrays = NULL; static PFNGLBINDVERTEXARRAYOESPROC glBindVertexArray = NULL; @@ -1045,7 +1065,7 @@ static PFNGLVERTEXATTRIBDIVISOREXTPROC glVertexAttribDivisor = NULL; static void rlLoadShaderDefault(void); // Load default shader static void rlUnloadShaderDefault(void); // Unload default shader #if defined(RLGL_SHOW_GL_DETAILS_INFO) -static char *rlGetCompressedFormatName(int format); // Get compressed format official GL identifier name +static const char *rlGetCompressedFormatName(int format); // Get compressed format official GL identifier name #endif // RLGL_SHOW_GL_DETAILS_INFO #endif // GRAPHICS_API_OPENGL_33 || GRAPHICS_API_OPENGL_ES2 @@ -1416,8 +1436,7 @@ void rlVertex3f(float x, float y, float z) RLGL.currentBatch->vertexBuffer[RLGL.currentBatch->currentBuffer].texcoords[2*RLGL.State.vertexCounter] = RLGL.State.texcoordx; RLGL.currentBatch->vertexBuffer[RLGL.currentBatch->currentBuffer].texcoords[2*RLGL.State.vertexCounter + 1] = RLGL.State.texcoordy; - // TODO: Add current normal - // By default rlVertexBuffer type does not store normals + // WARNING: By default rlVertexBuffer struct does not store normals // Add current color RLGL.currentBatch->vertexBuffer[RLGL.currentBatch->currentBuffer].colors[4*RLGL.State.vertexCounter] = RLGL.State.colorr; @@ -1702,11 +1721,19 @@ void rlDisableFramebuffer(void) #endif } +// Blit active framebuffer to main framebuffer +void rlBlitFramebuffer(int srcX, int srcY, int srcWidth, int srcHeight, int dstX, int dstY, int dstWidth, int dstHeight, int bufferMask) +{ +#if (defined(GRAPHICS_API_OPENGL_33) || defined(GRAPHICS_API_OPENGL_ES3)) && defined(RLGL_RENDER_TEXTURES_HINT) + glBlitFramebuffer(srcX, srcY, srcWidth, srcHeight, dstX, dstY, dstWidth, dstHeight, bufferMask, GL_NEAREST); +#endif +} + // Activate multiple draw color buffers // NOTE: One color buffer is always active by default void rlActiveDrawBuffers(int count) { -#if (defined(GRAPHICS_API_OPENGL_33) && defined(RLGL_RENDER_TEXTURES_HINT)) +#if ((defined(GRAPHICS_API_OPENGL_33) || defined(GRAPHICS_API_OPENGL_ES3)) && defined(RLGL_RENDER_TEXTURES_HINT)) // NOTE: Maximum number of draw buffers supported is implementation dependant, // it can be queried with glGet*() but it must be at least 8 //GLint maxDrawBuffers = 0; @@ -1718,6 +1745,16 @@ void rlActiveDrawBuffers(int count) else { unsigned int buffers[8] = { +#if defined(GRAPHICS_API_OPENGL_ES3) + GL_COLOR_ATTACHMENT0_EXT, + GL_COLOR_ATTACHMENT1_EXT, + GL_COLOR_ATTACHMENT2_EXT, + GL_COLOR_ATTACHMENT3_EXT, + GL_COLOR_ATTACHMENT4_EXT, + GL_COLOR_ATTACHMENT5_EXT, + GL_COLOR_ATTACHMENT6_EXT, + GL_COLOR_ATTACHMENT7_EXT, +#else GL_COLOR_ATTACHMENT0, GL_COLOR_ATTACHMENT1, GL_COLOR_ATTACHMENT2, @@ -1726,9 +1763,14 @@ void rlActiveDrawBuffers(int count) GL_COLOR_ATTACHMENT5, GL_COLOR_ATTACHMENT6, GL_COLOR_ATTACHMENT7, +#endif }; +#if defined(GRAPHICS_API_OPENGL_ES3) + glDrawBuffersEXT(count, buffers); +#else glDrawBuffers(count, buffers); +#endif } } else TRACELOG(LOG_WARNING, "GL: One color buffer active by default"); @@ -1792,6 +1834,14 @@ void rlEnableWireMode(void) #endif } +void rlEnablePointMode(void) +{ +#if defined(GRAPHICS_API_OPENGL_11) || defined(GRAPHICS_API_OPENGL_33) + // NOTE: glPolygonMode() not available on OpenGL ES + glPolygonMode(GL_FRONT_AND_BACK, GL_POINT); + glEnable(GL_PROGRAM_POINT_SIZE); +#endif +} // Disable wire mode void rlDisableWireMode(void) { @@ -2047,7 +2097,7 @@ void rlglInit(int width, int height) if ((glDebugMessageCallback != NULL) && (glDebugMessageControl != NULL)) { glDebugMessageCallback(rlDebugMessageCallback, 0); - // glDebugMessageControl(GL_DEBUG_SOURCE_API, GL_DEBUG_TYPE_ERROR, GL_DEBUG_SEVERITY_HIGH, 0, 0, GL_TRUE); // TODO: Filter message + // glDebugMessageControl(GL_DEBUG_SOURCE_API, GL_DEBUG_TYPE_ERROR, GL_DEBUG_SEVERITY_HIGH, 0, 0, GL_TRUE); // Debug context options: // - GL_DEBUG_OUTPUT - Faster version but not useful for breakpoints @@ -2168,6 +2218,7 @@ void rlLoadExtensions(void *loader) RLGL.ExtSupported.instancing = (GLAD_GL_EXT_draw_instanced && GLAD_GL_ARB_instanced_arrays); RLGL.ExtSupported.texNPOT = GLAD_GL_ARB_texture_non_power_of_two; RLGL.ExtSupported.texFloat32 = GLAD_GL_ARB_texture_float; + RLGL.ExtSupported.texFloat16 = GLAD_GL_ARB_texture_float; RLGL.ExtSupported.texDepth = GLAD_GL_ARB_depth_texture; RLGL.ExtSupported.maxDepthBits = 32; RLGL.ExtSupported.texAnisoFilter = GLAD_GL_EXT_texture_filter_anisotropic; @@ -2179,6 +2230,7 @@ void rlLoadExtensions(void *loader) RLGL.ExtSupported.instancing = true; RLGL.ExtSupported.texNPOT = true; RLGL.ExtSupported.texFloat32 = true; + RLGL.ExtSupported.texFloat16 = true; RLGL.ExtSupported.texDepth = true; RLGL.ExtSupported.maxDepthBits = 32; RLGL.ExtSupported.texAnisoFilter = true; @@ -2196,11 +2248,35 @@ void rlLoadExtensions(void *loader) #endif // GRAPHICS_API_OPENGL_33 -#if defined(GRAPHICS_API_OPENGL_ES2) - - #if defined(PLATFORM_DESKTOP) +#if defined(GRAPHICS_API_OPENGL_ES3) + // Register supported extensions flags + // OpenGL ES 3.0 extensions supported by default (or it should be) + RLGL.ExtSupported.vao = true; + RLGL.ExtSupported.instancing = true; + RLGL.ExtSupported.texNPOT = true; + RLGL.ExtSupported.texFloat32 = true; + RLGL.ExtSupported.texFloat16 = true; + RLGL.ExtSupported.texDepth = true; + RLGL.ExtSupported.texDepthWebGL = true; + RLGL.ExtSupported.maxDepthBits = 24; + RLGL.ExtSupported.texAnisoFilter = true; + RLGL.ExtSupported.texMirrorClamp = true; + // TODO: Check for additional OpenGL ES 3.0 supported extensions: + //RLGL.ExtSupported.texCompDXT = true; + //RLGL.ExtSupported.texCompETC1 = true; + //RLGL.ExtSupported.texCompETC2 = true; + //RLGL.ExtSupported.texCompPVRT = true; + //RLGL.ExtSupported.texCompASTC = true; + //RLGL.ExtSupported.maxAnisotropyLevel = true; + //RLGL.ExtSupported.computeShader = true; + //RLGL.ExtSupported.ssbo = true; + +#elif defined(GRAPHICS_API_OPENGL_ES2) + + #if defined(PLATFORM_DESKTOP) || defined(PLATFORM_DESKTOP_SDL) + // TODO: Support GLAD loader for OpenGL ES 3.0 if (gladLoadGLES2((GLADloadfunc)loader) == 0) TRACELOG(RL_LOG_WARNING, "GLAD: Cannot load OpenGL ES2.0 functions"); - else TRACELOG(RL_LOG_INFO, "GLAD: OpenGL ES2.0 loaded successfully"); + else TRACELOG(RL_LOG_INFO, "GLAD: OpenGL ES 2.0 loaded successfully"); #endif // Get supported extensions list @@ -2276,6 +2352,7 @@ void rlLoadExtensions(void *loader) // Check texture float support if (strcmp(extList[i], (const char *)"GL_OES_texture_float") == 0) RLGL.ExtSupported.texFloat32 = true; + if (strcmp(extList[i], (const char *)"GL_OES_texture_half_float") == 0) RLGL.ExtSupported.texFloat16 = true; // Check depth texture support if (strcmp(extList[i], (const char *)"GL_OES_depth_texture") == 0) RLGL.ExtSupported.texDepth = true; @@ -2391,15 +2468,17 @@ int rlGetVersion(void) #endif #if defined(GRAPHICS_API_OPENGL_21) glVersion = RL_OPENGL_21; +#elif defined(GRAPHICS_API_OPENGL_43) + glVersion = RL_OPENGL_43; #elif defined(GRAPHICS_API_OPENGL_33) glVersion = RL_OPENGL_33; #endif -#if defined(GRAPHICS_API_OPENGL_43) - glVersion = RL_OPENGL_43; -#endif -#if defined(GRAPHICS_API_OPENGL_ES2) +#if defined(GRAPHICS_API_OPENGL_ES3) + glVersion = RL_OPENGL_ES_30; +#elif defined(GRAPHICS_API_OPENGL_ES2) glVersion = RL_OPENGL_ES_20; #endif + return glVersion; } @@ -2648,7 +2727,7 @@ void rlDrawRenderBatch(rlRenderBatch *batch) // Update batch vertex buffers //------------------------------------------------------------------------------------------------------------ // NOTE: If there is not vertex data, buffers doesn't need to be updated (vertexCount > 0) - // TODO: If no data changed on the CPU arrays --> No need to re-update GPU arrays (change flag required) + // TODO: If no data changed on the CPU arrays --> No need to re-update GPU arrays (use a change detector flag?) if (RLGL.State.vertexCounter > 0) { // Activate elements VAO @@ -2943,7 +3022,11 @@ unsigned int rlLoadTexture(const void *data, int width, int height, int format, int mipWidth = width; int mipHeight = height; - int mipOffset = 0; // Mipmap data offset + int mipOffset = 0; // Mipmap data offset, only used for tracelog + + // NOTE: Added pointer math separately from function to avoid UBSAN complaining + unsigned char *dataPtr = NULL; + if (data != NULL) dataPtr = (unsigned char *)data; // Load the different mipmap levels for (int i = 0; i < mipmapCount; i++) @@ -2955,11 +3038,11 @@ unsigned int rlLoadTexture(const void *data, int width, int height, int format, TRACELOGD("TEXTURE: Load mipmap level %i (%i x %i), size: %i, offset: %i", i, mipWidth, mipHeight, mipSize, mipOffset); - if (glInternalFormat != -1) + if (glInternalFormat != 0) { - if (format < RL_PIXELFORMAT_COMPRESSED_DXT1_RGB) glTexImage2D(GL_TEXTURE_2D, i, glInternalFormat, mipWidth, mipHeight, 0, glFormat, glType, (unsigned char *)data + mipOffset); + if (format < RL_PIXELFORMAT_COMPRESSED_DXT1_RGB) glTexImage2D(GL_TEXTURE_2D, i, glInternalFormat, mipWidth, mipHeight, 0, glFormat, glType, dataPtr); #if !defined(GRAPHICS_API_OPENGL_11) - else glCompressedTexImage2D(GL_TEXTURE_2D, i, glInternalFormat, mipWidth, mipHeight, 0, mipSize, (unsigned char *)data + mipOffset); + else glCompressedTexImage2D(GL_TEXTURE_2D, i, glInternalFormat, mipWidth, mipHeight, 0, mipSize, dataPtr); #endif #if defined(GRAPHICS_API_OPENGL_33) @@ -2982,7 +3065,8 @@ unsigned int rlLoadTexture(const void *data, int width, int height, int format, mipWidth /= 2; mipHeight /= 2; - mipOffset += mipSize; + mipOffset += mipSize; // Increment offset position to next mipmap + if (data != NULL) dataPtr += mipSize; // Increment data pointer to next mipmap // Security check for NPOT textures if (mipWidth < 1) mipWidth = 1; @@ -3049,7 +3133,7 @@ unsigned int rlLoadTextureDepth(int width, int height, bool useRenderBuffer) // Possible formats: GL_DEPTH_COMPONENT16, GL_DEPTH_COMPONENT24, GL_DEPTH_COMPONENT32 and GL_DEPTH_COMPONENT32F unsigned int glInternalFormat = GL_DEPTH_COMPONENT; -#if defined(GRAPHICS_API_OPENGL_ES2) +#if (defined(GRAPHICS_API_OPENGL_ES2) || defined(GRAPHICS_API_OPENGL_ES3)) // WARNING: WebGL platform requires unsized internal format definition (GL_DEPTH_COMPONENT) // while other platforms using OpenGL ES 2.0 require/support sized internal formats depending on the GPU capabilities if (!RLGL.ExtSupported.texDepthWebGL || useRenderBuffer) @@ -3108,7 +3192,7 @@ unsigned int rlLoadTextureCubemap(const void *data, int size, int format) unsigned int glInternalFormat, glFormat, glType; rlGetGlTextureFormats(format, &glInternalFormat, &glFormat, &glType); - if (glInternalFormat != -1) + if (glInternalFormat != 0) { // Load cubemap faces for (unsigned int i = 0; i < 6; i++) @@ -3117,13 +3201,9 @@ unsigned int rlLoadTextureCubemap(const void *data, int size, int format) { if (format < RL_PIXELFORMAT_COMPRESSED_DXT1_RGB) { - if (format == RL_PIXELFORMAT_UNCOMPRESSED_R32G32B32) - { - // Instead of using a sized internal texture format (GL_RGB16F, GL_RGB32F), we let the driver to choose the better format for us (GL_RGB) - if (RLGL.ExtSupported.texFloat32) glTexImage2D(GL_TEXTURE_CUBE_MAP_POSITIVE_X + i, 0, GL_RGB, size, size, 0, GL_RGB, GL_FLOAT, NULL); - else TRACELOG(RL_LOG_WARNING, "TEXTURES: Cubemap requested format not supported"); - } - else if ((format == RL_PIXELFORMAT_UNCOMPRESSED_R32) || (format == RL_PIXELFORMAT_UNCOMPRESSED_R32G32B32A32)) TRACELOG(RL_LOG_WARNING, "TEXTURES: Cubemap requested format not supported"); + if ((format == RL_PIXELFORMAT_UNCOMPRESSED_R32) || (format == RL_PIXELFORMAT_UNCOMPRESSED_R32G32B32A32) + || (format == RL_PIXELFORMAT_UNCOMPRESSED_R16) || (format == RL_PIXELFORMAT_UNCOMPRESSED_R16G16B16A16)) + TRACELOG(RL_LOG_WARNING, "TEXTURES: Cubemap requested format not supported"); else glTexImage2D(GL_TEXTURE_CUBE_MAP_POSITIVE_X + i, 0, glInternalFormat, size, size, 0, glFormat, glType, NULL); } else TRACELOG(RL_LOG_WARNING, "TEXTURES: Empty cubemap creation does not support compressed format"); @@ -3180,7 +3260,7 @@ void rlUpdateTexture(unsigned int id, int offsetX, int offsetY, int width, int h unsigned int glInternalFormat, glFormat, glType; rlGetGlTextureFormats(format, &glInternalFormat, &glFormat, &glType); - if ((glInternalFormat != -1) && (format < RL_PIXELFORMAT_COMPRESSED_DXT1_RGB)) + if ((glInternalFormat != 0) && (format < RL_PIXELFORMAT_COMPRESSED_DXT1_RGB)) { glTexSubImage2D(GL_TEXTURE_2D, 0, offsetX, offsetY, width, height, glFormat, glType, data); } @@ -3206,9 +3286,27 @@ void rlGetGlTextureFormats(int format, unsigned int *glInternalFormat, unsigned case RL_PIXELFORMAT_UNCOMPRESSED_R4G4B4A4: *glInternalFormat = GL_RGBA; *glFormat = GL_RGBA; *glType = GL_UNSIGNED_SHORT_4_4_4_4; break; case RL_PIXELFORMAT_UNCOMPRESSED_R8G8B8A8: *glInternalFormat = GL_RGBA; *glFormat = GL_RGBA; *glType = GL_UNSIGNED_BYTE; break; #if !defined(GRAPHICS_API_OPENGL_11) - case RL_PIXELFORMAT_UNCOMPRESSED_R32: if (RLGL.ExtSupported.texFloat32) *glInternalFormat = GL_LUMINANCE; *glFormat = GL_LUMINANCE; *glType = GL_FLOAT; break; // NOTE: Requires extension OES_texture_float - case RL_PIXELFORMAT_UNCOMPRESSED_R32G32B32: if (RLGL.ExtSupported.texFloat32) *glInternalFormat = GL_RGB; *glFormat = GL_RGB; *glType = GL_FLOAT; break; // NOTE: Requires extension OES_texture_float - case RL_PIXELFORMAT_UNCOMPRESSED_R32G32B32A32: if (RLGL.ExtSupported.texFloat32) *glInternalFormat = GL_RGBA; *glFormat = GL_RGBA; *glType = GL_FLOAT; break; // NOTE: Requires extension OES_texture_float + #if defined(GRAPHICS_API_OPENGL_ES3) + case RL_PIXELFORMAT_UNCOMPRESSED_R32: if (RLGL.ExtSupported.texFloat32) *glInternalFormat = GL_R32F_EXT; *glFormat = GL_RED_EXT; *glType = GL_FLOAT; break; + case RL_PIXELFORMAT_UNCOMPRESSED_R32G32B32: if (RLGL.ExtSupported.texFloat32) *glInternalFormat = GL_RGB32F_EXT; *glFormat = GL_RGB; *glType = GL_FLOAT; break; + case RL_PIXELFORMAT_UNCOMPRESSED_R32G32B32A32: if (RLGL.ExtSupported.texFloat32) *glInternalFormat = GL_RGBA32F_EXT; *glFormat = GL_RGBA; *glType = GL_FLOAT; break; + case RL_PIXELFORMAT_UNCOMPRESSED_R16: if (RLGL.ExtSupported.texFloat16) *glInternalFormat = GL_R16F_EXT; *glFormat = GL_RED_EXT; *glType = GL_HALF_FLOAT; break; + case RL_PIXELFORMAT_UNCOMPRESSED_R16G16B16: if (RLGL.ExtSupported.texFloat16) *glInternalFormat = GL_RGB16F_EXT; *glFormat = GL_RGB; *glType = GL_HALF_FLOAT; break; + case RL_PIXELFORMAT_UNCOMPRESSED_R16G16B16A16: if (RLGL.ExtSupported.texFloat16) *glInternalFormat = GL_RGBA16F_EXT; *glFormat = GL_RGBA; *glType = GL_HALF_FLOAT; break; + #else + case RL_PIXELFORMAT_UNCOMPRESSED_R32: if (RLGL.ExtSupported.texFloat32) *glInternalFormat = GL_LUMINANCE; *glFormat = GL_LUMINANCE; *glType = GL_FLOAT; break; // NOTE: Requires extension OES_texture_float + case RL_PIXELFORMAT_UNCOMPRESSED_R32G32B32: if (RLGL.ExtSupported.texFloat32) *glInternalFormat = GL_RGB; *glFormat = GL_RGB; *glType = GL_FLOAT; break; // NOTE: Requires extension OES_texture_float + case RL_PIXELFORMAT_UNCOMPRESSED_R32G32B32A32: if (RLGL.ExtSupported.texFloat32) *glInternalFormat = GL_RGBA; *glFormat = GL_RGBA; *glType = GL_FLOAT; break; // NOTE: Requires extension OES_texture_float + #if defined(GRAPHICS_API_OPENGL_21) + case RL_PIXELFORMAT_UNCOMPRESSED_R16: if (RLGL.ExtSupported.texFloat16) *glInternalFormat = GL_LUMINANCE; *glFormat = GL_LUMINANCE; *glType = GL_HALF_FLOAT_ARB; break; + case RL_PIXELFORMAT_UNCOMPRESSED_R16G16B16: if (RLGL.ExtSupported.texFloat16) *glInternalFormat = GL_RGB; *glFormat = GL_RGB; *glType = GL_HALF_FLOAT_ARB; break; + case RL_PIXELFORMAT_UNCOMPRESSED_R16G16B16A16: if (RLGL.ExtSupported.texFloat16) *glInternalFormat = GL_RGBA; *glFormat = GL_RGBA; *glType = GL_HALF_FLOAT_ARB; break; + #else // defined(GRAPHICS_API_OPENGL_ES2) + case RL_PIXELFORMAT_UNCOMPRESSED_R16: if (RLGL.ExtSupported.texFloat16) *glInternalFormat = GL_LUMINANCE; *glFormat = GL_LUMINANCE; *glType = GL_HALF_FLOAT_OES; break; // NOTE: Requires extension OES_texture_half_float + case RL_PIXELFORMAT_UNCOMPRESSED_R16G16B16: if (RLGL.ExtSupported.texFloat16) *glInternalFormat = GL_RGB; *glFormat = GL_RGB; *glType = GL_HALF_FLOAT_OES; break; // NOTE: Requires extension OES_texture_half_float + case RL_PIXELFORMAT_UNCOMPRESSED_R16G16B16A16: if (RLGL.ExtSupported.texFloat16) *glInternalFormat = GL_RGBA; *glFormat = GL_RGBA; *glType = GL_HALF_FLOAT_OES; break; // NOTE: Requires extension OES_texture_half_float + #endif + #endif #endif #elif defined(GRAPHICS_API_OPENGL_33) case RL_PIXELFORMAT_UNCOMPRESSED_GRAYSCALE: *glInternalFormat = GL_R8; *glFormat = GL_RED; *glType = GL_UNSIGNED_BYTE; break; @@ -3221,6 +3319,9 @@ void rlGetGlTextureFormats(int format, unsigned int *glInternalFormat, unsigned case RL_PIXELFORMAT_UNCOMPRESSED_R32: if (RLGL.ExtSupported.texFloat32) *glInternalFormat = GL_R32F; *glFormat = GL_RED; *glType = GL_FLOAT; break; case RL_PIXELFORMAT_UNCOMPRESSED_R32G32B32: if (RLGL.ExtSupported.texFloat32) *glInternalFormat = GL_RGB32F; *glFormat = GL_RGB; *glType = GL_FLOAT; break; case RL_PIXELFORMAT_UNCOMPRESSED_R32G32B32A32: if (RLGL.ExtSupported.texFloat32) *glInternalFormat = GL_RGBA32F; *glFormat = GL_RGBA; *glType = GL_FLOAT; break; + case RL_PIXELFORMAT_UNCOMPRESSED_R16: if (RLGL.ExtSupported.texFloat16) *glInternalFormat = GL_R16F; *glFormat = GL_RED; *glType = GL_HALF_FLOAT; break; + case RL_PIXELFORMAT_UNCOMPRESSED_R16G16B16: if (RLGL.ExtSupported.texFloat16) *glInternalFormat = GL_RGB16F; *glFormat = GL_RGB; *glType = GL_HALF_FLOAT; break; + case RL_PIXELFORMAT_UNCOMPRESSED_R16G16B16A16: if (RLGL.ExtSupported.texFloat16) *glInternalFormat = GL_RGBA16F; *glFormat = GL_RGBA; *glType = GL_HALF_FLOAT; break; #endif #if !defined(GRAPHICS_API_OPENGL_11) case RL_PIXELFORMAT_COMPRESSED_DXT1_RGB: if (RLGL.ExtSupported.texCompDXT) *glInternalFormat = GL_COMPRESSED_RGB_S3TC_DXT1_EXT; break; @@ -3303,7 +3404,7 @@ void *rlReadTexturePixels(unsigned int id, int width, int height, int format) rlGetGlTextureFormats(format, &glInternalFormat, &glFormat, &glType); unsigned int size = rlGetPixelDataSize(width, height, format); - if ((glInternalFormat != -1) && (format < RL_PIXELFORMAT_COMPRESSED_DXT1_RGB)) + if ((glInternalFormat != 0) && (format < RL_PIXELFORMAT_COMPRESSED_DXT1_RGB)) { pixels = RL_MALLOC(size); glGetTexImage(GL_TEXTURE_2D, 0, glFormat, glType, pixels); @@ -3466,11 +3567,14 @@ bool rlFramebufferComplete(unsigned int id) void rlUnloadFramebuffer(unsigned int id) { #if (defined(GRAPHICS_API_OPENGL_33) || defined(GRAPHICS_API_OPENGL_ES2)) && defined(RLGL_RENDER_TEXTURES_HINT) - // Query depth attachment to automatically delete texture/renderbuffer int depthType = 0, depthId = 0; glBindFramebuffer(GL_FRAMEBUFFER, id); // Bind framebuffer to query depth texture type glGetFramebufferAttachmentParameteriv(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE, &depthType); + + // TODO: Review warning retrieving object name in WebGL + // WARNING: WebGL: INVALID_ENUM: getFramebufferAttachmentParameter: invalid parameter name + // https://registry.khronos.org/webgl/specs/latest/1.0/ glGetFramebufferAttachmentParameteriv(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME, &depthId); unsigned int depthIdU = (unsigned int)depthId; @@ -3616,7 +3720,11 @@ void rlDrawVertexArray(int offset, int count) // Draw vertex array elements void rlDrawVertexArrayElements(int offset, int count, const void *buffer) { - glDrawElements(GL_TRIANGLES, count, GL_UNSIGNED_SHORT, (const unsigned short *)buffer + offset); + // NOTE: Added pointer math separately from function to avoid UBSAN complaining + unsigned short *bufferPtr = (unsigned short *)buffer; + if (offset > 0) bufferPtr += offset; + + glDrawElements(GL_TRIANGLES, count, GL_UNSIGNED_SHORT, (const unsigned short *)bufferPtr); } // Draw vertex array instanced @@ -3631,7 +3739,11 @@ void rlDrawVertexArrayInstanced(int offset, int count, int instances) void rlDrawVertexArrayElementsInstanced(int offset, int count, const void *buffer, int instances) { #if defined(GRAPHICS_API_OPENGL_33) || defined(GRAPHICS_API_OPENGL_ES2) - glDrawElementsInstanced(GL_TRIANGLES, count, GL_UNSIGNED_SHORT, (const unsigned short *)buffer + offset, instances); + // NOTE: Added pointer math separately from function to avoid UBSAN complaining + unsigned short *bufferPtr = (unsigned short *)buffer; + if (offset > 0) bufferPtr += offset; + + glDrawElementsInstanced(GL_TRIANGLES, count, GL_UNSIGNED_SHORT, (const unsigned short *)bufferPtr, instances); #endif } @@ -3923,8 +4035,8 @@ int rlGetLocationUniform(unsigned int shaderId, const char *uniformName) #if defined(GRAPHICS_API_OPENGL_33) || defined(GRAPHICS_API_OPENGL_ES2) location = glGetUniformLocation(shaderId, uniformName); - if (location == -1) TRACELOG(RL_LOG_WARNING, "SHADER: [ID %i] Failed to find shader uniform: %s", shaderId, uniformName); - else TRACELOG(RL_LOG_INFO, "SHADER: [ID %i] Shader uniform (%s) set at location: %i", shaderId, uniformName, location); + //if (location == -1) TRACELOG(RL_LOG_WARNING, "SHADER: [ID %i] Failed to find shader uniform: %s", shaderId, uniformName); + //else TRACELOG(RL_LOG_INFO, "SHADER: [ID %i] Shader uniform (%s) set at location: %i", shaderId, uniformName, location); #endif return location; } @@ -3936,8 +4048,8 @@ int rlGetLocationAttrib(unsigned int shaderId, const char *attribName) #if defined(GRAPHICS_API_OPENGL_33) || defined(GRAPHICS_API_OPENGL_ES2) location = glGetAttribLocation(shaderId, attribName); - if (location == -1) TRACELOG(RL_LOG_WARNING, "SHADER: [ID %i] Failed to find shader attribute: %s", shaderId, attribName); - else TRACELOG(RL_LOG_INFO, "SHADER: [ID %i] Shader attribute (%s) set at location: %i", shaderId, attribName, location); + //if (location == -1) TRACELOG(RL_LOG_WARNING, "SHADER: [ID %i] Failed to find shader attribute: %s", shaderId, attribName); + //else TRACELOG(RL_LOG_INFO, "SHADER: [ID %i] Shader attribute (%s) set at location: %i", shaderId, attribName, location); #endif return location; } @@ -4091,7 +4203,7 @@ unsigned int rlLoadShaderBuffer(unsigned int size, const void *data, int usageHi glGenBuffers(1, &ssbo); glBindBuffer(GL_SHADER_STORAGE_BUFFER, ssbo); glBufferData(GL_SHADER_STORAGE_BUFFER, size, data, usageHint? usageHint : RL_STREAM_COPY); - glClearBufferData(GL_SHADER_STORAGE_BUFFER, GL_R8UI, GL_RED_INTEGER, GL_UNSIGNED_BYTE, 0); + if (data == NULL) glClearBufferData(GL_SHADER_STORAGE_BUFFER, GL_R8UI, GL_RED_INTEGER, GL_UNSIGNED_BYTE, NULL); // Clear buffer data to 0 glBindBuffer(GL_SHADER_STORAGE_BUFFER, 0); #endif @@ -4162,7 +4274,7 @@ void rlBindImageTexture(unsigned int id, unsigned int index, int format, bool re unsigned int glInternalFormat = 0, glFormat = 0, glType = 0; rlGetGlTextureFormats(format, &glInternalFormat, &glFormat, &glType); - glBindImageTexture(index, id, 0, 0, 0, readonly ? GL_READ_ONLY : GL_READ_WRITE, glInternalFormat); + glBindImageTexture(index, id, 0, 0, 0, readonly? GL_READ_ONLY : GL_READ_WRITE, glInternalFormat); #endif } @@ -4428,6 +4540,9 @@ const char *rlGetPixelFormatName(unsigned int format) case RL_PIXELFORMAT_UNCOMPRESSED_R32: return "R32"; break; // 32 bpp (1 channel - float) case RL_PIXELFORMAT_UNCOMPRESSED_R32G32B32: return "R32G32B32"; break; // 32*3 bpp (3 channels - float) case RL_PIXELFORMAT_UNCOMPRESSED_R32G32B32A32: return "R32G32B32A32"; break; // 32*4 bpp (4 channels - float) + case RL_PIXELFORMAT_UNCOMPRESSED_R16: return "R16"; break; // 16 bpp (1 channel - half float) + case RL_PIXELFORMAT_UNCOMPRESSED_R16G16B16: return "R16G16B16"; break; // 16*3 bpp (3 channels - half float) + case RL_PIXELFORMAT_UNCOMPRESSED_R16G16B16A16: return "R16G16B16A16"; break; // 16*4 bpp (4 channels - half float) case RL_PIXELFORMAT_COMPRESSED_DXT1_RGB: return "DXT1_RGB"; break; // 4 bpp (no alpha) case RL_PIXELFORMAT_COMPRESSED_DXT1_RGBA: return "DXT1_RGBA"; break; // 4 bpp (1 bit alpha) case RL_PIXELFORMAT_COMPRESSED_DXT3_RGBA: return "DXT3_RGBA"; break; // 8 bpp @@ -4476,6 +4591,7 @@ static void rlLoadShaderDefault(void) #endif #if defined(GRAPHICS_API_OPENGL_ES2) "#version 100 \n" + "precision mediump float; \n" // Precision required for OpenGL ES2 (WebGL) (on some browsers) "attribute vec3 vertexPosition; \n" "attribute vec2 vertexTexCoord; \n" "attribute vec4 vertexColor; \n" @@ -4574,7 +4690,7 @@ static void rlUnloadShaderDefault(void) #if defined(RLGL_SHOW_GL_DETAILS_INFO) // Get compressed format official GL identifier name -static char *rlGetCompressedFormatName(int format) +static const char *rlGetCompressedFormatName(int format) { switch (format) { @@ -4669,6 +4785,9 @@ static int rlGetPixelDataSize(int width, int height, int format) case RL_PIXELFORMAT_UNCOMPRESSED_R32: bpp = 32; break; case RL_PIXELFORMAT_UNCOMPRESSED_R32G32B32: bpp = 32*3; break; case RL_PIXELFORMAT_UNCOMPRESSED_R32G32B32A32: bpp = 32*4; break; + case RL_PIXELFORMAT_UNCOMPRESSED_R16: bpp = 16; break; + case RL_PIXELFORMAT_UNCOMPRESSED_R16G16B16: bpp = 16*3; break; + case RL_PIXELFORMAT_UNCOMPRESSED_R16G16B16A16: bpp = 16*4; break; case RL_PIXELFORMAT_COMPRESSED_DXT1_RGB: case RL_PIXELFORMAT_COMPRESSED_DXT1_RGBA: case RL_PIXELFORMAT_COMPRESSED_ETC1_RGB: diff --git a/src/generated/node-raylib-drm.js b/src/generated/node-raylib-drm.js index fc21812..e3d1de4 100644 --- a/src/generated/node-raylib-drm.js +++ b/src/generated/node-raylib-drm.js @@ -20,7 +20,7 @@ const raylib = {} * * @return {undefined} */ -function InitWindow (width, height, title) { +function InitWindow(width, height, title) { return r.BindInitWindow( width, height, @@ -30,31 +30,31 @@ function InitWindow (width, height, title) { raylib.InitWindow = InitWindow /** - * Check if KEY_ESCAPE pressed or Close icon pressed + * Close window and unload OpenGL context * - * @return {boolean} The resulting bool. + * @return {undefined} */ -function WindowShouldClose () { - return r.BindWindowShouldClose() +function CloseWindow() { + return r.BindCloseWindow() } -raylib.WindowShouldClose = WindowShouldClose +raylib.CloseWindow = CloseWindow /** - * Close window and unload OpenGL context + * Check if application should close (KEY_ESCAPE pressed or windows close icon clicked) * - * @return {undefined} + * @return {boolean} The resulting bool. */ -function CloseWindow () { - return r.BindCloseWindow() +function WindowShouldClose() { + return r.BindWindowShouldClose() } -raylib.CloseWindow = CloseWindow +raylib.WindowShouldClose = WindowShouldClose /** * Check if window has been initialized successfully * * @return {boolean} The resulting bool. */ -function IsWindowReady () { +function IsWindowReady() { return r.BindIsWindowReady() } raylib.IsWindowReady = IsWindowReady @@ -64,7 +64,7 @@ raylib.IsWindowReady = IsWindowReady * * @return {boolean} The resulting bool. */ -function IsWindowFullscreen () { +function IsWindowFullscreen() { return r.BindIsWindowFullscreen() } raylib.IsWindowFullscreen = IsWindowFullscreen @@ -74,7 +74,7 @@ raylib.IsWindowFullscreen = IsWindowFullscreen * * @return {boolean} The resulting bool. */ -function IsWindowHidden () { +function IsWindowHidden() { return r.BindIsWindowHidden() } raylib.IsWindowHidden = IsWindowHidden @@ -84,7 +84,7 @@ raylib.IsWindowHidden = IsWindowHidden * * @return {boolean} The resulting bool. */ -function IsWindowMinimized () { +function IsWindowMinimized() { return r.BindIsWindowMinimized() } raylib.IsWindowMinimized = IsWindowMinimized @@ -94,7 +94,7 @@ raylib.IsWindowMinimized = IsWindowMinimized * * @return {boolean} The resulting bool. */ -function IsWindowMaximized () { +function IsWindowMaximized() { return r.BindIsWindowMaximized() } raylib.IsWindowMaximized = IsWindowMaximized @@ -104,7 +104,7 @@ raylib.IsWindowMaximized = IsWindowMaximized * * @return {boolean} The resulting bool. */ -function IsWindowFocused () { +function IsWindowFocused() { return r.BindIsWindowFocused() } raylib.IsWindowFocused = IsWindowFocused @@ -114,7 +114,7 @@ raylib.IsWindowFocused = IsWindowFocused * * @return {boolean} The resulting bool. */ -function IsWindowResized () { +function IsWindowResized() { return r.BindIsWindowResized() } raylib.IsWindowResized = IsWindowResized @@ -126,7 +126,7 @@ raylib.IsWindowResized = IsWindowResized * * @return {boolean} The resulting bool. */ -function IsWindowState (flag) { +function IsWindowState(flag) { return r.BindIsWindowState( flag ) @@ -140,7 +140,7 @@ raylib.IsWindowState = IsWindowState * * @return {undefined} */ -function SetWindowState (flags) { +function SetWindowState(flags) { return r.BindSetWindowState( flags ) @@ -154,7 +154,7 @@ raylib.SetWindowState = SetWindowState * * @return {undefined} */ -function ClearWindowState (flags) { +function ClearWindowState(flags) { return r.BindClearWindowState( flags ) @@ -166,17 +166,27 @@ raylib.ClearWindowState = ClearWindowState * * @return {undefined} */ -function ToggleFullscreen () { +function ToggleFullscreen() { return r.BindToggleFullscreen() } raylib.ToggleFullscreen = ToggleFullscreen +/** + * Toggle window state: borderless windowed (only PLATFORM_DESKTOP) + * + * @return {undefined} + */ +function ToggleBorderlessWindowed() { + return r.BindToggleBorderlessWindowed() +} +raylib.ToggleBorderlessWindowed = ToggleBorderlessWindowed + /** * Set window state: maximized, if resizable (only PLATFORM_DESKTOP) * * @return {undefined} */ -function MaximizeWindow () { +function MaximizeWindow() { return r.BindMaximizeWindow() } raylib.MaximizeWindow = MaximizeWindow @@ -186,7 +196,7 @@ raylib.MaximizeWindow = MaximizeWindow * * @return {undefined} */ -function MinimizeWindow () { +function MinimizeWindow() { return r.BindMinimizeWindow() } raylib.MinimizeWindow = MinimizeWindow @@ -196,7 +206,7 @@ raylib.MinimizeWindow = MinimizeWindow * * @return {undefined} */ -function RestoreWindow () { +function RestoreWindow() { return r.BindRestoreWindow() } raylib.RestoreWindow = RestoreWindow @@ -208,7 +218,7 @@ raylib.RestoreWindow = RestoreWindow * * @return {undefined} */ -function SetWindowIcon (image) { +function SetWindowIcon(image) { return r.BindSetWindowIcon( image.data, image.width, @@ -227,7 +237,7 @@ raylib.SetWindowIcon = SetWindowIcon * * @return {undefined} */ -function SetWindowIcons (images, count) { +function SetWindowIcons(images, count) { return r.BindSetWindowIcons( images, count @@ -236,13 +246,13 @@ function SetWindowIcons (images, count) { raylib.SetWindowIcons = SetWindowIcons /** - * Set title for window (only PLATFORM_DESKTOP) + * Set title for window (only PLATFORM_DESKTOP and PLATFORM_WEB) * * @param {string} title * * @return {undefined} */ -function SetWindowTitle (title) { +function SetWindowTitle(title) { return r.BindSetWindowTitle( title ) @@ -257,7 +267,7 @@ raylib.SetWindowTitle = SetWindowTitle * * @return {undefined} */ -function SetWindowPosition (x, y) { +function SetWindowPosition(x, y) { return r.BindSetWindowPosition( x, y @@ -266,13 +276,13 @@ function SetWindowPosition (x, y) { raylib.SetWindowPosition = SetWindowPosition /** - * Set monitor for the current window (fullscreen mode) + * Set monitor for the current window * * @param {number} monitor * * @return {undefined} */ -function SetWindowMonitor (monitor) { +function SetWindowMonitor(monitor) { return r.BindSetWindowMonitor( monitor ) @@ -287,7 +297,7 @@ raylib.SetWindowMonitor = SetWindowMonitor * * @return {undefined} */ -function SetWindowMinSize (width, height) { +function SetWindowMinSize(width, height) { return r.BindSetWindowMinSize( width, height @@ -295,6 +305,22 @@ function SetWindowMinSize (width, height) { } raylib.SetWindowMinSize = SetWindowMinSize +/** + * Set window maximum dimensions (for FLAG_WINDOW_RESIZABLE) + * + * @param {number} width + * @param {number} height + * + * @return {undefined} + */ +function SetWindowMaxSize(width, height) { + return r.BindSetWindowMaxSize( + width, + height + ) +} +raylib.SetWindowMaxSize = SetWindowMaxSize + /** * Set window dimensions * @@ -303,7 +329,7 @@ raylib.SetWindowMinSize = SetWindowMinSize * * @return {undefined} */ -function SetWindowSize (width, height) { +function SetWindowSize(width, height) { return r.BindSetWindowSize( width, height @@ -318,19 +344,29 @@ raylib.SetWindowSize = SetWindowSize * * @return {undefined} */ -function SetWindowOpacity (opacity) { +function SetWindowOpacity(opacity) { return r.BindSetWindowOpacity( opacity ) } raylib.SetWindowOpacity = SetWindowOpacity +/** + * Set window focused (only PLATFORM_DESKTOP) + * + * @return {undefined} + */ +function SetWindowFocused() { + return r.BindSetWindowFocused() +} +raylib.SetWindowFocused = SetWindowFocused + /** * Get native window handle * * @return {number} The resulting void *. */ -function GetWindowHandle () { +function GetWindowHandle() { return r.BindGetWindowHandle() } raylib.GetWindowHandle = GetWindowHandle @@ -340,7 +376,7 @@ raylib.GetWindowHandle = GetWindowHandle * * @return {number} The resulting int. */ -function GetScreenWidth () { +function GetScreenWidth() { return r.BindGetScreenWidth() } raylib.GetScreenWidth = GetScreenWidth @@ -350,7 +386,7 @@ raylib.GetScreenWidth = GetScreenWidth * * @return {number} The resulting int. */ -function GetScreenHeight () { +function GetScreenHeight() { return r.BindGetScreenHeight() } raylib.GetScreenHeight = GetScreenHeight @@ -360,7 +396,7 @@ raylib.GetScreenHeight = GetScreenHeight * * @return {number} The resulting int. */ -function GetRenderWidth () { +function GetRenderWidth() { return r.BindGetRenderWidth() } raylib.GetRenderWidth = GetRenderWidth @@ -370,7 +406,7 @@ raylib.GetRenderWidth = GetRenderWidth * * @return {number} The resulting int. */ -function GetRenderHeight () { +function GetRenderHeight() { return r.BindGetRenderHeight() } raylib.GetRenderHeight = GetRenderHeight @@ -380,7 +416,7 @@ raylib.GetRenderHeight = GetRenderHeight * * @return {number} The resulting int. */ -function GetMonitorCount () { +function GetMonitorCount() { return r.BindGetMonitorCount() } raylib.GetMonitorCount = GetMonitorCount @@ -390,7 +426,7 @@ raylib.GetMonitorCount = GetMonitorCount * * @return {number} The resulting int. */ -function GetCurrentMonitor () { +function GetCurrentMonitor() { return r.BindGetCurrentMonitor() } raylib.GetCurrentMonitor = GetCurrentMonitor @@ -402,7 +438,7 @@ raylib.GetCurrentMonitor = GetCurrentMonitor * * @return {Vector2} The resulting Vector2. */ -function GetMonitorPosition (monitor) { +function GetMonitorPosition(monitor) { return r.BindGetMonitorPosition( monitor ) @@ -416,7 +452,7 @@ raylib.GetMonitorPosition = GetMonitorPosition * * @return {number} The resulting int. */ -function GetMonitorWidth (monitor) { +function GetMonitorWidth(monitor) { return r.BindGetMonitorWidth( monitor ) @@ -430,7 +466,7 @@ raylib.GetMonitorWidth = GetMonitorWidth * * @return {number} The resulting int. */ -function GetMonitorHeight (monitor) { +function GetMonitorHeight(monitor) { return r.BindGetMonitorHeight( monitor ) @@ -444,7 +480,7 @@ raylib.GetMonitorHeight = GetMonitorHeight * * @return {number} The resulting int. */ -function GetMonitorPhysicalWidth (monitor) { +function GetMonitorPhysicalWidth(monitor) { return r.BindGetMonitorPhysicalWidth( monitor ) @@ -458,7 +494,7 @@ raylib.GetMonitorPhysicalWidth = GetMonitorPhysicalWidth * * @return {number} The resulting int. */ -function GetMonitorPhysicalHeight (monitor) { +function GetMonitorPhysicalHeight(monitor) { return r.BindGetMonitorPhysicalHeight( monitor ) @@ -472,7 +508,7 @@ raylib.GetMonitorPhysicalHeight = GetMonitorPhysicalHeight * * @return {number} The resulting int. */ -function GetMonitorRefreshRate (monitor) { +function GetMonitorRefreshRate(monitor) { return r.BindGetMonitorRefreshRate( monitor ) @@ -484,7 +520,7 @@ raylib.GetMonitorRefreshRate = GetMonitorRefreshRate * * @return {Vector2} The resulting Vector2. */ -function GetWindowPosition () { +function GetWindowPosition() { return r.BindGetWindowPosition() } raylib.GetWindowPosition = GetWindowPosition @@ -494,19 +530,19 @@ raylib.GetWindowPosition = GetWindowPosition * * @return {Vector2} The resulting Vector2. */ -function GetWindowScaleDPI () { +function GetWindowScaleDPI() { return r.BindGetWindowScaleDPI() } raylib.GetWindowScaleDPI = GetWindowScaleDPI /** - * Get the human-readable, UTF-8 encoded name of the primary monitor + * Get the human-readable, UTF-8 encoded name of the specified monitor * * @param {number} monitor * * @return {string} The resulting const char *. */ -function GetMonitorName (monitor) { +function GetMonitorName(monitor) { return r.BindGetMonitorName( monitor ) @@ -520,7 +556,7 @@ raylib.GetMonitorName = GetMonitorName * * @return {undefined} */ -function SetClipboardText (text) { +function SetClipboardText(text) { return r.BindSetClipboardText( text ) @@ -532,7 +568,7 @@ raylib.SetClipboardText = SetClipboardText * * @return {string} The resulting const char *. */ -function GetClipboardText () { +function GetClipboardText() { return r.BindGetClipboardText() } raylib.GetClipboardText = GetClipboardText @@ -542,7 +578,7 @@ raylib.GetClipboardText = GetClipboardText * * @return {undefined} */ -function EnableEventWaiting () { +function EnableEventWaiting() { return r.BindEnableEventWaiting() } raylib.EnableEventWaiting = EnableEventWaiting @@ -552,51 +588,17 @@ raylib.EnableEventWaiting = EnableEventWaiting * * @return {undefined} */ -function DisableEventWaiting () { +function DisableEventWaiting() { return r.BindDisableEventWaiting() } raylib.DisableEventWaiting = DisableEventWaiting -/** - * Swap back buffer with front buffer (screen drawing) - * - * @return {undefined} - */ -function SwapScreenBuffer () { - return r.BindSwapScreenBuffer() -} -raylib.SwapScreenBuffer = SwapScreenBuffer - -/** - * Register all input events - * - * @return {undefined} - */ -function PollInputEvents () { - return r.BindPollInputEvents() -} -raylib.PollInputEvents = PollInputEvents - -/** - * Wait for some time (halt program execution) - * - * @param {number} seconds - * - * @return {undefined} - */ -function WaitTime (seconds) { - return r.BindWaitTime( - seconds - ) -} -raylib.WaitTime = WaitTime - /** * Shows cursor * * @return {undefined} */ -function ShowCursor () { +function ShowCursor() { return r.BindShowCursor() } raylib.ShowCursor = ShowCursor @@ -606,7 +608,7 @@ raylib.ShowCursor = ShowCursor * * @return {undefined} */ -function HideCursor () { +function HideCursor() { return r.BindHideCursor() } raylib.HideCursor = HideCursor @@ -616,7 +618,7 @@ raylib.HideCursor = HideCursor * * @return {boolean} The resulting bool. */ -function IsCursorHidden () { +function IsCursorHidden() { return r.BindIsCursorHidden() } raylib.IsCursorHidden = IsCursorHidden @@ -626,7 +628,7 @@ raylib.IsCursorHidden = IsCursorHidden * * @return {undefined} */ -function EnableCursor () { +function EnableCursor() { return r.BindEnableCursor() } raylib.EnableCursor = EnableCursor @@ -636,7 +638,7 @@ raylib.EnableCursor = EnableCursor * * @return {undefined} */ -function DisableCursor () { +function DisableCursor() { return r.BindDisableCursor() } raylib.DisableCursor = DisableCursor @@ -646,7 +648,7 @@ raylib.DisableCursor = DisableCursor * * @return {boolean} The resulting bool. */ -function IsCursorOnScreen () { +function IsCursorOnScreen() { return r.BindIsCursorOnScreen() } raylib.IsCursorOnScreen = IsCursorOnScreen @@ -658,7 +660,7 @@ raylib.IsCursorOnScreen = IsCursorOnScreen * * @return {undefined} */ -function ClearBackground (color) { +function ClearBackground(color) { return r.BindClearBackground( color.r, color.g, @@ -673,7 +675,7 @@ raylib.ClearBackground = ClearBackground * * @return {undefined} */ -function BeginDrawing () { +function BeginDrawing() { return r.BindBeginDrawing() } raylib.BeginDrawing = BeginDrawing @@ -683,7 +685,7 @@ raylib.BeginDrawing = BeginDrawing * * @return {undefined} */ -function EndDrawing () { +function EndDrawing() { return r.BindEndDrawing() } raylib.EndDrawing = EndDrawing @@ -695,7 +697,7 @@ raylib.EndDrawing = EndDrawing * * @return {undefined} */ -function BeginMode2D (camera) { +function BeginMode2D(camera) { return r.BindBeginMode2D( camera.offset.x, camera.offset.y, @@ -712,7 +714,7 @@ raylib.BeginMode2D = BeginMode2D * * @return {undefined} */ -function EndMode2D () { +function EndMode2D() { return r.BindEndMode2D() } raylib.EndMode2D = EndMode2D @@ -724,7 +726,7 @@ raylib.EndMode2D = EndMode2D * * @return {undefined} */ -function BeginMode3D (camera) { +function BeginMode3D(camera) { return r.BindBeginMode3D( camera.position.x, camera.position.y, @@ -746,7 +748,7 @@ raylib.BeginMode3D = BeginMode3D * * @return {undefined} */ -function EndMode3D () { +function EndMode3D() { return r.BindEndMode3D() } raylib.EndMode3D = EndMode3D @@ -758,7 +760,7 @@ raylib.EndMode3D = EndMode3D * * @return {undefined} */ -function BeginTextureMode (target) { +function BeginTextureMode(target) { return r.BindBeginTextureMode( target.id, target.texture.id, @@ -780,7 +782,7 @@ raylib.BeginTextureMode = BeginTextureMode * * @return {undefined} */ -function EndTextureMode () { +function EndTextureMode() { return r.BindEndTextureMode() } raylib.EndTextureMode = EndTextureMode @@ -792,7 +794,7 @@ raylib.EndTextureMode = EndTextureMode * * @return {undefined} */ -function BeginShaderMode (shader) { +function BeginShaderMode(shader) { return r.BindBeginShaderMode( shader.id, shader.locs @@ -805,7 +807,7 @@ raylib.BeginShaderMode = BeginShaderMode * * @return {undefined} */ -function EndShaderMode () { +function EndShaderMode() { return r.BindEndShaderMode() } raylib.EndShaderMode = EndShaderMode @@ -817,7 +819,7 @@ raylib.EndShaderMode = EndShaderMode * * @return {undefined} */ -function BeginBlendMode (mode) { +function BeginBlendMode(mode) { return r.BindBeginBlendMode( mode ) @@ -829,7 +831,7 @@ raylib.BeginBlendMode = BeginBlendMode * * @return {undefined} */ -function EndBlendMode () { +function EndBlendMode() { return r.BindEndBlendMode() } raylib.EndBlendMode = EndBlendMode @@ -844,7 +846,7 @@ raylib.EndBlendMode = EndBlendMode * * @return {undefined} */ -function BeginScissorMode (x, y, width, height) { +function BeginScissorMode(x, y, width, height) { return r.BindBeginScissorMode( x, y, @@ -859,7 +861,7 @@ raylib.BeginScissorMode = BeginScissorMode * * @return {undefined} */ -function EndScissorMode () { +function EndScissorMode() { return r.BindEndScissorMode() } raylib.EndScissorMode = EndScissorMode @@ -869,7 +871,7 @@ raylib.EndScissorMode = EndScissorMode * * @return {undefined} */ -function EndVrStereoMode () { +function EndVrStereoMode() { return r.BindEndVrStereoMode() } raylib.EndVrStereoMode = EndVrStereoMode @@ -882,7 +884,7 @@ raylib.EndVrStereoMode = EndVrStereoMode * * @return {Shader} The resulting Shader. */ -function LoadShader (vsFileName, fsFileName) { +function LoadShader(vsFileName, fsFileName) { return r.BindLoadShader( vsFileName, fsFileName @@ -898,7 +900,7 @@ raylib.LoadShader = LoadShader * * @return {Shader} The resulting Shader. */ -function LoadShaderFromMemory (vsCode, fsCode) { +function LoadShaderFromMemory(vsCode, fsCode) { return r.BindLoadShaderFromMemory( vsCode, fsCode @@ -913,7 +915,7 @@ raylib.LoadShaderFromMemory = LoadShaderFromMemory * * @return {boolean} The resulting bool. */ -function IsShaderReady (shader) { +function IsShaderReady(shader) { return r.BindIsShaderReady( shader.id, shader.locs @@ -929,7 +931,7 @@ raylib.IsShaderReady = IsShaderReady * * @return {number} The resulting int. */ -function GetShaderLocation (shader, uniformName) { +function GetShaderLocation(shader, uniformName) { return r.BindGetShaderLocation( shader.id, shader.locs, @@ -946,7 +948,7 @@ raylib.GetShaderLocation = GetShaderLocation * * @return {number} The resulting int. */ -function GetShaderLocationAttrib (shader, attribName) { +function GetShaderLocationAttrib(shader, attribName) { return r.BindGetShaderLocationAttrib( shader.id, shader.locs, @@ -964,7 +966,7 @@ raylib.GetShaderLocationAttrib = GetShaderLocationAttrib * * @return {undefined} */ -function SetShaderValueMatrix (shader, locIndex, mat) { +function SetShaderValueMatrix(shader, locIndex, mat) { return r.BindSetShaderValueMatrix( shader.id, shader.locs, @@ -998,7 +1000,7 @@ raylib.SetShaderValueMatrix = SetShaderValueMatrix * * @return {undefined} */ -function SetShaderValueTexture (shader, locIndex, texture) { +function SetShaderValueTexture(shader, locIndex, texture) { return r.BindSetShaderValueTexture( shader.id, shader.locs, @@ -1019,7 +1021,7 @@ raylib.SetShaderValueTexture = SetShaderValueTexture * * @return {undefined} */ -function UnloadShader (shader) { +function UnloadShader(shader) { return r.BindUnloadShader( shader.id, shader.locs @@ -1035,7 +1037,7 @@ raylib.UnloadShader = UnloadShader * * @return {Ray} The resulting Ray. */ -function GetMouseRay (mousePosition, camera) { +function GetMouseRay(mousePosition, camera) { return r.BindGetMouseRay( mousePosition.x, mousePosition.y, @@ -1061,7 +1063,7 @@ raylib.GetMouseRay = GetMouseRay * * @return {Matrix} The resulting Matrix. */ -function GetCameraMatrix (camera) { +function GetCameraMatrix(camera) { return r.BindGetCameraMatrix( camera.position.x, camera.position.y, @@ -1085,7 +1087,7 @@ raylib.GetCameraMatrix = GetCameraMatrix * * @return {Matrix} The resulting Matrix. */ -function GetCameraMatrix2D (camera) { +function GetCameraMatrix2D(camera) { return r.BindGetCameraMatrix2D( camera.offset.x, camera.offset.y, @@ -1105,7 +1107,7 @@ raylib.GetCameraMatrix2D = GetCameraMatrix2D * * @return {Vector2} The resulting Vector2. */ -function GetWorldToScreen (position, camera) { +function GetWorldToScreen(position, camera) { return r.BindGetWorldToScreen( position.x, position.y, @@ -1133,7 +1135,7 @@ raylib.GetWorldToScreen = GetWorldToScreen * * @return {Vector2} The resulting Vector2. */ -function GetScreenToWorld2D (position, camera) { +function GetScreenToWorld2D(position, camera) { return r.BindGetScreenToWorld2D( position.x, position.y, @@ -1157,7 +1159,7 @@ raylib.GetScreenToWorld2D = GetScreenToWorld2D * * @return {Vector2} The resulting Vector2. */ -function GetWorldToScreenEx (position, camera, width, height) { +function GetWorldToScreenEx(position, camera, width, height) { return r.BindGetWorldToScreenEx( position.x, position.y, @@ -1187,7 +1189,7 @@ raylib.GetWorldToScreenEx = GetWorldToScreenEx * * @return {Vector2} The resulting Vector2. */ -function GetWorldToScreen2D (position, camera) { +function GetWorldToScreen2D(position, camera) { return r.BindGetWorldToScreen2D( position.x, position.y, @@ -1208,42 +1210,90 @@ raylib.GetWorldToScreen2D = GetWorldToScreen2D * * @return {undefined} */ -function SetTargetFPS (fps) { +function SetTargetFPS(fps) { return r.BindSetTargetFPS( fps ) } raylib.SetTargetFPS = SetTargetFPS +/** + * Get time in seconds for last frame drawn (delta time) + * + * @return {number} The resulting float. + */ +function GetFrameTime() { + return r.BindGetFrameTime() +} +raylib.GetFrameTime = GetFrameTime + +/** + * Get elapsed time in seconds since InitWindow() + * + * @return {number} The resulting double. + */ +function GetTime() { + return r.BindGetTime() +} +raylib.GetTime = GetTime + /** * Get current FPS * * @return {number} The resulting int. */ -function GetFPS () { +function GetFPS() { return r.BindGetFPS() } raylib.GetFPS = GetFPS /** - * Get time in seconds for last frame drawn (delta time) + * Swap back buffer with front buffer (screen drawing) * - * @return {number} The resulting float. + * @return {undefined} */ -function GetFrameTime () { - return r.BindGetFrameTime() +function SwapScreenBuffer() { + return r.BindSwapScreenBuffer() } -raylib.GetFrameTime = GetFrameTime +raylib.SwapScreenBuffer = SwapScreenBuffer /** - * Get elapsed time in seconds since InitWindow() + * Register all input events * - * @return {number} The resulting double. + * @return {undefined} */ -function GetTime () { - return r.BindGetTime() +function PollInputEvents() { + return r.BindPollInputEvents() } -raylib.GetTime = GetTime +raylib.PollInputEvents = PollInputEvents + +/** + * Wait for some time (halt program execution) + * + * @param {number} seconds + * + * @return {undefined} + */ +function WaitTime(seconds) { + return r.BindWaitTime( + seconds + ) +} +raylib.WaitTime = WaitTime + +/** + * Set the seed for the random number generator + * + * @param {number} seed + * + * @return {undefined} + */ +function SetRandomSeed(seed) { + return r.BindSetRandomSeed( + seed + ) +} +raylib.SetRandomSeed = SetRandomSeed /** * Get a random value between min and max (both included) @@ -1253,7 +1303,7 @@ raylib.GetTime = GetTime * * @return {number} The resulting int. */ -function GetRandomValue (min, max) { +function GetRandomValue(min, max) { return r.BindGetRandomValue( min, max @@ -1262,18 +1312,36 @@ function GetRandomValue (min, max) { raylib.GetRandomValue = GetRandomValue /** - * Set the seed for the random number generator + * Load random values sequence, no values repeated * - * @param {number} seed + * @param {number} count + * @param {number} min + * @param {number} max + * + * @return {number} The resulting int *. + */ +function LoadRandomSequence(count, min, max) { + return r.BindLoadRandomSequence( + count, + min, + max + ) +} +raylib.LoadRandomSequence = LoadRandomSequence + +/** + * Unload random values sequence + * + * @param {number} sequence * * @return {undefined} */ -function SetRandomSeed (seed) { - return r.BindSetRandomSeed( - seed +function UnloadRandomSequence(sequence) { + return r.BindUnloadRandomSequence( + sequence ) } -raylib.SetRandomSeed = SetRandomSeed +raylib.UnloadRandomSequence = UnloadRandomSequence /** * Takes a screenshot of current screen (filename extension defines format) @@ -1282,7 +1350,7 @@ raylib.SetRandomSeed = SetRandomSeed * * @return {undefined} */ -function TakeScreenshot (fileName) { +function TakeScreenshot(fileName) { return r.BindTakeScreenshot( fileName ) @@ -1296,13 +1364,27 @@ raylib.TakeScreenshot = TakeScreenshot * * @return {undefined} */ -function SetConfigFlags (flags) { +function SetConfigFlags(flags) { return r.BindSetConfigFlags( flags ) } raylib.SetConfigFlags = SetConfigFlags +/** + * Open URL with default system browser (if available) + * + * @param {string} url + * + * @return {undefined} + */ +function OpenURL(url) { + return r.BindOpenURL( + url + ) +} +raylib.OpenURL = OpenURL + /** * Set the current threshold (minimum) log level * @@ -1310,7 +1392,7 @@ raylib.SetConfigFlags = SetConfigFlags * * @return {undefined} */ -function SetTraceLogLevel (logLevel) { +function SetTraceLogLevel(logLevel) { return r.BindSetTraceLogLevel( logLevel ) @@ -1324,7 +1406,7 @@ raylib.SetTraceLogLevel = SetTraceLogLevel * * @return {number} The resulting void *. */ -function MemAlloc (size) { +function MemAlloc(size) { return r.BindMemAlloc( size ) @@ -1339,7 +1421,7 @@ raylib.MemAlloc = MemAlloc * * @return {number} The resulting void *. */ -function MemRealloc (ptr, size) { +function MemRealloc(ptr, size) { return r.BindMemRealloc( ptr, size @@ -1354,39 +1436,25 @@ raylib.MemRealloc = MemRealloc * * @return {undefined} */ -function MemFree (ptr) { +function MemFree(ptr) { return r.BindMemFree( ptr ) } raylib.MemFree = MemFree -/** - * Open URL with default system browser (if available) - * - * @param {string} url - * - * @return {undefined} - */ -function OpenURL (url) { - return r.BindOpenURL( - url - ) -} -raylib.OpenURL = OpenURL - /** * Load file data as byte array (read) * * @param {string} fileName - * @param {number} bytesRead + * @param {number} dataSize * * @return {Buffer} The resulting unsigned char *. */ -function LoadFileData (fileName, bytesRead) { +function LoadFileData(fileName, dataSize) { return r.BindLoadFileData( fileName, - bytesRead + dataSize ) } raylib.LoadFileData = LoadFileData @@ -1398,7 +1466,7 @@ raylib.LoadFileData = LoadFileData * * @return {undefined} */ -function UnloadFileData (data) { +function UnloadFileData(data) { return r.BindUnloadFileData( data ) @@ -1410,15 +1478,15 @@ raylib.UnloadFileData = UnloadFileData * * @param {string} fileName * @param {number} data - * @param {number} bytesToWrite + * @param {number} dataSize * * @return {boolean} The resulting bool. */ -function SaveFileData (fileName, data, bytesToWrite) { +function SaveFileData(fileName, data, dataSize) { return r.BindSaveFileData( fileName, data, - bytesToWrite + dataSize ) } raylib.SaveFileData = SaveFileData @@ -1427,15 +1495,15 @@ raylib.SaveFileData = SaveFileData * Export data to code (.h), returns true on success * * @param {Buffer} data - * @param {number} size + * @param {number} dataSize * @param {string} fileName * * @return {boolean} The resulting bool. */ -function ExportDataAsCode (data, size, fileName) { +function ExportDataAsCode(data, dataSize, fileName) { return r.BindExportDataAsCode( data, - size, + dataSize, fileName ) } @@ -1448,7 +1516,7 @@ raylib.ExportDataAsCode = ExportDataAsCode * * @return {string} The resulting char *. */ -function LoadFileText (fileName) { +function LoadFileText(fileName) { return r.BindLoadFileText( fileName ) @@ -1462,7 +1530,7 @@ raylib.LoadFileText = LoadFileText * * @return {undefined} */ -function UnloadFileText (text) { +function UnloadFileText(text) { return r.BindUnloadFileText( text ) @@ -1477,7 +1545,7 @@ raylib.UnloadFileText = UnloadFileText * * @return {boolean} The resulting bool. */ -function SaveFileText (fileName, text) { +function SaveFileText(fileName, text) { return r.BindSaveFileText( fileName, text @@ -1492,7 +1560,7 @@ raylib.SaveFileText = SaveFileText * * @return {boolean} The resulting bool. */ -function FileExists (fileName) { +function FileExists(fileName) { return r.BindFileExists( fileName ) @@ -1506,7 +1574,7 @@ raylib.FileExists = FileExists * * @return {boolean} The resulting bool. */ -function DirectoryExists (dirPath) { +function DirectoryExists(dirPath) { return r.BindDirectoryExists( dirPath ) @@ -1521,7 +1589,7 @@ raylib.DirectoryExists = DirectoryExists * * @return {boolean} The resulting bool. */ -function IsFileExtension (fileName, ext) { +function IsFileExtension(fileName, ext) { return r.BindIsFileExtension( fileName, ext @@ -1536,7 +1604,7 @@ raylib.IsFileExtension = IsFileExtension * * @return {number} The resulting int. */ -function GetFileLength (fileName) { +function GetFileLength(fileName) { return r.BindGetFileLength( fileName ) @@ -1550,7 +1618,7 @@ raylib.GetFileLength = GetFileLength * * @return {string} The resulting const char *. */ -function GetFileExtension (fileName) { +function GetFileExtension(fileName) { return r.BindGetFileExtension( fileName ) @@ -1564,7 +1632,7 @@ raylib.GetFileExtension = GetFileExtension * * @return {string} The resulting const char *. */ -function GetFileName (filePath) { +function GetFileName(filePath) { return r.BindGetFileName( filePath ) @@ -1578,7 +1646,7 @@ raylib.GetFileName = GetFileName * * @return {string} The resulting const char *. */ -function GetFileNameWithoutExt (filePath) { +function GetFileNameWithoutExt(filePath) { return r.BindGetFileNameWithoutExt( filePath ) @@ -1592,7 +1660,7 @@ raylib.GetFileNameWithoutExt = GetFileNameWithoutExt * * @return {string} The resulting const char *. */ -function GetDirectoryPath (filePath) { +function GetDirectoryPath(filePath) { return r.BindGetDirectoryPath( filePath ) @@ -1606,7 +1674,7 @@ raylib.GetDirectoryPath = GetDirectoryPath * * @return {string} The resulting const char *. */ -function GetPrevDirectoryPath (dirPath) { +function GetPrevDirectoryPath(dirPath) { return r.BindGetPrevDirectoryPath( dirPath ) @@ -1618,17 +1686,17 @@ raylib.GetPrevDirectoryPath = GetPrevDirectoryPath * * @return {string} The resulting const char *. */ -function GetWorkingDirectory () { +function GetWorkingDirectory() { return r.BindGetWorkingDirectory() } raylib.GetWorkingDirectory = GetWorkingDirectory /** - * Get the directory if the running application (uses static string) + * Get the directory of the running application (uses static string) * * @return {string} The resulting const char *. */ -function GetApplicationDirectory () { +function GetApplicationDirectory() { return r.BindGetApplicationDirectory() } raylib.GetApplicationDirectory = GetApplicationDirectory @@ -1640,7 +1708,7 @@ raylib.GetApplicationDirectory = GetApplicationDirectory * * @return {boolean} The resulting bool. */ -function ChangeDirectory (dir) { +function ChangeDirectory(dir) { return r.BindChangeDirectory( dir ) @@ -1654,7 +1722,7 @@ raylib.ChangeDirectory = ChangeDirectory * * @return {boolean} The resulting bool. */ -function IsPathFile (path) { +function IsPathFile(path) { return r.BindIsPathFile( path ) @@ -1668,7 +1736,7 @@ raylib.IsPathFile = IsPathFile * * @return {FilePathList} The resulting FilePathList. */ -function LoadDirectoryFiles (dirPath) { +function LoadDirectoryFiles(dirPath) { return r.BindLoadDirectoryFiles( dirPath ) @@ -1684,7 +1752,7 @@ raylib.LoadDirectoryFiles = LoadDirectoryFiles * * @return {FilePathList} The resulting FilePathList. */ -function LoadDirectoryFilesEx (basePath, filter, scanSubdirs) { +function LoadDirectoryFilesEx(basePath, filter, scanSubdirs) { return r.BindLoadDirectoryFilesEx( basePath, filter, @@ -1700,7 +1768,7 @@ raylib.LoadDirectoryFilesEx = LoadDirectoryFilesEx * * @return {undefined} */ -function UnloadDirectoryFiles (files) { +function UnloadDirectoryFiles(files) { return r.BindUnloadDirectoryFiles( files.capacity, files.count, @@ -1714,7 +1782,7 @@ raylib.UnloadDirectoryFiles = UnloadDirectoryFiles * * @return {boolean} The resulting bool. */ -function IsFileDropped () { +function IsFileDropped() { return r.BindIsFileDropped() } raylib.IsFileDropped = IsFileDropped @@ -1724,7 +1792,7 @@ raylib.IsFileDropped = IsFileDropped * * @return {FilePathList} The resulting FilePathList. */ -function LoadDroppedFiles () { +function LoadDroppedFiles() { return r.BindLoadDroppedFiles() } raylib.LoadDroppedFiles = LoadDroppedFiles @@ -1736,7 +1804,7 @@ raylib.LoadDroppedFiles = LoadDroppedFiles * * @return {undefined} */ -function UnloadDroppedFiles (files) { +function UnloadDroppedFiles(files) { return r.BindUnloadDroppedFiles( files.capacity, files.count, @@ -1752,7 +1820,7 @@ raylib.UnloadDroppedFiles = UnloadDroppedFiles * * @return {number} The resulting long. */ -function GetFileModTime (fileName) { +function GetFileModTime(fileName) { return r.BindGetFileModTime( fileName ) @@ -1768,7 +1836,7 @@ raylib.GetFileModTime = GetFileModTime * * @return {Buffer} The resulting unsigned char *. */ -function CompressData (data, dataSize, compDataSize) { +function CompressData(data, dataSize, compDataSize) { return r.BindCompressData( data, dataSize, @@ -1786,7 +1854,7 @@ raylib.CompressData = CompressData * * @return {Buffer} The resulting unsigned char *. */ -function DecompressData (compData, compDataSize, dataSize) { +function DecompressData(compData, compDataSize, dataSize) { return r.BindDecompressData( compData, compDataSize, @@ -1804,7 +1872,7 @@ raylib.DecompressData = DecompressData * * @return {string} The resulting char *. */ -function EncodeDataBase64 (data, dataSize, outputSize) { +function EncodeDataBase64(data, dataSize, outputSize) { return r.BindEncodeDataBase64( data, dataSize, @@ -1821,7 +1889,7 @@ raylib.EncodeDataBase64 = EncodeDataBase64 * * @return {Buffer} The resulting unsigned char *. */ -function DecodeDataBase64 (data, outputSize) { +function DecodeDataBase64(data, outputSize) { return r.BindDecodeDataBase64( data, outputSize @@ -1830,138 +1898,262 @@ function DecodeDataBase64 (data, outputSize) { raylib.DecodeDataBase64 = DecodeDataBase64 /** - * Check if a key has been pressed once + * Load automation events list from file, NULL for empty list, capacity = MAX_AUTOMATION_EVENTS * - * @param {number} key + * @param {string} fileName * - * @return {boolean} The resulting bool. + * @return {AutomationEventList} The resulting AutomationEventList. */ -function IsKeyPressed (key) { - return r.BindIsKeyPressed( - key +function LoadAutomationEventList(fileName) { + return r.BindLoadAutomationEventList( + fileName ) } -raylib.IsKeyPressed = IsKeyPressed +raylib.LoadAutomationEventList = LoadAutomationEventList /** - * Check if a key is being pressed + * Unload automation events list from file * - * @param {number} key + * @param {number} list * - * @return {boolean} The resulting bool. + * @return {undefined} */ -function IsKeyDown (key) { - return r.BindIsKeyDown( - key +function UnloadAutomationEventList(list) { + return r.BindUnloadAutomationEventList( + list ) } -raylib.IsKeyDown = IsKeyDown +raylib.UnloadAutomationEventList = UnloadAutomationEventList /** - * Check if a key has been released once + * Export automation events list as text file * - * @param {number} key + * @param {AutomationEventList} list + * @param {string} fileName * * @return {boolean} The resulting bool. */ -function IsKeyReleased (key) { - return r.BindIsKeyReleased( - key +function ExportAutomationEventList(list, fileName) { + return r.BindExportAutomationEventList( + list.capacity, + list.count, + list.events, + fileName ) } -raylib.IsKeyReleased = IsKeyReleased +raylib.ExportAutomationEventList = ExportAutomationEventList /** - * Check if a key is NOT being pressed + * Set automation event list to record to * - * @param {number} key + * @param {number} list * - * @return {boolean} The resulting bool. + * @return {undefined} */ -function IsKeyUp (key) { - return r.BindIsKeyUp( - key +function SetAutomationEventList(list) { + return r.BindSetAutomationEventList( + list ) } -raylib.IsKeyUp = IsKeyUp +raylib.SetAutomationEventList = SetAutomationEventList /** - * Set a custom key to exit program (default is ESC) + * Set automation event internal base frame to start recording * - * @param {number} key + * @param {number} frame * * @return {undefined} */ -function SetExitKey (key) { - return r.BindSetExitKey( - key +function SetAutomationEventBaseFrame(frame) { + return r.BindSetAutomationEventBaseFrame( + frame ) } -raylib.SetExitKey = SetExitKey +raylib.SetAutomationEventBaseFrame = SetAutomationEventBaseFrame /** - * Get key pressed (keycode), call it multiple times for keys queued, returns 0 when the queue is empty + * Start recording automation events (AutomationEventList must be set) * - * @return {number} The resulting int. + * @return {undefined} */ -function GetKeyPressed () { - return r.BindGetKeyPressed() +function StartAutomationEventRecording() { + return r.BindStartAutomationEventRecording() } -raylib.GetKeyPressed = GetKeyPressed +raylib.StartAutomationEventRecording = StartAutomationEventRecording /** - * Get char pressed (unicode), call it multiple times for chars queued, returns 0 when the queue is empty + * Stop recording automation events * - * @return {number} The resulting int. + * @return {undefined} */ -function GetCharPressed () { - return r.BindGetCharPressed() +function StopAutomationEventRecording() { + return r.BindStopAutomationEventRecording() } -raylib.GetCharPressed = GetCharPressed +raylib.StopAutomationEventRecording = StopAutomationEventRecording /** - * Check if a gamepad is available + * Play a recorded automation event * - * @param {number} gamepad + * @param {AutomationEvent} event * - * @return {boolean} The resulting bool. + * @return {undefined} */ -function IsGamepadAvailable (gamepad) { - return r.BindIsGamepadAvailable( - gamepad +function PlayAutomationEvent(event) { + return r.BindPlayAutomationEvent( + event.frame, + event.type, + event.params ) } -raylib.IsGamepadAvailable = IsGamepadAvailable +raylib.PlayAutomationEvent = PlayAutomationEvent /** - * Get gamepad internal name id + * Check if a key has been pressed once * - * @param {number} gamepad + * @param {number} key * - * @return {string} The resulting const char *. + * @return {boolean} The resulting bool. */ -function GetGamepadName (gamepad) { - return r.BindGetGamepadName( - gamepad +function IsKeyPressed(key) { + return r.BindIsKeyPressed( + key ) } -raylib.GetGamepadName = GetGamepadName +raylib.IsKeyPressed = IsKeyPressed /** - * Check if a gamepad button has been pressed once + * Check if a key has been pressed again (Only PLATFORM_DESKTOP) * - * @param {number} gamepad - * @param {number} button + * @param {number} key * * @return {boolean} The resulting bool. */ -function IsGamepadButtonPressed (gamepad, button) { - return r.BindIsGamepadButtonPressed( - gamepad, - button +function IsKeyPressedRepeat(key) { + return r.BindIsKeyPressedRepeat( + key ) } -raylib.IsGamepadButtonPressed = IsGamepadButtonPressed +raylib.IsKeyPressedRepeat = IsKeyPressedRepeat + +/** + * Check if a key is being pressed + * + * @param {number} key + * + * @return {boolean} The resulting bool. + */ +function IsKeyDown(key) { + return r.BindIsKeyDown( + key + ) +} +raylib.IsKeyDown = IsKeyDown + +/** + * Check if a key has been released once + * + * @param {number} key + * + * @return {boolean} The resulting bool. + */ +function IsKeyReleased(key) { + return r.BindIsKeyReleased( + key + ) +} +raylib.IsKeyReleased = IsKeyReleased + +/** + * Check if a key is NOT being pressed + * + * @param {number} key + * + * @return {boolean} The resulting bool. + */ +function IsKeyUp(key) { + return r.BindIsKeyUp( + key + ) +} +raylib.IsKeyUp = IsKeyUp + +/** + * Get key pressed (keycode), call it multiple times for keys queued, returns 0 when the queue is empty + * + * @return {number} The resulting int. + */ +function GetKeyPressed() { + return r.BindGetKeyPressed() +} +raylib.GetKeyPressed = GetKeyPressed + +/** + * Get char pressed (unicode), call it multiple times for chars queued, returns 0 when the queue is empty + * + * @return {number} The resulting int. + */ +function GetCharPressed() { + return r.BindGetCharPressed() +} +raylib.GetCharPressed = GetCharPressed + +/** + * Set a custom key to exit program (default is ESC) + * + * @param {number} key + * + * @return {undefined} + */ +function SetExitKey(key) { + return r.BindSetExitKey( + key + ) +} +raylib.SetExitKey = SetExitKey + +/** + * Check if a gamepad is available + * + * @param {number} gamepad + * + * @return {boolean} The resulting bool. + */ +function IsGamepadAvailable(gamepad) { + return r.BindIsGamepadAvailable( + gamepad + ) +} +raylib.IsGamepadAvailable = IsGamepadAvailable + +/** + * Get gamepad internal name id + * + * @param {number} gamepad + * + * @return {string} The resulting const char *. + */ +function GetGamepadName(gamepad) { + return r.BindGetGamepadName( + gamepad + ) +} +raylib.GetGamepadName = GetGamepadName + +/** + * Check if a gamepad button has been pressed once + * + * @param {number} gamepad + * @param {number} button + * + * @return {boolean} The resulting bool. + */ +function IsGamepadButtonPressed(gamepad, button) { + return r.BindIsGamepadButtonPressed( + gamepad, + button + ) +} +raylib.IsGamepadButtonPressed = IsGamepadButtonPressed /** * Check if a gamepad button is being pressed @@ -1971,7 +2163,7 @@ raylib.IsGamepadButtonPressed = IsGamepadButtonPressed * * @return {boolean} The resulting bool. */ -function IsGamepadButtonDown (gamepad, button) { +function IsGamepadButtonDown(gamepad, button) { return r.BindIsGamepadButtonDown( gamepad, button @@ -1987,7 +2179,7 @@ raylib.IsGamepadButtonDown = IsGamepadButtonDown * * @return {boolean} The resulting bool. */ -function IsGamepadButtonReleased (gamepad, button) { +function IsGamepadButtonReleased(gamepad, button) { return r.BindIsGamepadButtonReleased( gamepad, button @@ -2003,7 +2195,7 @@ raylib.IsGamepadButtonReleased = IsGamepadButtonReleased * * @return {boolean} The resulting bool. */ -function IsGamepadButtonUp (gamepad, button) { +function IsGamepadButtonUp(gamepad, button) { return r.BindIsGamepadButtonUp( gamepad, button @@ -2016,7 +2208,7 @@ raylib.IsGamepadButtonUp = IsGamepadButtonUp * * @return {number} The resulting int. */ -function GetGamepadButtonPressed () { +function GetGamepadButtonPressed() { return r.BindGetGamepadButtonPressed() } raylib.GetGamepadButtonPressed = GetGamepadButtonPressed @@ -2028,7 +2220,7 @@ raylib.GetGamepadButtonPressed = GetGamepadButtonPressed * * @return {number} The resulting int. */ -function GetGamepadAxisCount (gamepad) { +function GetGamepadAxisCount(gamepad) { return r.BindGetGamepadAxisCount( gamepad ) @@ -2043,7 +2235,7 @@ raylib.GetGamepadAxisCount = GetGamepadAxisCount * * @return {number} The resulting float. */ -function GetGamepadAxisMovement (gamepad, axis) { +function GetGamepadAxisMovement(gamepad, axis) { return r.BindGetGamepadAxisMovement( gamepad, axis @@ -2058,7 +2250,7 @@ raylib.GetGamepadAxisMovement = GetGamepadAxisMovement * * @return {number} The resulting int. */ -function SetGamepadMappings (mappings) { +function SetGamepadMappings(mappings) { return r.BindSetGamepadMappings( mappings ) @@ -2072,7 +2264,7 @@ raylib.SetGamepadMappings = SetGamepadMappings * * @return {boolean} The resulting bool. */ -function IsMouseButtonPressed (button) { +function IsMouseButtonPressed(button) { return r.BindIsMouseButtonPressed( button ) @@ -2086,7 +2278,7 @@ raylib.IsMouseButtonPressed = IsMouseButtonPressed * * @return {boolean} The resulting bool. */ -function IsMouseButtonDown (button) { +function IsMouseButtonDown(button) { return r.BindIsMouseButtonDown( button ) @@ -2100,7 +2292,7 @@ raylib.IsMouseButtonDown = IsMouseButtonDown * * @return {boolean} The resulting bool. */ -function IsMouseButtonReleased (button) { +function IsMouseButtonReleased(button) { return r.BindIsMouseButtonReleased( button ) @@ -2114,7 +2306,7 @@ raylib.IsMouseButtonReleased = IsMouseButtonReleased * * @return {boolean} The resulting bool. */ -function IsMouseButtonUp (button) { +function IsMouseButtonUp(button) { return r.BindIsMouseButtonUp( button ) @@ -2126,7 +2318,7 @@ raylib.IsMouseButtonUp = IsMouseButtonUp * * @return {number} The resulting int. */ -function GetMouseX () { +function GetMouseX() { return r.BindGetMouseX() } raylib.GetMouseX = GetMouseX @@ -2136,7 +2328,7 @@ raylib.GetMouseX = GetMouseX * * @return {number} The resulting int. */ -function GetMouseY () { +function GetMouseY() { return r.BindGetMouseY() } raylib.GetMouseY = GetMouseY @@ -2146,7 +2338,7 @@ raylib.GetMouseY = GetMouseY * * @return {Vector2} The resulting Vector2. */ -function GetMousePosition () { +function GetMousePosition() { return r.BindGetMousePosition() } raylib.GetMousePosition = GetMousePosition @@ -2156,7 +2348,7 @@ raylib.GetMousePosition = GetMousePosition * * @return {Vector2} The resulting Vector2. */ -function GetMouseDelta () { +function GetMouseDelta() { return r.BindGetMouseDelta() } raylib.GetMouseDelta = GetMouseDelta @@ -2169,7 +2361,7 @@ raylib.GetMouseDelta = GetMouseDelta * * @return {undefined} */ -function SetMousePosition (x, y) { +function SetMousePosition(x, y) { return r.BindSetMousePosition( x, y @@ -2185,7 +2377,7 @@ raylib.SetMousePosition = SetMousePosition * * @return {undefined} */ -function SetMouseOffset (offsetX, offsetY) { +function SetMouseOffset(offsetX, offsetY) { return r.BindSetMouseOffset( offsetX, offsetY @@ -2201,7 +2393,7 @@ raylib.SetMouseOffset = SetMouseOffset * * @return {undefined} */ -function SetMouseScale (scaleX, scaleY) { +function SetMouseScale(scaleX, scaleY) { return r.BindSetMouseScale( scaleX, scaleY @@ -2214,7 +2406,7 @@ raylib.SetMouseScale = SetMouseScale * * @return {number} The resulting float. */ -function GetMouseWheelMove () { +function GetMouseWheelMove() { return r.BindGetMouseWheelMove() } raylib.GetMouseWheelMove = GetMouseWheelMove @@ -2224,7 +2416,7 @@ raylib.GetMouseWheelMove = GetMouseWheelMove * * @return {Vector2} The resulting Vector2. */ -function GetMouseWheelMoveV () { +function GetMouseWheelMoveV() { return r.BindGetMouseWheelMoveV() } raylib.GetMouseWheelMoveV = GetMouseWheelMoveV @@ -2236,7 +2428,7 @@ raylib.GetMouseWheelMoveV = GetMouseWheelMoveV * * @return {undefined} */ -function SetMouseCursor (cursor) { +function SetMouseCursor(cursor) { return r.BindSetMouseCursor( cursor ) @@ -2248,7 +2440,7 @@ raylib.SetMouseCursor = SetMouseCursor * * @return {number} The resulting int. */ -function GetTouchX () { +function GetTouchX() { return r.BindGetTouchX() } raylib.GetTouchX = GetTouchX @@ -2258,7 +2450,7 @@ raylib.GetTouchX = GetTouchX * * @return {number} The resulting int. */ -function GetTouchY () { +function GetTouchY() { return r.BindGetTouchY() } raylib.GetTouchY = GetTouchY @@ -2270,7 +2462,7 @@ raylib.GetTouchY = GetTouchY * * @return {Vector2} The resulting Vector2. */ -function GetTouchPosition (index) { +function GetTouchPosition(index) { return r.BindGetTouchPosition( index ) @@ -2284,7 +2476,7 @@ raylib.GetTouchPosition = GetTouchPosition * * @return {number} The resulting int. */ -function GetTouchPointId (index) { +function GetTouchPointId(index) { return r.BindGetTouchPointId( index ) @@ -2296,7 +2488,7 @@ raylib.GetTouchPointId = GetTouchPointId * * @return {number} The resulting int. */ -function GetTouchPointCount () { +function GetTouchPointCount() { return r.BindGetTouchPointCount() } raylib.GetTouchPointCount = GetTouchPointCount @@ -2308,7 +2500,7 @@ raylib.GetTouchPointCount = GetTouchPointCount * * @return {undefined} */ -function SetGesturesEnabled (flags) { +function SetGesturesEnabled(flags) { return r.BindSetGesturesEnabled( flags ) @@ -2322,7 +2514,7 @@ raylib.SetGesturesEnabled = SetGesturesEnabled * * @return {boolean} The resulting bool. */ -function IsGestureDetected (gesture) { +function IsGestureDetected(gesture) { return r.BindIsGestureDetected( gesture ) @@ -2334,7 +2526,7 @@ raylib.IsGestureDetected = IsGestureDetected * * @return {number} The resulting int. */ -function GetGestureDetected () { +function GetGestureDetected() { return r.BindGetGestureDetected() } raylib.GetGestureDetected = GetGestureDetected @@ -2344,7 +2536,7 @@ raylib.GetGestureDetected = GetGestureDetected * * @return {number} The resulting float. */ -function GetGestureHoldDuration () { +function GetGestureHoldDuration() { return r.BindGetGestureHoldDuration() } raylib.GetGestureHoldDuration = GetGestureHoldDuration @@ -2354,7 +2546,7 @@ raylib.GetGestureHoldDuration = GetGestureHoldDuration * * @return {Vector2} The resulting Vector2. */ -function GetGestureDragVector () { +function GetGestureDragVector() { return r.BindGetGestureDragVector() } raylib.GetGestureDragVector = GetGestureDragVector @@ -2364,7 +2556,7 @@ raylib.GetGestureDragVector = GetGestureDragVector * * @return {number} The resulting float. */ -function GetGestureDragAngle () { +function GetGestureDragAngle() { return r.BindGetGestureDragAngle() } raylib.GetGestureDragAngle = GetGestureDragAngle @@ -2374,7 +2566,7 @@ raylib.GetGestureDragAngle = GetGestureDragAngle * * @return {Vector2} The resulting Vector2. */ -function GetGesturePinchVector () { +function GetGesturePinchVector() { return r.BindGetGesturePinchVector() } raylib.GetGesturePinchVector = GetGesturePinchVector @@ -2384,7 +2576,7 @@ raylib.GetGesturePinchVector = GetGesturePinchVector * * @return {number} The resulting float. */ -function GetGesturePinchAngle () { +function GetGesturePinchAngle() { return r.BindGetGesturePinchAngle() } raylib.GetGesturePinchAngle = GetGesturePinchAngle @@ -2399,7 +2591,7 @@ raylib.GetGesturePinchAngle = GetGesturePinchAngle * * @return {undefined} */ -function UpdateCameraPro (camera, movement, rotation, zoom) { +function UpdateCameraPro(camera, movement, rotation, zoom) { return r.BindUpdateCameraPro( camera, movement.x, @@ -2421,7 +2613,7 @@ raylib.UpdateCameraPro = UpdateCameraPro * * @return {undefined} */ -function SetShapesTexture (texture, source) { +function SetShapesTexture(texture, source) { return r.BindSetShapesTexture( texture.id, texture.width, @@ -2445,7 +2637,7 @@ raylib.SetShapesTexture = SetShapesTexture * * @return {undefined} */ -function DrawPixel (posX, posY, color) { +function DrawPixel(posX, posY, color) { return r.BindDrawPixel( posX, posY, @@ -2465,7 +2657,7 @@ raylib.DrawPixel = DrawPixel * * @return {undefined} */ -function DrawPixelV (position, color) { +function DrawPixelV(position, color) { return r.BindDrawPixelV( position.x, position.y, @@ -2488,7 +2680,7 @@ raylib.DrawPixelV = DrawPixelV * * @return {undefined} */ -function DrawLine (startPosX, startPosY, endPosX, endPosY, color) { +function DrawLine(startPosX, startPosY, endPosX, endPosY, color) { return r.BindDrawLine( startPosX, startPosY, @@ -2503,7 +2695,7 @@ function DrawLine (startPosX, startPosY, endPosX, endPosY, color) { raylib.DrawLine = DrawLine /** - * Draw a line (Vector version) + * Draw a line (using gl lines) * * @param {Vector2} startPos * @param {Vector2} endPos @@ -2511,7 +2703,7 @@ raylib.DrawLine = DrawLine * * @return {undefined} */ -function DrawLineV (startPos, endPos, color) { +function DrawLineV(startPos, endPos, color) { return r.BindDrawLineV( startPos.x, startPos.y, @@ -2526,7 +2718,7 @@ function DrawLineV (startPos, endPos, color) { raylib.DrawLineV = DrawLineV /** - * Draw a line defining thickness + * Draw a line (using triangles/quads) * * @param {Vector2} startPos * @param {Vector2} endPos @@ -2535,7 +2727,7 @@ raylib.DrawLineV = DrawLineV * * @return {undefined} */ -function DrawLineEx (startPos, endPos, thick, color) { +function DrawLineEx(startPos, endPos, thick, color) { return r.BindDrawLineEx( startPos.x, startPos.y, @@ -2551,80 +2743,42 @@ function DrawLineEx (startPos, endPos, thick, color) { raylib.DrawLineEx = DrawLineEx /** - * Draw a line using cubic-bezier curves in-out - * - * @param {Vector2} startPos - * @param {Vector2} endPos - * @param {number} thick - * @param {Color} color - * - * @return {undefined} - */ -function DrawLineBezier (startPos, endPos, thick, color) { - return r.BindDrawLineBezier( - startPos.x, - startPos.y, - endPos.x, - endPos.y, - thick, - color.r, - color.g, - color.b, - color.a - ) -} -raylib.DrawLineBezier = DrawLineBezier - -/** - * Draw line using quadratic bezier curves with a control point + * Draw lines sequence (using gl lines) * - * @param {Vector2} startPos - * @param {Vector2} endPos - * @param {Vector2} controlPos - * @param {number} thick + * @param {number} points + * @param {number} pointCount * @param {Color} color * * @return {undefined} */ -function DrawLineBezierQuad (startPos, endPos, controlPos, thick, color) { - return r.BindDrawLineBezierQuad( - startPos.x, - startPos.y, - endPos.x, - endPos.y, - controlPos.x, - controlPos.y, - thick, +function DrawLineStrip(points, pointCount, color) { + return r.BindDrawLineStrip( + points, + pointCount, color.r, color.g, color.b, color.a ) } -raylib.DrawLineBezierQuad = DrawLineBezierQuad +raylib.DrawLineStrip = DrawLineStrip /** - * Draw line using cubic bezier curves with 2 control points + * Draw line segment cubic-bezier in-out interpolation * * @param {Vector2} startPos * @param {Vector2} endPos - * @param {Vector2} startControlPos - * @param {Vector2} endControlPos * @param {number} thick * @param {Color} color * * @return {undefined} */ -function DrawLineBezierCubic (startPos, endPos, startControlPos, endControlPos, thick, color) { - return r.BindDrawLineBezierCubic( +function DrawLineBezier(startPos, endPos, thick, color) { + return r.BindDrawLineBezier( startPos.x, startPos.y, endPos.x, endPos.y, - startControlPos.x, - startControlPos.y, - endControlPos.x, - endControlPos.y, thick, color.r, color.g, @@ -2632,28 +2786,7 @@ function DrawLineBezierCubic (startPos, endPos, startControlPos, endControlPos, color.a ) } -raylib.DrawLineBezierCubic = DrawLineBezierCubic - -/** - * Draw lines sequence - * - * @param {number} points - * @param {number} pointCount - * @param {Color} color - * - * @return {undefined} - */ -function DrawLineStrip (points, pointCount, color) { - return r.BindDrawLineStrip( - points, - pointCount, - color.r, - color.g, - color.b, - color.a - ) -} -raylib.DrawLineStrip = DrawLineStrip +raylib.DrawLineBezier = DrawLineBezier /** * Draw a color-filled circle @@ -2665,7 +2798,7 @@ raylib.DrawLineStrip = DrawLineStrip * * @return {undefined} */ -function DrawCircle (centerX, centerY, radius, color) { +function DrawCircle(centerX, centerY, radius, color) { return r.BindDrawCircle( centerX, centerY, @@ -2690,7 +2823,7 @@ raylib.DrawCircle = DrawCircle * * @return {undefined} */ -function DrawCircleSector (center, radius, startAngle, endAngle, segments, color) { +function DrawCircleSector(center, radius, startAngle, endAngle, segments, color) { return r.BindDrawCircleSector( center.x, center.y, @@ -2718,7 +2851,7 @@ raylib.DrawCircleSector = DrawCircleSector * * @return {undefined} */ -function DrawCircleSectorLines (center, radius, startAngle, endAngle, segments, color) { +function DrawCircleSectorLines(center, radius, startAngle, endAngle, segments, color) { return r.BindDrawCircleSectorLines( center.x, center.y, @@ -2745,7 +2878,7 @@ raylib.DrawCircleSectorLines = DrawCircleSectorLines * * @return {undefined} */ -function DrawCircleGradient (centerX, centerY, radius, color1, color2) { +function DrawCircleGradient(centerX, centerY, radius, color1, color2) { return r.BindDrawCircleGradient( centerX, centerY, @@ -2771,7 +2904,7 @@ raylib.DrawCircleGradient = DrawCircleGradient * * @return {undefined} */ -function DrawCircleV (center, radius, color) { +function DrawCircleV(center, radius, color) { return r.BindDrawCircleV( center.x, center.y, @@ -2794,7 +2927,7 @@ raylib.DrawCircleV = DrawCircleV * * @return {undefined} */ -function DrawCircleLines (centerX, centerY, radius, color) { +function DrawCircleLines(centerX, centerY, radius, color) { return r.BindDrawCircleLines( centerX, centerY, @@ -2807,6 +2940,28 @@ function DrawCircleLines (centerX, centerY, radius, color) { } raylib.DrawCircleLines = DrawCircleLines +/** + * Draw circle outline (Vector version) + * + * @param {Vector2} center + * @param {number} radius + * @param {Color} color + * + * @return {undefined} + */ +function DrawCircleLinesV(center, radius, color) { + return r.BindDrawCircleLinesV( + center.x, + center.y, + radius, + color.r, + color.g, + color.b, + color.a + ) +} +raylib.DrawCircleLinesV = DrawCircleLinesV + /** * Draw ellipse * @@ -2818,7 +2973,7 @@ raylib.DrawCircleLines = DrawCircleLines * * @return {undefined} */ -function DrawEllipse (centerX, centerY, radiusH, radiusV, color) { +function DrawEllipse(centerX, centerY, radiusH, radiusV, color) { return r.BindDrawEllipse( centerX, centerY, @@ -2843,7 +2998,7 @@ raylib.DrawEllipse = DrawEllipse * * @return {undefined} */ -function DrawEllipseLines (centerX, centerY, radiusH, radiusV, color) { +function DrawEllipseLines(centerX, centerY, radiusH, radiusV, color) { return r.BindDrawEllipseLines( centerX, centerY, @@ -2870,7 +3025,7 @@ raylib.DrawEllipseLines = DrawEllipseLines * * @return {undefined} */ -function DrawRing (center, innerRadius, outerRadius, startAngle, endAngle, segments, color) { +function DrawRing(center, innerRadius, outerRadius, startAngle, endAngle, segments, color) { return r.BindDrawRing( center.x, center.y, @@ -2900,7 +3055,7 @@ raylib.DrawRing = DrawRing * * @return {undefined} */ -function DrawRingLines (center, innerRadius, outerRadius, startAngle, endAngle, segments, color) { +function DrawRingLines(center, innerRadius, outerRadius, startAngle, endAngle, segments, color) { return r.BindDrawRingLines( center.x, center.y, @@ -2928,7 +3083,7 @@ raylib.DrawRingLines = DrawRingLines * * @return {undefined} */ -function DrawRectangle (posX, posY, width, height, color) { +function DrawRectangle(posX, posY, width, height, color) { return r.BindDrawRectangle( posX, posY, @@ -2951,7 +3106,7 @@ raylib.DrawRectangle = DrawRectangle * * @return {undefined} */ -function DrawRectangleV (position, size, color) { +function DrawRectangleV(position, size, color) { return r.BindDrawRectangleV( position.x, position.y, @@ -2973,7 +3128,7 @@ raylib.DrawRectangleV = DrawRectangleV * * @return {undefined} */ -function DrawRectangleRec (rec, color) { +function DrawRectangleRec(rec, color) { return r.BindDrawRectangleRec( rec.x, rec.y, @@ -2997,7 +3152,7 @@ raylib.DrawRectangleRec = DrawRectangleRec * * @return {undefined} */ -function DrawRectanglePro (rec, origin, rotation, color) { +function DrawRectanglePro(rec, origin, rotation, color) { return r.BindDrawRectanglePro( rec.x, rec.y, @@ -3026,7 +3181,7 @@ raylib.DrawRectanglePro = DrawRectanglePro * * @return {undefined} */ -function DrawRectangleGradientV (posX, posY, width, height, color1, color2) { +function DrawRectangleGradientV(posX, posY, width, height, color1, color2) { return r.BindDrawRectangleGradientV( posX, posY, @@ -3056,7 +3211,7 @@ raylib.DrawRectangleGradientV = DrawRectangleGradientV * * @return {undefined} */ -function DrawRectangleGradientH (posX, posY, width, height, color1, color2) { +function DrawRectangleGradientH(posX, posY, width, height, color1, color2) { return r.BindDrawRectangleGradientH( posX, posY, @@ -3085,7 +3240,7 @@ raylib.DrawRectangleGradientH = DrawRectangleGradientH * * @return {undefined} */ -function DrawRectangleGradientEx (rec, col1, col2, col3, col4) { +function DrawRectangleGradientEx(rec, col1, col2, col3, col4) { return r.BindDrawRectangleGradientEx( rec.x, rec.y, @@ -3122,7 +3277,7 @@ raylib.DrawRectangleGradientEx = DrawRectangleGradientEx * * @return {undefined} */ -function DrawRectangleLines (posX, posY, width, height, color) { +function DrawRectangleLines(posX, posY, width, height, color) { return r.BindDrawRectangleLines( posX, posY, @@ -3145,7 +3300,7 @@ raylib.DrawRectangleLines = DrawRectangleLines * * @return {undefined} */ -function DrawRectangleLinesEx (rec, lineThick, color) { +function DrawRectangleLinesEx(rec, lineThick, color) { return r.BindDrawRectangleLinesEx( rec.x, rec.y, @@ -3170,7 +3325,7 @@ raylib.DrawRectangleLinesEx = DrawRectangleLinesEx * * @return {undefined} */ -function DrawRectangleRounded (rec, roundness, segments, color) { +function DrawRectangleRounded(rec, roundness, segments, color) { return r.BindDrawRectangleRounded( rec.x, rec.y, @@ -3197,7 +3352,7 @@ raylib.DrawRectangleRounded = DrawRectangleRounded * * @return {undefined} */ -function DrawRectangleRoundedLines (rec, roundness, segments, lineThick, color) { +function DrawRectangleRoundedLines(rec, roundness, segments, lineThick, color) { return r.BindDrawRectangleRoundedLines( rec.x, rec.y, @@ -3224,7 +3379,7 @@ raylib.DrawRectangleRoundedLines = DrawRectangleRoundedLines * * @return {undefined} */ -function DrawTriangle (v1, v2, v3, color) { +function DrawTriangle(v1, v2, v3, color) { return r.BindDrawTriangle( v1.x, v1.y, @@ -3250,7 +3405,7 @@ raylib.DrawTriangle = DrawTriangle * * @return {undefined} */ -function DrawTriangleLines (v1, v2, v3, color) { +function DrawTriangleLines(v1, v2, v3, color) { return r.BindDrawTriangleLines( v1.x, v1.y, @@ -3275,7 +3430,7 @@ raylib.DrawTriangleLines = DrawTriangleLines * * @return {undefined} */ -function DrawTriangleFan (points, pointCount, color) { +function DrawTriangleFan(points, pointCount, color) { return r.BindDrawTriangleFan( points, pointCount, @@ -3296,7 +3451,7 @@ raylib.DrawTriangleFan = DrawTriangleFan * * @return {undefined} */ -function DrawTriangleStrip (points, pointCount, color) { +function DrawTriangleStrip(points, pointCount, color) { return r.BindDrawTriangleStrip( points, pointCount, @@ -3319,7 +3474,7 @@ raylib.DrawTriangleStrip = DrawTriangleStrip * * @return {undefined} */ -function DrawPoly (center, sides, radius, rotation, color) { +function DrawPoly(center, sides, radius, rotation, color) { return r.BindDrawPoly( center.x, center.y, @@ -3345,7 +3500,7 @@ raylib.DrawPoly = DrawPoly * * @return {undefined} */ -function DrawPolyLines (center, sides, radius, rotation, color) { +function DrawPolyLines(center, sides, radius, rotation, color) { return r.BindDrawPolyLines( center.x, center.y, @@ -3372,7 +3527,7 @@ raylib.DrawPolyLines = DrawPolyLines * * @return {undefined} */ -function DrawPolyLinesEx (center, sides, radius, rotation, lineThick, color) { +function DrawPolyLinesEx(center, sides, radius, rotation, lineThick, color) { return r.BindDrawPolyLinesEx( center.x, center.y, @@ -3389,66 +3544,448 @@ function DrawPolyLinesEx (center, sides, radius, rotation, lineThick, color) { raylib.DrawPolyLinesEx = DrawPolyLinesEx /** - * Check collision between two rectangles + * Draw spline: Linear, minimum 2 points * - * @param {Rectangle} rec1 - * @param {Rectangle} rec2 + * @param {number} points + * @param {number} pointCount + * @param {number} thick + * @param {Color} color * - * @return {boolean} The resulting bool. + * @return {undefined} */ -function CheckCollisionRecs (rec1, rec2) { - return r.BindCheckCollisionRecs( - rec1.x, - rec1.y, - rec1.width, - rec1.height, - rec2.x, - rec2.y, - rec2.width, - rec2.height +function DrawSplineLinear(points, pointCount, thick, color) { + return r.BindDrawSplineLinear( + points, + pointCount, + thick, + color.r, + color.g, + color.b, + color.a ) } -raylib.CheckCollisionRecs = CheckCollisionRecs +raylib.DrawSplineLinear = DrawSplineLinear /** - * Check collision between two circles + * Draw spline: B-Spline, minimum 4 points * - * @param {Vector2} center1 - * @param {number} radius1 - * @param {Vector2} center2 - * @param {number} radius2 + * @param {number} points + * @param {number} pointCount + * @param {number} thick + * @param {Color} color * - * @return {boolean} The resulting bool. + * @return {undefined} */ -function CheckCollisionCircles (center1, radius1, center2, radius2) { - return r.BindCheckCollisionCircles( - center1.x, - center1.y, - radius1, - center2.x, - center2.y, - radius2 +function DrawSplineBasis(points, pointCount, thick, color) { + return r.BindDrawSplineBasis( + points, + pointCount, + thick, + color.r, + color.g, + color.b, + color.a ) } -raylib.CheckCollisionCircles = CheckCollisionCircles +raylib.DrawSplineBasis = DrawSplineBasis /** - * Check collision between circle and rectangle + * Draw spline: Catmull-Rom, minimum 4 points * - * @param {Vector2} center - * @param {number} radius - * @param {Rectangle} rec + * @param {number} points + * @param {number} pointCount + * @param {number} thick + * @param {Color} color * - * @return {boolean} The resulting bool. + * @return {undefined} */ -function CheckCollisionCircleRec (center, radius, rec) { - return r.BindCheckCollisionCircleRec( - center.x, - center.y, - radius, - rec.x, - rec.y, - rec.width, +function DrawSplineCatmullRom(points, pointCount, thick, color) { + return r.BindDrawSplineCatmullRom( + points, + pointCount, + thick, + color.r, + color.g, + color.b, + color.a + ) +} +raylib.DrawSplineCatmullRom = DrawSplineCatmullRom + +/** + * Draw spline: Quadratic Bezier, minimum 3 points (1 control point): [p1, c2, p3, c4...] + * + * @param {number} points + * @param {number} pointCount + * @param {number} thick + * @param {Color} color + * + * @return {undefined} + */ +function DrawSplineBezierQuadratic(points, pointCount, thick, color) { + return r.BindDrawSplineBezierQuadratic( + points, + pointCount, + thick, + color.r, + color.g, + color.b, + color.a + ) +} +raylib.DrawSplineBezierQuadratic = DrawSplineBezierQuadratic + +/** + * Draw spline: Cubic Bezier, minimum 4 points (2 control points): [p1, c2, c3, p4, c5, c6...] + * + * @param {number} points + * @param {number} pointCount + * @param {number} thick + * @param {Color} color + * + * @return {undefined} + */ +function DrawSplineBezierCubic(points, pointCount, thick, color) { + return r.BindDrawSplineBezierCubic( + points, + pointCount, + thick, + color.r, + color.g, + color.b, + color.a + ) +} +raylib.DrawSplineBezierCubic = DrawSplineBezierCubic + +/** + * Draw spline segment: Linear, 2 points + * + * @param {Vector2} p1 + * @param {Vector2} p2 + * @param {number} thick + * @param {Color} color + * + * @return {undefined} + */ +function DrawSplineSegmentLinear(p1, p2, thick, color) { + return r.BindDrawSplineSegmentLinear( + p1.x, + p1.y, + p2.x, + p2.y, + thick, + color.r, + color.g, + color.b, + color.a + ) +} +raylib.DrawSplineSegmentLinear = DrawSplineSegmentLinear + +/** + * Draw spline segment: B-Spline, 4 points + * + * @param {Vector2} p1 + * @param {Vector2} p2 + * @param {Vector2} p3 + * @param {Vector2} p4 + * @param {number} thick + * @param {Color} color + * + * @return {undefined} + */ +function DrawSplineSegmentBasis(p1, p2, p3, p4, thick, color) { + return r.BindDrawSplineSegmentBasis( + p1.x, + p1.y, + p2.x, + p2.y, + p3.x, + p3.y, + p4.x, + p4.y, + thick, + color.r, + color.g, + color.b, + color.a + ) +} +raylib.DrawSplineSegmentBasis = DrawSplineSegmentBasis + +/** + * Draw spline segment: Catmull-Rom, 4 points + * + * @param {Vector2} p1 + * @param {Vector2} p2 + * @param {Vector2} p3 + * @param {Vector2} p4 + * @param {number} thick + * @param {Color} color + * + * @return {undefined} + */ +function DrawSplineSegmentCatmullRom(p1, p2, p3, p4, thick, color) { + return r.BindDrawSplineSegmentCatmullRom( + p1.x, + p1.y, + p2.x, + p2.y, + p3.x, + p3.y, + p4.x, + p4.y, + thick, + color.r, + color.g, + color.b, + color.a + ) +} +raylib.DrawSplineSegmentCatmullRom = DrawSplineSegmentCatmullRom + +/** + * Draw spline segment: Quadratic Bezier, 2 points, 1 control point + * + * @param {Vector2} p1 + * @param {Vector2} c2 + * @param {Vector2} p3 + * @param {number} thick + * @param {Color} color + * + * @return {undefined} + */ +function DrawSplineSegmentBezierQuadratic(p1, c2, p3, thick, color) { + return r.BindDrawSplineSegmentBezierQuadratic( + p1.x, + p1.y, + c2.x, + c2.y, + p3.x, + p3.y, + thick, + color.r, + color.g, + color.b, + color.a + ) +} +raylib.DrawSplineSegmentBezierQuadratic = DrawSplineSegmentBezierQuadratic + +/** + * Draw spline segment: Cubic Bezier, 2 points, 2 control points + * + * @param {Vector2} p1 + * @param {Vector2} c2 + * @param {Vector2} c3 + * @param {Vector2} p4 + * @param {number} thick + * @param {Color} color + * + * @return {undefined} + */ +function DrawSplineSegmentBezierCubic(p1, c2, c3, p4, thick, color) { + return r.BindDrawSplineSegmentBezierCubic( + p1.x, + p1.y, + c2.x, + c2.y, + c3.x, + c3.y, + p4.x, + p4.y, + thick, + color.r, + color.g, + color.b, + color.a + ) +} +raylib.DrawSplineSegmentBezierCubic = DrawSplineSegmentBezierCubic + +/** + * Get (evaluate) spline point: Linear + * + * @param {Vector2} startPos + * @param {Vector2} endPos + * @param {number} t + * + * @return {Vector2} The resulting Vector2. + */ +function GetSplinePointLinear(startPos, endPos, t) { + return r.BindGetSplinePointLinear( + startPos.x, + startPos.y, + endPos.x, + endPos.y, + t + ) +} +raylib.GetSplinePointLinear = GetSplinePointLinear + +/** + * Get (evaluate) spline point: B-Spline + * + * @param {Vector2} p1 + * @param {Vector2} p2 + * @param {Vector2} p3 + * @param {Vector2} p4 + * @param {number} t + * + * @return {Vector2} The resulting Vector2. + */ +function GetSplinePointBasis(p1, p2, p3, p4, t) { + return r.BindGetSplinePointBasis( + p1.x, + p1.y, + p2.x, + p2.y, + p3.x, + p3.y, + p4.x, + p4.y, + t + ) +} +raylib.GetSplinePointBasis = GetSplinePointBasis + +/** + * Get (evaluate) spline point: Catmull-Rom + * + * @param {Vector2} p1 + * @param {Vector2} p2 + * @param {Vector2} p3 + * @param {Vector2} p4 + * @param {number} t + * + * @return {Vector2} The resulting Vector2. + */ +function GetSplinePointCatmullRom(p1, p2, p3, p4, t) { + return r.BindGetSplinePointCatmullRom( + p1.x, + p1.y, + p2.x, + p2.y, + p3.x, + p3.y, + p4.x, + p4.y, + t + ) +} +raylib.GetSplinePointCatmullRom = GetSplinePointCatmullRom + +/** + * Get (evaluate) spline point: Quadratic Bezier + * + * @param {Vector2} p1 + * @param {Vector2} c2 + * @param {Vector2} p3 + * @param {number} t + * + * @return {Vector2} The resulting Vector2. + */ +function GetSplinePointBezierQuad(p1, c2, p3, t) { + return r.BindGetSplinePointBezierQuad( + p1.x, + p1.y, + c2.x, + c2.y, + p3.x, + p3.y, + t + ) +} +raylib.GetSplinePointBezierQuad = GetSplinePointBezierQuad + +/** + * Get (evaluate) spline point: Cubic Bezier + * + * @param {Vector2} p1 + * @param {Vector2} c2 + * @param {Vector2} c3 + * @param {Vector2} p4 + * @param {number} t + * + * @return {Vector2} The resulting Vector2. + */ +function GetSplinePointBezierCubic(p1, c2, c3, p4, t) { + return r.BindGetSplinePointBezierCubic( + p1.x, + p1.y, + c2.x, + c2.y, + c3.x, + c3.y, + p4.x, + p4.y, + t + ) +} +raylib.GetSplinePointBezierCubic = GetSplinePointBezierCubic + +/** + * Check collision between two rectangles + * + * @param {Rectangle} rec1 + * @param {Rectangle} rec2 + * + * @return {boolean} The resulting bool. + */ +function CheckCollisionRecs(rec1, rec2) { + return r.BindCheckCollisionRecs( + rec1.x, + rec1.y, + rec1.width, + rec1.height, + rec2.x, + rec2.y, + rec2.width, + rec2.height + ) +} +raylib.CheckCollisionRecs = CheckCollisionRecs + +/** + * Check collision between two circles + * + * @param {Vector2} center1 + * @param {number} radius1 + * @param {Vector2} center2 + * @param {number} radius2 + * + * @return {boolean} The resulting bool. + */ +function CheckCollisionCircles(center1, radius1, center2, radius2) { + return r.BindCheckCollisionCircles( + center1.x, + center1.y, + radius1, + center2.x, + center2.y, + radius2 + ) +} +raylib.CheckCollisionCircles = CheckCollisionCircles + +/** + * Check collision between circle and rectangle + * + * @param {Vector2} center + * @param {number} radius + * @param {Rectangle} rec + * + * @return {boolean} The resulting bool. + */ +function CheckCollisionCircleRec(center, radius, rec) { + return r.BindCheckCollisionCircleRec( + center.x, + center.y, + radius, + rec.x, + rec.y, + rec.width, rec.height ) } @@ -3462,7 +3999,7 @@ raylib.CheckCollisionCircleRec = CheckCollisionCircleRec * * @return {boolean} The resulting bool. */ -function CheckCollisionPointRec (point, rec) { +function CheckCollisionPointRec(point, rec) { return r.BindCheckCollisionPointRec( point.x, point.y, @@ -3483,7 +4020,7 @@ raylib.CheckCollisionPointRec = CheckCollisionPointRec * * @return {boolean} The resulting bool. */ -function CheckCollisionPointCircle (point, center, radius) { +function CheckCollisionPointCircle(point, center, radius) { return r.BindCheckCollisionPointCircle( point.x, point.y, @@ -3504,7 +4041,7 @@ raylib.CheckCollisionPointCircle = CheckCollisionPointCircle * * @return {boolean} The resulting bool. */ -function CheckCollisionPointTriangle (point, p1, p2, p3) { +function CheckCollisionPointTriangle(point, p1, p2, p3) { return r.BindCheckCollisionPointTriangle( point.x, point.y, @@ -3527,7 +4064,7 @@ raylib.CheckCollisionPointTriangle = CheckCollisionPointTriangle * * @return {boolean} The resulting bool. */ -function CheckCollisionPointPoly (point, points, pointCount) { +function CheckCollisionPointPoly(point, points, pointCount) { return r.BindCheckCollisionPointPoly( point.x, point.y, @@ -3548,7 +4085,7 @@ raylib.CheckCollisionPointPoly = CheckCollisionPointPoly * * @return {boolean} The resulting bool. */ -function CheckCollisionLines (startPos1, endPos1, startPos2, endPos2, collisionPoint) { +function CheckCollisionLines(startPos1, endPos1, startPos2, endPos2, collisionPoint) { return r.BindCheckCollisionLines( startPos1.x, startPos1.y, @@ -3573,7 +4110,7 @@ raylib.CheckCollisionLines = CheckCollisionLines * * @return {boolean} The resulting bool. */ -function CheckCollisionPointLine (point, p1, p2, threshold) { +function CheckCollisionPointLine(point, p1, p2, threshold) { return r.BindCheckCollisionPointLine( point.x, point.y, @@ -3594,7 +4131,7 @@ raylib.CheckCollisionPointLine = CheckCollisionPointLine * * @return {Rectangle} The resulting Rectangle. */ -function GetCollisionRec (rec1, rec2) { +function GetCollisionRec(rec1, rec2) { return r.BindGetCollisionRec( rec1.x, rec1.y, @@ -3615,7 +4152,7 @@ raylib.GetCollisionRec = GetCollisionRec * * @return {Image} The resulting Image. */ -function LoadImage (fileName) { +function LoadImage(fileName) { return r.BindLoadImage( fileName ) @@ -3633,7 +4170,7 @@ raylib.LoadImage = LoadImage * * @return {Image} The resulting Image. */ -function LoadImageRaw (fileName, width, height, format, headerSize) { +function LoadImageRaw(fileName, width, height, format, headerSize) { return r.BindLoadImageRaw( fileName, width, @@ -3644,6 +4181,24 @@ function LoadImageRaw (fileName, width, height, format, headerSize) { } raylib.LoadImageRaw = LoadImageRaw +/** + * Load image from SVG file data or string with specified size + * + * @param {string} fileNameOrString + * @param {number} width + * @param {number} height + * + * @return {Image} The resulting Image. + */ +function LoadImageSvg(fileNameOrString, width, height) { + return r.BindLoadImageSvg( + fileNameOrString, + width, + height + ) +} +raylib.LoadImageSvg = LoadImageSvg + /** * Load image sequence from file (frames appended to image.data) * @@ -3652,7 +4207,7 @@ raylib.LoadImageRaw = LoadImageRaw * * @return {Image} The resulting Image. */ -function LoadImageAnim (fileName, frames) { +function LoadImageAnim(fileName, frames) { return r.BindLoadImageAnim( fileName, frames @@ -3669,7 +4224,7 @@ raylib.LoadImageAnim = LoadImageAnim * * @return {Image} The resulting Image. */ -function LoadImageFromMemory (fileType, fileData, dataSize) { +function LoadImageFromMemory(fileType, fileData, dataSize) { return r.BindLoadImageFromMemory( fileType, fileData, @@ -3685,7 +4240,7 @@ raylib.LoadImageFromMemory = LoadImageFromMemory * * @return {Image} The resulting Image. */ -function LoadImageFromTexture (texture) { +function LoadImageFromTexture(texture) { return r.BindLoadImageFromTexture( texture.id, texture.width, @@ -3701,7 +4256,7 @@ raylib.LoadImageFromTexture = LoadImageFromTexture * * @return {Image} The resulting Image. */ -function LoadImageFromScreen () { +function LoadImageFromScreen() { return r.BindLoadImageFromScreen() } raylib.LoadImageFromScreen = LoadImageFromScreen @@ -3713,7 +4268,7 @@ raylib.LoadImageFromScreen = LoadImageFromScreen * * @return {boolean} The resulting bool. */ -function IsImageReady (image) { +function IsImageReady(image) { return r.BindIsImageReady( image.data, image.width, @@ -3731,7 +4286,7 @@ raylib.IsImageReady = IsImageReady * * @return {undefined} */ -function UnloadImage (image) { +function UnloadImage(image) { return r.BindUnloadImage( image.data, image.width, @@ -3750,7 +4305,7 @@ raylib.UnloadImage = UnloadImage * * @return {boolean} The resulting bool. */ -function ExportImage (image, fileName) { +function ExportImage(image, fileName) { return r.BindExportImage( image.data, image.width, @@ -3762,6 +4317,28 @@ function ExportImage (image, fileName) { } raylib.ExportImage = ExportImage +/** + * Export image to memory buffer + * + * @param {Image} image + * @param {string} fileType + * @param {number} fileSize + * + * @return {Buffer} The resulting unsigned char *. + */ +function ExportImageToMemory(image, fileType, fileSize) { + return r.BindExportImageToMemory( + image.data, + image.width, + image.height, + image.mipmaps, + image.format, + fileType, + fileSize + ) +} +raylib.ExportImageToMemory = ExportImageToMemory + /** * Export image as code file defining an array of bytes, returns true on success * @@ -3770,7 +4347,7 @@ raylib.ExportImage = ExportImage * * @return {boolean} The resulting bool. */ -function ExportImageAsCode (image, fileName) { +function ExportImageAsCode(image, fileName) { return r.BindExportImageAsCode( image.data, image.width, @@ -3791,7 +4368,7 @@ raylib.ExportImageAsCode = ExportImageAsCode * * @return {Image} The resulting Image. */ -function GenImageColor (width, height, color) { +function GenImageColor(width, height, color) { return r.BindGenImageColor( width, height, @@ -3804,59 +4381,63 @@ function GenImageColor (width, height, color) { raylib.GenImageColor = GenImageColor /** - * Generate image: vertical gradient + * Generate image: linear gradient, direction in degrees [0..360], 0=Vertical gradient * * @param {number} width * @param {number} height - * @param {Color} top - * @param {Color} bottom + * @param {number} direction + * @param {Color} start + * @param {Color} end * * @return {Image} The resulting Image. */ -function GenImageGradientV (width, height, top, bottom) { - return r.BindGenImageGradientV( +function GenImageGradientLinear(width, height, direction, start, end) { + return r.BindGenImageGradientLinear( width, height, - top.r, - top.g, - top.b, - top.a, - bottom.r, - bottom.g, - bottom.b, - bottom.a + direction, + start.r, + start.g, + start.b, + start.a, + end.r, + end.g, + end.b, + end.a ) } -raylib.GenImageGradientV = GenImageGradientV +raylib.GenImageGradientLinear = GenImageGradientLinear /** - * Generate image: horizontal gradient + * Generate image: radial gradient * * @param {number} width * @param {number} height - * @param {Color} left - * @param {Color} right + * @param {number} density + * @param {Color} inner + * @param {Color} outer * * @return {Image} The resulting Image. */ -function GenImageGradientH (width, height, left, right) { - return r.BindGenImageGradientH( +function GenImageGradientRadial(width, height, density, inner, outer) { + return r.BindGenImageGradientRadial( width, height, - left.r, - left.g, - left.b, - left.a, - right.r, - right.g, - right.b, - right.a + density, + inner.r, + inner.g, + inner.b, + inner.a, + outer.r, + outer.g, + outer.b, + outer.a ) } -raylib.GenImageGradientH = GenImageGradientH +raylib.GenImageGradientRadial = GenImageGradientRadial /** - * Generate image: radial gradient + * Generate image: square gradient * * @param {number} width * @param {number} height @@ -3866,8 +4447,8 @@ raylib.GenImageGradientH = GenImageGradientH * * @return {Image} The resulting Image. */ -function GenImageGradientRadial (width, height, density, inner, outer) { - return r.BindGenImageGradientRadial( +function GenImageGradientSquare(width, height, density, inner, outer) { + return r.BindGenImageGradientSquare( width, height, density, @@ -3881,7 +4462,7 @@ function GenImageGradientRadial (width, height, density, inner, outer) { outer.a ) } -raylib.GenImageGradientRadial = GenImageGradientRadial +raylib.GenImageGradientSquare = GenImageGradientSquare /** * Generate image: checked @@ -3895,7 +4476,7 @@ raylib.GenImageGradientRadial = GenImageGradientRadial * * @return {Image} The resulting Image. */ -function GenImageChecked (width, height, checksX, checksY, col1, col2) { +function GenImageChecked(width, height, checksX, checksY, col1, col2) { return r.BindGenImageChecked( width, height, @@ -3922,7 +4503,7 @@ raylib.GenImageChecked = GenImageChecked * * @return {Image} The resulting Image. */ -function GenImageWhiteNoise (width, height, factor) { +function GenImageWhiteNoise(width, height, factor) { return r.BindGenImageWhiteNoise( width, height, @@ -3942,7 +4523,7 @@ raylib.GenImageWhiteNoise = GenImageWhiteNoise * * @return {Image} The resulting Image. */ -function GenImagePerlinNoise (width, height, offsetX, offsetY, scale) { +function GenImagePerlinNoise(width, height, offsetX, offsetY, scale) { return r.BindGenImagePerlinNoise( width, height, @@ -3962,7 +4543,7 @@ raylib.GenImagePerlinNoise = GenImagePerlinNoise * * @return {Image} The resulting Image. */ -function GenImageCellular (width, height, tileSize) { +function GenImageCellular(width, height, tileSize) { return r.BindGenImageCellular( width, height, @@ -3980,7 +4561,7 @@ raylib.GenImageCellular = GenImageCellular * * @return {Image} The resulting Image. */ -function GenImageText (width, height, text) { +function GenImageText(width, height, text) { return r.BindGenImageText( width, height, @@ -3996,7 +4577,7 @@ raylib.GenImageText = GenImageText * * @return {Image} The resulting Image. */ -function ImageCopy (image) { +function ImageCopy(image) { return r.BindImageCopy( image.data, image.width, @@ -4015,7 +4596,7 @@ raylib.ImageCopy = ImageCopy * * @return {Image} The resulting Image. */ -function ImageFromImage (image, rec) { +function ImageFromImage(image, rec) { return r.BindImageFromImage( image.data, image.width, @@ -4039,7 +4620,7 @@ raylib.ImageFromImage = ImageFromImage * * @return {Image} The resulting Image. */ -function ImageText (text, fontSize, color) { +function ImageText(text, fontSize, color) { return r.BindImageText( text, fontSize, @@ -4062,7 +4643,7 @@ raylib.ImageText = ImageText * * @return {Image} The resulting Image. */ -function ImageTextEx (font, text, fontSize, spacing, tint) { +function ImageTextEx(font, text, fontSize, spacing, tint) { return r.BindImageTextEx( font.baseSize, font.glyphCount, @@ -4093,7 +4674,7 @@ raylib.ImageTextEx = ImageTextEx * * @return {undefined} */ -function ImageBlurGaussian (image, blurSize) { +function ImageBlurGaussian(image, blurSize) { return r.BindImageBlurGaussian( image, blurSize @@ -4101,6 +4682,22 @@ function ImageBlurGaussian (image, blurSize) { } raylib.ImageBlurGaussian = ImageBlurGaussian +/** + * Rotate image by input angle in degrees (-359 to 359) + * + * @param {number} image + * @param {number} degrees + * + * @return {undefined} + */ +function ImageRotate(image, degrees) { + return r.BindImageRotate( + image, + degrees + ) +} +raylib.ImageRotate = ImageRotate + /** * Load color data from image as a Color array (RGBA - 32bit) * @@ -4108,7 +4705,7 @@ raylib.ImageBlurGaussian = ImageBlurGaussian * * @return {number} The resulting Color *. */ -function LoadImageColors (image) { +function LoadImageColors(image) { return r.BindLoadImageColors( image.data, image.width, @@ -4128,7 +4725,7 @@ raylib.LoadImageColors = LoadImageColors * * @return {number} The resulting Color *. */ -function LoadImagePalette (image, maxPaletteSize, colorCount) { +function LoadImagePalette(image, maxPaletteSize, colorCount) { return r.BindLoadImagePalette( image.data, image.width, @@ -4148,7 +4745,7 @@ raylib.LoadImagePalette = LoadImagePalette * * @return {undefined} */ -function UnloadImageColors (colors) { +function UnloadImageColors(colors) { return r.BindUnloadImageColors( colors ) @@ -4162,7 +4759,7 @@ raylib.UnloadImageColors = UnloadImageColors * * @return {undefined} */ -function UnloadImagePalette (colors) { +function UnloadImagePalette(colors) { return r.BindUnloadImagePalette( colors ) @@ -4177,7 +4774,7 @@ raylib.UnloadImagePalette = UnloadImagePalette * * @return {Rectangle} The resulting Rectangle. */ -function GetImageAlphaBorder (image, threshold) { +function GetImageAlphaBorder(image, threshold) { return r.BindGetImageAlphaBorder( image.data, image.width, @@ -4198,7 +4795,7 @@ raylib.GetImageAlphaBorder = GetImageAlphaBorder * * @return {Color} The resulting Color. */ -function GetImageColor (image, x, y) { +function GetImageColor(image, x, y) { return r.BindGetImageColor( image.data, image.width, @@ -4222,7 +4819,7 @@ raylib.GetImageColor = GetImageColor * * @return {undefined} */ -function ImageDrawCircleLines (dst, centerX, centerY, radius, color) { +function ImageDrawCircleLines(dst, centerX, centerY, radius, color) { return r.BindImageDrawCircleLines( dst, centerX, @@ -4246,7 +4843,7 @@ raylib.ImageDrawCircleLines = ImageDrawCircleLines * * @return {undefined} */ -function ImageDrawCircleLinesV (dst, center, radius, color) { +function ImageDrawCircleLinesV(dst, center, radius, color) { return r.BindImageDrawCircleLinesV( dst, center.x, @@ -4267,7 +4864,7 @@ raylib.ImageDrawCircleLinesV = ImageDrawCircleLinesV * * @return {Texture2D} The resulting Texture2D. */ -function LoadTexture (fileName) { +function LoadTexture(fileName) { return r.BindLoadTexture( fileName ) @@ -4281,7 +4878,7 @@ raylib.LoadTexture = LoadTexture * * @return {Texture2D} The resulting Texture2D. */ -function LoadTextureFromImage (image) { +function LoadTextureFromImage(image) { return r.BindLoadTextureFromImage( image.data, image.width, @@ -4300,7 +4897,7 @@ raylib.LoadTextureFromImage = LoadTextureFromImage * * @return {TextureCubemap} The resulting TextureCubemap. */ -function LoadTextureCubemap (image, layout) { +function LoadTextureCubemap(image, layout) { return r.BindLoadTextureCubemap( image.data, image.width, @@ -4320,7 +4917,7 @@ raylib.LoadTextureCubemap = LoadTextureCubemap * * @return {RenderTexture2D} The resulting RenderTexture2D. */ -function LoadRenderTexture (width, height) { +function LoadRenderTexture(width, height) { return r.BindLoadRenderTexture( width, height @@ -4335,7 +4932,7 @@ raylib.LoadRenderTexture = LoadRenderTexture * * @return {boolean} The resulting bool. */ -function IsTextureReady (texture) { +function IsTextureReady(texture) { return r.BindIsTextureReady( texture.id, texture.width, @@ -4353,7 +4950,7 @@ raylib.IsTextureReady = IsTextureReady * * @return {undefined} */ -function UnloadTexture (texture) { +function UnloadTexture(texture) { return r.BindUnloadTexture( texture.id, texture.width, @@ -4371,7 +4968,7 @@ raylib.UnloadTexture = UnloadTexture * * @return {boolean} The resulting bool. */ -function IsRenderTextureReady (target) { +function IsRenderTextureReady(target) { return r.BindIsRenderTextureReady( target.id, target.texture.id, @@ -4395,7 +4992,7 @@ raylib.IsRenderTextureReady = IsRenderTextureReady * * @return {undefined} */ -function UnloadRenderTexture (target) { +function UnloadRenderTexture(target) { return r.BindUnloadRenderTexture( target.id, target.texture.id, @@ -4420,7 +5017,7 @@ raylib.UnloadRenderTexture = UnloadRenderTexture * * @return {undefined} */ -function UpdateTexture (texture, pixels) { +function UpdateTexture(texture, pixels) { return r.BindUpdateTexture( texture.id, texture.width, @@ -4441,7 +5038,7 @@ raylib.UpdateTexture = UpdateTexture * * @return {undefined} */ -function UpdateTextureRec (texture, rec, pixels) { +function UpdateTextureRec(texture, rec, pixels) { return r.BindUpdateTextureRec( texture.id, texture.width, @@ -4465,7 +5062,7 @@ raylib.UpdateTextureRec = UpdateTextureRec * * @return {undefined} */ -function SetTextureFilter (texture, filter) { +function SetTextureFilter(texture, filter) { return r.BindSetTextureFilter( texture.id, texture.width, @@ -4485,7 +5082,7 @@ raylib.SetTextureFilter = SetTextureFilter * * @return {undefined} */ -function SetTextureWrap (texture, wrap) { +function SetTextureWrap(texture, wrap) { return r.BindSetTextureWrap( texture.id, texture.width, @@ -4507,7 +5104,7 @@ raylib.SetTextureWrap = SetTextureWrap * * @return {undefined} */ -function DrawTexture (texture, posX, posY, tint) { +function DrawTexture(texture, posX, posY, tint) { return r.BindDrawTexture( texture.id, texture.width, @@ -4533,7 +5130,7 @@ raylib.DrawTexture = DrawTexture * * @return {undefined} */ -function DrawTextureV (texture, position, tint) { +function DrawTextureV(texture, position, tint) { return r.BindDrawTextureV( texture.id, texture.width, @@ -4561,7 +5158,7 @@ raylib.DrawTextureV = DrawTextureV * * @return {undefined} */ -function DrawTextureEx (texture, position, rotation, scale, tint) { +function DrawTextureEx(texture, position, rotation, scale, tint) { return r.BindDrawTextureEx( texture.id, texture.width, @@ -4590,7 +5187,7 @@ raylib.DrawTextureEx = DrawTextureEx * * @return {undefined} */ -function DrawTextureRec (texture, source, position, tint) { +function DrawTextureRec(texture, source, position, tint) { return r.BindDrawTextureRec( texture.id, texture.width, @@ -4623,7 +5220,7 @@ raylib.DrawTextureRec = DrawTextureRec * * @return {undefined} */ -function DrawTexturePro (texture, source, dest, origin, rotation, tint) { +function DrawTexturePro(texture, source, dest, origin, rotation, tint) { return r.BindDrawTexturePro( texture.id, texture.width, @@ -4661,7 +5258,7 @@ raylib.DrawTexturePro = DrawTexturePro * * @return {undefined} */ -function DrawTextureNPatch (texture, nPatchInfo, dest, origin, rotation, tint) { +function DrawTextureNPatch(texture, nPatchInfo, dest, origin, rotation, tint) { return r.BindDrawTextureNPatch( texture.id, texture.width, @@ -4700,7 +5297,7 @@ raylib.DrawTextureNPatch = DrawTextureNPatch * * @return {Color} The resulting Color. */ -function Fade (color, alpha) { +function Fade(color, alpha) { return r.BindFade( color.r, color.g, @@ -4718,7 +5315,7 @@ raylib.Fade = Fade * * @return {number} The resulting int. */ -function ColorToInt (color) { +function ColorToInt(color) { return r.BindColorToInt( color.r, color.g, @@ -4735,7 +5332,7 @@ raylib.ColorToInt = ColorToInt * * @return {Vector4} The resulting Vector4. */ -function ColorNormalize (color) { +function ColorNormalize(color) { return r.BindColorNormalize( color.r, color.g, @@ -4752,7 +5349,7 @@ raylib.ColorNormalize = ColorNormalize * * @return {Color} The resulting Color. */ -function ColorFromNormalized (normalized) { +function ColorFromNormalized(normalized) { return r.BindColorFromNormalized( normalized.x, normalized.y, @@ -4769,7 +5366,7 @@ raylib.ColorFromNormalized = ColorFromNormalized * * @return {Vector3} The resulting Vector3. */ -function ColorToHSV (color) { +function ColorToHSV(color) { return r.BindColorToHSV( color.r, color.g, @@ -4788,7 +5385,7 @@ raylib.ColorToHSV = ColorToHSV * * @return {Color} The resulting Color. */ -function ColorFromHSV (hue, saturation, value) { +function ColorFromHSV(hue, saturation, value) { return r.BindColorFromHSV( hue, saturation, @@ -4805,7 +5402,7 @@ raylib.ColorFromHSV = ColorFromHSV * * @return {Color} The resulting Color. */ -function ColorTint (color, tint) { +function ColorTint(color, tint) { return r.BindColorTint( color.r, color.g, @@ -4827,7 +5424,7 @@ raylib.ColorTint = ColorTint * * @return {Color} The resulting Color. */ -function ColorBrightness (color, factor) { +function ColorBrightness(color, factor) { return r.BindColorBrightness( color.r, color.g, @@ -4846,7 +5443,7 @@ raylib.ColorBrightness = ColorBrightness * * @return {Color} The resulting Color. */ -function ColorContrast (color, contrast) { +function ColorContrast(color, contrast) { return r.BindColorContrast( color.r, color.g, @@ -4865,7 +5462,7 @@ raylib.ColorContrast = ColorContrast * * @return {Color} The resulting Color. */ -function ColorAlpha (color, alpha) { +function ColorAlpha(color, alpha) { return r.BindColorAlpha( color.r, color.g, @@ -4885,7 +5482,7 @@ raylib.ColorAlpha = ColorAlpha * * @return {Color} The resulting Color. */ -function ColorAlphaBlend (dst, src, tint) { +function ColorAlphaBlend(dst, src, tint) { return r.BindColorAlphaBlend( dst.r, dst.g, @@ -4910,7 +5507,7 @@ raylib.ColorAlphaBlend = ColorAlphaBlend * * @return {Color} The resulting Color. */ -function GetColor (hexValue) { +function GetColor(hexValue) { return r.BindGetColor( hexValue ) @@ -4925,7 +5522,7 @@ raylib.GetColor = GetColor * * @return {Color} The resulting Color. */ -function GetPixelColor (srcPtr, format) { +function GetPixelColor(srcPtr, format) { return r.BindGetPixelColor( srcPtr, format @@ -4942,7 +5539,7 @@ raylib.GetPixelColor = GetPixelColor * * @return {undefined} */ -function SetPixelColor (dstPtr, color, format) { +function SetPixelColor(dstPtr, color, format) { return r.BindSetPixelColor( dstPtr, color.r, @@ -4963,7 +5560,7 @@ raylib.SetPixelColor = SetPixelColor * * @return {number} The resulting int. */ -function GetPixelDataSize (width, height, format) { +function GetPixelDataSize(width, height, format) { return r.BindGetPixelDataSize( width, height, @@ -4977,7 +5574,7 @@ raylib.GetPixelDataSize = GetPixelDataSize * * @return {Font} The resulting Font. */ -function GetFontDefault () { +function GetFontDefault() { return r.BindGetFontDefault() } raylib.GetFontDefault = GetFontDefault @@ -4989,7 +5586,7 @@ raylib.GetFontDefault = GetFontDefault * * @return {Font} The resulting Font. */ -function LoadFont (fileName) { +function LoadFont(fileName) { return r.BindLoadFont( fileName ) @@ -4997,21 +5594,21 @@ function LoadFont (fileName) { raylib.LoadFont = LoadFont /** - * Load font from file with extended parameters, use NULL for fontChars and 0 for glyphCount to load the default character set + * Load font from file with extended parameters, use NULL for codepoints and 0 for codepointCount to load the default character setFont * * @param {string} fileName * @param {number} fontSize - * @param {number} fontChars - * @param {number} glyphCount + * @param {number} codepoints + * @param {number} codepointCount * * @return {Font} The resulting Font. */ -function LoadFontEx (fileName, fontSize, fontChars, glyphCount) { +function LoadFontEx(fileName, fontSize, codepoints, codepointCount) { return r.BindLoadFontEx( fileName, fontSize, - fontChars, - glyphCount + codepoints, + codepointCount ) } raylib.LoadFontEx = LoadFontEx @@ -5025,7 +5622,7 @@ raylib.LoadFontEx = LoadFontEx * * @return {Font} The resulting Font. */ -function LoadFontFromImage (image, key, firstChar) { +function LoadFontFromImage(image, key, firstChar) { return r.BindLoadFontFromImage( image.data, image.width, @@ -5048,19 +5645,19 @@ raylib.LoadFontFromImage = LoadFontFromImage * @param {Buffer} fileData * @param {number} dataSize * @param {number} fontSize - * @param {number} fontChars - * @param {number} glyphCount + * @param {number} codepoints + * @param {number} codepointCount * * @return {Font} The resulting Font. */ -function LoadFontFromMemory (fileType, fileData, dataSize, fontSize, fontChars, glyphCount) { +function LoadFontFromMemory(fileType, fileData, dataSize, fontSize, codepoints, codepointCount) { return r.BindLoadFontFromMemory( fileType, fileData, dataSize, fontSize, - fontChars, - glyphCount + codepoints, + codepointCount ) } raylib.LoadFontFromMemory = LoadFontFromMemory @@ -5072,7 +5669,7 @@ raylib.LoadFontFromMemory = LoadFontFromMemory * * @return {boolean} The resulting bool. */ -function IsFontReady (font) { +function IsFontReady(font) { return r.BindIsFontReady( font.baseSize, font.glyphCount, @@ -5094,19 +5691,19 @@ raylib.IsFontReady = IsFontReady * @param {Buffer} fileData * @param {number} dataSize * @param {number} fontSize - * @param {number} fontChars - * @param {number} glyphCount + * @param {number} codepoints + * @param {number} codepointCount * @param {number} type * * @return {number} The resulting GlyphInfo *. */ -function LoadFontData (fileData, dataSize, fontSize, fontChars, glyphCount, type) { +function LoadFontData(fileData, dataSize, fontSize, codepoints, codepointCount, type) { return r.BindLoadFontData( fileData, dataSize, fontSize, - fontChars, - glyphCount, + codepoints, + codepointCount, type ) } @@ -5115,8 +5712,8 @@ raylib.LoadFontData = LoadFontData /** * Generate image font atlas using chars info * - * @param {number} chars - * @param {number} recs + * @param {number} glyphs + * @param {number} glyphRecs * @param {number} glyphCount * @param {number} fontSize * @param {number} padding @@ -5124,10 +5721,10 @@ raylib.LoadFontData = LoadFontData * * @return {Image} The resulting Image. */ -function GenImageFontAtlas (chars, recs, glyphCount, fontSize, padding, packMethod) { +function GenImageFontAtlas(glyphs, glyphRecs, glyphCount, fontSize, padding, packMethod) { return r.BindGenImageFontAtlas( - chars, - recs, + glyphs, + glyphRecs, glyphCount, fontSize, padding, @@ -5139,14 +5736,14 @@ raylib.GenImageFontAtlas = GenImageFontAtlas /** * Unload font chars info data (RAM) * - * @param {number} chars + * @param {number} glyphs * @param {number} glyphCount * * @return {undefined} */ -function UnloadFontData (chars, glyphCount) { +function UnloadFontData(glyphs, glyphCount) { return r.BindUnloadFontData( - chars, + glyphs, glyphCount ) } @@ -5159,7 +5756,7 @@ raylib.UnloadFontData = UnloadFontData * * @return {undefined} */ -function UnloadFont (font) { +function UnloadFont(font) { return r.BindUnloadFont( font.baseSize, font.glyphCount, @@ -5183,7 +5780,7 @@ raylib.UnloadFont = UnloadFont * * @return {boolean} The resulting bool. */ -function ExportFontAsCode (font, fileName) { +function ExportFontAsCode(font, fileName) { return r.BindExportFontAsCode( font.baseSize, font.glyphCount, @@ -5208,7 +5805,7 @@ raylib.ExportFontAsCode = ExportFontAsCode * * @return {undefined} */ -function DrawFPS (posX, posY) { +function DrawFPS(posX, posY) { return r.BindDrawFPS( posX, posY @@ -5227,7 +5824,7 @@ raylib.DrawFPS = DrawFPS * * @return {undefined} */ -function DrawText (text, posX, posY, fontSize, color) { +function DrawText(text, posX, posY, fontSize, color) { return r.BindDrawText( text, posX, @@ -5253,7 +5850,7 @@ raylib.DrawText = DrawText * * @return {undefined} */ -function DrawTextEx (font, text, position, fontSize, spacing, tint) { +function DrawTextEx(font, text, position, fontSize, spacing, tint) { return r.BindDrawTextEx( font.baseSize, font.glyphCount, @@ -5292,7 +5889,7 @@ raylib.DrawTextEx = DrawTextEx * * @return {undefined} */ -function DrawTextPro (font, text, position, origin, rotation, fontSize, spacing, tint) { +function DrawTextPro(font, text, position, origin, rotation, fontSize, spacing, tint) { return r.BindDrawTextPro( font.baseSize, font.glyphCount, @@ -5331,7 +5928,7 @@ raylib.DrawTextPro = DrawTextPro * * @return {undefined} */ -function DrawTextCodepoint (font, codepoint, position, fontSize, tint) { +function DrawTextCodepoint(font, codepoint, position, fontSize, tint) { return r.BindDrawTextCodepoint( font.baseSize, font.glyphCount, @@ -5360,7 +5957,7 @@ raylib.DrawTextCodepoint = DrawTextCodepoint * * @param {Font} font * @param {number} codepoints - * @param {number} count + * @param {number} codepointCount * @param {Vector2} position * @param {number} fontSize * @param {number} spacing @@ -5368,7 +5965,7 @@ raylib.DrawTextCodepoint = DrawTextCodepoint * * @return {undefined} */ -function DrawTextCodepoints (font, codepoints, count, position, fontSize, spacing, tint) { +function DrawTextCodepoints(font, codepoints, codepointCount, position, fontSize, spacing, tint) { return r.BindDrawTextCodepoints( font.baseSize, font.glyphCount, @@ -5381,7 +5978,7 @@ function DrawTextCodepoints (font, codepoints, count, position, fontSize, spacin font.recs, font.glyphs, codepoints, - count, + codepointCount, position.x, position.y, fontSize, @@ -5394,6 +5991,20 @@ function DrawTextCodepoints (font, codepoints, count, position, fontSize, spacin } raylib.DrawTextCodepoints = DrawTextCodepoints +/** + * Set vertical line spacing when drawing with line-breaks + * + * @param {number} spacing + * + * @return {undefined} + */ +function SetTextLineSpacing(spacing) { + return r.BindSetTextLineSpacing( + spacing + ) +} +raylib.SetTextLineSpacing = SetTextLineSpacing + /** * Measure string width for default font * @@ -5402,7 +6013,7 @@ raylib.DrawTextCodepoints = DrawTextCodepoints * * @return {number} The resulting int. */ -function MeasureText (text, fontSize) { +function MeasureText(text, fontSize) { return r.BindMeasureText( text, fontSize @@ -5420,7 +6031,7 @@ raylib.MeasureText = MeasureText * * @return {Vector2} The resulting Vector2. */ -function MeasureTextEx (font, text, fontSize, spacing) { +function MeasureTextEx(font, text, fontSize, spacing) { return r.BindMeasureTextEx( font.baseSize, font.glyphCount, @@ -5447,7 +6058,7 @@ raylib.MeasureTextEx = MeasureTextEx * * @return {number} The resulting int. */ -function GetGlyphIndex (font, codepoint) { +function GetGlyphIndex(font, codepoint) { return r.BindGetGlyphIndex( font.baseSize, font.glyphCount, @@ -5472,7 +6083,7 @@ raylib.GetGlyphIndex = GetGlyphIndex * * @return {GlyphInfo} The resulting GlyphInfo. */ -function GetGlyphInfo (font, codepoint) { +function GetGlyphInfo(font, codepoint) { return r.BindGetGlyphInfo( font.baseSize, font.glyphCount, @@ -5497,7 +6108,7 @@ raylib.GetGlyphInfo = GetGlyphInfo * * @return {Rectangle} The resulting Rectangle. */ -function GetGlyphAtlasRec (font, codepoint) { +function GetGlyphAtlasRec(font, codepoint) { return r.BindGetGlyphAtlasRec( font.baseSize, font.glyphCount, @@ -5522,7 +6133,7 @@ raylib.GetGlyphAtlasRec = GetGlyphAtlasRec * * @return {string} The resulting char *. */ -function LoadUTF8 (codepoints, length) { +function LoadUTF8(codepoints, length) { return r.BindLoadUTF8( codepoints, length @@ -5537,7 +6148,7 @@ raylib.LoadUTF8 = LoadUTF8 * * @return {undefined} */ -function UnloadUTF8 (text) { +function UnloadUTF8(text) { return r.BindUnloadUTF8( text ) @@ -5552,7 +6163,7 @@ raylib.UnloadUTF8 = UnloadUTF8 * * @return {number} The resulting int *. */ -function LoadCodepoints (text, count) { +function LoadCodepoints(text, count) { return r.BindLoadCodepoints( text, count @@ -5567,7 +6178,7 @@ raylib.LoadCodepoints = LoadCodepoints * * @return {undefined} */ -function UnloadCodepoints (codepoints) { +function UnloadCodepoints(codepoints) { return r.BindUnloadCodepoints( codepoints ) @@ -5581,7 +6192,7 @@ raylib.UnloadCodepoints = UnloadCodepoints * * @return {number} The resulting int. */ -function GetCodepointCount (text) { +function GetCodepointCount(text) { return r.BindGetCodepointCount( text ) @@ -5596,7 +6207,7 @@ raylib.GetCodepointCount = GetCodepointCount * * @return {number} The resulting int. */ -function GetCodepoint (text, codepointSize) { +function GetCodepoint(text, codepointSize) { return r.BindGetCodepoint( text, codepointSize @@ -5612,7 +6223,7 @@ raylib.GetCodepoint = GetCodepoint * * @return {number} The resulting int. */ -function GetCodepointNext (text, codepointSize) { +function GetCodepointNext(text, codepointSize) { return r.BindGetCodepointNext( text, codepointSize @@ -5628,7 +6239,7 @@ raylib.GetCodepointNext = GetCodepointNext * * @return {number} The resulting int. */ -function GetCodepointPrevious (text, codepointSize) { +function GetCodepointPrevious(text, codepointSize) { return r.BindGetCodepointPrevious( text, codepointSize @@ -5644,7 +6255,7 @@ raylib.GetCodepointPrevious = GetCodepointPrevious * * @return {string} The resulting const char *. */ -function CodepointToUTF8 (codepoint, utf8Size) { +function CodepointToUTF8(codepoint, utf8Size) { return r.BindCodepointToUTF8( codepoint, utf8Size @@ -5660,7 +6271,7 @@ raylib.CodepointToUTF8 = CodepointToUTF8 * * @return {number} The resulting int. */ -function TextCopy (dst, src) { +function TextCopy(dst, src) { return r.BindTextCopy( dst, src @@ -5676,7 +6287,7 @@ raylib.TextCopy = TextCopy * * @return {boolean} The resulting bool. */ -function TextIsEqual (text1, text2) { +function TextIsEqual(text1, text2) { return r.BindTextIsEqual( text1, text2 @@ -5691,7 +6302,7 @@ raylib.TextIsEqual = TextIsEqual * * @return {number} The resulting unsigned int. */ -function TextLength (text) { +function TextLength(text) { return r.BindTextLength( text ) @@ -5707,7 +6318,7 @@ raylib.TextLength = TextLength * * @return {string} The resulting const char *. */ -function TextSubtext (text, position, length) { +function TextSubtext(text, position, length) { return r.BindTextSubtext( text, position, @@ -5725,7 +6336,7 @@ raylib.TextSubtext = TextSubtext * * @return {string} The resulting char *. */ -function TextReplace (text, replace, by) { +function TextReplace(text, replace, by) { return r.BindTextReplace( text, replace, @@ -5743,7 +6354,7 @@ raylib.TextReplace = TextReplace * * @return {string} The resulting char *. */ -function TextInsert (text, insert, position) { +function TextInsert(text, insert, position) { return r.BindTextInsert( text, insert, @@ -5761,7 +6372,7 @@ raylib.TextInsert = TextInsert * * @return {string} The resulting const char *. */ -function TextJoin (textList, count, delimiter) { +function TextJoin(textList, count, delimiter) { return r.BindTextJoin( textList, count, @@ -5779,7 +6390,7 @@ raylib.TextJoin = TextJoin * * @return {number} The resulting const char **. */ -function TextSplit (text, delimiter, count) { +function TextSplit(text, delimiter, count) { return r.BindTextSplit( text, delimiter, @@ -5797,7 +6408,7 @@ raylib.TextSplit = TextSplit * * @return {undefined} */ -function TextAppend (text, append, position) { +function TextAppend(text, append, position) { return r.BindTextAppend( text, append, @@ -5814,7 +6425,7 @@ raylib.TextAppend = TextAppend * * @return {number} The resulting int. */ -function TextFindIndex (text, find) { +function TextFindIndex(text, find) { return r.BindTextFindIndex( text, find @@ -5829,7 +6440,7 @@ raylib.TextFindIndex = TextFindIndex * * @return {string} The resulting const char *. */ -function TextToUpper (text) { +function TextToUpper(text) { return r.BindTextToUpper( text ) @@ -5843,7 +6454,7 @@ raylib.TextToUpper = TextToUpper * * @return {string} The resulting const char *. */ -function TextToLower (text) { +function TextToLower(text) { return r.BindTextToLower( text ) @@ -5857,7 +6468,7 @@ raylib.TextToLower = TextToLower * * @return {string} The resulting const char *. */ -function TextToPascal (text) { +function TextToPascal(text) { return r.BindTextToPascal( text ) @@ -5871,7 +6482,7 @@ raylib.TextToPascal = TextToPascal * * @return {number} The resulting int. */ -function TextToInteger (text) { +function TextToInteger(text) { return r.BindTextToInteger( text ) @@ -5887,7 +6498,7 @@ raylib.TextToInteger = TextToInteger * * @return {undefined} */ -function DrawLine3D (startPos, endPos, color) { +function DrawLine3D(startPos, endPos, color) { return r.BindDrawLine3D( startPos.x, startPos.y, @@ -5911,7 +6522,7 @@ raylib.DrawLine3D = DrawLine3D * * @return {undefined} */ -function DrawPoint3D (position, color) { +function DrawPoint3D(position, color) { return r.BindDrawPoint3D( position.x, position.y, @@ -5935,7 +6546,7 @@ raylib.DrawPoint3D = DrawPoint3D * * @return {undefined} */ -function DrawCircle3D (center, radius, rotationAxis, rotationAngle, color) { +function DrawCircle3D(center, radius, rotationAxis, rotationAngle, color) { return r.BindDrawCircle3D( center.x, center.y, @@ -5963,7 +6574,7 @@ raylib.DrawCircle3D = DrawCircle3D * * @return {undefined} */ -function DrawTriangle3D (v1, v2, v3, color) { +function DrawTriangle3D(v1, v2, v3, color) { return r.BindDrawTriangle3D( v1.x, v1.y, @@ -5991,7 +6602,7 @@ raylib.DrawTriangle3D = DrawTriangle3D * * @return {undefined} */ -function DrawTriangleStrip3D (points, pointCount, color) { +function DrawTriangleStrip3D(points, pointCount, color) { return r.BindDrawTriangleStrip3D( points, pointCount, @@ -6014,7 +6625,7 @@ raylib.DrawTriangleStrip3D = DrawTriangleStrip3D * * @return {undefined} */ -function DrawCube (position, width, height, length, color) { +function DrawCube(position, width, height, length, color) { return r.BindDrawCube( position.x, position.y, @@ -6039,7 +6650,7 @@ raylib.DrawCube = DrawCube * * @return {undefined} */ -function DrawCubeV (position, size, color) { +function DrawCubeV(position, size, color) { return r.BindDrawCubeV( position.x, position.y, @@ -6066,7 +6677,7 @@ raylib.DrawCubeV = DrawCubeV * * @return {undefined} */ -function DrawCubeWires (position, width, height, length, color) { +function DrawCubeWires(position, width, height, length, color) { return r.BindDrawCubeWires( position.x, position.y, @@ -6091,7 +6702,7 @@ raylib.DrawCubeWires = DrawCubeWires * * @return {undefined} */ -function DrawCubeWiresV (position, size, color) { +function DrawCubeWiresV(position, size, color) { return r.BindDrawCubeWiresV( position.x, position.y, @@ -6116,7 +6727,7 @@ raylib.DrawCubeWiresV = DrawCubeWiresV * * @return {undefined} */ -function DrawSphere (centerPos, radius, color) { +function DrawSphere(centerPos, radius, color) { return r.BindDrawSphere( centerPos.x, centerPos.y, @@ -6141,7 +6752,7 @@ raylib.DrawSphere = DrawSphere * * @return {undefined} */ -function DrawSphereEx (centerPos, radius, rings, slices, color) { +function DrawSphereEx(centerPos, radius, rings, slices, color) { return r.BindDrawSphereEx( centerPos.x, centerPos.y, @@ -6168,7 +6779,7 @@ raylib.DrawSphereEx = DrawSphereEx * * @return {undefined} */ -function DrawSphereWires (centerPos, radius, rings, slices, color) { +function DrawSphereWires(centerPos, radius, rings, slices, color) { return r.BindDrawSphereWires( centerPos.x, centerPos.y, @@ -6196,7 +6807,7 @@ raylib.DrawSphereWires = DrawSphereWires * * @return {undefined} */ -function DrawCylinder (position, radiusTop, radiusBottom, height, slices, color) { +function DrawCylinder(position, radiusTop, radiusBottom, height, slices, color) { return r.BindDrawCylinder( position.x, position.y, @@ -6225,7 +6836,7 @@ raylib.DrawCylinder = DrawCylinder * * @return {undefined} */ -function DrawCylinderEx (startPos, endPos, startRadius, endRadius, sides, color) { +function DrawCylinderEx(startPos, endPos, startRadius, endRadius, sides, color) { return r.BindDrawCylinderEx( startPos.x, startPos.y, @@ -6256,7 +6867,7 @@ raylib.DrawCylinderEx = DrawCylinderEx * * @return {undefined} */ -function DrawCylinderWires (position, radiusTop, radiusBottom, height, slices, color) { +function DrawCylinderWires(position, radiusTop, radiusBottom, height, slices, color) { return r.BindDrawCylinderWires( position.x, position.y, @@ -6285,7 +6896,7 @@ raylib.DrawCylinderWires = DrawCylinderWires * * @return {undefined} */ -function DrawCylinderWiresEx (startPos, endPos, startRadius, endRadius, sides, color) { +function DrawCylinderWiresEx(startPos, endPos, startRadius, endRadius, sides, color) { return r.BindDrawCylinderWiresEx( startPos.x, startPos.y, @@ -6316,7 +6927,7 @@ raylib.DrawCylinderWiresEx = DrawCylinderWiresEx * * @return {undefined} */ -function DrawCapsule (startPos, endPos, radius, slices, rings, color) { +function DrawCapsule(startPos, endPos, radius, slices, rings, color) { return r.BindDrawCapsule( startPos.x, startPos.y, @@ -6347,7 +6958,7 @@ raylib.DrawCapsule = DrawCapsule * * @return {undefined} */ -function DrawCapsuleWires (startPos, endPos, radius, slices, rings, color) { +function DrawCapsuleWires(startPos, endPos, radius, slices, rings, color) { return r.BindDrawCapsuleWires( startPos.x, startPos.y, @@ -6375,7 +6986,7 @@ raylib.DrawCapsuleWires = DrawCapsuleWires * * @return {undefined} */ -function DrawPlane (centerPos, size, color) { +function DrawPlane(centerPos, size, color) { return r.BindDrawPlane( centerPos.x, centerPos.y, @@ -6398,7 +7009,7 @@ raylib.DrawPlane = DrawPlane * * @return {undefined} */ -function DrawRay (ray, color) { +function DrawRay(ray, color) { return r.BindDrawRay( ray.position.x, ray.position.y, @@ -6422,7 +7033,7 @@ raylib.DrawRay = DrawRay * * @return {undefined} */ -function DrawGrid (slices, spacing) { +function DrawGrid(slices, spacing) { return r.BindDrawGrid( slices, spacing @@ -6437,7 +7048,7 @@ raylib.DrawGrid = DrawGrid * * @return {Model} The resulting Model. */ -function LoadModel (fileName) { +function LoadModel(fileName) { return r.BindLoadModel( fileName ) @@ -6451,7 +7062,7 @@ raylib.LoadModel = LoadModel * * @return {Model} The resulting Model. */ -function LoadModelFromMesh (mesh) { +function LoadModelFromMesh(mesh) { return r.BindLoadModelFromMesh( mesh.vertexCount, mesh.triangleCount, @@ -6479,7 +7090,7 @@ raylib.LoadModelFromMesh = LoadModelFromMesh * * @return {boolean} The resulting bool. */ -function IsModelReady (model) { +function IsModelReady(model) { return r.BindIsModelReady( model.transform.m0, model.transform.m4, @@ -6516,7 +7127,7 @@ raylib.IsModelReady = IsModelReady * * @return {undefined} */ -function UnloadModel (model) { +function UnloadModel(model) { return r.BindUnloadModel( model.transform.m0, model.transform.m4, @@ -6553,7 +7164,7 @@ raylib.UnloadModel = UnloadModel * * @return {BoundingBox} The resulting BoundingBox. */ -function GetModelBoundingBox (model) { +function GetModelBoundingBox(model) { return r.BindGetModelBoundingBox( model.transform.m0, model.transform.m4, @@ -6593,7 +7204,7 @@ raylib.GetModelBoundingBox = GetModelBoundingBox * * @return {undefined} */ -function DrawModel (model, position, scale, tint) { +function DrawModel(model, position, scale, tint) { return r.BindDrawModel( model.transform.m0, model.transform.m4, @@ -6643,7 +7254,7 @@ raylib.DrawModel = DrawModel * * @return {undefined} */ -function DrawModelEx (model, position, rotationAxis, rotationAngle, scale, tint) { +function DrawModelEx(model, position, rotationAxis, rotationAngle, scale, tint) { return r.BindDrawModelEx( model.transform.m0, model.transform.m4, @@ -6697,7 +7308,7 @@ raylib.DrawModelEx = DrawModelEx * * @return {undefined} */ -function DrawModelWires (model, position, scale, tint) { +function DrawModelWires(model, position, scale, tint) { return r.BindDrawModelWires( model.transform.m0, model.transform.m4, @@ -6747,7 +7358,7 @@ raylib.DrawModelWires = DrawModelWires * * @return {undefined} */ -function DrawModelWiresEx (model, position, rotationAxis, rotationAngle, scale, tint) { +function DrawModelWiresEx(model, position, rotationAxis, rotationAngle, scale, tint) { return r.BindDrawModelWiresEx( model.transform.m0, model.transform.m4, @@ -6799,7 +7410,7 @@ raylib.DrawModelWiresEx = DrawModelWiresEx * * @return {undefined} */ -function DrawBoundingBox (box, color) { +function DrawBoundingBox(box, color) { return r.BindDrawBoundingBox( box.min.x, box.min.y, @@ -6826,7 +7437,7 @@ raylib.DrawBoundingBox = DrawBoundingBox * * @return {undefined} */ -function DrawBillboard (camera, texture, position, size, tint) { +function DrawBillboard(camera, texture, position, size, tint) { return r.BindDrawBillboard( camera.position.x, camera.position.y, @@ -6868,7 +7479,7 @@ raylib.DrawBillboard = DrawBillboard * * @return {undefined} */ -function DrawBillboardRec (camera, texture, source, position, size, tint) { +function DrawBillboardRec(camera, texture, source, position, size, tint) { return r.BindDrawBillboardRec( camera.position.x, camera.position.y, @@ -6918,7 +7529,7 @@ raylib.DrawBillboardRec = DrawBillboardRec * * @return {undefined} */ -function DrawBillboardPro (camera, texture, source, position, up, size, origin, rotation, tint) { +function DrawBillboardPro(camera, texture, source, position, up, size, origin, rotation, tint) { return r.BindDrawBillboardPro( camera.position.x, camera.position.y, @@ -6970,7 +7581,7 @@ raylib.DrawBillboardPro = DrawBillboardPro * * @return {undefined} */ -function UpdateMeshBuffer (mesh, index, data, dataSize, offset) { +function UpdateMeshBuffer(mesh, index, data, dataSize, offset) { return r.BindUpdateMeshBuffer( mesh.vertexCount, mesh.triangleCount, @@ -7002,7 +7613,7 @@ raylib.UpdateMeshBuffer = UpdateMeshBuffer * * @return {undefined} */ -function UnloadMesh (mesh) { +function UnloadMesh(mesh) { return r.BindUnloadMesh( mesh.vertexCount, mesh.triangleCount, @@ -7031,7 +7642,7 @@ raylib.UnloadMesh = UnloadMesh * * @return {boolean} The resulting bool. */ -function ExportMesh (mesh, fileName) { +function ExportMesh(mesh, fileName) { return r.BindExportMesh( mesh.vertexCount, mesh.triangleCount, @@ -7060,7 +7671,7 @@ raylib.ExportMesh = ExportMesh * * @return {BoundingBox} The resulting BoundingBox. */ -function GetMeshBoundingBox (mesh) { +function GetMeshBoundingBox(mesh) { return r.BindGetMeshBoundingBox( mesh.vertexCount, mesh.triangleCount, @@ -7089,7 +7700,7 @@ raylib.GetMeshBoundingBox = GetMeshBoundingBox * * @return {Mesh} The resulting Mesh. */ -function GenMeshPoly (sides, radius) { +function GenMeshPoly(sides, radius) { return r.BindGenMeshPoly( sides, radius @@ -7107,7 +7718,7 @@ raylib.GenMeshPoly = GenMeshPoly * * @return {Mesh} The resulting Mesh. */ -function GenMeshPlane (width, length, resX, resZ) { +function GenMeshPlane(width, length, resX, resZ) { return r.BindGenMeshPlane( width, length, @@ -7126,7 +7737,7 @@ raylib.GenMeshPlane = GenMeshPlane * * @return {Mesh} The resulting Mesh. */ -function GenMeshCube (width, height, length) { +function GenMeshCube(width, height, length) { return r.BindGenMeshCube( width, height, @@ -7144,7 +7755,7 @@ raylib.GenMeshCube = GenMeshCube * * @return {Mesh} The resulting Mesh. */ -function GenMeshSphere (radius, rings, slices) { +function GenMeshSphere(radius, rings, slices) { return r.BindGenMeshSphere( radius, rings, @@ -7162,7 +7773,7 @@ raylib.GenMeshSphere = GenMeshSphere * * @return {Mesh} The resulting Mesh. */ -function GenMeshHemiSphere (radius, rings, slices) { +function GenMeshHemiSphere(radius, rings, slices) { return r.BindGenMeshHemiSphere( radius, rings, @@ -7180,7 +7791,7 @@ raylib.GenMeshHemiSphere = GenMeshHemiSphere * * @return {Mesh} The resulting Mesh. */ -function GenMeshCylinder (radius, height, slices) { +function GenMeshCylinder(radius, height, slices) { return r.BindGenMeshCylinder( radius, height, @@ -7198,7 +7809,7 @@ raylib.GenMeshCylinder = GenMeshCylinder * * @return {Mesh} The resulting Mesh. */ -function GenMeshCone (radius, height, slices) { +function GenMeshCone(radius, height, slices) { return r.BindGenMeshCone( radius, height, @@ -7217,7 +7828,7 @@ raylib.GenMeshCone = GenMeshCone * * @return {Mesh} The resulting Mesh. */ -function GenMeshTorus (radius, size, radSeg, sides) { +function GenMeshTorus(radius, size, radSeg, sides) { return r.BindGenMeshTorus( radius, size, @@ -7237,7 +7848,7 @@ raylib.GenMeshTorus = GenMeshTorus * * @return {Mesh} The resulting Mesh. */ -function GenMeshKnot (radius, size, radSeg, sides) { +function GenMeshKnot(radius, size, radSeg, sides) { return r.BindGenMeshKnot( radius, size, @@ -7255,7 +7866,7 @@ raylib.GenMeshKnot = GenMeshKnot * * @return {Mesh} The resulting Mesh. */ -function GenMeshHeightmap (heightmap, size) { +function GenMeshHeightmap(heightmap, size) { return r.BindGenMeshHeightmap( heightmap.data, heightmap.width, @@ -7277,7 +7888,7 @@ raylib.GenMeshHeightmap = GenMeshHeightmap * * @return {Mesh} The resulting Mesh. */ -function GenMeshCubicmap (cubicmap, cubeSize) { +function GenMeshCubicmap(cubicmap, cubeSize) { return r.BindGenMeshCubicmap( cubicmap.data, cubicmap.width, @@ -7299,7 +7910,7 @@ raylib.GenMeshCubicmap = GenMeshCubicmap * * @return {number} The resulting ModelAnimation *. */ -function LoadModelAnimations (fileName, animCount) { +function LoadModelAnimations(fileName, animCount) { return r.BindLoadModelAnimations( fileName, animCount @@ -7316,7 +7927,7 @@ raylib.LoadModelAnimations = LoadModelAnimations * * @return {undefined} */ -function UpdateModelAnimation (model, anim, frame) { +function UpdateModelAnimation(model, anim, frame) { return r.BindUpdateModelAnimation( model.transform.m0, model.transform.m4, @@ -7346,6 +7957,7 @@ function UpdateModelAnimation (model, anim, frame) { anim.frameCount, anim.bones, anim.framePoses, + anim.name, frame ) } @@ -7358,12 +7970,13 @@ raylib.UpdateModelAnimation = UpdateModelAnimation * * @return {undefined} */ -function UnloadModelAnimation (anim) { +function UnloadModelAnimation(anim) { return r.BindUnloadModelAnimation( anim.boneCount, anim.frameCount, anim.bones, - anim.framePoses + anim.framePoses, + anim.name ) } raylib.UnloadModelAnimation = UnloadModelAnimation @@ -7372,14 +7985,14 @@ raylib.UnloadModelAnimation = UnloadModelAnimation * Unload animation array data * * @param {number} animations - * @param {number} count + * @param {number} animCount * * @return {undefined} */ -function UnloadModelAnimations (animations, count) { +function UnloadModelAnimations(animations, animCount) { return r.BindUnloadModelAnimations( animations, - count + animCount ) } raylib.UnloadModelAnimations = UnloadModelAnimations @@ -7392,7 +8005,7 @@ raylib.UnloadModelAnimations = UnloadModelAnimations * * @return {boolean} The resulting bool. */ -function IsModelAnimationValid (model, anim) { +function IsModelAnimationValid(model, anim) { return r.BindIsModelAnimationValid( model.transform.m0, model.transform.m4, @@ -7421,7 +8034,8 @@ function IsModelAnimationValid (model, anim) { anim.boneCount, anim.frameCount, anim.bones, - anim.framePoses + anim.framePoses, + anim.name ) } raylib.IsModelAnimationValid = IsModelAnimationValid @@ -7436,7 +8050,7 @@ raylib.IsModelAnimationValid = IsModelAnimationValid * * @return {boolean} The resulting bool. */ -function CheckCollisionSpheres (center1, radius1, center2, radius2) { +function CheckCollisionSpheres(center1, radius1, center2, radius2) { return r.BindCheckCollisionSpheres( center1.x, center1.y, @@ -7458,7 +8072,7 @@ raylib.CheckCollisionSpheres = CheckCollisionSpheres * * @return {boolean} The resulting bool. */ -function CheckCollisionBoxes (box1, box2) { +function CheckCollisionBoxes(box1, box2) { return r.BindCheckCollisionBoxes( box1.min.x, box1.min.y, @@ -7485,7 +8099,7 @@ raylib.CheckCollisionBoxes = CheckCollisionBoxes * * @return {boolean} The resulting bool. */ -function CheckCollisionBoxSphere (box, center, radius) { +function CheckCollisionBoxSphere(box, center, radius) { return r.BindCheckCollisionBoxSphere( box.min.x, box.min.y, @@ -7510,7 +8124,7 @@ raylib.CheckCollisionBoxSphere = CheckCollisionBoxSphere * * @return {RayCollision} The resulting RayCollision. */ -function GetRayCollisionSphere (ray, center, radius) { +function GetRayCollisionSphere(ray, center, radius) { return r.BindGetRayCollisionSphere( ray.position.x, ray.position.y, @@ -7534,7 +8148,7 @@ raylib.GetRayCollisionSphere = GetRayCollisionSphere * * @return {RayCollision} The resulting RayCollision. */ -function GetRayCollisionBox (ray, box) { +function GetRayCollisionBox(ray, box) { return r.BindGetRayCollisionBox( ray.position.x, ray.position.y, @@ -7561,7 +8175,7 @@ raylib.GetRayCollisionBox = GetRayCollisionBox * * @return {RayCollision} The resulting RayCollision. */ -function GetRayCollisionMesh (ray, mesh, transform) { +function GetRayCollisionMesh(ray, mesh, transform) { return r.BindGetRayCollisionMesh( ray.position.x, ray.position.y, @@ -7614,7 +8228,7 @@ raylib.GetRayCollisionMesh = GetRayCollisionMesh * * @return {RayCollision} The resulting RayCollision. */ -function GetRayCollisionTriangle (ray, p1, p2, p3) { +function GetRayCollisionTriangle(ray, p1, p2, p3) { return r.BindGetRayCollisionTriangle( ray.position.x, ray.position.y, @@ -7646,7 +8260,7 @@ raylib.GetRayCollisionTriangle = GetRayCollisionTriangle * * @return {RayCollision} The resulting RayCollision. */ -function GetRayCollisionQuad (ray, p1, p2, p3, p4) { +function GetRayCollisionQuad(ray, p1, p2, p3, p4) { return r.BindGetRayCollisionQuad( ray.position.x, ray.position.y, @@ -7675,7 +8289,7 @@ raylib.GetRayCollisionQuad = GetRayCollisionQuad * * @return {undefined} */ -function InitAudioDevice () { +function InitAudioDevice() { return r.BindInitAudioDevice() } raylib.InitAudioDevice = InitAudioDevice @@ -7685,7 +8299,7 @@ raylib.InitAudioDevice = InitAudioDevice * * @return {undefined} */ -function CloseAudioDevice () { +function CloseAudioDevice() { return r.BindCloseAudioDevice() } raylib.CloseAudioDevice = CloseAudioDevice @@ -7695,7 +8309,7 @@ raylib.CloseAudioDevice = CloseAudioDevice * * @return {boolean} The resulting bool. */ -function IsAudioDeviceReady () { +function IsAudioDeviceReady() { return r.BindIsAudioDeviceReady() } raylib.IsAudioDeviceReady = IsAudioDeviceReady @@ -7707,13 +8321,23 @@ raylib.IsAudioDeviceReady = IsAudioDeviceReady * * @return {undefined} */ -function SetMasterVolume (volume) { +function SetMasterVolume(volume) { return r.BindSetMasterVolume( volume ) } raylib.SetMasterVolume = SetMasterVolume +/** + * Get master volume (listener) + * + * @return {number} The resulting float. + */ +function GetMasterVolume() { + return r.BindGetMasterVolume() +} +raylib.GetMasterVolume = GetMasterVolume + /** * Load wave data from file * @@ -7721,7 +8345,7 @@ raylib.SetMasterVolume = SetMasterVolume * * @return {Wave} The resulting Wave. */ -function LoadWave (fileName) { +function LoadWave(fileName) { return r.BindLoadWave( fileName ) @@ -7737,7 +8361,7 @@ raylib.LoadWave = LoadWave * * @return {Wave} The resulting Wave. */ -function LoadWaveFromMemory (fileType, fileData, dataSize) { +function LoadWaveFromMemory(fileType, fileData, dataSize) { return r.BindLoadWaveFromMemory( fileType, fileData, @@ -7753,7 +8377,7 @@ raylib.LoadWaveFromMemory = LoadWaveFromMemory * * @return {boolean} The resulting bool. */ -function IsWaveReady (wave) { +function IsWaveReady(wave) { return r.BindIsWaveReady( wave.frameCount, wave.sampleRate, @@ -7771,7 +8395,7 @@ raylib.IsWaveReady = IsWaveReady * * @return {Sound} The resulting Sound. */ -function LoadSound (fileName) { +function LoadSound(fileName) { return r.BindLoadSound( fileName ) @@ -7785,7 +8409,7 @@ raylib.LoadSound = LoadSound * * @return {Sound} The resulting Sound. */ -function LoadSoundFromWave (wave) { +function LoadSoundFromWave(wave) { return r.BindLoadSoundFromWave( wave.frameCount, wave.sampleRate, @@ -7796,6 +8420,25 @@ function LoadSoundFromWave (wave) { } raylib.LoadSoundFromWave = LoadSoundFromWave +/** + * Create a new sound that shares the same sample data as the source sound, does not own the sound data + * + * @param {Sound} source + * + * @return {Sound} The resulting Sound. + */ +function LoadSoundAlias(source) { + return r.BindLoadSoundAlias( + source.stream.buffer, + source.stream.processor, + source.stream.sampleRate, + source.stream.sampleSize, + source.stream.channels, + source.frameCount + ) +} +raylib.LoadSoundAlias = LoadSoundAlias + /** * Checks if a sound is ready * @@ -7803,7 +8446,7 @@ raylib.LoadSoundFromWave = LoadSoundFromWave * * @return {boolean} The resulting bool. */ -function IsSoundReady (sound) { +function IsSoundReady(sound) { return r.BindIsSoundReady( sound.stream.buffer, sound.stream.processor, @@ -7824,7 +8467,7 @@ raylib.IsSoundReady = IsSoundReady * * @return {undefined} */ -function UpdateSound (sound, data, sampleCount) { +function UpdateSound(sound, data, sampleCount) { return r.BindUpdateSound( sound.stream.buffer, sound.stream.processor, @@ -7845,7 +8488,7 @@ raylib.UpdateSound = UpdateSound * * @return {undefined} */ -function UnloadWave (wave) { +function UnloadWave(wave) { return r.BindUnloadWave( wave.frameCount, wave.sampleRate, @@ -7863,7 +8506,7 @@ raylib.UnloadWave = UnloadWave * * @return {undefined} */ -function UnloadSound (sound) { +function UnloadSound(sound) { return r.BindUnloadSound( sound.stream.buffer, sound.stream.processor, @@ -7875,6 +8518,25 @@ function UnloadSound (sound) { } raylib.UnloadSound = UnloadSound +/** + * Unload a sound alias (does not deallocate sample data) + * + * @param {Sound} alias + * + * @return {undefined} + */ +function UnloadSoundAlias(alias) { + return r.BindUnloadSoundAlias( + alias.stream.buffer, + alias.stream.processor, + alias.stream.sampleRate, + alias.stream.sampleSize, + alias.stream.channels, + alias.frameCount + ) +} +raylib.UnloadSoundAlias = UnloadSoundAlias + /** * Export wave data to file, returns true on success * @@ -7883,7 +8545,7 @@ raylib.UnloadSound = UnloadSound * * @return {boolean} The resulting bool. */ -function ExportWave (wave, fileName) { +function ExportWave(wave, fileName) { return r.BindExportWave( wave.frameCount, wave.sampleRate, @@ -7903,7 +8565,7 @@ raylib.ExportWave = ExportWave * * @return {boolean} The resulting bool. */ -function ExportWaveAsCode (wave, fileName) { +function ExportWaveAsCode(wave, fileName) { return r.BindExportWaveAsCode( wave.frameCount, wave.sampleRate, @@ -7922,7 +8584,7 @@ raylib.ExportWaveAsCode = ExportWaveAsCode * * @return {undefined} */ -function PlaySound (sound) { +function PlaySound(sound) { return r.BindPlaySound( sound.stream.buffer, sound.stream.processor, @@ -7941,7 +8603,7 @@ raylib.PlaySound = PlaySound * * @return {undefined} */ -function StopSound (sound) { +function StopSound(sound) { return r.BindStopSound( sound.stream.buffer, sound.stream.processor, @@ -7960,7 +8622,7 @@ raylib.StopSound = StopSound * * @return {undefined} */ -function PauseSound (sound) { +function PauseSound(sound) { return r.BindPauseSound( sound.stream.buffer, sound.stream.processor, @@ -7979,7 +8641,7 @@ raylib.PauseSound = PauseSound * * @return {undefined} */ -function ResumeSound (sound) { +function ResumeSound(sound) { return r.BindResumeSound( sound.stream.buffer, sound.stream.processor, @@ -7998,7 +8660,7 @@ raylib.ResumeSound = ResumeSound * * @return {boolean} The resulting bool. */ -function IsSoundPlaying (sound) { +function IsSoundPlaying(sound) { return r.BindIsSoundPlaying( sound.stream.buffer, sound.stream.processor, @@ -8018,7 +8680,7 @@ raylib.IsSoundPlaying = IsSoundPlaying * * @return {undefined} */ -function SetSoundVolume (sound, volume) { +function SetSoundVolume(sound, volume) { return r.BindSetSoundVolume( sound.stream.buffer, sound.stream.processor, @@ -8039,7 +8701,7 @@ raylib.SetSoundVolume = SetSoundVolume * * @return {undefined} */ -function SetSoundPitch (sound, pitch) { +function SetSoundPitch(sound, pitch) { return r.BindSetSoundPitch( sound.stream.buffer, sound.stream.processor, @@ -8060,7 +8722,7 @@ raylib.SetSoundPitch = SetSoundPitch * * @return {undefined} */ -function SetSoundPan (sound, pan) { +function SetSoundPan(sound, pan) { return r.BindSetSoundPan( sound.stream.buffer, sound.stream.processor, @@ -8080,7 +8742,7 @@ raylib.SetSoundPan = SetSoundPan * * @return {Wave} The resulting Wave. */ -function WaveCopy (wave) { +function WaveCopy(wave) { return r.BindWaveCopy( wave.frameCount, wave.sampleRate, @@ -8098,7 +8760,7 @@ raylib.WaveCopy = WaveCopy * * @return {number} The resulting float *. */ -function LoadWaveSamples (wave) { +function LoadWaveSamples(wave) { return r.BindLoadWaveSamples( wave.frameCount, wave.sampleRate, @@ -8116,7 +8778,7 @@ raylib.LoadWaveSamples = LoadWaveSamples * * @return {undefined} */ -function UnloadWaveSamples (samples) { +function UnloadWaveSamples(samples) { return r.BindUnloadWaveSamples( samples ) @@ -8130,7 +8792,7 @@ raylib.UnloadWaveSamples = UnloadWaveSamples * * @return {Music} The resulting Music. */ -function LoadMusicStream (fileName) { +function LoadMusicStream(fileName) { return r.BindLoadMusicStream( fileName ) @@ -8146,7 +8808,7 @@ raylib.LoadMusicStream = LoadMusicStream * * @return {Music} The resulting Music. */ -function LoadMusicStreamFromMemory (fileType, data, dataSize) { +function LoadMusicStreamFromMemory(fileType, data, dataSize) { return r.BindLoadMusicStreamFromMemory( fileType, data, @@ -8162,7 +8824,7 @@ raylib.LoadMusicStreamFromMemory = LoadMusicStreamFromMemory * * @return {boolean} The resulting bool. */ -function IsMusicReady (music) { +function IsMusicReady(music) { return r.BindIsMusicReady( music.stream.buffer, music.stream.processor, @@ -8184,7 +8846,7 @@ raylib.IsMusicReady = IsMusicReady * * @return {undefined} */ -function UnloadMusicStream (music) { +function UnloadMusicStream(music) { return r.BindUnloadMusicStream( music.stream.buffer, music.stream.processor, @@ -8206,7 +8868,7 @@ raylib.UnloadMusicStream = UnloadMusicStream * * @return {undefined} */ -function PlayMusicStream (music) { +function PlayMusicStream(music) { return r.BindPlayMusicStream( music.stream.buffer, music.stream.processor, @@ -8228,7 +8890,7 @@ raylib.PlayMusicStream = PlayMusicStream * * @return {boolean} The resulting bool. */ -function IsMusicStreamPlaying (music) { +function IsMusicStreamPlaying(music) { return r.BindIsMusicStreamPlaying( music.stream.buffer, music.stream.processor, @@ -8250,7 +8912,7 @@ raylib.IsMusicStreamPlaying = IsMusicStreamPlaying * * @return {undefined} */ -function UpdateMusicStream (music) { +function UpdateMusicStream(music) { return r.BindUpdateMusicStream( music.stream.buffer, music.stream.processor, @@ -8272,7 +8934,7 @@ raylib.UpdateMusicStream = UpdateMusicStream * * @return {undefined} */ -function StopMusicStream (music) { +function StopMusicStream(music) { return r.BindStopMusicStream( music.stream.buffer, music.stream.processor, @@ -8294,7 +8956,7 @@ raylib.StopMusicStream = StopMusicStream * * @return {undefined} */ -function PauseMusicStream (music) { +function PauseMusicStream(music) { return r.BindPauseMusicStream( music.stream.buffer, music.stream.processor, @@ -8316,7 +8978,7 @@ raylib.PauseMusicStream = PauseMusicStream * * @return {undefined} */ -function ResumeMusicStream (music) { +function ResumeMusicStream(music) { return r.BindResumeMusicStream( music.stream.buffer, music.stream.processor, @@ -8339,7 +9001,7 @@ raylib.ResumeMusicStream = ResumeMusicStream * * @return {undefined} */ -function SeekMusicStream (music, position) { +function SeekMusicStream(music, position) { return r.BindSeekMusicStream( music.stream.buffer, music.stream.processor, @@ -8363,7 +9025,7 @@ raylib.SeekMusicStream = SeekMusicStream * * @return {undefined} */ -function SetMusicVolume (music, volume) { +function SetMusicVolume(music, volume) { return r.BindSetMusicVolume( music.stream.buffer, music.stream.processor, @@ -8387,7 +9049,7 @@ raylib.SetMusicVolume = SetMusicVolume * * @return {undefined} */ -function SetMusicPitch (music, pitch) { +function SetMusicPitch(music, pitch) { return r.BindSetMusicPitch( music.stream.buffer, music.stream.processor, @@ -8411,7 +9073,7 @@ raylib.SetMusicPitch = SetMusicPitch * * @return {undefined} */ -function SetMusicPan (music, pan) { +function SetMusicPan(music, pan) { return r.BindSetMusicPan( music.stream.buffer, music.stream.processor, @@ -8434,7 +9096,7 @@ raylib.SetMusicPan = SetMusicPan * * @return {number} The resulting float. */ -function GetMusicTimeLength (music) { +function GetMusicTimeLength(music) { return r.BindGetMusicTimeLength( music.stream.buffer, music.stream.processor, @@ -8456,7 +9118,7 @@ raylib.GetMusicTimeLength = GetMusicTimeLength * * @return {number} The resulting float. */ -function GetMusicTimePlayed (music) { +function GetMusicTimePlayed(music) { return r.BindGetMusicTimePlayed( music.stream.buffer, music.stream.processor, @@ -8480,7 +9142,7 @@ raylib.GetMusicTimePlayed = GetMusicTimePlayed * * @return {AudioStream} The resulting AudioStream. */ -function LoadAudioStream (sampleRate, sampleSize, channels) { +function LoadAudioStream(sampleRate, sampleSize, channels) { return r.BindLoadAudioStream( sampleRate, sampleSize, @@ -8496,7 +9158,7 @@ raylib.LoadAudioStream = LoadAudioStream * * @return {boolean} The resulting bool. */ -function IsAudioStreamReady (stream) { +function IsAudioStreamReady(stream) { return r.BindIsAudioStreamReady( stream.buffer, stream.processor, @@ -8514,7 +9176,7 @@ raylib.IsAudioStreamReady = IsAudioStreamReady * * @return {undefined} */ -function UnloadAudioStream (stream) { +function UnloadAudioStream(stream) { return r.BindUnloadAudioStream( stream.buffer, stream.processor, @@ -8534,7 +9196,7 @@ raylib.UnloadAudioStream = UnloadAudioStream * * @return {undefined} */ -function UpdateAudioStream (stream, data, frameCount) { +function UpdateAudioStream(stream, data, frameCount) { return r.BindUpdateAudioStream( stream.buffer, stream.processor, @@ -8554,7 +9216,7 @@ raylib.UpdateAudioStream = UpdateAudioStream * * @return {boolean} The resulting bool. */ -function IsAudioStreamProcessed (stream) { +function IsAudioStreamProcessed(stream) { return r.BindIsAudioStreamProcessed( stream.buffer, stream.processor, @@ -8572,7 +9234,7 @@ raylib.IsAudioStreamProcessed = IsAudioStreamProcessed * * @return {undefined} */ -function PlayAudioStream (stream) { +function PlayAudioStream(stream) { return r.BindPlayAudioStream( stream.buffer, stream.processor, @@ -8590,7 +9252,7 @@ raylib.PlayAudioStream = PlayAudioStream * * @return {undefined} */ -function PauseAudioStream (stream) { +function PauseAudioStream(stream) { return r.BindPauseAudioStream( stream.buffer, stream.processor, @@ -8608,7 +9270,7 @@ raylib.PauseAudioStream = PauseAudioStream * * @return {undefined} */ -function ResumeAudioStream (stream) { +function ResumeAudioStream(stream) { return r.BindResumeAudioStream( stream.buffer, stream.processor, @@ -8626,7 +9288,7 @@ raylib.ResumeAudioStream = ResumeAudioStream * * @return {boolean} The resulting bool. */ -function IsAudioStreamPlaying (stream) { +function IsAudioStreamPlaying(stream) { return r.BindIsAudioStreamPlaying( stream.buffer, stream.processor, @@ -8644,7 +9306,7 @@ raylib.IsAudioStreamPlaying = IsAudioStreamPlaying * * @return {undefined} */ -function StopAudioStream (stream) { +function StopAudioStream(stream) { return r.BindStopAudioStream( stream.buffer, stream.processor, @@ -8663,7 +9325,7 @@ raylib.StopAudioStream = StopAudioStream * * @return {undefined} */ -function SetAudioStreamVolume (stream, volume) { +function SetAudioStreamVolume(stream, volume) { return r.BindSetAudioStreamVolume( stream.buffer, stream.processor, @@ -8683,7 +9345,7 @@ raylib.SetAudioStreamVolume = SetAudioStreamVolume * * @return {undefined} */ -function SetAudioStreamPitch (stream, pitch) { +function SetAudioStreamPitch(stream, pitch) { return r.BindSetAudioStreamPitch( stream.buffer, stream.processor, @@ -8703,7 +9365,7 @@ raylib.SetAudioStreamPitch = SetAudioStreamPitch * * @return {undefined} */ -function SetAudioStreamPan (stream, pan) { +function SetAudioStreamPan(stream, pan) { return r.BindSetAudioStreamPan( stream.buffer, stream.processor, @@ -8722,7 +9384,7 @@ raylib.SetAudioStreamPan = SetAudioStreamPan * * @return {undefined} */ -function SetAudioStreamBufferSizeDefault (size) { +function SetAudioStreamBufferSizeDefault(size) { return r.BindSetAudioStreamBufferSizeDefault( size ) @@ -8739,7 +9401,7 @@ raylib.SetAudioStreamBufferSizeDefault = SetAudioStreamBufferSizeDefault * * @return {number} The resulting float. */ -function EaseLinearNone (t, b, c, d) { +function EaseLinearNone(t, b, c, d) { return r.BindEaseLinearNone( t, b, @@ -8759,7 +9421,7 @@ raylib.EaseLinearNone = EaseLinearNone * * @return {number} The resulting float. */ -function EaseLinearIn (t, b, c, d) { +function EaseLinearIn(t, b, c, d) { return r.BindEaseLinearIn( t, b, @@ -8779,7 +9441,7 @@ raylib.EaseLinearIn = EaseLinearIn * * @return {number} The resulting float. */ -function EaseLinearOut (t, b, c, d) { +function EaseLinearOut(t, b, c, d) { return r.BindEaseLinearOut( t, b, @@ -8799,7 +9461,7 @@ raylib.EaseLinearOut = EaseLinearOut * * @return {number} The resulting float. */ -function EaseLinearInOut (t, b, c, d) { +function EaseLinearInOut(t, b, c, d) { return r.BindEaseLinearInOut( t, b, @@ -8819,7 +9481,7 @@ raylib.EaseLinearInOut = EaseLinearInOut * * @return {number} The resulting float. */ -function EaseSineIn (t, b, c, d) { +function EaseSineIn(t, b, c, d) { return r.BindEaseSineIn( t, b, @@ -8839,7 +9501,7 @@ raylib.EaseSineIn = EaseSineIn * * @return {number} The resulting float. */ -function EaseSineOut (t, b, c, d) { +function EaseSineOut(t, b, c, d) { return r.BindEaseSineOut( t, b, @@ -8859,7 +9521,7 @@ raylib.EaseSineOut = EaseSineOut * * @return {number} The resulting float. */ -function EaseSineInOut (t, b, c, d) { +function EaseSineInOut(t, b, c, d) { return r.BindEaseSineInOut( t, b, @@ -8879,7 +9541,7 @@ raylib.EaseSineInOut = EaseSineInOut * * @return {number} The resulting float. */ -function EaseCircIn (t, b, c, d) { +function EaseCircIn(t, b, c, d) { return r.BindEaseCircIn( t, b, @@ -8899,7 +9561,7 @@ raylib.EaseCircIn = EaseCircIn * * @return {number} The resulting float. */ -function EaseCircOut (t, b, c, d) { +function EaseCircOut(t, b, c, d) { return r.BindEaseCircOut( t, b, @@ -8919,7 +9581,7 @@ raylib.EaseCircOut = EaseCircOut * * @return {number} The resulting float. */ -function EaseCircInOut (t, b, c, d) { +function EaseCircInOut(t, b, c, d) { return r.BindEaseCircInOut( t, b, @@ -8939,7 +9601,7 @@ raylib.EaseCircInOut = EaseCircInOut * * @return {number} The resulting float. */ -function EaseCubicIn (t, b, c, d) { +function EaseCubicIn(t, b, c, d) { return r.BindEaseCubicIn( t, b, @@ -8959,7 +9621,7 @@ raylib.EaseCubicIn = EaseCubicIn * * @return {number} The resulting float. */ -function EaseCubicOut (t, b, c, d) { +function EaseCubicOut(t, b, c, d) { return r.BindEaseCubicOut( t, b, @@ -8979,7 +9641,7 @@ raylib.EaseCubicOut = EaseCubicOut * * @return {number} The resulting float. */ -function EaseCubicInOut (t, b, c, d) { +function EaseCubicInOut(t, b, c, d) { return r.BindEaseCubicInOut( t, b, @@ -8999,7 +9661,7 @@ raylib.EaseCubicInOut = EaseCubicInOut * * @return {number} The resulting float. */ -function EaseQuadIn (t, b, c, d) { +function EaseQuadIn(t, b, c, d) { return r.BindEaseQuadIn( t, b, @@ -9019,7 +9681,7 @@ raylib.EaseQuadIn = EaseQuadIn * * @return {number} The resulting float. */ -function EaseQuadOut (t, b, c, d) { +function EaseQuadOut(t, b, c, d) { return r.BindEaseQuadOut( t, b, @@ -9039,7 +9701,7 @@ raylib.EaseQuadOut = EaseQuadOut * * @return {number} The resulting float. */ -function EaseQuadInOut (t, b, c, d) { +function EaseQuadInOut(t, b, c, d) { return r.BindEaseQuadInOut( t, b, @@ -9059,7 +9721,7 @@ raylib.EaseQuadInOut = EaseQuadInOut * * @return {number} The resulting float. */ -function EaseExpoIn (t, b, c, d) { +function EaseExpoIn(t, b, c, d) { return r.BindEaseExpoIn( t, b, @@ -9079,7 +9741,7 @@ raylib.EaseExpoIn = EaseExpoIn * * @return {number} The resulting float. */ -function EaseExpoOut (t, b, c, d) { +function EaseExpoOut(t, b, c, d) { return r.BindEaseExpoOut( t, b, @@ -9099,7 +9761,7 @@ raylib.EaseExpoOut = EaseExpoOut * * @return {number} The resulting float. */ -function EaseExpoInOut (t, b, c, d) { +function EaseExpoInOut(t, b, c, d) { return r.BindEaseExpoInOut( t, b, @@ -9119,7 +9781,7 @@ raylib.EaseExpoInOut = EaseExpoInOut * * @return {number} The resulting float. */ -function EaseBackIn (t, b, c, d) { +function EaseBackIn(t, b, c, d) { return r.BindEaseBackIn( t, b, @@ -9139,7 +9801,7 @@ raylib.EaseBackIn = EaseBackIn * * @return {number} The resulting float. */ -function EaseBackOut (t, b, c, d) { +function EaseBackOut(t, b, c, d) { return r.BindEaseBackOut( t, b, @@ -9159,7 +9821,7 @@ raylib.EaseBackOut = EaseBackOut * * @return {number} The resulting float. */ -function EaseBackInOut (t, b, c, d) { +function EaseBackInOut(t, b, c, d) { return r.BindEaseBackInOut( t, b, @@ -9179,7 +9841,7 @@ raylib.EaseBackInOut = EaseBackInOut * * @return {number} The resulting float. */ -function EaseBounceOut (t, b, c, d) { +function EaseBounceOut(t, b, c, d) { return r.BindEaseBounceOut( t, b, @@ -9199,7 +9861,7 @@ raylib.EaseBounceOut = EaseBounceOut * * @return {number} The resulting float. */ -function EaseBounceIn (t, b, c, d) { +function EaseBounceIn(t, b, c, d) { return r.BindEaseBounceIn( t, b, @@ -9219,7 +9881,7 @@ raylib.EaseBounceIn = EaseBounceIn * * @return {number} The resulting float. */ -function EaseBounceInOut (t, b, c, d) { +function EaseBounceInOut(t, b, c, d) { return r.BindEaseBounceInOut( t, b, @@ -9239,7 +9901,7 @@ raylib.EaseBounceInOut = EaseBounceInOut * * @return {number} The resulting float. */ -function EaseElasticIn (t, b, c, d) { +function EaseElasticIn(t, b, c, d) { return r.BindEaseElasticIn( t, b, @@ -9259,7 +9921,7 @@ raylib.EaseElasticIn = EaseElasticIn * * @return {number} The resulting float. */ -function EaseElasticOut (t, b, c, d) { +function EaseElasticOut(t, b, c, d) { return r.BindEaseElasticOut( t, b, @@ -9279,7 +9941,7 @@ raylib.EaseElasticOut = EaseElasticOut * * @return {number} The resulting float. */ -function EaseElasticInOut (t, b, c, d) { +function EaseElasticInOut(t, b, c, d) { return r.BindEaseElasticInOut( t, b, @@ -9289,7 +9951,7 @@ function EaseElasticInOut (t, b, c, d) { } raylib.EaseElasticInOut = EaseElasticInOut -function Clamp (value, min, max) { +function Clamp(value, min, max) { return r.BindClamp( value, min, @@ -9298,7 +9960,7 @@ function Clamp (value, min, max) { } raylib.Clamp = Clamp -function Lerp (start, end, amount) { +function Lerp(start, end, amount) { return r.BindLerp( start, end, @@ -9307,7 +9969,7 @@ function Lerp (start, end, amount) { } raylib.Lerp = Lerp -function Normalize (value, start, end) { +function Normalize(value, start, end) { return r.BindNormalize( value, start, @@ -9316,7 +9978,7 @@ function Normalize (value, start, end) { } raylib.Normalize = Normalize -function Remap (value, inputStart, inputEnd, outputStart, outputEnd) { +function Remap(value, inputStart, inputEnd, outputStart, outputEnd) { return r.BindRemap( value, inputStart, @@ -9327,7 +9989,7 @@ function Remap (value, inputStart, inputEnd, outputStart, outputEnd) { } raylib.Remap = Remap -function Wrap (value, min, max) { +function Wrap(value, min, max) { return r.BindWrap( value, min, @@ -9336,7 +9998,7 @@ function Wrap (value, min, max) { } raylib.Wrap = Wrap -function FloatEquals (x, y) { +function FloatEquals(x, y) { return r.BindFloatEquals( x, y @@ -9344,17 +10006,17 @@ function FloatEquals (x, y) { } raylib.FloatEquals = FloatEquals -function Vector2Zero () { +function Vector2Zero() { return r.BindVector2Zero() } raylib.Vector2Zero = Vector2Zero -function Vector2One () { +function Vector2One() { return r.BindVector2One() } raylib.Vector2One = Vector2One -function Vector2Add (v1, v2) { +function Vector2Add(v1, v2) { return r.BindVector2Add( v1.x, v1.y, @@ -9364,7 +10026,7 @@ function Vector2Add (v1, v2) { } raylib.Vector2Add = Vector2Add -function Vector2AddValue (v, add) { +function Vector2AddValue(v, add) { return r.BindVector2AddValue( v.x, v.y, @@ -9373,7 +10035,7 @@ function Vector2AddValue (v, add) { } raylib.Vector2AddValue = Vector2AddValue -function Vector2Subtract (v1, v2) { +function Vector2Subtract(v1, v2) { return r.BindVector2Subtract( v1.x, v1.y, @@ -9383,7 +10045,7 @@ function Vector2Subtract (v1, v2) { } raylib.Vector2Subtract = Vector2Subtract -function Vector2SubtractValue (v, sub) { +function Vector2SubtractValue(v, sub) { return r.BindVector2SubtractValue( v.x, v.y, @@ -9392,7 +10054,7 @@ function Vector2SubtractValue (v, sub) { } raylib.Vector2SubtractValue = Vector2SubtractValue -function Vector2Length (v) { +function Vector2Length(v) { return r.BindVector2Length( v.x, v.y @@ -9400,7 +10062,7 @@ function Vector2Length (v) { } raylib.Vector2Length = Vector2Length -function Vector2LengthSqr (v) { +function Vector2LengthSqr(v) { return r.BindVector2LengthSqr( v.x, v.y @@ -9408,7 +10070,7 @@ function Vector2LengthSqr (v) { } raylib.Vector2LengthSqr = Vector2LengthSqr -function Vector2DotProduct (v1, v2) { +function Vector2DotProduct(v1, v2) { return r.BindVector2DotProduct( v1.x, v1.y, @@ -9418,7 +10080,7 @@ function Vector2DotProduct (v1, v2) { } raylib.Vector2DotProduct = Vector2DotProduct -function Vector2Distance (v1, v2) { +function Vector2Distance(v1, v2) { return r.BindVector2Distance( v1.x, v1.y, @@ -9428,7 +10090,7 @@ function Vector2Distance (v1, v2) { } raylib.Vector2Distance = Vector2Distance -function Vector2DistanceSqr (v1, v2) { +function Vector2DistanceSqr(v1, v2) { return r.BindVector2DistanceSqr( v1.x, v1.y, @@ -9438,7 +10100,7 @@ function Vector2DistanceSqr (v1, v2) { } raylib.Vector2DistanceSqr = Vector2DistanceSqr -function Vector2Angle (v1, v2) { +function Vector2Angle(v1, v2) { return r.BindVector2Angle( v1.x, v1.y, @@ -9448,7 +10110,7 @@ function Vector2Angle (v1, v2) { } raylib.Vector2Angle = Vector2Angle -function Vector2LineAngle (start, end) { +function Vector2LineAngle(start, end) { return r.BindVector2LineAngle( start.x, start.y, @@ -9458,7 +10120,7 @@ function Vector2LineAngle (start, end) { } raylib.Vector2LineAngle = Vector2LineAngle -function Vector2Scale (v, scale) { +function Vector2Scale(v, scale) { return r.BindVector2Scale( v.x, v.y, @@ -9467,7 +10129,7 @@ function Vector2Scale (v, scale) { } raylib.Vector2Scale = Vector2Scale -function Vector2Multiply (v1, v2) { +function Vector2Multiply(v1, v2) { return r.BindVector2Multiply( v1.x, v1.y, @@ -9477,7 +10139,7 @@ function Vector2Multiply (v1, v2) { } raylib.Vector2Multiply = Vector2Multiply -function Vector2Negate (v) { +function Vector2Negate(v) { return r.BindVector2Negate( v.x, v.y @@ -9485,7 +10147,7 @@ function Vector2Negate (v) { } raylib.Vector2Negate = Vector2Negate -function Vector2Divide (v1, v2) { +function Vector2Divide(v1, v2) { return r.BindVector2Divide( v1.x, v1.y, @@ -9495,7 +10157,7 @@ function Vector2Divide (v1, v2) { } raylib.Vector2Divide = Vector2Divide -function Vector2Normalize (v) { +function Vector2Normalize(v) { return r.BindVector2Normalize( v.x, v.y @@ -9503,7 +10165,7 @@ function Vector2Normalize (v) { } raylib.Vector2Normalize = Vector2Normalize -function Vector2Transform (v, mat) { +function Vector2Transform(v, mat) { return r.BindVector2Transform( v.x, v.y, @@ -9527,7 +10189,7 @@ function Vector2Transform (v, mat) { } raylib.Vector2Transform = Vector2Transform -function Vector2Lerp (v1, v2, amount) { +function Vector2Lerp(v1, v2, amount) { return r.BindVector2Lerp( v1.x, v1.y, @@ -9538,7 +10200,7 @@ function Vector2Lerp (v1, v2, amount) { } raylib.Vector2Lerp = Vector2Lerp -function Vector2Reflect (v, normal) { +function Vector2Reflect(v, normal) { return r.BindVector2Reflect( v.x, v.y, @@ -9548,7 +10210,7 @@ function Vector2Reflect (v, normal) { } raylib.Vector2Reflect = Vector2Reflect -function Vector2Rotate (v, angle) { +function Vector2Rotate(v, angle) { return r.BindVector2Rotate( v.x, v.y, @@ -9557,7 +10219,7 @@ function Vector2Rotate (v, angle) { } raylib.Vector2Rotate = Vector2Rotate -function Vector2MoveTowards (v, target, maxDistance) { +function Vector2MoveTowards(v, target, maxDistance) { return r.BindVector2MoveTowards( v.x, v.y, @@ -9568,7 +10230,7 @@ function Vector2MoveTowards (v, target, maxDistance) { } raylib.Vector2MoveTowards = Vector2MoveTowards -function Vector2Invert (v) { +function Vector2Invert(v) { return r.BindVector2Invert( v.x, v.y @@ -9576,7 +10238,7 @@ function Vector2Invert (v) { } raylib.Vector2Invert = Vector2Invert -function Vector2Clamp (v, min, max) { +function Vector2Clamp(v, min, max) { return r.BindVector2Clamp( v.x, v.y, @@ -9588,7 +10250,7 @@ function Vector2Clamp (v, min, max) { } raylib.Vector2Clamp = Vector2Clamp -function Vector2ClampValue (v, min, max) { +function Vector2ClampValue(v, min, max) { return r.BindVector2ClampValue( v.x, v.y, @@ -9598,7 +10260,7 @@ function Vector2ClampValue (v, min, max) { } raylib.Vector2ClampValue = Vector2ClampValue -function Vector2Equals (p, q) { +function Vector2Equals(p, q) { return r.BindVector2Equals( p.x, p.y, @@ -9608,17 +10270,17 @@ function Vector2Equals (p, q) { } raylib.Vector2Equals = Vector2Equals -function Vector3Zero () { +function Vector3Zero() { return r.BindVector3Zero() } raylib.Vector3Zero = Vector3Zero -function Vector3One () { +function Vector3One() { return r.BindVector3One() } raylib.Vector3One = Vector3One -function Vector3Add (v1, v2) { +function Vector3Add(v1, v2) { return r.BindVector3Add( v1.x, v1.y, @@ -9630,7 +10292,7 @@ function Vector3Add (v1, v2) { } raylib.Vector3Add = Vector3Add -function Vector3AddValue (v, add) { +function Vector3AddValue(v, add) { return r.BindVector3AddValue( v.x, v.y, @@ -9640,7 +10302,7 @@ function Vector3AddValue (v, add) { } raylib.Vector3AddValue = Vector3AddValue -function Vector3Subtract (v1, v2) { +function Vector3Subtract(v1, v2) { return r.BindVector3Subtract( v1.x, v1.y, @@ -9652,7 +10314,7 @@ function Vector3Subtract (v1, v2) { } raylib.Vector3Subtract = Vector3Subtract -function Vector3SubtractValue (v, sub) { +function Vector3SubtractValue(v, sub) { return r.BindVector3SubtractValue( v.x, v.y, @@ -9662,7 +10324,7 @@ function Vector3SubtractValue (v, sub) { } raylib.Vector3SubtractValue = Vector3SubtractValue -function Vector3Scale (v, scalar) { +function Vector3Scale(v, scalar) { return r.BindVector3Scale( v.x, v.y, @@ -9672,7 +10334,7 @@ function Vector3Scale (v, scalar) { } raylib.Vector3Scale = Vector3Scale -function Vector3Multiply (v1, v2) { +function Vector3Multiply(v1, v2) { return r.BindVector3Multiply( v1.x, v1.y, @@ -9684,7 +10346,7 @@ function Vector3Multiply (v1, v2) { } raylib.Vector3Multiply = Vector3Multiply -function Vector3CrossProduct (v1, v2) { +function Vector3CrossProduct(v1, v2) { return r.BindVector3CrossProduct( v1.x, v1.y, @@ -9696,7 +10358,7 @@ function Vector3CrossProduct (v1, v2) { } raylib.Vector3CrossProduct = Vector3CrossProduct -function Vector3Perpendicular (v) { +function Vector3Perpendicular(v) { return r.BindVector3Perpendicular( v.x, v.y, @@ -9705,21 +10367,21 @@ function Vector3Perpendicular (v) { } raylib.Vector3Perpendicular = Vector3Perpendicular -function Vector3Length (v) { +function Vector3Length(v) { return r.BindVector3Length( v ) } raylib.Vector3Length = Vector3Length -function Vector3LengthSqr (v) { +function Vector3LengthSqr(v) { return r.BindVector3LengthSqr( v ) } raylib.Vector3LengthSqr = Vector3LengthSqr -function Vector3DotProduct (v1, v2) { +function Vector3DotProduct(v1, v2) { return r.BindVector3DotProduct( v1.x, v1.y, @@ -9731,7 +10393,7 @@ function Vector3DotProduct (v1, v2) { } raylib.Vector3DotProduct = Vector3DotProduct -function Vector3Distance (v1, v2) { +function Vector3Distance(v1, v2) { return r.BindVector3Distance( v1.x, v1.y, @@ -9743,7 +10405,7 @@ function Vector3Distance (v1, v2) { } raylib.Vector3Distance = Vector3Distance -function Vector3DistanceSqr (v1, v2) { +function Vector3DistanceSqr(v1, v2) { return r.BindVector3DistanceSqr( v1.x, v1.y, @@ -9755,7 +10417,7 @@ function Vector3DistanceSqr (v1, v2) { } raylib.Vector3DistanceSqr = Vector3DistanceSqr -function Vector3Angle (v1, v2) { +function Vector3Angle(v1, v2) { return r.BindVector3Angle( v1.x, v1.y, @@ -9767,7 +10429,7 @@ function Vector3Angle (v1, v2) { } raylib.Vector3Angle = Vector3Angle -function Vector3Negate (v) { +function Vector3Negate(v) { return r.BindVector3Negate( v.x, v.y, @@ -9776,7 +10438,7 @@ function Vector3Negate (v) { } raylib.Vector3Negate = Vector3Negate -function Vector3Divide (v1, v2) { +function Vector3Divide(v1, v2) { return r.BindVector3Divide( v1.x, v1.y, @@ -9788,7 +10450,7 @@ function Vector3Divide (v1, v2) { } raylib.Vector3Divide = Vector3Divide -function Vector3Normalize (v) { +function Vector3Normalize(v) { return r.BindVector3Normalize( v.x, v.y, @@ -9797,7 +10459,31 @@ function Vector3Normalize (v) { } raylib.Vector3Normalize = Vector3Normalize -function Vector3OrthoNormalize (v1, v2) { +function Vector3Project(v1, v2) { + return r.BindVector3Project( + v1.x, + v1.y, + v1.z, + v2.x, + v2.y, + v2.z + ) +} +raylib.Vector3Project = Vector3Project + +function Vector3Reject(v1, v2) { + return r.BindVector3Reject( + v1.x, + v1.y, + v1.z, + v2.x, + v2.y, + v2.z + ) +} +raylib.Vector3Reject = Vector3Reject + +function Vector3OrthoNormalize(v1, v2) { return r.BindVector3OrthoNormalize( v1, v2 @@ -9805,7 +10491,7 @@ function Vector3OrthoNormalize (v1, v2) { } raylib.Vector3OrthoNormalize = Vector3OrthoNormalize -function Vector3Transform (v, mat) { +function Vector3Transform(v, mat) { return r.BindVector3Transform( v.x, v.y, @@ -9830,7 +10516,7 @@ function Vector3Transform (v, mat) { } raylib.Vector3Transform = Vector3Transform -function Vector3RotateByQuaternion (v, q) { +function Vector3RotateByQuaternion(v, q) { return r.BindVector3RotateByQuaternion( v.x, v.y, @@ -9840,7 +10526,7 @@ function Vector3RotateByQuaternion (v, q) { } raylib.Vector3RotateByQuaternion = Vector3RotateByQuaternion -function Vector3RotateByAxisAngle (v, axis, angle) { +function Vector3RotateByAxisAngle(v, axis, angle) { return r.BindVector3RotateByAxisAngle( v.x, v.y, @@ -9853,7 +10539,7 @@ function Vector3RotateByAxisAngle (v, axis, angle) { } raylib.Vector3RotateByAxisAngle = Vector3RotateByAxisAngle -function Vector3Lerp (v1, v2, amount) { +function Vector3Lerp(v1, v2, amount) { return r.BindVector3Lerp( v1.x, v1.y, @@ -9866,7 +10552,7 @@ function Vector3Lerp (v1, v2, amount) { } raylib.Vector3Lerp = Vector3Lerp -function Vector3Reflect (v, normal) { +function Vector3Reflect(v, normal) { return r.BindVector3Reflect( v.x, v.y, @@ -9878,7 +10564,7 @@ function Vector3Reflect (v, normal) { } raylib.Vector3Reflect = Vector3Reflect -function Vector3Min (v1, v2) { +function Vector3Min(v1, v2) { return r.BindVector3Min( v1.x, v1.y, @@ -9890,7 +10576,7 @@ function Vector3Min (v1, v2) { } raylib.Vector3Min = Vector3Min -function Vector3Max (v1, v2) { +function Vector3Max(v1, v2) { return r.BindVector3Max( v1.x, v1.y, @@ -9902,7 +10588,7 @@ function Vector3Max (v1, v2) { } raylib.Vector3Max = Vector3Max -function Vector3Barycenter (p, a, b, c) { +function Vector3Barycenter(p, a, b, c) { return r.BindVector3Barycenter( p.x, p.y, @@ -9920,7 +10606,7 @@ function Vector3Barycenter (p, a, b, c) { } raylib.Vector3Barycenter = Vector3Barycenter -function Vector3Unproject (source, projection, view) { +function Vector3Unproject(source, projection, view) { return r.BindVector3Unproject( source.x, source.y, @@ -9961,7 +10647,7 @@ function Vector3Unproject (source, projection, view) { } raylib.Vector3Unproject = Vector3Unproject -function Vector3Invert (v) { +function Vector3Invert(v) { return r.BindVector3Invert( v.x, v.y, @@ -9970,7 +10656,7 @@ function Vector3Invert (v) { } raylib.Vector3Invert = Vector3Invert -function Vector3Clamp (v, min, max) { +function Vector3Clamp(v, min, max) { return r.BindVector3Clamp( v.x, v.y, @@ -9985,7 +10671,7 @@ function Vector3Clamp (v, min, max) { } raylib.Vector3Clamp = Vector3Clamp -function Vector3ClampValue (v, min, max) { +function Vector3ClampValue(v, min, max) { return r.BindVector3ClampValue( v.x, v.y, @@ -9996,7 +10682,7 @@ function Vector3ClampValue (v, min, max) { } raylib.Vector3ClampValue = Vector3ClampValue -function Vector3Equals (p, q) { +function Vector3Equals(p, q) { return r.BindVector3Equals( p.x, p.y, @@ -10008,7 +10694,7 @@ function Vector3Equals (p, q) { } raylib.Vector3Equals = Vector3Equals -function Vector3Refract (v, n, r) { +function Vector3Refract(v, n, r) { return r.BindVector3Refract( v.x, v.y, @@ -10021,7 +10707,7 @@ function Vector3Refract (v, n, r) { } raylib.Vector3Refract = Vector3Refract -function MatrixDeterminant (mat) { +function MatrixDeterminant(mat) { return r.BindMatrixDeterminant( mat.m0, mat.m4, @@ -10043,7 +10729,7 @@ function MatrixDeterminant (mat) { } raylib.MatrixDeterminant = MatrixDeterminant -function MatrixTrace (mat) { +function MatrixTrace(mat) { return r.BindMatrixTrace( mat.m0, mat.m4, @@ -10065,7 +10751,7 @@ function MatrixTrace (mat) { } raylib.MatrixTrace = MatrixTrace -function MatrixTranspose (mat) { +function MatrixTranspose(mat) { return r.BindMatrixTranspose( mat.m0, mat.m4, @@ -10087,7 +10773,7 @@ function MatrixTranspose (mat) { } raylib.MatrixTranspose = MatrixTranspose -function MatrixInvert (mat) { +function MatrixInvert(mat) { return r.BindMatrixInvert( mat.m0, mat.m4, @@ -10109,12 +10795,12 @@ function MatrixInvert (mat) { } raylib.MatrixInvert = MatrixInvert -function MatrixIdentity () { +function MatrixIdentity() { return r.BindMatrixIdentity() } raylib.MatrixIdentity = MatrixIdentity -function MatrixAdd (left, right) { +function MatrixAdd(left, right) { return r.BindMatrixAdd( left.m0, left.m4, @@ -10152,7 +10838,7 @@ function MatrixAdd (left, right) { } raylib.MatrixAdd = MatrixAdd -function MatrixSubtract (left, right) { +function MatrixSubtract(left, right) { return r.BindMatrixSubtract( left.m0, left.m4, @@ -10190,7 +10876,7 @@ function MatrixSubtract (left, right) { } raylib.MatrixSubtract = MatrixSubtract -function MatrixMultiply (left, right) { +function MatrixMultiply(left, right) { return r.BindMatrixMultiply( left.m0, left.m4, @@ -10228,7 +10914,7 @@ function MatrixMultiply (left, right) { } raylib.MatrixMultiply = MatrixMultiply -function MatrixTranslate (x, y, z) { +function MatrixTranslate(x, y, z) { return r.BindMatrixTranslate( x, y, @@ -10237,7 +10923,7 @@ function MatrixTranslate (x, y, z) { } raylib.MatrixTranslate = MatrixTranslate -function MatrixRotate (axis, angle) { +function MatrixRotate(axis, angle) { return r.BindMatrixRotate( axis.x, axis.y, @@ -10247,28 +10933,28 @@ function MatrixRotate (axis, angle) { } raylib.MatrixRotate = MatrixRotate -function MatrixRotateX (angle) { +function MatrixRotateX(angle) { return r.BindMatrixRotateX( angle ) } raylib.MatrixRotateX = MatrixRotateX -function MatrixRotateY (angle) { +function MatrixRotateY(angle) { return r.BindMatrixRotateY( angle ) } raylib.MatrixRotateY = MatrixRotateY -function MatrixRotateZ (angle) { +function MatrixRotateZ(angle) { return r.BindMatrixRotateZ( angle ) } raylib.MatrixRotateZ = MatrixRotateZ -function MatrixRotateXYZ (angle) { +function MatrixRotateXYZ(angle) { return r.BindMatrixRotateXYZ( angle.x, angle.y, @@ -10277,7 +10963,7 @@ function MatrixRotateXYZ (angle) { } raylib.MatrixRotateXYZ = MatrixRotateXYZ -function MatrixRotateZYX (angle) { +function MatrixRotateZYX(angle) { return r.BindMatrixRotateZYX( angle.x, angle.y, @@ -10286,7 +10972,7 @@ function MatrixRotateZYX (angle) { } raylib.MatrixRotateZYX = MatrixRotateZYX -function MatrixScale (x, y, z) { +function MatrixScale(x, y, z) { return r.BindMatrixScale( x, y, @@ -10295,7 +10981,7 @@ function MatrixScale (x, y, z) { } raylib.MatrixScale = MatrixScale -function MatrixFrustum (left, right, bottom, top, near, far) { +function MatrixFrustum(left, right, bottom, top, near, far) { return r.BindMatrixFrustum( left, right, @@ -10307,29 +10993,29 @@ function MatrixFrustum (left, right, bottom, top, near, far) { } raylib.MatrixFrustum = MatrixFrustum -function MatrixPerspective (fovy, aspect, near, far) { +function MatrixPerspective(fovY, aspect, nearPlane, farPlane) { return r.BindMatrixPerspective( - fovy, + fovY, aspect, - near, - far + nearPlane, + farPlane ) } raylib.MatrixPerspective = MatrixPerspective -function MatrixOrtho (left, right, bottom, top, near, far) { +function MatrixOrtho(left, right, bottom, top, nearPlane, farPlane) { return r.BindMatrixOrtho( left, right, bottom, top, - near, - far + nearPlane, + farPlane ) } raylib.MatrixOrtho = MatrixOrtho -function MatrixLookAt (eye, target, up) { +function MatrixLookAt(eye, target, up) { return r.BindMatrixLookAt( eye.x, eye.y, @@ -10344,7 +11030,7 @@ function MatrixLookAt (eye, target, up) { } raylib.MatrixLookAt = MatrixLookAt -function QuaternionAdd (q1, q2) { +function QuaternionAdd(q1, q2) { return r.BindQuaternionAdd( q1, q2 @@ -10352,7 +11038,7 @@ function QuaternionAdd (q1, q2) { } raylib.QuaternionAdd = QuaternionAdd -function QuaternionAddValue (q, add) { +function QuaternionAddValue(q, add) { return r.BindQuaternionAddValue( q, add @@ -10360,7 +11046,7 @@ function QuaternionAddValue (q, add) { } raylib.QuaternionAddValue = QuaternionAddValue -function QuaternionSubtract (q1, q2) { +function QuaternionSubtract(q1, q2) { return r.BindQuaternionSubtract( q1, q2 @@ -10368,7 +11054,7 @@ function QuaternionSubtract (q1, q2) { } raylib.QuaternionSubtract = QuaternionSubtract -function QuaternionSubtractValue (q, sub) { +function QuaternionSubtractValue(q, sub) { return r.BindQuaternionSubtractValue( q, sub @@ -10376,33 +11062,33 @@ function QuaternionSubtractValue (q, sub) { } raylib.QuaternionSubtractValue = QuaternionSubtractValue -function QuaternionIdentity () { +function QuaternionIdentity() { return r.BindQuaternionIdentity() } raylib.QuaternionIdentity = QuaternionIdentity -function QuaternionLength (q) { +function QuaternionLength(q) { return r.BindQuaternionLength( q ) } raylib.QuaternionLength = QuaternionLength -function QuaternionNormalize (q) { +function QuaternionNormalize(q) { return r.BindQuaternionNormalize( q ) } raylib.QuaternionNormalize = QuaternionNormalize -function QuaternionInvert (q) { +function QuaternionInvert(q) { return r.BindQuaternionInvert( q ) } raylib.QuaternionInvert = QuaternionInvert -function QuaternionMultiply (q1, q2) { +function QuaternionMultiply(q1, q2) { return r.BindQuaternionMultiply( q1, q2 @@ -10410,7 +11096,7 @@ function QuaternionMultiply (q1, q2) { } raylib.QuaternionMultiply = QuaternionMultiply -function QuaternionScale (q, mul) { +function QuaternionScale(q, mul) { return r.BindQuaternionScale( q, mul @@ -10418,7 +11104,7 @@ function QuaternionScale (q, mul) { } raylib.QuaternionScale = QuaternionScale -function QuaternionDivide (q1, q2) { +function QuaternionDivide(q1, q2) { return r.BindQuaternionDivide( q1, q2 @@ -10426,7 +11112,7 @@ function QuaternionDivide (q1, q2) { } raylib.QuaternionDivide = QuaternionDivide -function QuaternionLerp (q1, q2, amount) { +function QuaternionLerp(q1, q2, amount) { return r.BindQuaternionLerp( q1, q2, @@ -10435,7 +11121,7 @@ function QuaternionLerp (q1, q2, amount) { } raylib.QuaternionLerp = QuaternionLerp -function QuaternionNlerp (q1, q2, amount) { +function QuaternionNlerp(q1, q2, amount) { return r.BindQuaternionNlerp( q1, q2, @@ -10444,7 +11130,7 @@ function QuaternionNlerp (q1, q2, amount) { } raylib.QuaternionNlerp = QuaternionNlerp -function QuaternionSlerp (q1, q2, amount) { +function QuaternionSlerp(q1, q2, amount) { return r.BindQuaternionSlerp( q1, q2, @@ -10453,7 +11139,7 @@ function QuaternionSlerp (q1, q2, amount) { } raylib.QuaternionSlerp = QuaternionSlerp -function QuaternionFromVector3ToVector3 (from, to) { +function QuaternionFromVector3ToVector3(from, to) { return r.BindQuaternionFromVector3ToVector3( from.x, from.y, @@ -10465,7 +11151,7 @@ function QuaternionFromVector3ToVector3 (from, to) { } raylib.QuaternionFromVector3ToVector3 = QuaternionFromVector3ToVector3 -function QuaternionFromMatrix (mat) { +function QuaternionFromMatrix(mat) { return r.BindQuaternionFromMatrix( mat.m0, mat.m4, @@ -10487,14 +11173,14 @@ function QuaternionFromMatrix (mat) { } raylib.QuaternionFromMatrix = QuaternionFromMatrix -function QuaternionToMatrix (q) { +function QuaternionToMatrix(q) { return r.BindQuaternionToMatrix( q ) } raylib.QuaternionToMatrix = QuaternionToMatrix -function QuaternionFromAxisAngle (axis, angle) { +function QuaternionFromAxisAngle(axis, angle) { return r.BindQuaternionFromAxisAngle( axis.x, axis.y, @@ -10504,7 +11190,7 @@ function QuaternionFromAxisAngle (axis, angle) { } raylib.QuaternionFromAxisAngle = QuaternionFromAxisAngle -function QuaternionToAxisAngle (q, outAxis, outAngle) { +function QuaternionToAxisAngle(q, outAxis, outAngle) { return r.BindQuaternionToAxisAngle( q, outAxis, @@ -10513,7 +11199,7 @@ function QuaternionToAxisAngle (q, outAxis, outAngle) { } raylib.QuaternionToAxisAngle = QuaternionToAxisAngle -function QuaternionFromEuler (pitch, yaw, roll) { +function QuaternionFromEuler(pitch, yaw, roll) { return r.BindQuaternionFromEuler( pitch, yaw, @@ -10522,14 +11208,14 @@ function QuaternionFromEuler (pitch, yaw, roll) { } raylib.QuaternionFromEuler = QuaternionFromEuler -function QuaternionToEuler (q) { +function QuaternionToEuler(q) { return r.BindQuaternionToEuler( q ) } raylib.QuaternionToEuler = QuaternionToEuler -function QuaternionTransform (q, mat) { +function QuaternionTransform(q, mat) { return r.BindQuaternionTransform( q, mat.m0, @@ -10552,7 +11238,7 @@ function QuaternionTransform (q, mat) { } raylib.QuaternionTransform = QuaternionTransform -function QuaternionEquals (p, q) { +function QuaternionEquals(p, q) { return r.BindQuaternionEquals( p, q @@ -10565,7 +11251,7 @@ raylib.QuaternionEquals = QuaternionEquals * * @return {undefined} */ -function GuiEnable () { +function GuiEnable() { return r.BindGuiEnable() } raylib.GuiEnable = GuiEnable @@ -10575,7 +11261,7 @@ raylib.GuiEnable = GuiEnable * * @return {undefined} */ -function GuiDisable () { +function GuiDisable() { return r.BindGuiDisable() } raylib.GuiDisable = GuiDisable @@ -10585,7 +11271,7 @@ raylib.GuiDisable = GuiDisable * * @return {undefined} */ -function GuiLock () { +function GuiLock() { return r.BindGuiLock() } raylib.GuiLock = GuiLock @@ -10595,7 +11281,7 @@ raylib.GuiLock = GuiLock * * @return {undefined} */ -function GuiUnlock () { +function GuiUnlock() { return r.BindGuiUnlock() } raylib.GuiUnlock = GuiUnlock @@ -10605,7 +11291,7 @@ raylib.GuiUnlock = GuiUnlock * * @return {boolean} The resulting bool. */ -function GuiIsLocked () { +function GuiIsLocked() { return r.BindGuiIsLocked() } raylib.GuiIsLocked = GuiIsLocked @@ -10617,12 +11303,12 @@ raylib.GuiIsLocked = GuiIsLocked * * @return {undefined} */ -function GuiFade (alpha) { - return r.BindGuiFade( +function GuiSetAlpha(alpha) { + return r.BindGuiSetAlpha( alpha ) } -raylib.GuiFade = GuiFade +raylib.GuiSetAlpha = GuiSetAlpha /** * Set gui state (global state) @@ -10631,7 +11317,7 @@ raylib.GuiFade = GuiFade * * @return {undefined} */ -function GuiSetState (state) { +function GuiSetState(state) { return r.BindGuiSetState( state ) @@ -10643,7 +11329,7 @@ raylib.GuiSetState = GuiSetState * * @return {number} The resulting int. */ -function GuiGetState () { +function GuiGetState() { return r.BindGuiGetState() } raylib.GuiGetState = GuiGetState @@ -10655,7 +11341,7 @@ raylib.GuiGetState = GuiGetState * * @return {undefined} */ -function GuiSetFont (font) { +function GuiSetFont(font) { return r.BindGuiSetFont( font.baseSize, font.glyphCount, @@ -10669,51 +11355,190 @@ function GuiSetFont (font) { font.glyphs ) } -raylib.GuiSetFont = GuiSetFont +raylib.GuiSetFont = GuiSetFont + +/** + * Get gui custom font (global state) + * + * @return {Font} The resulting Font. + */ +function GuiGetFont() { + return r.BindGuiGetFont() +} +raylib.GuiGetFont = GuiGetFont + +/** + * Set one style property + * + * @param {number} control + * @param {number} property + * @param {number} value + * + * @return {undefined} + */ +function GuiSetStyle(control, property, value) { + return r.BindGuiSetStyle( + control, + property, + value + ) +} +raylib.GuiSetStyle = GuiSetStyle + +/** + * Get one style property + * + * @param {number} control + * @param {number} property + * + * @return {number} The resulting int. + */ +function GuiGetStyle(control, property) { + return r.BindGuiGetStyle( + control, + property + ) +} +raylib.GuiGetStyle = GuiGetStyle + +/** + * Load style file over global style variable (.rgs) + * + * @param {string} fileName + * + * @return {undefined} + */ +function GuiLoadStyle(fileName) { + return r.BindGuiLoadStyle( + fileName + ) +} +raylib.GuiLoadStyle = GuiLoadStyle + +/** + * Load style default over global style + * + * @return {undefined} + */ +function GuiLoadStyleDefault() { + return r.BindGuiLoadStyleDefault() +} +raylib.GuiLoadStyleDefault = GuiLoadStyleDefault + +/** + * Enable gui tooltips (global state) + * + * @return {undefined} + */ +function GuiEnableTooltip() { + return r.BindGuiEnableTooltip() +} +raylib.GuiEnableTooltip = GuiEnableTooltip + +/** + * Disable gui tooltips (global state) + * + * @return {undefined} + */ +function GuiDisableTooltip() { + return r.BindGuiDisableTooltip() +} +raylib.GuiDisableTooltip = GuiDisableTooltip + +/** + * Set tooltip string + * + * @param {string} tooltip + * + * @return {undefined} + */ +function GuiSetTooltip(tooltip) { + return r.BindGuiSetTooltip( + tooltip + ) +} +raylib.GuiSetTooltip = GuiSetTooltip + +/** + * Get text with icon id prepended (if supported) + * + * @param {number} iconId + * @param {string} text + * + * @return {string} The resulting const char *. + */ +function GuiIconText(iconId, text) { + return r.BindGuiIconText( + iconId, + text + ) +} +raylib.GuiIconText = GuiIconText + +/** + * Set default icon drawing size + * + * @param {number} scale + * + * @return {undefined} + */ +function GuiSetIconScale(scale) { + return r.BindGuiSetIconScale( + scale + ) +} +raylib.GuiSetIconScale = GuiSetIconScale /** - * Get gui custom font (global state) + * Get raygui icons data pointer * - * @return {Font} The resulting Font. + * @return {number} The resulting unsigned int *. */ -function GuiGetFont () { - return r.BindGuiGetFont() +function GuiGetIcons() { + return r.BindGuiGetIcons() } -raylib.GuiGetFont = GuiGetFont +raylib.GuiGetIcons = GuiGetIcons /** - * Set one style property + * Load raygui icons file (.rgi) into internal icons data * - * @param {number} control - * @param {number} property - * @param {number} value + * @param {string} fileName + * @param {boolean} loadIconsName * - * @return {undefined} + * @return {number} The resulting char **. */ -function GuiSetStyle (control, property, value) { - return r.BindGuiSetStyle( - control, - property, - value +function GuiLoadIcons(fileName, loadIconsName) { + return r.BindGuiLoadIcons( + fileName, + loadIconsName ) } -raylib.GuiSetStyle = GuiSetStyle +raylib.GuiLoadIcons = GuiLoadIcons /** - * Get one style property + * Draw icon using pixel size at specified position * - * @param {number} control - * @param {number} property + * @param {number} iconId + * @param {number} posX + * @param {number} posY + * @param {number} pixelSize + * @param {Color} color * - * @return {number} The resulting int. + * @return {undefined} */ -function GuiGetStyle (control, property) { - return r.BindGuiGetStyle( - control, - property +function GuiDrawIcon(iconId, posX, posY, pixelSize, color) { + return r.BindGuiDrawIcon( + iconId, + posX, + posY, + pixelSize, + color.r, + color.g, + color.b, + color.a ) } -raylib.GuiGetStyle = GuiGetStyle +raylib.GuiDrawIcon = GuiDrawIcon /** * Window Box control, shows a window that can be closed @@ -10721,9 +11546,9 @@ raylib.GuiGetStyle = GuiGetStyle * @param {Rectangle} bounds * @param {string} title * - * @return {boolean} The resulting bool. + * @return {number} The resulting int. */ -function GuiWindowBox (bounds, title) { +function GuiWindowBox(bounds, title) { return r.BindGuiWindowBox( bounds.x, bounds.y, @@ -10740,9 +11565,9 @@ raylib.GuiWindowBox = GuiWindowBox * @param {Rectangle} bounds * @param {string} text * - * @return {undefined} + * @return {number} The resulting int. */ -function GuiGroupBox (bounds, text) { +function GuiGroupBox(bounds, text) { return r.BindGuiGroupBox( bounds.x, bounds.y, @@ -10759,9 +11584,9 @@ raylib.GuiGroupBox = GuiGroupBox * @param {Rectangle} bounds * @param {string} text * - * @return {undefined} + * @return {number} The resulting int. */ -function GuiLine (bounds, text) { +function GuiLine(bounds, text) { return r.BindGuiLine( bounds.x, bounds.y, @@ -10778,9 +11603,9 @@ raylib.GuiLine = GuiLine * @param {Rectangle} bounds * @param {string} text * - * @return {undefined} + * @return {number} The resulting int. */ -function GuiPanel (bounds, text) { +function GuiPanel(bounds, text) { return r.BindGuiPanel( bounds.x, bounds.y, @@ -10801,7 +11626,7 @@ raylib.GuiPanel = GuiPanel * * @return {number} The resulting int. */ -function GuiTabBar (bounds, text, count, active) { +function GuiTabBar(bounds, text, count, active) { return r.BindGuiTabBar( bounds.x, bounds.y, @@ -10821,10 +11646,11 @@ raylib.GuiTabBar = GuiTabBar * @param {string} text * @param {Rectangle} content * @param {number} scroll + * @param {number} view * - * @return {Rectangle} The resulting Rectangle. + * @return {number} The resulting int. */ -function GuiScrollPanel (bounds, text, content, scroll) { +function GuiScrollPanel(bounds, text, content, scroll, view) { return r.BindGuiScrollPanel( bounds.x, bounds.y, @@ -10835,7 +11661,8 @@ function GuiScrollPanel (bounds, text, content, scroll) { content.y, content.width, content.height, - scroll + scroll, + view ) } raylib.GuiScrollPanel = GuiScrollPanel @@ -10846,9 +11673,9 @@ raylib.GuiScrollPanel = GuiScrollPanel * @param {Rectangle} bounds * @param {string} text * - * @return {undefined} + * @return {number} The resulting int. */ -function GuiLabel (bounds, text) { +function GuiLabel(bounds, text) { return r.BindGuiLabel( bounds.x, bounds.y, @@ -10865,9 +11692,9 @@ raylib.GuiLabel = GuiLabel * @param {Rectangle} bounds * @param {string} text * - * @return {boolean} The resulting bool. + * @return {number} The resulting int. */ -function GuiButton (bounds, text) { +function GuiButton(bounds, text) { return r.BindGuiButton( bounds.x, bounds.y, @@ -10884,9 +11711,9 @@ raylib.GuiButton = GuiButton * @param {Rectangle} bounds * @param {string} text * - * @return {boolean} The resulting bool. + * @return {number} The resulting int. */ -function GuiLabelButton (bounds, text) { +function GuiLabelButton(bounds, text) { return r.BindGuiLabelButton( bounds.x, bounds.y, @@ -10902,11 +11729,11 @@ raylib.GuiLabelButton = GuiLabelButton * * @param {Rectangle} bounds * @param {string} text - * @param {boolean} active + * @param {number} active * - * @return {boolean} The resulting bool. + * @return {number} The resulting int. */ -function GuiToggle (bounds, text, active) { +function GuiToggle(bounds, text, active) { return r.BindGuiToggle( bounds.x, bounds.y, @@ -10927,7 +11754,7 @@ raylib.GuiToggle = GuiToggle * * @return {number} The resulting int. */ -function GuiToggleGroup (bounds, text, active) { +function GuiToggleGroup(bounds, text, active) { return r.BindGuiToggleGroup( bounds.x, bounds.y, @@ -10939,16 +11766,37 @@ function GuiToggleGroup (bounds, text, active) { } raylib.GuiToggleGroup = GuiToggleGroup +/** + * Toggle Slider control, returns true when clicked + * + * @param {Rectangle} bounds + * @param {string} text + * @param {number} active + * + * @return {number} The resulting int. + */ +function GuiToggleSlider(bounds, text, active) { + return r.BindGuiToggleSlider( + bounds.x, + bounds.y, + bounds.width, + bounds.height, + text, + active + ) +} +raylib.GuiToggleSlider = GuiToggleSlider + /** * Check Box control, returns true when active * * @param {Rectangle} bounds * @param {string} text - * @param {boolean} checked + * @param {number} checked * - * @return {boolean} The resulting bool. + * @return {number} The resulting int. */ -function GuiCheckBox (bounds, text, checked) { +function GuiCheckBox(bounds, text, checked) { return r.BindGuiCheckBox( bounds.x, bounds.y, @@ -10969,7 +11817,7 @@ raylib.GuiCheckBox = GuiCheckBox * * @return {number} The resulting int. */ -function GuiComboBox (bounds, text, active) { +function GuiComboBox(bounds, text, active) { return r.BindGuiComboBox( bounds.x, bounds.y, @@ -10989,9 +11837,9 @@ raylib.GuiComboBox = GuiComboBox * @param {number} active * @param {boolean} editMode * - * @return {boolean} The resulting bool. + * @return {number} The resulting int. */ -function GuiDropdownBox (bounds, text, active, editMode) { +function GuiDropdownBox(bounds, text, active, editMode) { return r.BindGuiDropdownBox( bounds.x, bounds.y, @@ -11014,9 +11862,9 @@ raylib.GuiDropdownBox = GuiDropdownBox * @param {number} maxValue * @param {boolean} editMode * - * @return {boolean} The resulting bool. + * @return {number} The resulting int. */ -function GuiSpinner (bounds, text, value, minValue, maxValue, editMode) { +function GuiSpinner(bounds, text, value, minValue, maxValue, editMode) { return r.BindGuiSpinner( bounds.x, bounds.y, @@ -11041,9 +11889,9 @@ raylib.GuiSpinner = GuiSpinner * @param {number} maxValue * @param {boolean} editMode * - * @return {boolean} The resulting bool. + * @return {number} The resulting int. */ -function GuiValueBox (bounds, text, value, minValue, maxValue, editMode) { +function GuiValueBox(bounds, text, value, minValue, maxValue, editMode) { return r.BindGuiValueBox( bounds.x, bounds.y, @@ -11066,9 +11914,9 @@ raylib.GuiValueBox = GuiValueBox * @param {number} textSize * @param {boolean} editMode * - * @return {boolean} The resulting bool. + * @return {number} The resulting int. */ -function GuiTextBox (bounds, text, textSize, editMode) { +function GuiTextBox(bounds, text, textSize, editMode) { return r.BindGuiTextBox( bounds.x, bounds.y, @@ -11081,29 +11929,6 @@ function GuiTextBox (bounds, text, textSize, editMode) { } raylib.GuiTextBox = GuiTextBox -/** - * Text Box control with multiple lines - * - * @param {Rectangle} bounds - * @param {string} text - * @param {number} textSize - * @param {boolean} editMode - * - * @return {boolean} The resulting bool. - */ -function GuiTextBoxMulti (bounds, text, textSize, editMode) { - return r.BindGuiTextBoxMulti( - bounds.x, - bounds.y, - bounds.width, - bounds.height, - text, - textSize, - editMode - ) -} -raylib.GuiTextBoxMulti = GuiTextBoxMulti - /** * Slider control, returns selected value * @@ -11114,9 +11939,9 @@ raylib.GuiTextBoxMulti = GuiTextBoxMulti * @param {number} minValue * @param {number} maxValue * - * @return {number} The resulting float. + * @return {number} The resulting int. */ -function GuiSlider (bounds, textLeft, textRight, value, minValue, maxValue) { +function GuiSlider(bounds, textLeft, textRight, value, minValue, maxValue) { return r.BindGuiSlider( bounds.x, bounds.y, @@ -11141,9 +11966,9 @@ raylib.GuiSlider = GuiSlider * @param {number} minValue * @param {number} maxValue * - * @return {number} The resulting float. + * @return {number} The resulting int. */ -function GuiSliderBar (bounds, textLeft, textRight, value, minValue, maxValue) { +function GuiSliderBar(bounds, textLeft, textRight, value, minValue, maxValue) { return r.BindGuiSliderBar( bounds.x, bounds.y, @@ -11168,9 +11993,9 @@ raylib.GuiSliderBar = GuiSliderBar * @param {number} minValue * @param {number} maxValue * - * @return {number} The resulting float. + * @return {number} The resulting int. */ -function GuiProgressBar (bounds, textLeft, textRight, value, minValue, maxValue) { +function GuiProgressBar(bounds, textLeft, textRight, value, minValue, maxValue) { return r.BindGuiProgressBar( bounds.x, bounds.y, @@ -11191,9 +12016,9 @@ raylib.GuiProgressBar = GuiProgressBar * @param {Rectangle} bounds * @param {string} text * - * @return {undefined} + * @return {number} The resulting int. */ -function GuiStatusBar (bounds, text) { +function GuiStatusBar(bounds, text) { return r.BindGuiStatusBar( bounds.x, bounds.y, @@ -11210,9 +12035,9 @@ raylib.GuiStatusBar = GuiStatusBar * @param {Rectangle} bounds * @param {string} text * - * @return {undefined} + * @return {number} The resulting int. */ -function GuiDummyRec (bounds, text) { +function GuiDummyRec(bounds, text) { return r.BindGuiDummyRec( bounds.x, bounds.y, @@ -11230,10 +12055,11 @@ raylib.GuiDummyRec = GuiDummyRec * @param {string} text * @param {number} spacing * @param {number} subdivs + * @param {number} mouseCell * - * @return {Vector2} The resulting Vector2. + * @return {number} The resulting int. */ -function GuiGrid (bounds, text, spacing, subdivs) { +function GuiGrid(bounds, text, spacing, subdivs, mouseCell) { return r.BindGuiGrid( bounds.x, bounds.y, @@ -11241,7 +12067,8 @@ function GuiGrid (bounds, text, spacing, subdivs) { bounds.height, text, spacing, - subdivs + subdivs, + mouseCell ) } raylib.GuiGrid = GuiGrid @@ -11256,7 +12083,7 @@ raylib.GuiGrid = GuiGrid * * @return {number} The resulting int. */ -function GuiListView (bounds, text, scrollIndex, active) { +function GuiListView(bounds, text, scrollIndex, active) { return r.BindGuiListView( bounds.x, bounds.y, @@ -11275,13 +12102,13 @@ raylib.GuiListView = GuiListView * @param {Rectangle} bounds * @param {number} text * @param {number} count - * @param {number} focus * @param {number} scrollIndex * @param {number} active + * @param {number} focus * * @return {number} The resulting int. */ -function GuiListViewEx (bounds, text, count, focus, scrollIndex, active) { +function GuiListViewEx(bounds, text, count, scrollIndex, active, focus) { return r.BindGuiListViewEx( bounds.x, bounds.y, @@ -11289,9 +12116,9 @@ function GuiListViewEx (bounds, text, count, focus, scrollIndex, active) { bounds.height, text, count, - focus, scrollIndex, - active + active, + focus ) } raylib.GuiListViewEx = GuiListViewEx @@ -11306,7 +12133,7 @@ raylib.GuiListViewEx = GuiListViewEx * * @return {number} The resulting int. */ -function GuiMessageBox (bounds, title, message, buttons) { +function GuiMessageBox(bounds, title, message, buttons) { return r.BindGuiMessageBox( bounds.x, bounds.y, @@ -11332,7 +12159,7 @@ raylib.GuiMessageBox = GuiMessageBox * * @return {number} The resulting int. */ -function GuiTextInputBox (bounds, title, message, buttons, text, textMaxSize, secretViewActive) { +function GuiTextInputBox(bounds, title, message, buttons, text, textMaxSize, secretViewActive) { return r.BindGuiTextInputBox( bounds.x, bounds.y, @@ -11353,21 +12180,18 @@ raylib.GuiTextInputBox = GuiTextInputBox * * @param {Rectangle} bounds * @param {string} text - * @param {Color} color + * @param {number} color * - * @return {Color} The resulting Color. + * @return {number} The resulting int. */ -function GuiColorPicker (bounds, text, color) { +function GuiColorPicker(bounds, text, color) { return r.BindGuiColorPicker( bounds.x, bounds.y, bounds.width, bounds.height, text, - color.r, - color.g, - color.b, - color.a + color ) } raylib.GuiColorPicker = GuiColorPicker @@ -11377,194 +12201,105 @@ raylib.GuiColorPicker = GuiColorPicker * * @param {Rectangle} bounds * @param {string} text - * @param {Color} color + * @param {number} color * - * @return {Color} The resulting Color. + * @return {number} The resulting int. */ -function GuiColorPanel (bounds, text, color) { +function GuiColorPanel(bounds, text, color) { return r.BindGuiColorPanel( bounds.x, bounds.y, bounds.width, bounds.height, text, - color.r, - color.g, - color.b, - color.a - ) -} -raylib.GuiColorPanel = GuiColorPanel - -/** - * Color Bar Alpha control - * - * @param {Rectangle} bounds - * @param {string} text - * @param {number} alpha - * - * @return {number} The resulting float. - */ -function GuiColorBarAlpha (bounds, text, alpha) { - return r.BindGuiColorBarAlpha( - bounds.x, - bounds.y, - bounds.width, - bounds.height, - text, - alpha - ) -} -raylib.GuiColorBarAlpha = GuiColorBarAlpha - -/** - * Color Bar Hue control - * - * @param {Rectangle} bounds - * @param {string} text - * @param {number} value - * - * @return {number} The resulting float. - */ -function GuiColorBarHue (bounds, text, value) { - return r.BindGuiColorBarHue( - bounds.x, - bounds.y, - bounds.width, - bounds.height, - text, - value - ) -} -raylib.GuiColorBarHue = GuiColorBarHue - -/** - * Load style file over global style variable (.rgs) - * - * @param {string} fileName - * - * @return {undefined} - */ -function GuiLoadStyle (fileName) { - return r.BindGuiLoadStyle( - fileName - ) -} -raylib.GuiLoadStyle = GuiLoadStyle - -/** - * Load style default over global style - * - * @return {undefined} - */ -function GuiLoadStyleDefault () { - return r.BindGuiLoadStyleDefault() -} -raylib.GuiLoadStyleDefault = GuiLoadStyleDefault - -/** - * Enable gui tooltips (global state) - * - * @return {undefined} - */ -function GuiEnableTooltip () { - return r.BindGuiEnableTooltip() -} -raylib.GuiEnableTooltip = GuiEnableTooltip - -/** - * Disable gui tooltips (global state) - * - * @return {undefined} - */ -function GuiDisableTooltip () { - return r.BindGuiDisableTooltip() -} -raylib.GuiDisableTooltip = GuiDisableTooltip - -/** - * Set tooltip string - * - * @param {string} tooltip - * - * @return {undefined} - */ -function GuiSetTooltip (tooltip) { - return r.BindGuiSetTooltip( - tooltip - ) -} -raylib.GuiSetTooltip = GuiSetTooltip - -/** - * Get text with icon id prepended (if supported) - * - * @param {number} iconId - * @param {string} text - * - * @return {string} The resulting const char *. - */ -function GuiIconText (iconId, text) { - return r.BindGuiIconText( - iconId, - text + color ) } -raylib.GuiIconText = GuiIconText +raylib.GuiColorPanel = GuiColorPanel /** - * Get raygui icons data pointer + * Color Bar Alpha control * - * @return {number} The resulting unsigned int *. + * @param {Rectangle} bounds + * @param {string} text + * @param {number} alpha + * + * @return {number} The resulting int. */ -function GuiGetIcons () { - return r.BindGuiGetIcons() +function GuiColorBarAlpha(bounds, text, alpha) { + return r.BindGuiColorBarAlpha( + bounds.x, + bounds.y, + bounds.width, + bounds.height, + text, + alpha + ) } -raylib.GuiGetIcons = GuiGetIcons +raylib.GuiColorBarAlpha = GuiColorBarAlpha /** - * Load raygui icons file (.rgi) into internal icons data + * Color Bar Hue control * - * @param {string} fileName - * @param {boolean} loadIconsName + * @param {Rectangle} bounds + * @param {string} text + * @param {number} value * - * @return {number} The resulting char **. + * @return {number} The resulting int. */ -function GuiLoadIcons (fileName, loadIconsName) { - return r.BindGuiLoadIcons( - fileName, - loadIconsName +function GuiColorBarHue(bounds, text, value) { + return r.BindGuiColorBarHue( + bounds.x, + bounds.y, + bounds.width, + bounds.height, + text, + value ) } -raylib.GuiLoadIcons = GuiLoadIcons +raylib.GuiColorBarHue = GuiColorBarHue -function GuiDrawIcon (iconId, posX, posY, pixelSize, color) { - return r.BindGuiDrawIcon( - iconId, - posX, - posY, - pixelSize, - color.r, - color.g, - color.b, - color.a +/** + * Color Picker control that avoids conversion to RGB on each call (multiple color controls) + * + * @param {Rectangle} bounds + * @param {string} text + * @param {number} colorHsv + * + * @return {number} The resulting int. + */ +function GuiColorPickerHSV(bounds, text, colorHsv) { + return r.BindGuiColorPickerHSV( + bounds.x, + bounds.y, + bounds.width, + bounds.height, + text, + colorHsv ) } -raylib.GuiDrawIcon = GuiDrawIcon +raylib.GuiColorPickerHSV = GuiColorPickerHSV /** - * Set icon drawing size + * Color Panel control that returns HSV color value, used by GuiColorPickerHSV() * - * @param {number} scale + * @param {Rectangle} bounds + * @param {string} text + * @param {number} colorHsv * - * @return {undefined} + * @return {number} The resulting int. */ -function GuiSetIconScale (scale) { - return r.BindGuiSetIconScale( - scale +function GuiColorPanelHSV(bounds, text, colorHsv) { + return r.BindGuiColorPanelHSV( + bounds.x, + bounds.y, + bounds.width, + bounds.height, + text, + colorHsv ) } -raylib.GuiSetIconScale = GuiSetIconScale +raylib.GuiColorPanelHSV = GuiColorPanelHSV /** * Choose the current matrix to be transformed @@ -11573,7 +12308,7 @@ raylib.GuiSetIconScale = GuiSetIconScale * * @return {undefined} */ -function rlMatrixMode (mode) { +function rlMatrixMode(mode) { return r.BindrlMatrixMode( mode ) @@ -11585,7 +12320,7 @@ raylib.rlMatrixMode = rlMatrixMode * * @return {undefined} */ -function rlPushMatrix () { +function rlPushMatrix() { return r.BindrlPushMatrix() } raylib.rlPushMatrix = rlPushMatrix @@ -11595,7 +12330,7 @@ raylib.rlPushMatrix = rlPushMatrix * * @return {undefined} */ -function rlPopMatrix () { +function rlPopMatrix() { return r.BindrlPopMatrix() } raylib.rlPopMatrix = rlPopMatrix @@ -11605,7 +12340,7 @@ raylib.rlPopMatrix = rlPopMatrix * * @return {undefined} */ -function rlLoadIdentity () { +function rlLoadIdentity() { return r.BindrlLoadIdentity() } raylib.rlLoadIdentity = rlLoadIdentity @@ -11619,7 +12354,7 @@ raylib.rlLoadIdentity = rlLoadIdentity * * @return {undefined} */ -function rlTranslatef (x, y, z) { +function rlTranslatef(x, y, z) { return r.BindrlTranslatef( x, y, @@ -11638,7 +12373,7 @@ raylib.rlTranslatef = rlTranslatef * * @return {undefined} */ -function rlRotatef (angle, x, y, z) { +function rlRotatef(angle, x, y, z) { return r.BindrlRotatef( angle, x, @@ -11657,7 +12392,7 @@ raylib.rlRotatef = rlRotatef * * @return {undefined} */ -function rlScalef (x, y, z) { +function rlScalef(x, y, z) { return r.BindrlScalef( x, y, @@ -11673,14 +12408,14 @@ raylib.rlScalef = rlScalef * * @return {undefined} */ -function rlMultMatrixf (matf) { +function rlMultMatrixf(matf) { return r.BindrlMultMatrixf( matf ) } raylib.rlMultMatrixf = rlMultMatrixf -function rlFrustum (left, right, bottom, top, znear, zfar) { +function rlFrustum(left, right, bottom, top, znear, zfar) { return r.BindrlFrustum( left, right, @@ -11692,7 +12427,7 @@ function rlFrustum (left, right, bottom, top, znear, zfar) { } raylib.rlFrustum = rlFrustum -function rlOrtho (left, right, bottom, top, znear, zfar) { +function rlOrtho(left, right, bottom, top, znear, zfar) { return r.BindrlOrtho( left, right, @@ -11714,7 +12449,7 @@ raylib.rlOrtho = rlOrtho * * @return {undefined} */ -function rlViewport (x, y, width, height) { +function rlViewport(x, y, width, height) { return r.BindrlViewport( x, y, @@ -11731,7 +12466,7 @@ raylib.rlViewport = rlViewport * * @return {undefined} */ -function rlBegin (mode) { +function rlBegin(mode) { return r.BindrlBegin( mode ) @@ -11743,7 +12478,7 @@ raylib.rlBegin = rlBegin * * @return {undefined} */ -function rlEnd () { +function rlEnd() { return r.BindrlEnd() } raylib.rlEnd = rlEnd @@ -11756,7 +12491,7 @@ raylib.rlEnd = rlEnd * * @return {undefined} */ -function rlVertex2i (x, y) { +function rlVertex2i(x, y) { return r.BindrlVertex2i( x, y @@ -11772,7 +12507,7 @@ raylib.rlVertex2i = rlVertex2i * * @return {undefined} */ -function rlVertex2f (x, y) { +function rlVertex2f(x, y) { return r.BindrlVertex2f( x, y @@ -11789,7 +12524,7 @@ raylib.rlVertex2f = rlVertex2f * * @return {undefined} */ -function rlVertex3f (x, y, z) { +function rlVertex3f(x, y, z) { return r.BindrlVertex3f( x, y, @@ -11806,7 +12541,7 @@ raylib.rlVertex3f = rlVertex3f * * @return {undefined} */ -function rlTexCoord2f (x, y) { +function rlTexCoord2f(x, y) { return r.BindrlTexCoord2f( x, y @@ -11823,7 +12558,7 @@ raylib.rlTexCoord2f = rlTexCoord2f * * @return {undefined} */ -function rlNormal3f (x, y, z) { +function rlNormal3f(x, y, z) { return r.BindrlNormal3f( x, y, @@ -11842,7 +12577,7 @@ raylib.rlNormal3f = rlNormal3f * * @return {undefined} */ -function rlColor4ub (r, g, b, a) { +function rlColor4ub(r, g, b, a) { return r.BindrlColor4ub( r, g, @@ -11861,7 +12596,7 @@ raylib.rlColor4ub = rlColor4ub * * @return {undefined} */ -function rlColor3f (x, y, z) { +function rlColor3f(x, y, z) { return r.BindrlColor3f( x, y, @@ -11880,7 +12615,7 @@ raylib.rlColor3f = rlColor3f * * @return {undefined} */ -function rlColor4f (x, y, z, w) { +function rlColor4f(x, y, z, w) { return r.BindrlColor4f( x, y, @@ -11897,7 +12632,7 @@ raylib.rlColor4f = rlColor4f * * @return {boolean} The resulting bool. */ -function rlEnableVertexArray (vaoId) { +function rlEnableVertexArray(vaoId) { return r.BindrlEnableVertexArray( vaoId ) @@ -11909,7 +12644,7 @@ raylib.rlEnableVertexArray = rlEnableVertexArray * * @return {undefined} */ -function rlDisableVertexArray () { +function rlDisableVertexArray() { return r.BindrlDisableVertexArray() } raylib.rlDisableVertexArray = rlDisableVertexArray @@ -11921,7 +12656,7 @@ raylib.rlDisableVertexArray = rlDisableVertexArray * * @return {undefined} */ -function rlEnableVertexBuffer (id) { +function rlEnableVertexBuffer(id) { return r.BindrlEnableVertexBuffer( id ) @@ -11933,7 +12668,7 @@ raylib.rlEnableVertexBuffer = rlEnableVertexBuffer * * @return {undefined} */ -function rlDisableVertexBuffer () { +function rlDisableVertexBuffer() { return r.BindrlDisableVertexBuffer() } raylib.rlDisableVertexBuffer = rlDisableVertexBuffer @@ -11945,7 +12680,7 @@ raylib.rlDisableVertexBuffer = rlDisableVertexBuffer * * @return {undefined} */ -function rlEnableVertexBufferElement (id) { +function rlEnableVertexBufferElement(id) { return r.BindrlEnableVertexBufferElement( id ) @@ -11957,7 +12692,7 @@ raylib.rlEnableVertexBufferElement = rlEnableVertexBufferElement * * @return {undefined} */ -function rlDisableVertexBufferElement () { +function rlDisableVertexBufferElement() { return r.BindrlDisableVertexBufferElement() } raylib.rlDisableVertexBufferElement = rlDisableVertexBufferElement @@ -11969,7 +12704,7 @@ raylib.rlDisableVertexBufferElement = rlDisableVertexBufferElement * * @return {undefined} */ -function rlEnableVertexAttribute (index) { +function rlEnableVertexAttribute(index) { return r.BindrlEnableVertexAttribute( index ) @@ -11983,7 +12718,7 @@ raylib.rlEnableVertexAttribute = rlEnableVertexAttribute * * @return {undefined} */ -function rlDisableVertexAttribute (index) { +function rlDisableVertexAttribute(index) { return r.BindrlDisableVertexAttribute( index ) @@ -11997,7 +12732,7 @@ raylib.rlDisableVertexAttribute = rlDisableVertexAttribute * * @return {undefined} */ -function rlActiveTextureSlot (slot) { +function rlActiveTextureSlot(slot) { return r.BindrlActiveTextureSlot( slot ) @@ -12011,7 +12746,7 @@ raylib.rlActiveTextureSlot = rlActiveTextureSlot * * @return {undefined} */ -function rlEnableTexture (id) { +function rlEnableTexture(id) { return r.BindrlEnableTexture( id ) @@ -12023,7 +12758,7 @@ raylib.rlEnableTexture = rlEnableTexture * * @return {undefined} */ -function rlDisableTexture () { +function rlDisableTexture() { return r.BindrlDisableTexture() } raylib.rlDisableTexture = rlDisableTexture @@ -12035,7 +12770,7 @@ raylib.rlDisableTexture = rlDisableTexture * * @return {undefined} */ -function rlEnableTextureCubemap (id) { +function rlEnableTextureCubemap(id) { return r.BindrlEnableTextureCubemap( id ) @@ -12047,7 +12782,7 @@ raylib.rlEnableTextureCubemap = rlEnableTextureCubemap * * @return {undefined} */ -function rlDisableTextureCubemap () { +function rlDisableTextureCubemap() { return r.BindrlDisableTextureCubemap() } raylib.rlDisableTextureCubemap = rlDisableTextureCubemap @@ -12061,7 +12796,7 @@ raylib.rlDisableTextureCubemap = rlDisableTextureCubemap * * @return {undefined} */ -function rlTextureParameters (id, param, value) { +function rlTextureParameters(id, param, value) { return r.BindrlTextureParameters( id, param, @@ -12079,7 +12814,7 @@ raylib.rlTextureParameters = rlTextureParameters * * @return {undefined} */ -function rlCubemapParameters (id, param, value) { +function rlCubemapParameters(id, param, value) { return r.BindrlCubemapParameters( id, param, @@ -12095,7 +12830,7 @@ raylib.rlCubemapParameters = rlCubemapParameters * * @return {undefined} */ -function rlEnableShader (id) { +function rlEnableShader(id) { return r.BindrlEnableShader( id ) @@ -12107,7 +12842,7 @@ raylib.rlEnableShader = rlEnableShader * * @return {undefined} */ -function rlDisableShader () { +function rlDisableShader() { return r.BindrlDisableShader() } raylib.rlDisableShader = rlDisableShader @@ -12119,7 +12854,7 @@ raylib.rlDisableShader = rlDisableShader * * @return {undefined} */ -function rlEnableFramebuffer (id) { +function rlEnableFramebuffer(id) { return r.BindrlEnableFramebuffer( id ) @@ -12131,7 +12866,7 @@ raylib.rlEnableFramebuffer = rlEnableFramebuffer * * @return {undefined} */ -function rlDisableFramebuffer () { +function rlDisableFramebuffer() { return r.BindrlDisableFramebuffer() } raylib.rlDisableFramebuffer = rlDisableFramebuffer @@ -12143,19 +12878,49 @@ raylib.rlDisableFramebuffer = rlDisableFramebuffer * * @return {undefined} */ -function rlActiveDrawBuffers (count) { +function rlActiveDrawBuffers(count) { return r.BindrlActiveDrawBuffers( count ) } raylib.rlActiveDrawBuffers = rlActiveDrawBuffers +/** + * Blit active framebuffer to main framebuffer + * + * @param {number} srcX + * @param {number} srcY + * @param {number} srcWidth + * @param {number} srcHeight + * @param {number} dstX + * @param {number} dstY + * @param {number} dstWidth + * @param {number} dstHeight + * @param {number} bufferMask + * + * @return {undefined} + */ +function rlBlitFramebuffer(srcX, srcY, srcWidth, srcHeight, dstX, dstY, dstWidth, dstHeight, bufferMask) { + return r.BindrlBlitFramebuffer( + srcX, + srcY, + srcWidth, + srcHeight, + dstX, + dstY, + dstWidth, + dstHeight, + bufferMask + ) +} +raylib.rlBlitFramebuffer = rlBlitFramebuffer + /** * Enable color blending * * @return {undefined} */ -function rlEnableColorBlend () { +function rlEnableColorBlend() { return r.BindrlEnableColorBlend() } raylib.rlEnableColorBlend = rlEnableColorBlend @@ -12165,7 +12930,7 @@ raylib.rlEnableColorBlend = rlEnableColorBlend * * @return {undefined} */ -function rlDisableColorBlend () { +function rlDisableColorBlend() { return r.BindrlDisableColorBlend() } raylib.rlDisableColorBlend = rlDisableColorBlend @@ -12175,7 +12940,7 @@ raylib.rlDisableColorBlend = rlDisableColorBlend * * @return {undefined} */ -function rlEnableDepthTest () { +function rlEnableDepthTest() { return r.BindrlEnableDepthTest() } raylib.rlEnableDepthTest = rlEnableDepthTest @@ -12185,7 +12950,7 @@ raylib.rlEnableDepthTest = rlEnableDepthTest * * @return {undefined} */ -function rlDisableDepthTest () { +function rlDisableDepthTest() { return r.BindrlDisableDepthTest() } raylib.rlDisableDepthTest = rlDisableDepthTest @@ -12195,7 +12960,7 @@ raylib.rlDisableDepthTest = rlDisableDepthTest * * @return {undefined} */ -function rlEnableDepthMask () { +function rlEnableDepthMask() { return r.BindrlEnableDepthMask() } raylib.rlEnableDepthMask = rlEnableDepthMask @@ -12205,7 +12970,7 @@ raylib.rlEnableDepthMask = rlEnableDepthMask * * @return {undefined} */ -function rlDisableDepthMask () { +function rlDisableDepthMask() { return r.BindrlDisableDepthMask() } raylib.rlDisableDepthMask = rlDisableDepthMask @@ -12215,7 +12980,7 @@ raylib.rlDisableDepthMask = rlDisableDepthMask * * @return {undefined} */ -function rlEnableBackfaceCulling () { +function rlEnableBackfaceCulling() { return r.BindrlEnableBackfaceCulling() } raylib.rlEnableBackfaceCulling = rlEnableBackfaceCulling @@ -12225,7 +12990,7 @@ raylib.rlEnableBackfaceCulling = rlEnableBackfaceCulling * * @return {undefined} */ -function rlDisableBackfaceCulling () { +function rlDisableBackfaceCulling() { return r.BindrlDisableBackfaceCulling() } raylib.rlDisableBackfaceCulling = rlDisableBackfaceCulling @@ -12237,7 +13002,7 @@ raylib.rlDisableBackfaceCulling = rlDisableBackfaceCulling * * @return {undefined} */ -function rlSetCullFace (mode) { +function rlSetCullFace(mode) { return r.BindrlSetCullFace( mode ) @@ -12249,7 +13014,7 @@ raylib.rlSetCullFace = rlSetCullFace * * @return {undefined} */ -function rlEnableScissorTest () { +function rlEnableScissorTest() { return r.BindrlEnableScissorTest() } raylib.rlEnableScissorTest = rlEnableScissorTest @@ -12259,7 +13024,7 @@ raylib.rlEnableScissorTest = rlEnableScissorTest * * @return {undefined} */ -function rlDisableScissorTest () { +function rlDisableScissorTest() { return r.BindrlDisableScissorTest() } raylib.rlDisableScissorTest = rlDisableScissorTest @@ -12274,7 +13039,7 @@ raylib.rlDisableScissorTest = rlDisableScissorTest * * @return {undefined} */ -function rlScissor (x, y, width, height) { +function rlScissor(x, y, width, height) { return r.BindrlScissor( x, y, @@ -12289,17 +13054,27 @@ raylib.rlScissor = rlScissor * * @return {undefined} */ -function rlEnableWireMode () { +function rlEnableWireMode() { return r.BindrlEnableWireMode() } raylib.rlEnableWireMode = rlEnableWireMode /** - * Disable wire mode + * Enable point mode + * + * @return {undefined} + */ +function rlEnablePointMode() { + return r.BindrlEnablePointMode() +} +raylib.rlEnablePointMode = rlEnablePointMode + +/** + * Disable wire mode ( and point ) maybe rename * * @return {undefined} */ -function rlDisableWireMode () { +function rlDisableWireMode() { return r.BindrlDisableWireMode() } raylib.rlDisableWireMode = rlDisableWireMode @@ -12311,7 +13086,7 @@ raylib.rlDisableWireMode = rlDisableWireMode * * @return {undefined} */ -function rlSetLineWidth (width) { +function rlSetLineWidth(width) { return r.BindrlSetLineWidth( width ) @@ -12323,7 +13098,7 @@ raylib.rlSetLineWidth = rlSetLineWidth * * @return {number} The resulting float. */ -function rlGetLineWidth () { +function rlGetLineWidth() { return r.BindrlGetLineWidth() } raylib.rlGetLineWidth = rlGetLineWidth @@ -12333,7 +13108,7 @@ raylib.rlGetLineWidth = rlGetLineWidth * * @return {undefined} */ -function rlEnableSmoothLines () { +function rlEnableSmoothLines() { return r.BindrlEnableSmoothLines() } raylib.rlEnableSmoothLines = rlEnableSmoothLines @@ -12343,7 +13118,7 @@ raylib.rlEnableSmoothLines = rlEnableSmoothLines * * @return {undefined} */ -function rlDisableSmoothLines () { +function rlDisableSmoothLines() { return r.BindrlDisableSmoothLines() } raylib.rlDisableSmoothLines = rlDisableSmoothLines @@ -12353,7 +13128,7 @@ raylib.rlDisableSmoothLines = rlDisableSmoothLines * * @return {undefined} */ -function rlEnableStereoRender () { +function rlEnableStereoRender() { return r.BindrlEnableStereoRender() } raylib.rlEnableStereoRender = rlEnableStereoRender @@ -12363,7 +13138,7 @@ raylib.rlEnableStereoRender = rlEnableStereoRender * * @return {undefined} */ -function rlDisableStereoRender () { +function rlDisableStereoRender() { return r.BindrlDisableStereoRender() } raylib.rlDisableStereoRender = rlDisableStereoRender @@ -12373,7 +13148,7 @@ raylib.rlDisableStereoRender = rlDisableStereoRender * * @return {boolean} The resulting bool. */ -function rlIsStereoRenderEnabled () { +function rlIsStereoRenderEnabled() { return r.BindrlIsStereoRenderEnabled() } raylib.rlIsStereoRenderEnabled = rlIsStereoRenderEnabled @@ -12388,7 +13163,7 @@ raylib.rlIsStereoRenderEnabled = rlIsStereoRenderEnabled * * @return {undefined} */ -function rlClearColor (r, g, b, a) { +function rlClearColor(r, g, b, a) { return r.BindrlClearColor( r, g, @@ -12403,7 +13178,7 @@ raylib.rlClearColor = rlClearColor * * @return {undefined} */ -function rlClearScreenBuffers () { +function rlClearScreenBuffers() { return r.BindrlClearScreenBuffers() } raylib.rlClearScreenBuffers = rlClearScreenBuffers @@ -12413,7 +13188,7 @@ raylib.rlClearScreenBuffers = rlClearScreenBuffers * * @return {undefined} */ -function rlCheckErrors () { +function rlCheckErrors() { return r.BindrlCheckErrors() } raylib.rlCheckErrors = rlCheckErrors @@ -12425,7 +13200,7 @@ raylib.rlCheckErrors = rlCheckErrors * * @return {undefined} */ -function rlSetBlendMode (mode) { +function rlSetBlendMode(mode) { return r.BindrlSetBlendMode( mode ) @@ -12441,7 +13216,7 @@ raylib.rlSetBlendMode = rlSetBlendMode * * @return {undefined} */ -function rlSetBlendFactors (glSrcFactor, glDstFactor, glEquation) { +function rlSetBlendFactors(glSrcFactor, glDstFactor, glEquation) { return r.BindrlSetBlendFactors( glSrcFactor, glDstFactor, @@ -12462,7 +13237,7 @@ raylib.rlSetBlendFactors = rlSetBlendFactors * * @return {undefined} */ -function rlSetBlendFactorsSeparate (glSrcRGB, glDstRGB, glSrcAlpha, glDstAlpha, glEqRGB, glEqAlpha) { +function rlSetBlendFactorsSeparate(glSrcRGB, glDstRGB, glSrcAlpha, glDstAlpha, glEqRGB, glEqAlpha) { return r.BindrlSetBlendFactorsSeparate( glSrcRGB, glDstRGB, @@ -12482,7 +13257,7 @@ raylib.rlSetBlendFactorsSeparate = rlSetBlendFactorsSeparate * * @return {undefined} */ -function rlglInit (width, height) { +function rlglInit(width, height) { return r.BindrlglInit( width, height @@ -12495,7 +13270,7 @@ raylib.rlglInit = rlglInit * * @return {undefined} */ -function rlglClose () { +function rlglClose() { return r.BindrlglClose() } raylib.rlglClose = rlglClose @@ -12507,7 +13282,7 @@ raylib.rlglClose = rlglClose * * @return {undefined} */ -function rlLoadExtensions (loader) { +function rlLoadExtensions(loader) { return r.BindrlLoadExtensions( loader ) @@ -12519,7 +13294,7 @@ raylib.rlLoadExtensions = rlLoadExtensions * * @return {number} The resulting int. */ -function rlGetVersion () { +function rlGetVersion() { return r.BindrlGetVersion() } raylib.rlGetVersion = rlGetVersion @@ -12531,7 +13306,7 @@ raylib.rlGetVersion = rlGetVersion * * @return {undefined} */ -function rlSetFramebufferWidth (width) { +function rlSetFramebufferWidth(width) { return r.BindrlSetFramebufferWidth( width ) @@ -12543,7 +13318,7 @@ raylib.rlSetFramebufferWidth = rlSetFramebufferWidth * * @return {number} The resulting int. */ -function rlGetFramebufferWidth () { +function rlGetFramebufferWidth() { return r.BindrlGetFramebufferWidth() } raylib.rlGetFramebufferWidth = rlGetFramebufferWidth @@ -12555,7 +13330,7 @@ raylib.rlGetFramebufferWidth = rlGetFramebufferWidth * * @return {undefined} */ -function rlSetFramebufferHeight (height) { +function rlSetFramebufferHeight(height) { return r.BindrlSetFramebufferHeight( height ) @@ -12567,7 +13342,7 @@ raylib.rlSetFramebufferHeight = rlSetFramebufferHeight * * @return {number} The resulting int. */ -function rlGetFramebufferHeight () { +function rlGetFramebufferHeight() { return r.BindrlGetFramebufferHeight() } raylib.rlGetFramebufferHeight = rlGetFramebufferHeight @@ -12577,7 +13352,7 @@ raylib.rlGetFramebufferHeight = rlGetFramebufferHeight * * @return {number} The resulting unsigned int. */ -function rlGetTextureIdDefault () { +function rlGetTextureIdDefault() { return r.BindrlGetTextureIdDefault() } raylib.rlGetTextureIdDefault = rlGetTextureIdDefault @@ -12587,7 +13362,7 @@ raylib.rlGetTextureIdDefault = rlGetTextureIdDefault * * @return {number} The resulting unsigned int. */ -function rlGetShaderIdDefault () { +function rlGetShaderIdDefault() { return r.BindrlGetShaderIdDefault() } raylib.rlGetShaderIdDefault = rlGetShaderIdDefault @@ -12597,7 +13372,7 @@ raylib.rlGetShaderIdDefault = rlGetShaderIdDefault * * @return {number} The resulting int *. */ -function rlGetShaderLocsDefault () { +function rlGetShaderLocsDefault() { return r.BindrlGetShaderLocsDefault() } raylib.rlGetShaderLocsDefault = rlGetShaderLocsDefault @@ -12610,7 +13385,7 @@ raylib.rlGetShaderLocsDefault = rlGetShaderLocsDefault * * @return {rlRenderBatch} The resulting rlRenderBatch. */ -function rlLoadRenderBatch (numBuffers, bufferElements) { +function rlLoadRenderBatch(numBuffers, bufferElements) { return r.BindrlLoadRenderBatch( numBuffers, bufferElements @@ -12625,7 +13400,7 @@ raylib.rlLoadRenderBatch = rlLoadRenderBatch * * @return {undefined} */ -function rlUnloadRenderBatch (batch) { +function rlUnloadRenderBatch(batch) { return r.BindrlUnloadRenderBatch( batch.bufferCount, batch.currentBuffer, @@ -12644,7 +13419,7 @@ raylib.rlUnloadRenderBatch = rlUnloadRenderBatch * * @return {undefined} */ -function rlDrawRenderBatch (batch) { +function rlDrawRenderBatch(batch) { return r.BindrlDrawRenderBatch( batch ) @@ -12658,7 +13433,7 @@ raylib.rlDrawRenderBatch = rlDrawRenderBatch * * @return {undefined} */ -function rlSetRenderBatchActive (batch) { +function rlSetRenderBatchActive(batch) { return r.BindrlSetRenderBatchActive( batch ) @@ -12670,7 +13445,7 @@ raylib.rlSetRenderBatchActive = rlSetRenderBatchActive * * @return {undefined} */ -function rlDrawRenderBatchActive () { +function rlDrawRenderBatchActive() { return r.BindrlDrawRenderBatchActive() } raylib.rlDrawRenderBatchActive = rlDrawRenderBatchActive @@ -12682,7 +13457,7 @@ raylib.rlDrawRenderBatchActive = rlDrawRenderBatchActive * * @return {boolean} The resulting bool. */ -function rlCheckRenderBatchLimit (vCount) { +function rlCheckRenderBatchLimit(vCount) { return r.BindrlCheckRenderBatchLimit( vCount ) @@ -12696,7 +13471,7 @@ raylib.rlCheckRenderBatchLimit = rlCheckRenderBatchLimit * * @return {undefined} */ -function rlSetTexture (id) { +function rlSetTexture(id) { return r.BindrlSetTexture( id ) @@ -12708,7 +13483,7 @@ raylib.rlSetTexture = rlSetTexture * * @return {number} The resulting unsigned int. */ -function rlLoadVertexArray () { +function rlLoadVertexArray() { return r.BindrlLoadVertexArray() } raylib.rlLoadVertexArray = rlLoadVertexArray @@ -12722,7 +13497,7 @@ raylib.rlLoadVertexArray = rlLoadVertexArray * * @return {number} The resulting unsigned int. */ -function rlLoadVertexBuffer (buffer, size, dynamic) { +function rlLoadVertexBuffer(buffer, size, dynamic) { return r.BindrlLoadVertexBuffer( buffer, size, @@ -12740,7 +13515,7 @@ raylib.rlLoadVertexBuffer = rlLoadVertexBuffer * * @return {number} The resulting unsigned int. */ -function rlLoadVertexBufferElement (buffer, size, dynamic) { +function rlLoadVertexBufferElement(buffer, size, dynamic) { return r.BindrlLoadVertexBufferElement( buffer, size, @@ -12759,7 +13534,7 @@ raylib.rlLoadVertexBufferElement = rlLoadVertexBufferElement * * @return {undefined} */ -function rlUpdateVertexBuffer (bufferId, data, dataSize, offset) { +function rlUpdateVertexBuffer(bufferId, data, dataSize, offset) { return r.BindrlUpdateVertexBuffer( bufferId, data, @@ -12779,7 +13554,7 @@ raylib.rlUpdateVertexBuffer = rlUpdateVertexBuffer * * @return {undefined} */ -function rlUpdateVertexBufferElements (id, data, dataSize, offset) { +function rlUpdateVertexBufferElements(id, data, dataSize, offset) { return r.BindrlUpdateVertexBufferElements( id, data, @@ -12789,21 +13564,21 @@ function rlUpdateVertexBufferElements (id, data, dataSize, offset) { } raylib.rlUpdateVertexBufferElements = rlUpdateVertexBufferElements -function rlUnloadVertexArray (vaoId) { +function rlUnloadVertexArray(vaoId) { return r.BindrlUnloadVertexArray( vaoId ) } raylib.rlUnloadVertexArray = rlUnloadVertexArray -function rlUnloadVertexBuffer (vboId) { +function rlUnloadVertexBuffer(vboId) { return r.BindrlUnloadVertexBuffer( vboId ) } raylib.rlUnloadVertexBuffer = rlUnloadVertexBuffer -function rlSetVertexAttribute (index, compSize, type, normalized, stride, pointer) { +function rlSetVertexAttribute(index, compSize, type, normalized, stride, pointer) { return r.BindrlSetVertexAttribute( index, compSize, @@ -12815,7 +13590,7 @@ function rlSetVertexAttribute (index, compSize, type, normalized, stride, pointe } raylib.rlSetVertexAttribute = rlSetVertexAttribute -function rlSetVertexAttributeDivisor (index, divisor) { +function rlSetVertexAttributeDivisor(index, divisor) { return r.BindrlSetVertexAttributeDivisor( index, divisor @@ -12833,7 +13608,7 @@ raylib.rlSetVertexAttributeDivisor = rlSetVertexAttributeDivisor * * @return {undefined} */ -function rlSetVertexAttributeDefault (locIndex, value, attribType, count) { +function rlSetVertexAttributeDefault(locIndex, value, attribType, count) { return r.BindrlSetVertexAttributeDefault( locIndex, value, @@ -12843,7 +13618,7 @@ function rlSetVertexAttributeDefault (locIndex, value, attribType, count) { } raylib.rlSetVertexAttributeDefault = rlSetVertexAttributeDefault -function rlDrawVertexArray (offset, count) { +function rlDrawVertexArray(offset, count) { return r.BindrlDrawVertexArray( offset, count @@ -12851,7 +13626,7 @@ function rlDrawVertexArray (offset, count) { } raylib.rlDrawVertexArray = rlDrawVertexArray -function rlDrawVertexArrayElements (offset, count, buffer) { +function rlDrawVertexArrayElements(offset, count, buffer) { return r.BindrlDrawVertexArrayElements( offset, count, @@ -12860,7 +13635,7 @@ function rlDrawVertexArrayElements (offset, count, buffer) { } raylib.rlDrawVertexArrayElements = rlDrawVertexArrayElements -function rlDrawVertexArrayInstanced (offset, count, instances) { +function rlDrawVertexArrayInstanced(offset, count, instances) { return r.BindrlDrawVertexArrayInstanced( offset, count, @@ -12869,7 +13644,7 @@ function rlDrawVertexArrayInstanced (offset, count, instances) { } raylib.rlDrawVertexArrayInstanced = rlDrawVertexArrayInstanced -function rlDrawVertexArrayElementsInstanced (offset, count, buffer, instances) { +function rlDrawVertexArrayElementsInstanced(offset, count, buffer, instances) { return r.BindrlDrawVertexArrayElementsInstanced( offset, count, @@ -12890,7 +13665,7 @@ raylib.rlDrawVertexArrayElementsInstanced = rlDrawVertexArrayElementsInstanced * * @return {number} The resulting unsigned int. */ -function rlLoadTexture (data, width, height, format, mipmapCount) { +function rlLoadTexture(data, width, height, format, mipmapCount) { return r.BindrlLoadTexture( data, width, @@ -12910,7 +13685,7 @@ raylib.rlLoadTexture = rlLoadTexture * * @return {number} The resulting unsigned int. */ -function rlLoadTextureDepth (width, height, useRenderBuffer) { +function rlLoadTextureDepth(width, height, useRenderBuffer) { return r.BindrlLoadTextureDepth( width, height, @@ -12928,7 +13703,7 @@ raylib.rlLoadTextureDepth = rlLoadTextureDepth * * @return {number} The resulting unsigned int. */ -function rlLoadTextureCubemap (data, size, format) { +function rlLoadTextureCubemap(data, size, format) { return r.BindrlLoadTextureCubemap( data, size, @@ -12950,7 +13725,7 @@ raylib.rlLoadTextureCubemap = rlLoadTextureCubemap * * @return {undefined} */ -function rlUpdateTexture (id, offsetX, offsetY, width, height, format, data) { +function rlUpdateTexture(id, offsetX, offsetY, width, height, format, data) { return r.BindrlUpdateTexture( id, offsetX, @@ -12973,7 +13748,7 @@ raylib.rlUpdateTexture = rlUpdateTexture * * @return {undefined} */ -function rlGetGlTextureFormats (format, glInternalFormat, glFormat, glType) { +function rlGetGlTextureFormats(format, glInternalFormat, glFormat, glType) { return r.BindrlGetGlTextureFormats( format, glInternalFormat, @@ -12990,7 +13765,7 @@ raylib.rlGetGlTextureFormats = rlGetGlTextureFormats * * @return {string} The resulting const char *. */ -function rlGetPixelFormatName (format) { +function rlGetPixelFormatName(format) { return r.BindrlGetPixelFormatName( format ) @@ -13004,7 +13779,7 @@ raylib.rlGetPixelFormatName = rlGetPixelFormatName * * @return {undefined} */ -function rlUnloadTexture (id) { +function rlUnloadTexture(id) { return r.BindrlUnloadTexture( id ) @@ -13022,7 +13797,7 @@ raylib.rlUnloadTexture = rlUnloadTexture * * @return {undefined} */ -function rlGenTextureMipmaps (id, width, height, format, mipmaps) { +function rlGenTextureMipmaps(id, width, height, format, mipmaps) { return r.BindrlGenTextureMipmaps( id, width, @@ -13043,7 +13818,7 @@ raylib.rlGenTextureMipmaps = rlGenTextureMipmaps * * @return {number} The resulting void *. */ -function rlReadTexturePixels (id, width, height, format) { +function rlReadTexturePixels(id, width, height, format) { return r.BindrlReadTexturePixels( id, width, @@ -13061,7 +13836,7 @@ raylib.rlReadTexturePixels = rlReadTexturePixels * * @return {Buffer} The resulting unsigned char *. */ -function rlReadScreenPixels (width, height) { +function rlReadScreenPixels(width, height) { return r.BindrlReadScreenPixels( width, height @@ -13077,7 +13852,7 @@ raylib.rlReadScreenPixels = rlReadScreenPixels * * @return {number} The resulting unsigned int. */ -function rlLoadFramebuffer (width, height) { +function rlLoadFramebuffer(width, height) { return r.BindrlLoadFramebuffer( width, height @@ -13096,7 +13871,7 @@ raylib.rlLoadFramebuffer = rlLoadFramebuffer * * @return {undefined} */ -function rlFramebufferAttach (fboId, texId, attachType, texType, mipLevel) { +function rlFramebufferAttach(fboId, texId, attachType, texType, mipLevel) { return r.BindrlFramebufferAttach( fboId, texId, @@ -13114,7 +13889,7 @@ raylib.rlFramebufferAttach = rlFramebufferAttach * * @return {boolean} The resulting bool. */ -function rlFramebufferComplete (id) { +function rlFramebufferComplete(id) { return r.BindrlFramebufferComplete( id ) @@ -13128,7 +13903,7 @@ raylib.rlFramebufferComplete = rlFramebufferComplete * * @return {undefined} */ -function rlUnloadFramebuffer (id) { +function rlUnloadFramebuffer(id) { return r.BindrlUnloadFramebuffer( id ) @@ -13143,7 +13918,7 @@ raylib.rlUnloadFramebuffer = rlUnloadFramebuffer * * @return {number} The resulting unsigned int. */ -function rlLoadShaderCode (vsCode, fsCode) { +function rlLoadShaderCode(vsCode, fsCode) { return r.BindrlLoadShaderCode( vsCode, fsCode @@ -13159,7 +13934,7 @@ raylib.rlLoadShaderCode = rlLoadShaderCode * * @return {number} The resulting unsigned int. */ -function rlCompileShader (shaderCode, type) { +function rlCompileShader(shaderCode, type) { return r.BindrlCompileShader( shaderCode, type @@ -13175,7 +13950,7 @@ raylib.rlCompileShader = rlCompileShader * * @return {number} The resulting unsigned int. */ -function rlLoadShaderProgram (vShaderId, fShaderId) { +function rlLoadShaderProgram(vShaderId, fShaderId) { return r.BindrlLoadShaderProgram( vShaderId, fShaderId @@ -13190,7 +13965,7 @@ raylib.rlLoadShaderProgram = rlLoadShaderProgram * * @return {undefined} */ -function rlUnloadShaderProgram (id) { +function rlUnloadShaderProgram(id) { return r.BindrlUnloadShaderProgram( id ) @@ -13205,7 +13980,7 @@ raylib.rlUnloadShaderProgram = rlUnloadShaderProgram * * @return {number} The resulting int. */ -function rlGetLocationUniform (shaderId, uniformName) { +function rlGetLocationUniform(shaderId, uniformName) { return r.BindrlGetLocationUniform( shaderId, uniformName @@ -13221,7 +13996,7 @@ raylib.rlGetLocationUniform = rlGetLocationUniform * * @return {number} The resulting int. */ -function rlGetLocationAttrib (shaderId, attribName) { +function rlGetLocationAttrib(shaderId, attribName) { return r.BindrlGetLocationAttrib( shaderId, attribName @@ -13239,7 +14014,7 @@ raylib.rlGetLocationAttrib = rlGetLocationAttrib * * @return {undefined} */ -function rlSetUniform (locIndex, value, uniformType, count) { +function rlSetUniform(locIndex, value, uniformType, count) { return r.BindrlSetUniform( locIndex, value, @@ -13257,7 +14032,7 @@ raylib.rlSetUniform = rlSetUniform * * @return {undefined} */ -function rlSetUniformMatrix (locIndex, mat) { +function rlSetUniformMatrix(locIndex, mat) { return r.BindrlSetUniformMatrix( locIndex, mat.m0, @@ -13288,7 +14063,7 @@ raylib.rlSetUniformMatrix = rlSetUniformMatrix * * @return {undefined} */ -function rlSetUniformSampler (locIndex, textureId) { +function rlSetUniformSampler(locIndex, textureId) { return r.BindrlSetUniformSampler( locIndex, textureId @@ -13304,7 +14079,7 @@ raylib.rlSetUniformSampler = rlSetUniformSampler * * @return {undefined} */ -function rlSetShader (id, locs) { +function rlSetShader(id, locs) { return r.BindrlSetShader( id, locs @@ -13319,7 +14094,7 @@ raylib.rlSetShader = rlSetShader * * @return {number} The resulting unsigned int. */ -function rlLoadComputeShaderProgram (shaderId) { +function rlLoadComputeShaderProgram(shaderId) { return r.BindrlLoadComputeShaderProgram( shaderId ) @@ -13335,7 +14110,7 @@ raylib.rlLoadComputeShaderProgram = rlLoadComputeShaderProgram * * @return {undefined} */ -function rlComputeShaderDispatch (groupX, groupY, groupZ) { +function rlComputeShaderDispatch(groupX, groupY, groupZ) { return r.BindrlComputeShaderDispatch( groupX, groupY, @@ -13353,7 +14128,7 @@ raylib.rlComputeShaderDispatch = rlComputeShaderDispatch * * @return {number} The resulting unsigned int. */ -function rlLoadShaderBuffer (size, data, usageHint) { +function rlLoadShaderBuffer(size, data, usageHint) { return r.BindrlLoadShaderBuffer( size, data, @@ -13369,7 +14144,7 @@ raylib.rlLoadShaderBuffer = rlLoadShaderBuffer * * @return {undefined} */ -function rlUnloadShaderBuffer (ssboId) { +function rlUnloadShaderBuffer(ssboId) { return r.BindrlUnloadShaderBuffer( ssboId ) @@ -13386,7 +14161,7 @@ raylib.rlUnloadShaderBuffer = rlUnloadShaderBuffer * * @return {undefined} */ -function rlUpdateShaderBuffer (id, data, dataSize, offset) { +function rlUpdateShaderBuffer(id, data, dataSize, offset) { return r.BindrlUpdateShaderBuffer( id, data, @@ -13404,7 +14179,7 @@ raylib.rlUpdateShaderBuffer = rlUpdateShaderBuffer * * @return {undefined} */ -function rlBindShaderBuffer (id, index) { +function rlBindShaderBuffer(id, index) { return r.BindrlBindShaderBuffer( id, index @@ -13422,7 +14197,7 @@ raylib.rlBindShaderBuffer = rlBindShaderBuffer * * @return {undefined} */ -function rlReadShaderBuffer (id, dest, count, offset) { +function rlReadShaderBuffer(id, dest, count, offset) { return r.BindrlReadShaderBuffer( id, dest, @@ -13443,7 +14218,7 @@ raylib.rlReadShaderBuffer = rlReadShaderBuffer * * @return {undefined} */ -function rlCopyShaderBuffer (destId, srcId, destOffset, srcOffset, count) { +function rlCopyShaderBuffer(destId, srcId, destOffset, srcOffset, count) { return r.BindrlCopyShaderBuffer( destId, srcId, @@ -13461,7 +14236,7 @@ raylib.rlCopyShaderBuffer = rlCopyShaderBuffer * * @return {number} The resulting unsigned int. */ -function rlGetShaderBufferSize (id) { +function rlGetShaderBufferSize(id) { return r.BindrlGetShaderBufferSize( id ) @@ -13478,7 +14253,7 @@ raylib.rlGetShaderBufferSize = rlGetShaderBufferSize * * @return {undefined} */ -function rlBindImageTexture (id, index, format, readonly) { +function rlBindImageTexture(id, index, format, readonly) { return r.BindrlBindImageTexture( id, index, @@ -13493,7 +14268,7 @@ raylib.rlBindImageTexture = rlBindImageTexture * * @return {Matrix} The resulting Matrix. */ -function rlGetMatrixModelview () { +function rlGetMatrixModelview() { return r.BindrlGetMatrixModelview() } raylib.rlGetMatrixModelview = rlGetMatrixModelview @@ -13503,7 +14278,7 @@ raylib.rlGetMatrixModelview = rlGetMatrixModelview * * @return {Matrix} The resulting Matrix. */ -function rlGetMatrixProjection () { +function rlGetMatrixProjection() { return r.BindrlGetMatrixProjection() } raylib.rlGetMatrixProjection = rlGetMatrixProjection @@ -13513,7 +14288,7 @@ raylib.rlGetMatrixProjection = rlGetMatrixProjection * * @return {Matrix} The resulting Matrix. */ -function rlGetMatrixTransform () { +function rlGetMatrixTransform() { return r.BindrlGetMatrixTransform() } raylib.rlGetMatrixTransform = rlGetMatrixTransform @@ -13525,7 +14300,7 @@ raylib.rlGetMatrixTransform = rlGetMatrixTransform * * @return {Matrix} The resulting Matrix. */ -function rlGetMatrixProjectionStereo (eye) { +function rlGetMatrixProjectionStereo(eye) { return r.BindrlGetMatrixProjectionStereo( eye ) @@ -13539,7 +14314,7 @@ raylib.rlGetMatrixProjectionStereo = rlGetMatrixProjectionStereo * * @return {Matrix} The resulting Matrix. */ -function rlGetMatrixViewOffsetStereo (eye) { +function rlGetMatrixViewOffsetStereo(eye) { return r.BindrlGetMatrixViewOffsetStereo( eye ) @@ -13553,7 +14328,7 @@ raylib.rlGetMatrixViewOffsetStereo = rlGetMatrixViewOffsetStereo * * @return {undefined} */ -function rlSetMatrixProjection (proj) { +function rlSetMatrixProjection(proj) { return r.BindrlSetMatrixProjection( proj.m0, proj.m4, @@ -13582,7 +14357,7 @@ raylib.rlSetMatrixProjection = rlSetMatrixProjection * * @return {undefined} */ -function rlSetMatrixModelview (view) { +function rlSetMatrixModelview(view) { return r.BindrlSetMatrixModelview( view.m0, view.m4, @@ -13612,7 +14387,7 @@ raylib.rlSetMatrixModelview = rlSetMatrixModelview * * @return {undefined} */ -function rlSetMatrixProjectionStereo (right, left) { +function rlSetMatrixProjectionStereo(right, left) { return r.BindrlSetMatrixProjectionStereo( right.m0, right.m4, @@ -13658,7 +14433,7 @@ raylib.rlSetMatrixProjectionStereo = rlSetMatrixProjectionStereo * * @return {undefined} */ -function rlSetMatrixViewOffsetStereo (right, left) { +function rlSetMatrixViewOffsetStereo(right, left) { return r.BindrlSetMatrixViewOffsetStereo( right.m0, right.m4, @@ -13701,7 +14476,7 @@ raylib.rlSetMatrixViewOffsetStereo = rlSetMatrixViewOffsetStereo * * @return {undefined} */ -function rlLoadDrawCube () { +function rlLoadDrawCube() { return r.BindrlLoadDrawCube() } raylib.rlLoadDrawCube = rlLoadDrawCube @@ -13711,7 +14486,7 @@ raylib.rlLoadDrawCube = rlLoadDrawCube * * @return {undefined} */ -function rlLoadDrawQuad () { +function rlLoadDrawQuad() { return r.BindrlLoadDrawQuad() } raylib.rlLoadDrawQuad = rlLoadDrawQuad @@ -13724,7 +14499,7 @@ raylib.rlLoadDrawQuad = rlLoadDrawQuad * * @return {undefined} */ -function UpdateCamera (camera, mode) { +function UpdateCamera(camera, mode) { const obj = r.BindUpdateCamera( camera.position.x, camera.position.y, @@ -13755,7 +14530,7 @@ raylib.UpdateCamera = UpdateCamera * * @return {undefined} */ -function ImageFormat (image, newFormat) { +function ImageFormat(image, newFormat) { const obj = r.BindImageFormat( image.data, image.width, @@ -13780,7 +14555,7 @@ raylib.ImageFormat = ImageFormat * * @return {undefined} */ -function ImageToPOT (image, fill) { +function ImageToPOT(image, fill) { const obj = r.BindImageToPOT( image.data, image.width, @@ -13808,7 +14583,7 @@ raylib.ImageToPOT = ImageToPOT * * @return {undefined} */ -function ImageCrop (image, crop) { +function ImageCrop(image, crop) { const obj = r.BindImageCrop( image.data, image.width, @@ -13836,7 +14611,7 @@ raylib.ImageCrop = ImageCrop * * @return {undefined} */ -function ImageAlphaCrop (image, threshold) { +function ImageAlphaCrop(image, threshold) { const obj = r.BindImageAlphaCrop( image.data, image.width, @@ -13862,7 +14637,7 @@ raylib.ImageAlphaCrop = ImageAlphaCrop * * @return {undefined} */ -function ImageAlphaClear (image, color, threshold) { +function ImageAlphaClear(image, color, threshold) { const obj = r.BindImageAlphaClear( image.data, image.width, @@ -13891,7 +14666,7 @@ raylib.ImageAlphaClear = ImageAlphaClear * * @return {undefined} */ -function ImageAlphaMask (image, alphaMask) { +function ImageAlphaMask(image, alphaMask) { const obj = r.BindImageAlphaMask( image.data, image.width, @@ -13919,7 +14694,7 @@ raylib.ImageAlphaMask = ImageAlphaMask * * @return {undefined} */ -function ImageAlphaPremultiply (image) { +function ImageAlphaPremultiply(image) { const obj = r.BindImageAlphaPremultiply( image.data, image.width, @@ -13944,7 +14719,7 @@ raylib.ImageAlphaPremultiply = ImageAlphaPremultiply * * @return {undefined} */ -function ImageResize (image, newWidth, newHeight) { +function ImageResize(image, newWidth, newHeight) { const obj = r.BindImageResize( image.data, image.width, @@ -13971,7 +14746,7 @@ raylib.ImageResize = ImageResize * * @return {undefined} */ -function ImageResizeNN (image, newWidth, newHeight) { +function ImageResizeNN(image, newWidth, newHeight) { const obj = r.BindImageResizeNN( image.data, image.width, @@ -14001,7 +14776,7 @@ raylib.ImageResizeNN = ImageResizeNN * * @return {undefined} */ -function ImageResizeCanvas (image, newWidth, newHeight, offsetX, offsetY, fill) { +function ImageResizeCanvas(image, newWidth, newHeight, offsetX, offsetY, fill) { const obj = r.BindImageResizeCanvas( image.data, image.width, @@ -14032,7 +14807,7 @@ raylib.ImageResizeCanvas = ImageResizeCanvas * * @return {undefined} */ -function ImageMipmaps (image) { +function ImageMipmaps(image) { const obj = r.BindImageMipmaps( image.data, image.width, @@ -14059,7 +14834,7 @@ raylib.ImageMipmaps = ImageMipmaps * * @return {undefined} */ -function ImageDither (image, rBpp, gBpp, bBpp, aBpp) { +function ImageDither(image, rBpp, gBpp, bBpp, aBpp) { const obj = r.BindImageDither( image.data, image.width, @@ -14086,7 +14861,7 @@ raylib.ImageDither = ImageDither * * @return {undefined} */ -function ImageFlipVertical (image) { +function ImageFlipVertical(image) { const obj = r.BindImageFlipVertical( image.data, image.width, @@ -14109,7 +14884,7 @@ raylib.ImageFlipVertical = ImageFlipVertical * * @return {undefined} */ -function ImageFlipHorizontal (image) { +function ImageFlipHorizontal(image) { const obj = r.BindImageFlipHorizontal( image.data, image.width, @@ -14132,7 +14907,7 @@ raylib.ImageFlipHorizontal = ImageFlipHorizontal * * @return {undefined} */ -function ImageRotateCW (image) { +function ImageRotateCW(image) { const obj = r.BindImageRotateCW( image.data, image.width, @@ -14155,7 +14930,7 @@ raylib.ImageRotateCW = ImageRotateCW * * @return {undefined} */ -function ImageRotateCCW (image) { +function ImageRotateCCW(image) { const obj = r.BindImageRotateCCW( image.data, image.width, @@ -14179,7 +14954,7 @@ raylib.ImageRotateCCW = ImageRotateCCW * * @return {undefined} */ -function ImageColorTint (image, color) { +function ImageColorTint(image, color) { const obj = r.BindImageColorTint( image.data, image.width, @@ -14206,7 +14981,7 @@ raylib.ImageColorTint = ImageColorTint * * @return {undefined} */ -function ImageColorInvert (image) { +function ImageColorInvert(image) { const obj = r.BindImageColorInvert( image.data, image.width, @@ -14229,7 +15004,7 @@ raylib.ImageColorInvert = ImageColorInvert * * @return {undefined} */ -function ImageColorGrayscale (image) { +function ImageColorGrayscale(image) { const obj = r.BindImageColorGrayscale( image.data, image.width, @@ -14253,7 +15028,7 @@ raylib.ImageColorGrayscale = ImageColorGrayscale * * @return {undefined} */ -function ImageColorContrast (image, contrast) { +function ImageColorContrast(image, contrast) { const obj = r.BindImageColorContrast( image.data, image.width, @@ -14278,7 +15053,7 @@ raylib.ImageColorContrast = ImageColorContrast * * @return {undefined} */ -function ImageColorBrightness (image, brightness) { +function ImageColorBrightness(image, brightness) { const obj = r.BindImageColorBrightness( image.data, image.width, @@ -14304,7 +15079,7 @@ raylib.ImageColorBrightness = ImageColorBrightness * * @return {undefined} */ -function ImageColorReplace (image, color, replace) { +function ImageColorReplace(image, color, replace) { const obj = r.BindImageColorReplace( image.data, image.width, @@ -14336,7 +15111,7 @@ raylib.ImageColorReplace = ImageColorReplace * * @return {undefined} */ -function ImageClearBackground (dst, color) { +function ImageClearBackground(dst, color) { const obj = r.BindImageClearBackground( dst.data, dst.width, @@ -14366,7 +15141,7 @@ raylib.ImageClearBackground = ImageClearBackground * * @return {undefined} */ -function ImageDrawPixel (dst, posX, posY, color) { +function ImageDrawPixel(dst, posX, posY, color) { const obj = r.BindImageDrawPixel( dst.data, dst.width, @@ -14397,7 +15172,7 @@ raylib.ImageDrawPixel = ImageDrawPixel * * @return {undefined} */ -function ImageDrawPixelV (dst, position, color) { +function ImageDrawPixelV(dst, position, color) { const obj = r.BindImageDrawPixelV( dst.data, dst.width, @@ -14431,7 +15206,7 @@ raylib.ImageDrawPixelV = ImageDrawPixelV * * @return {undefined} */ -function ImageDrawLine (dst, startPosX, startPosY, endPosX, endPosY, color) { +function ImageDrawLine(dst, startPosX, startPosY, endPosX, endPosY, color) { const obj = r.BindImageDrawLine( dst.data, dst.width, @@ -14465,7 +15240,7 @@ raylib.ImageDrawLine = ImageDrawLine * * @return {undefined} */ -function ImageDrawLineV (dst, start, end, color) { +function ImageDrawLineV(dst, start, end, color) { const obj = r.BindImageDrawLineV( dst.data, dst.width, @@ -14500,7 +15275,7 @@ raylib.ImageDrawLineV = ImageDrawLineV * * @return {undefined} */ -function ImageDrawCircle (dst, centerX, centerY, radius, color) { +function ImageDrawCircle(dst, centerX, centerY, radius, color) { const obj = r.BindImageDrawCircle( dst.data, dst.width, @@ -14533,7 +15308,7 @@ raylib.ImageDrawCircle = ImageDrawCircle * * @return {undefined} */ -function ImageDrawCircleV (dst, center, radius, color) { +function ImageDrawCircleV(dst, center, radius, color) { const obj = r.BindImageDrawCircleV( dst.data, dst.width, @@ -14568,7 +15343,7 @@ raylib.ImageDrawCircleV = ImageDrawCircleV * * @return {undefined} */ -function ImageDrawRectangle (dst, posX, posY, width, height, color) { +function ImageDrawRectangle(dst, posX, posY, width, height, color) { const obj = r.BindImageDrawRectangle( dst.data, dst.width, @@ -14602,7 +15377,7 @@ raylib.ImageDrawRectangle = ImageDrawRectangle * * @return {undefined} */ -function ImageDrawRectangleV (dst, position, size, color) { +function ImageDrawRectangleV(dst, position, size, color) { const obj = r.BindImageDrawRectangleV( dst.data, dst.width, @@ -14635,7 +15410,7 @@ raylib.ImageDrawRectangleV = ImageDrawRectangleV * * @return {undefined} */ -function ImageDrawRectangleRec (dst, rec, color) { +function ImageDrawRectangleRec(dst, rec, color) { const obj = r.BindImageDrawRectangleRec( dst.data, dst.width, @@ -14669,7 +15444,7 @@ raylib.ImageDrawRectangleRec = ImageDrawRectangleRec * * @return {undefined} */ -function ImageDrawRectangleLines (dst, rec, thick, color) { +function ImageDrawRectangleLines(dst, rec, thick, color) { const obj = r.BindImageDrawRectangleLines( dst.data, dst.width, @@ -14705,7 +15480,7 @@ raylib.ImageDrawRectangleLines = ImageDrawRectangleLines * * @return {undefined} */ -function ImageDraw (dst, src, srcRec, dstRec, tint) { +function ImageDraw(dst, src, srcRec, dstRec, tint) { const obj = r.BindImageDraw( dst.data, dst.width, @@ -14750,7 +15525,7 @@ raylib.ImageDraw = ImageDraw * * @return {undefined} */ -function ImageDrawText (dst, text, posX, posY, fontSize, color) { +function ImageDrawText(dst, text, posX, posY, fontSize, color) { const obj = r.BindImageDrawText( dst.data, dst.width, @@ -14787,7 +15562,7 @@ raylib.ImageDrawText = ImageDrawText * * @return {undefined} */ -function ImageDrawTextEx (dst, font, text, position, fontSize, spacing, tint) { +function ImageDrawTextEx(dst, font, text, position, fontSize, spacing, tint) { const obj = r.BindImageDrawTextEx( dst.data, dst.width, @@ -14829,7 +15604,7 @@ raylib.ImageDrawTextEx = ImageDrawTextEx * * @return {undefined} */ -function GenTextureMipmaps (texture) { +function GenTextureMipmaps(texture) { const obj = r.BindGenTextureMipmaps( texture.id, texture.width, @@ -14853,7 +15628,7 @@ raylib.GenTextureMipmaps = GenTextureMipmaps * * @return {undefined} */ -function UploadMesh (mesh, dynamic) { +function UploadMesh(mesh, dynamic) { const obj = r.BindUploadMesh( mesh.vertexCount, mesh.triangleCount, @@ -14887,7 +15662,7 @@ raylib.UploadMesh = UploadMesh * * @return {undefined} */ -function GenMeshTangents (mesh) { +function GenMeshTangents(mesh) { const obj = r.BindGenMeshTangents( mesh.vertexCount, mesh.triangleCount, @@ -14922,7 +15697,7 @@ raylib.GenMeshTangents = GenMeshTangents * * @return {undefined} */ -function SetModelMeshMaterial (model, meshId, materialId) { +function SetModelMeshMaterial(model, meshId, materialId) { const obj = r.BindSetModelMeshMaterial( model.transform.m0, model.transform.m4, @@ -14968,7 +15743,7 @@ raylib.SetModelMeshMaterial = SetModelMeshMaterial * * @return {undefined} */ -function WaveCrop (wave, initSample, finalSample) { +function WaveCrop(wave, initSample, finalSample) { const obj = r.BindWaveCrop( wave.frameCount, wave.sampleRate, @@ -14996,7 +15771,7 @@ raylib.WaveCrop = WaveCrop * * @return {undefined} */ -function WaveFormat (wave, sampleRate, sampleSize, channels) { +function WaveFormat(wave, sampleRate, sampleSize, channels) { const obj = r.BindWaveFormat( wave.frameCount, wave.sampleRate, @@ -15025,8 +15800,8 @@ raylib.WaveFormat = WaveFormat * * @return {Color} The new Color. */ -function Color (r, g, b, a) { - return { r, g, b, a } +function Color(r,g,b,a) { + return {r,g,b,a} } raylib.Color = Color @@ -15038,8 +15813,8 @@ raylib.Color = Color * * @return {Vector2} The new Vector2. */ -function Vector2 (x, y) { - return { x, y } +function Vector2(x,y) { + return {x,y} } raylib.Vector2 = Vector2 @@ -15052,8 +15827,8 @@ raylib.Vector2 = Vector2 * * @return {Vector3} The new Vector3. */ -function Vector3 (x, y, z) { - return { x, y, z } +function Vector3(x,y,z) { + return {x,y,z} } raylib.Vector3 = Vector3 @@ -15067,8 +15842,8 @@ raylib.Vector3 = Vector3 * * @return {Vector4} The new Vector4. */ -function Vector4 (x, y, z, w) { - return { x, y, z, w } +function Vector4(x,y,z,w) { + return {x,y,z,w} } raylib.Vector4 = Vector4 @@ -15082,8 +15857,8 @@ raylib.Vector4 = Vector4 * * @return {Rectangle} The new Rectangle. */ -function Rectangle (x, y, width, height) { - return { x, y, width, height } +function Rectangle(x,y,width,height) { + return {x,y,width,height} } raylib.Rectangle = Rectangle @@ -15097,8 +15872,8 @@ raylib.Rectangle = Rectangle * * @return {Camera2D} The new Camera2D. */ -function Camera2D (offset, target, rotation, zoom) { - return { offset, target, rotation, zoom } +function Camera2D(offset,target,rotation,zoom) { + return {offset,target,rotation,zoom} } raylib.Camera2D = Camera2D @@ -15113,8 +15888,8 @@ raylib.Camera2D = Camera2D * * @return {Camera3D} The new Camera3D. */ -function Camera3D (position, target, up, fovy, projection) { - return { position, target, up, fovy, projection } +function Camera3D(position,target,up,fovy,projection) { + return {position,target,up,fovy,projection} } raylib.Camera3D = Camera3D raylib.Camera = raylib.Camera3D @@ -15123,14 +15898,14 @@ raylib.Camera = raylib.Camera3D /** * Set shader uniform value float - * + * * @param {Shader} shader * @param {number} locIndex * @param {number} value - * + * * @returns {undefined} */ -function SetShaderFloat (shader, locIndex, value) { +function SetShaderFloat(shader, locIndex, value) { return r.BindSetShaderFloat( shader.id, shader.locs, @@ -15142,14 +15917,14 @@ raylib.SetShaderFloat = SetShaderFloat /** * Set shader uniform value float - * + * * @param {Shader} shader * @param {number} locIndex * @param {number} value - * + * * @returns {undefined} */ -function SetShaderInt (shader, locIndex, value) { +function SetShaderInt(shader, locIndex, value) { return r.BindSetShaderInt( shader.id, shader.locs, @@ -15161,14 +15936,14 @@ raylib.SetShaderInt = SetShaderInt /** * Set shader uniform value vector2 - * + * * @param {Shader} shader * @param {number} locIndex * @param {Vector2} value - * + * * @returns {undefined} */ -function SetShaderVec2 (shader, locIndex, value) { +function SetShaderVec2(shader, locIndex, value) { return r.BindSetShaderVec2( shader.id, shader.locs, @@ -15181,14 +15956,14 @@ raylib.SetShaderVec2 = SetShaderVec2 /** * Set shader uniform value vector3 - * + * * @param {Shader} shader * @param {number} locIndex * @param {Vector3} value - * + * * @returns {undefined} */ -function SetShaderVec3 (shader, locIndex, value) { +function SetShaderVec3(shader, locIndex, value) { return r.BindSetShaderVec3( shader.id, shader.locs, @@ -15202,14 +15977,14 @@ raylib.SetShaderVec3 = SetShaderVec3 /** * Set shader uniform value vector4 - * + * * @param {Shader} shader * @param {number} locIndex * @param {Vector4} value - * + * * @returns {undefined} */ -function SetShaderVec4 (shader, locIndex, value) { +function SetShaderVec4(shader, locIndex, value) { return r.BindSetShaderVec4( shader.id, shader.locs, @@ -15326,6 +16101,14 @@ raylib.FLAG_WINDOW_HIGHDPI = 8192 */ raylib.FLAG_WINDOW_MOUSE_PASSTHROUGH = 16384 +/** + * Set to run program in borderless windowed mode + * + * @type {number} + * @constant + */ +raylib.FLAG_BORDERLESS_WINDOWED_MODE = 32768 + /** * Set to try enabling MSAA 4X * @@ -17102,13 +17885,37 @@ raylib.PIXELFORMAT_UNCOMPRESSED_R32G32B32 = 9 */ raylib.PIXELFORMAT_UNCOMPRESSED_R32G32B32A32 = 10 +/** + * 16 bpp (1 channel - half float) + * + * @type {number} + * @constant + */ +raylib.PIXELFORMAT_UNCOMPRESSED_R16 = 11 + +/** + * 16*3 bpp (3 channels - half float) + * + * @type {number} + * @constant + */ +raylib.PIXELFORMAT_UNCOMPRESSED_R16G16B16 = 12 + +/** + * 16*4 bpp (4 channels - half float) + * + * @type {number} + * @constant + */ +raylib.PIXELFORMAT_UNCOMPRESSED_R16G16B16A16 = 13 + /** * 4 bpp (no alpha) * * @type {number} * @constant */ -raylib.PIXELFORMAT_COMPRESSED_DXT1_RGB = 11 +raylib.PIXELFORMAT_COMPRESSED_DXT1_RGB = 14 /** * 4 bpp (1 bit alpha) @@ -17116,7 +17923,7 @@ raylib.PIXELFORMAT_COMPRESSED_DXT1_RGB = 11 * @type {number} * @constant */ -raylib.PIXELFORMAT_COMPRESSED_DXT1_RGBA = 12 +raylib.PIXELFORMAT_COMPRESSED_DXT1_RGBA = 15 /** * 8 bpp @@ -17124,7 +17931,7 @@ raylib.PIXELFORMAT_COMPRESSED_DXT1_RGBA = 12 * @type {number} * @constant */ -raylib.PIXELFORMAT_COMPRESSED_DXT3_RGBA = 13 +raylib.PIXELFORMAT_COMPRESSED_DXT3_RGBA = 16 /** * 8 bpp @@ -17132,7 +17939,7 @@ raylib.PIXELFORMAT_COMPRESSED_DXT3_RGBA = 13 * @type {number} * @constant */ -raylib.PIXELFORMAT_COMPRESSED_DXT5_RGBA = 14 +raylib.PIXELFORMAT_COMPRESSED_DXT5_RGBA = 17 /** * 4 bpp @@ -17140,7 +17947,7 @@ raylib.PIXELFORMAT_COMPRESSED_DXT5_RGBA = 14 * @type {number} * @constant */ -raylib.PIXELFORMAT_COMPRESSED_ETC1_RGB = 15 +raylib.PIXELFORMAT_COMPRESSED_ETC1_RGB = 18 /** * 4 bpp @@ -17148,7 +17955,7 @@ raylib.PIXELFORMAT_COMPRESSED_ETC1_RGB = 15 * @type {number} * @constant */ -raylib.PIXELFORMAT_COMPRESSED_ETC2_RGB = 16 +raylib.PIXELFORMAT_COMPRESSED_ETC2_RGB = 19 /** * 8 bpp @@ -17156,7 +17963,7 @@ raylib.PIXELFORMAT_COMPRESSED_ETC2_RGB = 16 * @type {number} * @constant */ -raylib.PIXELFORMAT_COMPRESSED_ETC2_EAC_RGBA = 17 +raylib.PIXELFORMAT_COMPRESSED_ETC2_EAC_RGBA = 20 /** * 4 bpp @@ -17164,7 +17971,7 @@ raylib.PIXELFORMAT_COMPRESSED_ETC2_EAC_RGBA = 17 * @type {number} * @constant */ -raylib.PIXELFORMAT_COMPRESSED_PVRT_RGB = 18 +raylib.PIXELFORMAT_COMPRESSED_PVRT_RGB = 21 /** * 4 bpp @@ -17172,7 +17979,7 @@ raylib.PIXELFORMAT_COMPRESSED_PVRT_RGB = 18 * @type {number} * @constant */ -raylib.PIXELFORMAT_COMPRESSED_PVRT_RGBA = 19 +raylib.PIXELFORMAT_COMPRESSED_PVRT_RGBA = 22 /** * 8 bpp @@ -17180,7 +17987,7 @@ raylib.PIXELFORMAT_COMPRESSED_PVRT_RGBA = 19 * @type {number} * @constant */ -raylib.PIXELFORMAT_COMPRESSED_ASTC_4x4_RGBA = 20 +raylib.PIXELFORMAT_COMPRESSED_ASTC_4x4_RGBA = 23 /** * 2 bpp @@ -17188,7 +17995,7 @@ raylib.PIXELFORMAT_COMPRESSED_ASTC_4x4_RGBA = 20 * @type {number} * @constant */ -raylib.PIXELFORMAT_COMPRESSED_ASTC_8x8_RGBA = 21 +raylib.PIXELFORMAT_COMPRESSED_ASTC_8x8_RGBA = 24 /** * No filter, just pixel approximation @@ -17575,7 +18382,7 @@ raylib.NPATCH_THREE_PATCH_VERTICAL = 1 raylib.NPATCH_THREE_PATCH_HORIZONTAL = 2 /** - * + * * * @type {number} * @constant @@ -17583,7 +18390,7 @@ raylib.NPATCH_THREE_PATCH_HORIZONTAL = 2 raylib.STATE_NORMAL = 0 /** - * + * * * @type {number} * @constant @@ -17591,7 +18398,7 @@ raylib.STATE_NORMAL = 0 raylib.STATE_FOCUSED = 1 /** - * + * * * @type {number} * @constant @@ -17599,7 +18406,7 @@ raylib.STATE_FOCUSED = 1 raylib.STATE_PRESSED = 2 /** - * + * * * @type {number} * @constant @@ -17607,7 +18414,7 @@ raylib.STATE_PRESSED = 2 raylib.STATE_DISABLED = 3 /** - * + * * * @type {number} * @constant @@ -17615,7 +18422,7 @@ raylib.STATE_DISABLED = 3 raylib.TEXT_ALIGN_LEFT = 0 /** - * + * * * @type {number} * @constant @@ -17623,7 +18430,7 @@ raylib.TEXT_ALIGN_LEFT = 0 raylib.TEXT_ALIGN_CENTER = 1 /** - * + * * * @type {number} * @constant @@ -17631,7 +18438,55 @@ raylib.TEXT_ALIGN_CENTER = 1 raylib.TEXT_ALIGN_RIGHT = 2 /** + * + * + * @type {number} + * @constant + */ +raylib.TEXT_ALIGN_TOP = 0 + +/** + * + * + * @type {number} + * @constant + */ +raylib.TEXT_ALIGN_MIDDLE = 1 + +/** + * + * + * @type {number} + * @constant + */ +raylib.TEXT_ALIGN_BOTTOM = 2 + +/** + * + * + * @type {number} + * @constant + */ +raylib.TEXT_WRAP_NONE = 0 + +/** + * + * + * @type {number} + * @constant + */ +raylib.TEXT_WRAP_CHAR = 1 + +/** + * * + * @type {number} + * @constant + */ +raylib.TEXT_WRAP_WORD = 2 + +/** + * * * @type {number} * @constant @@ -17647,7 +18502,7 @@ raylib.DEFAULT = 0 raylib.LABEL = 1 /** - * + * * * @type {number} * @constant @@ -17663,7 +18518,7 @@ raylib.BUTTON = 2 raylib.TOGGLE = 3 /** - * Used also for: SLIDERBAR + * Used also for: SLIDERBAR, TOGGLESLIDER * * @type {number} * @constant @@ -17671,7 +18526,7 @@ raylib.TOGGLE = 3 raylib.SLIDER = 4 /** - * + * * * @type {number} * @constant @@ -17679,7 +18534,7 @@ raylib.SLIDER = 4 raylib.PROGRESSBAR = 5 /** - * + * * * @type {number} * @constant @@ -17687,7 +18542,7 @@ raylib.PROGRESSBAR = 5 raylib.CHECKBOX = 6 /** - * + * * * @type {number} * @constant @@ -17695,7 +18550,7 @@ raylib.CHECKBOX = 6 raylib.COMBOBOX = 7 /** - * + * * * @type {number} * @constant @@ -17711,7 +18566,7 @@ raylib.DROPDOWNBOX = 8 raylib.TEXTBOX = 9 /** - * + * * * @type {number} * @constant @@ -17727,7 +18582,7 @@ raylib.VALUEBOX = 10 raylib.SPINNER = 11 /** - * + * * * @type {number} * @constant @@ -17735,7 +18590,7 @@ raylib.SPINNER = 11 raylib.LISTVIEW = 12 /** - * + * * * @type {number} * @constant @@ -17743,7 +18598,7 @@ raylib.LISTVIEW = 12 raylib.COLORPICKER = 13 /** - * + * * * @type {number} * @constant @@ -17751,7 +18606,7 @@ raylib.COLORPICKER = 13 raylib.SCROLLBAR = 14 /** - * + * * * @type {number} * @constant @@ -17759,7 +18614,7 @@ raylib.SCROLLBAR = 14 raylib.STATUSBAR = 15 /** - * + * Control border color in STATE_NORMAL * * @type {number} * @constant @@ -17767,7 +18622,7 @@ raylib.STATUSBAR = 15 raylib.BORDER_COLOR_NORMAL = 0 /** - * + * Control base color in STATE_NORMAL * * @type {number} * @constant @@ -17775,7 +18630,7 @@ raylib.BORDER_COLOR_NORMAL = 0 raylib.BASE_COLOR_NORMAL = 1 /** - * + * Control text color in STATE_NORMAL * * @type {number} * @constant @@ -17783,7 +18638,7 @@ raylib.BASE_COLOR_NORMAL = 1 raylib.TEXT_COLOR_NORMAL = 2 /** - * + * Control border color in STATE_FOCUSED * * @type {number} * @constant @@ -17791,7 +18646,7 @@ raylib.TEXT_COLOR_NORMAL = 2 raylib.BORDER_COLOR_FOCUSED = 3 /** - * + * Control base color in STATE_FOCUSED * * @type {number} * @constant @@ -17799,7 +18654,7 @@ raylib.BORDER_COLOR_FOCUSED = 3 raylib.BASE_COLOR_FOCUSED = 4 /** - * + * Control text color in STATE_FOCUSED * * @type {number} * @constant @@ -17807,7 +18662,7 @@ raylib.BASE_COLOR_FOCUSED = 4 raylib.TEXT_COLOR_FOCUSED = 5 /** - * + * Control border color in STATE_PRESSED * * @type {number} * @constant @@ -17815,7 +18670,7 @@ raylib.TEXT_COLOR_FOCUSED = 5 raylib.BORDER_COLOR_PRESSED = 6 /** - * + * Control base color in STATE_PRESSED * * @type {number} * @constant @@ -17823,7 +18678,7 @@ raylib.BORDER_COLOR_PRESSED = 6 raylib.BASE_COLOR_PRESSED = 7 /** - * + * Control text color in STATE_PRESSED * * @type {number} * @constant @@ -17831,7 +18686,7 @@ raylib.BASE_COLOR_PRESSED = 7 raylib.TEXT_COLOR_PRESSED = 8 /** - * + * Control border color in STATE_DISABLED * * @type {number} * @constant @@ -17839,7 +18694,7 @@ raylib.TEXT_COLOR_PRESSED = 8 raylib.BORDER_COLOR_DISABLED = 9 /** - * + * Control base color in STATE_DISABLED * * @type {number} * @constant @@ -17847,7 +18702,7 @@ raylib.BORDER_COLOR_DISABLED = 9 raylib.BASE_COLOR_DISABLED = 10 /** - * + * Control text color in STATE_DISABLED * * @type {number} * @constant @@ -17855,7 +18710,7 @@ raylib.BASE_COLOR_DISABLED = 10 raylib.TEXT_COLOR_DISABLED = 11 /** - * + * Control border size, 0 for no border * * @type {number} * @constant @@ -17863,7 +18718,7 @@ raylib.TEXT_COLOR_DISABLED = 11 raylib.BORDER_WIDTH = 12 /** - * + * Control text padding, not considering border * * @type {number} * @constant @@ -17871,21 +18726,13 @@ raylib.BORDER_WIDTH = 12 raylib.TEXT_PADDING = 13 /** - * + * Control text horizontal alignment inside control text bound (after border and padding) * * @type {number} * @constant */ raylib.TEXT_ALIGNMENT = 14 -/** - * - * - * @type {number} - * @constant - */ -raylib.RESERVED = 15 - /** * Text size (glyphs max height) * @@ -17918,6 +18765,30 @@ raylib.LINE_COLOR = 18 */ raylib.BACKGROUND_COLOR = 19 +/** + * Text spacing between lines + * + * @type {number} + * @constant + */ +raylib.TEXT_LINE_SPACING = 20 + +/** + * Text vertical alignment inside text bounds (after border and padding) + * + * @type {number} + * @constant + */ +raylib.TEXT_ALIGNMENT_VERTICAL = 21 + +/** + * Text wrap-mode inside text bounds + * + * @type {number} + * @constant + */ +raylib.TEXT_WRAP_MODE = 22 + /** * ToggleGroup separation between toggles * @@ -17951,7 +18822,7 @@ raylib.SLIDER_PADDING = 17 raylib.PROGRESS_PADDING = 16 /** - * + * ScrollBar arrows size * * @type {number} * @constant @@ -17959,7 +18830,7 @@ raylib.PROGRESS_PADDING = 16 raylib.ARROWS_SIZE = 16 /** - * + * ScrollBar arrows visible * * @type {number} * @constant @@ -17967,7 +18838,7 @@ raylib.ARROWS_SIZE = 16 raylib.ARROWS_VISIBLE = 17 /** - * (SLIDERBAR, SLIDER_PADDING) + * ScrollBar slider internal padding * * @type {number} * @constant @@ -17975,7 +18846,7 @@ raylib.ARROWS_VISIBLE = 17 raylib.SCROLL_SLIDER_PADDING = 18 /** - * + * ScrollBar slider size * * @type {number} * @constant @@ -17983,7 +18854,7 @@ raylib.SCROLL_SLIDER_PADDING = 18 raylib.SCROLL_SLIDER_SIZE = 19 /** - * + * ScrollBar scroll padding from arrows * * @type {number} * @constant @@ -17991,7 +18862,7 @@ raylib.SCROLL_SLIDER_SIZE = 19 raylib.SCROLL_PADDING = 20 /** - * + * ScrollBar scrolling speed * * @type {number} * @constant @@ -18039,20 +18910,12 @@ raylib.ARROW_PADDING = 16 raylib.DROPDOWN_ITEMS_SPACING = 17 /** - * TextBox/TextBoxMulti/ValueBox/Spinner inner text padding - * - * @type {number} - * @constant - */ -raylib.TEXT_INNER_PADDING = 16 - -/** - * TextBoxMulti lines separation + * TextBox in read-only mode: 0-text editable, 1-text no-editable * * @type {number} * @constant */ -raylib.TEXT_LINES_SPACING = 17 +raylib.TEXT_READONLY = 16 /** * Spinner left/right buttons width @@ -18095,7 +18958,7 @@ raylib.LIST_ITEMS_SPACING = 17 raylib.SCROLLBAR_WIDTH = 18 /** - * ListView scrollbar side (0-left, 1-right) + * ListView scrollbar side (0-SCROLLBAR_LEFT_SIDE, 1-SCROLLBAR_RIGHT_SIDE) * * @type {number} * @constant @@ -18103,7 +18966,7 @@ raylib.SCROLLBAR_WIDTH = 18 raylib.SCROLLBAR_SIDE = 19 /** - * + * * * @type {number} * @constant @@ -18143,7 +19006,7 @@ raylib.HUEBAR_SELECTOR_HEIGHT = 19 raylib.HUEBAR_SELECTOR_OVERFLOW = 20 /** - * + * * * @type {number} * @constant @@ -18151,7 +19014,7 @@ raylib.HUEBAR_SELECTOR_OVERFLOW = 20 raylib.ICON_NONE = 0 /** - * + * * * @type {number} * @constant @@ -18159,7 +19022,7 @@ raylib.ICON_NONE = 0 raylib.ICON_FOLDER_FILE_OPEN = 1 /** - * + * * * @type {number} * @constant @@ -18167,7 +19030,7 @@ raylib.ICON_FOLDER_FILE_OPEN = 1 raylib.ICON_FILE_SAVE_CLASSIC = 2 /** - * + * * * @type {number} * @constant @@ -18175,7 +19038,7 @@ raylib.ICON_FILE_SAVE_CLASSIC = 2 raylib.ICON_FOLDER_OPEN = 3 /** - * + * * * @type {number} * @constant @@ -18183,7 +19046,7 @@ raylib.ICON_FOLDER_OPEN = 3 raylib.ICON_FOLDER_SAVE = 4 /** - * + * * * @type {number} * @constant @@ -18191,7 +19054,7 @@ raylib.ICON_FOLDER_SAVE = 4 raylib.ICON_FILE_OPEN = 5 /** - * + * * * @type {number} * @constant @@ -18199,7 +19062,7 @@ raylib.ICON_FILE_OPEN = 5 raylib.ICON_FILE_SAVE = 6 /** - * + * * * @type {number} * @constant @@ -18207,7 +19070,7 @@ raylib.ICON_FILE_SAVE = 6 raylib.ICON_FILE_EXPORT = 7 /** - * + * * * @type {number} * @constant @@ -18215,7 +19078,7 @@ raylib.ICON_FILE_EXPORT = 7 raylib.ICON_FILE_ADD = 8 /** - * + * * * @type {number} * @constant @@ -18223,7 +19086,7 @@ raylib.ICON_FILE_ADD = 8 raylib.ICON_FILE_DELETE = 9 /** - * + * * * @type {number} * @constant @@ -18231,7 +19094,7 @@ raylib.ICON_FILE_DELETE = 9 raylib.ICON_FILETYPE_TEXT = 10 /** - * + * * * @type {number} * @constant @@ -18239,7 +19102,7 @@ raylib.ICON_FILETYPE_TEXT = 10 raylib.ICON_FILETYPE_AUDIO = 11 /** - * + * * * @type {number} * @constant @@ -18247,7 +19110,7 @@ raylib.ICON_FILETYPE_AUDIO = 11 raylib.ICON_FILETYPE_IMAGE = 12 /** - * + * * * @type {number} * @constant @@ -18255,7 +19118,7 @@ raylib.ICON_FILETYPE_IMAGE = 12 raylib.ICON_FILETYPE_PLAY = 13 /** - * + * * * @type {number} * @constant @@ -18263,7 +19126,7 @@ raylib.ICON_FILETYPE_PLAY = 13 raylib.ICON_FILETYPE_VIDEO = 14 /** - * + * * * @type {number} * @constant @@ -18271,7 +19134,7 @@ raylib.ICON_FILETYPE_VIDEO = 14 raylib.ICON_FILETYPE_INFO = 15 /** - * + * * * @type {number} * @constant @@ -18279,7 +19142,7 @@ raylib.ICON_FILETYPE_INFO = 15 raylib.ICON_FILE_COPY = 16 /** - * + * * * @type {number} * @constant @@ -18287,7 +19150,7 @@ raylib.ICON_FILE_COPY = 16 raylib.ICON_FILE_CUT = 17 /** - * + * * * @type {number} * @constant @@ -18295,7 +19158,7 @@ raylib.ICON_FILE_CUT = 17 raylib.ICON_FILE_PASTE = 18 /** - * + * * * @type {number} * @constant @@ -18303,7 +19166,7 @@ raylib.ICON_FILE_PASTE = 18 raylib.ICON_CURSOR_HAND = 19 /** - * + * * * @type {number} * @constant @@ -18311,7 +19174,7 @@ raylib.ICON_CURSOR_HAND = 19 raylib.ICON_CURSOR_POINTER = 20 /** - * + * * * @type {number} * @constant @@ -18319,7 +19182,7 @@ raylib.ICON_CURSOR_POINTER = 20 raylib.ICON_CURSOR_CLASSIC = 21 /** - * + * * * @type {number} * @constant @@ -18327,7 +19190,7 @@ raylib.ICON_CURSOR_CLASSIC = 21 raylib.ICON_PENCIL = 22 /** - * + * * * @type {number} * @constant @@ -18335,7 +19198,7 @@ raylib.ICON_PENCIL = 22 raylib.ICON_PENCIL_BIG = 23 /** - * + * * * @type {number} * @constant @@ -18343,7 +19206,7 @@ raylib.ICON_PENCIL_BIG = 23 raylib.ICON_BRUSH_CLASSIC = 24 /** - * + * * * @type {number} * @constant @@ -18351,7 +19214,7 @@ raylib.ICON_BRUSH_CLASSIC = 24 raylib.ICON_BRUSH_PAINTER = 25 /** - * + * * * @type {number} * @constant @@ -18359,7 +19222,7 @@ raylib.ICON_BRUSH_PAINTER = 25 raylib.ICON_WATER_DROP = 26 /** - * + * * * @type {number} * @constant @@ -18367,7 +19230,7 @@ raylib.ICON_WATER_DROP = 26 raylib.ICON_COLOR_PICKER = 27 /** - * + * * * @type {number} * @constant @@ -18375,7 +19238,7 @@ raylib.ICON_COLOR_PICKER = 27 raylib.ICON_RUBBER = 28 /** - * + * * * @type {number} * @constant @@ -18383,7 +19246,7 @@ raylib.ICON_RUBBER = 28 raylib.ICON_COLOR_BUCKET = 29 /** - * + * * * @type {number} * @constant @@ -18391,7 +19254,7 @@ raylib.ICON_COLOR_BUCKET = 29 raylib.ICON_TEXT_T = 30 /** - * + * * * @type {number} * @constant @@ -18399,7 +19262,7 @@ raylib.ICON_TEXT_T = 30 raylib.ICON_TEXT_A = 31 /** - * + * * * @type {number} * @constant @@ -18407,7 +19270,7 @@ raylib.ICON_TEXT_A = 31 raylib.ICON_SCALE = 32 /** - * + * * * @type {number} * @constant @@ -18415,7 +19278,7 @@ raylib.ICON_SCALE = 32 raylib.ICON_RESIZE = 33 /** - * + * * * @type {number} * @constant @@ -18423,7 +19286,7 @@ raylib.ICON_RESIZE = 33 raylib.ICON_FILTER_POINT = 34 /** - * + * * * @type {number} * @constant @@ -18431,7 +19294,7 @@ raylib.ICON_FILTER_POINT = 34 raylib.ICON_FILTER_BILINEAR = 35 /** - * + * * * @type {number} * @constant @@ -18439,7 +19302,7 @@ raylib.ICON_FILTER_BILINEAR = 35 raylib.ICON_CROP = 36 /** - * + * * * @type {number} * @constant @@ -18447,7 +19310,7 @@ raylib.ICON_CROP = 36 raylib.ICON_CROP_ALPHA = 37 /** - * + * * * @type {number} * @constant @@ -18455,7 +19318,7 @@ raylib.ICON_CROP_ALPHA = 37 raylib.ICON_SQUARE_TOGGLE = 38 /** - * + * * * @type {number} * @constant @@ -18463,7 +19326,7 @@ raylib.ICON_SQUARE_TOGGLE = 38 raylib.ICON_SYMMETRY = 39 /** - * + * * * @type {number} * @constant @@ -18471,7 +19334,7 @@ raylib.ICON_SYMMETRY = 39 raylib.ICON_SYMMETRY_HORIZONTAL = 40 /** - * + * * * @type {number} * @constant @@ -18479,7 +19342,7 @@ raylib.ICON_SYMMETRY_HORIZONTAL = 40 raylib.ICON_SYMMETRY_VERTICAL = 41 /** - * + * * * @type {number} * @constant @@ -18487,7 +19350,7 @@ raylib.ICON_SYMMETRY_VERTICAL = 41 raylib.ICON_LENS = 42 /** - * + * * * @type {number} * @constant @@ -18495,7 +19358,7 @@ raylib.ICON_LENS = 42 raylib.ICON_LENS_BIG = 43 /** - * + * * * @type {number} * @constant @@ -18503,7 +19366,7 @@ raylib.ICON_LENS_BIG = 43 raylib.ICON_EYE_ON = 44 /** - * + * * * @type {number} * @constant @@ -18511,7 +19374,7 @@ raylib.ICON_EYE_ON = 44 raylib.ICON_EYE_OFF = 45 /** - * + * * * @type {number} * @constant @@ -18519,7 +19382,7 @@ raylib.ICON_EYE_OFF = 45 raylib.ICON_FILTER_TOP = 46 /** - * + * * * @type {number} * @constant @@ -18527,7 +19390,7 @@ raylib.ICON_FILTER_TOP = 46 raylib.ICON_FILTER = 47 /** - * + * * * @type {number} * @constant @@ -18535,7 +19398,7 @@ raylib.ICON_FILTER = 47 raylib.ICON_TARGET_POINT = 48 /** - * + * * * @type {number} * @constant @@ -18543,7 +19406,7 @@ raylib.ICON_TARGET_POINT = 48 raylib.ICON_TARGET_SMALL = 49 /** - * + * * * @type {number} * @constant @@ -18551,7 +19414,7 @@ raylib.ICON_TARGET_SMALL = 49 raylib.ICON_TARGET_BIG = 50 /** - * + * * * @type {number} * @constant @@ -18559,7 +19422,7 @@ raylib.ICON_TARGET_BIG = 50 raylib.ICON_TARGET_MOVE = 51 /** - * + * * * @type {number} * @constant @@ -18567,7 +19430,7 @@ raylib.ICON_TARGET_MOVE = 51 raylib.ICON_CURSOR_MOVE = 52 /** - * + * * * @type {number} * @constant @@ -18575,7 +19438,7 @@ raylib.ICON_CURSOR_MOVE = 52 raylib.ICON_CURSOR_SCALE = 53 /** - * + * * * @type {number} * @constant @@ -18583,7 +19446,7 @@ raylib.ICON_CURSOR_SCALE = 53 raylib.ICON_CURSOR_SCALE_RIGHT = 54 /** - * + * * * @type {number} * @constant @@ -18591,7 +19454,7 @@ raylib.ICON_CURSOR_SCALE_RIGHT = 54 raylib.ICON_CURSOR_SCALE_LEFT = 55 /** - * + * * * @type {number} * @constant @@ -18599,7 +19462,7 @@ raylib.ICON_CURSOR_SCALE_LEFT = 55 raylib.ICON_UNDO = 56 /** - * + * * * @type {number} * @constant @@ -18607,7 +19470,7 @@ raylib.ICON_UNDO = 56 raylib.ICON_REDO = 57 /** - * + * * * @type {number} * @constant @@ -18615,7 +19478,7 @@ raylib.ICON_REDO = 57 raylib.ICON_REREDO = 58 /** - * + * * * @type {number} * @constant @@ -18623,7 +19486,7 @@ raylib.ICON_REREDO = 58 raylib.ICON_MUTATE = 59 /** - * + * * * @type {number} * @constant @@ -18631,7 +19494,7 @@ raylib.ICON_MUTATE = 59 raylib.ICON_ROTATE = 60 /** - * + * * * @type {number} * @constant @@ -18639,7 +19502,7 @@ raylib.ICON_ROTATE = 60 raylib.ICON_REPEAT = 61 /** - * + * * * @type {number} * @constant @@ -18647,7 +19510,7 @@ raylib.ICON_REPEAT = 61 raylib.ICON_SHUFFLE = 62 /** - * + * * * @type {number} * @constant @@ -18655,7 +19518,7 @@ raylib.ICON_SHUFFLE = 62 raylib.ICON_EMPTYBOX = 63 /** - * + * * * @type {number} * @constant @@ -18663,7 +19526,7 @@ raylib.ICON_EMPTYBOX = 63 raylib.ICON_TARGET = 64 /** - * + * * * @type {number} * @constant @@ -18671,7 +19534,7 @@ raylib.ICON_TARGET = 64 raylib.ICON_TARGET_SMALL_FILL = 65 /** - * + * * * @type {number} * @constant @@ -18679,7 +19542,7 @@ raylib.ICON_TARGET_SMALL_FILL = 65 raylib.ICON_TARGET_BIG_FILL = 66 /** - * + * * * @type {number} * @constant @@ -18687,7 +19550,7 @@ raylib.ICON_TARGET_BIG_FILL = 66 raylib.ICON_TARGET_MOVE_FILL = 67 /** - * + * * * @type {number} * @constant @@ -18695,7 +19558,7 @@ raylib.ICON_TARGET_MOVE_FILL = 67 raylib.ICON_CURSOR_MOVE_FILL = 68 /** - * + * * * @type {number} * @constant @@ -18703,7 +19566,7 @@ raylib.ICON_CURSOR_MOVE_FILL = 68 raylib.ICON_CURSOR_SCALE_FILL = 69 /** - * + * * * @type {number} * @constant @@ -18711,7 +19574,7 @@ raylib.ICON_CURSOR_SCALE_FILL = 69 raylib.ICON_CURSOR_SCALE_RIGHT_FILL = 70 /** - * + * * * @type {number} * @constant @@ -18719,7 +19582,7 @@ raylib.ICON_CURSOR_SCALE_RIGHT_FILL = 70 raylib.ICON_CURSOR_SCALE_LEFT_FILL = 71 /** - * + * * * @type {number} * @constant @@ -18727,7 +19590,7 @@ raylib.ICON_CURSOR_SCALE_LEFT_FILL = 71 raylib.ICON_UNDO_FILL = 72 /** - * + * * * @type {number} * @constant @@ -18735,7 +19598,7 @@ raylib.ICON_UNDO_FILL = 72 raylib.ICON_REDO_FILL = 73 /** - * + * * * @type {number} * @constant @@ -18743,7 +19606,7 @@ raylib.ICON_REDO_FILL = 73 raylib.ICON_REREDO_FILL = 74 /** - * + * * * @type {number} * @constant @@ -18751,7 +19614,7 @@ raylib.ICON_REREDO_FILL = 74 raylib.ICON_MUTATE_FILL = 75 /** - * + * * * @type {number} * @constant @@ -18759,7 +19622,7 @@ raylib.ICON_MUTATE_FILL = 75 raylib.ICON_ROTATE_FILL = 76 /** - * + * * * @type {number} * @constant @@ -18767,7 +19630,7 @@ raylib.ICON_ROTATE_FILL = 76 raylib.ICON_REPEAT_FILL = 77 /** - * + * * * @type {number} * @constant @@ -18775,7 +19638,7 @@ raylib.ICON_REPEAT_FILL = 77 raylib.ICON_SHUFFLE_FILL = 78 /** - * + * * * @type {number} * @constant @@ -18783,7 +19646,7 @@ raylib.ICON_SHUFFLE_FILL = 78 raylib.ICON_EMPTYBOX_SMALL = 79 /** - * + * * * @type {number} * @constant @@ -18791,7 +19654,7 @@ raylib.ICON_EMPTYBOX_SMALL = 79 raylib.ICON_BOX = 80 /** - * + * * * @type {number} * @constant @@ -18799,7 +19662,7 @@ raylib.ICON_BOX = 80 raylib.ICON_BOX_TOP = 81 /** - * + * * * @type {number} * @constant @@ -18807,7 +19670,7 @@ raylib.ICON_BOX_TOP = 81 raylib.ICON_BOX_TOP_RIGHT = 82 /** - * + * * * @type {number} * @constant @@ -18815,7 +19678,7 @@ raylib.ICON_BOX_TOP_RIGHT = 82 raylib.ICON_BOX_RIGHT = 83 /** - * + * * * @type {number} * @constant @@ -18823,7 +19686,7 @@ raylib.ICON_BOX_RIGHT = 83 raylib.ICON_BOX_BOTTOM_RIGHT = 84 /** - * + * * * @type {number} * @constant @@ -18831,7 +19694,7 @@ raylib.ICON_BOX_BOTTOM_RIGHT = 84 raylib.ICON_BOX_BOTTOM = 85 /** - * + * * * @type {number} * @constant @@ -18839,7 +19702,7 @@ raylib.ICON_BOX_BOTTOM = 85 raylib.ICON_BOX_BOTTOM_LEFT = 86 /** - * + * * * @type {number} * @constant @@ -18847,7 +19710,7 @@ raylib.ICON_BOX_BOTTOM_LEFT = 86 raylib.ICON_BOX_LEFT = 87 /** - * + * * * @type {number} * @constant @@ -18855,7 +19718,7 @@ raylib.ICON_BOX_LEFT = 87 raylib.ICON_BOX_TOP_LEFT = 88 /** - * + * * * @type {number} * @constant @@ -18863,7 +19726,7 @@ raylib.ICON_BOX_TOP_LEFT = 88 raylib.ICON_BOX_CENTER = 89 /** - * + * * * @type {number} * @constant @@ -18871,7 +19734,7 @@ raylib.ICON_BOX_CENTER = 89 raylib.ICON_BOX_CIRCLE_MASK = 90 /** - * + * * * @type {number} * @constant @@ -18879,7 +19742,7 @@ raylib.ICON_BOX_CIRCLE_MASK = 90 raylib.ICON_POT = 91 /** - * + * * * @type {number} * @constant @@ -18887,7 +19750,7 @@ raylib.ICON_POT = 91 raylib.ICON_ALPHA_MULTIPLY = 92 /** - * + * * * @type {number} * @constant @@ -18895,7 +19758,7 @@ raylib.ICON_ALPHA_MULTIPLY = 92 raylib.ICON_ALPHA_CLEAR = 93 /** - * + * * * @type {number} * @constant @@ -18903,7 +19766,7 @@ raylib.ICON_ALPHA_CLEAR = 93 raylib.ICON_DITHERING = 94 /** - * + * * * @type {number} * @constant @@ -18911,7 +19774,7 @@ raylib.ICON_DITHERING = 94 raylib.ICON_MIPMAPS = 95 /** - * + * * * @type {number} * @constant @@ -18919,7 +19782,7 @@ raylib.ICON_MIPMAPS = 95 raylib.ICON_BOX_GRID = 96 /** - * + * * * @type {number} * @constant @@ -18927,7 +19790,7 @@ raylib.ICON_BOX_GRID = 96 raylib.ICON_GRID = 97 /** - * + * * * @type {number} * @constant @@ -18935,7 +19798,7 @@ raylib.ICON_GRID = 97 raylib.ICON_BOX_CORNERS_SMALL = 98 /** - * + * * * @type {number} * @constant @@ -18943,7 +19806,7 @@ raylib.ICON_BOX_CORNERS_SMALL = 98 raylib.ICON_BOX_CORNERS_BIG = 99 /** - * + * * * @type {number} * @constant @@ -18951,7 +19814,7 @@ raylib.ICON_BOX_CORNERS_BIG = 99 raylib.ICON_FOUR_BOXES = 100 /** - * + * * * @type {number} * @constant @@ -18959,7 +19822,7 @@ raylib.ICON_FOUR_BOXES = 100 raylib.ICON_GRID_FILL = 101 /** - * + * * * @type {number} * @constant @@ -18967,7 +19830,7 @@ raylib.ICON_GRID_FILL = 101 raylib.ICON_BOX_MULTISIZE = 102 /** - * + * * * @type {number} * @constant @@ -18975,7 +19838,7 @@ raylib.ICON_BOX_MULTISIZE = 102 raylib.ICON_ZOOM_SMALL = 103 /** - * + * * * @type {number} * @constant @@ -18983,7 +19846,7 @@ raylib.ICON_ZOOM_SMALL = 103 raylib.ICON_ZOOM_MEDIUM = 104 /** - * + * * * @type {number} * @constant @@ -18991,7 +19854,7 @@ raylib.ICON_ZOOM_MEDIUM = 104 raylib.ICON_ZOOM_BIG = 105 /** - * + * * * @type {number} * @constant @@ -18999,7 +19862,7 @@ raylib.ICON_ZOOM_BIG = 105 raylib.ICON_ZOOM_ALL = 106 /** - * + * * * @type {number} * @constant @@ -19007,7 +19870,7 @@ raylib.ICON_ZOOM_ALL = 106 raylib.ICON_ZOOM_CENTER = 107 /** - * + * * * @type {number} * @constant @@ -19015,7 +19878,7 @@ raylib.ICON_ZOOM_CENTER = 107 raylib.ICON_BOX_DOTS_SMALL = 108 /** - * + * * * @type {number} * @constant @@ -19023,7 +19886,7 @@ raylib.ICON_BOX_DOTS_SMALL = 108 raylib.ICON_BOX_DOTS_BIG = 109 /** - * + * * * @type {number} * @constant @@ -19031,7 +19894,7 @@ raylib.ICON_BOX_DOTS_BIG = 109 raylib.ICON_BOX_CONCENTRIC = 110 /** - * + * * * @type {number} * @constant @@ -19039,7 +19902,7 @@ raylib.ICON_BOX_CONCENTRIC = 110 raylib.ICON_BOX_GRID_BIG = 111 /** - * + * * * @type {number} * @constant @@ -19047,7 +19910,7 @@ raylib.ICON_BOX_GRID_BIG = 111 raylib.ICON_OK_TICK = 112 /** - * + * * * @type {number} * @constant @@ -19055,7 +19918,7 @@ raylib.ICON_OK_TICK = 112 raylib.ICON_CROSS = 113 /** - * + * * * @type {number} * @constant @@ -19063,7 +19926,7 @@ raylib.ICON_CROSS = 113 raylib.ICON_ARROW_LEFT = 114 /** - * + * * * @type {number} * @constant @@ -19071,7 +19934,7 @@ raylib.ICON_ARROW_LEFT = 114 raylib.ICON_ARROW_RIGHT = 115 /** - * + * * * @type {number} * @constant @@ -19079,7 +19942,7 @@ raylib.ICON_ARROW_RIGHT = 115 raylib.ICON_ARROW_DOWN = 116 /** - * + * * * @type {number} * @constant @@ -19087,7 +19950,7 @@ raylib.ICON_ARROW_DOWN = 116 raylib.ICON_ARROW_UP = 117 /** - * + * * * @type {number} * @constant @@ -19095,7 +19958,7 @@ raylib.ICON_ARROW_UP = 117 raylib.ICON_ARROW_LEFT_FILL = 118 /** - * + * * * @type {number} * @constant @@ -19103,7 +19966,7 @@ raylib.ICON_ARROW_LEFT_FILL = 118 raylib.ICON_ARROW_RIGHT_FILL = 119 /** - * + * * * @type {number} * @constant @@ -19111,7 +19974,7 @@ raylib.ICON_ARROW_RIGHT_FILL = 119 raylib.ICON_ARROW_DOWN_FILL = 120 /** - * + * * * @type {number} * @constant @@ -19119,7 +19982,7 @@ raylib.ICON_ARROW_DOWN_FILL = 120 raylib.ICON_ARROW_UP_FILL = 121 /** - * + * * * @type {number} * @constant @@ -19127,7 +19990,7 @@ raylib.ICON_ARROW_UP_FILL = 121 raylib.ICON_AUDIO = 122 /** - * + * * * @type {number} * @constant @@ -19135,7 +19998,7 @@ raylib.ICON_AUDIO = 122 raylib.ICON_FX = 123 /** - * + * * * @type {number} * @constant @@ -19143,7 +20006,7 @@ raylib.ICON_FX = 123 raylib.ICON_WAVE = 124 /** - * + * * * @type {number} * @constant @@ -19151,7 +20014,7 @@ raylib.ICON_WAVE = 124 raylib.ICON_WAVE_SINUS = 125 /** - * + * * * @type {number} * @constant @@ -19159,7 +20022,7 @@ raylib.ICON_WAVE_SINUS = 125 raylib.ICON_WAVE_SQUARE = 126 /** - * + * * * @type {number} * @constant @@ -19167,7 +20030,7 @@ raylib.ICON_WAVE_SQUARE = 126 raylib.ICON_WAVE_TRIANGULAR = 127 /** - * + * * * @type {number} * @constant @@ -19175,7 +20038,7 @@ raylib.ICON_WAVE_TRIANGULAR = 127 raylib.ICON_CROSS_SMALL = 128 /** - * + * * * @type {number} * @constant @@ -19183,7 +20046,7 @@ raylib.ICON_CROSS_SMALL = 128 raylib.ICON_PLAYER_PREVIOUS = 129 /** - * + * * * @type {number} * @constant @@ -19191,7 +20054,7 @@ raylib.ICON_PLAYER_PREVIOUS = 129 raylib.ICON_PLAYER_PLAY_BACK = 130 /** - * + * * * @type {number} * @constant @@ -19199,7 +20062,7 @@ raylib.ICON_PLAYER_PLAY_BACK = 130 raylib.ICON_PLAYER_PLAY = 131 /** - * + * * * @type {number} * @constant @@ -19207,7 +20070,7 @@ raylib.ICON_PLAYER_PLAY = 131 raylib.ICON_PLAYER_PAUSE = 132 /** - * + * * * @type {number} * @constant @@ -19215,7 +20078,7 @@ raylib.ICON_PLAYER_PAUSE = 132 raylib.ICON_PLAYER_STOP = 133 /** - * + * * * @type {number} * @constant @@ -19223,7 +20086,7 @@ raylib.ICON_PLAYER_STOP = 133 raylib.ICON_PLAYER_NEXT = 134 /** - * + * * * @type {number} * @constant @@ -19231,7 +20094,7 @@ raylib.ICON_PLAYER_NEXT = 134 raylib.ICON_PLAYER_RECORD = 135 /** - * + * * * @type {number} * @constant @@ -19239,7 +20102,7 @@ raylib.ICON_PLAYER_RECORD = 135 raylib.ICON_MAGNET = 136 /** - * + * * * @type {number} * @constant @@ -19247,7 +20110,7 @@ raylib.ICON_MAGNET = 136 raylib.ICON_LOCK_CLOSE = 137 /** - * + * * * @type {number} * @constant @@ -19255,7 +20118,7 @@ raylib.ICON_LOCK_CLOSE = 137 raylib.ICON_LOCK_OPEN = 138 /** - * + * * * @type {number} * @constant @@ -19263,7 +20126,7 @@ raylib.ICON_LOCK_OPEN = 138 raylib.ICON_CLOCK = 139 /** - * + * * * @type {number} * @constant @@ -19271,7 +20134,7 @@ raylib.ICON_CLOCK = 139 raylib.ICON_TOOLS = 140 /** - * + * * * @type {number} * @constant @@ -19279,7 +20142,7 @@ raylib.ICON_TOOLS = 140 raylib.ICON_GEAR = 141 /** - * + * * * @type {number} * @constant @@ -19287,7 +20150,7 @@ raylib.ICON_GEAR = 141 raylib.ICON_GEAR_BIG = 142 /** - * + * * * @type {number} * @constant @@ -19295,7 +20158,7 @@ raylib.ICON_GEAR_BIG = 142 raylib.ICON_BIN = 143 /** - * + * * * @type {number} * @constant @@ -19303,7 +20166,7 @@ raylib.ICON_BIN = 143 raylib.ICON_HAND_POINTER = 144 /** - * + * * * @type {number} * @constant @@ -19311,7 +20174,7 @@ raylib.ICON_HAND_POINTER = 144 raylib.ICON_LASER = 145 /** - * + * * * @type {number} * @constant @@ -19319,7 +20182,7 @@ raylib.ICON_LASER = 145 raylib.ICON_COIN = 146 /** - * + * * * @type {number} * @constant @@ -19327,7 +20190,7 @@ raylib.ICON_COIN = 146 raylib.ICON_EXPLOSION = 147 /** - * + * * * @type {number} * @constant @@ -19335,7 +20198,7 @@ raylib.ICON_EXPLOSION = 147 raylib.ICON_1UP = 148 /** - * + * * * @type {number} * @constant @@ -19343,7 +20206,7 @@ raylib.ICON_1UP = 148 raylib.ICON_PLAYER = 149 /** - * + * * * @type {number} * @constant @@ -19351,7 +20214,7 @@ raylib.ICON_PLAYER = 149 raylib.ICON_PLAYER_JUMP = 150 /** - * + * * * @type {number} * @constant @@ -19359,7 +20222,7 @@ raylib.ICON_PLAYER_JUMP = 150 raylib.ICON_KEY = 151 /** - * + * * * @type {number} * @constant @@ -19367,7 +20230,7 @@ raylib.ICON_KEY = 151 raylib.ICON_DEMON = 152 /** - * + * * * @type {number} * @constant @@ -19375,7 +20238,7 @@ raylib.ICON_DEMON = 152 raylib.ICON_TEXT_POPUP = 153 /** - * + * * * @type {number} * @constant @@ -19383,7 +20246,7 @@ raylib.ICON_TEXT_POPUP = 153 raylib.ICON_GEAR_EX = 154 /** - * + * * * @type {number} * @constant @@ -19391,7 +20254,7 @@ raylib.ICON_GEAR_EX = 154 raylib.ICON_CRACK = 155 /** - * + * * * @type {number} * @constant @@ -19399,7 +20262,7 @@ raylib.ICON_CRACK = 155 raylib.ICON_CRACK_POINTS = 156 /** - * + * * * @type {number} * @constant @@ -19407,7 +20270,7 @@ raylib.ICON_CRACK_POINTS = 156 raylib.ICON_STAR = 157 /** - * + * * * @type {number} * @constant @@ -19415,7 +20278,7 @@ raylib.ICON_STAR = 157 raylib.ICON_DOOR = 158 /** - * + * * * @type {number} * @constant @@ -19423,7 +20286,7 @@ raylib.ICON_DOOR = 158 raylib.ICON_EXIT = 159 /** - * + * * * @type {number} * @constant @@ -19431,7 +20294,7 @@ raylib.ICON_EXIT = 159 raylib.ICON_MODE_2D = 160 /** - * + * * * @type {number} * @constant @@ -19439,7 +20302,7 @@ raylib.ICON_MODE_2D = 160 raylib.ICON_MODE_3D = 161 /** - * + * * * @type {number} * @constant @@ -19447,7 +20310,7 @@ raylib.ICON_MODE_3D = 161 raylib.ICON_CUBE = 162 /** - * + * * * @type {number} * @constant @@ -19455,7 +20318,7 @@ raylib.ICON_CUBE = 162 raylib.ICON_CUBE_FACE_TOP = 163 /** - * + * * * @type {number} * @constant @@ -19463,7 +20326,7 @@ raylib.ICON_CUBE_FACE_TOP = 163 raylib.ICON_CUBE_FACE_LEFT = 164 /** - * + * * * @type {number} * @constant @@ -19471,7 +20334,7 @@ raylib.ICON_CUBE_FACE_LEFT = 164 raylib.ICON_CUBE_FACE_FRONT = 165 /** - * + * * * @type {number} * @constant @@ -19479,7 +20342,7 @@ raylib.ICON_CUBE_FACE_FRONT = 165 raylib.ICON_CUBE_FACE_BOTTOM = 166 /** - * + * * * @type {number} * @constant @@ -19487,7 +20350,7 @@ raylib.ICON_CUBE_FACE_BOTTOM = 166 raylib.ICON_CUBE_FACE_RIGHT = 167 /** - * + * * * @type {number} * @constant @@ -19495,7 +20358,7 @@ raylib.ICON_CUBE_FACE_RIGHT = 167 raylib.ICON_CUBE_FACE_BACK = 168 /** - * + * * * @type {number} * @constant @@ -19503,7 +20366,7 @@ raylib.ICON_CUBE_FACE_BACK = 168 raylib.ICON_CAMERA = 169 /** - * + * * * @type {number} * @constant @@ -19511,7 +20374,7 @@ raylib.ICON_CAMERA = 169 raylib.ICON_SPECIAL = 170 /** - * + * * * @type {number} * @constant @@ -19519,7 +20382,7 @@ raylib.ICON_SPECIAL = 170 raylib.ICON_LINK_NET = 171 /** - * + * * * @type {number} * @constant @@ -19527,7 +20390,7 @@ raylib.ICON_LINK_NET = 171 raylib.ICON_LINK_BOXES = 172 /** - * + * * * @type {number} * @constant @@ -19535,7 +20398,7 @@ raylib.ICON_LINK_BOXES = 172 raylib.ICON_LINK_MULTI = 173 /** - * + * * * @type {number} * @constant @@ -19543,7 +20406,7 @@ raylib.ICON_LINK_MULTI = 173 raylib.ICON_LINK = 174 /** - * + * * * @type {number} * @constant @@ -19551,7 +20414,7 @@ raylib.ICON_LINK = 174 raylib.ICON_LINK_BROKE = 175 /** - * + * * * @type {number} * @constant @@ -19559,7 +20422,7 @@ raylib.ICON_LINK_BROKE = 175 raylib.ICON_TEXT_NOTES = 176 /** - * + * * * @type {number} * @constant @@ -19567,7 +20430,7 @@ raylib.ICON_TEXT_NOTES = 176 raylib.ICON_NOTEBOOK = 177 /** - * + * * * @type {number} * @constant @@ -19575,7 +20438,7 @@ raylib.ICON_NOTEBOOK = 177 raylib.ICON_SUITCASE = 178 /** - * + * * * @type {number} * @constant @@ -19583,7 +20446,7 @@ raylib.ICON_SUITCASE = 178 raylib.ICON_SUITCASE_ZIP = 179 /** - * + * * * @type {number} * @constant @@ -19591,7 +20454,7 @@ raylib.ICON_SUITCASE_ZIP = 179 raylib.ICON_MAILBOX = 180 /** - * + * * * @type {number} * @constant @@ -19599,7 +20462,7 @@ raylib.ICON_MAILBOX = 180 raylib.ICON_MONITOR = 181 /** - * + * * * @type {number} * @constant @@ -19607,7 +20470,7 @@ raylib.ICON_MONITOR = 181 raylib.ICON_PRINTER = 182 /** - * + * * * @type {number} * @constant @@ -19615,7 +20478,7 @@ raylib.ICON_PRINTER = 182 raylib.ICON_PHOTO_CAMERA = 183 /** - * + * * * @type {number} * @constant @@ -19623,7 +20486,7 @@ raylib.ICON_PHOTO_CAMERA = 183 raylib.ICON_PHOTO_CAMERA_FLASH = 184 /** - * + * * * @type {number} * @constant @@ -19631,7 +20494,7 @@ raylib.ICON_PHOTO_CAMERA_FLASH = 184 raylib.ICON_HOUSE = 185 /** - * + * * * @type {number} * @constant @@ -19639,7 +20502,7 @@ raylib.ICON_HOUSE = 185 raylib.ICON_HEART = 186 /** - * + * * * @type {number} * @constant @@ -19647,7 +20510,7 @@ raylib.ICON_HEART = 186 raylib.ICON_CORNER = 187 /** - * + * * * @type {number} * @constant @@ -19655,7 +20518,7 @@ raylib.ICON_CORNER = 187 raylib.ICON_VERTICAL_BARS = 188 /** - * + * * * @type {number} * @constant @@ -19663,7 +20526,7 @@ raylib.ICON_VERTICAL_BARS = 188 raylib.ICON_VERTICAL_BARS_FILL = 189 /** - * + * * * @type {number} * @constant @@ -19671,7 +20534,7 @@ raylib.ICON_VERTICAL_BARS_FILL = 189 raylib.ICON_LIFE_BARS = 190 /** - * + * * * @type {number} * @constant @@ -19679,7 +20542,7 @@ raylib.ICON_LIFE_BARS = 190 raylib.ICON_INFO = 191 /** - * + * * * @type {number} * @constant @@ -19687,7 +20550,7 @@ raylib.ICON_INFO = 191 raylib.ICON_CROSSLINE = 192 /** - * + * * * @type {number} * @constant @@ -19695,7 +20558,7 @@ raylib.ICON_CROSSLINE = 192 raylib.ICON_HELP = 193 /** - * + * * * @type {number} * @constant @@ -19703,7 +20566,7 @@ raylib.ICON_HELP = 193 raylib.ICON_FILETYPE_ALPHA = 194 /** - * + * * * @type {number} * @constant @@ -19711,7 +20574,7 @@ raylib.ICON_FILETYPE_ALPHA = 194 raylib.ICON_FILETYPE_HOME = 195 /** - * + * * * @type {number} * @constant @@ -19719,7 +20582,7 @@ raylib.ICON_FILETYPE_HOME = 195 raylib.ICON_LAYERS_VISIBLE = 196 /** - * + * * * @type {number} * @constant @@ -19727,7 +20590,7 @@ raylib.ICON_LAYERS_VISIBLE = 196 raylib.ICON_LAYERS = 197 /** - * + * * * @type {number} * @constant @@ -19735,7 +20598,7 @@ raylib.ICON_LAYERS = 197 raylib.ICON_WINDOW = 198 /** - * + * * * @type {number} * @constant @@ -19743,7 +20606,7 @@ raylib.ICON_WINDOW = 198 raylib.ICON_HIDPI = 199 /** - * + * * * @type {number} * @constant @@ -19751,7 +20614,7 @@ raylib.ICON_HIDPI = 199 raylib.ICON_FILETYPE_BINARY = 200 /** - * + * * * @type {number} * @constant @@ -19759,7 +20622,7 @@ raylib.ICON_FILETYPE_BINARY = 200 raylib.ICON_HEX = 201 /** - * + * * * @type {number} * @constant @@ -19767,7 +20630,7 @@ raylib.ICON_HEX = 201 raylib.ICON_SHIELD = 202 /** - * + * * * @type {number} * @constant @@ -19775,7 +20638,7 @@ raylib.ICON_SHIELD = 202 raylib.ICON_FILE_NEW = 203 /** - * + * * * @type {number} * @constant @@ -19783,7 +20646,7 @@ raylib.ICON_FILE_NEW = 203 raylib.ICON_FOLDER_ADD = 204 /** - * + * * * @type {number} * @constant @@ -19791,7 +20654,7 @@ raylib.ICON_FOLDER_ADD = 204 raylib.ICON_ALARM = 205 /** - * + * * * @type {number} * @constant @@ -19799,7 +20662,7 @@ raylib.ICON_ALARM = 205 raylib.ICON_CPU = 206 /** - * + * * * @type {number} * @constant @@ -19807,7 +20670,7 @@ raylib.ICON_CPU = 206 raylib.ICON_ROM = 207 /** - * + * * * @type {number} * @constant @@ -19815,7 +20678,7 @@ raylib.ICON_ROM = 207 raylib.ICON_STEP_OVER = 208 /** - * + * * * @type {number} * @constant @@ -19823,7 +20686,7 @@ raylib.ICON_STEP_OVER = 208 raylib.ICON_STEP_INTO = 209 /** - * + * * * @type {number} * @constant @@ -19831,7 +20694,7 @@ raylib.ICON_STEP_INTO = 209 raylib.ICON_STEP_OUT = 210 /** - * + * * * @type {number} * @constant @@ -19839,7 +20702,7 @@ raylib.ICON_STEP_OUT = 210 raylib.ICON_RESTART = 211 /** - * + * * * @type {number} * @constant @@ -19847,7 +20710,7 @@ raylib.ICON_RESTART = 211 raylib.ICON_BREAKPOINT_ON = 212 /** - * + * * * @type {number} * @constant @@ -19855,7 +20718,7 @@ raylib.ICON_BREAKPOINT_ON = 212 raylib.ICON_BREAKPOINT_OFF = 213 /** - * + * * * @type {number} * @constant @@ -19863,7 +20726,7 @@ raylib.ICON_BREAKPOINT_OFF = 213 raylib.ICON_BURGER_MENU = 214 /** - * + * * * @type {number} * @constant @@ -19871,7 +20734,7 @@ raylib.ICON_BURGER_MENU = 214 raylib.ICON_CASE_SENSITIVE = 215 /** - * + * * * @type {number} * @constant @@ -19879,7 +20742,7 @@ raylib.ICON_CASE_SENSITIVE = 215 raylib.ICON_REG_EXP = 216 /** - * + * * * @type {number} * @constant @@ -19887,7 +20750,7 @@ raylib.ICON_REG_EXP = 216 raylib.ICON_FOLDER = 217 /** - * + * * * @type {number} * @constant @@ -19895,15 +20758,15 @@ raylib.ICON_FOLDER = 217 raylib.ICON_FILE = 218 /** - * + * * * @type {number} * @constant */ -raylib.ICON_219 = 219 +raylib.ICON_SAND_TIMER = 219 /** - * + * * * @type {number} * @constant @@ -19911,7 +20774,7 @@ raylib.ICON_219 = 219 raylib.ICON_220 = 220 /** - * + * * * @type {number} * @constant @@ -19919,7 +20782,7 @@ raylib.ICON_220 = 220 raylib.ICON_221 = 221 /** - * + * * * @type {number} * @constant @@ -19927,7 +20790,7 @@ raylib.ICON_221 = 221 raylib.ICON_222 = 222 /** - * + * * * @type {number} * @constant @@ -19935,7 +20798,7 @@ raylib.ICON_222 = 222 raylib.ICON_223 = 223 /** - * + * * * @type {number} * @constant @@ -19943,7 +20806,7 @@ raylib.ICON_223 = 223 raylib.ICON_224 = 224 /** - * + * * * @type {number} * @constant @@ -19951,7 +20814,7 @@ raylib.ICON_224 = 224 raylib.ICON_225 = 225 /** - * + * * * @type {number} * @constant @@ -19959,7 +20822,7 @@ raylib.ICON_225 = 225 raylib.ICON_226 = 226 /** - * + * * * @type {number} * @constant @@ -19967,7 +20830,7 @@ raylib.ICON_226 = 226 raylib.ICON_227 = 227 /** - * + * * * @type {number} * @constant @@ -19975,7 +20838,7 @@ raylib.ICON_227 = 227 raylib.ICON_228 = 228 /** - * + * * * @type {number} * @constant @@ -19983,7 +20846,7 @@ raylib.ICON_228 = 228 raylib.ICON_229 = 229 /** - * + * * * @type {number} * @constant @@ -19991,7 +20854,7 @@ raylib.ICON_229 = 229 raylib.ICON_230 = 230 /** - * + * * * @type {number} * @constant @@ -19999,7 +20862,7 @@ raylib.ICON_230 = 230 raylib.ICON_231 = 231 /** - * + * * * @type {number} * @constant @@ -20007,7 +20870,7 @@ raylib.ICON_231 = 231 raylib.ICON_232 = 232 /** - * + * * * @type {number} * @constant @@ -20015,7 +20878,7 @@ raylib.ICON_232 = 232 raylib.ICON_233 = 233 /** - * + * * * @type {number} * @constant @@ -20023,7 +20886,7 @@ raylib.ICON_233 = 233 raylib.ICON_234 = 234 /** - * + * * * @type {number} * @constant @@ -20031,7 +20894,7 @@ raylib.ICON_234 = 234 raylib.ICON_235 = 235 /** - * + * * * @type {number} * @constant @@ -20039,7 +20902,7 @@ raylib.ICON_235 = 235 raylib.ICON_236 = 236 /** - * + * * * @type {number} * @constant @@ -20047,7 +20910,7 @@ raylib.ICON_236 = 236 raylib.ICON_237 = 237 /** - * + * * * @type {number} * @constant @@ -20055,7 +20918,7 @@ raylib.ICON_237 = 237 raylib.ICON_238 = 238 /** - * + * * * @type {number} * @constant @@ -20063,7 +20926,7 @@ raylib.ICON_238 = 238 raylib.ICON_239 = 239 /** - * + * * * @type {number} * @constant @@ -20071,7 +20934,7 @@ raylib.ICON_239 = 239 raylib.ICON_240 = 240 /** - * + * * * @type {number} * @constant @@ -20079,7 +20942,7 @@ raylib.ICON_240 = 240 raylib.ICON_241 = 241 /** - * + * * * @type {number} * @constant @@ -20087,7 +20950,7 @@ raylib.ICON_241 = 241 raylib.ICON_242 = 242 /** - * + * * * @type {number} * @constant @@ -20095,7 +20958,7 @@ raylib.ICON_242 = 242 raylib.ICON_243 = 243 /** - * + * * * @type {number} * @constant @@ -20103,7 +20966,7 @@ raylib.ICON_243 = 243 raylib.ICON_244 = 244 /** - * + * * * @type {number} * @constant @@ -20111,7 +20974,7 @@ raylib.ICON_244 = 244 raylib.ICON_245 = 245 /** - * + * * * @type {number} * @constant @@ -20119,7 +20982,7 @@ raylib.ICON_245 = 245 raylib.ICON_246 = 246 /** - * + * * * @type {number} * @constant @@ -20127,7 +20990,7 @@ raylib.ICON_246 = 246 raylib.ICON_247 = 247 /** - * + * * * @type {number} * @constant @@ -20135,7 +20998,7 @@ raylib.ICON_247 = 247 raylib.ICON_248 = 248 /** - * + * * * @type {number} * @constant @@ -20143,7 +21006,7 @@ raylib.ICON_248 = 248 raylib.ICON_249 = 249 /** - * + * * * @type {number} * @constant @@ -20151,7 +21014,7 @@ raylib.ICON_249 = 249 raylib.ICON_250 = 250 /** - * + * * * @type {number} * @constant @@ -20159,7 +21022,7 @@ raylib.ICON_250 = 250 raylib.ICON_251 = 251 /** - * + * * * @type {number} * @constant @@ -20167,7 +21030,7 @@ raylib.ICON_251 = 251 raylib.ICON_252 = 252 /** - * + * * * @type {number} * @constant @@ -20175,7 +21038,7 @@ raylib.ICON_252 = 252 raylib.ICON_253 = 253 /** - * + * * * @type {number} * @constant @@ -20183,7 +21046,7 @@ raylib.ICON_253 = 253 raylib.ICON_254 = 254 /** - * + * * * @type {number} * @constant @@ -20230,6 +21093,14 @@ raylib.RL_OPENGL_43 = 4 */ raylib.RL_OPENGL_ES_20 = 5 +/** + * OpenGL ES 3.0 (GLSL 300 es) + * + * @type {number} + * @constant + */ +raylib.RL_OPENGL_ES_30 = 6 + /** * Display all logs * @@ -20374,13 +21245,37 @@ raylib.RL_PIXELFORMAT_UNCOMPRESSED_R32G32B32 = 9 */ raylib.RL_PIXELFORMAT_UNCOMPRESSED_R32G32B32A32 = 10 +/** + * 16 bpp (1 channel - half float) + * + * @type {number} + * @constant + */ +raylib.RL_PIXELFORMAT_UNCOMPRESSED_R16 = 11 + +/** + * 16*3 bpp (3 channels - half float) + * + * @type {number} + * @constant + */ +raylib.RL_PIXELFORMAT_UNCOMPRESSED_R16G16B16 = 12 + +/** + * 16*4 bpp (4 channels - half float) + * + * @type {number} + * @constant + */ +raylib.RL_PIXELFORMAT_UNCOMPRESSED_R16G16B16A16 = 13 + /** * 4 bpp (no alpha) * * @type {number} * @constant */ -raylib.RL_PIXELFORMAT_COMPRESSED_DXT1_RGB = 11 +raylib.RL_PIXELFORMAT_COMPRESSED_DXT1_RGB = 14 /** * 4 bpp (1 bit alpha) @@ -20388,7 +21283,7 @@ raylib.RL_PIXELFORMAT_COMPRESSED_DXT1_RGB = 11 * @type {number} * @constant */ -raylib.RL_PIXELFORMAT_COMPRESSED_DXT1_RGBA = 12 +raylib.RL_PIXELFORMAT_COMPRESSED_DXT1_RGBA = 15 /** * 8 bpp @@ -20396,7 +21291,7 @@ raylib.RL_PIXELFORMAT_COMPRESSED_DXT1_RGBA = 12 * @type {number} * @constant */ -raylib.RL_PIXELFORMAT_COMPRESSED_DXT3_RGBA = 13 +raylib.RL_PIXELFORMAT_COMPRESSED_DXT3_RGBA = 16 /** * 8 bpp @@ -20404,7 +21299,7 @@ raylib.RL_PIXELFORMAT_COMPRESSED_DXT3_RGBA = 13 * @type {number} * @constant */ -raylib.RL_PIXELFORMAT_COMPRESSED_DXT5_RGBA = 14 +raylib.RL_PIXELFORMAT_COMPRESSED_DXT5_RGBA = 17 /** * 4 bpp @@ -20412,7 +21307,7 @@ raylib.RL_PIXELFORMAT_COMPRESSED_DXT5_RGBA = 14 * @type {number} * @constant */ -raylib.RL_PIXELFORMAT_COMPRESSED_ETC1_RGB = 15 +raylib.RL_PIXELFORMAT_COMPRESSED_ETC1_RGB = 18 /** * 4 bpp @@ -20420,7 +21315,7 @@ raylib.RL_PIXELFORMAT_COMPRESSED_ETC1_RGB = 15 * @type {number} * @constant */ -raylib.RL_PIXELFORMAT_COMPRESSED_ETC2_RGB = 16 +raylib.RL_PIXELFORMAT_COMPRESSED_ETC2_RGB = 19 /** * 8 bpp @@ -20428,7 +21323,7 @@ raylib.RL_PIXELFORMAT_COMPRESSED_ETC2_RGB = 16 * @type {number} * @constant */ -raylib.RL_PIXELFORMAT_COMPRESSED_ETC2_EAC_RGBA = 17 +raylib.RL_PIXELFORMAT_COMPRESSED_ETC2_EAC_RGBA = 20 /** * 4 bpp @@ -20436,7 +21331,7 @@ raylib.RL_PIXELFORMAT_COMPRESSED_ETC2_EAC_RGBA = 17 * @type {number} * @constant */ -raylib.RL_PIXELFORMAT_COMPRESSED_PVRT_RGB = 18 +raylib.RL_PIXELFORMAT_COMPRESSED_PVRT_RGB = 21 /** * 4 bpp @@ -20444,7 +21339,7 @@ raylib.RL_PIXELFORMAT_COMPRESSED_PVRT_RGB = 18 * @type {number} * @constant */ -raylib.RL_PIXELFORMAT_COMPRESSED_PVRT_RGBA = 19 +raylib.RL_PIXELFORMAT_COMPRESSED_PVRT_RGBA = 22 /** * 8 bpp @@ -20452,7 +21347,7 @@ raylib.RL_PIXELFORMAT_COMPRESSED_PVRT_RGBA = 19 * @type {number} * @constant */ -raylib.RL_PIXELFORMAT_COMPRESSED_ASTC_4x4_RGBA = 20 +raylib.RL_PIXELFORMAT_COMPRESSED_ASTC_4x4_RGBA = 23 /** * 2 bpp @@ -20460,7 +21355,7 @@ raylib.RL_PIXELFORMAT_COMPRESSED_ASTC_4x4_RGBA = 20 * @type {number} * @constant */ -raylib.RL_PIXELFORMAT_COMPRESSED_ASTC_8x8_RGBA = 21 +raylib.RL_PIXELFORMAT_COMPRESSED_ASTC_8x8_RGBA = 24 /** * No filter, just pixel approximation @@ -21031,7 +21926,7 @@ raylib.RL_ATTACHMENT_TEXTURE2D = 100 raylib.RL_ATTACHMENT_RENDERBUFFER = 200 /** - * + * * * @type {number} * @constant @@ -21039,7 +21934,7 @@ raylib.RL_ATTACHMENT_RENDERBUFFER = 200 raylib.RL_CULL_FACE_FRONT = 0 /** - * + * * * @type {number} * @constant @@ -21047,7 +21942,7 @@ raylib.RL_CULL_FACE_FRONT = 0 raylib.RL_CULL_FACE_BACK = 1 /** - * + * * * @type {number} * @constant diff --git a/src/generated/node-raylib.cc b/src/generated/node-raylib.cc index b0ea9d3..2a3d414 100644 --- a/src/generated/node-raylib.cc +++ b/src/generated/node-raylib.cc @@ -315,7 +315,8 @@ inline ModelAnimation ModelAnimationFromValue(const Napi::CallbackInfo& info, in intFromValue(info, index + 0), intFromValue(info, index + 1), (BoneInfo *) pointerFromValue(info, index + 2), - (Transform **) pointerFromValue(info, index + 3) + (Transform **) pointerFromValue(info, index + 3), + pointerFromValue(info, index + 4) }; } @@ -387,6 +388,22 @@ inline FilePathList FilePathListFromValue(const Napi::CallbackInfo& info, int in }; } +inline AutomationEvent AutomationEventFromValue(const Napi::CallbackInfo& info, int index) { + return { + unsignedintFromValue(info, index + 0), + unsignedintFromValue(info, index + 1), + pointerFromValue(info, index + 2) + }; +} + +inline AutomationEventList AutomationEventListFromValue(const Napi::CallbackInfo& info, int index) { + return { + unsignedintFromValue(info, index + 0), + unsignedintFromValue(info, index + 1), + (AutomationEvent *) pointerFromValue(info, index + 2) + }; +} + inline rlDrawCall rlDrawCallFromValue(const Napi::CallbackInfo& info, int index) { return { intFromValue(info, index + 0), @@ -620,6 +637,7 @@ inline Napi::Value ToValue(Napi::Env env, ModelAnimation obj) { out.Set("frameCount", ToValue(env, obj.frameCount)); out.Set("bones", ToValue(env, obj.bones)); out.Set("framePoses", ToValue(env, obj.framePoses)); + out.Set("name", ToValue(env, obj.name)); return out; } @@ -691,6 +709,22 @@ inline Napi::Value ToValue(Napi::Env env, FilePathList obj) { return out; } +inline Napi::Value ToValue(Napi::Env env, AutomationEvent obj) { + Napi::Object out = Napi::Object::New(env); + out.Set("frame", ToValue(env, obj.frame)); + out.Set("type", ToValue(env, obj.type)); + out.Set("params", ToValue(env, obj.params)); + return out; +} + +inline Napi::Value ToValue(Napi::Env env, AutomationEventList obj) { + Napi::Object out = Napi::Object::New(env); + out.Set("capacity", ToValue(env, obj.capacity)); + out.Set("count", ToValue(env, obj.count)); + out.Set("events", ToValue(env, obj.events)); + return out; +} + inline Napi::Value ToValue(Napi::Env env, rlVertexBuffer obj) { Napi::Object out = Napi::Object::New(env); out.Set("elementCount", ToValue(env, obj.elementCount)); @@ -1066,25 +1100,25 @@ Napi::Value BindGetWorldToScreen2D(const Napi::CallbackInfo& info) { ); } -Napi::Value BindGetFPS(const Napi::CallbackInfo& info) { +Napi::Value BindGetFrameTime(const Napi::CallbackInfo& info) { return ToValue(info.Env(), - GetFPS( + GetFrameTime( ) ); } -Napi::Value BindGetFrameTime(const Napi::CallbackInfo& info) { +Napi::Value BindGetTime(const Napi::CallbackInfo& info) { return ToValue(info.Env(), - GetFrameTime( + GetTime( ) ); } -Napi::Value BindGetTime(const Napi::CallbackInfo& info) { +Napi::Value BindGetFPS(const Napi::CallbackInfo& info) { return ToValue(info.Env(), - GetTime( + GetFPS( ) ); @@ -1099,6 +1133,16 @@ Napi::Value BindGetRandomValue(const Napi::CallbackInfo& info) { ); } +Napi::Value BindLoadRandomSequence(const Napi::CallbackInfo& info) { + return ToValue(info.Env(), + LoadRandomSequence( + unsignedintFromValue(info, 0), + intFromValue(info, 1), + intFromValue(info, 2) + ) + ); +} + Napi::Value BindMemAlloc(const Napi::CallbackInfo& info) { return ToValue(info.Env(), MemAlloc( @@ -1120,7 +1164,7 @@ Napi::Value BindLoadFileData(const Napi::CallbackInfo& info) { return ToValue(info.Env(), LoadFileData( (const char *) stringFromValue(info, 0), - (unsigned int *) pointerFromValue(info, 1) + (int *) pointerFromValue(info, 1) ) ); } @@ -1130,7 +1174,7 @@ Napi::Value BindSaveFileData(const Napi::CallbackInfo& info) { SaveFileData( (const char *) stringFromValue(info, 0), (void *) pointerFromValue(info, 1), - unsignedintFromValue(info, 2) + intFromValue(info, 2) ) ); } @@ -1139,7 +1183,7 @@ Napi::Value BindExportDataAsCode(const Napi::CallbackInfo& info) { return ToValue(info.Env(), ExportDataAsCode( (const unsigned char *) pointerFromValue(info, 0), - unsignedintFromValue(info, 1), + intFromValue(info, 1), (const char *) stringFromValue(info, 2) ) ); @@ -1348,6 +1392,23 @@ Napi::Value BindDecodeDataBase64(const Napi::CallbackInfo& info) { ); } +Napi::Value BindLoadAutomationEventList(const Napi::CallbackInfo& info) { + return ToValue(info.Env(), + LoadAutomationEventList( + (const char *) stringFromValue(info, 0) + ) + ); +} + +Napi::Value BindExportAutomationEventList(const Napi::CallbackInfo& info) { + return ToValue(info.Env(), + ExportAutomationEventList( + AutomationEventListFromValue(info, 0), + (const char *) stringFromValue(info, 3) + ) + ); +} + Napi::Value BindIsKeyPressed(const Napi::CallbackInfo& info) { return ToValue(info.Env(), IsKeyPressed( @@ -1356,6 +1417,14 @@ Napi::Value BindIsKeyPressed(const Napi::CallbackInfo& info) { ); } +Napi::Value BindIsKeyPressedRepeat(const Napi::CallbackInfo& info) { + return ToValue(info.Env(), + IsKeyPressedRepeat( + intFromValue(info, 0) + ) + ); +} + Napi::Value BindIsKeyDown(const Napi::CallbackInfo& info) { return ToValue(info.Env(), IsKeyDown( @@ -1604,7 +1673,7 @@ Napi::Value BindGetTouchPointCount(const Napi::CallbackInfo& info) { Napi::Value BindIsGestureDetected(const Napi::CallbackInfo& info) { return ToValue(info.Env(), IsGestureDetected( - intFromValue(info, 0) + unsignedintFromValue(info, 0) ) ); } @@ -1657,6 +1726,63 @@ Napi::Value BindGetGesturePinchAngle(const Napi::CallbackInfo& info) { ); } +Napi::Value BindGetSplinePointLinear(const Napi::CallbackInfo& info) { + return ToValue(info.Env(), + GetSplinePointLinear( + Vector2FromValue(info, 0), + Vector2FromValue(info, 2), + floatFromValue(info, 4) + ) + ); +} + +Napi::Value BindGetSplinePointBasis(const Napi::CallbackInfo& info) { + return ToValue(info.Env(), + GetSplinePointBasis( + Vector2FromValue(info, 0), + Vector2FromValue(info, 2), + Vector2FromValue(info, 4), + Vector2FromValue(info, 6), + floatFromValue(info, 8) + ) + ); +} + +Napi::Value BindGetSplinePointCatmullRom(const Napi::CallbackInfo& info) { + return ToValue(info.Env(), + GetSplinePointCatmullRom( + Vector2FromValue(info, 0), + Vector2FromValue(info, 2), + Vector2FromValue(info, 4), + Vector2FromValue(info, 6), + floatFromValue(info, 8) + ) + ); +} + +Napi::Value BindGetSplinePointBezierQuad(const Napi::CallbackInfo& info) { + return ToValue(info.Env(), + GetSplinePointBezierQuad( + Vector2FromValue(info, 0), + Vector2FromValue(info, 2), + Vector2FromValue(info, 4), + floatFromValue(info, 6) + ) + ); +} + +Napi::Value BindGetSplinePointBezierCubic(const Napi::CallbackInfo& info) { + return ToValue(info.Env(), + GetSplinePointBezierCubic( + Vector2FromValue(info, 0), + Vector2FromValue(info, 2), + Vector2FromValue(info, 4), + Vector2FromValue(info, 6), + floatFromValue(info, 8) + ) + ); +} + Napi::Value BindCheckCollisionRecs(const Napi::CallbackInfo& info) { return ToValue(info.Env(), CheckCollisionRecs( @@ -1779,6 +1905,16 @@ Napi::Value BindLoadImageRaw(const Napi::CallbackInfo& info) { ); } +Napi::Value BindLoadImageSvg(const Napi::CallbackInfo& info) { + return ToValue(info.Env(), + LoadImageSvg( + (const char *) stringFromValue(info, 0), + intFromValue(info, 1), + intFromValue(info, 2) + ) + ); +} + Napi::Value BindLoadImageAnim(const Napi::CallbackInfo& info) { return ToValue(info.Env(), LoadImageAnim( @@ -1831,6 +1967,16 @@ Napi::Value BindExportImage(const Napi::CallbackInfo& info) { ); } +Napi::Value BindExportImageToMemory(const Napi::CallbackInfo& info) { + return ToValue(info.Env(), + ExportImageToMemory( + ImageFromValue(info, 0), + (const char *) stringFromValue(info, 5), + (int *) pointerFromValue(info, 6) + ) + ); +} + Napi::Value BindExportImageAsCode(const Napi::CallbackInfo& info) { return ToValue(info.Env(), ExportImageAsCode( @@ -1850,31 +1996,33 @@ Napi::Value BindGenImageColor(const Napi::CallbackInfo& info) { ); } -Napi::Value BindGenImageGradientV(const Napi::CallbackInfo& info) { +Napi::Value BindGenImageGradientLinear(const Napi::CallbackInfo& info) { return ToValue(info.Env(), - GenImageGradientV( + GenImageGradientLinear( intFromValue(info, 0), intFromValue(info, 1), - ColorFromValue(info, 2), - ColorFromValue(info, 6) + intFromValue(info, 2), + ColorFromValue(info, 3), + ColorFromValue(info, 7) ) ); } -Napi::Value BindGenImageGradientH(const Napi::CallbackInfo& info) { +Napi::Value BindGenImageGradientRadial(const Napi::CallbackInfo& info) { return ToValue(info.Env(), - GenImageGradientH( + GenImageGradientRadial( intFromValue(info, 0), intFromValue(info, 1), - ColorFromValue(info, 2), - ColorFromValue(info, 6) + floatFromValue(info, 2), + ColorFromValue(info, 3), + ColorFromValue(info, 7) ) ); } -Napi::Value BindGenImageGradientRadial(const Napi::CallbackInfo& info) { +Napi::Value BindGenImageGradientSquare(const Napi::CallbackInfo& info) { return ToValue(info.Env(), - GenImageGradientRadial( + GenImageGradientSquare( intFromValue(info, 0), intFromValue(info, 1), floatFromValue(info, 2), @@ -2671,7 +2819,7 @@ Napi::Value BindLoadModelAnimations(const Napi::CallbackInfo& info) { return ToValue(info.Env(), LoadModelAnimations( (const char *) stringFromValue(info, 0), - (unsigned int *) pointerFromValue(info, 1) + (int *) pointerFromValue(info, 1) ) ); } @@ -2775,6 +2923,14 @@ Napi::Value BindIsAudioDeviceReady(const Napi::CallbackInfo& info) { ); } +Napi::Value BindGetMasterVolume(const Napi::CallbackInfo& info) { + return ToValue(info.Env(), + GetMasterVolume( + + ) + ); +} + Napi::Value BindLoadWave(const Napi::CallbackInfo& info) { return ToValue(info.Env(), LoadWave( @@ -2817,6 +2973,14 @@ Napi::Value BindLoadSoundFromWave(const Napi::CallbackInfo& info) { ); } +Napi::Value BindLoadSoundAlias(const Napi::CallbackInfo& info) { + return ToValue(info.Env(), + LoadSoundAlias( + SoundFromValue(info, 0) + ) + ); +} + Napi::Value BindIsSoundReady(const Napi::CallbackInfo& info) { return ToValue(info.Env(), IsSoundReady( @@ -3724,6 +3888,24 @@ Napi::Value BindVector3Normalize(const Napi::CallbackInfo& info) { ); } +Napi::Value BindVector3Project(const Napi::CallbackInfo& info) { + return ToValue(info.Env(), + Vector3Project( + Vector3FromValue(info, 0), + Vector3FromValue(info, 3) + ) + ); +} + +Napi::Value BindVector3Reject(const Napi::CallbackInfo& info) { + return ToValue(info.Env(), + Vector3Reject( + Vector3FromValue(info, 0), + Vector3FromValue(info, 3) + ) + ); +} + Napi::Value BindVector3Transform(const Napi::CallbackInfo& info) { return ToValue(info.Env(), Vector3Transform( @@ -4268,6 +4450,32 @@ Napi::Value BindGuiGetStyle(const Napi::CallbackInfo& info) { ); } +Napi::Value BindGuiIconText(const Napi::CallbackInfo& info) { + return ToValue(info.Env(), + GuiIconText( + intFromValue(info, 0), + (const char *) stringFromValue(info, 1) + ) + ); +} + +Napi::Value BindGuiGetIcons(const Napi::CallbackInfo& info) { + return ToValue(info.Env(), + GuiGetIcons( + + ) + ); +} + +Napi::Value BindGuiLoadIcons(const Napi::CallbackInfo& info) { + return ToValue(info.Env(), + GuiLoadIcons( + (const char *) stringFromValue(info, 0), + boolFromValue(info, 1) + ) + ); +} + Napi::Value BindGuiWindowBox(const Napi::CallbackInfo& info) { return ToValue(info.Env(), GuiWindowBox( @@ -4277,6 +4485,33 @@ Napi::Value BindGuiWindowBox(const Napi::CallbackInfo& info) { ); } +Napi::Value BindGuiGroupBox(const Napi::CallbackInfo& info) { + return ToValue(info.Env(), + GuiGroupBox( + RectangleFromValue(info, 0), + (const char *) stringFromValue(info, 4) + ) + ); +} + +Napi::Value BindGuiLine(const Napi::CallbackInfo& info) { + return ToValue(info.Env(), + GuiLine( + RectangleFromValue(info, 0), + (const char *) stringFromValue(info, 4) + ) + ); +} + +Napi::Value BindGuiPanel(const Napi::CallbackInfo& info) { + return ToValue(info.Env(), + GuiPanel( + RectangleFromValue(info, 0), + (const char *) stringFromValue(info, 4) + ) + ); +} + Napi::Value BindGuiTabBar(const Napi::CallbackInfo& info) { return ToValue(info.Env(), GuiTabBar( @@ -4294,7 +4529,17 @@ Napi::Value BindGuiScrollPanel(const Napi::CallbackInfo& info) { RectangleFromValue(info, 0), (const char *) stringFromValue(info, 4), RectangleFromValue(info, 5), - (Vector2 *) pointerFromValue(info, 9) + (Vector2 *) pointerFromValue(info, 9), + (Rectangle *) pointerFromValue(info, 10) + ) + ); +} + +Napi::Value BindGuiLabel(const Napi::CallbackInfo& info) { + return ToValue(info.Env(), + GuiLabel( + RectangleFromValue(info, 0), + (const char *) stringFromValue(info, 4) ) ); } @@ -4322,7 +4567,7 @@ Napi::Value BindGuiToggle(const Napi::CallbackInfo& info) { GuiToggle( RectangleFromValue(info, 0), (const char *) stringFromValue(info, 4), - boolFromValue(info, 5) + (bool *) pointerFromValue(info, 5) ) ); } @@ -4332,7 +4577,17 @@ Napi::Value BindGuiToggleGroup(const Napi::CallbackInfo& info) { GuiToggleGroup( RectangleFromValue(info, 0), (const char *) stringFromValue(info, 4), - intFromValue(info, 5) + (int *) pointerFromValue(info, 5) + ) + ); +} + +Napi::Value BindGuiToggleSlider(const Napi::CallbackInfo& info) { + return ToValue(info.Env(), + GuiToggleSlider( + RectangleFromValue(info, 0), + (const char *) stringFromValue(info, 4), + (int *) pointerFromValue(info, 5) ) ); } @@ -4342,7 +4597,7 @@ Napi::Value BindGuiCheckBox(const Napi::CallbackInfo& info) { GuiCheckBox( RectangleFromValue(info, 0), (const char *) stringFromValue(info, 4), - boolFromValue(info, 5) + (bool *) pointerFromValue(info, 5) ) ); } @@ -4352,7 +4607,7 @@ Napi::Value BindGuiComboBox(const Napi::CallbackInfo& info) { GuiComboBox( RectangleFromValue(info, 0), (const char *) stringFromValue(info, 4), - intFromValue(info, 5) + (int *) pointerFromValue(info, 5) ) ); } @@ -4405,24 +4660,13 @@ Napi::Value BindGuiTextBox(const Napi::CallbackInfo& info) { ); } -Napi::Value BindGuiTextBoxMulti(const Napi::CallbackInfo& info) { - return ToValue(info.Env(), - GuiTextBoxMulti( - RectangleFromValue(info, 0), - (char *) pointerFromValue(info, 4), - intFromValue(info, 5), - boolFromValue(info, 6) - ) - ); -} - Napi::Value BindGuiSlider(const Napi::CallbackInfo& info) { return ToValue(info.Env(), GuiSlider( RectangleFromValue(info, 0), (const char *) stringFromValue(info, 4), (const char *) stringFromValue(info, 5), - floatFromValue(info, 6), + (float *) pointerFromValue(info, 6), floatFromValue(info, 7), floatFromValue(info, 8) ) @@ -4435,7 +4679,7 @@ Napi::Value BindGuiSliderBar(const Napi::CallbackInfo& info) { RectangleFromValue(info, 0), (const char *) stringFromValue(info, 4), (const char *) stringFromValue(info, 5), - floatFromValue(info, 6), + (float *) pointerFromValue(info, 6), floatFromValue(info, 7), floatFromValue(info, 8) ) @@ -4448,31 +4692,50 @@ Napi::Value BindGuiProgressBar(const Napi::CallbackInfo& info) { RectangleFromValue(info, 0), (const char *) stringFromValue(info, 4), (const char *) stringFromValue(info, 5), - floatFromValue(info, 6), + (float *) pointerFromValue(info, 6), floatFromValue(info, 7), floatFromValue(info, 8) ) ); } -Napi::Value BindGuiGrid(const Napi::CallbackInfo& info) { +Napi::Value BindGuiStatusBar(const Napi::CallbackInfo& info) { return ToValue(info.Env(), - GuiGrid( + GuiStatusBar( RectangleFromValue(info, 0), - (const char *) stringFromValue(info, 4), - floatFromValue(info, 5), - intFromValue(info, 6) + (const char *) stringFromValue(info, 4) ) ); } -Napi::Value BindGuiListView(const Napi::CallbackInfo& info) { +Napi::Value BindGuiDummyRec(const Napi::CallbackInfo& info) { return ToValue(info.Env(), - GuiListView( + GuiDummyRec( RectangleFromValue(info, 0), - (const char *) stringFromValue(info, 4), - (int *) pointerFromValue(info, 5), - intFromValue(info, 6) + (const char *) stringFromValue(info, 4) + ) + ); +} + +Napi::Value BindGuiGrid(const Napi::CallbackInfo& info) { + return ToValue(info.Env(), + GuiGrid( + RectangleFromValue(info, 0), + (const char *) stringFromValue(info, 4), + floatFromValue(info, 5), + intFromValue(info, 6), + (Vector2 *) pointerFromValue(info, 7) + ) + ); +} + +Napi::Value BindGuiListView(const Napi::CallbackInfo& info) { + return ToValue(info.Env(), + GuiListView( + RectangleFromValue(info, 0), + (const char *) stringFromValue(info, 4), + (int *) pointerFromValue(info, 5), + (int *) pointerFromValue(info, 6) ) ); } @@ -4485,7 +4748,7 @@ Napi::Value BindGuiListViewEx(const Napi::CallbackInfo& info) { intFromValue(info, 5), (int *) pointerFromValue(info, 6), (int *) pointerFromValue(info, 7), - intFromValue(info, 8) + (int *) pointerFromValue(info, 8) ) ); } @@ -4510,7 +4773,7 @@ Napi::Value BindGuiTextInputBox(const Napi::CallbackInfo& info) { (const char *) stringFromValue(info, 6), (char *) pointerFromValue(info, 7), intFromValue(info, 8), - (int *) pointerFromValue(info, 9) + (bool *) pointerFromValue(info, 9) ) ); } @@ -4520,7 +4783,7 @@ Napi::Value BindGuiColorPicker(const Napi::CallbackInfo& info) { GuiColorPicker( RectangleFromValue(info, 0), (const char *) stringFromValue(info, 4), - ColorFromValue(info, 5) + (Color *) pointerFromValue(info, 5) ) ); } @@ -4530,7 +4793,7 @@ Napi::Value BindGuiColorPanel(const Napi::CallbackInfo& info) { GuiColorPanel( RectangleFromValue(info, 0), (const char *) stringFromValue(info, 4), - ColorFromValue(info, 5) + (Color *) pointerFromValue(info, 5) ) ); } @@ -4540,7 +4803,7 @@ Napi::Value BindGuiColorBarAlpha(const Napi::CallbackInfo& info) { GuiColorBarAlpha( RectangleFromValue(info, 0), (const char *) stringFromValue(info, 4), - floatFromValue(info, 5) + (float *) pointerFromValue(info, 5) ) ); } @@ -4550,33 +4813,27 @@ Napi::Value BindGuiColorBarHue(const Napi::CallbackInfo& info) { GuiColorBarHue( RectangleFromValue(info, 0), (const char *) stringFromValue(info, 4), - floatFromValue(info, 5) - ) - ); -} - -Napi::Value BindGuiIconText(const Napi::CallbackInfo& info) { - return ToValue(info.Env(), - GuiIconText( - intFromValue(info, 0), - (const char *) stringFromValue(info, 1) + (float *) pointerFromValue(info, 5) ) ); } -Napi::Value BindGuiGetIcons(const Napi::CallbackInfo& info) { +Napi::Value BindGuiColorPickerHSV(const Napi::CallbackInfo& info) { return ToValue(info.Env(), - GuiGetIcons( - + GuiColorPickerHSV( + RectangleFromValue(info, 0), + (const char *) stringFromValue(info, 4), + (Vector3 *) pointerFromValue(info, 5) ) ); } -Napi::Value BindGuiLoadIcons(const Napi::CallbackInfo& info) { +Napi::Value BindGuiColorPanelHSV(const Napi::CallbackInfo& info) { return ToValue(info.Env(), - GuiLoadIcons( - (const char *) stringFromValue(info, 0), - boolFromValue(info, 1) + GuiColorPanelHSV( + RectangleFromValue(info, 0), + (const char *) stringFromValue(info, 4), + (Vector3 *) pointerFromValue(info, 5) ) ); } @@ -4918,6 +5175,12 @@ void BindToggleFullscreen(const Napi::CallbackInfo& info) { ); } +void BindToggleBorderlessWindowed(const Napi::CallbackInfo& info) { + ToggleBorderlessWindowed( + + ); +} + void BindMaximizeWindow(const Napi::CallbackInfo& info) { MaximizeWindow( @@ -4975,6 +5238,13 @@ void BindSetWindowMinSize(const Napi::CallbackInfo& info) { ); } +void BindSetWindowMaxSize(const Napi::CallbackInfo& info) { + SetWindowMaxSize( + intFromValue(info, 0), + intFromValue(info, 1) + ); +} + void BindSetWindowSize(const Napi::CallbackInfo& info) { SetWindowSize( intFromValue(info, 0), @@ -4988,6 +5258,12 @@ void BindSetWindowOpacity(const Napi::CallbackInfo& info) { ); } +void BindSetWindowFocused(const Napi::CallbackInfo& info) { + SetWindowFocused( + + ); +} + void BindSetClipboardText(const Napi::CallbackInfo& info) { SetClipboardText( (const char *) stringFromValue(info, 0) @@ -5006,24 +5282,6 @@ void BindDisableEventWaiting(const Napi::CallbackInfo& info) { ); } -void BindSwapScreenBuffer(const Napi::CallbackInfo& info) { - SwapScreenBuffer( - - ); -} - -void BindPollInputEvents(const Napi::CallbackInfo& info) { - PollInputEvents( - - ); -} - -void BindWaitTime(const Napi::CallbackInfo& info) { - WaitTime( - doubleFromValue(info, 0) - ); -} - void BindShowCursor(const Napi::CallbackInfo& info) { ShowCursor( @@ -5175,12 +5433,36 @@ void BindSetTargetFPS(const Napi::CallbackInfo& info) { ); } +void BindSwapScreenBuffer(const Napi::CallbackInfo& info) { + SwapScreenBuffer( + + ); +} + +void BindPollInputEvents(const Napi::CallbackInfo& info) { + PollInputEvents( + + ); +} + +void BindWaitTime(const Napi::CallbackInfo& info) { + WaitTime( + doubleFromValue(info, 0) + ); +} + void BindSetRandomSeed(const Napi::CallbackInfo& info) { SetRandomSeed( unsignedintFromValue(info, 0) ); } +void BindUnloadRandomSequence(const Napi::CallbackInfo& info) { + UnloadRandomSequence( + (int *) pointerFromValue(info, 0) + ); +} + void BindTakeScreenshot(const Napi::CallbackInfo& info) { TakeScreenshot( (const char *) stringFromValue(info, 0) @@ -5193,6 +5475,12 @@ void BindSetConfigFlags(const Napi::CallbackInfo& info) { ); } +void BindOpenURL(const Napi::CallbackInfo& info) { + OpenURL( + (const char *) stringFromValue(info, 0) + ); +} + void BindSetTraceLogLevel(const Napi::CallbackInfo& info) { SetTraceLogLevel( intFromValue(info, 0) @@ -5205,12 +5493,6 @@ void BindMemFree(const Napi::CallbackInfo& info) { ); } -void BindOpenURL(const Napi::CallbackInfo& info) { - OpenURL( - (const char *) stringFromValue(info, 0) - ); -} - void BindUnloadFileData(const Napi::CallbackInfo& info) { UnloadFileData( (unsigned char *) pointerFromValue(info, 0) @@ -5235,6 +5517,42 @@ void BindUnloadDroppedFiles(const Napi::CallbackInfo& info) { ); } +void BindUnloadAutomationEventList(const Napi::CallbackInfo& info) { + UnloadAutomationEventList( + (AutomationEventList *) pointerFromValue(info, 0) + ); +} + +void BindSetAutomationEventList(const Napi::CallbackInfo& info) { + SetAutomationEventList( + (AutomationEventList *) pointerFromValue(info, 0) + ); +} + +void BindSetAutomationEventBaseFrame(const Napi::CallbackInfo& info) { + SetAutomationEventBaseFrame( + intFromValue(info, 0) + ); +} + +void BindStartAutomationEventRecording(const Napi::CallbackInfo& info) { + StartAutomationEventRecording( + + ); +} + +void BindStopAutomationEventRecording(const Napi::CallbackInfo& info) { + StopAutomationEventRecording( + + ); +} + +void BindPlayAutomationEvent(const Napi::CallbackInfo& info) { + PlayAutomationEvent( + AutomationEventFromValue(info, 0) + ); +} + void BindSetExitKey(const Napi::CallbackInfo& info) { SetExitKey( intFromValue(info, 0) @@ -5332,6 +5650,14 @@ void BindDrawLineEx(const Napi::CallbackInfo& info) { ); } +void BindDrawLineStrip(const Napi::CallbackInfo& info) { + DrawLineStrip( + (Vector2 *) pointerFromValue(info, 0), + intFromValue(info, 1), + ColorFromValue(info, 2) + ); +} + void BindDrawLineBezier(const Napi::CallbackInfo& info) { DrawLineBezier( Vector2FromValue(info, 0), @@ -5341,35 +5667,6 @@ void BindDrawLineBezier(const Napi::CallbackInfo& info) { ); } -void BindDrawLineBezierQuad(const Napi::CallbackInfo& info) { - DrawLineBezierQuad( - Vector2FromValue(info, 0), - Vector2FromValue(info, 2), - Vector2FromValue(info, 4), - floatFromValue(info, 6), - ColorFromValue(info, 7) - ); -} - -void BindDrawLineBezierCubic(const Napi::CallbackInfo& info) { - DrawLineBezierCubic( - Vector2FromValue(info, 0), - Vector2FromValue(info, 2), - Vector2FromValue(info, 4), - Vector2FromValue(info, 6), - floatFromValue(info, 8), - ColorFromValue(info, 9) - ); -} - -void BindDrawLineStrip(const Napi::CallbackInfo& info) { - DrawLineStrip( - (Vector2 *) pointerFromValue(info, 0), - intFromValue(info, 1), - ColorFromValue(info, 2) - ); -} - void BindDrawCircle(const Napi::CallbackInfo& info) { DrawCircle( intFromValue(info, 0), @@ -5428,6 +5725,14 @@ void BindDrawCircleLines(const Napi::CallbackInfo& info) { ); } +void BindDrawCircleLinesV(const Napi::CallbackInfo& info) { + DrawCircleLinesV( + Vector2FromValue(info, 0), + floatFromValue(info, 2), + ColorFromValue(info, 3) + ); +} + void BindDrawEllipse(const Napi::CallbackInfo& info) { DrawEllipse( intFromValue(info, 0), @@ -5640,6 +5945,103 @@ void BindDrawPolyLinesEx(const Napi::CallbackInfo& info) { ); } +void BindDrawSplineLinear(const Napi::CallbackInfo& info) { + DrawSplineLinear( + (Vector2 *) pointerFromValue(info, 0), + intFromValue(info, 1), + floatFromValue(info, 2), + ColorFromValue(info, 3) + ); +} + +void BindDrawSplineBasis(const Napi::CallbackInfo& info) { + DrawSplineBasis( + (Vector2 *) pointerFromValue(info, 0), + intFromValue(info, 1), + floatFromValue(info, 2), + ColorFromValue(info, 3) + ); +} + +void BindDrawSplineCatmullRom(const Napi::CallbackInfo& info) { + DrawSplineCatmullRom( + (Vector2 *) pointerFromValue(info, 0), + intFromValue(info, 1), + floatFromValue(info, 2), + ColorFromValue(info, 3) + ); +} + +void BindDrawSplineBezierQuadratic(const Napi::CallbackInfo& info) { + DrawSplineBezierQuadratic( + (Vector2 *) pointerFromValue(info, 0), + intFromValue(info, 1), + floatFromValue(info, 2), + ColorFromValue(info, 3) + ); +} + +void BindDrawSplineBezierCubic(const Napi::CallbackInfo& info) { + DrawSplineBezierCubic( + (Vector2 *) pointerFromValue(info, 0), + intFromValue(info, 1), + floatFromValue(info, 2), + ColorFromValue(info, 3) + ); +} + +void BindDrawSplineSegmentLinear(const Napi::CallbackInfo& info) { + DrawSplineSegmentLinear( + Vector2FromValue(info, 0), + Vector2FromValue(info, 2), + floatFromValue(info, 4), + ColorFromValue(info, 5) + ); +} + +void BindDrawSplineSegmentBasis(const Napi::CallbackInfo& info) { + DrawSplineSegmentBasis( + Vector2FromValue(info, 0), + Vector2FromValue(info, 2), + Vector2FromValue(info, 4), + Vector2FromValue(info, 6), + floatFromValue(info, 8), + ColorFromValue(info, 9) + ); +} + +void BindDrawSplineSegmentCatmullRom(const Napi::CallbackInfo& info) { + DrawSplineSegmentCatmullRom( + Vector2FromValue(info, 0), + Vector2FromValue(info, 2), + Vector2FromValue(info, 4), + Vector2FromValue(info, 6), + floatFromValue(info, 8), + ColorFromValue(info, 9) + ); +} + +void BindDrawSplineSegmentBezierQuadratic(const Napi::CallbackInfo& info) { + DrawSplineSegmentBezierQuadratic( + Vector2FromValue(info, 0), + Vector2FromValue(info, 2), + Vector2FromValue(info, 4), + floatFromValue(info, 6), + ColorFromValue(info, 7) + ); +} + +void BindDrawSplineSegmentBezierCubic(const Napi::CallbackInfo& info) { + DrawSplineSegmentBezierCubic( + Vector2FromValue(info, 0), + Vector2FromValue(info, 2), + Vector2FromValue(info, 4), + Vector2FromValue(info, 6), + floatFromValue(info, 8), + ColorFromValue(info, 9) + ); +} + void BindUnloadImage(const Napi::CallbackInfo& info) { UnloadImage( ImageFromValue(info, 0) @@ -5653,6 +6055,13 @@ void BindImageBlurGaussian(const Napi::CallbackInfo& info) { ); } +void BindImageRotate(const Napi::CallbackInfo& info) { + ImageRotate( + (Image *) pointerFromValue(info, 0), + intFromValue(info, 1) + ); +} + void BindUnloadImageColors(const Napi::CallbackInfo& info) { UnloadImageColors( (Color *) pointerFromValue(info, 0) @@ -5867,6 +6276,12 @@ void BindDrawTextCodepoints(const Napi::CallbackInfo& info) { ); } +void BindSetTextLineSpacing(const Napi::CallbackInfo& info) { + SetTextLineSpacing( + intFromValue(info, 0) + ); +} + void BindUnloadUTF8(const Napi::CallbackInfo& info) { UnloadUTF8( (char *) pointerFromValue(info, 0) @@ -6189,7 +6604,7 @@ void BindUpdateModelAnimation(const Napi::CallbackInfo& info) { UpdateModelAnimation( ModelFromValue(info, 0), ModelAnimationFromValue(info, 24), - intFromValue(info, 28) + intFromValue(info, 29) ); } @@ -6202,7 +6617,7 @@ void BindUnloadModelAnimation(const Napi::CallbackInfo& info) { void BindUnloadModelAnimations(const Napi::CallbackInfo& info) { UnloadModelAnimations( (ModelAnimation *) pointerFromValue(info, 0), - unsignedintFromValue(info, 1) + intFromValue(info, 1) ); } @@ -6244,6 +6659,12 @@ void BindUnloadSound(const Napi::CallbackInfo& info) { ); } +void BindUnloadSoundAlias(const Napi::CallbackInfo& info) { + UnloadSoundAlias( + SoundFromValue(info, 0) + ); +} + void BindPlaySound(const Napi::CallbackInfo& info) { PlaySound( SoundFromValue(info, 0) @@ -6463,8 +6884,8 @@ void BindGuiUnlock(const Napi::CallbackInfo& info) { ); } -void BindGuiFade(const Napi::CallbackInfo& info) { - GuiFade( +void BindGuiSetAlpha(const Napi::CallbackInfo& info) { + GuiSetAlpha( floatFromValue(info, 0) ); } @@ -6489,48 +6910,6 @@ void BindGuiSetStyle(const Napi::CallbackInfo& info) { ); } -void BindGuiGroupBox(const Napi::CallbackInfo& info) { - GuiGroupBox( - RectangleFromValue(info, 0), - (const char *) stringFromValue(info, 4) - ); -} - -void BindGuiLine(const Napi::CallbackInfo& info) { - GuiLine( - RectangleFromValue(info, 0), - (const char *) stringFromValue(info, 4) - ); -} - -void BindGuiPanel(const Napi::CallbackInfo& info) { - GuiPanel( - RectangleFromValue(info, 0), - (const char *) stringFromValue(info, 4) - ); -} - -void BindGuiLabel(const Napi::CallbackInfo& info) { - GuiLabel( - RectangleFromValue(info, 0), - (const char *) stringFromValue(info, 4) - ); -} - -void BindGuiStatusBar(const Napi::CallbackInfo& info) { - GuiStatusBar( - RectangleFromValue(info, 0), - (const char *) stringFromValue(info, 4) - ); -} - -void BindGuiDummyRec(const Napi::CallbackInfo& info) { - GuiDummyRec( - RectangleFromValue(info, 0), - (const char *) stringFromValue(info, 4) - ); -} - void BindGuiLoadStyle(const Napi::CallbackInfo& info) { GuiLoadStyle( (const char *) stringFromValue(info, 0) @@ -6561,6 +6940,12 @@ void BindGuiSetTooltip(const Napi::CallbackInfo& info) { ); } +void BindGuiSetIconScale(const Napi::CallbackInfo& info) { + GuiSetIconScale( + intFromValue(info, 0) + ); +} + void BindGuiDrawIcon(const Napi::CallbackInfo& info) { GuiDrawIcon( intFromValue(info, 0), @@ -6571,12 +6956,6 @@ void BindGuiDrawIcon(const Napi::CallbackInfo& info) { ); } -void BindGuiSetIconScale(const Napi::CallbackInfo& info) { - GuiSetIconScale( - intFromValue(info, 0) - ); -} - void BindrlMatrixMode(const Napi::CallbackInfo& info) { rlMatrixMode( intFromValue(info, 0) @@ -6856,6 +7235,20 @@ void BindrlActiveDrawBuffers(const Napi::CallbackInfo& info) { ); } +void BindrlBlitFramebuffer(const Napi::CallbackInfo& info) { + rlBlitFramebuffer( + intFromValue(info, 0), + intFromValue(info, 1), + intFromValue(info, 2), + intFromValue(info, 3), + intFromValue(info, 4), + intFromValue(info, 5), + intFromValue(info, 6), + intFromValue(info, 7), + intFromValue(info, 8) + ); +} + void BindrlEnableColorBlend(const Napi::CallbackInfo& info) { rlEnableColorBlend( @@ -6937,6 +7330,12 @@ void BindrlEnableWireMode(const Napi::CallbackInfo& info) { ); } +void BindrlEnablePointMode(const Napi::CallbackInfo& info) { + rlEnablePointMode( + + ); +} + void BindrlDisableWireMode(const Napi::CallbackInfo& info) { rlDisableWireMode( @@ -7819,8 +8218,8 @@ void BindSetShaderVec4(const Napi::CallbackInfo& info) { Napi::Object Init(Napi::Env env, Napi::Object exports) { exports.Set("BindInitWindow", Napi::Function::New(env, BindInitWindow)); - exports.Set("BindWindowShouldClose", Napi::Function::New(env, BindWindowShouldClose)); exports.Set("BindCloseWindow", Napi::Function::New(env, BindCloseWindow)); + exports.Set("BindWindowShouldClose", Napi::Function::New(env, BindWindowShouldClose)); exports.Set("BindIsWindowReady", Napi::Function::New(env, BindIsWindowReady)); exports.Set("BindIsWindowFullscreen", Napi::Function::New(env, BindIsWindowFullscreen)); exports.Set("BindIsWindowHidden", Napi::Function::New(env, BindIsWindowHidden)); @@ -7832,6 +8231,7 @@ Napi::Object Init(Napi::Env env, Napi::Object exports) { exports.Set("BindSetWindowState", Napi::Function::New(env, BindSetWindowState)); exports.Set("BindClearWindowState", Napi::Function::New(env, BindClearWindowState)); exports.Set("BindToggleFullscreen", Napi::Function::New(env, BindToggleFullscreen)); + exports.Set("BindToggleBorderlessWindowed", Napi::Function::New(env, BindToggleBorderlessWindowed)); exports.Set("BindMaximizeWindow", Napi::Function::New(env, BindMaximizeWindow)); exports.Set("BindMinimizeWindow", Napi::Function::New(env, BindMinimizeWindow)); exports.Set("BindRestoreWindow", Napi::Function::New(env, BindRestoreWindow)); @@ -7841,8 +8241,10 @@ Napi::Object Init(Napi::Env env, Napi::Object exports) { exports.Set("BindSetWindowPosition", Napi::Function::New(env, BindSetWindowPosition)); exports.Set("BindSetWindowMonitor", Napi::Function::New(env, BindSetWindowMonitor)); exports.Set("BindSetWindowMinSize", Napi::Function::New(env, BindSetWindowMinSize)); + exports.Set("BindSetWindowMaxSize", Napi::Function::New(env, BindSetWindowMaxSize)); exports.Set("BindSetWindowSize", Napi::Function::New(env, BindSetWindowSize)); exports.Set("BindSetWindowOpacity", Napi::Function::New(env, BindSetWindowOpacity)); + exports.Set("BindSetWindowFocused", Napi::Function::New(env, BindSetWindowFocused)); exports.Set("BindGetWindowHandle", Napi::Function::New(env, BindGetWindowHandle)); exports.Set("BindGetScreenWidth", Napi::Function::New(env, BindGetScreenWidth)); exports.Set("BindGetScreenHeight", Napi::Function::New(env, BindGetScreenHeight)); @@ -7863,9 +8265,6 @@ Napi::Object Init(Napi::Env env, Napi::Object exports) { exports.Set("BindGetClipboardText", Napi::Function::New(env, BindGetClipboardText)); exports.Set("BindEnableEventWaiting", Napi::Function::New(env, BindEnableEventWaiting)); exports.Set("BindDisableEventWaiting", Napi::Function::New(env, BindDisableEventWaiting)); - exports.Set("BindSwapScreenBuffer", Napi::Function::New(env, BindSwapScreenBuffer)); - exports.Set("BindPollInputEvents", Napi::Function::New(env, BindPollInputEvents)); - exports.Set("BindWaitTime", Napi::Function::New(env, BindWaitTime)); exports.Set("BindShowCursor", Napi::Function::New(env, BindShowCursor)); exports.Set("BindHideCursor", Napi::Function::New(env, BindHideCursor)); exports.Set("BindIsCursorHidden", Napi::Function::New(env, BindIsCursorHidden)); @@ -7904,18 +8303,23 @@ Napi::Object Init(Napi::Env env, Napi::Object exports) { exports.Set("BindGetWorldToScreenEx", Napi::Function::New(env, BindGetWorldToScreenEx)); exports.Set("BindGetWorldToScreen2D", Napi::Function::New(env, BindGetWorldToScreen2D)); exports.Set("BindSetTargetFPS", Napi::Function::New(env, BindSetTargetFPS)); - exports.Set("BindGetFPS", Napi::Function::New(env, BindGetFPS)); exports.Set("BindGetFrameTime", Napi::Function::New(env, BindGetFrameTime)); exports.Set("BindGetTime", Napi::Function::New(env, BindGetTime)); - exports.Set("BindGetRandomValue", Napi::Function::New(env, BindGetRandomValue)); + exports.Set("BindGetFPS", Napi::Function::New(env, BindGetFPS)); + exports.Set("BindSwapScreenBuffer", Napi::Function::New(env, BindSwapScreenBuffer)); + exports.Set("BindPollInputEvents", Napi::Function::New(env, BindPollInputEvents)); + exports.Set("BindWaitTime", Napi::Function::New(env, BindWaitTime)); exports.Set("BindSetRandomSeed", Napi::Function::New(env, BindSetRandomSeed)); + exports.Set("BindGetRandomValue", Napi::Function::New(env, BindGetRandomValue)); + exports.Set("BindLoadRandomSequence", Napi::Function::New(env, BindLoadRandomSequence)); + exports.Set("BindUnloadRandomSequence", Napi::Function::New(env, BindUnloadRandomSequence)); exports.Set("BindTakeScreenshot", Napi::Function::New(env, BindTakeScreenshot)); exports.Set("BindSetConfigFlags", Napi::Function::New(env, BindSetConfigFlags)); + exports.Set("BindOpenURL", Napi::Function::New(env, BindOpenURL)); exports.Set("BindSetTraceLogLevel", Napi::Function::New(env, BindSetTraceLogLevel)); exports.Set("BindMemAlloc", Napi::Function::New(env, BindMemAlloc)); exports.Set("BindMemRealloc", Napi::Function::New(env, BindMemRealloc)); exports.Set("BindMemFree", Napi::Function::New(env, BindMemFree)); - exports.Set("BindOpenURL", Napi::Function::New(env, BindOpenURL)); exports.Set("BindLoadFileData", Napi::Function::New(env, BindLoadFileData)); exports.Set("BindUnloadFileData", Napi::Function::New(env, BindUnloadFileData)); exports.Set("BindSaveFileData", Napi::Function::New(env, BindSaveFileData)); @@ -7947,13 +8351,22 @@ Napi::Object Init(Napi::Env env, Napi::Object exports) { exports.Set("BindDecompressData", Napi::Function::New(env, BindDecompressData)); exports.Set("BindEncodeDataBase64", Napi::Function::New(env, BindEncodeDataBase64)); exports.Set("BindDecodeDataBase64", Napi::Function::New(env, BindDecodeDataBase64)); + exports.Set("BindLoadAutomationEventList", Napi::Function::New(env, BindLoadAutomationEventList)); + exports.Set("BindUnloadAutomationEventList", Napi::Function::New(env, BindUnloadAutomationEventList)); + exports.Set("BindExportAutomationEventList", Napi::Function::New(env, BindExportAutomationEventList)); + exports.Set("BindSetAutomationEventList", Napi::Function::New(env, BindSetAutomationEventList)); + exports.Set("BindSetAutomationEventBaseFrame", Napi::Function::New(env, BindSetAutomationEventBaseFrame)); + exports.Set("BindStartAutomationEventRecording", Napi::Function::New(env, BindStartAutomationEventRecording)); + exports.Set("BindStopAutomationEventRecording", Napi::Function::New(env, BindStopAutomationEventRecording)); + exports.Set("BindPlayAutomationEvent", Napi::Function::New(env, BindPlayAutomationEvent)); exports.Set("BindIsKeyPressed", Napi::Function::New(env, BindIsKeyPressed)); + exports.Set("BindIsKeyPressedRepeat", Napi::Function::New(env, BindIsKeyPressedRepeat)); exports.Set("BindIsKeyDown", Napi::Function::New(env, BindIsKeyDown)); exports.Set("BindIsKeyReleased", Napi::Function::New(env, BindIsKeyReleased)); exports.Set("BindIsKeyUp", Napi::Function::New(env, BindIsKeyUp)); - exports.Set("BindSetExitKey", Napi::Function::New(env, BindSetExitKey)); exports.Set("BindGetKeyPressed", Napi::Function::New(env, BindGetKeyPressed)); exports.Set("BindGetCharPressed", Napi::Function::New(env, BindGetCharPressed)); + exports.Set("BindSetExitKey", Napi::Function::New(env, BindSetExitKey)); exports.Set("BindIsGamepadAvailable", Napi::Function::New(env, BindIsGamepadAvailable)); exports.Set("BindGetGamepadName", Napi::Function::New(env, BindGetGamepadName)); exports.Set("BindIsGamepadButtonPressed", Napi::Function::New(env, BindIsGamepadButtonPressed)); @@ -7999,16 +8412,15 @@ Napi::Object Init(Napi::Env env, Napi::Object exports) { exports.Set("BindDrawLine", Napi::Function::New(env, BindDrawLine)); exports.Set("BindDrawLineV", Napi::Function::New(env, BindDrawLineV)); exports.Set("BindDrawLineEx", Napi::Function::New(env, BindDrawLineEx)); - exports.Set("BindDrawLineBezier", Napi::Function::New(env, BindDrawLineBezier)); - exports.Set("BindDrawLineBezierQuad", Napi::Function::New(env, BindDrawLineBezierQuad)); - exports.Set("BindDrawLineBezierCubic", Napi::Function::New(env, BindDrawLineBezierCubic)); exports.Set("BindDrawLineStrip", Napi::Function::New(env, BindDrawLineStrip)); + exports.Set("BindDrawLineBezier", Napi::Function::New(env, BindDrawLineBezier)); exports.Set("BindDrawCircle", Napi::Function::New(env, BindDrawCircle)); exports.Set("BindDrawCircleSector", Napi::Function::New(env, BindDrawCircleSector)); exports.Set("BindDrawCircleSectorLines", Napi::Function::New(env, BindDrawCircleSectorLines)); exports.Set("BindDrawCircleGradient", Napi::Function::New(env, BindDrawCircleGradient)); exports.Set("BindDrawCircleV", Napi::Function::New(env, BindDrawCircleV)); exports.Set("BindDrawCircleLines", Napi::Function::New(env, BindDrawCircleLines)); + exports.Set("BindDrawCircleLinesV", Napi::Function::New(env, BindDrawCircleLinesV)); exports.Set("BindDrawEllipse", Napi::Function::New(env, BindDrawEllipse)); exports.Set("BindDrawEllipseLines", Napi::Function::New(env, BindDrawEllipseLines)); exports.Set("BindDrawRing", Napi::Function::New(env, BindDrawRing)); @@ -8031,6 +8443,21 @@ Napi::Object Init(Napi::Env env, Napi::Object exports) { exports.Set("BindDrawPoly", Napi::Function::New(env, BindDrawPoly)); exports.Set("BindDrawPolyLines", Napi::Function::New(env, BindDrawPolyLines)); exports.Set("BindDrawPolyLinesEx", Napi::Function::New(env, BindDrawPolyLinesEx)); + exports.Set("BindDrawSplineLinear", Napi::Function::New(env, BindDrawSplineLinear)); + exports.Set("BindDrawSplineBasis", Napi::Function::New(env, BindDrawSplineBasis)); + exports.Set("BindDrawSplineCatmullRom", Napi::Function::New(env, BindDrawSplineCatmullRom)); + exports.Set("BindDrawSplineBezierQuadratic", Napi::Function::New(env, BindDrawSplineBezierQuadratic)); + exports.Set("BindDrawSplineBezierCubic", Napi::Function::New(env, BindDrawSplineBezierCubic)); + exports.Set("BindDrawSplineSegmentLinear", Napi::Function::New(env, BindDrawSplineSegmentLinear)); + exports.Set("BindDrawSplineSegmentBasis", Napi::Function::New(env, BindDrawSplineSegmentBasis)); + exports.Set("BindDrawSplineSegmentCatmullRom", Napi::Function::New(env, BindDrawSplineSegmentCatmullRom)); + exports.Set("BindDrawSplineSegmentBezierQuadratic", Napi::Function::New(env, BindDrawSplineSegmentBezierQuadratic)); + exports.Set("BindDrawSplineSegmentBezierCubic", Napi::Function::New(env, BindDrawSplineSegmentBezierCubic)); + exports.Set("BindGetSplinePointLinear", Napi::Function::New(env, BindGetSplinePointLinear)); + exports.Set("BindGetSplinePointBasis", Napi::Function::New(env, BindGetSplinePointBasis)); + exports.Set("BindGetSplinePointCatmullRom", Napi::Function::New(env, BindGetSplinePointCatmullRom)); + exports.Set("BindGetSplinePointBezierQuad", Napi::Function::New(env, BindGetSplinePointBezierQuad)); + exports.Set("BindGetSplinePointBezierCubic", Napi::Function::New(env, BindGetSplinePointBezierCubic)); exports.Set("BindCheckCollisionRecs", Napi::Function::New(env, BindCheckCollisionRecs)); exports.Set("BindCheckCollisionCircles", Napi::Function::New(env, BindCheckCollisionCircles)); exports.Set("BindCheckCollisionCircleRec", Napi::Function::New(env, BindCheckCollisionCircleRec)); @@ -8043,6 +8470,7 @@ Napi::Object Init(Napi::Env env, Napi::Object exports) { exports.Set("BindGetCollisionRec", Napi::Function::New(env, BindGetCollisionRec)); exports.Set("BindLoadImage", Napi::Function::New(env, BindLoadImage)); exports.Set("BindLoadImageRaw", Napi::Function::New(env, BindLoadImageRaw)); + exports.Set("BindLoadImageSvg", Napi::Function::New(env, BindLoadImageSvg)); exports.Set("BindLoadImageAnim", Napi::Function::New(env, BindLoadImageAnim)); exports.Set("BindLoadImageFromMemory", Napi::Function::New(env, BindLoadImageFromMemory)); exports.Set("BindLoadImageFromTexture", Napi::Function::New(env, BindLoadImageFromTexture)); @@ -8050,11 +8478,12 @@ Napi::Object Init(Napi::Env env, Napi::Object exports) { exports.Set("BindIsImageReady", Napi::Function::New(env, BindIsImageReady)); exports.Set("BindUnloadImage", Napi::Function::New(env, BindUnloadImage)); exports.Set("BindExportImage", Napi::Function::New(env, BindExportImage)); + exports.Set("BindExportImageToMemory", Napi::Function::New(env, BindExportImageToMemory)); exports.Set("BindExportImageAsCode", Napi::Function::New(env, BindExportImageAsCode)); exports.Set("BindGenImageColor", Napi::Function::New(env, BindGenImageColor)); - exports.Set("BindGenImageGradientV", Napi::Function::New(env, BindGenImageGradientV)); - exports.Set("BindGenImageGradientH", Napi::Function::New(env, BindGenImageGradientH)); + exports.Set("BindGenImageGradientLinear", Napi::Function::New(env, BindGenImageGradientLinear)); exports.Set("BindGenImageGradientRadial", Napi::Function::New(env, BindGenImageGradientRadial)); + exports.Set("BindGenImageGradientSquare", Napi::Function::New(env, BindGenImageGradientSquare)); exports.Set("BindGenImageChecked", Napi::Function::New(env, BindGenImageChecked)); exports.Set("BindGenImageWhiteNoise", Napi::Function::New(env, BindGenImageWhiteNoise)); exports.Set("BindGenImagePerlinNoise", Napi::Function::New(env, BindGenImagePerlinNoise)); @@ -8079,6 +8508,7 @@ Napi::Object Init(Napi::Env env, Napi::Object exports) { exports.Set("BindImageDither", Napi::Function::New(env, BindImageDither)); exports.Set("BindImageFlipVertical", Napi::Function::New(env, BindImageFlipVertical)); exports.Set("BindImageFlipHorizontal", Napi::Function::New(env, BindImageFlipHorizontal)); + exports.Set("BindImageRotate", Napi::Function::New(env, BindImageRotate)); exports.Set("BindImageRotateCW", Napi::Function::New(env, BindImageRotateCW)); exports.Set("BindImageRotateCCW", Napi::Function::New(env, BindImageRotateCCW)); exports.Set("BindImageColorTint", Napi::Function::New(env, BindImageColorTint)); @@ -8160,6 +8590,7 @@ Napi::Object Init(Napi::Env env, Napi::Object exports) { exports.Set("BindDrawTextPro", Napi::Function::New(env, BindDrawTextPro)); exports.Set("BindDrawTextCodepoint", Napi::Function::New(env, BindDrawTextCodepoint)); exports.Set("BindDrawTextCodepoints", Napi::Function::New(env, BindDrawTextCodepoints)); + exports.Set("BindSetTextLineSpacing", Napi::Function::New(env, BindSetTextLineSpacing)); exports.Set("BindMeasureText", Napi::Function::New(env, BindMeasureText)); exports.Set("BindMeasureTextEx", Napi::Function::New(env, BindMeasureTextEx)); exports.Set("BindGetGlyphIndex", Napi::Function::New(env, BindGetGlyphIndex)); @@ -8257,15 +8688,18 @@ Napi::Object Init(Napi::Env env, Napi::Object exports) { exports.Set("BindCloseAudioDevice", Napi::Function::New(env, BindCloseAudioDevice)); exports.Set("BindIsAudioDeviceReady", Napi::Function::New(env, BindIsAudioDeviceReady)); exports.Set("BindSetMasterVolume", Napi::Function::New(env, BindSetMasterVolume)); + exports.Set("BindGetMasterVolume", Napi::Function::New(env, BindGetMasterVolume)); exports.Set("BindLoadWave", Napi::Function::New(env, BindLoadWave)); exports.Set("BindLoadWaveFromMemory", Napi::Function::New(env, BindLoadWaveFromMemory)); exports.Set("BindIsWaveReady", Napi::Function::New(env, BindIsWaveReady)); exports.Set("BindLoadSound", Napi::Function::New(env, BindLoadSound)); exports.Set("BindLoadSoundFromWave", Napi::Function::New(env, BindLoadSoundFromWave)); + exports.Set("BindLoadSoundAlias", Napi::Function::New(env, BindLoadSoundAlias)); exports.Set("BindIsSoundReady", Napi::Function::New(env, BindIsSoundReady)); exports.Set("BindUpdateSound", Napi::Function::New(env, BindUpdateSound)); exports.Set("BindUnloadWave", Napi::Function::New(env, BindUnloadWave)); exports.Set("BindUnloadSound", Napi::Function::New(env, BindUnloadSound)); + exports.Set("BindUnloadSoundAlias", Napi::Function::New(env, BindUnloadSoundAlias)); exports.Set("BindExportWave", Napi::Function::New(env, BindExportWave)); exports.Set("BindExportWaveAsCode", Napi::Function::New(env, BindExportWaveAsCode)); exports.Set("BindPlaySound", Napi::Function::New(env, BindPlaySound)); @@ -8391,6 +8825,8 @@ Napi::Object Init(Napi::Env env, Napi::Object exports) { exports.Set("BindVector3Negate", Napi::Function::New(env, BindVector3Negate)); exports.Set("BindVector3Divide", Napi::Function::New(env, BindVector3Divide)); exports.Set("BindVector3Normalize", Napi::Function::New(env, BindVector3Normalize)); + exports.Set("BindVector3Project", Napi::Function::New(env, BindVector3Project)); + exports.Set("BindVector3Reject", Napi::Function::New(env, BindVector3Reject)); exports.Set("BindVector3OrthoNormalize", Napi::Function::New(env, BindVector3OrthoNormalize)); exports.Set("BindVector3Transform", Napi::Function::New(env, BindVector3Transform)); exports.Set("BindVector3RotateByQuaternion", Napi::Function::New(env, BindVector3RotateByQuaternion)); @@ -8454,13 +8890,23 @@ Napi::Object Init(Napi::Env env, Napi::Object exports) { exports.Set("BindGuiLock", Napi::Function::New(env, BindGuiLock)); exports.Set("BindGuiUnlock", Napi::Function::New(env, BindGuiUnlock)); exports.Set("BindGuiIsLocked", Napi::Function::New(env, BindGuiIsLocked)); - exports.Set("BindGuiFade", Napi::Function::New(env, BindGuiFade)); + exports.Set("BindGuiSetAlpha", Napi::Function::New(env, BindGuiSetAlpha)); exports.Set("BindGuiSetState", Napi::Function::New(env, BindGuiSetState)); exports.Set("BindGuiGetState", Napi::Function::New(env, BindGuiGetState)); exports.Set("BindGuiSetFont", Napi::Function::New(env, BindGuiSetFont)); exports.Set("BindGuiGetFont", Napi::Function::New(env, BindGuiGetFont)); exports.Set("BindGuiSetStyle", Napi::Function::New(env, BindGuiSetStyle)); exports.Set("BindGuiGetStyle", Napi::Function::New(env, BindGuiGetStyle)); + exports.Set("BindGuiLoadStyle", Napi::Function::New(env, BindGuiLoadStyle)); + exports.Set("BindGuiLoadStyleDefault", Napi::Function::New(env, BindGuiLoadStyleDefault)); + exports.Set("BindGuiEnableTooltip", Napi::Function::New(env, BindGuiEnableTooltip)); + exports.Set("BindGuiDisableTooltip", Napi::Function::New(env, BindGuiDisableTooltip)); + exports.Set("BindGuiSetTooltip", Napi::Function::New(env, BindGuiSetTooltip)); + exports.Set("BindGuiIconText", Napi::Function::New(env, BindGuiIconText)); + exports.Set("BindGuiSetIconScale", Napi::Function::New(env, BindGuiSetIconScale)); + exports.Set("BindGuiGetIcons", Napi::Function::New(env, BindGuiGetIcons)); + exports.Set("BindGuiLoadIcons", Napi::Function::New(env, BindGuiLoadIcons)); + exports.Set("BindGuiDrawIcon", Napi::Function::New(env, BindGuiDrawIcon)); exports.Set("BindGuiWindowBox", Napi::Function::New(env, BindGuiWindowBox)); exports.Set("BindGuiGroupBox", Napi::Function::New(env, BindGuiGroupBox)); exports.Set("BindGuiLine", Napi::Function::New(env, BindGuiLine)); @@ -8472,13 +8918,13 @@ Napi::Object Init(Napi::Env env, Napi::Object exports) { exports.Set("BindGuiLabelButton", Napi::Function::New(env, BindGuiLabelButton)); exports.Set("BindGuiToggle", Napi::Function::New(env, BindGuiToggle)); exports.Set("BindGuiToggleGroup", Napi::Function::New(env, BindGuiToggleGroup)); + exports.Set("BindGuiToggleSlider", Napi::Function::New(env, BindGuiToggleSlider)); exports.Set("BindGuiCheckBox", Napi::Function::New(env, BindGuiCheckBox)); exports.Set("BindGuiComboBox", Napi::Function::New(env, BindGuiComboBox)); exports.Set("BindGuiDropdownBox", Napi::Function::New(env, BindGuiDropdownBox)); exports.Set("BindGuiSpinner", Napi::Function::New(env, BindGuiSpinner)); exports.Set("BindGuiValueBox", Napi::Function::New(env, BindGuiValueBox)); exports.Set("BindGuiTextBox", Napi::Function::New(env, BindGuiTextBox)); - exports.Set("BindGuiTextBoxMulti", Napi::Function::New(env, BindGuiTextBoxMulti)); exports.Set("BindGuiSlider", Napi::Function::New(env, BindGuiSlider)); exports.Set("BindGuiSliderBar", Napi::Function::New(env, BindGuiSliderBar)); exports.Set("BindGuiProgressBar", Napi::Function::New(env, BindGuiProgressBar)); @@ -8493,16 +8939,8 @@ Napi::Object Init(Napi::Env env, Napi::Object exports) { exports.Set("BindGuiColorPanel", Napi::Function::New(env, BindGuiColorPanel)); exports.Set("BindGuiColorBarAlpha", Napi::Function::New(env, BindGuiColorBarAlpha)); exports.Set("BindGuiColorBarHue", Napi::Function::New(env, BindGuiColorBarHue)); - exports.Set("BindGuiLoadStyle", Napi::Function::New(env, BindGuiLoadStyle)); - exports.Set("BindGuiLoadStyleDefault", Napi::Function::New(env, BindGuiLoadStyleDefault)); - exports.Set("BindGuiEnableTooltip", Napi::Function::New(env, BindGuiEnableTooltip)); - exports.Set("BindGuiDisableTooltip", Napi::Function::New(env, BindGuiDisableTooltip)); - exports.Set("BindGuiSetTooltip", Napi::Function::New(env, BindGuiSetTooltip)); - exports.Set("BindGuiIconText", Napi::Function::New(env, BindGuiIconText)); - exports.Set("BindGuiGetIcons", Napi::Function::New(env, BindGuiGetIcons)); - exports.Set("BindGuiLoadIcons", Napi::Function::New(env, BindGuiLoadIcons)); - exports.Set("BindGuiDrawIcon", Napi::Function::New(env, BindGuiDrawIcon)); - exports.Set("BindGuiSetIconScale", Napi::Function::New(env, BindGuiSetIconScale)); + exports.Set("BindGuiColorPickerHSV", Napi::Function::New(env, BindGuiColorPickerHSV)); + exports.Set("BindGuiColorPanelHSV", Napi::Function::New(env, BindGuiColorPanelHSV)); exports.Set("BindrlMatrixMode", Napi::Function::New(env, BindrlMatrixMode)); exports.Set("BindrlPushMatrix", Napi::Function::New(env, BindrlPushMatrix)); exports.Set("BindrlPopMatrix", Napi::Function::New(env, BindrlPopMatrix)); @@ -8544,6 +8982,7 @@ Napi::Object Init(Napi::Env env, Napi::Object exports) { exports.Set("BindrlEnableFramebuffer", Napi::Function::New(env, BindrlEnableFramebuffer)); exports.Set("BindrlDisableFramebuffer", Napi::Function::New(env, BindrlDisableFramebuffer)); exports.Set("BindrlActiveDrawBuffers", Napi::Function::New(env, BindrlActiveDrawBuffers)); + exports.Set("BindrlBlitFramebuffer", Napi::Function::New(env, BindrlBlitFramebuffer)); exports.Set("BindrlEnableColorBlend", Napi::Function::New(env, BindrlEnableColorBlend)); exports.Set("BindrlDisableColorBlend", Napi::Function::New(env, BindrlDisableColorBlend)); exports.Set("BindrlEnableDepthTest", Napi::Function::New(env, BindrlEnableDepthTest)); @@ -8557,6 +8996,7 @@ Napi::Object Init(Napi::Env env, Napi::Object exports) { exports.Set("BindrlDisableScissorTest", Napi::Function::New(env, BindrlDisableScissorTest)); exports.Set("BindrlScissor", Napi::Function::New(env, BindrlScissor)); exports.Set("BindrlEnableWireMode", Napi::Function::New(env, BindrlEnableWireMode)); + exports.Set("BindrlEnablePointMode", Napi::Function::New(env, BindrlEnablePointMode)); exports.Set("BindrlDisableWireMode", Napi::Function::New(env, BindrlDisableWireMode)); exports.Set("BindrlSetLineWidth", Napi::Function::New(env, BindrlSetLineWidth)); exports.Set("BindrlGetLineWidth", Napi::Function::New(env, BindrlGetLineWidth)); diff --git a/src/generated/node-raylib.d.ts b/src/generated/node-raylib.d.ts index f2ff791..d0a9278 100644 --- a/src/generated/node-raylib.d.ts +++ b/src/generated/node-raylib.d.ts @@ -291,6 +291,8 @@ declare module "raylib" { bones: number /** Poses array by frame. (Transform **) */ framePoses: number + /** Animation name. (char[32]) */ + name: string } /** Ray, ray for raycasting */ export interface Ray { @@ -414,6 +416,24 @@ declare module "raylib" { /** Filepaths entries. (char **) */ paths: number } + /** Automation event */ + export interface AutomationEvent { + /** Event frame. (unsigned int) */ + frame: number + /** Event type (AutomationEventType). (unsigned int) */ + type: number + /** Event parameters (if required). (int[4]) */ + params: number + } + /** Automation event list */ + export interface AutomationEventList { + /** Events max entries (MAX_AUTOMATION_EVENTS). (unsigned int) */ + capacity: number + /** Events entries count. (unsigned int) */ + count: number + /** Events entries. (AutomationEvent *) */ + events: number + } /** Dynamic vertex buffers (position + texcoords + colors + indices arrays) */ export interface rlVertexBuffer { /** Number of elements in the buffer (QUADS). (int) */ @@ -475,12 +495,12 @@ declare module "raylib" { /** Initialize window and OpenGL context */ export function InitWindow(width: number, height: number, title: string): void - /** Check if KEY_ESCAPE pressed or Close icon pressed */ - export function WindowShouldClose(): boolean - /** Close window and unload OpenGL context */ export function CloseWindow(): void + /** Check if application should close (KEY_ESCAPE pressed or windows close icon clicked) */ + export function WindowShouldClose(): boolean + /** Check if window has been initialized successfully */ export function IsWindowReady(): boolean @@ -514,6 +534,9 @@ declare module "raylib" { /** Toggle window state: fullscreen/windowed (only PLATFORM_DESKTOP) */ export function ToggleFullscreen(): void + /** Toggle window state: borderless windowed (only PLATFORM_DESKTOP) */ + export function ToggleBorderlessWindowed(): void + /** Set window state: maximized, if resizable (only PLATFORM_DESKTOP) */ export function MaximizeWindow(): void @@ -529,24 +552,30 @@ declare module "raylib" { /** Set icon for window (multiple images, RGBA 32bit, only PLATFORM_DESKTOP) */ export function SetWindowIcons(images: number, count: number): void - /** Set title for window (only PLATFORM_DESKTOP) */ + /** Set title for window (only PLATFORM_DESKTOP and PLATFORM_WEB) */ export function SetWindowTitle(title: string): void /** Set window position on screen (only PLATFORM_DESKTOP) */ export function SetWindowPosition(x: number, y: number): void - /** Set monitor for the current window (fullscreen mode) */ + /** Set monitor for the current window */ export function SetWindowMonitor(monitor: number): void /** Set window minimum dimensions (for FLAG_WINDOW_RESIZABLE) */ export function SetWindowMinSize(width: number, height: number): void + /** Set window maximum dimensions (for FLAG_WINDOW_RESIZABLE) */ + export function SetWindowMaxSize(width: number, height: number): void + /** Set window dimensions */ export function SetWindowSize(width: number, height: number): void /** Set window opacity [0.0f..1.0f] (only PLATFORM_DESKTOP) */ export function SetWindowOpacity(opacity: number): void + /** Set window focused (only PLATFORM_DESKTOP) */ + export function SetWindowFocused(): void + /** Get native window handle */ export function GetWindowHandle(): number @@ -592,7 +621,7 @@ declare module "raylib" { /** Get window scale DPI factor */ export function GetWindowScaleDPI(): Vector2 - /** Get the human-readable, UTF-8 encoded name of the primary monitor */ + /** Get the human-readable, UTF-8 encoded name of the specified monitor */ export function GetMonitorName(monitor: number): string /** Set clipboard text content */ @@ -607,15 +636,6 @@ declare module "raylib" { /** Disable waiting for events on EndDrawing(), automatic events polling */ export function DisableEventWaiting(): void - /** Swap back buffer with front buffer (screen drawing) */ - export function SwapScreenBuffer(): void - - /** Register all input events */ - export function PollInputEvents(): void - - /** Wait for some time (halt program execution) */ - export function WaitTime(seconds: number): void - /** Shows cursor */ export function ShowCursor(): void @@ -730,27 +750,45 @@ declare module "raylib" { /** Set target FPS (maximum) */ export function SetTargetFPS(fps: number): void - /** Get current FPS */ - export function GetFPS(): number - /** Get time in seconds for last frame drawn (delta time) */ export function GetFrameTime(): number /** Get elapsed time in seconds since InitWindow() */ export function GetTime(): number - /** Get a random value between min and max (both included) */ - export function GetRandomValue(min: number, max: number): number + /** Get current FPS */ + export function GetFPS(): number + + /** Swap back buffer with front buffer (screen drawing) */ + export function SwapScreenBuffer(): void + + /** Register all input events */ + export function PollInputEvents(): void + + /** Wait for some time (halt program execution) */ + export function WaitTime(seconds: number): void /** Set the seed for the random number generator */ export function SetRandomSeed(seed: number): void + /** Get a random value between min and max (both included) */ + export function GetRandomValue(min: number, max: number): number + + /** Load random values sequence, no values repeated */ + export function LoadRandomSequence(count: number, min: number, max: number): number + + /** Unload random values sequence */ + export function UnloadRandomSequence(sequence: number): void + /** Takes a screenshot of current screen (filename extension defines format) */ export function TakeScreenshot(fileName: string): void /** Setup init configuration flags (view FLAGS) */ export function SetConfigFlags(flags: number): void + /** Open URL with default system browser (if available) */ + export function OpenURL(url: string): void + /** Set the current threshold (minimum) log level */ export function SetTraceLogLevel(logLevel: number): void @@ -763,20 +801,17 @@ declare module "raylib" { /** Internal memory free */ export function MemFree(ptr: number): void - /** Open URL with default system browser (if available) */ - export function OpenURL(url: string): void - /** Load file data as byte array (read) */ - export function LoadFileData(fileName: string, bytesRead: number): Buffer + export function LoadFileData(fileName: string, dataSize: number): Buffer /** Unload file data allocated by LoadFileData() */ export function UnloadFileData(data: Buffer): void /** Save data to file from byte array (write), returns true on success */ - export function SaveFileData(fileName: string, data: number, bytesToWrite: number): boolean + export function SaveFileData(fileName: string, data: number, dataSize: number): boolean /** Export data to code (.h), returns true on success */ - export function ExportDataAsCode(data: Buffer, size: number, fileName: string): boolean + export function ExportDataAsCode(data: Buffer, dataSize: number, fileName: string): boolean /** Load text data from file (read), returns a '\0' terminated string */ export function LoadFileText(fileName: string): string @@ -817,7 +852,7 @@ declare module "raylib" { /** Get current working directory (uses static string) */ export function GetWorkingDirectory(): string - /** Get the directory if the running application (uses static string) */ + /** Get the directory of the running application (uses static string) */ export function GetApplicationDirectory(): string /** Change working directory, return true on success */ @@ -859,9 +894,36 @@ declare module "raylib" { /** Decode Base64 string data, memory must be MemFree() */ export function DecodeDataBase64(data: Buffer, outputSize: number): Buffer + /** Load automation events list from file, NULL for empty list, capacity = MAX_AUTOMATION_EVENTS */ + export function LoadAutomationEventList(fileName: string): AutomationEventList + + /** Unload automation events list from file */ + export function UnloadAutomationEventList(list: number): void + + /** Export automation events list as text file */ + export function ExportAutomationEventList(list: AutomationEventList, fileName: string): boolean + + /** Set automation event list to record to */ + export function SetAutomationEventList(list: number): void + + /** Set automation event internal base frame to start recording */ + export function SetAutomationEventBaseFrame(frame: number): void + + /** Start recording automation events (AutomationEventList must be set) */ + export function StartAutomationEventRecording(): void + + /** Stop recording automation events */ + export function StopAutomationEventRecording(): void + + /** Play a recorded automation event */ + export function PlayAutomationEvent(event: AutomationEvent): void + /** Check if a key has been pressed once */ export function IsKeyPressed(key: number): boolean + /** Check if a key has been pressed again (Only PLATFORM_DESKTOP) */ + export function IsKeyPressedRepeat(key: number): boolean + /** Check if a key is being pressed */ export function IsKeyDown(key: number): boolean @@ -871,15 +933,15 @@ declare module "raylib" { /** Check if a key is NOT being pressed */ export function IsKeyUp(key: number): boolean - /** Set a custom key to exit program (default is ESC) */ - export function SetExitKey(key: number): void - /** Get key pressed (keycode), call it multiple times for keys queued, returns 0 when the queue is empty */ export function GetKeyPressed(): number /** Get char pressed (unicode), call it multiple times for chars queued, returns 0 when the queue is empty */ export function GetCharPressed(): number + /** Set a custom key to exit program (default is ESC) */ + export function SetExitKey(key: number): void + /** Check if a gamepad is available */ export function IsGamepadAvailable(gamepad: number): boolean @@ -1009,24 +1071,18 @@ declare module "raylib" { /** Draw a line */ export function DrawLine(startPosX: number, startPosY: number, endPosX: number, endPosY: number, color: Color): void - /** Draw a line (Vector version) */ + /** Draw a line (using gl lines) */ export function DrawLineV(startPos: Vector2, endPos: Vector2, color: Color): void - /** Draw a line defining thickness */ + /** Draw a line (using triangles/quads) */ export function DrawLineEx(startPos: Vector2, endPos: Vector2, thick: number, color: Color): void - /** Draw a line using cubic-bezier curves in-out */ - export function DrawLineBezier(startPos: Vector2, endPos: Vector2, thick: number, color: Color): void - - /** Draw line using quadratic bezier curves with a control point */ - export function DrawLineBezierQuad(startPos: Vector2, endPos: Vector2, controlPos: Vector2, thick: number, color: Color): void - - /** Draw line using cubic bezier curves with 2 control points */ - export function DrawLineBezierCubic(startPos: Vector2, endPos: Vector2, startControlPos: Vector2, endControlPos: Vector2, thick: number, color: Color): void - - /** Draw lines sequence */ + /** Draw lines sequence (using gl lines) */ export function DrawLineStrip(points: number, pointCount: number, color: Color): void + /** Draw line segment cubic-bezier in-out interpolation */ + export function DrawLineBezier(startPos: Vector2, endPos: Vector2, thick: number, color: Color): void + /** Draw a color-filled circle */ export function DrawCircle(centerX: number, centerY: number, radius: number, color: Color): void @@ -1045,6 +1101,9 @@ declare module "raylib" { /** Draw circle outline */ export function DrawCircleLines(centerX: number, centerY: number, radius: number, color: Color): void + /** Draw circle outline (Vector version) */ + export function DrawCircleLinesV(center: Vector2, radius: number, color: Color): void + /** Draw ellipse */ export function DrawEllipse(centerX: number, centerY: number, radiusH: number, radiusV: number, color: Color): void @@ -1111,6 +1170,51 @@ declare module "raylib" { /** Draw a polygon outline of n sides with extended parameters */ export function DrawPolyLinesEx(center: Vector2, sides: number, radius: number, rotation: number, lineThick: number, color: Color): void + /** Draw spline: Linear, minimum 2 points */ + export function DrawSplineLinear(points: number, pointCount: number, thick: number, color: Color): void + + /** Draw spline: B-Spline, minimum 4 points */ + export function DrawSplineBasis(points: number, pointCount: number, thick: number, color: Color): void + + /** Draw spline: Catmull-Rom, minimum 4 points */ + export function DrawSplineCatmullRom(points: number, pointCount: number, thick: number, color: Color): void + + /** Draw spline: Quadratic Bezier, minimum 3 points (1 control point): [p1, c2, p3, c4...] */ + export function DrawSplineBezierQuadratic(points: number, pointCount: number, thick: number, color: Color): void + + /** Draw spline: Cubic Bezier, minimum 4 points (2 control points): [p1, c2, c3, p4, c5, c6...] */ + export function DrawSplineBezierCubic(points: number, pointCount: number, thick: number, color: Color): void + + /** Draw spline segment: Linear, 2 points */ + export function DrawSplineSegmentLinear(p1: Vector2, p2: Vector2, thick: number, color: Color): void + + /** Draw spline segment: B-Spline, 4 points */ + export function DrawSplineSegmentBasis(p1: Vector2, p2: Vector2, p3: Vector2, p4: Vector2, thick: number, color: Color): void + + /** Draw spline segment: Catmull-Rom, 4 points */ + export function DrawSplineSegmentCatmullRom(p1: Vector2, p2: Vector2, p3: Vector2, p4: Vector2, thick: number, color: Color): void + + /** Draw spline segment: Quadratic Bezier, 2 points, 1 control point */ + export function DrawSplineSegmentBezierQuadratic(p1: Vector2, c2: Vector2, p3: Vector2, thick: number, color: Color): void + + /** Draw spline segment: Cubic Bezier, 2 points, 2 control points */ + export function DrawSplineSegmentBezierCubic(p1: Vector2, c2: Vector2, c3: Vector2, p4: Vector2, thick: number, color: Color): void + + /** Get (evaluate) spline point: Linear */ + export function GetSplinePointLinear(startPos: Vector2, endPos: Vector2, t: number): Vector2 + + /** Get (evaluate) spline point: B-Spline */ + export function GetSplinePointBasis(p1: Vector2, p2: Vector2, p3: Vector2, p4: Vector2, t: number): Vector2 + + /** Get (evaluate) spline point: Catmull-Rom */ + export function GetSplinePointCatmullRom(p1: Vector2, p2: Vector2, p3: Vector2, p4: Vector2, t: number): Vector2 + + /** Get (evaluate) spline point: Quadratic Bezier */ + export function GetSplinePointBezierQuad(p1: Vector2, c2: Vector2, p3: Vector2, t: number): Vector2 + + /** Get (evaluate) spline point: Cubic Bezier */ + export function GetSplinePointBezierCubic(p1: Vector2, c2: Vector2, c3: Vector2, p4: Vector2, t: number): Vector2 + /** Check collision between two rectangles */ export function CheckCollisionRecs(rec1: Rectangle, rec2: Rectangle): boolean @@ -1147,6 +1251,9 @@ declare module "raylib" { /** Load image from RAW file data */ export function LoadImageRaw(fileName: string, width: number, height: number, format: number, headerSize: number): Image + /** Load image from SVG file data or string with specified size */ + export function LoadImageSvg(fileNameOrString: string, width: number, height: number): Image + /** Load image sequence from file (frames appended to image.data) */ export function LoadImageAnim(fileName: string, frames: number): Image @@ -1168,21 +1275,24 @@ declare module "raylib" { /** Export image data to file, returns true on success */ export function ExportImage(image: Image, fileName: string): boolean + /** Export image to memory buffer */ + export function ExportImageToMemory(image: Image, fileType: string, fileSize: number): Buffer + /** Export image as code file defining an array of bytes, returns true on success */ export function ExportImageAsCode(image: Image, fileName: string): boolean /** Generate image: plain color */ export function GenImageColor(width: number, height: number, color: Color): Image - /** Generate image: vertical gradient */ - export function GenImageGradientV(width: number, height: number, top: Color, bottom: Color): Image - - /** Generate image: horizontal gradient */ - export function GenImageGradientH(width: number, height: number, left: Color, right: Color): Image + /** Generate image: linear gradient, direction in degrees [0..360], 0=Vertical gradient */ + export function GenImageGradientLinear(width: number, height: number, direction: number, start: Color, end: Color): Image /** Generate image: radial gradient */ export function GenImageGradientRadial(width: number, height: number, density: number, inner: Color, outer: Color): Image + /** Generate image: square gradient */ + export function GenImageGradientSquare(width: number, height: number, density: number, inner: Color, outer: Color): Image + /** Generate image: checked */ export function GenImageChecked(width: number, height: number, checksX: number, checksY: number, col1: Color, col2: Color): Image @@ -1255,6 +1365,9 @@ declare module "raylib" { /** Flip image horizontally */ export function ImageFlipHorizontal(image: Image): void + /** Rotate image by input angle in degrees (-359 to 359) */ + export function ImageRotate(image: number, degrees: number): void + /** Rotate image clockwise 90deg */ export function ImageRotateCW(image: Image): void @@ -1453,26 +1566,26 @@ declare module "raylib" { /** Load font from file into GPU memory (VRAM) */ export function LoadFont(fileName: string): Font - /** Load font from file with extended parameters, use NULL for fontChars and 0 for glyphCount to load the default character set */ - export function LoadFontEx(fileName: string, fontSize: number, fontChars: number, glyphCount: number): Font + /** Load font from file with extended parameters, use NULL for codepoints and 0 for codepointCount to load the default character setFont */ + export function LoadFontEx(fileName: string, fontSize: number, codepoints: number, codepointCount: number): Font /** Load font from Image (XNA style) */ export function LoadFontFromImage(image: Image, key: Color, firstChar: number): Font /** Load font from memory buffer, fileType refers to extension: i.e. '.ttf' */ - export function LoadFontFromMemory(fileType: string, fileData: Buffer, dataSize: number, fontSize: number, fontChars: number, glyphCount: number): Font + export function LoadFontFromMemory(fileType: string, fileData: Buffer, dataSize: number, fontSize: number, codepoints: number, codepointCount: number): Font /** Check if a font is ready */ export function IsFontReady(font: Font): boolean /** Load font data for further use */ - export function LoadFontData(fileData: Buffer, dataSize: number, fontSize: number, fontChars: number, glyphCount: number, type: number): number + export function LoadFontData(fileData: Buffer, dataSize: number, fontSize: number, codepoints: number, codepointCount: number, type: number): number /** Generate image font atlas using chars info */ - export function GenImageFontAtlas(chars: number, recs: number, glyphCount: number, fontSize: number, padding: number, packMethod: number): Image + export function GenImageFontAtlas(glyphs: number, glyphRecs: number, glyphCount: number, fontSize: number, padding: number, packMethod: number): Image /** Unload font chars info data (RAM) */ - export function UnloadFontData(chars: number, glyphCount: number): void + export function UnloadFontData(glyphs: number, glyphCount: number): void /** Unload font from GPU memory (VRAM) */ export function UnloadFont(font: Font): void @@ -1496,7 +1609,10 @@ declare module "raylib" { export function DrawTextCodepoint(font: Font, codepoint: number, position: Vector2, fontSize: number, tint: Color): void /** Draw multiple character (codepoint) */ - export function DrawTextCodepoints(font: Font, codepoints: number, count: number, position: Vector2, fontSize: number, spacing: number, tint: Color): void + export function DrawTextCodepoints(font: Font, codepoints: number, codepointCount: number, position: Vector2, fontSize: number, spacing: number, tint: Color): void + + /** Set vertical line spacing when drawing with line-breaks */ + export function SetTextLineSpacing(spacing: number): void /** Measure string width for default font */ export function MeasureText(text: string, fontSize: number): number @@ -1748,7 +1864,7 @@ declare module "raylib" { export function UnloadModelAnimation(anim: ModelAnimation): void /** Unload animation array data */ - export function UnloadModelAnimations(animations: number, count: number): void + export function UnloadModelAnimations(animations: number, animCount: number): void /** Check model animation skeleton match */ export function IsModelAnimationValid(model: Model, anim: ModelAnimation): boolean @@ -1789,6 +1905,9 @@ declare module "raylib" { /** Set master volume (listener) */ export function SetMasterVolume(volume: number): void + /** Get master volume (listener) */ + export function GetMasterVolume(): number + /** Load wave data from file */ export function LoadWave(fileName: string): Wave @@ -1804,6 +1923,9 @@ declare module "raylib" { /** Load sound from wave data */ export function LoadSoundFromWave(wave: Wave): Sound + /** Create a new sound that shares the same sample data as the source sound, does not own the sound data */ + export function LoadSoundAlias(source: Sound): Sound + /** Checks if a sound is ready */ export function IsSoundReady(sound: Sound): boolean @@ -1816,6 +1938,9 @@ declare module "raylib" { /** Unload sound */ export function UnloadSound(sound: Sound): void + /** Unload a sound alias (does not deallocate sample data) */ + export function UnloadSoundAlias(alias: Sound): void + /** Export wave data to file, returns true on success */ export function ExportWave(wave: Wave, fileName: string): boolean @@ -2191,6 +2316,12 @@ declare module "raylib" { /** */ export function Vector3Normalize(v: Vector3): Vector3 + /** */ + export function Vector3Project(v1: Vector3, v2: Vector3): Vector3 + + /** */ + export function Vector3Reject(v1: Vector3, v2: Vector3): Vector3 + /** */ export function Vector3OrthoNormalize(v1: number, v2: number): void @@ -2288,10 +2419,10 @@ declare module "raylib" { export function MatrixFrustum(left: number, right: number, bottom: number, top: number, near: number, far: number): Matrix /** */ - export function MatrixPerspective(fovy: number, aspect: number, near: number, far: number): Matrix + export function MatrixPerspective(fovY: number, aspect: number, nearPlane: number, farPlane: number): Matrix /** */ - export function MatrixOrtho(left: number, right: number, bottom: number, top: number, near: number, far: number): Matrix + export function MatrixOrtho(left: number, right: number, bottom: number, top: number, nearPlane: number, farPlane: number): Matrix /** */ export function MatrixLookAt(eye: Vector3, target: Vector3, up: Vector3): Matrix @@ -2381,7 +2512,7 @@ declare module "raylib" { export function GuiIsLocked(): boolean /** Set gui controls alpha (global state), alpha goes from 0.0f to 1.0f */ - export function GuiFade(alpha: number): void + export function GuiSetAlpha(alpha: number): void /** Set gui state (global state) */ export function GuiSetState(state: number): void @@ -2401,59 +2532,89 @@ declare module "raylib" { /** Get one style property */ export function GuiGetStyle(control: number, property: number): number + /** Load style file over global style variable (.rgs) */ + export function GuiLoadStyle(fileName: string): void + + /** Load style default over global style */ + export function GuiLoadStyleDefault(): void + + /** Enable gui tooltips (global state) */ + export function GuiEnableTooltip(): void + + /** Disable gui tooltips (global state) */ + export function GuiDisableTooltip(): void + + /** Set tooltip string */ + export function GuiSetTooltip(tooltip: string): void + + /** Get text with icon id prepended (if supported) */ + export function GuiIconText(iconId: number, text: string): string + + /** Set default icon drawing size */ + export function GuiSetIconScale(scale: number): void + + /** Get raygui icons data pointer */ + export function GuiGetIcons(): number + + /** Load raygui icons file (.rgi) into internal icons data */ + export function GuiLoadIcons(fileName: string, loadIconsName: boolean): number + + /** Draw icon using pixel size at specified position */ + export function GuiDrawIcon(iconId: number, posX: number, posY: number, pixelSize: number, color: Color): void + /** Window Box control, shows a window that can be closed */ - export function GuiWindowBox(bounds: Rectangle, title: string): boolean + export function GuiWindowBox(bounds: Rectangle, title: string): number /** Group Box control with text name */ - export function GuiGroupBox(bounds: Rectangle, text: string): void + export function GuiGroupBox(bounds: Rectangle, text: string): number /** Line separator control, could contain text */ - export function GuiLine(bounds: Rectangle, text: string): void + export function GuiLine(bounds: Rectangle, text: string): number /** Panel control, useful to group controls */ - export function GuiPanel(bounds: Rectangle, text: string): void + export function GuiPanel(bounds: Rectangle, text: string): number /** Tab Bar control, returns TAB to be closed or -1 */ export function GuiTabBar(bounds: Rectangle, text: number, count: number, active: number): number /** Scroll Panel control */ - export function GuiScrollPanel(bounds: Rectangle, text: string, content: Rectangle, scroll: number): Rectangle + export function GuiScrollPanel(bounds: Rectangle, text: string, content: Rectangle, scroll: number, view: number): number /** Label control, shows text */ - export function GuiLabel(bounds: Rectangle, text: string): void + export function GuiLabel(bounds: Rectangle, text: string): number /** Button control, returns true when clicked */ - export function GuiButton(bounds: Rectangle, text: string): boolean + export function GuiButton(bounds: Rectangle, text: string): number /** Label button control, show true when clicked */ - export function GuiLabelButton(bounds: Rectangle, text: string): boolean + export function GuiLabelButton(bounds: Rectangle, text: string): number /** Toggle Button control, returns true when active */ - export function GuiToggle(bounds: Rectangle, text: string, active: boolean): boolean + export function GuiToggle(bounds: Rectangle, text: string, active: number): number /** Toggle Group control, returns active toggle index */ export function GuiToggleGroup(bounds: Rectangle, text: string, active: number): number + /** Toggle Slider control, returns true when clicked */ + export function GuiToggleSlider(bounds: Rectangle, text: string, active: number): number + /** Check Box control, returns true when active */ - export function GuiCheckBox(bounds: Rectangle, text: string, checked: boolean): boolean + export function GuiCheckBox(bounds: Rectangle, text: string, checked: number): number /** Combo Box control, returns selected item index */ export function GuiComboBox(bounds: Rectangle, text: string, active: number): number /** Dropdown Box control, returns selected item */ - export function GuiDropdownBox(bounds: Rectangle, text: string, active: number, editMode: boolean): boolean + export function GuiDropdownBox(bounds: Rectangle, text: string, active: number, editMode: boolean): number /** Spinner control, returns selected value */ - export function GuiSpinner(bounds: Rectangle, text: string, value: number, minValue: number, maxValue: number, editMode: boolean): boolean + export function GuiSpinner(bounds: Rectangle, text: string, value: number, minValue: number, maxValue: number, editMode: boolean): number /** Value Box control, updates input text with numbers */ - export function GuiValueBox(bounds: Rectangle, text: string, value: number, minValue: number, maxValue: number, editMode: boolean): boolean + export function GuiValueBox(bounds: Rectangle, text: string, value: number, minValue: number, maxValue: number, editMode: boolean): number /** Text Box control, updates input text */ - export function GuiTextBox(bounds: Rectangle, text: string, textSize: number, editMode: boolean): boolean - - /** Text Box control with multiple lines */ - export function GuiTextBoxMulti(bounds: Rectangle, text: string, textSize: number, editMode: boolean): boolean + export function GuiTextBox(bounds: Rectangle, text: string, textSize: number, editMode: boolean): number /** Slider control, returns selected value */ export function GuiSlider(bounds: Rectangle, textLeft: string, textRight: string, value: number, minValue: number, maxValue: number): number @@ -2465,19 +2626,19 @@ declare module "raylib" { export function GuiProgressBar(bounds: Rectangle, textLeft: string, textRight: string, value: number, minValue: number, maxValue: number): number /** Status Bar control, shows info text */ - export function GuiStatusBar(bounds: Rectangle, text: string): void + export function GuiStatusBar(bounds: Rectangle, text: string): number /** Dummy control for placeholders */ - export function GuiDummyRec(bounds: Rectangle, text: string): void + export function GuiDummyRec(bounds: Rectangle, text: string): number /** Grid control, returns mouse cell position */ - export function GuiGrid(bounds: Rectangle, text: string, spacing: number, subdivs: number): Vector2 + export function GuiGrid(bounds: Rectangle, text: string, spacing: number, subdivs: number, mouseCell: number): number /** List View control, returns selected list item index */ export function GuiListView(bounds: Rectangle, text: string, scrollIndex: number, active: number): number /** List View with extended parameters */ - export function GuiListViewEx(bounds: Rectangle, text: number, count: number, focus: number, scrollIndex: number, active: number): number + export function GuiListViewEx(bounds: Rectangle, text: number, count: number, scrollIndex: number, active: number, focus: number): number /** Message Box control, displays a message */ export function GuiMessageBox(bounds: Rectangle, title: string, message: string, buttons: string): number @@ -2486,10 +2647,10 @@ declare module "raylib" { export function GuiTextInputBox(bounds: Rectangle, title: string, message: string, buttons: string, text: string, textMaxSize: number, secretViewActive: number): number /** Color Picker control (multiple color controls) */ - export function GuiColorPicker(bounds: Rectangle, text: string, color: Color): Color + export function GuiColorPicker(bounds: Rectangle, text: string, color: number): number /** Color Panel control */ - export function GuiColorPanel(bounds: Rectangle, text: string, color: Color): Color + export function GuiColorPanel(bounds: Rectangle, text: string, color: number): number /** Color Bar Alpha control */ export function GuiColorBarAlpha(bounds: Rectangle, text: string, alpha: number): number @@ -2497,35 +2658,11 @@ declare module "raylib" { /** Color Bar Hue control */ export function GuiColorBarHue(bounds: Rectangle, text: string, value: number): number - /** Load style file over global style variable (.rgs) */ - export function GuiLoadStyle(fileName: string): void - - /** Load style default over global style */ - export function GuiLoadStyleDefault(): void - - /** Enable gui tooltips (global state) */ - export function GuiEnableTooltip(): void - - /** Disable gui tooltips (global state) */ - export function GuiDisableTooltip(): void - - /** Set tooltip string */ - export function GuiSetTooltip(tooltip: string): void - - /** Get text with icon id prepended (if supported) */ - export function GuiIconText(iconId: number, text: string): string - - /** Get raygui icons data pointer */ - export function GuiGetIcons(): number + /** Color Picker control that avoids conversion to RGB on each call (multiple color controls) */ + export function GuiColorPickerHSV(bounds: Rectangle, text: string, colorHsv: number): number - /** Load raygui icons file (.rgi) into internal icons data */ - export function GuiLoadIcons(fileName: string, loadIconsName: boolean): number - - /** */ - export function GuiDrawIcon(iconId: number, posX: number, posY: number, pixelSize: number, color: Color): void - - /** Set icon drawing size */ - export function GuiSetIconScale(scale: number): void + /** Color Panel control that returns HSV color value, used by GuiColorPickerHSV() */ + export function GuiColorPanelHSV(bounds: Rectangle, text: string, colorHsv: number): number /** Choose the current matrix to be transformed */ export function rlMatrixMode(mode: number): void @@ -2650,6 +2787,9 @@ declare module "raylib" { /** Activate multiple draw color buffers */ export function rlActiveDrawBuffers(count: number): void + /** Blit active framebuffer to main framebuffer */ + export function rlBlitFramebuffer(srcX: number, srcY: number, srcWidth: number, srcHeight: number, dstX: number, dstY: number, dstWidth: number, dstHeight: number, bufferMask: number): void + /** Enable color blending */ export function rlEnableColorBlend(): void @@ -2689,7 +2829,10 @@ declare module "raylib" { /** Enable wire mode */ export function rlEnableWireMode(): void - /** Disable wire mode */ + /** Enable point mode */ + export function rlEnablePointMode(): void + + /** Disable wire mode ( and point ) maybe rename */ export function rlDisableWireMode(): void /** Set the line drawing width */ @@ -3000,6 +3143,8 @@ declare module "raylib" { export const FLAG_WINDOW_HIGHDPI = 8192 /** Set to support mouse passthrough, only supported when FLAG_WINDOW_UNDECORATED */ export const FLAG_WINDOW_MOUSE_PASSTHROUGH = 16384 + /** Set to run program in borderless windowed mode */ + export const FLAG_BORDERLESS_WINDOWED_MODE = 32768 /** Set to try enabling MSAA 4X */ export const FLAG_MSAA_4X_HINT = 32 /** Set to try enabling interlaced video format (for V3D) */ @@ -3444,28 +3589,34 @@ declare module "raylib" { export const PIXELFORMAT_UNCOMPRESSED_R32G32B32 = 9 /** 32*4 bpp (4 channels - float) */ export const PIXELFORMAT_UNCOMPRESSED_R32G32B32A32 = 10 + /** 16 bpp (1 channel - half float) */ + export const PIXELFORMAT_UNCOMPRESSED_R16 = 11 + /** 16*3 bpp (3 channels - half float) */ + export const PIXELFORMAT_UNCOMPRESSED_R16G16B16 = 12 + /** 16*4 bpp (4 channels - half float) */ + export const PIXELFORMAT_UNCOMPRESSED_R16G16B16A16 = 13 /** 4 bpp (no alpha) */ - export const PIXELFORMAT_COMPRESSED_DXT1_RGB = 11 + export const PIXELFORMAT_COMPRESSED_DXT1_RGB = 14 /** 4 bpp (1 bit alpha) */ - export const PIXELFORMAT_COMPRESSED_DXT1_RGBA = 12 + export const PIXELFORMAT_COMPRESSED_DXT1_RGBA = 15 /** 8 bpp */ - export const PIXELFORMAT_COMPRESSED_DXT3_RGBA = 13 + export const PIXELFORMAT_COMPRESSED_DXT3_RGBA = 16 /** 8 bpp */ - export const PIXELFORMAT_COMPRESSED_DXT5_RGBA = 14 + export const PIXELFORMAT_COMPRESSED_DXT5_RGBA = 17 /** 4 bpp */ - export const PIXELFORMAT_COMPRESSED_ETC1_RGB = 15 + export const PIXELFORMAT_COMPRESSED_ETC1_RGB = 18 /** 4 bpp */ - export const PIXELFORMAT_COMPRESSED_ETC2_RGB = 16 + export const PIXELFORMAT_COMPRESSED_ETC2_RGB = 19 /** 8 bpp */ - export const PIXELFORMAT_COMPRESSED_ETC2_EAC_RGBA = 17 + export const PIXELFORMAT_COMPRESSED_ETC2_EAC_RGBA = 20 /** 4 bpp */ - export const PIXELFORMAT_COMPRESSED_PVRT_RGB = 18 + export const PIXELFORMAT_COMPRESSED_PVRT_RGB = 21 /** 4 bpp */ - export const PIXELFORMAT_COMPRESSED_PVRT_RGBA = 19 + export const PIXELFORMAT_COMPRESSED_PVRT_RGBA = 22 /** 8 bpp */ - export const PIXELFORMAT_COMPRESSED_ASTC_4x4_RGBA = 20 + export const PIXELFORMAT_COMPRESSED_ASTC_4x4_RGBA = 23 /** 2 bpp */ - export const PIXELFORMAT_COMPRESSED_ASTC_8x8_RGBA = 21 + export const PIXELFORMAT_COMPRESSED_ASTC_8x8_RGBA = 24 /** No filter, just pixel approximation */ export const TEXTURE_FILTER_POINT = 0 /** Linear filtering */ @@ -3577,6 +3728,18 @@ declare module "raylib" { /** */ export const TEXT_ALIGN_RIGHT = 2 /** */ + export const TEXT_ALIGN_TOP = 0 + /** */ + export const TEXT_ALIGN_MIDDLE = 1 + /** */ + export const TEXT_ALIGN_BOTTOM = 2 + /** */ + export const TEXT_WRAP_NONE = 0 + /** */ + export const TEXT_WRAP_CHAR = 1 + /** */ + export const TEXT_WRAP_WORD = 2 + /** */ export const DEFAULT = 0 /** Used also for: LABELBUTTON */ export const LABEL = 1 @@ -3584,7 +3747,7 @@ declare module "raylib" { export const BUTTON = 2 /** Used also for: TOGGLEGROUP */ export const TOGGLE = 3 - /** Used also for: SLIDERBAR */ + /** Used also for: SLIDERBAR, TOGGLESLIDER */ export const SLIDER = 4 /** */ export const PROGRESSBAR = 5 @@ -3608,38 +3771,36 @@ declare module "raylib" { export const SCROLLBAR = 14 /** */ export const STATUSBAR = 15 - /** */ + /** Control border color in STATE_NORMAL */ export const BORDER_COLOR_NORMAL = 0 - /** */ + /** Control base color in STATE_NORMAL */ export const BASE_COLOR_NORMAL = 1 - /** */ + /** Control text color in STATE_NORMAL */ export const TEXT_COLOR_NORMAL = 2 - /** */ + /** Control border color in STATE_FOCUSED */ export const BORDER_COLOR_FOCUSED = 3 - /** */ + /** Control base color in STATE_FOCUSED */ export const BASE_COLOR_FOCUSED = 4 - /** */ + /** Control text color in STATE_FOCUSED */ export const TEXT_COLOR_FOCUSED = 5 - /** */ + /** Control border color in STATE_PRESSED */ export const BORDER_COLOR_PRESSED = 6 - /** */ + /** Control base color in STATE_PRESSED */ export const BASE_COLOR_PRESSED = 7 - /** */ + /** Control text color in STATE_PRESSED */ export const TEXT_COLOR_PRESSED = 8 - /** */ + /** Control border color in STATE_DISABLED */ export const BORDER_COLOR_DISABLED = 9 - /** */ + /** Control base color in STATE_DISABLED */ export const BASE_COLOR_DISABLED = 10 - /** */ + /** Control text color in STATE_DISABLED */ export const TEXT_COLOR_DISABLED = 11 - /** */ + /** Control border size, 0 for no border */ export const BORDER_WIDTH = 12 - /** */ + /** Control text padding, not considering border */ export const TEXT_PADDING = 13 - /** */ + /** Control text horizontal alignment inside control text bound (after border and padding) */ export const TEXT_ALIGNMENT = 14 - /** */ - export const RESERVED = 15 /** Text size (glyphs max height) */ export const TEXT_SIZE = 16 /** Text spacing between glyphs */ @@ -3648,6 +3809,12 @@ declare module "raylib" { export const LINE_COLOR = 18 /** Background color */ export const BACKGROUND_COLOR = 19 + /** Text spacing between lines */ + export const TEXT_LINE_SPACING = 20 + /** Text vertical alignment inside text bounds (after border and padding) */ + export const TEXT_ALIGNMENT_VERTICAL = 21 + /** Text wrap-mode inside text bounds */ + export const TEXT_WRAP_MODE = 22 /** ToggleGroup separation between toggles */ export const GROUP_PADDING = 16 /** Slider size of internal bar */ @@ -3656,17 +3823,17 @@ declare module "raylib" { export const SLIDER_PADDING = 17 /** ProgressBar internal padding */ export const PROGRESS_PADDING = 16 - /** */ + /** ScrollBar arrows size */ export const ARROWS_SIZE = 16 - /** */ + /** ScrollBar arrows visible */ export const ARROWS_VISIBLE = 17 - /** (SLIDERBAR, SLIDER_PADDING) */ + /** ScrollBar slider internal padding */ export const SCROLL_SLIDER_PADDING = 18 - /** */ + /** ScrollBar slider size */ export const SCROLL_SLIDER_SIZE = 19 - /** */ + /** ScrollBar scroll padding from arrows */ export const SCROLL_PADDING = 20 - /** */ + /** ScrollBar scrolling speed */ export const SCROLL_SPEED = 21 /** CheckBox internal check padding */ export const CHECK_PADDING = 16 @@ -3678,10 +3845,8 @@ declare module "raylib" { export const ARROW_PADDING = 16 /** DropdownBox items separation */ export const DROPDOWN_ITEMS_SPACING = 17 - /** TextBox/TextBoxMulti/ValueBox/Spinner inner text padding */ - export const TEXT_INNER_PADDING = 16 - /** TextBoxMulti lines separation */ - export const TEXT_LINES_SPACING = 17 + /** TextBox in read-only mode: 0-text editable, 1-text no-editable */ + export const TEXT_READONLY = 16 /** Spinner left/right buttons width */ export const SPIN_BUTTON_WIDTH = 16 /** Spinner buttons separation */ @@ -3692,7 +3857,7 @@ declare module "raylib" { export const LIST_ITEMS_SPACING = 17 /** ListView scrollbar size (usually width) */ export const SCROLLBAR_WIDTH = 18 - /** ListView scrollbar side (0-left, 1-right) */ + /** ListView scrollbar side (0-SCROLLBAR_LEFT_SIDE, 1-SCROLLBAR_RIGHT_SIDE) */ export const SCROLLBAR_SIDE = 19 /** */ export const COLOR_SELECTOR_SIZE = 16 @@ -4143,7 +4308,7 @@ declare module "raylib" { /** */ export const ICON_FILE = 218 /** */ - export const ICON_219 = 219 + export const ICON_SAND_TIMER = 219 /** */ export const ICON_220 = 220 /** */ @@ -4226,6 +4391,8 @@ declare module "raylib" { export const RL_OPENGL_43 = 4 /** OpenGL ES 2.0 (GLSL 100) */ export const RL_OPENGL_ES_20 = 5 + /** OpenGL ES 3.0 (GLSL 300 es) */ + export const RL_OPENGL_ES_30 = 6 /** Display all logs */ export const RL_LOG_ALL = 0 /** Trace logging, intended for internal use only */ @@ -4262,28 +4429,34 @@ declare module "raylib" { export const RL_PIXELFORMAT_UNCOMPRESSED_R32G32B32 = 9 /** 32*4 bpp (4 channels - float) */ export const RL_PIXELFORMAT_UNCOMPRESSED_R32G32B32A32 = 10 + /** 16 bpp (1 channel - half float) */ + export const RL_PIXELFORMAT_UNCOMPRESSED_R16 = 11 + /** 16*3 bpp (3 channels - half float) */ + export const RL_PIXELFORMAT_UNCOMPRESSED_R16G16B16 = 12 + /** 16*4 bpp (4 channels - half float) */ + export const RL_PIXELFORMAT_UNCOMPRESSED_R16G16B16A16 = 13 /** 4 bpp (no alpha) */ - export const RL_PIXELFORMAT_COMPRESSED_DXT1_RGB = 11 + export const RL_PIXELFORMAT_COMPRESSED_DXT1_RGB = 14 /** 4 bpp (1 bit alpha) */ - export const RL_PIXELFORMAT_COMPRESSED_DXT1_RGBA = 12 + export const RL_PIXELFORMAT_COMPRESSED_DXT1_RGBA = 15 /** 8 bpp */ - export const RL_PIXELFORMAT_COMPRESSED_DXT3_RGBA = 13 + export const RL_PIXELFORMAT_COMPRESSED_DXT3_RGBA = 16 /** 8 bpp */ - export const RL_PIXELFORMAT_COMPRESSED_DXT5_RGBA = 14 + export const RL_PIXELFORMAT_COMPRESSED_DXT5_RGBA = 17 /** 4 bpp */ - export const RL_PIXELFORMAT_COMPRESSED_ETC1_RGB = 15 + export const RL_PIXELFORMAT_COMPRESSED_ETC1_RGB = 18 /** 4 bpp */ - export const RL_PIXELFORMAT_COMPRESSED_ETC2_RGB = 16 + export const RL_PIXELFORMAT_COMPRESSED_ETC2_RGB = 19 /** 8 bpp */ - export const RL_PIXELFORMAT_COMPRESSED_ETC2_EAC_RGBA = 17 + export const RL_PIXELFORMAT_COMPRESSED_ETC2_EAC_RGBA = 20 /** 4 bpp */ - export const RL_PIXELFORMAT_COMPRESSED_PVRT_RGB = 18 + export const RL_PIXELFORMAT_COMPRESSED_PVRT_RGB = 21 /** 4 bpp */ - export const RL_PIXELFORMAT_COMPRESSED_PVRT_RGBA = 19 + export const RL_PIXELFORMAT_COMPRESSED_PVRT_RGBA = 22 /** 8 bpp */ - export const RL_PIXELFORMAT_COMPRESSED_ASTC_4x4_RGBA = 20 + export const RL_PIXELFORMAT_COMPRESSED_ASTC_4x4_RGBA = 23 /** 2 bpp */ - export const RL_PIXELFORMAT_COMPRESSED_ASTC_8x8_RGBA = 21 + export const RL_PIXELFORMAT_COMPRESSED_ASTC_8x8_RGBA = 24 /** No filter, just pixel approximation */ export const RL_TEXTURE_FILTER_POINT = 0 /** Linear filtering */ diff --git a/src/generated/node-raylib.js b/src/generated/node-raylib.js index 7b793ae..c570134 100644 --- a/src/generated/node-raylib.js +++ b/src/generated/node-raylib.js @@ -20,7 +20,7 @@ const raylib = {} * * @return {undefined} */ -function InitWindow (width, height, title) { +function InitWindow(width, height, title) { return r.BindInitWindow( width, height, @@ -30,31 +30,31 @@ function InitWindow (width, height, title) { raylib.InitWindow = InitWindow /** - * Check if KEY_ESCAPE pressed or Close icon pressed + * Close window and unload OpenGL context * - * @return {boolean} The resulting bool. + * @return {undefined} */ -function WindowShouldClose () { - return r.BindWindowShouldClose() +function CloseWindow() { + return r.BindCloseWindow() } -raylib.WindowShouldClose = WindowShouldClose +raylib.CloseWindow = CloseWindow /** - * Close window and unload OpenGL context + * Check if application should close (KEY_ESCAPE pressed or windows close icon clicked) * - * @return {undefined} + * @return {boolean} The resulting bool. */ -function CloseWindow () { - return r.BindCloseWindow() +function WindowShouldClose() { + return r.BindWindowShouldClose() } -raylib.CloseWindow = CloseWindow +raylib.WindowShouldClose = WindowShouldClose /** * Check if window has been initialized successfully * * @return {boolean} The resulting bool. */ -function IsWindowReady () { +function IsWindowReady() { return r.BindIsWindowReady() } raylib.IsWindowReady = IsWindowReady @@ -64,7 +64,7 @@ raylib.IsWindowReady = IsWindowReady * * @return {boolean} The resulting bool. */ -function IsWindowFullscreen () { +function IsWindowFullscreen() { return r.BindIsWindowFullscreen() } raylib.IsWindowFullscreen = IsWindowFullscreen @@ -74,7 +74,7 @@ raylib.IsWindowFullscreen = IsWindowFullscreen * * @return {boolean} The resulting bool. */ -function IsWindowHidden () { +function IsWindowHidden() { return r.BindIsWindowHidden() } raylib.IsWindowHidden = IsWindowHidden @@ -84,7 +84,7 @@ raylib.IsWindowHidden = IsWindowHidden * * @return {boolean} The resulting bool. */ -function IsWindowMinimized () { +function IsWindowMinimized() { return r.BindIsWindowMinimized() } raylib.IsWindowMinimized = IsWindowMinimized @@ -94,7 +94,7 @@ raylib.IsWindowMinimized = IsWindowMinimized * * @return {boolean} The resulting bool. */ -function IsWindowMaximized () { +function IsWindowMaximized() { return r.BindIsWindowMaximized() } raylib.IsWindowMaximized = IsWindowMaximized @@ -104,7 +104,7 @@ raylib.IsWindowMaximized = IsWindowMaximized * * @return {boolean} The resulting bool. */ -function IsWindowFocused () { +function IsWindowFocused() { return r.BindIsWindowFocused() } raylib.IsWindowFocused = IsWindowFocused @@ -114,7 +114,7 @@ raylib.IsWindowFocused = IsWindowFocused * * @return {boolean} The resulting bool. */ -function IsWindowResized () { +function IsWindowResized() { return r.BindIsWindowResized() } raylib.IsWindowResized = IsWindowResized @@ -126,7 +126,7 @@ raylib.IsWindowResized = IsWindowResized * * @return {boolean} The resulting bool. */ -function IsWindowState (flag) { +function IsWindowState(flag) { return r.BindIsWindowState( flag ) @@ -140,7 +140,7 @@ raylib.IsWindowState = IsWindowState * * @return {undefined} */ -function SetWindowState (flags) { +function SetWindowState(flags) { return r.BindSetWindowState( flags ) @@ -154,7 +154,7 @@ raylib.SetWindowState = SetWindowState * * @return {undefined} */ -function ClearWindowState (flags) { +function ClearWindowState(flags) { return r.BindClearWindowState( flags ) @@ -166,17 +166,27 @@ raylib.ClearWindowState = ClearWindowState * * @return {undefined} */ -function ToggleFullscreen () { +function ToggleFullscreen() { return r.BindToggleFullscreen() } raylib.ToggleFullscreen = ToggleFullscreen +/** + * Toggle window state: borderless windowed (only PLATFORM_DESKTOP) + * + * @return {undefined} + */ +function ToggleBorderlessWindowed() { + return r.BindToggleBorderlessWindowed() +} +raylib.ToggleBorderlessWindowed = ToggleBorderlessWindowed + /** * Set window state: maximized, if resizable (only PLATFORM_DESKTOP) * * @return {undefined} */ -function MaximizeWindow () { +function MaximizeWindow() { return r.BindMaximizeWindow() } raylib.MaximizeWindow = MaximizeWindow @@ -186,7 +196,7 @@ raylib.MaximizeWindow = MaximizeWindow * * @return {undefined} */ -function MinimizeWindow () { +function MinimizeWindow() { return r.BindMinimizeWindow() } raylib.MinimizeWindow = MinimizeWindow @@ -196,7 +206,7 @@ raylib.MinimizeWindow = MinimizeWindow * * @return {undefined} */ -function RestoreWindow () { +function RestoreWindow() { return r.BindRestoreWindow() } raylib.RestoreWindow = RestoreWindow @@ -208,7 +218,7 @@ raylib.RestoreWindow = RestoreWindow * * @return {undefined} */ -function SetWindowIcon (image) { +function SetWindowIcon(image) { return r.BindSetWindowIcon( image.data, image.width, @@ -227,7 +237,7 @@ raylib.SetWindowIcon = SetWindowIcon * * @return {undefined} */ -function SetWindowIcons (images, count) { +function SetWindowIcons(images, count) { return r.BindSetWindowIcons( images, count @@ -236,13 +246,13 @@ function SetWindowIcons (images, count) { raylib.SetWindowIcons = SetWindowIcons /** - * Set title for window (only PLATFORM_DESKTOP) + * Set title for window (only PLATFORM_DESKTOP and PLATFORM_WEB) * * @param {string} title * * @return {undefined} */ -function SetWindowTitle (title) { +function SetWindowTitle(title) { return r.BindSetWindowTitle( title ) @@ -257,7 +267,7 @@ raylib.SetWindowTitle = SetWindowTitle * * @return {undefined} */ -function SetWindowPosition (x, y) { +function SetWindowPosition(x, y) { return r.BindSetWindowPosition( x, y @@ -266,13 +276,13 @@ function SetWindowPosition (x, y) { raylib.SetWindowPosition = SetWindowPosition /** - * Set monitor for the current window (fullscreen mode) + * Set monitor for the current window * * @param {number} monitor * * @return {undefined} */ -function SetWindowMonitor (monitor) { +function SetWindowMonitor(monitor) { return r.BindSetWindowMonitor( monitor ) @@ -287,7 +297,7 @@ raylib.SetWindowMonitor = SetWindowMonitor * * @return {undefined} */ -function SetWindowMinSize (width, height) { +function SetWindowMinSize(width, height) { return r.BindSetWindowMinSize( width, height @@ -295,6 +305,22 @@ function SetWindowMinSize (width, height) { } raylib.SetWindowMinSize = SetWindowMinSize +/** + * Set window maximum dimensions (for FLAG_WINDOW_RESIZABLE) + * + * @param {number} width + * @param {number} height + * + * @return {undefined} + */ +function SetWindowMaxSize(width, height) { + return r.BindSetWindowMaxSize( + width, + height + ) +} +raylib.SetWindowMaxSize = SetWindowMaxSize + /** * Set window dimensions * @@ -303,7 +329,7 @@ raylib.SetWindowMinSize = SetWindowMinSize * * @return {undefined} */ -function SetWindowSize (width, height) { +function SetWindowSize(width, height) { return r.BindSetWindowSize( width, height @@ -318,19 +344,29 @@ raylib.SetWindowSize = SetWindowSize * * @return {undefined} */ -function SetWindowOpacity (opacity) { +function SetWindowOpacity(opacity) { return r.BindSetWindowOpacity( opacity ) } raylib.SetWindowOpacity = SetWindowOpacity +/** + * Set window focused (only PLATFORM_DESKTOP) + * + * @return {undefined} + */ +function SetWindowFocused() { + return r.BindSetWindowFocused() +} +raylib.SetWindowFocused = SetWindowFocused + /** * Get native window handle * * @return {number} The resulting void *. */ -function GetWindowHandle () { +function GetWindowHandle() { return r.BindGetWindowHandle() } raylib.GetWindowHandle = GetWindowHandle @@ -340,7 +376,7 @@ raylib.GetWindowHandle = GetWindowHandle * * @return {number} The resulting int. */ -function GetScreenWidth () { +function GetScreenWidth() { return r.BindGetScreenWidth() } raylib.GetScreenWidth = GetScreenWidth @@ -350,7 +386,7 @@ raylib.GetScreenWidth = GetScreenWidth * * @return {number} The resulting int. */ -function GetScreenHeight () { +function GetScreenHeight() { return r.BindGetScreenHeight() } raylib.GetScreenHeight = GetScreenHeight @@ -360,7 +396,7 @@ raylib.GetScreenHeight = GetScreenHeight * * @return {number} The resulting int. */ -function GetRenderWidth () { +function GetRenderWidth() { return r.BindGetRenderWidth() } raylib.GetRenderWidth = GetRenderWidth @@ -370,7 +406,7 @@ raylib.GetRenderWidth = GetRenderWidth * * @return {number} The resulting int. */ -function GetRenderHeight () { +function GetRenderHeight() { return r.BindGetRenderHeight() } raylib.GetRenderHeight = GetRenderHeight @@ -380,7 +416,7 @@ raylib.GetRenderHeight = GetRenderHeight * * @return {number} The resulting int. */ -function GetMonitorCount () { +function GetMonitorCount() { return r.BindGetMonitorCount() } raylib.GetMonitorCount = GetMonitorCount @@ -390,7 +426,7 @@ raylib.GetMonitorCount = GetMonitorCount * * @return {number} The resulting int. */ -function GetCurrentMonitor () { +function GetCurrentMonitor() { return r.BindGetCurrentMonitor() } raylib.GetCurrentMonitor = GetCurrentMonitor @@ -402,7 +438,7 @@ raylib.GetCurrentMonitor = GetCurrentMonitor * * @return {Vector2} The resulting Vector2. */ -function GetMonitorPosition (monitor) { +function GetMonitorPosition(monitor) { return r.BindGetMonitorPosition( monitor ) @@ -416,7 +452,7 @@ raylib.GetMonitorPosition = GetMonitorPosition * * @return {number} The resulting int. */ -function GetMonitorWidth (monitor) { +function GetMonitorWidth(monitor) { return r.BindGetMonitorWidth( monitor ) @@ -430,7 +466,7 @@ raylib.GetMonitorWidth = GetMonitorWidth * * @return {number} The resulting int. */ -function GetMonitorHeight (monitor) { +function GetMonitorHeight(monitor) { return r.BindGetMonitorHeight( monitor ) @@ -444,7 +480,7 @@ raylib.GetMonitorHeight = GetMonitorHeight * * @return {number} The resulting int. */ -function GetMonitorPhysicalWidth (monitor) { +function GetMonitorPhysicalWidth(monitor) { return r.BindGetMonitorPhysicalWidth( monitor ) @@ -458,7 +494,7 @@ raylib.GetMonitorPhysicalWidth = GetMonitorPhysicalWidth * * @return {number} The resulting int. */ -function GetMonitorPhysicalHeight (monitor) { +function GetMonitorPhysicalHeight(monitor) { return r.BindGetMonitorPhysicalHeight( monitor ) @@ -472,7 +508,7 @@ raylib.GetMonitorPhysicalHeight = GetMonitorPhysicalHeight * * @return {number} The resulting int. */ -function GetMonitorRefreshRate (monitor) { +function GetMonitorRefreshRate(monitor) { return r.BindGetMonitorRefreshRate( monitor ) @@ -484,7 +520,7 @@ raylib.GetMonitorRefreshRate = GetMonitorRefreshRate * * @return {Vector2} The resulting Vector2. */ -function GetWindowPosition () { +function GetWindowPosition() { return r.BindGetWindowPosition() } raylib.GetWindowPosition = GetWindowPosition @@ -494,19 +530,19 @@ raylib.GetWindowPosition = GetWindowPosition * * @return {Vector2} The resulting Vector2. */ -function GetWindowScaleDPI () { +function GetWindowScaleDPI() { return r.BindGetWindowScaleDPI() } raylib.GetWindowScaleDPI = GetWindowScaleDPI /** - * Get the human-readable, UTF-8 encoded name of the primary monitor + * Get the human-readable, UTF-8 encoded name of the specified monitor * * @param {number} monitor * * @return {string} The resulting const char *. */ -function GetMonitorName (monitor) { +function GetMonitorName(monitor) { return r.BindGetMonitorName( monitor ) @@ -520,7 +556,7 @@ raylib.GetMonitorName = GetMonitorName * * @return {undefined} */ -function SetClipboardText (text) { +function SetClipboardText(text) { return r.BindSetClipboardText( text ) @@ -532,7 +568,7 @@ raylib.SetClipboardText = SetClipboardText * * @return {string} The resulting const char *. */ -function GetClipboardText () { +function GetClipboardText() { return r.BindGetClipboardText() } raylib.GetClipboardText = GetClipboardText @@ -542,7 +578,7 @@ raylib.GetClipboardText = GetClipboardText * * @return {undefined} */ -function EnableEventWaiting () { +function EnableEventWaiting() { return r.BindEnableEventWaiting() } raylib.EnableEventWaiting = EnableEventWaiting @@ -552,51 +588,17 @@ raylib.EnableEventWaiting = EnableEventWaiting * * @return {undefined} */ -function DisableEventWaiting () { +function DisableEventWaiting() { return r.BindDisableEventWaiting() } raylib.DisableEventWaiting = DisableEventWaiting -/** - * Swap back buffer with front buffer (screen drawing) - * - * @return {undefined} - */ -function SwapScreenBuffer () { - return r.BindSwapScreenBuffer() -} -raylib.SwapScreenBuffer = SwapScreenBuffer - -/** - * Register all input events - * - * @return {undefined} - */ -function PollInputEvents () { - return r.BindPollInputEvents() -} -raylib.PollInputEvents = PollInputEvents - -/** - * Wait for some time (halt program execution) - * - * @param {number} seconds - * - * @return {undefined} - */ -function WaitTime (seconds) { - return r.BindWaitTime( - seconds - ) -} -raylib.WaitTime = WaitTime - /** * Shows cursor * * @return {undefined} */ -function ShowCursor () { +function ShowCursor() { return r.BindShowCursor() } raylib.ShowCursor = ShowCursor @@ -606,7 +608,7 @@ raylib.ShowCursor = ShowCursor * * @return {undefined} */ -function HideCursor () { +function HideCursor() { return r.BindHideCursor() } raylib.HideCursor = HideCursor @@ -616,7 +618,7 @@ raylib.HideCursor = HideCursor * * @return {boolean} The resulting bool. */ -function IsCursorHidden () { +function IsCursorHidden() { return r.BindIsCursorHidden() } raylib.IsCursorHidden = IsCursorHidden @@ -626,7 +628,7 @@ raylib.IsCursorHidden = IsCursorHidden * * @return {undefined} */ -function EnableCursor () { +function EnableCursor() { return r.BindEnableCursor() } raylib.EnableCursor = EnableCursor @@ -636,7 +638,7 @@ raylib.EnableCursor = EnableCursor * * @return {undefined} */ -function DisableCursor () { +function DisableCursor() { return r.BindDisableCursor() } raylib.DisableCursor = DisableCursor @@ -646,7 +648,7 @@ raylib.DisableCursor = DisableCursor * * @return {boolean} The resulting bool. */ -function IsCursorOnScreen () { +function IsCursorOnScreen() { return r.BindIsCursorOnScreen() } raylib.IsCursorOnScreen = IsCursorOnScreen @@ -658,7 +660,7 @@ raylib.IsCursorOnScreen = IsCursorOnScreen * * @return {undefined} */ -function ClearBackground (color) { +function ClearBackground(color) { return r.BindClearBackground( color.r, color.g, @@ -673,7 +675,7 @@ raylib.ClearBackground = ClearBackground * * @return {undefined} */ -function BeginDrawing () { +function BeginDrawing() { return r.BindBeginDrawing() } raylib.BeginDrawing = BeginDrawing @@ -683,7 +685,7 @@ raylib.BeginDrawing = BeginDrawing * * @return {undefined} */ -function EndDrawing () { +function EndDrawing() { return r.BindEndDrawing() } raylib.EndDrawing = EndDrawing @@ -695,7 +697,7 @@ raylib.EndDrawing = EndDrawing * * @return {undefined} */ -function BeginMode2D (camera) { +function BeginMode2D(camera) { return r.BindBeginMode2D( camera.offset.x, camera.offset.y, @@ -712,7 +714,7 @@ raylib.BeginMode2D = BeginMode2D * * @return {undefined} */ -function EndMode2D () { +function EndMode2D() { return r.BindEndMode2D() } raylib.EndMode2D = EndMode2D @@ -724,7 +726,7 @@ raylib.EndMode2D = EndMode2D * * @return {undefined} */ -function BeginMode3D (camera) { +function BeginMode3D(camera) { return r.BindBeginMode3D( camera.position.x, camera.position.y, @@ -746,7 +748,7 @@ raylib.BeginMode3D = BeginMode3D * * @return {undefined} */ -function EndMode3D () { +function EndMode3D() { return r.BindEndMode3D() } raylib.EndMode3D = EndMode3D @@ -758,7 +760,7 @@ raylib.EndMode3D = EndMode3D * * @return {undefined} */ -function BeginTextureMode (target) { +function BeginTextureMode(target) { return r.BindBeginTextureMode( target.id, target.texture.id, @@ -780,7 +782,7 @@ raylib.BeginTextureMode = BeginTextureMode * * @return {undefined} */ -function EndTextureMode () { +function EndTextureMode() { return r.BindEndTextureMode() } raylib.EndTextureMode = EndTextureMode @@ -792,7 +794,7 @@ raylib.EndTextureMode = EndTextureMode * * @return {undefined} */ -function BeginShaderMode (shader) { +function BeginShaderMode(shader) { return r.BindBeginShaderMode( shader.id, shader.locs @@ -805,7 +807,7 @@ raylib.BeginShaderMode = BeginShaderMode * * @return {undefined} */ -function EndShaderMode () { +function EndShaderMode() { return r.BindEndShaderMode() } raylib.EndShaderMode = EndShaderMode @@ -817,7 +819,7 @@ raylib.EndShaderMode = EndShaderMode * * @return {undefined} */ -function BeginBlendMode (mode) { +function BeginBlendMode(mode) { return r.BindBeginBlendMode( mode ) @@ -829,7 +831,7 @@ raylib.BeginBlendMode = BeginBlendMode * * @return {undefined} */ -function EndBlendMode () { +function EndBlendMode() { return r.BindEndBlendMode() } raylib.EndBlendMode = EndBlendMode @@ -844,7 +846,7 @@ raylib.EndBlendMode = EndBlendMode * * @return {undefined} */ -function BeginScissorMode (x, y, width, height) { +function BeginScissorMode(x, y, width, height) { return r.BindBeginScissorMode( x, y, @@ -859,7 +861,7 @@ raylib.BeginScissorMode = BeginScissorMode * * @return {undefined} */ -function EndScissorMode () { +function EndScissorMode() { return r.BindEndScissorMode() } raylib.EndScissorMode = EndScissorMode @@ -869,7 +871,7 @@ raylib.EndScissorMode = EndScissorMode * * @return {undefined} */ -function EndVrStereoMode () { +function EndVrStereoMode() { return r.BindEndVrStereoMode() } raylib.EndVrStereoMode = EndVrStereoMode @@ -882,7 +884,7 @@ raylib.EndVrStereoMode = EndVrStereoMode * * @return {Shader} The resulting Shader. */ -function LoadShader (vsFileName, fsFileName) { +function LoadShader(vsFileName, fsFileName) { return r.BindLoadShader( vsFileName, fsFileName @@ -898,7 +900,7 @@ raylib.LoadShader = LoadShader * * @return {Shader} The resulting Shader. */ -function LoadShaderFromMemory (vsCode, fsCode) { +function LoadShaderFromMemory(vsCode, fsCode) { return r.BindLoadShaderFromMemory( vsCode, fsCode @@ -913,7 +915,7 @@ raylib.LoadShaderFromMemory = LoadShaderFromMemory * * @return {boolean} The resulting bool. */ -function IsShaderReady (shader) { +function IsShaderReady(shader) { return r.BindIsShaderReady( shader.id, shader.locs @@ -929,7 +931,7 @@ raylib.IsShaderReady = IsShaderReady * * @return {number} The resulting int. */ -function GetShaderLocation (shader, uniformName) { +function GetShaderLocation(shader, uniformName) { return r.BindGetShaderLocation( shader.id, shader.locs, @@ -946,7 +948,7 @@ raylib.GetShaderLocation = GetShaderLocation * * @return {number} The resulting int. */ -function GetShaderLocationAttrib (shader, attribName) { +function GetShaderLocationAttrib(shader, attribName) { return r.BindGetShaderLocationAttrib( shader.id, shader.locs, @@ -964,7 +966,7 @@ raylib.GetShaderLocationAttrib = GetShaderLocationAttrib * * @return {undefined} */ -function SetShaderValueMatrix (shader, locIndex, mat) { +function SetShaderValueMatrix(shader, locIndex, mat) { return r.BindSetShaderValueMatrix( shader.id, shader.locs, @@ -998,7 +1000,7 @@ raylib.SetShaderValueMatrix = SetShaderValueMatrix * * @return {undefined} */ -function SetShaderValueTexture (shader, locIndex, texture) { +function SetShaderValueTexture(shader, locIndex, texture) { return r.BindSetShaderValueTexture( shader.id, shader.locs, @@ -1019,7 +1021,7 @@ raylib.SetShaderValueTexture = SetShaderValueTexture * * @return {undefined} */ -function UnloadShader (shader) { +function UnloadShader(shader) { return r.BindUnloadShader( shader.id, shader.locs @@ -1035,7 +1037,7 @@ raylib.UnloadShader = UnloadShader * * @return {Ray} The resulting Ray. */ -function GetMouseRay (mousePosition, camera) { +function GetMouseRay(mousePosition, camera) { return r.BindGetMouseRay( mousePosition.x, mousePosition.y, @@ -1061,7 +1063,7 @@ raylib.GetMouseRay = GetMouseRay * * @return {Matrix} The resulting Matrix. */ -function GetCameraMatrix (camera) { +function GetCameraMatrix(camera) { return r.BindGetCameraMatrix( camera.position.x, camera.position.y, @@ -1085,7 +1087,7 @@ raylib.GetCameraMatrix = GetCameraMatrix * * @return {Matrix} The resulting Matrix. */ -function GetCameraMatrix2D (camera) { +function GetCameraMatrix2D(camera) { return r.BindGetCameraMatrix2D( camera.offset.x, camera.offset.y, @@ -1105,7 +1107,7 @@ raylib.GetCameraMatrix2D = GetCameraMatrix2D * * @return {Vector2} The resulting Vector2. */ -function GetWorldToScreen (position, camera) { +function GetWorldToScreen(position, camera) { return r.BindGetWorldToScreen( position.x, position.y, @@ -1133,7 +1135,7 @@ raylib.GetWorldToScreen = GetWorldToScreen * * @return {Vector2} The resulting Vector2. */ -function GetScreenToWorld2D (position, camera) { +function GetScreenToWorld2D(position, camera) { return r.BindGetScreenToWorld2D( position.x, position.y, @@ -1157,7 +1159,7 @@ raylib.GetScreenToWorld2D = GetScreenToWorld2D * * @return {Vector2} The resulting Vector2. */ -function GetWorldToScreenEx (position, camera, width, height) { +function GetWorldToScreenEx(position, camera, width, height) { return r.BindGetWorldToScreenEx( position.x, position.y, @@ -1187,7 +1189,7 @@ raylib.GetWorldToScreenEx = GetWorldToScreenEx * * @return {Vector2} The resulting Vector2. */ -function GetWorldToScreen2D (position, camera) { +function GetWorldToScreen2D(position, camera) { return r.BindGetWorldToScreen2D( position.x, position.y, @@ -1208,42 +1210,90 @@ raylib.GetWorldToScreen2D = GetWorldToScreen2D * * @return {undefined} */ -function SetTargetFPS (fps) { +function SetTargetFPS(fps) { return r.BindSetTargetFPS( fps ) } raylib.SetTargetFPS = SetTargetFPS +/** + * Get time in seconds for last frame drawn (delta time) + * + * @return {number} The resulting float. + */ +function GetFrameTime() { + return r.BindGetFrameTime() +} +raylib.GetFrameTime = GetFrameTime + +/** + * Get elapsed time in seconds since InitWindow() + * + * @return {number} The resulting double. + */ +function GetTime() { + return r.BindGetTime() +} +raylib.GetTime = GetTime + /** * Get current FPS * * @return {number} The resulting int. */ -function GetFPS () { +function GetFPS() { return r.BindGetFPS() } raylib.GetFPS = GetFPS /** - * Get time in seconds for last frame drawn (delta time) + * Swap back buffer with front buffer (screen drawing) * - * @return {number} The resulting float. + * @return {undefined} */ -function GetFrameTime () { - return r.BindGetFrameTime() +function SwapScreenBuffer() { + return r.BindSwapScreenBuffer() } -raylib.GetFrameTime = GetFrameTime +raylib.SwapScreenBuffer = SwapScreenBuffer /** - * Get elapsed time in seconds since InitWindow() + * Register all input events * - * @return {number} The resulting double. + * @return {undefined} */ -function GetTime () { - return r.BindGetTime() +function PollInputEvents() { + return r.BindPollInputEvents() } -raylib.GetTime = GetTime +raylib.PollInputEvents = PollInputEvents + +/** + * Wait for some time (halt program execution) + * + * @param {number} seconds + * + * @return {undefined} + */ +function WaitTime(seconds) { + return r.BindWaitTime( + seconds + ) +} +raylib.WaitTime = WaitTime + +/** + * Set the seed for the random number generator + * + * @param {number} seed + * + * @return {undefined} + */ +function SetRandomSeed(seed) { + return r.BindSetRandomSeed( + seed + ) +} +raylib.SetRandomSeed = SetRandomSeed /** * Get a random value between min and max (both included) @@ -1253,7 +1303,7 @@ raylib.GetTime = GetTime * * @return {number} The resulting int. */ -function GetRandomValue (min, max) { +function GetRandomValue(min, max) { return r.BindGetRandomValue( min, max @@ -1262,18 +1312,36 @@ function GetRandomValue (min, max) { raylib.GetRandomValue = GetRandomValue /** - * Set the seed for the random number generator + * Load random values sequence, no values repeated * - * @param {number} seed + * @param {number} count + * @param {number} min + * @param {number} max + * + * @return {number} The resulting int *. + */ +function LoadRandomSequence(count, min, max) { + return r.BindLoadRandomSequence( + count, + min, + max + ) +} +raylib.LoadRandomSequence = LoadRandomSequence + +/** + * Unload random values sequence + * + * @param {number} sequence * * @return {undefined} */ -function SetRandomSeed (seed) { - return r.BindSetRandomSeed( - seed +function UnloadRandomSequence(sequence) { + return r.BindUnloadRandomSequence( + sequence ) } -raylib.SetRandomSeed = SetRandomSeed +raylib.UnloadRandomSequence = UnloadRandomSequence /** * Takes a screenshot of current screen (filename extension defines format) @@ -1282,7 +1350,7 @@ raylib.SetRandomSeed = SetRandomSeed * * @return {undefined} */ -function TakeScreenshot (fileName) { +function TakeScreenshot(fileName) { return r.BindTakeScreenshot( fileName ) @@ -1296,13 +1364,27 @@ raylib.TakeScreenshot = TakeScreenshot * * @return {undefined} */ -function SetConfigFlags (flags) { +function SetConfigFlags(flags) { return r.BindSetConfigFlags( flags ) } raylib.SetConfigFlags = SetConfigFlags +/** + * Open URL with default system browser (if available) + * + * @param {string} url + * + * @return {undefined} + */ +function OpenURL(url) { + return r.BindOpenURL( + url + ) +} +raylib.OpenURL = OpenURL + /** * Set the current threshold (minimum) log level * @@ -1310,7 +1392,7 @@ raylib.SetConfigFlags = SetConfigFlags * * @return {undefined} */ -function SetTraceLogLevel (logLevel) { +function SetTraceLogLevel(logLevel) { return r.BindSetTraceLogLevel( logLevel ) @@ -1324,7 +1406,7 @@ raylib.SetTraceLogLevel = SetTraceLogLevel * * @return {number} The resulting void *. */ -function MemAlloc (size) { +function MemAlloc(size) { return r.BindMemAlloc( size ) @@ -1339,7 +1421,7 @@ raylib.MemAlloc = MemAlloc * * @return {number} The resulting void *. */ -function MemRealloc (ptr, size) { +function MemRealloc(ptr, size) { return r.BindMemRealloc( ptr, size @@ -1354,39 +1436,25 @@ raylib.MemRealloc = MemRealloc * * @return {undefined} */ -function MemFree (ptr) { +function MemFree(ptr) { return r.BindMemFree( ptr ) } raylib.MemFree = MemFree -/** - * Open URL with default system browser (if available) - * - * @param {string} url - * - * @return {undefined} - */ -function OpenURL (url) { - return r.BindOpenURL( - url - ) -} -raylib.OpenURL = OpenURL - /** * Load file data as byte array (read) * * @param {string} fileName - * @param {number} bytesRead + * @param {number} dataSize * * @return {Buffer} The resulting unsigned char *. */ -function LoadFileData (fileName, bytesRead) { +function LoadFileData(fileName, dataSize) { return r.BindLoadFileData( fileName, - bytesRead + dataSize ) } raylib.LoadFileData = LoadFileData @@ -1398,7 +1466,7 @@ raylib.LoadFileData = LoadFileData * * @return {undefined} */ -function UnloadFileData (data) { +function UnloadFileData(data) { return r.BindUnloadFileData( data ) @@ -1410,15 +1478,15 @@ raylib.UnloadFileData = UnloadFileData * * @param {string} fileName * @param {number} data - * @param {number} bytesToWrite + * @param {number} dataSize * * @return {boolean} The resulting bool. */ -function SaveFileData (fileName, data, bytesToWrite) { +function SaveFileData(fileName, data, dataSize) { return r.BindSaveFileData( fileName, data, - bytesToWrite + dataSize ) } raylib.SaveFileData = SaveFileData @@ -1427,15 +1495,15 @@ raylib.SaveFileData = SaveFileData * Export data to code (.h), returns true on success * * @param {Buffer} data - * @param {number} size + * @param {number} dataSize * @param {string} fileName * * @return {boolean} The resulting bool. */ -function ExportDataAsCode (data, size, fileName) { +function ExportDataAsCode(data, dataSize, fileName) { return r.BindExportDataAsCode( data, - size, + dataSize, fileName ) } @@ -1448,7 +1516,7 @@ raylib.ExportDataAsCode = ExportDataAsCode * * @return {string} The resulting char *. */ -function LoadFileText (fileName) { +function LoadFileText(fileName) { return r.BindLoadFileText( fileName ) @@ -1462,7 +1530,7 @@ raylib.LoadFileText = LoadFileText * * @return {undefined} */ -function UnloadFileText (text) { +function UnloadFileText(text) { return r.BindUnloadFileText( text ) @@ -1477,7 +1545,7 @@ raylib.UnloadFileText = UnloadFileText * * @return {boolean} The resulting bool. */ -function SaveFileText (fileName, text) { +function SaveFileText(fileName, text) { return r.BindSaveFileText( fileName, text @@ -1492,7 +1560,7 @@ raylib.SaveFileText = SaveFileText * * @return {boolean} The resulting bool. */ -function FileExists (fileName) { +function FileExists(fileName) { return r.BindFileExists( fileName ) @@ -1506,7 +1574,7 @@ raylib.FileExists = FileExists * * @return {boolean} The resulting bool. */ -function DirectoryExists (dirPath) { +function DirectoryExists(dirPath) { return r.BindDirectoryExists( dirPath ) @@ -1521,7 +1589,7 @@ raylib.DirectoryExists = DirectoryExists * * @return {boolean} The resulting bool. */ -function IsFileExtension (fileName, ext) { +function IsFileExtension(fileName, ext) { return r.BindIsFileExtension( fileName, ext @@ -1536,7 +1604,7 @@ raylib.IsFileExtension = IsFileExtension * * @return {number} The resulting int. */ -function GetFileLength (fileName) { +function GetFileLength(fileName) { return r.BindGetFileLength( fileName ) @@ -1550,7 +1618,7 @@ raylib.GetFileLength = GetFileLength * * @return {string} The resulting const char *. */ -function GetFileExtension (fileName) { +function GetFileExtension(fileName) { return r.BindGetFileExtension( fileName ) @@ -1564,7 +1632,7 @@ raylib.GetFileExtension = GetFileExtension * * @return {string} The resulting const char *. */ -function GetFileName (filePath) { +function GetFileName(filePath) { return r.BindGetFileName( filePath ) @@ -1578,7 +1646,7 @@ raylib.GetFileName = GetFileName * * @return {string} The resulting const char *. */ -function GetFileNameWithoutExt (filePath) { +function GetFileNameWithoutExt(filePath) { return r.BindGetFileNameWithoutExt( filePath ) @@ -1592,7 +1660,7 @@ raylib.GetFileNameWithoutExt = GetFileNameWithoutExt * * @return {string} The resulting const char *. */ -function GetDirectoryPath (filePath) { +function GetDirectoryPath(filePath) { return r.BindGetDirectoryPath( filePath ) @@ -1606,7 +1674,7 @@ raylib.GetDirectoryPath = GetDirectoryPath * * @return {string} The resulting const char *. */ -function GetPrevDirectoryPath (dirPath) { +function GetPrevDirectoryPath(dirPath) { return r.BindGetPrevDirectoryPath( dirPath ) @@ -1618,17 +1686,17 @@ raylib.GetPrevDirectoryPath = GetPrevDirectoryPath * * @return {string} The resulting const char *. */ -function GetWorkingDirectory () { +function GetWorkingDirectory() { return r.BindGetWorkingDirectory() } raylib.GetWorkingDirectory = GetWorkingDirectory /** - * Get the directory if the running application (uses static string) + * Get the directory of the running application (uses static string) * * @return {string} The resulting const char *. */ -function GetApplicationDirectory () { +function GetApplicationDirectory() { return r.BindGetApplicationDirectory() } raylib.GetApplicationDirectory = GetApplicationDirectory @@ -1640,7 +1708,7 @@ raylib.GetApplicationDirectory = GetApplicationDirectory * * @return {boolean} The resulting bool. */ -function ChangeDirectory (dir) { +function ChangeDirectory(dir) { return r.BindChangeDirectory( dir ) @@ -1654,7 +1722,7 @@ raylib.ChangeDirectory = ChangeDirectory * * @return {boolean} The resulting bool. */ -function IsPathFile (path) { +function IsPathFile(path) { return r.BindIsPathFile( path ) @@ -1668,7 +1736,7 @@ raylib.IsPathFile = IsPathFile * * @return {FilePathList} The resulting FilePathList. */ -function LoadDirectoryFiles (dirPath) { +function LoadDirectoryFiles(dirPath) { return r.BindLoadDirectoryFiles( dirPath ) @@ -1684,7 +1752,7 @@ raylib.LoadDirectoryFiles = LoadDirectoryFiles * * @return {FilePathList} The resulting FilePathList. */ -function LoadDirectoryFilesEx (basePath, filter, scanSubdirs) { +function LoadDirectoryFilesEx(basePath, filter, scanSubdirs) { return r.BindLoadDirectoryFilesEx( basePath, filter, @@ -1700,7 +1768,7 @@ raylib.LoadDirectoryFilesEx = LoadDirectoryFilesEx * * @return {undefined} */ -function UnloadDirectoryFiles (files) { +function UnloadDirectoryFiles(files) { return r.BindUnloadDirectoryFiles( files.capacity, files.count, @@ -1714,7 +1782,7 @@ raylib.UnloadDirectoryFiles = UnloadDirectoryFiles * * @return {boolean} The resulting bool. */ -function IsFileDropped () { +function IsFileDropped() { return r.BindIsFileDropped() } raylib.IsFileDropped = IsFileDropped @@ -1724,7 +1792,7 @@ raylib.IsFileDropped = IsFileDropped * * @return {FilePathList} The resulting FilePathList. */ -function LoadDroppedFiles () { +function LoadDroppedFiles() { return r.BindLoadDroppedFiles() } raylib.LoadDroppedFiles = LoadDroppedFiles @@ -1736,7 +1804,7 @@ raylib.LoadDroppedFiles = LoadDroppedFiles * * @return {undefined} */ -function UnloadDroppedFiles (files) { +function UnloadDroppedFiles(files) { return r.BindUnloadDroppedFiles( files.capacity, files.count, @@ -1752,7 +1820,7 @@ raylib.UnloadDroppedFiles = UnloadDroppedFiles * * @return {number} The resulting long. */ -function GetFileModTime (fileName) { +function GetFileModTime(fileName) { return r.BindGetFileModTime( fileName ) @@ -1768,7 +1836,7 @@ raylib.GetFileModTime = GetFileModTime * * @return {Buffer} The resulting unsigned char *. */ -function CompressData (data, dataSize, compDataSize) { +function CompressData(data, dataSize, compDataSize) { return r.BindCompressData( data, dataSize, @@ -1786,7 +1854,7 @@ raylib.CompressData = CompressData * * @return {Buffer} The resulting unsigned char *. */ -function DecompressData (compData, compDataSize, dataSize) { +function DecompressData(compData, compDataSize, dataSize) { return r.BindDecompressData( compData, compDataSize, @@ -1804,7 +1872,7 @@ raylib.DecompressData = DecompressData * * @return {string} The resulting char *. */ -function EncodeDataBase64 (data, dataSize, outputSize) { +function EncodeDataBase64(data, dataSize, outputSize) { return r.BindEncodeDataBase64( data, dataSize, @@ -1821,7 +1889,7 @@ raylib.EncodeDataBase64 = EncodeDataBase64 * * @return {Buffer} The resulting unsigned char *. */ -function DecodeDataBase64 (data, outputSize) { +function DecodeDataBase64(data, outputSize) { return r.BindDecodeDataBase64( data, outputSize @@ -1830,138 +1898,262 @@ function DecodeDataBase64 (data, outputSize) { raylib.DecodeDataBase64 = DecodeDataBase64 /** - * Check if a key has been pressed once + * Load automation events list from file, NULL for empty list, capacity = MAX_AUTOMATION_EVENTS * - * @param {number} key + * @param {string} fileName * - * @return {boolean} The resulting bool. + * @return {AutomationEventList} The resulting AutomationEventList. */ -function IsKeyPressed (key) { - return r.BindIsKeyPressed( - key +function LoadAutomationEventList(fileName) { + return r.BindLoadAutomationEventList( + fileName ) } -raylib.IsKeyPressed = IsKeyPressed +raylib.LoadAutomationEventList = LoadAutomationEventList /** - * Check if a key is being pressed + * Unload automation events list from file * - * @param {number} key + * @param {number} list * - * @return {boolean} The resulting bool. + * @return {undefined} */ -function IsKeyDown (key) { - return r.BindIsKeyDown( - key +function UnloadAutomationEventList(list) { + return r.BindUnloadAutomationEventList( + list ) } -raylib.IsKeyDown = IsKeyDown +raylib.UnloadAutomationEventList = UnloadAutomationEventList /** - * Check if a key has been released once + * Export automation events list as text file * - * @param {number} key + * @param {AutomationEventList} list + * @param {string} fileName * * @return {boolean} The resulting bool. */ -function IsKeyReleased (key) { - return r.BindIsKeyReleased( - key +function ExportAutomationEventList(list, fileName) { + return r.BindExportAutomationEventList( + list.capacity, + list.count, + list.events, + fileName ) } -raylib.IsKeyReleased = IsKeyReleased +raylib.ExportAutomationEventList = ExportAutomationEventList /** - * Check if a key is NOT being pressed + * Set automation event list to record to * - * @param {number} key + * @param {number} list * - * @return {boolean} The resulting bool. + * @return {undefined} */ -function IsKeyUp (key) { - return r.BindIsKeyUp( - key +function SetAutomationEventList(list) { + return r.BindSetAutomationEventList( + list ) } -raylib.IsKeyUp = IsKeyUp +raylib.SetAutomationEventList = SetAutomationEventList /** - * Set a custom key to exit program (default is ESC) + * Set automation event internal base frame to start recording * - * @param {number} key + * @param {number} frame * * @return {undefined} */ -function SetExitKey (key) { - return r.BindSetExitKey( - key +function SetAutomationEventBaseFrame(frame) { + return r.BindSetAutomationEventBaseFrame( + frame ) } -raylib.SetExitKey = SetExitKey +raylib.SetAutomationEventBaseFrame = SetAutomationEventBaseFrame /** - * Get key pressed (keycode), call it multiple times for keys queued, returns 0 when the queue is empty + * Start recording automation events (AutomationEventList must be set) * - * @return {number} The resulting int. + * @return {undefined} */ -function GetKeyPressed () { - return r.BindGetKeyPressed() +function StartAutomationEventRecording() { + return r.BindStartAutomationEventRecording() } -raylib.GetKeyPressed = GetKeyPressed +raylib.StartAutomationEventRecording = StartAutomationEventRecording /** - * Get char pressed (unicode), call it multiple times for chars queued, returns 0 when the queue is empty + * Stop recording automation events * - * @return {number} The resulting int. + * @return {undefined} */ -function GetCharPressed () { - return r.BindGetCharPressed() +function StopAutomationEventRecording() { + return r.BindStopAutomationEventRecording() } -raylib.GetCharPressed = GetCharPressed +raylib.StopAutomationEventRecording = StopAutomationEventRecording /** - * Check if a gamepad is available + * Play a recorded automation event * - * @param {number} gamepad + * @param {AutomationEvent} event * - * @return {boolean} The resulting bool. + * @return {undefined} */ -function IsGamepadAvailable (gamepad) { - return r.BindIsGamepadAvailable( - gamepad +function PlayAutomationEvent(event) { + return r.BindPlayAutomationEvent( + event.frame, + event.type, + event.params ) } -raylib.IsGamepadAvailable = IsGamepadAvailable +raylib.PlayAutomationEvent = PlayAutomationEvent /** - * Get gamepad internal name id + * Check if a key has been pressed once * - * @param {number} gamepad + * @param {number} key * - * @return {string} The resulting const char *. + * @return {boolean} The resulting bool. */ -function GetGamepadName (gamepad) { - return r.BindGetGamepadName( - gamepad +function IsKeyPressed(key) { + return r.BindIsKeyPressed( + key ) } -raylib.GetGamepadName = GetGamepadName +raylib.IsKeyPressed = IsKeyPressed /** - * Check if a gamepad button has been pressed once + * Check if a key has been pressed again (Only PLATFORM_DESKTOP) * - * @param {number} gamepad - * @param {number} button + * @param {number} key * * @return {boolean} The resulting bool. */ -function IsGamepadButtonPressed (gamepad, button) { - return r.BindIsGamepadButtonPressed( - gamepad, - button +function IsKeyPressedRepeat(key) { + return r.BindIsKeyPressedRepeat( + key ) } -raylib.IsGamepadButtonPressed = IsGamepadButtonPressed +raylib.IsKeyPressedRepeat = IsKeyPressedRepeat + +/** + * Check if a key is being pressed + * + * @param {number} key + * + * @return {boolean} The resulting bool. + */ +function IsKeyDown(key) { + return r.BindIsKeyDown( + key + ) +} +raylib.IsKeyDown = IsKeyDown + +/** + * Check if a key has been released once + * + * @param {number} key + * + * @return {boolean} The resulting bool. + */ +function IsKeyReleased(key) { + return r.BindIsKeyReleased( + key + ) +} +raylib.IsKeyReleased = IsKeyReleased + +/** + * Check if a key is NOT being pressed + * + * @param {number} key + * + * @return {boolean} The resulting bool. + */ +function IsKeyUp(key) { + return r.BindIsKeyUp( + key + ) +} +raylib.IsKeyUp = IsKeyUp + +/** + * Get key pressed (keycode), call it multiple times for keys queued, returns 0 when the queue is empty + * + * @return {number} The resulting int. + */ +function GetKeyPressed() { + return r.BindGetKeyPressed() +} +raylib.GetKeyPressed = GetKeyPressed + +/** + * Get char pressed (unicode), call it multiple times for chars queued, returns 0 when the queue is empty + * + * @return {number} The resulting int. + */ +function GetCharPressed() { + return r.BindGetCharPressed() +} +raylib.GetCharPressed = GetCharPressed + +/** + * Set a custom key to exit program (default is ESC) + * + * @param {number} key + * + * @return {undefined} + */ +function SetExitKey(key) { + return r.BindSetExitKey( + key + ) +} +raylib.SetExitKey = SetExitKey + +/** + * Check if a gamepad is available + * + * @param {number} gamepad + * + * @return {boolean} The resulting bool. + */ +function IsGamepadAvailable(gamepad) { + return r.BindIsGamepadAvailable( + gamepad + ) +} +raylib.IsGamepadAvailable = IsGamepadAvailable + +/** + * Get gamepad internal name id + * + * @param {number} gamepad + * + * @return {string} The resulting const char *. + */ +function GetGamepadName(gamepad) { + return r.BindGetGamepadName( + gamepad + ) +} +raylib.GetGamepadName = GetGamepadName + +/** + * Check if a gamepad button has been pressed once + * + * @param {number} gamepad + * @param {number} button + * + * @return {boolean} The resulting bool. + */ +function IsGamepadButtonPressed(gamepad, button) { + return r.BindIsGamepadButtonPressed( + gamepad, + button + ) +} +raylib.IsGamepadButtonPressed = IsGamepadButtonPressed /** * Check if a gamepad button is being pressed @@ -1971,7 +2163,7 @@ raylib.IsGamepadButtonPressed = IsGamepadButtonPressed * * @return {boolean} The resulting bool. */ -function IsGamepadButtonDown (gamepad, button) { +function IsGamepadButtonDown(gamepad, button) { return r.BindIsGamepadButtonDown( gamepad, button @@ -1987,7 +2179,7 @@ raylib.IsGamepadButtonDown = IsGamepadButtonDown * * @return {boolean} The resulting bool. */ -function IsGamepadButtonReleased (gamepad, button) { +function IsGamepadButtonReleased(gamepad, button) { return r.BindIsGamepadButtonReleased( gamepad, button @@ -2003,7 +2195,7 @@ raylib.IsGamepadButtonReleased = IsGamepadButtonReleased * * @return {boolean} The resulting bool. */ -function IsGamepadButtonUp (gamepad, button) { +function IsGamepadButtonUp(gamepad, button) { return r.BindIsGamepadButtonUp( gamepad, button @@ -2016,7 +2208,7 @@ raylib.IsGamepadButtonUp = IsGamepadButtonUp * * @return {number} The resulting int. */ -function GetGamepadButtonPressed () { +function GetGamepadButtonPressed() { return r.BindGetGamepadButtonPressed() } raylib.GetGamepadButtonPressed = GetGamepadButtonPressed @@ -2028,7 +2220,7 @@ raylib.GetGamepadButtonPressed = GetGamepadButtonPressed * * @return {number} The resulting int. */ -function GetGamepadAxisCount (gamepad) { +function GetGamepadAxisCount(gamepad) { return r.BindGetGamepadAxisCount( gamepad ) @@ -2043,7 +2235,7 @@ raylib.GetGamepadAxisCount = GetGamepadAxisCount * * @return {number} The resulting float. */ -function GetGamepadAxisMovement (gamepad, axis) { +function GetGamepadAxisMovement(gamepad, axis) { return r.BindGetGamepadAxisMovement( gamepad, axis @@ -2058,7 +2250,7 @@ raylib.GetGamepadAxisMovement = GetGamepadAxisMovement * * @return {number} The resulting int. */ -function SetGamepadMappings (mappings) { +function SetGamepadMappings(mappings) { return r.BindSetGamepadMappings( mappings ) @@ -2072,7 +2264,7 @@ raylib.SetGamepadMappings = SetGamepadMappings * * @return {boolean} The resulting bool. */ -function IsMouseButtonPressed (button) { +function IsMouseButtonPressed(button) { return r.BindIsMouseButtonPressed( button ) @@ -2086,7 +2278,7 @@ raylib.IsMouseButtonPressed = IsMouseButtonPressed * * @return {boolean} The resulting bool. */ -function IsMouseButtonDown (button) { +function IsMouseButtonDown(button) { return r.BindIsMouseButtonDown( button ) @@ -2100,7 +2292,7 @@ raylib.IsMouseButtonDown = IsMouseButtonDown * * @return {boolean} The resulting bool. */ -function IsMouseButtonReleased (button) { +function IsMouseButtonReleased(button) { return r.BindIsMouseButtonReleased( button ) @@ -2114,7 +2306,7 @@ raylib.IsMouseButtonReleased = IsMouseButtonReleased * * @return {boolean} The resulting bool. */ -function IsMouseButtonUp (button) { +function IsMouseButtonUp(button) { return r.BindIsMouseButtonUp( button ) @@ -2126,7 +2318,7 @@ raylib.IsMouseButtonUp = IsMouseButtonUp * * @return {number} The resulting int. */ -function GetMouseX () { +function GetMouseX() { return r.BindGetMouseX() } raylib.GetMouseX = GetMouseX @@ -2136,7 +2328,7 @@ raylib.GetMouseX = GetMouseX * * @return {number} The resulting int. */ -function GetMouseY () { +function GetMouseY() { return r.BindGetMouseY() } raylib.GetMouseY = GetMouseY @@ -2146,7 +2338,7 @@ raylib.GetMouseY = GetMouseY * * @return {Vector2} The resulting Vector2. */ -function GetMousePosition () { +function GetMousePosition() { return r.BindGetMousePosition() } raylib.GetMousePosition = GetMousePosition @@ -2156,7 +2348,7 @@ raylib.GetMousePosition = GetMousePosition * * @return {Vector2} The resulting Vector2. */ -function GetMouseDelta () { +function GetMouseDelta() { return r.BindGetMouseDelta() } raylib.GetMouseDelta = GetMouseDelta @@ -2169,7 +2361,7 @@ raylib.GetMouseDelta = GetMouseDelta * * @return {undefined} */ -function SetMousePosition (x, y) { +function SetMousePosition(x, y) { return r.BindSetMousePosition( x, y @@ -2185,7 +2377,7 @@ raylib.SetMousePosition = SetMousePosition * * @return {undefined} */ -function SetMouseOffset (offsetX, offsetY) { +function SetMouseOffset(offsetX, offsetY) { return r.BindSetMouseOffset( offsetX, offsetY @@ -2201,7 +2393,7 @@ raylib.SetMouseOffset = SetMouseOffset * * @return {undefined} */ -function SetMouseScale (scaleX, scaleY) { +function SetMouseScale(scaleX, scaleY) { return r.BindSetMouseScale( scaleX, scaleY @@ -2214,7 +2406,7 @@ raylib.SetMouseScale = SetMouseScale * * @return {number} The resulting float. */ -function GetMouseWheelMove () { +function GetMouseWheelMove() { return r.BindGetMouseWheelMove() } raylib.GetMouseWheelMove = GetMouseWheelMove @@ -2224,7 +2416,7 @@ raylib.GetMouseWheelMove = GetMouseWheelMove * * @return {Vector2} The resulting Vector2. */ -function GetMouseWheelMoveV () { +function GetMouseWheelMoveV() { return r.BindGetMouseWheelMoveV() } raylib.GetMouseWheelMoveV = GetMouseWheelMoveV @@ -2236,7 +2428,7 @@ raylib.GetMouseWheelMoveV = GetMouseWheelMoveV * * @return {undefined} */ -function SetMouseCursor (cursor) { +function SetMouseCursor(cursor) { return r.BindSetMouseCursor( cursor ) @@ -2248,7 +2440,7 @@ raylib.SetMouseCursor = SetMouseCursor * * @return {number} The resulting int. */ -function GetTouchX () { +function GetTouchX() { return r.BindGetTouchX() } raylib.GetTouchX = GetTouchX @@ -2258,7 +2450,7 @@ raylib.GetTouchX = GetTouchX * * @return {number} The resulting int. */ -function GetTouchY () { +function GetTouchY() { return r.BindGetTouchY() } raylib.GetTouchY = GetTouchY @@ -2270,7 +2462,7 @@ raylib.GetTouchY = GetTouchY * * @return {Vector2} The resulting Vector2. */ -function GetTouchPosition (index) { +function GetTouchPosition(index) { return r.BindGetTouchPosition( index ) @@ -2284,7 +2476,7 @@ raylib.GetTouchPosition = GetTouchPosition * * @return {number} The resulting int. */ -function GetTouchPointId (index) { +function GetTouchPointId(index) { return r.BindGetTouchPointId( index ) @@ -2296,7 +2488,7 @@ raylib.GetTouchPointId = GetTouchPointId * * @return {number} The resulting int. */ -function GetTouchPointCount () { +function GetTouchPointCount() { return r.BindGetTouchPointCount() } raylib.GetTouchPointCount = GetTouchPointCount @@ -2308,7 +2500,7 @@ raylib.GetTouchPointCount = GetTouchPointCount * * @return {undefined} */ -function SetGesturesEnabled (flags) { +function SetGesturesEnabled(flags) { return r.BindSetGesturesEnabled( flags ) @@ -2322,7 +2514,7 @@ raylib.SetGesturesEnabled = SetGesturesEnabled * * @return {boolean} The resulting bool. */ -function IsGestureDetected (gesture) { +function IsGestureDetected(gesture) { return r.BindIsGestureDetected( gesture ) @@ -2334,7 +2526,7 @@ raylib.IsGestureDetected = IsGestureDetected * * @return {number} The resulting int. */ -function GetGestureDetected () { +function GetGestureDetected() { return r.BindGetGestureDetected() } raylib.GetGestureDetected = GetGestureDetected @@ -2344,7 +2536,7 @@ raylib.GetGestureDetected = GetGestureDetected * * @return {number} The resulting float. */ -function GetGestureHoldDuration () { +function GetGestureHoldDuration() { return r.BindGetGestureHoldDuration() } raylib.GetGestureHoldDuration = GetGestureHoldDuration @@ -2354,7 +2546,7 @@ raylib.GetGestureHoldDuration = GetGestureHoldDuration * * @return {Vector2} The resulting Vector2. */ -function GetGestureDragVector () { +function GetGestureDragVector() { return r.BindGetGestureDragVector() } raylib.GetGestureDragVector = GetGestureDragVector @@ -2364,7 +2556,7 @@ raylib.GetGestureDragVector = GetGestureDragVector * * @return {number} The resulting float. */ -function GetGestureDragAngle () { +function GetGestureDragAngle() { return r.BindGetGestureDragAngle() } raylib.GetGestureDragAngle = GetGestureDragAngle @@ -2374,7 +2566,7 @@ raylib.GetGestureDragAngle = GetGestureDragAngle * * @return {Vector2} The resulting Vector2. */ -function GetGesturePinchVector () { +function GetGesturePinchVector() { return r.BindGetGesturePinchVector() } raylib.GetGesturePinchVector = GetGesturePinchVector @@ -2384,7 +2576,7 @@ raylib.GetGesturePinchVector = GetGesturePinchVector * * @return {number} The resulting float. */ -function GetGesturePinchAngle () { +function GetGesturePinchAngle() { return r.BindGetGesturePinchAngle() } raylib.GetGesturePinchAngle = GetGesturePinchAngle @@ -2399,7 +2591,7 @@ raylib.GetGesturePinchAngle = GetGesturePinchAngle * * @return {undefined} */ -function UpdateCameraPro (camera, movement, rotation, zoom) { +function UpdateCameraPro(camera, movement, rotation, zoom) { return r.BindUpdateCameraPro( camera, movement.x, @@ -2421,7 +2613,7 @@ raylib.UpdateCameraPro = UpdateCameraPro * * @return {undefined} */ -function SetShapesTexture (texture, source) { +function SetShapesTexture(texture, source) { return r.BindSetShapesTexture( texture.id, texture.width, @@ -2445,7 +2637,7 @@ raylib.SetShapesTexture = SetShapesTexture * * @return {undefined} */ -function DrawPixel (posX, posY, color) { +function DrawPixel(posX, posY, color) { return r.BindDrawPixel( posX, posY, @@ -2465,7 +2657,7 @@ raylib.DrawPixel = DrawPixel * * @return {undefined} */ -function DrawPixelV (position, color) { +function DrawPixelV(position, color) { return r.BindDrawPixelV( position.x, position.y, @@ -2488,7 +2680,7 @@ raylib.DrawPixelV = DrawPixelV * * @return {undefined} */ -function DrawLine (startPosX, startPosY, endPosX, endPosY, color) { +function DrawLine(startPosX, startPosY, endPosX, endPosY, color) { return r.BindDrawLine( startPosX, startPosY, @@ -2503,7 +2695,7 @@ function DrawLine (startPosX, startPosY, endPosX, endPosY, color) { raylib.DrawLine = DrawLine /** - * Draw a line (Vector version) + * Draw a line (using gl lines) * * @param {Vector2} startPos * @param {Vector2} endPos @@ -2511,7 +2703,7 @@ raylib.DrawLine = DrawLine * * @return {undefined} */ -function DrawLineV (startPos, endPos, color) { +function DrawLineV(startPos, endPos, color) { return r.BindDrawLineV( startPos.x, startPos.y, @@ -2526,7 +2718,7 @@ function DrawLineV (startPos, endPos, color) { raylib.DrawLineV = DrawLineV /** - * Draw a line defining thickness + * Draw a line (using triangles/quads) * * @param {Vector2} startPos * @param {Vector2} endPos @@ -2535,7 +2727,7 @@ raylib.DrawLineV = DrawLineV * * @return {undefined} */ -function DrawLineEx (startPos, endPos, thick, color) { +function DrawLineEx(startPos, endPos, thick, color) { return r.BindDrawLineEx( startPos.x, startPos.y, @@ -2551,80 +2743,42 @@ function DrawLineEx (startPos, endPos, thick, color) { raylib.DrawLineEx = DrawLineEx /** - * Draw a line using cubic-bezier curves in-out - * - * @param {Vector2} startPos - * @param {Vector2} endPos - * @param {number} thick - * @param {Color} color - * - * @return {undefined} - */ -function DrawLineBezier (startPos, endPos, thick, color) { - return r.BindDrawLineBezier( - startPos.x, - startPos.y, - endPos.x, - endPos.y, - thick, - color.r, - color.g, - color.b, - color.a - ) -} -raylib.DrawLineBezier = DrawLineBezier - -/** - * Draw line using quadratic bezier curves with a control point + * Draw lines sequence (using gl lines) * - * @param {Vector2} startPos - * @param {Vector2} endPos - * @param {Vector2} controlPos - * @param {number} thick + * @param {number} points + * @param {number} pointCount * @param {Color} color * * @return {undefined} */ -function DrawLineBezierQuad (startPos, endPos, controlPos, thick, color) { - return r.BindDrawLineBezierQuad( - startPos.x, - startPos.y, - endPos.x, - endPos.y, - controlPos.x, - controlPos.y, - thick, +function DrawLineStrip(points, pointCount, color) { + return r.BindDrawLineStrip( + points, + pointCount, color.r, color.g, color.b, color.a ) } -raylib.DrawLineBezierQuad = DrawLineBezierQuad +raylib.DrawLineStrip = DrawLineStrip /** - * Draw line using cubic bezier curves with 2 control points + * Draw line segment cubic-bezier in-out interpolation * * @param {Vector2} startPos * @param {Vector2} endPos - * @param {Vector2} startControlPos - * @param {Vector2} endControlPos * @param {number} thick * @param {Color} color * * @return {undefined} */ -function DrawLineBezierCubic (startPos, endPos, startControlPos, endControlPos, thick, color) { - return r.BindDrawLineBezierCubic( +function DrawLineBezier(startPos, endPos, thick, color) { + return r.BindDrawLineBezier( startPos.x, startPos.y, endPos.x, endPos.y, - startControlPos.x, - startControlPos.y, - endControlPos.x, - endControlPos.y, thick, color.r, color.g, @@ -2632,28 +2786,7 @@ function DrawLineBezierCubic (startPos, endPos, startControlPos, endControlPos, color.a ) } -raylib.DrawLineBezierCubic = DrawLineBezierCubic - -/** - * Draw lines sequence - * - * @param {number} points - * @param {number} pointCount - * @param {Color} color - * - * @return {undefined} - */ -function DrawLineStrip (points, pointCount, color) { - return r.BindDrawLineStrip( - points, - pointCount, - color.r, - color.g, - color.b, - color.a - ) -} -raylib.DrawLineStrip = DrawLineStrip +raylib.DrawLineBezier = DrawLineBezier /** * Draw a color-filled circle @@ -2665,7 +2798,7 @@ raylib.DrawLineStrip = DrawLineStrip * * @return {undefined} */ -function DrawCircle (centerX, centerY, radius, color) { +function DrawCircle(centerX, centerY, radius, color) { return r.BindDrawCircle( centerX, centerY, @@ -2690,7 +2823,7 @@ raylib.DrawCircle = DrawCircle * * @return {undefined} */ -function DrawCircleSector (center, radius, startAngle, endAngle, segments, color) { +function DrawCircleSector(center, radius, startAngle, endAngle, segments, color) { return r.BindDrawCircleSector( center.x, center.y, @@ -2718,7 +2851,7 @@ raylib.DrawCircleSector = DrawCircleSector * * @return {undefined} */ -function DrawCircleSectorLines (center, radius, startAngle, endAngle, segments, color) { +function DrawCircleSectorLines(center, radius, startAngle, endAngle, segments, color) { return r.BindDrawCircleSectorLines( center.x, center.y, @@ -2745,7 +2878,7 @@ raylib.DrawCircleSectorLines = DrawCircleSectorLines * * @return {undefined} */ -function DrawCircleGradient (centerX, centerY, radius, color1, color2) { +function DrawCircleGradient(centerX, centerY, radius, color1, color2) { return r.BindDrawCircleGradient( centerX, centerY, @@ -2771,7 +2904,7 @@ raylib.DrawCircleGradient = DrawCircleGradient * * @return {undefined} */ -function DrawCircleV (center, radius, color) { +function DrawCircleV(center, radius, color) { return r.BindDrawCircleV( center.x, center.y, @@ -2794,7 +2927,7 @@ raylib.DrawCircleV = DrawCircleV * * @return {undefined} */ -function DrawCircleLines (centerX, centerY, radius, color) { +function DrawCircleLines(centerX, centerY, radius, color) { return r.BindDrawCircleLines( centerX, centerY, @@ -2807,6 +2940,28 @@ function DrawCircleLines (centerX, centerY, radius, color) { } raylib.DrawCircleLines = DrawCircleLines +/** + * Draw circle outline (Vector version) + * + * @param {Vector2} center + * @param {number} radius + * @param {Color} color + * + * @return {undefined} + */ +function DrawCircleLinesV(center, radius, color) { + return r.BindDrawCircleLinesV( + center.x, + center.y, + radius, + color.r, + color.g, + color.b, + color.a + ) +} +raylib.DrawCircleLinesV = DrawCircleLinesV + /** * Draw ellipse * @@ -2818,7 +2973,7 @@ raylib.DrawCircleLines = DrawCircleLines * * @return {undefined} */ -function DrawEllipse (centerX, centerY, radiusH, radiusV, color) { +function DrawEllipse(centerX, centerY, radiusH, radiusV, color) { return r.BindDrawEllipse( centerX, centerY, @@ -2843,7 +2998,7 @@ raylib.DrawEllipse = DrawEllipse * * @return {undefined} */ -function DrawEllipseLines (centerX, centerY, radiusH, radiusV, color) { +function DrawEllipseLines(centerX, centerY, radiusH, radiusV, color) { return r.BindDrawEllipseLines( centerX, centerY, @@ -2870,7 +3025,7 @@ raylib.DrawEllipseLines = DrawEllipseLines * * @return {undefined} */ -function DrawRing (center, innerRadius, outerRadius, startAngle, endAngle, segments, color) { +function DrawRing(center, innerRadius, outerRadius, startAngle, endAngle, segments, color) { return r.BindDrawRing( center.x, center.y, @@ -2900,7 +3055,7 @@ raylib.DrawRing = DrawRing * * @return {undefined} */ -function DrawRingLines (center, innerRadius, outerRadius, startAngle, endAngle, segments, color) { +function DrawRingLines(center, innerRadius, outerRadius, startAngle, endAngle, segments, color) { return r.BindDrawRingLines( center.x, center.y, @@ -2928,7 +3083,7 @@ raylib.DrawRingLines = DrawRingLines * * @return {undefined} */ -function DrawRectangle (posX, posY, width, height, color) { +function DrawRectangle(posX, posY, width, height, color) { return r.BindDrawRectangle( posX, posY, @@ -2951,7 +3106,7 @@ raylib.DrawRectangle = DrawRectangle * * @return {undefined} */ -function DrawRectangleV (position, size, color) { +function DrawRectangleV(position, size, color) { return r.BindDrawRectangleV( position.x, position.y, @@ -2973,7 +3128,7 @@ raylib.DrawRectangleV = DrawRectangleV * * @return {undefined} */ -function DrawRectangleRec (rec, color) { +function DrawRectangleRec(rec, color) { return r.BindDrawRectangleRec( rec.x, rec.y, @@ -2997,7 +3152,7 @@ raylib.DrawRectangleRec = DrawRectangleRec * * @return {undefined} */ -function DrawRectanglePro (rec, origin, rotation, color) { +function DrawRectanglePro(rec, origin, rotation, color) { return r.BindDrawRectanglePro( rec.x, rec.y, @@ -3026,7 +3181,7 @@ raylib.DrawRectanglePro = DrawRectanglePro * * @return {undefined} */ -function DrawRectangleGradientV (posX, posY, width, height, color1, color2) { +function DrawRectangleGradientV(posX, posY, width, height, color1, color2) { return r.BindDrawRectangleGradientV( posX, posY, @@ -3056,7 +3211,7 @@ raylib.DrawRectangleGradientV = DrawRectangleGradientV * * @return {undefined} */ -function DrawRectangleGradientH (posX, posY, width, height, color1, color2) { +function DrawRectangleGradientH(posX, posY, width, height, color1, color2) { return r.BindDrawRectangleGradientH( posX, posY, @@ -3085,7 +3240,7 @@ raylib.DrawRectangleGradientH = DrawRectangleGradientH * * @return {undefined} */ -function DrawRectangleGradientEx (rec, col1, col2, col3, col4) { +function DrawRectangleGradientEx(rec, col1, col2, col3, col4) { return r.BindDrawRectangleGradientEx( rec.x, rec.y, @@ -3122,7 +3277,7 @@ raylib.DrawRectangleGradientEx = DrawRectangleGradientEx * * @return {undefined} */ -function DrawRectangleLines (posX, posY, width, height, color) { +function DrawRectangleLines(posX, posY, width, height, color) { return r.BindDrawRectangleLines( posX, posY, @@ -3145,7 +3300,7 @@ raylib.DrawRectangleLines = DrawRectangleLines * * @return {undefined} */ -function DrawRectangleLinesEx (rec, lineThick, color) { +function DrawRectangleLinesEx(rec, lineThick, color) { return r.BindDrawRectangleLinesEx( rec.x, rec.y, @@ -3170,7 +3325,7 @@ raylib.DrawRectangleLinesEx = DrawRectangleLinesEx * * @return {undefined} */ -function DrawRectangleRounded (rec, roundness, segments, color) { +function DrawRectangleRounded(rec, roundness, segments, color) { return r.BindDrawRectangleRounded( rec.x, rec.y, @@ -3197,7 +3352,7 @@ raylib.DrawRectangleRounded = DrawRectangleRounded * * @return {undefined} */ -function DrawRectangleRoundedLines (rec, roundness, segments, lineThick, color) { +function DrawRectangleRoundedLines(rec, roundness, segments, lineThick, color) { return r.BindDrawRectangleRoundedLines( rec.x, rec.y, @@ -3224,7 +3379,7 @@ raylib.DrawRectangleRoundedLines = DrawRectangleRoundedLines * * @return {undefined} */ -function DrawTriangle (v1, v2, v3, color) { +function DrawTriangle(v1, v2, v3, color) { return r.BindDrawTriangle( v1.x, v1.y, @@ -3250,7 +3405,7 @@ raylib.DrawTriangle = DrawTriangle * * @return {undefined} */ -function DrawTriangleLines (v1, v2, v3, color) { +function DrawTriangleLines(v1, v2, v3, color) { return r.BindDrawTriangleLines( v1.x, v1.y, @@ -3275,7 +3430,7 @@ raylib.DrawTriangleLines = DrawTriangleLines * * @return {undefined} */ -function DrawTriangleFan (points, pointCount, color) { +function DrawTriangleFan(points, pointCount, color) { return r.BindDrawTriangleFan( points, pointCount, @@ -3296,7 +3451,7 @@ raylib.DrawTriangleFan = DrawTriangleFan * * @return {undefined} */ -function DrawTriangleStrip (points, pointCount, color) { +function DrawTriangleStrip(points, pointCount, color) { return r.BindDrawTriangleStrip( points, pointCount, @@ -3319,7 +3474,7 @@ raylib.DrawTriangleStrip = DrawTriangleStrip * * @return {undefined} */ -function DrawPoly (center, sides, radius, rotation, color) { +function DrawPoly(center, sides, radius, rotation, color) { return r.BindDrawPoly( center.x, center.y, @@ -3345,7 +3500,7 @@ raylib.DrawPoly = DrawPoly * * @return {undefined} */ -function DrawPolyLines (center, sides, radius, rotation, color) { +function DrawPolyLines(center, sides, radius, rotation, color) { return r.BindDrawPolyLines( center.x, center.y, @@ -3372,7 +3527,7 @@ raylib.DrawPolyLines = DrawPolyLines * * @return {undefined} */ -function DrawPolyLinesEx (center, sides, radius, rotation, lineThick, color) { +function DrawPolyLinesEx(center, sides, radius, rotation, lineThick, color) { return r.BindDrawPolyLinesEx( center.x, center.y, @@ -3389,66 +3544,448 @@ function DrawPolyLinesEx (center, sides, radius, rotation, lineThick, color) { raylib.DrawPolyLinesEx = DrawPolyLinesEx /** - * Check collision between two rectangles + * Draw spline: Linear, minimum 2 points * - * @param {Rectangle} rec1 - * @param {Rectangle} rec2 + * @param {number} points + * @param {number} pointCount + * @param {number} thick + * @param {Color} color * - * @return {boolean} The resulting bool. + * @return {undefined} */ -function CheckCollisionRecs (rec1, rec2) { - return r.BindCheckCollisionRecs( - rec1.x, - rec1.y, - rec1.width, - rec1.height, - rec2.x, - rec2.y, - rec2.width, - rec2.height +function DrawSplineLinear(points, pointCount, thick, color) { + return r.BindDrawSplineLinear( + points, + pointCount, + thick, + color.r, + color.g, + color.b, + color.a ) } -raylib.CheckCollisionRecs = CheckCollisionRecs +raylib.DrawSplineLinear = DrawSplineLinear /** - * Check collision between two circles + * Draw spline: B-Spline, minimum 4 points * - * @param {Vector2} center1 - * @param {number} radius1 - * @param {Vector2} center2 - * @param {number} radius2 + * @param {number} points + * @param {number} pointCount + * @param {number} thick + * @param {Color} color * - * @return {boolean} The resulting bool. + * @return {undefined} */ -function CheckCollisionCircles (center1, radius1, center2, radius2) { - return r.BindCheckCollisionCircles( - center1.x, - center1.y, - radius1, - center2.x, - center2.y, - radius2 +function DrawSplineBasis(points, pointCount, thick, color) { + return r.BindDrawSplineBasis( + points, + pointCount, + thick, + color.r, + color.g, + color.b, + color.a ) } -raylib.CheckCollisionCircles = CheckCollisionCircles +raylib.DrawSplineBasis = DrawSplineBasis /** - * Check collision between circle and rectangle + * Draw spline: Catmull-Rom, minimum 4 points * - * @param {Vector2} center - * @param {number} radius - * @param {Rectangle} rec + * @param {number} points + * @param {number} pointCount + * @param {number} thick + * @param {Color} color * - * @return {boolean} The resulting bool. + * @return {undefined} */ -function CheckCollisionCircleRec (center, radius, rec) { - return r.BindCheckCollisionCircleRec( - center.x, - center.y, - radius, - rec.x, - rec.y, - rec.width, +function DrawSplineCatmullRom(points, pointCount, thick, color) { + return r.BindDrawSplineCatmullRom( + points, + pointCount, + thick, + color.r, + color.g, + color.b, + color.a + ) +} +raylib.DrawSplineCatmullRom = DrawSplineCatmullRom + +/** + * Draw spline: Quadratic Bezier, minimum 3 points (1 control point): [p1, c2, p3, c4...] + * + * @param {number} points + * @param {number} pointCount + * @param {number} thick + * @param {Color} color + * + * @return {undefined} + */ +function DrawSplineBezierQuadratic(points, pointCount, thick, color) { + return r.BindDrawSplineBezierQuadratic( + points, + pointCount, + thick, + color.r, + color.g, + color.b, + color.a + ) +} +raylib.DrawSplineBezierQuadratic = DrawSplineBezierQuadratic + +/** + * Draw spline: Cubic Bezier, minimum 4 points (2 control points): [p1, c2, c3, p4, c5, c6...] + * + * @param {number} points + * @param {number} pointCount + * @param {number} thick + * @param {Color} color + * + * @return {undefined} + */ +function DrawSplineBezierCubic(points, pointCount, thick, color) { + return r.BindDrawSplineBezierCubic( + points, + pointCount, + thick, + color.r, + color.g, + color.b, + color.a + ) +} +raylib.DrawSplineBezierCubic = DrawSplineBezierCubic + +/** + * Draw spline segment: Linear, 2 points + * + * @param {Vector2} p1 + * @param {Vector2} p2 + * @param {number} thick + * @param {Color} color + * + * @return {undefined} + */ +function DrawSplineSegmentLinear(p1, p2, thick, color) { + return r.BindDrawSplineSegmentLinear( + p1.x, + p1.y, + p2.x, + p2.y, + thick, + color.r, + color.g, + color.b, + color.a + ) +} +raylib.DrawSplineSegmentLinear = DrawSplineSegmentLinear + +/** + * Draw spline segment: B-Spline, 4 points + * + * @param {Vector2} p1 + * @param {Vector2} p2 + * @param {Vector2} p3 + * @param {Vector2} p4 + * @param {number} thick + * @param {Color} color + * + * @return {undefined} + */ +function DrawSplineSegmentBasis(p1, p2, p3, p4, thick, color) { + return r.BindDrawSplineSegmentBasis( + p1.x, + p1.y, + p2.x, + p2.y, + p3.x, + p3.y, + p4.x, + p4.y, + thick, + color.r, + color.g, + color.b, + color.a + ) +} +raylib.DrawSplineSegmentBasis = DrawSplineSegmentBasis + +/** + * Draw spline segment: Catmull-Rom, 4 points + * + * @param {Vector2} p1 + * @param {Vector2} p2 + * @param {Vector2} p3 + * @param {Vector2} p4 + * @param {number} thick + * @param {Color} color + * + * @return {undefined} + */ +function DrawSplineSegmentCatmullRom(p1, p2, p3, p4, thick, color) { + return r.BindDrawSplineSegmentCatmullRom( + p1.x, + p1.y, + p2.x, + p2.y, + p3.x, + p3.y, + p4.x, + p4.y, + thick, + color.r, + color.g, + color.b, + color.a + ) +} +raylib.DrawSplineSegmentCatmullRom = DrawSplineSegmentCatmullRom + +/** + * Draw spline segment: Quadratic Bezier, 2 points, 1 control point + * + * @param {Vector2} p1 + * @param {Vector2} c2 + * @param {Vector2} p3 + * @param {number} thick + * @param {Color} color + * + * @return {undefined} + */ +function DrawSplineSegmentBezierQuadratic(p1, c2, p3, thick, color) { + return r.BindDrawSplineSegmentBezierQuadratic( + p1.x, + p1.y, + c2.x, + c2.y, + p3.x, + p3.y, + thick, + color.r, + color.g, + color.b, + color.a + ) +} +raylib.DrawSplineSegmentBezierQuadratic = DrawSplineSegmentBezierQuadratic + +/** + * Draw spline segment: Cubic Bezier, 2 points, 2 control points + * + * @param {Vector2} p1 + * @param {Vector2} c2 + * @param {Vector2} c3 + * @param {Vector2} p4 + * @param {number} thick + * @param {Color} color + * + * @return {undefined} + */ +function DrawSplineSegmentBezierCubic(p1, c2, c3, p4, thick, color) { + return r.BindDrawSplineSegmentBezierCubic( + p1.x, + p1.y, + c2.x, + c2.y, + c3.x, + c3.y, + p4.x, + p4.y, + thick, + color.r, + color.g, + color.b, + color.a + ) +} +raylib.DrawSplineSegmentBezierCubic = DrawSplineSegmentBezierCubic + +/** + * Get (evaluate) spline point: Linear + * + * @param {Vector2} startPos + * @param {Vector2} endPos + * @param {number} t + * + * @return {Vector2} The resulting Vector2. + */ +function GetSplinePointLinear(startPos, endPos, t) { + return r.BindGetSplinePointLinear( + startPos.x, + startPos.y, + endPos.x, + endPos.y, + t + ) +} +raylib.GetSplinePointLinear = GetSplinePointLinear + +/** + * Get (evaluate) spline point: B-Spline + * + * @param {Vector2} p1 + * @param {Vector2} p2 + * @param {Vector2} p3 + * @param {Vector2} p4 + * @param {number} t + * + * @return {Vector2} The resulting Vector2. + */ +function GetSplinePointBasis(p1, p2, p3, p4, t) { + return r.BindGetSplinePointBasis( + p1.x, + p1.y, + p2.x, + p2.y, + p3.x, + p3.y, + p4.x, + p4.y, + t + ) +} +raylib.GetSplinePointBasis = GetSplinePointBasis + +/** + * Get (evaluate) spline point: Catmull-Rom + * + * @param {Vector2} p1 + * @param {Vector2} p2 + * @param {Vector2} p3 + * @param {Vector2} p4 + * @param {number} t + * + * @return {Vector2} The resulting Vector2. + */ +function GetSplinePointCatmullRom(p1, p2, p3, p4, t) { + return r.BindGetSplinePointCatmullRom( + p1.x, + p1.y, + p2.x, + p2.y, + p3.x, + p3.y, + p4.x, + p4.y, + t + ) +} +raylib.GetSplinePointCatmullRom = GetSplinePointCatmullRom + +/** + * Get (evaluate) spline point: Quadratic Bezier + * + * @param {Vector2} p1 + * @param {Vector2} c2 + * @param {Vector2} p3 + * @param {number} t + * + * @return {Vector2} The resulting Vector2. + */ +function GetSplinePointBezierQuad(p1, c2, p3, t) { + return r.BindGetSplinePointBezierQuad( + p1.x, + p1.y, + c2.x, + c2.y, + p3.x, + p3.y, + t + ) +} +raylib.GetSplinePointBezierQuad = GetSplinePointBezierQuad + +/** + * Get (evaluate) spline point: Cubic Bezier + * + * @param {Vector2} p1 + * @param {Vector2} c2 + * @param {Vector2} c3 + * @param {Vector2} p4 + * @param {number} t + * + * @return {Vector2} The resulting Vector2. + */ +function GetSplinePointBezierCubic(p1, c2, c3, p4, t) { + return r.BindGetSplinePointBezierCubic( + p1.x, + p1.y, + c2.x, + c2.y, + c3.x, + c3.y, + p4.x, + p4.y, + t + ) +} +raylib.GetSplinePointBezierCubic = GetSplinePointBezierCubic + +/** + * Check collision between two rectangles + * + * @param {Rectangle} rec1 + * @param {Rectangle} rec2 + * + * @return {boolean} The resulting bool. + */ +function CheckCollisionRecs(rec1, rec2) { + return r.BindCheckCollisionRecs( + rec1.x, + rec1.y, + rec1.width, + rec1.height, + rec2.x, + rec2.y, + rec2.width, + rec2.height + ) +} +raylib.CheckCollisionRecs = CheckCollisionRecs + +/** + * Check collision between two circles + * + * @param {Vector2} center1 + * @param {number} radius1 + * @param {Vector2} center2 + * @param {number} radius2 + * + * @return {boolean} The resulting bool. + */ +function CheckCollisionCircles(center1, radius1, center2, radius2) { + return r.BindCheckCollisionCircles( + center1.x, + center1.y, + radius1, + center2.x, + center2.y, + radius2 + ) +} +raylib.CheckCollisionCircles = CheckCollisionCircles + +/** + * Check collision between circle and rectangle + * + * @param {Vector2} center + * @param {number} radius + * @param {Rectangle} rec + * + * @return {boolean} The resulting bool. + */ +function CheckCollisionCircleRec(center, radius, rec) { + return r.BindCheckCollisionCircleRec( + center.x, + center.y, + radius, + rec.x, + rec.y, + rec.width, rec.height ) } @@ -3462,7 +3999,7 @@ raylib.CheckCollisionCircleRec = CheckCollisionCircleRec * * @return {boolean} The resulting bool. */ -function CheckCollisionPointRec (point, rec) { +function CheckCollisionPointRec(point, rec) { return r.BindCheckCollisionPointRec( point.x, point.y, @@ -3483,7 +4020,7 @@ raylib.CheckCollisionPointRec = CheckCollisionPointRec * * @return {boolean} The resulting bool. */ -function CheckCollisionPointCircle (point, center, radius) { +function CheckCollisionPointCircle(point, center, radius) { return r.BindCheckCollisionPointCircle( point.x, point.y, @@ -3504,7 +4041,7 @@ raylib.CheckCollisionPointCircle = CheckCollisionPointCircle * * @return {boolean} The resulting bool. */ -function CheckCollisionPointTriangle (point, p1, p2, p3) { +function CheckCollisionPointTriangle(point, p1, p2, p3) { return r.BindCheckCollisionPointTriangle( point.x, point.y, @@ -3527,7 +4064,7 @@ raylib.CheckCollisionPointTriangle = CheckCollisionPointTriangle * * @return {boolean} The resulting bool. */ -function CheckCollisionPointPoly (point, points, pointCount) { +function CheckCollisionPointPoly(point, points, pointCount) { return r.BindCheckCollisionPointPoly( point.x, point.y, @@ -3548,7 +4085,7 @@ raylib.CheckCollisionPointPoly = CheckCollisionPointPoly * * @return {boolean} The resulting bool. */ -function CheckCollisionLines (startPos1, endPos1, startPos2, endPos2, collisionPoint) { +function CheckCollisionLines(startPos1, endPos1, startPos2, endPos2, collisionPoint) { return r.BindCheckCollisionLines( startPos1.x, startPos1.y, @@ -3573,7 +4110,7 @@ raylib.CheckCollisionLines = CheckCollisionLines * * @return {boolean} The resulting bool. */ -function CheckCollisionPointLine (point, p1, p2, threshold) { +function CheckCollisionPointLine(point, p1, p2, threshold) { return r.BindCheckCollisionPointLine( point.x, point.y, @@ -3594,7 +4131,7 @@ raylib.CheckCollisionPointLine = CheckCollisionPointLine * * @return {Rectangle} The resulting Rectangle. */ -function GetCollisionRec (rec1, rec2) { +function GetCollisionRec(rec1, rec2) { return r.BindGetCollisionRec( rec1.x, rec1.y, @@ -3615,7 +4152,7 @@ raylib.GetCollisionRec = GetCollisionRec * * @return {Image} The resulting Image. */ -function LoadImage (fileName) { +function LoadImage(fileName) { return r.BindLoadImage( fileName ) @@ -3633,7 +4170,7 @@ raylib.LoadImage = LoadImage * * @return {Image} The resulting Image. */ -function LoadImageRaw (fileName, width, height, format, headerSize) { +function LoadImageRaw(fileName, width, height, format, headerSize) { return r.BindLoadImageRaw( fileName, width, @@ -3644,6 +4181,24 @@ function LoadImageRaw (fileName, width, height, format, headerSize) { } raylib.LoadImageRaw = LoadImageRaw +/** + * Load image from SVG file data or string with specified size + * + * @param {string} fileNameOrString + * @param {number} width + * @param {number} height + * + * @return {Image} The resulting Image. + */ +function LoadImageSvg(fileNameOrString, width, height) { + return r.BindLoadImageSvg( + fileNameOrString, + width, + height + ) +} +raylib.LoadImageSvg = LoadImageSvg + /** * Load image sequence from file (frames appended to image.data) * @@ -3652,7 +4207,7 @@ raylib.LoadImageRaw = LoadImageRaw * * @return {Image} The resulting Image. */ -function LoadImageAnim (fileName, frames) { +function LoadImageAnim(fileName, frames) { return r.BindLoadImageAnim( fileName, frames @@ -3669,7 +4224,7 @@ raylib.LoadImageAnim = LoadImageAnim * * @return {Image} The resulting Image. */ -function LoadImageFromMemory (fileType, fileData, dataSize) { +function LoadImageFromMemory(fileType, fileData, dataSize) { return r.BindLoadImageFromMemory( fileType, fileData, @@ -3685,7 +4240,7 @@ raylib.LoadImageFromMemory = LoadImageFromMemory * * @return {Image} The resulting Image. */ -function LoadImageFromTexture (texture) { +function LoadImageFromTexture(texture) { return r.BindLoadImageFromTexture( texture.id, texture.width, @@ -3701,7 +4256,7 @@ raylib.LoadImageFromTexture = LoadImageFromTexture * * @return {Image} The resulting Image. */ -function LoadImageFromScreen () { +function LoadImageFromScreen() { return r.BindLoadImageFromScreen() } raylib.LoadImageFromScreen = LoadImageFromScreen @@ -3713,7 +4268,7 @@ raylib.LoadImageFromScreen = LoadImageFromScreen * * @return {boolean} The resulting bool. */ -function IsImageReady (image) { +function IsImageReady(image) { return r.BindIsImageReady( image.data, image.width, @@ -3731,7 +4286,7 @@ raylib.IsImageReady = IsImageReady * * @return {undefined} */ -function UnloadImage (image) { +function UnloadImage(image) { return r.BindUnloadImage( image.data, image.width, @@ -3750,7 +4305,7 @@ raylib.UnloadImage = UnloadImage * * @return {boolean} The resulting bool. */ -function ExportImage (image, fileName) { +function ExportImage(image, fileName) { return r.BindExportImage( image.data, image.width, @@ -3762,6 +4317,28 @@ function ExportImage (image, fileName) { } raylib.ExportImage = ExportImage +/** + * Export image to memory buffer + * + * @param {Image} image + * @param {string} fileType + * @param {number} fileSize + * + * @return {Buffer} The resulting unsigned char *. + */ +function ExportImageToMemory(image, fileType, fileSize) { + return r.BindExportImageToMemory( + image.data, + image.width, + image.height, + image.mipmaps, + image.format, + fileType, + fileSize + ) +} +raylib.ExportImageToMemory = ExportImageToMemory + /** * Export image as code file defining an array of bytes, returns true on success * @@ -3770,7 +4347,7 @@ raylib.ExportImage = ExportImage * * @return {boolean} The resulting bool. */ -function ExportImageAsCode (image, fileName) { +function ExportImageAsCode(image, fileName) { return r.BindExportImageAsCode( image.data, image.width, @@ -3791,7 +4368,7 @@ raylib.ExportImageAsCode = ExportImageAsCode * * @return {Image} The resulting Image. */ -function GenImageColor (width, height, color) { +function GenImageColor(width, height, color) { return r.BindGenImageColor( width, height, @@ -3804,59 +4381,63 @@ function GenImageColor (width, height, color) { raylib.GenImageColor = GenImageColor /** - * Generate image: vertical gradient + * Generate image: linear gradient, direction in degrees [0..360], 0=Vertical gradient * * @param {number} width * @param {number} height - * @param {Color} top - * @param {Color} bottom + * @param {number} direction + * @param {Color} start + * @param {Color} end * * @return {Image} The resulting Image. */ -function GenImageGradientV (width, height, top, bottom) { - return r.BindGenImageGradientV( +function GenImageGradientLinear(width, height, direction, start, end) { + return r.BindGenImageGradientLinear( width, height, - top.r, - top.g, - top.b, - top.a, - bottom.r, - bottom.g, - bottom.b, - bottom.a + direction, + start.r, + start.g, + start.b, + start.a, + end.r, + end.g, + end.b, + end.a ) } -raylib.GenImageGradientV = GenImageGradientV +raylib.GenImageGradientLinear = GenImageGradientLinear /** - * Generate image: horizontal gradient + * Generate image: radial gradient * * @param {number} width * @param {number} height - * @param {Color} left - * @param {Color} right + * @param {number} density + * @param {Color} inner + * @param {Color} outer * * @return {Image} The resulting Image. */ -function GenImageGradientH (width, height, left, right) { - return r.BindGenImageGradientH( +function GenImageGradientRadial(width, height, density, inner, outer) { + return r.BindGenImageGradientRadial( width, height, - left.r, - left.g, - left.b, - left.a, - right.r, - right.g, - right.b, - right.a + density, + inner.r, + inner.g, + inner.b, + inner.a, + outer.r, + outer.g, + outer.b, + outer.a ) } -raylib.GenImageGradientH = GenImageGradientH +raylib.GenImageGradientRadial = GenImageGradientRadial /** - * Generate image: radial gradient + * Generate image: square gradient * * @param {number} width * @param {number} height @@ -3866,8 +4447,8 @@ raylib.GenImageGradientH = GenImageGradientH * * @return {Image} The resulting Image. */ -function GenImageGradientRadial (width, height, density, inner, outer) { - return r.BindGenImageGradientRadial( +function GenImageGradientSquare(width, height, density, inner, outer) { + return r.BindGenImageGradientSquare( width, height, density, @@ -3881,7 +4462,7 @@ function GenImageGradientRadial (width, height, density, inner, outer) { outer.a ) } -raylib.GenImageGradientRadial = GenImageGradientRadial +raylib.GenImageGradientSquare = GenImageGradientSquare /** * Generate image: checked @@ -3895,7 +4476,7 @@ raylib.GenImageGradientRadial = GenImageGradientRadial * * @return {Image} The resulting Image. */ -function GenImageChecked (width, height, checksX, checksY, col1, col2) { +function GenImageChecked(width, height, checksX, checksY, col1, col2) { return r.BindGenImageChecked( width, height, @@ -3922,7 +4503,7 @@ raylib.GenImageChecked = GenImageChecked * * @return {Image} The resulting Image. */ -function GenImageWhiteNoise (width, height, factor) { +function GenImageWhiteNoise(width, height, factor) { return r.BindGenImageWhiteNoise( width, height, @@ -3942,7 +4523,7 @@ raylib.GenImageWhiteNoise = GenImageWhiteNoise * * @return {Image} The resulting Image. */ -function GenImagePerlinNoise (width, height, offsetX, offsetY, scale) { +function GenImagePerlinNoise(width, height, offsetX, offsetY, scale) { return r.BindGenImagePerlinNoise( width, height, @@ -3962,7 +4543,7 @@ raylib.GenImagePerlinNoise = GenImagePerlinNoise * * @return {Image} The resulting Image. */ -function GenImageCellular (width, height, tileSize) { +function GenImageCellular(width, height, tileSize) { return r.BindGenImageCellular( width, height, @@ -3980,7 +4561,7 @@ raylib.GenImageCellular = GenImageCellular * * @return {Image} The resulting Image. */ -function GenImageText (width, height, text) { +function GenImageText(width, height, text) { return r.BindGenImageText( width, height, @@ -3996,7 +4577,7 @@ raylib.GenImageText = GenImageText * * @return {Image} The resulting Image. */ -function ImageCopy (image) { +function ImageCopy(image) { return r.BindImageCopy( image.data, image.width, @@ -4015,7 +4596,7 @@ raylib.ImageCopy = ImageCopy * * @return {Image} The resulting Image. */ -function ImageFromImage (image, rec) { +function ImageFromImage(image, rec) { return r.BindImageFromImage( image.data, image.width, @@ -4039,7 +4620,7 @@ raylib.ImageFromImage = ImageFromImage * * @return {Image} The resulting Image. */ -function ImageText (text, fontSize, color) { +function ImageText(text, fontSize, color) { return r.BindImageText( text, fontSize, @@ -4062,7 +4643,7 @@ raylib.ImageText = ImageText * * @return {Image} The resulting Image. */ -function ImageTextEx (font, text, fontSize, spacing, tint) { +function ImageTextEx(font, text, fontSize, spacing, tint) { return r.BindImageTextEx( font.baseSize, font.glyphCount, @@ -4093,7 +4674,7 @@ raylib.ImageTextEx = ImageTextEx * * @return {undefined} */ -function ImageBlurGaussian (image, blurSize) { +function ImageBlurGaussian(image, blurSize) { return r.BindImageBlurGaussian( image, blurSize @@ -4101,6 +4682,22 @@ function ImageBlurGaussian (image, blurSize) { } raylib.ImageBlurGaussian = ImageBlurGaussian +/** + * Rotate image by input angle in degrees (-359 to 359) + * + * @param {number} image + * @param {number} degrees + * + * @return {undefined} + */ +function ImageRotate(image, degrees) { + return r.BindImageRotate( + image, + degrees + ) +} +raylib.ImageRotate = ImageRotate + /** * Load color data from image as a Color array (RGBA - 32bit) * @@ -4108,7 +4705,7 @@ raylib.ImageBlurGaussian = ImageBlurGaussian * * @return {number} The resulting Color *. */ -function LoadImageColors (image) { +function LoadImageColors(image) { return r.BindLoadImageColors( image.data, image.width, @@ -4128,7 +4725,7 @@ raylib.LoadImageColors = LoadImageColors * * @return {number} The resulting Color *. */ -function LoadImagePalette (image, maxPaletteSize, colorCount) { +function LoadImagePalette(image, maxPaletteSize, colorCount) { return r.BindLoadImagePalette( image.data, image.width, @@ -4148,7 +4745,7 @@ raylib.LoadImagePalette = LoadImagePalette * * @return {undefined} */ -function UnloadImageColors (colors) { +function UnloadImageColors(colors) { return r.BindUnloadImageColors( colors ) @@ -4162,7 +4759,7 @@ raylib.UnloadImageColors = UnloadImageColors * * @return {undefined} */ -function UnloadImagePalette (colors) { +function UnloadImagePalette(colors) { return r.BindUnloadImagePalette( colors ) @@ -4177,7 +4774,7 @@ raylib.UnloadImagePalette = UnloadImagePalette * * @return {Rectangle} The resulting Rectangle. */ -function GetImageAlphaBorder (image, threshold) { +function GetImageAlphaBorder(image, threshold) { return r.BindGetImageAlphaBorder( image.data, image.width, @@ -4198,7 +4795,7 @@ raylib.GetImageAlphaBorder = GetImageAlphaBorder * * @return {Color} The resulting Color. */ -function GetImageColor (image, x, y) { +function GetImageColor(image, x, y) { return r.BindGetImageColor( image.data, image.width, @@ -4222,7 +4819,7 @@ raylib.GetImageColor = GetImageColor * * @return {undefined} */ -function ImageDrawCircleLines (dst, centerX, centerY, radius, color) { +function ImageDrawCircleLines(dst, centerX, centerY, radius, color) { return r.BindImageDrawCircleLines( dst, centerX, @@ -4246,7 +4843,7 @@ raylib.ImageDrawCircleLines = ImageDrawCircleLines * * @return {undefined} */ -function ImageDrawCircleLinesV (dst, center, radius, color) { +function ImageDrawCircleLinesV(dst, center, radius, color) { return r.BindImageDrawCircleLinesV( dst, center.x, @@ -4267,7 +4864,7 @@ raylib.ImageDrawCircleLinesV = ImageDrawCircleLinesV * * @return {Texture2D} The resulting Texture2D. */ -function LoadTexture (fileName) { +function LoadTexture(fileName) { return r.BindLoadTexture( fileName ) @@ -4281,7 +4878,7 @@ raylib.LoadTexture = LoadTexture * * @return {Texture2D} The resulting Texture2D. */ -function LoadTextureFromImage (image) { +function LoadTextureFromImage(image) { return r.BindLoadTextureFromImage( image.data, image.width, @@ -4300,7 +4897,7 @@ raylib.LoadTextureFromImage = LoadTextureFromImage * * @return {TextureCubemap} The resulting TextureCubemap. */ -function LoadTextureCubemap (image, layout) { +function LoadTextureCubemap(image, layout) { return r.BindLoadTextureCubemap( image.data, image.width, @@ -4320,7 +4917,7 @@ raylib.LoadTextureCubemap = LoadTextureCubemap * * @return {RenderTexture2D} The resulting RenderTexture2D. */ -function LoadRenderTexture (width, height) { +function LoadRenderTexture(width, height) { return r.BindLoadRenderTexture( width, height @@ -4335,7 +4932,7 @@ raylib.LoadRenderTexture = LoadRenderTexture * * @return {boolean} The resulting bool. */ -function IsTextureReady (texture) { +function IsTextureReady(texture) { return r.BindIsTextureReady( texture.id, texture.width, @@ -4353,7 +4950,7 @@ raylib.IsTextureReady = IsTextureReady * * @return {undefined} */ -function UnloadTexture (texture) { +function UnloadTexture(texture) { return r.BindUnloadTexture( texture.id, texture.width, @@ -4371,7 +4968,7 @@ raylib.UnloadTexture = UnloadTexture * * @return {boolean} The resulting bool. */ -function IsRenderTextureReady (target) { +function IsRenderTextureReady(target) { return r.BindIsRenderTextureReady( target.id, target.texture.id, @@ -4395,7 +4992,7 @@ raylib.IsRenderTextureReady = IsRenderTextureReady * * @return {undefined} */ -function UnloadRenderTexture (target) { +function UnloadRenderTexture(target) { return r.BindUnloadRenderTexture( target.id, target.texture.id, @@ -4420,7 +5017,7 @@ raylib.UnloadRenderTexture = UnloadRenderTexture * * @return {undefined} */ -function UpdateTexture (texture, pixels) { +function UpdateTexture(texture, pixels) { return r.BindUpdateTexture( texture.id, texture.width, @@ -4441,7 +5038,7 @@ raylib.UpdateTexture = UpdateTexture * * @return {undefined} */ -function UpdateTextureRec (texture, rec, pixels) { +function UpdateTextureRec(texture, rec, pixels) { return r.BindUpdateTextureRec( texture.id, texture.width, @@ -4465,7 +5062,7 @@ raylib.UpdateTextureRec = UpdateTextureRec * * @return {undefined} */ -function SetTextureFilter (texture, filter) { +function SetTextureFilter(texture, filter) { return r.BindSetTextureFilter( texture.id, texture.width, @@ -4485,7 +5082,7 @@ raylib.SetTextureFilter = SetTextureFilter * * @return {undefined} */ -function SetTextureWrap (texture, wrap) { +function SetTextureWrap(texture, wrap) { return r.BindSetTextureWrap( texture.id, texture.width, @@ -4507,7 +5104,7 @@ raylib.SetTextureWrap = SetTextureWrap * * @return {undefined} */ -function DrawTexture (texture, posX, posY, tint) { +function DrawTexture(texture, posX, posY, tint) { return r.BindDrawTexture( texture.id, texture.width, @@ -4533,7 +5130,7 @@ raylib.DrawTexture = DrawTexture * * @return {undefined} */ -function DrawTextureV (texture, position, tint) { +function DrawTextureV(texture, position, tint) { return r.BindDrawTextureV( texture.id, texture.width, @@ -4561,7 +5158,7 @@ raylib.DrawTextureV = DrawTextureV * * @return {undefined} */ -function DrawTextureEx (texture, position, rotation, scale, tint) { +function DrawTextureEx(texture, position, rotation, scale, tint) { return r.BindDrawTextureEx( texture.id, texture.width, @@ -4590,7 +5187,7 @@ raylib.DrawTextureEx = DrawTextureEx * * @return {undefined} */ -function DrawTextureRec (texture, source, position, tint) { +function DrawTextureRec(texture, source, position, tint) { return r.BindDrawTextureRec( texture.id, texture.width, @@ -4623,7 +5220,7 @@ raylib.DrawTextureRec = DrawTextureRec * * @return {undefined} */ -function DrawTexturePro (texture, source, dest, origin, rotation, tint) { +function DrawTexturePro(texture, source, dest, origin, rotation, tint) { return r.BindDrawTexturePro( texture.id, texture.width, @@ -4661,7 +5258,7 @@ raylib.DrawTexturePro = DrawTexturePro * * @return {undefined} */ -function DrawTextureNPatch (texture, nPatchInfo, dest, origin, rotation, tint) { +function DrawTextureNPatch(texture, nPatchInfo, dest, origin, rotation, tint) { return r.BindDrawTextureNPatch( texture.id, texture.width, @@ -4700,7 +5297,7 @@ raylib.DrawTextureNPatch = DrawTextureNPatch * * @return {Color} The resulting Color. */ -function Fade (color, alpha) { +function Fade(color, alpha) { return r.BindFade( color.r, color.g, @@ -4718,7 +5315,7 @@ raylib.Fade = Fade * * @return {number} The resulting int. */ -function ColorToInt (color) { +function ColorToInt(color) { return r.BindColorToInt( color.r, color.g, @@ -4735,7 +5332,7 @@ raylib.ColorToInt = ColorToInt * * @return {Vector4} The resulting Vector4. */ -function ColorNormalize (color) { +function ColorNormalize(color) { return r.BindColorNormalize( color.r, color.g, @@ -4752,7 +5349,7 @@ raylib.ColorNormalize = ColorNormalize * * @return {Color} The resulting Color. */ -function ColorFromNormalized (normalized) { +function ColorFromNormalized(normalized) { return r.BindColorFromNormalized( normalized.x, normalized.y, @@ -4769,7 +5366,7 @@ raylib.ColorFromNormalized = ColorFromNormalized * * @return {Vector3} The resulting Vector3. */ -function ColorToHSV (color) { +function ColorToHSV(color) { return r.BindColorToHSV( color.r, color.g, @@ -4788,7 +5385,7 @@ raylib.ColorToHSV = ColorToHSV * * @return {Color} The resulting Color. */ -function ColorFromHSV (hue, saturation, value) { +function ColorFromHSV(hue, saturation, value) { return r.BindColorFromHSV( hue, saturation, @@ -4805,7 +5402,7 @@ raylib.ColorFromHSV = ColorFromHSV * * @return {Color} The resulting Color. */ -function ColorTint (color, tint) { +function ColorTint(color, tint) { return r.BindColorTint( color.r, color.g, @@ -4827,7 +5424,7 @@ raylib.ColorTint = ColorTint * * @return {Color} The resulting Color. */ -function ColorBrightness (color, factor) { +function ColorBrightness(color, factor) { return r.BindColorBrightness( color.r, color.g, @@ -4846,7 +5443,7 @@ raylib.ColorBrightness = ColorBrightness * * @return {Color} The resulting Color. */ -function ColorContrast (color, contrast) { +function ColorContrast(color, contrast) { return r.BindColorContrast( color.r, color.g, @@ -4865,7 +5462,7 @@ raylib.ColorContrast = ColorContrast * * @return {Color} The resulting Color. */ -function ColorAlpha (color, alpha) { +function ColorAlpha(color, alpha) { return r.BindColorAlpha( color.r, color.g, @@ -4885,7 +5482,7 @@ raylib.ColorAlpha = ColorAlpha * * @return {Color} The resulting Color. */ -function ColorAlphaBlend (dst, src, tint) { +function ColorAlphaBlend(dst, src, tint) { return r.BindColorAlphaBlend( dst.r, dst.g, @@ -4910,7 +5507,7 @@ raylib.ColorAlphaBlend = ColorAlphaBlend * * @return {Color} The resulting Color. */ -function GetColor (hexValue) { +function GetColor(hexValue) { return r.BindGetColor( hexValue ) @@ -4925,7 +5522,7 @@ raylib.GetColor = GetColor * * @return {Color} The resulting Color. */ -function GetPixelColor (srcPtr, format) { +function GetPixelColor(srcPtr, format) { return r.BindGetPixelColor( srcPtr, format @@ -4942,7 +5539,7 @@ raylib.GetPixelColor = GetPixelColor * * @return {undefined} */ -function SetPixelColor (dstPtr, color, format) { +function SetPixelColor(dstPtr, color, format) { return r.BindSetPixelColor( dstPtr, color.r, @@ -4963,7 +5560,7 @@ raylib.SetPixelColor = SetPixelColor * * @return {number} The resulting int. */ -function GetPixelDataSize (width, height, format) { +function GetPixelDataSize(width, height, format) { return r.BindGetPixelDataSize( width, height, @@ -4977,7 +5574,7 @@ raylib.GetPixelDataSize = GetPixelDataSize * * @return {Font} The resulting Font. */ -function GetFontDefault () { +function GetFontDefault() { return r.BindGetFontDefault() } raylib.GetFontDefault = GetFontDefault @@ -4989,7 +5586,7 @@ raylib.GetFontDefault = GetFontDefault * * @return {Font} The resulting Font. */ -function LoadFont (fileName) { +function LoadFont(fileName) { return r.BindLoadFont( fileName ) @@ -4997,21 +5594,21 @@ function LoadFont (fileName) { raylib.LoadFont = LoadFont /** - * Load font from file with extended parameters, use NULL for fontChars and 0 for glyphCount to load the default character set + * Load font from file with extended parameters, use NULL for codepoints and 0 for codepointCount to load the default character setFont * * @param {string} fileName * @param {number} fontSize - * @param {number} fontChars - * @param {number} glyphCount + * @param {number} codepoints + * @param {number} codepointCount * * @return {Font} The resulting Font. */ -function LoadFontEx (fileName, fontSize, fontChars, glyphCount) { +function LoadFontEx(fileName, fontSize, codepoints, codepointCount) { return r.BindLoadFontEx( fileName, fontSize, - fontChars, - glyphCount + codepoints, + codepointCount ) } raylib.LoadFontEx = LoadFontEx @@ -5025,7 +5622,7 @@ raylib.LoadFontEx = LoadFontEx * * @return {Font} The resulting Font. */ -function LoadFontFromImage (image, key, firstChar) { +function LoadFontFromImage(image, key, firstChar) { return r.BindLoadFontFromImage( image.data, image.width, @@ -5048,19 +5645,19 @@ raylib.LoadFontFromImage = LoadFontFromImage * @param {Buffer} fileData * @param {number} dataSize * @param {number} fontSize - * @param {number} fontChars - * @param {number} glyphCount + * @param {number} codepoints + * @param {number} codepointCount * * @return {Font} The resulting Font. */ -function LoadFontFromMemory (fileType, fileData, dataSize, fontSize, fontChars, glyphCount) { +function LoadFontFromMemory(fileType, fileData, dataSize, fontSize, codepoints, codepointCount) { return r.BindLoadFontFromMemory( fileType, fileData, dataSize, fontSize, - fontChars, - glyphCount + codepoints, + codepointCount ) } raylib.LoadFontFromMemory = LoadFontFromMemory @@ -5072,7 +5669,7 @@ raylib.LoadFontFromMemory = LoadFontFromMemory * * @return {boolean} The resulting bool. */ -function IsFontReady (font) { +function IsFontReady(font) { return r.BindIsFontReady( font.baseSize, font.glyphCount, @@ -5094,19 +5691,19 @@ raylib.IsFontReady = IsFontReady * @param {Buffer} fileData * @param {number} dataSize * @param {number} fontSize - * @param {number} fontChars - * @param {number} glyphCount + * @param {number} codepoints + * @param {number} codepointCount * @param {number} type * * @return {number} The resulting GlyphInfo *. */ -function LoadFontData (fileData, dataSize, fontSize, fontChars, glyphCount, type) { +function LoadFontData(fileData, dataSize, fontSize, codepoints, codepointCount, type) { return r.BindLoadFontData( fileData, dataSize, fontSize, - fontChars, - glyphCount, + codepoints, + codepointCount, type ) } @@ -5115,8 +5712,8 @@ raylib.LoadFontData = LoadFontData /** * Generate image font atlas using chars info * - * @param {number} chars - * @param {number} recs + * @param {number} glyphs + * @param {number} glyphRecs * @param {number} glyphCount * @param {number} fontSize * @param {number} padding @@ -5124,10 +5721,10 @@ raylib.LoadFontData = LoadFontData * * @return {Image} The resulting Image. */ -function GenImageFontAtlas (chars, recs, glyphCount, fontSize, padding, packMethod) { +function GenImageFontAtlas(glyphs, glyphRecs, glyphCount, fontSize, padding, packMethod) { return r.BindGenImageFontAtlas( - chars, - recs, + glyphs, + glyphRecs, glyphCount, fontSize, padding, @@ -5139,14 +5736,14 @@ raylib.GenImageFontAtlas = GenImageFontAtlas /** * Unload font chars info data (RAM) * - * @param {number} chars + * @param {number} glyphs * @param {number} glyphCount * * @return {undefined} */ -function UnloadFontData (chars, glyphCount) { +function UnloadFontData(glyphs, glyphCount) { return r.BindUnloadFontData( - chars, + glyphs, glyphCount ) } @@ -5159,7 +5756,7 @@ raylib.UnloadFontData = UnloadFontData * * @return {undefined} */ -function UnloadFont (font) { +function UnloadFont(font) { return r.BindUnloadFont( font.baseSize, font.glyphCount, @@ -5183,7 +5780,7 @@ raylib.UnloadFont = UnloadFont * * @return {boolean} The resulting bool. */ -function ExportFontAsCode (font, fileName) { +function ExportFontAsCode(font, fileName) { return r.BindExportFontAsCode( font.baseSize, font.glyphCount, @@ -5208,7 +5805,7 @@ raylib.ExportFontAsCode = ExportFontAsCode * * @return {undefined} */ -function DrawFPS (posX, posY) { +function DrawFPS(posX, posY) { return r.BindDrawFPS( posX, posY @@ -5227,7 +5824,7 @@ raylib.DrawFPS = DrawFPS * * @return {undefined} */ -function DrawText (text, posX, posY, fontSize, color) { +function DrawText(text, posX, posY, fontSize, color) { return r.BindDrawText( text, posX, @@ -5253,7 +5850,7 @@ raylib.DrawText = DrawText * * @return {undefined} */ -function DrawTextEx (font, text, position, fontSize, spacing, tint) { +function DrawTextEx(font, text, position, fontSize, spacing, tint) { return r.BindDrawTextEx( font.baseSize, font.glyphCount, @@ -5292,7 +5889,7 @@ raylib.DrawTextEx = DrawTextEx * * @return {undefined} */ -function DrawTextPro (font, text, position, origin, rotation, fontSize, spacing, tint) { +function DrawTextPro(font, text, position, origin, rotation, fontSize, spacing, tint) { return r.BindDrawTextPro( font.baseSize, font.glyphCount, @@ -5331,7 +5928,7 @@ raylib.DrawTextPro = DrawTextPro * * @return {undefined} */ -function DrawTextCodepoint (font, codepoint, position, fontSize, tint) { +function DrawTextCodepoint(font, codepoint, position, fontSize, tint) { return r.BindDrawTextCodepoint( font.baseSize, font.glyphCount, @@ -5360,7 +5957,7 @@ raylib.DrawTextCodepoint = DrawTextCodepoint * * @param {Font} font * @param {number} codepoints - * @param {number} count + * @param {number} codepointCount * @param {Vector2} position * @param {number} fontSize * @param {number} spacing @@ -5368,7 +5965,7 @@ raylib.DrawTextCodepoint = DrawTextCodepoint * * @return {undefined} */ -function DrawTextCodepoints (font, codepoints, count, position, fontSize, spacing, tint) { +function DrawTextCodepoints(font, codepoints, codepointCount, position, fontSize, spacing, tint) { return r.BindDrawTextCodepoints( font.baseSize, font.glyphCount, @@ -5381,7 +5978,7 @@ function DrawTextCodepoints (font, codepoints, count, position, fontSize, spacin font.recs, font.glyphs, codepoints, - count, + codepointCount, position.x, position.y, fontSize, @@ -5394,6 +5991,20 @@ function DrawTextCodepoints (font, codepoints, count, position, fontSize, spacin } raylib.DrawTextCodepoints = DrawTextCodepoints +/** + * Set vertical line spacing when drawing with line-breaks + * + * @param {number} spacing + * + * @return {undefined} + */ +function SetTextLineSpacing(spacing) { + return r.BindSetTextLineSpacing( + spacing + ) +} +raylib.SetTextLineSpacing = SetTextLineSpacing + /** * Measure string width for default font * @@ -5402,7 +6013,7 @@ raylib.DrawTextCodepoints = DrawTextCodepoints * * @return {number} The resulting int. */ -function MeasureText (text, fontSize) { +function MeasureText(text, fontSize) { return r.BindMeasureText( text, fontSize @@ -5420,7 +6031,7 @@ raylib.MeasureText = MeasureText * * @return {Vector2} The resulting Vector2. */ -function MeasureTextEx (font, text, fontSize, spacing) { +function MeasureTextEx(font, text, fontSize, spacing) { return r.BindMeasureTextEx( font.baseSize, font.glyphCount, @@ -5447,7 +6058,7 @@ raylib.MeasureTextEx = MeasureTextEx * * @return {number} The resulting int. */ -function GetGlyphIndex (font, codepoint) { +function GetGlyphIndex(font, codepoint) { return r.BindGetGlyphIndex( font.baseSize, font.glyphCount, @@ -5472,7 +6083,7 @@ raylib.GetGlyphIndex = GetGlyphIndex * * @return {GlyphInfo} The resulting GlyphInfo. */ -function GetGlyphInfo (font, codepoint) { +function GetGlyphInfo(font, codepoint) { return r.BindGetGlyphInfo( font.baseSize, font.glyphCount, @@ -5497,7 +6108,7 @@ raylib.GetGlyphInfo = GetGlyphInfo * * @return {Rectangle} The resulting Rectangle. */ -function GetGlyphAtlasRec (font, codepoint) { +function GetGlyphAtlasRec(font, codepoint) { return r.BindGetGlyphAtlasRec( font.baseSize, font.glyphCount, @@ -5522,7 +6133,7 @@ raylib.GetGlyphAtlasRec = GetGlyphAtlasRec * * @return {string} The resulting char *. */ -function LoadUTF8 (codepoints, length) { +function LoadUTF8(codepoints, length) { return r.BindLoadUTF8( codepoints, length @@ -5537,7 +6148,7 @@ raylib.LoadUTF8 = LoadUTF8 * * @return {undefined} */ -function UnloadUTF8 (text) { +function UnloadUTF8(text) { return r.BindUnloadUTF8( text ) @@ -5552,7 +6163,7 @@ raylib.UnloadUTF8 = UnloadUTF8 * * @return {number} The resulting int *. */ -function LoadCodepoints (text, count) { +function LoadCodepoints(text, count) { return r.BindLoadCodepoints( text, count @@ -5567,7 +6178,7 @@ raylib.LoadCodepoints = LoadCodepoints * * @return {undefined} */ -function UnloadCodepoints (codepoints) { +function UnloadCodepoints(codepoints) { return r.BindUnloadCodepoints( codepoints ) @@ -5581,7 +6192,7 @@ raylib.UnloadCodepoints = UnloadCodepoints * * @return {number} The resulting int. */ -function GetCodepointCount (text) { +function GetCodepointCount(text) { return r.BindGetCodepointCount( text ) @@ -5596,7 +6207,7 @@ raylib.GetCodepointCount = GetCodepointCount * * @return {number} The resulting int. */ -function GetCodepoint (text, codepointSize) { +function GetCodepoint(text, codepointSize) { return r.BindGetCodepoint( text, codepointSize @@ -5612,7 +6223,7 @@ raylib.GetCodepoint = GetCodepoint * * @return {number} The resulting int. */ -function GetCodepointNext (text, codepointSize) { +function GetCodepointNext(text, codepointSize) { return r.BindGetCodepointNext( text, codepointSize @@ -5628,7 +6239,7 @@ raylib.GetCodepointNext = GetCodepointNext * * @return {number} The resulting int. */ -function GetCodepointPrevious (text, codepointSize) { +function GetCodepointPrevious(text, codepointSize) { return r.BindGetCodepointPrevious( text, codepointSize @@ -5644,7 +6255,7 @@ raylib.GetCodepointPrevious = GetCodepointPrevious * * @return {string} The resulting const char *. */ -function CodepointToUTF8 (codepoint, utf8Size) { +function CodepointToUTF8(codepoint, utf8Size) { return r.BindCodepointToUTF8( codepoint, utf8Size @@ -5660,7 +6271,7 @@ raylib.CodepointToUTF8 = CodepointToUTF8 * * @return {number} The resulting int. */ -function TextCopy (dst, src) { +function TextCopy(dst, src) { return r.BindTextCopy( dst, src @@ -5676,7 +6287,7 @@ raylib.TextCopy = TextCopy * * @return {boolean} The resulting bool. */ -function TextIsEqual (text1, text2) { +function TextIsEqual(text1, text2) { return r.BindTextIsEqual( text1, text2 @@ -5691,7 +6302,7 @@ raylib.TextIsEqual = TextIsEqual * * @return {number} The resulting unsigned int. */ -function TextLength (text) { +function TextLength(text) { return r.BindTextLength( text ) @@ -5707,7 +6318,7 @@ raylib.TextLength = TextLength * * @return {string} The resulting const char *. */ -function TextSubtext (text, position, length) { +function TextSubtext(text, position, length) { return r.BindTextSubtext( text, position, @@ -5725,7 +6336,7 @@ raylib.TextSubtext = TextSubtext * * @return {string} The resulting char *. */ -function TextReplace (text, replace, by) { +function TextReplace(text, replace, by) { return r.BindTextReplace( text, replace, @@ -5743,7 +6354,7 @@ raylib.TextReplace = TextReplace * * @return {string} The resulting char *. */ -function TextInsert (text, insert, position) { +function TextInsert(text, insert, position) { return r.BindTextInsert( text, insert, @@ -5761,7 +6372,7 @@ raylib.TextInsert = TextInsert * * @return {string} The resulting const char *. */ -function TextJoin (textList, count, delimiter) { +function TextJoin(textList, count, delimiter) { return r.BindTextJoin( textList, count, @@ -5779,7 +6390,7 @@ raylib.TextJoin = TextJoin * * @return {number} The resulting const char **. */ -function TextSplit (text, delimiter, count) { +function TextSplit(text, delimiter, count) { return r.BindTextSplit( text, delimiter, @@ -5797,7 +6408,7 @@ raylib.TextSplit = TextSplit * * @return {undefined} */ -function TextAppend (text, append, position) { +function TextAppend(text, append, position) { return r.BindTextAppend( text, append, @@ -5814,7 +6425,7 @@ raylib.TextAppend = TextAppend * * @return {number} The resulting int. */ -function TextFindIndex (text, find) { +function TextFindIndex(text, find) { return r.BindTextFindIndex( text, find @@ -5829,7 +6440,7 @@ raylib.TextFindIndex = TextFindIndex * * @return {string} The resulting const char *. */ -function TextToUpper (text) { +function TextToUpper(text) { return r.BindTextToUpper( text ) @@ -5843,7 +6454,7 @@ raylib.TextToUpper = TextToUpper * * @return {string} The resulting const char *. */ -function TextToLower (text) { +function TextToLower(text) { return r.BindTextToLower( text ) @@ -5857,7 +6468,7 @@ raylib.TextToLower = TextToLower * * @return {string} The resulting const char *. */ -function TextToPascal (text) { +function TextToPascal(text) { return r.BindTextToPascal( text ) @@ -5871,7 +6482,7 @@ raylib.TextToPascal = TextToPascal * * @return {number} The resulting int. */ -function TextToInteger (text) { +function TextToInteger(text) { return r.BindTextToInteger( text ) @@ -5887,7 +6498,7 @@ raylib.TextToInteger = TextToInteger * * @return {undefined} */ -function DrawLine3D (startPos, endPos, color) { +function DrawLine3D(startPos, endPos, color) { return r.BindDrawLine3D( startPos.x, startPos.y, @@ -5911,7 +6522,7 @@ raylib.DrawLine3D = DrawLine3D * * @return {undefined} */ -function DrawPoint3D (position, color) { +function DrawPoint3D(position, color) { return r.BindDrawPoint3D( position.x, position.y, @@ -5935,7 +6546,7 @@ raylib.DrawPoint3D = DrawPoint3D * * @return {undefined} */ -function DrawCircle3D (center, radius, rotationAxis, rotationAngle, color) { +function DrawCircle3D(center, radius, rotationAxis, rotationAngle, color) { return r.BindDrawCircle3D( center.x, center.y, @@ -5963,7 +6574,7 @@ raylib.DrawCircle3D = DrawCircle3D * * @return {undefined} */ -function DrawTriangle3D (v1, v2, v3, color) { +function DrawTriangle3D(v1, v2, v3, color) { return r.BindDrawTriangle3D( v1.x, v1.y, @@ -5991,7 +6602,7 @@ raylib.DrawTriangle3D = DrawTriangle3D * * @return {undefined} */ -function DrawTriangleStrip3D (points, pointCount, color) { +function DrawTriangleStrip3D(points, pointCount, color) { return r.BindDrawTriangleStrip3D( points, pointCount, @@ -6014,7 +6625,7 @@ raylib.DrawTriangleStrip3D = DrawTriangleStrip3D * * @return {undefined} */ -function DrawCube (position, width, height, length, color) { +function DrawCube(position, width, height, length, color) { return r.BindDrawCube( position.x, position.y, @@ -6039,7 +6650,7 @@ raylib.DrawCube = DrawCube * * @return {undefined} */ -function DrawCubeV (position, size, color) { +function DrawCubeV(position, size, color) { return r.BindDrawCubeV( position.x, position.y, @@ -6066,7 +6677,7 @@ raylib.DrawCubeV = DrawCubeV * * @return {undefined} */ -function DrawCubeWires (position, width, height, length, color) { +function DrawCubeWires(position, width, height, length, color) { return r.BindDrawCubeWires( position.x, position.y, @@ -6091,7 +6702,7 @@ raylib.DrawCubeWires = DrawCubeWires * * @return {undefined} */ -function DrawCubeWiresV (position, size, color) { +function DrawCubeWiresV(position, size, color) { return r.BindDrawCubeWiresV( position.x, position.y, @@ -6116,7 +6727,7 @@ raylib.DrawCubeWiresV = DrawCubeWiresV * * @return {undefined} */ -function DrawSphere (centerPos, radius, color) { +function DrawSphere(centerPos, radius, color) { return r.BindDrawSphere( centerPos.x, centerPos.y, @@ -6141,7 +6752,7 @@ raylib.DrawSphere = DrawSphere * * @return {undefined} */ -function DrawSphereEx (centerPos, radius, rings, slices, color) { +function DrawSphereEx(centerPos, radius, rings, slices, color) { return r.BindDrawSphereEx( centerPos.x, centerPos.y, @@ -6168,7 +6779,7 @@ raylib.DrawSphereEx = DrawSphereEx * * @return {undefined} */ -function DrawSphereWires (centerPos, radius, rings, slices, color) { +function DrawSphereWires(centerPos, radius, rings, slices, color) { return r.BindDrawSphereWires( centerPos.x, centerPos.y, @@ -6196,7 +6807,7 @@ raylib.DrawSphereWires = DrawSphereWires * * @return {undefined} */ -function DrawCylinder (position, radiusTop, radiusBottom, height, slices, color) { +function DrawCylinder(position, radiusTop, radiusBottom, height, slices, color) { return r.BindDrawCylinder( position.x, position.y, @@ -6225,7 +6836,7 @@ raylib.DrawCylinder = DrawCylinder * * @return {undefined} */ -function DrawCylinderEx (startPos, endPos, startRadius, endRadius, sides, color) { +function DrawCylinderEx(startPos, endPos, startRadius, endRadius, sides, color) { return r.BindDrawCylinderEx( startPos.x, startPos.y, @@ -6256,7 +6867,7 @@ raylib.DrawCylinderEx = DrawCylinderEx * * @return {undefined} */ -function DrawCylinderWires (position, radiusTop, radiusBottom, height, slices, color) { +function DrawCylinderWires(position, radiusTop, radiusBottom, height, slices, color) { return r.BindDrawCylinderWires( position.x, position.y, @@ -6285,7 +6896,7 @@ raylib.DrawCylinderWires = DrawCylinderWires * * @return {undefined} */ -function DrawCylinderWiresEx (startPos, endPos, startRadius, endRadius, sides, color) { +function DrawCylinderWiresEx(startPos, endPos, startRadius, endRadius, sides, color) { return r.BindDrawCylinderWiresEx( startPos.x, startPos.y, @@ -6316,7 +6927,7 @@ raylib.DrawCylinderWiresEx = DrawCylinderWiresEx * * @return {undefined} */ -function DrawCapsule (startPos, endPos, radius, slices, rings, color) { +function DrawCapsule(startPos, endPos, radius, slices, rings, color) { return r.BindDrawCapsule( startPos.x, startPos.y, @@ -6347,7 +6958,7 @@ raylib.DrawCapsule = DrawCapsule * * @return {undefined} */ -function DrawCapsuleWires (startPos, endPos, radius, slices, rings, color) { +function DrawCapsuleWires(startPos, endPos, radius, slices, rings, color) { return r.BindDrawCapsuleWires( startPos.x, startPos.y, @@ -6375,7 +6986,7 @@ raylib.DrawCapsuleWires = DrawCapsuleWires * * @return {undefined} */ -function DrawPlane (centerPos, size, color) { +function DrawPlane(centerPos, size, color) { return r.BindDrawPlane( centerPos.x, centerPos.y, @@ -6398,7 +7009,7 @@ raylib.DrawPlane = DrawPlane * * @return {undefined} */ -function DrawRay (ray, color) { +function DrawRay(ray, color) { return r.BindDrawRay( ray.position.x, ray.position.y, @@ -6422,7 +7033,7 @@ raylib.DrawRay = DrawRay * * @return {undefined} */ -function DrawGrid (slices, spacing) { +function DrawGrid(slices, spacing) { return r.BindDrawGrid( slices, spacing @@ -6437,7 +7048,7 @@ raylib.DrawGrid = DrawGrid * * @return {Model} The resulting Model. */ -function LoadModel (fileName) { +function LoadModel(fileName) { return r.BindLoadModel( fileName ) @@ -6451,7 +7062,7 @@ raylib.LoadModel = LoadModel * * @return {Model} The resulting Model. */ -function LoadModelFromMesh (mesh) { +function LoadModelFromMesh(mesh) { return r.BindLoadModelFromMesh( mesh.vertexCount, mesh.triangleCount, @@ -6479,7 +7090,7 @@ raylib.LoadModelFromMesh = LoadModelFromMesh * * @return {boolean} The resulting bool. */ -function IsModelReady (model) { +function IsModelReady(model) { return r.BindIsModelReady( model.transform.m0, model.transform.m4, @@ -6516,7 +7127,7 @@ raylib.IsModelReady = IsModelReady * * @return {undefined} */ -function UnloadModel (model) { +function UnloadModel(model) { return r.BindUnloadModel( model.transform.m0, model.transform.m4, @@ -6553,7 +7164,7 @@ raylib.UnloadModel = UnloadModel * * @return {BoundingBox} The resulting BoundingBox. */ -function GetModelBoundingBox (model) { +function GetModelBoundingBox(model) { return r.BindGetModelBoundingBox( model.transform.m0, model.transform.m4, @@ -6593,7 +7204,7 @@ raylib.GetModelBoundingBox = GetModelBoundingBox * * @return {undefined} */ -function DrawModel (model, position, scale, tint) { +function DrawModel(model, position, scale, tint) { return r.BindDrawModel( model.transform.m0, model.transform.m4, @@ -6643,7 +7254,7 @@ raylib.DrawModel = DrawModel * * @return {undefined} */ -function DrawModelEx (model, position, rotationAxis, rotationAngle, scale, tint) { +function DrawModelEx(model, position, rotationAxis, rotationAngle, scale, tint) { return r.BindDrawModelEx( model.transform.m0, model.transform.m4, @@ -6697,7 +7308,7 @@ raylib.DrawModelEx = DrawModelEx * * @return {undefined} */ -function DrawModelWires (model, position, scale, tint) { +function DrawModelWires(model, position, scale, tint) { return r.BindDrawModelWires( model.transform.m0, model.transform.m4, @@ -6747,7 +7358,7 @@ raylib.DrawModelWires = DrawModelWires * * @return {undefined} */ -function DrawModelWiresEx (model, position, rotationAxis, rotationAngle, scale, tint) { +function DrawModelWiresEx(model, position, rotationAxis, rotationAngle, scale, tint) { return r.BindDrawModelWiresEx( model.transform.m0, model.transform.m4, @@ -6799,7 +7410,7 @@ raylib.DrawModelWiresEx = DrawModelWiresEx * * @return {undefined} */ -function DrawBoundingBox (box, color) { +function DrawBoundingBox(box, color) { return r.BindDrawBoundingBox( box.min.x, box.min.y, @@ -6826,7 +7437,7 @@ raylib.DrawBoundingBox = DrawBoundingBox * * @return {undefined} */ -function DrawBillboard (camera, texture, position, size, tint) { +function DrawBillboard(camera, texture, position, size, tint) { return r.BindDrawBillboard( camera.position.x, camera.position.y, @@ -6868,7 +7479,7 @@ raylib.DrawBillboard = DrawBillboard * * @return {undefined} */ -function DrawBillboardRec (camera, texture, source, position, size, tint) { +function DrawBillboardRec(camera, texture, source, position, size, tint) { return r.BindDrawBillboardRec( camera.position.x, camera.position.y, @@ -6918,7 +7529,7 @@ raylib.DrawBillboardRec = DrawBillboardRec * * @return {undefined} */ -function DrawBillboardPro (camera, texture, source, position, up, size, origin, rotation, tint) { +function DrawBillboardPro(camera, texture, source, position, up, size, origin, rotation, tint) { return r.BindDrawBillboardPro( camera.position.x, camera.position.y, @@ -6970,7 +7581,7 @@ raylib.DrawBillboardPro = DrawBillboardPro * * @return {undefined} */ -function UpdateMeshBuffer (mesh, index, data, dataSize, offset) { +function UpdateMeshBuffer(mesh, index, data, dataSize, offset) { return r.BindUpdateMeshBuffer( mesh.vertexCount, mesh.triangleCount, @@ -7002,7 +7613,7 @@ raylib.UpdateMeshBuffer = UpdateMeshBuffer * * @return {undefined} */ -function UnloadMesh (mesh) { +function UnloadMesh(mesh) { return r.BindUnloadMesh( mesh.vertexCount, mesh.triangleCount, @@ -7031,7 +7642,7 @@ raylib.UnloadMesh = UnloadMesh * * @return {boolean} The resulting bool. */ -function ExportMesh (mesh, fileName) { +function ExportMesh(mesh, fileName) { return r.BindExportMesh( mesh.vertexCount, mesh.triangleCount, @@ -7060,7 +7671,7 @@ raylib.ExportMesh = ExportMesh * * @return {BoundingBox} The resulting BoundingBox. */ -function GetMeshBoundingBox (mesh) { +function GetMeshBoundingBox(mesh) { return r.BindGetMeshBoundingBox( mesh.vertexCount, mesh.triangleCount, @@ -7089,7 +7700,7 @@ raylib.GetMeshBoundingBox = GetMeshBoundingBox * * @return {Mesh} The resulting Mesh. */ -function GenMeshPoly (sides, radius) { +function GenMeshPoly(sides, radius) { return r.BindGenMeshPoly( sides, radius @@ -7107,7 +7718,7 @@ raylib.GenMeshPoly = GenMeshPoly * * @return {Mesh} The resulting Mesh. */ -function GenMeshPlane (width, length, resX, resZ) { +function GenMeshPlane(width, length, resX, resZ) { return r.BindGenMeshPlane( width, length, @@ -7126,7 +7737,7 @@ raylib.GenMeshPlane = GenMeshPlane * * @return {Mesh} The resulting Mesh. */ -function GenMeshCube (width, height, length) { +function GenMeshCube(width, height, length) { return r.BindGenMeshCube( width, height, @@ -7144,7 +7755,7 @@ raylib.GenMeshCube = GenMeshCube * * @return {Mesh} The resulting Mesh. */ -function GenMeshSphere (radius, rings, slices) { +function GenMeshSphere(radius, rings, slices) { return r.BindGenMeshSphere( radius, rings, @@ -7162,7 +7773,7 @@ raylib.GenMeshSphere = GenMeshSphere * * @return {Mesh} The resulting Mesh. */ -function GenMeshHemiSphere (radius, rings, slices) { +function GenMeshHemiSphere(radius, rings, slices) { return r.BindGenMeshHemiSphere( radius, rings, @@ -7180,7 +7791,7 @@ raylib.GenMeshHemiSphere = GenMeshHemiSphere * * @return {Mesh} The resulting Mesh. */ -function GenMeshCylinder (radius, height, slices) { +function GenMeshCylinder(radius, height, slices) { return r.BindGenMeshCylinder( radius, height, @@ -7198,7 +7809,7 @@ raylib.GenMeshCylinder = GenMeshCylinder * * @return {Mesh} The resulting Mesh. */ -function GenMeshCone (radius, height, slices) { +function GenMeshCone(radius, height, slices) { return r.BindGenMeshCone( radius, height, @@ -7217,7 +7828,7 @@ raylib.GenMeshCone = GenMeshCone * * @return {Mesh} The resulting Mesh. */ -function GenMeshTorus (radius, size, radSeg, sides) { +function GenMeshTorus(radius, size, radSeg, sides) { return r.BindGenMeshTorus( radius, size, @@ -7237,7 +7848,7 @@ raylib.GenMeshTorus = GenMeshTorus * * @return {Mesh} The resulting Mesh. */ -function GenMeshKnot (radius, size, radSeg, sides) { +function GenMeshKnot(radius, size, radSeg, sides) { return r.BindGenMeshKnot( radius, size, @@ -7255,7 +7866,7 @@ raylib.GenMeshKnot = GenMeshKnot * * @return {Mesh} The resulting Mesh. */ -function GenMeshHeightmap (heightmap, size) { +function GenMeshHeightmap(heightmap, size) { return r.BindGenMeshHeightmap( heightmap.data, heightmap.width, @@ -7277,7 +7888,7 @@ raylib.GenMeshHeightmap = GenMeshHeightmap * * @return {Mesh} The resulting Mesh. */ -function GenMeshCubicmap (cubicmap, cubeSize) { +function GenMeshCubicmap(cubicmap, cubeSize) { return r.BindGenMeshCubicmap( cubicmap.data, cubicmap.width, @@ -7299,7 +7910,7 @@ raylib.GenMeshCubicmap = GenMeshCubicmap * * @return {number} The resulting ModelAnimation *. */ -function LoadModelAnimations (fileName, animCount) { +function LoadModelAnimations(fileName, animCount) { return r.BindLoadModelAnimations( fileName, animCount @@ -7316,7 +7927,7 @@ raylib.LoadModelAnimations = LoadModelAnimations * * @return {undefined} */ -function UpdateModelAnimation (model, anim, frame) { +function UpdateModelAnimation(model, anim, frame) { return r.BindUpdateModelAnimation( model.transform.m0, model.transform.m4, @@ -7346,6 +7957,7 @@ function UpdateModelAnimation (model, anim, frame) { anim.frameCount, anim.bones, anim.framePoses, + anim.name, frame ) } @@ -7358,12 +7970,13 @@ raylib.UpdateModelAnimation = UpdateModelAnimation * * @return {undefined} */ -function UnloadModelAnimation (anim) { +function UnloadModelAnimation(anim) { return r.BindUnloadModelAnimation( anim.boneCount, anim.frameCount, anim.bones, - anim.framePoses + anim.framePoses, + anim.name ) } raylib.UnloadModelAnimation = UnloadModelAnimation @@ -7372,14 +7985,14 @@ raylib.UnloadModelAnimation = UnloadModelAnimation * Unload animation array data * * @param {number} animations - * @param {number} count + * @param {number} animCount * * @return {undefined} */ -function UnloadModelAnimations (animations, count) { +function UnloadModelAnimations(animations, animCount) { return r.BindUnloadModelAnimations( animations, - count + animCount ) } raylib.UnloadModelAnimations = UnloadModelAnimations @@ -7392,7 +8005,7 @@ raylib.UnloadModelAnimations = UnloadModelAnimations * * @return {boolean} The resulting bool. */ -function IsModelAnimationValid (model, anim) { +function IsModelAnimationValid(model, anim) { return r.BindIsModelAnimationValid( model.transform.m0, model.transform.m4, @@ -7421,7 +8034,8 @@ function IsModelAnimationValid (model, anim) { anim.boneCount, anim.frameCount, anim.bones, - anim.framePoses + anim.framePoses, + anim.name ) } raylib.IsModelAnimationValid = IsModelAnimationValid @@ -7436,7 +8050,7 @@ raylib.IsModelAnimationValid = IsModelAnimationValid * * @return {boolean} The resulting bool. */ -function CheckCollisionSpheres (center1, radius1, center2, radius2) { +function CheckCollisionSpheres(center1, radius1, center2, radius2) { return r.BindCheckCollisionSpheres( center1.x, center1.y, @@ -7458,7 +8072,7 @@ raylib.CheckCollisionSpheres = CheckCollisionSpheres * * @return {boolean} The resulting bool. */ -function CheckCollisionBoxes (box1, box2) { +function CheckCollisionBoxes(box1, box2) { return r.BindCheckCollisionBoxes( box1.min.x, box1.min.y, @@ -7485,7 +8099,7 @@ raylib.CheckCollisionBoxes = CheckCollisionBoxes * * @return {boolean} The resulting bool. */ -function CheckCollisionBoxSphere (box, center, radius) { +function CheckCollisionBoxSphere(box, center, radius) { return r.BindCheckCollisionBoxSphere( box.min.x, box.min.y, @@ -7510,7 +8124,7 @@ raylib.CheckCollisionBoxSphere = CheckCollisionBoxSphere * * @return {RayCollision} The resulting RayCollision. */ -function GetRayCollisionSphere (ray, center, radius) { +function GetRayCollisionSphere(ray, center, radius) { return r.BindGetRayCollisionSphere( ray.position.x, ray.position.y, @@ -7534,7 +8148,7 @@ raylib.GetRayCollisionSphere = GetRayCollisionSphere * * @return {RayCollision} The resulting RayCollision. */ -function GetRayCollisionBox (ray, box) { +function GetRayCollisionBox(ray, box) { return r.BindGetRayCollisionBox( ray.position.x, ray.position.y, @@ -7561,7 +8175,7 @@ raylib.GetRayCollisionBox = GetRayCollisionBox * * @return {RayCollision} The resulting RayCollision. */ -function GetRayCollisionMesh (ray, mesh, transform) { +function GetRayCollisionMesh(ray, mesh, transform) { return r.BindGetRayCollisionMesh( ray.position.x, ray.position.y, @@ -7614,7 +8228,7 @@ raylib.GetRayCollisionMesh = GetRayCollisionMesh * * @return {RayCollision} The resulting RayCollision. */ -function GetRayCollisionTriangle (ray, p1, p2, p3) { +function GetRayCollisionTriangle(ray, p1, p2, p3) { return r.BindGetRayCollisionTriangle( ray.position.x, ray.position.y, @@ -7646,7 +8260,7 @@ raylib.GetRayCollisionTriangle = GetRayCollisionTriangle * * @return {RayCollision} The resulting RayCollision. */ -function GetRayCollisionQuad (ray, p1, p2, p3, p4) { +function GetRayCollisionQuad(ray, p1, p2, p3, p4) { return r.BindGetRayCollisionQuad( ray.position.x, ray.position.y, @@ -7675,7 +8289,7 @@ raylib.GetRayCollisionQuad = GetRayCollisionQuad * * @return {undefined} */ -function InitAudioDevice () { +function InitAudioDevice() { return r.BindInitAudioDevice() } raylib.InitAudioDevice = InitAudioDevice @@ -7685,7 +8299,7 @@ raylib.InitAudioDevice = InitAudioDevice * * @return {undefined} */ -function CloseAudioDevice () { +function CloseAudioDevice() { return r.BindCloseAudioDevice() } raylib.CloseAudioDevice = CloseAudioDevice @@ -7695,7 +8309,7 @@ raylib.CloseAudioDevice = CloseAudioDevice * * @return {boolean} The resulting bool. */ -function IsAudioDeviceReady () { +function IsAudioDeviceReady() { return r.BindIsAudioDeviceReady() } raylib.IsAudioDeviceReady = IsAudioDeviceReady @@ -7707,13 +8321,23 @@ raylib.IsAudioDeviceReady = IsAudioDeviceReady * * @return {undefined} */ -function SetMasterVolume (volume) { +function SetMasterVolume(volume) { return r.BindSetMasterVolume( volume ) } raylib.SetMasterVolume = SetMasterVolume +/** + * Get master volume (listener) + * + * @return {number} The resulting float. + */ +function GetMasterVolume() { + return r.BindGetMasterVolume() +} +raylib.GetMasterVolume = GetMasterVolume + /** * Load wave data from file * @@ -7721,7 +8345,7 @@ raylib.SetMasterVolume = SetMasterVolume * * @return {Wave} The resulting Wave. */ -function LoadWave (fileName) { +function LoadWave(fileName) { return r.BindLoadWave( fileName ) @@ -7737,7 +8361,7 @@ raylib.LoadWave = LoadWave * * @return {Wave} The resulting Wave. */ -function LoadWaveFromMemory (fileType, fileData, dataSize) { +function LoadWaveFromMemory(fileType, fileData, dataSize) { return r.BindLoadWaveFromMemory( fileType, fileData, @@ -7753,7 +8377,7 @@ raylib.LoadWaveFromMemory = LoadWaveFromMemory * * @return {boolean} The resulting bool. */ -function IsWaveReady (wave) { +function IsWaveReady(wave) { return r.BindIsWaveReady( wave.frameCount, wave.sampleRate, @@ -7771,7 +8395,7 @@ raylib.IsWaveReady = IsWaveReady * * @return {Sound} The resulting Sound. */ -function LoadSound (fileName) { +function LoadSound(fileName) { return r.BindLoadSound( fileName ) @@ -7785,7 +8409,7 @@ raylib.LoadSound = LoadSound * * @return {Sound} The resulting Sound. */ -function LoadSoundFromWave (wave) { +function LoadSoundFromWave(wave) { return r.BindLoadSoundFromWave( wave.frameCount, wave.sampleRate, @@ -7796,6 +8420,25 @@ function LoadSoundFromWave (wave) { } raylib.LoadSoundFromWave = LoadSoundFromWave +/** + * Create a new sound that shares the same sample data as the source sound, does not own the sound data + * + * @param {Sound} source + * + * @return {Sound} The resulting Sound. + */ +function LoadSoundAlias(source) { + return r.BindLoadSoundAlias( + source.stream.buffer, + source.stream.processor, + source.stream.sampleRate, + source.stream.sampleSize, + source.stream.channels, + source.frameCount + ) +} +raylib.LoadSoundAlias = LoadSoundAlias + /** * Checks if a sound is ready * @@ -7803,7 +8446,7 @@ raylib.LoadSoundFromWave = LoadSoundFromWave * * @return {boolean} The resulting bool. */ -function IsSoundReady (sound) { +function IsSoundReady(sound) { return r.BindIsSoundReady( sound.stream.buffer, sound.stream.processor, @@ -7824,7 +8467,7 @@ raylib.IsSoundReady = IsSoundReady * * @return {undefined} */ -function UpdateSound (sound, data, sampleCount) { +function UpdateSound(sound, data, sampleCount) { return r.BindUpdateSound( sound.stream.buffer, sound.stream.processor, @@ -7845,7 +8488,7 @@ raylib.UpdateSound = UpdateSound * * @return {undefined} */ -function UnloadWave (wave) { +function UnloadWave(wave) { return r.BindUnloadWave( wave.frameCount, wave.sampleRate, @@ -7863,7 +8506,7 @@ raylib.UnloadWave = UnloadWave * * @return {undefined} */ -function UnloadSound (sound) { +function UnloadSound(sound) { return r.BindUnloadSound( sound.stream.buffer, sound.stream.processor, @@ -7875,6 +8518,25 @@ function UnloadSound (sound) { } raylib.UnloadSound = UnloadSound +/** + * Unload a sound alias (does not deallocate sample data) + * + * @param {Sound} alias + * + * @return {undefined} + */ +function UnloadSoundAlias(alias) { + return r.BindUnloadSoundAlias( + alias.stream.buffer, + alias.stream.processor, + alias.stream.sampleRate, + alias.stream.sampleSize, + alias.stream.channels, + alias.frameCount + ) +} +raylib.UnloadSoundAlias = UnloadSoundAlias + /** * Export wave data to file, returns true on success * @@ -7883,7 +8545,7 @@ raylib.UnloadSound = UnloadSound * * @return {boolean} The resulting bool. */ -function ExportWave (wave, fileName) { +function ExportWave(wave, fileName) { return r.BindExportWave( wave.frameCount, wave.sampleRate, @@ -7903,7 +8565,7 @@ raylib.ExportWave = ExportWave * * @return {boolean} The resulting bool. */ -function ExportWaveAsCode (wave, fileName) { +function ExportWaveAsCode(wave, fileName) { return r.BindExportWaveAsCode( wave.frameCount, wave.sampleRate, @@ -7922,7 +8584,7 @@ raylib.ExportWaveAsCode = ExportWaveAsCode * * @return {undefined} */ -function PlaySound (sound) { +function PlaySound(sound) { return r.BindPlaySound( sound.stream.buffer, sound.stream.processor, @@ -7941,7 +8603,7 @@ raylib.PlaySound = PlaySound * * @return {undefined} */ -function StopSound (sound) { +function StopSound(sound) { return r.BindStopSound( sound.stream.buffer, sound.stream.processor, @@ -7960,7 +8622,7 @@ raylib.StopSound = StopSound * * @return {undefined} */ -function PauseSound (sound) { +function PauseSound(sound) { return r.BindPauseSound( sound.stream.buffer, sound.stream.processor, @@ -7979,7 +8641,7 @@ raylib.PauseSound = PauseSound * * @return {undefined} */ -function ResumeSound (sound) { +function ResumeSound(sound) { return r.BindResumeSound( sound.stream.buffer, sound.stream.processor, @@ -7998,7 +8660,7 @@ raylib.ResumeSound = ResumeSound * * @return {boolean} The resulting bool. */ -function IsSoundPlaying (sound) { +function IsSoundPlaying(sound) { return r.BindIsSoundPlaying( sound.stream.buffer, sound.stream.processor, @@ -8018,7 +8680,7 @@ raylib.IsSoundPlaying = IsSoundPlaying * * @return {undefined} */ -function SetSoundVolume (sound, volume) { +function SetSoundVolume(sound, volume) { return r.BindSetSoundVolume( sound.stream.buffer, sound.stream.processor, @@ -8039,7 +8701,7 @@ raylib.SetSoundVolume = SetSoundVolume * * @return {undefined} */ -function SetSoundPitch (sound, pitch) { +function SetSoundPitch(sound, pitch) { return r.BindSetSoundPitch( sound.stream.buffer, sound.stream.processor, @@ -8060,7 +8722,7 @@ raylib.SetSoundPitch = SetSoundPitch * * @return {undefined} */ -function SetSoundPan (sound, pan) { +function SetSoundPan(sound, pan) { return r.BindSetSoundPan( sound.stream.buffer, sound.stream.processor, @@ -8080,7 +8742,7 @@ raylib.SetSoundPan = SetSoundPan * * @return {Wave} The resulting Wave. */ -function WaveCopy (wave) { +function WaveCopy(wave) { return r.BindWaveCopy( wave.frameCount, wave.sampleRate, @@ -8098,7 +8760,7 @@ raylib.WaveCopy = WaveCopy * * @return {number} The resulting float *. */ -function LoadWaveSamples (wave) { +function LoadWaveSamples(wave) { return r.BindLoadWaveSamples( wave.frameCount, wave.sampleRate, @@ -8116,7 +8778,7 @@ raylib.LoadWaveSamples = LoadWaveSamples * * @return {undefined} */ -function UnloadWaveSamples (samples) { +function UnloadWaveSamples(samples) { return r.BindUnloadWaveSamples( samples ) @@ -8130,7 +8792,7 @@ raylib.UnloadWaveSamples = UnloadWaveSamples * * @return {Music} The resulting Music. */ -function LoadMusicStream (fileName) { +function LoadMusicStream(fileName) { return r.BindLoadMusicStream( fileName ) @@ -8146,7 +8808,7 @@ raylib.LoadMusicStream = LoadMusicStream * * @return {Music} The resulting Music. */ -function LoadMusicStreamFromMemory (fileType, data, dataSize) { +function LoadMusicStreamFromMemory(fileType, data, dataSize) { return r.BindLoadMusicStreamFromMemory( fileType, data, @@ -8162,7 +8824,7 @@ raylib.LoadMusicStreamFromMemory = LoadMusicStreamFromMemory * * @return {boolean} The resulting bool. */ -function IsMusicReady (music) { +function IsMusicReady(music) { return r.BindIsMusicReady( music.stream.buffer, music.stream.processor, @@ -8184,7 +8846,7 @@ raylib.IsMusicReady = IsMusicReady * * @return {undefined} */ -function UnloadMusicStream (music) { +function UnloadMusicStream(music) { return r.BindUnloadMusicStream( music.stream.buffer, music.stream.processor, @@ -8206,7 +8868,7 @@ raylib.UnloadMusicStream = UnloadMusicStream * * @return {undefined} */ -function PlayMusicStream (music) { +function PlayMusicStream(music) { return r.BindPlayMusicStream( music.stream.buffer, music.stream.processor, @@ -8228,7 +8890,7 @@ raylib.PlayMusicStream = PlayMusicStream * * @return {boolean} The resulting bool. */ -function IsMusicStreamPlaying (music) { +function IsMusicStreamPlaying(music) { return r.BindIsMusicStreamPlaying( music.stream.buffer, music.stream.processor, @@ -8250,7 +8912,7 @@ raylib.IsMusicStreamPlaying = IsMusicStreamPlaying * * @return {undefined} */ -function UpdateMusicStream (music) { +function UpdateMusicStream(music) { return r.BindUpdateMusicStream( music.stream.buffer, music.stream.processor, @@ -8272,7 +8934,7 @@ raylib.UpdateMusicStream = UpdateMusicStream * * @return {undefined} */ -function StopMusicStream (music) { +function StopMusicStream(music) { return r.BindStopMusicStream( music.stream.buffer, music.stream.processor, @@ -8294,7 +8956,7 @@ raylib.StopMusicStream = StopMusicStream * * @return {undefined} */ -function PauseMusicStream (music) { +function PauseMusicStream(music) { return r.BindPauseMusicStream( music.stream.buffer, music.stream.processor, @@ -8316,7 +8978,7 @@ raylib.PauseMusicStream = PauseMusicStream * * @return {undefined} */ -function ResumeMusicStream (music) { +function ResumeMusicStream(music) { return r.BindResumeMusicStream( music.stream.buffer, music.stream.processor, @@ -8339,7 +9001,7 @@ raylib.ResumeMusicStream = ResumeMusicStream * * @return {undefined} */ -function SeekMusicStream (music, position) { +function SeekMusicStream(music, position) { return r.BindSeekMusicStream( music.stream.buffer, music.stream.processor, @@ -8363,7 +9025,7 @@ raylib.SeekMusicStream = SeekMusicStream * * @return {undefined} */ -function SetMusicVolume (music, volume) { +function SetMusicVolume(music, volume) { return r.BindSetMusicVolume( music.stream.buffer, music.stream.processor, @@ -8387,7 +9049,7 @@ raylib.SetMusicVolume = SetMusicVolume * * @return {undefined} */ -function SetMusicPitch (music, pitch) { +function SetMusicPitch(music, pitch) { return r.BindSetMusicPitch( music.stream.buffer, music.stream.processor, @@ -8411,7 +9073,7 @@ raylib.SetMusicPitch = SetMusicPitch * * @return {undefined} */ -function SetMusicPan (music, pan) { +function SetMusicPan(music, pan) { return r.BindSetMusicPan( music.stream.buffer, music.stream.processor, @@ -8434,7 +9096,7 @@ raylib.SetMusicPan = SetMusicPan * * @return {number} The resulting float. */ -function GetMusicTimeLength (music) { +function GetMusicTimeLength(music) { return r.BindGetMusicTimeLength( music.stream.buffer, music.stream.processor, @@ -8456,7 +9118,7 @@ raylib.GetMusicTimeLength = GetMusicTimeLength * * @return {number} The resulting float. */ -function GetMusicTimePlayed (music) { +function GetMusicTimePlayed(music) { return r.BindGetMusicTimePlayed( music.stream.buffer, music.stream.processor, @@ -8480,7 +9142,7 @@ raylib.GetMusicTimePlayed = GetMusicTimePlayed * * @return {AudioStream} The resulting AudioStream. */ -function LoadAudioStream (sampleRate, sampleSize, channels) { +function LoadAudioStream(sampleRate, sampleSize, channels) { return r.BindLoadAudioStream( sampleRate, sampleSize, @@ -8496,7 +9158,7 @@ raylib.LoadAudioStream = LoadAudioStream * * @return {boolean} The resulting bool. */ -function IsAudioStreamReady (stream) { +function IsAudioStreamReady(stream) { return r.BindIsAudioStreamReady( stream.buffer, stream.processor, @@ -8514,7 +9176,7 @@ raylib.IsAudioStreamReady = IsAudioStreamReady * * @return {undefined} */ -function UnloadAudioStream (stream) { +function UnloadAudioStream(stream) { return r.BindUnloadAudioStream( stream.buffer, stream.processor, @@ -8534,7 +9196,7 @@ raylib.UnloadAudioStream = UnloadAudioStream * * @return {undefined} */ -function UpdateAudioStream (stream, data, frameCount) { +function UpdateAudioStream(stream, data, frameCount) { return r.BindUpdateAudioStream( stream.buffer, stream.processor, @@ -8554,7 +9216,7 @@ raylib.UpdateAudioStream = UpdateAudioStream * * @return {boolean} The resulting bool. */ -function IsAudioStreamProcessed (stream) { +function IsAudioStreamProcessed(stream) { return r.BindIsAudioStreamProcessed( stream.buffer, stream.processor, @@ -8572,7 +9234,7 @@ raylib.IsAudioStreamProcessed = IsAudioStreamProcessed * * @return {undefined} */ -function PlayAudioStream (stream) { +function PlayAudioStream(stream) { return r.BindPlayAudioStream( stream.buffer, stream.processor, @@ -8590,7 +9252,7 @@ raylib.PlayAudioStream = PlayAudioStream * * @return {undefined} */ -function PauseAudioStream (stream) { +function PauseAudioStream(stream) { return r.BindPauseAudioStream( stream.buffer, stream.processor, @@ -8608,7 +9270,7 @@ raylib.PauseAudioStream = PauseAudioStream * * @return {undefined} */ -function ResumeAudioStream (stream) { +function ResumeAudioStream(stream) { return r.BindResumeAudioStream( stream.buffer, stream.processor, @@ -8626,7 +9288,7 @@ raylib.ResumeAudioStream = ResumeAudioStream * * @return {boolean} The resulting bool. */ -function IsAudioStreamPlaying (stream) { +function IsAudioStreamPlaying(stream) { return r.BindIsAudioStreamPlaying( stream.buffer, stream.processor, @@ -8644,7 +9306,7 @@ raylib.IsAudioStreamPlaying = IsAudioStreamPlaying * * @return {undefined} */ -function StopAudioStream (stream) { +function StopAudioStream(stream) { return r.BindStopAudioStream( stream.buffer, stream.processor, @@ -8663,7 +9325,7 @@ raylib.StopAudioStream = StopAudioStream * * @return {undefined} */ -function SetAudioStreamVolume (stream, volume) { +function SetAudioStreamVolume(stream, volume) { return r.BindSetAudioStreamVolume( stream.buffer, stream.processor, @@ -8683,7 +9345,7 @@ raylib.SetAudioStreamVolume = SetAudioStreamVolume * * @return {undefined} */ -function SetAudioStreamPitch (stream, pitch) { +function SetAudioStreamPitch(stream, pitch) { return r.BindSetAudioStreamPitch( stream.buffer, stream.processor, @@ -8703,7 +9365,7 @@ raylib.SetAudioStreamPitch = SetAudioStreamPitch * * @return {undefined} */ -function SetAudioStreamPan (stream, pan) { +function SetAudioStreamPan(stream, pan) { return r.BindSetAudioStreamPan( stream.buffer, stream.processor, @@ -8722,7 +9384,7 @@ raylib.SetAudioStreamPan = SetAudioStreamPan * * @return {undefined} */ -function SetAudioStreamBufferSizeDefault (size) { +function SetAudioStreamBufferSizeDefault(size) { return r.BindSetAudioStreamBufferSizeDefault( size ) @@ -8739,7 +9401,7 @@ raylib.SetAudioStreamBufferSizeDefault = SetAudioStreamBufferSizeDefault * * @return {number} The resulting float. */ -function EaseLinearNone (t, b, c, d) { +function EaseLinearNone(t, b, c, d) { return r.BindEaseLinearNone( t, b, @@ -8759,7 +9421,7 @@ raylib.EaseLinearNone = EaseLinearNone * * @return {number} The resulting float. */ -function EaseLinearIn (t, b, c, d) { +function EaseLinearIn(t, b, c, d) { return r.BindEaseLinearIn( t, b, @@ -8779,7 +9441,7 @@ raylib.EaseLinearIn = EaseLinearIn * * @return {number} The resulting float. */ -function EaseLinearOut (t, b, c, d) { +function EaseLinearOut(t, b, c, d) { return r.BindEaseLinearOut( t, b, @@ -8799,7 +9461,7 @@ raylib.EaseLinearOut = EaseLinearOut * * @return {number} The resulting float. */ -function EaseLinearInOut (t, b, c, d) { +function EaseLinearInOut(t, b, c, d) { return r.BindEaseLinearInOut( t, b, @@ -8819,7 +9481,7 @@ raylib.EaseLinearInOut = EaseLinearInOut * * @return {number} The resulting float. */ -function EaseSineIn (t, b, c, d) { +function EaseSineIn(t, b, c, d) { return r.BindEaseSineIn( t, b, @@ -8839,7 +9501,7 @@ raylib.EaseSineIn = EaseSineIn * * @return {number} The resulting float. */ -function EaseSineOut (t, b, c, d) { +function EaseSineOut(t, b, c, d) { return r.BindEaseSineOut( t, b, @@ -8859,7 +9521,7 @@ raylib.EaseSineOut = EaseSineOut * * @return {number} The resulting float. */ -function EaseSineInOut (t, b, c, d) { +function EaseSineInOut(t, b, c, d) { return r.BindEaseSineInOut( t, b, @@ -8879,7 +9541,7 @@ raylib.EaseSineInOut = EaseSineInOut * * @return {number} The resulting float. */ -function EaseCircIn (t, b, c, d) { +function EaseCircIn(t, b, c, d) { return r.BindEaseCircIn( t, b, @@ -8899,7 +9561,7 @@ raylib.EaseCircIn = EaseCircIn * * @return {number} The resulting float. */ -function EaseCircOut (t, b, c, d) { +function EaseCircOut(t, b, c, d) { return r.BindEaseCircOut( t, b, @@ -8919,7 +9581,7 @@ raylib.EaseCircOut = EaseCircOut * * @return {number} The resulting float. */ -function EaseCircInOut (t, b, c, d) { +function EaseCircInOut(t, b, c, d) { return r.BindEaseCircInOut( t, b, @@ -8939,7 +9601,7 @@ raylib.EaseCircInOut = EaseCircInOut * * @return {number} The resulting float. */ -function EaseCubicIn (t, b, c, d) { +function EaseCubicIn(t, b, c, d) { return r.BindEaseCubicIn( t, b, @@ -8959,7 +9621,7 @@ raylib.EaseCubicIn = EaseCubicIn * * @return {number} The resulting float. */ -function EaseCubicOut (t, b, c, d) { +function EaseCubicOut(t, b, c, d) { return r.BindEaseCubicOut( t, b, @@ -8979,7 +9641,7 @@ raylib.EaseCubicOut = EaseCubicOut * * @return {number} The resulting float. */ -function EaseCubicInOut (t, b, c, d) { +function EaseCubicInOut(t, b, c, d) { return r.BindEaseCubicInOut( t, b, @@ -8999,7 +9661,7 @@ raylib.EaseCubicInOut = EaseCubicInOut * * @return {number} The resulting float. */ -function EaseQuadIn (t, b, c, d) { +function EaseQuadIn(t, b, c, d) { return r.BindEaseQuadIn( t, b, @@ -9019,7 +9681,7 @@ raylib.EaseQuadIn = EaseQuadIn * * @return {number} The resulting float. */ -function EaseQuadOut (t, b, c, d) { +function EaseQuadOut(t, b, c, d) { return r.BindEaseQuadOut( t, b, @@ -9039,7 +9701,7 @@ raylib.EaseQuadOut = EaseQuadOut * * @return {number} The resulting float. */ -function EaseQuadInOut (t, b, c, d) { +function EaseQuadInOut(t, b, c, d) { return r.BindEaseQuadInOut( t, b, @@ -9059,7 +9721,7 @@ raylib.EaseQuadInOut = EaseQuadInOut * * @return {number} The resulting float. */ -function EaseExpoIn (t, b, c, d) { +function EaseExpoIn(t, b, c, d) { return r.BindEaseExpoIn( t, b, @@ -9079,7 +9741,7 @@ raylib.EaseExpoIn = EaseExpoIn * * @return {number} The resulting float. */ -function EaseExpoOut (t, b, c, d) { +function EaseExpoOut(t, b, c, d) { return r.BindEaseExpoOut( t, b, @@ -9099,7 +9761,7 @@ raylib.EaseExpoOut = EaseExpoOut * * @return {number} The resulting float. */ -function EaseExpoInOut (t, b, c, d) { +function EaseExpoInOut(t, b, c, d) { return r.BindEaseExpoInOut( t, b, @@ -9119,7 +9781,7 @@ raylib.EaseExpoInOut = EaseExpoInOut * * @return {number} The resulting float. */ -function EaseBackIn (t, b, c, d) { +function EaseBackIn(t, b, c, d) { return r.BindEaseBackIn( t, b, @@ -9139,7 +9801,7 @@ raylib.EaseBackIn = EaseBackIn * * @return {number} The resulting float. */ -function EaseBackOut (t, b, c, d) { +function EaseBackOut(t, b, c, d) { return r.BindEaseBackOut( t, b, @@ -9159,7 +9821,7 @@ raylib.EaseBackOut = EaseBackOut * * @return {number} The resulting float. */ -function EaseBackInOut (t, b, c, d) { +function EaseBackInOut(t, b, c, d) { return r.BindEaseBackInOut( t, b, @@ -9179,7 +9841,7 @@ raylib.EaseBackInOut = EaseBackInOut * * @return {number} The resulting float. */ -function EaseBounceOut (t, b, c, d) { +function EaseBounceOut(t, b, c, d) { return r.BindEaseBounceOut( t, b, @@ -9199,7 +9861,7 @@ raylib.EaseBounceOut = EaseBounceOut * * @return {number} The resulting float. */ -function EaseBounceIn (t, b, c, d) { +function EaseBounceIn(t, b, c, d) { return r.BindEaseBounceIn( t, b, @@ -9219,7 +9881,7 @@ raylib.EaseBounceIn = EaseBounceIn * * @return {number} The resulting float. */ -function EaseBounceInOut (t, b, c, d) { +function EaseBounceInOut(t, b, c, d) { return r.BindEaseBounceInOut( t, b, @@ -9239,7 +9901,7 @@ raylib.EaseBounceInOut = EaseBounceInOut * * @return {number} The resulting float. */ -function EaseElasticIn (t, b, c, d) { +function EaseElasticIn(t, b, c, d) { return r.BindEaseElasticIn( t, b, @@ -9259,7 +9921,7 @@ raylib.EaseElasticIn = EaseElasticIn * * @return {number} The resulting float. */ -function EaseElasticOut (t, b, c, d) { +function EaseElasticOut(t, b, c, d) { return r.BindEaseElasticOut( t, b, @@ -9279,7 +9941,7 @@ raylib.EaseElasticOut = EaseElasticOut * * @return {number} The resulting float. */ -function EaseElasticInOut (t, b, c, d) { +function EaseElasticInOut(t, b, c, d) { return r.BindEaseElasticInOut( t, b, @@ -9289,7 +9951,7 @@ function EaseElasticInOut (t, b, c, d) { } raylib.EaseElasticInOut = EaseElasticInOut -function Clamp (value, min, max) { +function Clamp(value, min, max) { return r.BindClamp( value, min, @@ -9298,7 +9960,7 @@ function Clamp (value, min, max) { } raylib.Clamp = Clamp -function Lerp (start, end, amount) { +function Lerp(start, end, amount) { return r.BindLerp( start, end, @@ -9307,7 +9969,7 @@ function Lerp (start, end, amount) { } raylib.Lerp = Lerp -function Normalize (value, start, end) { +function Normalize(value, start, end) { return r.BindNormalize( value, start, @@ -9316,7 +9978,7 @@ function Normalize (value, start, end) { } raylib.Normalize = Normalize -function Remap (value, inputStart, inputEnd, outputStart, outputEnd) { +function Remap(value, inputStart, inputEnd, outputStart, outputEnd) { return r.BindRemap( value, inputStart, @@ -9327,7 +9989,7 @@ function Remap (value, inputStart, inputEnd, outputStart, outputEnd) { } raylib.Remap = Remap -function Wrap (value, min, max) { +function Wrap(value, min, max) { return r.BindWrap( value, min, @@ -9336,7 +9998,7 @@ function Wrap (value, min, max) { } raylib.Wrap = Wrap -function FloatEquals (x, y) { +function FloatEquals(x, y) { return r.BindFloatEquals( x, y @@ -9344,17 +10006,17 @@ function FloatEquals (x, y) { } raylib.FloatEquals = FloatEquals -function Vector2Zero () { +function Vector2Zero() { return r.BindVector2Zero() } raylib.Vector2Zero = Vector2Zero -function Vector2One () { +function Vector2One() { return r.BindVector2One() } raylib.Vector2One = Vector2One -function Vector2Add (v1, v2) { +function Vector2Add(v1, v2) { return r.BindVector2Add( v1.x, v1.y, @@ -9364,7 +10026,7 @@ function Vector2Add (v1, v2) { } raylib.Vector2Add = Vector2Add -function Vector2AddValue (v, add) { +function Vector2AddValue(v, add) { return r.BindVector2AddValue( v.x, v.y, @@ -9373,7 +10035,7 @@ function Vector2AddValue (v, add) { } raylib.Vector2AddValue = Vector2AddValue -function Vector2Subtract (v1, v2) { +function Vector2Subtract(v1, v2) { return r.BindVector2Subtract( v1.x, v1.y, @@ -9383,7 +10045,7 @@ function Vector2Subtract (v1, v2) { } raylib.Vector2Subtract = Vector2Subtract -function Vector2SubtractValue (v, sub) { +function Vector2SubtractValue(v, sub) { return r.BindVector2SubtractValue( v.x, v.y, @@ -9392,7 +10054,7 @@ function Vector2SubtractValue (v, sub) { } raylib.Vector2SubtractValue = Vector2SubtractValue -function Vector2Length (v) { +function Vector2Length(v) { return r.BindVector2Length( v.x, v.y @@ -9400,7 +10062,7 @@ function Vector2Length (v) { } raylib.Vector2Length = Vector2Length -function Vector2LengthSqr (v) { +function Vector2LengthSqr(v) { return r.BindVector2LengthSqr( v.x, v.y @@ -9408,7 +10070,7 @@ function Vector2LengthSqr (v) { } raylib.Vector2LengthSqr = Vector2LengthSqr -function Vector2DotProduct (v1, v2) { +function Vector2DotProduct(v1, v2) { return r.BindVector2DotProduct( v1.x, v1.y, @@ -9418,7 +10080,7 @@ function Vector2DotProduct (v1, v2) { } raylib.Vector2DotProduct = Vector2DotProduct -function Vector2Distance (v1, v2) { +function Vector2Distance(v1, v2) { return r.BindVector2Distance( v1.x, v1.y, @@ -9428,7 +10090,7 @@ function Vector2Distance (v1, v2) { } raylib.Vector2Distance = Vector2Distance -function Vector2DistanceSqr (v1, v2) { +function Vector2DistanceSqr(v1, v2) { return r.BindVector2DistanceSqr( v1.x, v1.y, @@ -9438,7 +10100,7 @@ function Vector2DistanceSqr (v1, v2) { } raylib.Vector2DistanceSqr = Vector2DistanceSqr -function Vector2Angle (v1, v2) { +function Vector2Angle(v1, v2) { return r.BindVector2Angle( v1.x, v1.y, @@ -9448,7 +10110,7 @@ function Vector2Angle (v1, v2) { } raylib.Vector2Angle = Vector2Angle -function Vector2LineAngle (start, end) { +function Vector2LineAngle(start, end) { return r.BindVector2LineAngle( start.x, start.y, @@ -9458,7 +10120,7 @@ function Vector2LineAngle (start, end) { } raylib.Vector2LineAngle = Vector2LineAngle -function Vector2Scale (v, scale) { +function Vector2Scale(v, scale) { return r.BindVector2Scale( v.x, v.y, @@ -9467,7 +10129,7 @@ function Vector2Scale (v, scale) { } raylib.Vector2Scale = Vector2Scale -function Vector2Multiply (v1, v2) { +function Vector2Multiply(v1, v2) { return r.BindVector2Multiply( v1.x, v1.y, @@ -9477,7 +10139,7 @@ function Vector2Multiply (v1, v2) { } raylib.Vector2Multiply = Vector2Multiply -function Vector2Negate (v) { +function Vector2Negate(v) { return r.BindVector2Negate( v.x, v.y @@ -9485,7 +10147,7 @@ function Vector2Negate (v) { } raylib.Vector2Negate = Vector2Negate -function Vector2Divide (v1, v2) { +function Vector2Divide(v1, v2) { return r.BindVector2Divide( v1.x, v1.y, @@ -9495,7 +10157,7 @@ function Vector2Divide (v1, v2) { } raylib.Vector2Divide = Vector2Divide -function Vector2Normalize (v) { +function Vector2Normalize(v) { return r.BindVector2Normalize( v.x, v.y @@ -9503,7 +10165,7 @@ function Vector2Normalize (v) { } raylib.Vector2Normalize = Vector2Normalize -function Vector2Transform (v, mat) { +function Vector2Transform(v, mat) { return r.BindVector2Transform( v.x, v.y, @@ -9527,7 +10189,7 @@ function Vector2Transform (v, mat) { } raylib.Vector2Transform = Vector2Transform -function Vector2Lerp (v1, v2, amount) { +function Vector2Lerp(v1, v2, amount) { return r.BindVector2Lerp( v1.x, v1.y, @@ -9538,7 +10200,7 @@ function Vector2Lerp (v1, v2, amount) { } raylib.Vector2Lerp = Vector2Lerp -function Vector2Reflect (v, normal) { +function Vector2Reflect(v, normal) { return r.BindVector2Reflect( v.x, v.y, @@ -9548,7 +10210,7 @@ function Vector2Reflect (v, normal) { } raylib.Vector2Reflect = Vector2Reflect -function Vector2Rotate (v, angle) { +function Vector2Rotate(v, angle) { return r.BindVector2Rotate( v.x, v.y, @@ -9557,7 +10219,7 @@ function Vector2Rotate (v, angle) { } raylib.Vector2Rotate = Vector2Rotate -function Vector2MoveTowards (v, target, maxDistance) { +function Vector2MoveTowards(v, target, maxDistance) { return r.BindVector2MoveTowards( v.x, v.y, @@ -9568,7 +10230,7 @@ function Vector2MoveTowards (v, target, maxDistance) { } raylib.Vector2MoveTowards = Vector2MoveTowards -function Vector2Invert (v) { +function Vector2Invert(v) { return r.BindVector2Invert( v.x, v.y @@ -9576,7 +10238,7 @@ function Vector2Invert (v) { } raylib.Vector2Invert = Vector2Invert -function Vector2Clamp (v, min, max) { +function Vector2Clamp(v, min, max) { return r.BindVector2Clamp( v.x, v.y, @@ -9588,7 +10250,7 @@ function Vector2Clamp (v, min, max) { } raylib.Vector2Clamp = Vector2Clamp -function Vector2ClampValue (v, min, max) { +function Vector2ClampValue(v, min, max) { return r.BindVector2ClampValue( v.x, v.y, @@ -9598,7 +10260,7 @@ function Vector2ClampValue (v, min, max) { } raylib.Vector2ClampValue = Vector2ClampValue -function Vector2Equals (p, q) { +function Vector2Equals(p, q) { return r.BindVector2Equals( p.x, p.y, @@ -9608,17 +10270,17 @@ function Vector2Equals (p, q) { } raylib.Vector2Equals = Vector2Equals -function Vector3Zero () { +function Vector3Zero() { return r.BindVector3Zero() } raylib.Vector3Zero = Vector3Zero -function Vector3One () { +function Vector3One() { return r.BindVector3One() } raylib.Vector3One = Vector3One -function Vector3Add (v1, v2) { +function Vector3Add(v1, v2) { return r.BindVector3Add( v1.x, v1.y, @@ -9630,7 +10292,7 @@ function Vector3Add (v1, v2) { } raylib.Vector3Add = Vector3Add -function Vector3AddValue (v, add) { +function Vector3AddValue(v, add) { return r.BindVector3AddValue( v.x, v.y, @@ -9640,7 +10302,7 @@ function Vector3AddValue (v, add) { } raylib.Vector3AddValue = Vector3AddValue -function Vector3Subtract (v1, v2) { +function Vector3Subtract(v1, v2) { return r.BindVector3Subtract( v1.x, v1.y, @@ -9652,7 +10314,7 @@ function Vector3Subtract (v1, v2) { } raylib.Vector3Subtract = Vector3Subtract -function Vector3SubtractValue (v, sub) { +function Vector3SubtractValue(v, sub) { return r.BindVector3SubtractValue( v.x, v.y, @@ -9662,7 +10324,7 @@ function Vector3SubtractValue (v, sub) { } raylib.Vector3SubtractValue = Vector3SubtractValue -function Vector3Scale (v, scalar) { +function Vector3Scale(v, scalar) { return r.BindVector3Scale( v.x, v.y, @@ -9672,7 +10334,7 @@ function Vector3Scale (v, scalar) { } raylib.Vector3Scale = Vector3Scale -function Vector3Multiply (v1, v2) { +function Vector3Multiply(v1, v2) { return r.BindVector3Multiply( v1.x, v1.y, @@ -9684,7 +10346,7 @@ function Vector3Multiply (v1, v2) { } raylib.Vector3Multiply = Vector3Multiply -function Vector3CrossProduct (v1, v2) { +function Vector3CrossProduct(v1, v2) { return r.BindVector3CrossProduct( v1.x, v1.y, @@ -9696,7 +10358,7 @@ function Vector3CrossProduct (v1, v2) { } raylib.Vector3CrossProduct = Vector3CrossProduct -function Vector3Perpendicular (v) { +function Vector3Perpendicular(v) { return r.BindVector3Perpendicular( v.x, v.y, @@ -9705,21 +10367,21 @@ function Vector3Perpendicular (v) { } raylib.Vector3Perpendicular = Vector3Perpendicular -function Vector3Length (v) { +function Vector3Length(v) { return r.BindVector3Length( v ) } raylib.Vector3Length = Vector3Length -function Vector3LengthSqr (v) { +function Vector3LengthSqr(v) { return r.BindVector3LengthSqr( v ) } raylib.Vector3LengthSqr = Vector3LengthSqr -function Vector3DotProduct (v1, v2) { +function Vector3DotProduct(v1, v2) { return r.BindVector3DotProduct( v1.x, v1.y, @@ -9731,7 +10393,7 @@ function Vector3DotProduct (v1, v2) { } raylib.Vector3DotProduct = Vector3DotProduct -function Vector3Distance (v1, v2) { +function Vector3Distance(v1, v2) { return r.BindVector3Distance( v1.x, v1.y, @@ -9743,7 +10405,7 @@ function Vector3Distance (v1, v2) { } raylib.Vector3Distance = Vector3Distance -function Vector3DistanceSqr (v1, v2) { +function Vector3DistanceSqr(v1, v2) { return r.BindVector3DistanceSqr( v1.x, v1.y, @@ -9755,7 +10417,7 @@ function Vector3DistanceSqr (v1, v2) { } raylib.Vector3DistanceSqr = Vector3DistanceSqr -function Vector3Angle (v1, v2) { +function Vector3Angle(v1, v2) { return r.BindVector3Angle( v1.x, v1.y, @@ -9767,7 +10429,7 @@ function Vector3Angle (v1, v2) { } raylib.Vector3Angle = Vector3Angle -function Vector3Negate (v) { +function Vector3Negate(v) { return r.BindVector3Negate( v.x, v.y, @@ -9776,7 +10438,7 @@ function Vector3Negate (v) { } raylib.Vector3Negate = Vector3Negate -function Vector3Divide (v1, v2) { +function Vector3Divide(v1, v2) { return r.BindVector3Divide( v1.x, v1.y, @@ -9788,7 +10450,7 @@ function Vector3Divide (v1, v2) { } raylib.Vector3Divide = Vector3Divide -function Vector3Normalize (v) { +function Vector3Normalize(v) { return r.BindVector3Normalize( v.x, v.y, @@ -9797,7 +10459,31 @@ function Vector3Normalize (v) { } raylib.Vector3Normalize = Vector3Normalize -function Vector3OrthoNormalize (v1, v2) { +function Vector3Project(v1, v2) { + return r.BindVector3Project( + v1.x, + v1.y, + v1.z, + v2.x, + v2.y, + v2.z + ) +} +raylib.Vector3Project = Vector3Project + +function Vector3Reject(v1, v2) { + return r.BindVector3Reject( + v1.x, + v1.y, + v1.z, + v2.x, + v2.y, + v2.z + ) +} +raylib.Vector3Reject = Vector3Reject + +function Vector3OrthoNormalize(v1, v2) { return r.BindVector3OrthoNormalize( v1, v2 @@ -9805,7 +10491,7 @@ function Vector3OrthoNormalize (v1, v2) { } raylib.Vector3OrthoNormalize = Vector3OrthoNormalize -function Vector3Transform (v, mat) { +function Vector3Transform(v, mat) { return r.BindVector3Transform( v.x, v.y, @@ -9830,7 +10516,7 @@ function Vector3Transform (v, mat) { } raylib.Vector3Transform = Vector3Transform -function Vector3RotateByQuaternion (v, q) { +function Vector3RotateByQuaternion(v, q) { return r.BindVector3RotateByQuaternion( v.x, v.y, @@ -9840,7 +10526,7 @@ function Vector3RotateByQuaternion (v, q) { } raylib.Vector3RotateByQuaternion = Vector3RotateByQuaternion -function Vector3RotateByAxisAngle (v, axis, angle) { +function Vector3RotateByAxisAngle(v, axis, angle) { return r.BindVector3RotateByAxisAngle( v.x, v.y, @@ -9853,7 +10539,7 @@ function Vector3RotateByAxisAngle (v, axis, angle) { } raylib.Vector3RotateByAxisAngle = Vector3RotateByAxisAngle -function Vector3Lerp (v1, v2, amount) { +function Vector3Lerp(v1, v2, amount) { return r.BindVector3Lerp( v1.x, v1.y, @@ -9866,7 +10552,7 @@ function Vector3Lerp (v1, v2, amount) { } raylib.Vector3Lerp = Vector3Lerp -function Vector3Reflect (v, normal) { +function Vector3Reflect(v, normal) { return r.BindVector3Reflect( v.x, v.y, @@ -9878,7 +10564,7 @@ function Vector3Reflect (v, normal) { } raylib.Vector3Reflect = Vector3Reflect -function Vector3Min (v1, v2) { +function Vector3Min(v1, v2) { return r.BindVector3Min( v1.x, v1.y, @@ -9890,7 +10576,7 @@ function Vector3Min (v1, v2) { } raylib.Vector3Min = Vector3Min -function Vector3Max (v1, v2) { +function Vector3Max(v1, v2) { return r.BindVector3Max( v1.x, v1.y, @@ -9902,7 +10588,7 @@ function Vector3Max (v1, v2) { } raylib.Vector3Max = Vector3Max -function Vector3Barycenter (p, a, b, c) { +function Vector3Barycenter(p, a, b, c) { return r.BindVector3Barycenter( p.x, p.y, @@ -9920,7 +10606,7 @@ function Vector3Barycenter (p, a, b, c) { } raylib.Vector3Barycenter = Vector3Barycenter -function Vector3Unproject (source, projection, view) { +function Vector3Unproject(source, projection, view) { return r.BindVector3Unproject( source.x, source.y, @@ -9961,7 +10647,7 @@ function Vector3Unproject (source, projection, view) { } raylib.Vector3Unproject = Vector3Unproject -function Vector3Invert (v) { +function Vector3Invert(v) { return r.BindVector3Invert( v.x, v.y, @@ -9970,7 +10656,7 @@ function Vector3Invert (v) { } raylib.Vector3Invert = Vector3Invert -function Vector3Clamp (v, min, max) { +function Vector3Clamp(v, min, max) { return r.BindVector3Clamp( v.x, v.y, @@ -9985,7 +10671,7 @@ function Vector3Clamp (v, min, max) { } raylib.Vector3Clamp = Vector3Clamp -function Vector3ClampValue (v, min, max) { +function Vector3ClampValue(v, min, max) { return r.BindVector3ClampValue( v.x, v.y, @@ -9996,7 +10682,7 @@ function Vector3ClampValue (v, min, max) { } raylib.Vector3ClampValue = Vector3ClampValue -function Vector3Equals (p, q) { +function Vector3Equals(p, q) { return r.BindVector3Equals( p.x, p.y, @@ -10008,7 +10694,7 @@ function Vector3Equals (p, q) { } raylib.Vector3Equals = Vector3Equals -function Vector3Refract (v, n, r) { +function Vector3Refract(v, n, r) { return r.BindVector3Refract( v.x, v.y, @@ -10021,7 +10707,7 @@ function Vector3Refract (v, n, r) { } raylib.Vector3Refract = Vector3Refract -function MatrixDeterminant (mat) { +function MatrixDeterminant(mat) { return r.BindMatrixDeterminant( mat.m0, mat.m4, @@ -10043,7 +10729,7 @@ function MatrixDeterminant (mat) { } raylib.MatrixDeterminant = MatrixDeterminant -function MatrixTrace (mat) { +function MatrixTrace(mat) { return r.BindMatrixTrace( mat.m0, mat.m4, @@ -10065,7 +10751,7 @@ function MatrixTrace (mat) { } raylib.MatrixTrace = MatrixTrace -function MatrixTranspose (mat) { +function MatrixTranspose(mat) { return r.BindMatrixTranspose( mat.m0, mat.m4, @@ -10087,7 +10773,7 @@ function MatrixTranspose (mat) { } raylib.MatrixTranspose = MatrixTranspose -function MatrixInvert (mat) { +function MatrixInvert(mat) { return r.BindMatrixInvert( mat.m0, mat.m4, @@ -10109,12 +10795,12 @@ function MatrixInvert (mat) { } raylib.MatrixInvert = MatrixInvert -function MatrixIdentity () { +function MatrixIdentity() { return r.BindMatrixIdentity() } raylib.MatrixIdentity = MatrixIdentity -function MatrixAdd (left, right) { +function MatrixAdd(left, right) { return r.BindMatrixAdd( left.m0, left.m4, @@ -10152,7 +10838,7 @@ function MatrixAdd (left, right) { } raylib.MatrixAdd = MatrixAdd -function MatrixSubtract (left, right) { +function MatrixSubtract(left, right) { return r.BindMatrixSubtract( left.m0, left.m4, @@ -10190,7 +10876,7 @@ function MatrixSubtract (left, right) { } raylib.MatrixSubtract = MatrixSubtract -function MatrixMultiply (left, right) { +function MatrixMultiply(left, right) { return r.BindMatrixMultiply( left.m0, left.m4, @@ -10228,7 +10914,7 @@ function MatrixMultiply (left, right) { } raylib.MatrixMultiply = MatrixMultiply -function MatrixTranslate (x, y, z) { +function MatrixTranslate(x, y, z) { return r.BindMatrixTranslate( x, y, @@ -10237,7 +10923,7 @@ function MatrixTranslate (x, y, z) { } raylib.MatrixTranslate = MatrixTranslate -function MatrixRotate (axis, angle) { +function MatrixRotate(axis, angle) { return r.BindMatrixRotate( axis.x, axis.y, @@ -10247,28 +10933,28 @@ function MatrixRotate (axis, angle) { } raylib.MatrixRotate = MatrixRotate -function MatrixRotateX (angle) { +function MatrixRotateX(angle) { return r.BindMatrixRotateX( angle ) } raylib.MatrixRotateX = MatrixRotateX -function MatrixRotateY (angle) { +function MatrixRotateY(angle) { return r.BindMatrixRotateY( angle ) } raylib.MatrixRotateY = MatrixRotateY -function MatrixRotateZ (angle) { +function MatrixRotateZ(angle) { return r.BindMatrixRotateZ( angle ) } raylib.MatrixRotateZ = MatrixRotateZ -function MatrixRotateXYZ (angle) { +function MatrixRotateXYZ(angle) { return r.BindMatrixRotateXYZ( angle.x, angle.y, @@ -10277,7 +10963,7 @@ function MatrixRotateXYZ (angle) { } raylib.MatrixRotateXYZ = MatrixRotateXYZ -function MatrixRotateZYX (angle) { +function MatrixRotateZYX(angle) { return r.BindMatrixRotateZYX( angle.x, angle.y, @@ -10286,7 +10972,7 @@ function MatrixRotateZYX (angle) { } raylib.MatrixRotateZYX = MatrixRotateZYX -function MatrixScale (x, y, z) { +function MatrixScale(x, y, z) { return r.BindMatrixScale( x, y, @@ -10295,7 +10981,7 @@ function MatrixScale (x, y, z) { } raylib.MatrixScale = MatrixScale -function MatrixFrustum (left, right, bottom, top, near, far) { +function MatrixFrustum(left, right, bottom, top, near, far) { return r.BindMatrixFrustum( left, right, @@ -10307,29 +10993,29 @@ function MatrixFrustum (left, right, bottom, top, near, far) { } raylib.MatrixFrustum = MatrixFrustum -function MatrixPerspective (fovy, aspect, near, far) { +function MatrixPerspective(fovY, aspect, nearPlane, farPlane) { return r.BindMatrixPerspective( - fovy, + fovY, aspect, - near, - far + nearPlane, + farPlane ) } raylib.MatrixPerspective = MatrixPerspective -function MatrixOrtho (left, right, bottom, top, near, far) { +function MatrixOrtho(left, right, bottom, top, nearPlane, farPlane) { return r.BindMatrixOrtho( left, right, bottom, top, - near, - far + nearPlane, + farPlane ) } raylib.MatrixOrtho = MatrixOrtho -function MatrixLookAt (eye, target, up) { +function MatrixLookAt(eye, target, up) { return r.BindMatrixLookAt( eye.x, eye.y, @@ -10344,7 +11030,7 @@ function MatrixLookAt (eye, target, up) { } raylib.MatrixLookAt = MatrixLookAt -function QuaternionAdd (q1, q2) { +function QuaternionAdd(q1, q2) { return r.BindQuaternionAdd( q1, q2 @@ -10352,7 +11038,7 @@ function QuaternionAdd (q1, q2) { } raylib.QuaternionAdd = QuaternionAdd -function QuaternionAddValue (q, add) { +function QuaternionAddValue(q, add) { return r.BindQuaternionAddValue( q, add @@ -10360,7 +11046,7 @@ function QuaternionAddValue (q, add) { } raylib.QuaternionAddValue = QuaternionAddValue -function QuaternionSubtract (q1, q2) { +function QuaternionSubtract(q1, q2) { return r.BindQuaternionSubtract( q1, q2 @@ -10368,7 +11054,7 @@ function QuaternionSubtract (q1, q2) { } raylib.QuaternionSubtract = QuaternionSubtract -function QuaternionSubtractValue (q, sub) { +function QuaternionSubtractValue(q, sub) { return r.BindQuaternionSubtractValue( q, sub @@ -10376,33 +11062,33 @@ function QuaternionSubtractValue (q, sub) { } raylib.QuaternionSubtractValue = QuaternionSubtractValue -function QuaternionIdentity () { +function QuaternionIdentity() { return r.BindQuaternionIdentity() } raylib.QuaternionIdentity = QuaternionIdentity -function QuaternionLength (q) { +function QuaternionLength(q) { return r.BindQuaternionLength( q ) } raylib.QuaternionLength = QuaternionLength -function QuaternionNormalize (q) { +function QuaternionNormalize(q) { return r.BindQuaternionNormalize( q ) } raylib.QuaternionNormalize = QuaternionNormalize -function QuaternionInvert (q) { +function QuaternionInvert(q) { return r.BindQuaternionInvert( q ) } raylib.QuaternionInvert = QuaternionInvert -function QuaternionMultiply (q1, q2) { +function QuaternionMultiply(q1, q2) { return r.BindQuaternionMultiply( q1, q2 @@ -10410,7 +11096,7 @@ function QuaternionMultiply (q1, q2) { } raylib.QuaternionMultiply = QuaternionMultiply -function QuaternionScale (q, mul) { +function QuaternionScale(q, mul) { return r.BindQuaternionScale( q, mul @@ -10418,7 +11104,7 @@ function QuaternionScale (q, mul) { } raylib.QuaternionScale = QuaternionScale -function QuaternionDivide (q1, q2) { +function QuaternionDivide(q1, q2) { return r.BindQuaternionDivide( q1, q2 @@ -10426,7 +11112,7 @@ function QuaternionDivide (q1, q2) { } raylib.QuaternionDivide = QuaternionDivide -function QuaternionLerp (q1, q2, amount) { +function QuaternionLerp(q1, q2, amount) { return r.BindQuaternionLerp( q1, q2, @@ -10435,7 +11121,7 @@ function QuaternionLerp (q1, q2, amount) { } raylib.QuaternionLerp = QuaternionLerp -function QuaternionNlerp (q1, q2, amount) { +function QuaternionNlerp(q1, q2, amount) { return r.BindQuaternionNlerp( q1, q2, @@ -10444,7 +11130,7 @@ function QuaternionNlerp (q1, q2, amount) { } raylib.QuaternionNlerp = QuaternionNlerp -function QuaternionSlerp (q1, q2, amount) { +function QuaternionSlerp(q1, q2, amount) { return r.BindQuaternionSlerp( q1, q2, @@ -10453,7 +11139,7 @@ function QuaternionSlerp (q1, q2, amount) { } raylib.QuaternionSlerp = QuaternionSlerp -function QuaternionFromVector3ToVector3 (from, to) { +function QuaternionFromVector3ToVector3(from, to) { return r.BindQuaternionFromVector3ToVector3( from.x, from.y, @@ -10465,7 +11151,7 @@ function QuaternionFromVector3ToVector3 (from, to) { } raylib.QuaternionFromVector3ToVector3 = QuaternionFromVector3ToVector3 -function QuaternionFromMatrix (mat) { +function QuaternionFromMatrix(mat) { return r.BindQuaternionFromMatrix( mat.m0, mat.m4, @@ -10487,14 +11173,14 @@ function QuaternionFromMatrix (mat) { } raylib.QuaternionFromMatrix = QuaternionFromMatrix -function QuaternionToMatrix (q) { +function QuaternionToMatrix(q) { return r.BindQuaternionToMatrix( q ) } raylib.QuaternionToMatrix = QuaternionToMatrix -function QuaternionFromAxisAngle (axis, angle) { +function QuaternionFromAxisAngle(axis, angle) { return r.BindQuaternionFromAxisAngle( axis.x, axis.y, @@ -10504,7 +11190,7 @@ function QuaternionFromAxisAngle (axis, angle) { } raylib.QuaternionFromAxisAngle = QuaternionFromAxisAngle -function QuaternionToAxisAngle (q, outAxis, outAngle) { +function QuaternionToAxisAngle(q, outAxis, outAngle) { return r.BindQuaternionToAxisAngle( q, outAxis, @@ -10513,7 +11199,7 @@ function QuaternionToAxisAngle (q, outAxis, outAngle) { } raylib.QuaternionToAxisAngle = QuaternionToAxisAngle -function QuaternionFromEuler (pitch, yaw, roll) { +function QuaternionFromEuler(pitch, yaw, roll) { return r.BindQuaternionFromEuler( pitch, yaw, @@ -10522,14 +11208,14 @@ function QuaternionFromEuler (pitch, yaw, roll) { } raylib.QuaternionFromEuler = QuaternionFromEuler -function QuaternionToEuler (q) { +function QuaternionToEuler(q) { return r.BindQuaternionToEuler( q ) } raylib.QuaternionToEuler = QuaternionToEuler -function QuaternionTransform (q, mat) { +function QuaternionTransform(q, mat) { return r.BindQuaternionTransform( q, mat.m0, @@ -10552,7 +11238,7 @@ function QuaternionTransform (q, mat) { } raylib.QuaternionTransform = QuaternionTransform -function QuaternionEquals (p, q) { +function QuaternionEquals(p, q) { return r.BindQuaternionEquals( p, q @@ -10565,7 +11251,7 @@ raylib.QuaternionEquals = QuaternionEquals * * @return {undefined} */ -function GuiEnable () { +function GuiEnable() { return r.BindGuiEnable() } raylib.GuiEnable = GuiEnable @@ -10575,7 +11261,7 @@ raylib.GuiEnable = GuiEnable * * @return {undefined} */ -function GuiDisable () { +function GuiDisable() { return r.BindGuiDisable() } raylib.GuiDisable = GuiDisable @@ -10585,7 +11271,7 @@ raylib.GuiDisable = GuiDisable * * @return {undefined} */ -function GuiLock () { +function GuiLock() { return r.BindGuiLock() } raylib.GuiLock = GuiLock @@ -10595,7 +11281,7 @@ raylib.GuiLock = GuiLock * * @return {undefined} */ -function GuiUnlock () { +function GuiUnlock() { return r.BindGuiUnlock() } raylib.GuiUnlock = GuiUnlock @@ -10605,7 +11291,7 @@ raylib.GuiUnlock = GuiUnlock * * @return {boolean} The resulting bool. */ -function GuiIsLocked () { +function GuiIsLocked() { return r.BindGuiIsLocked() } raylib.GuiIsLocked = GuiIsLocked @@ -10617,12 +11303,12 @@ raylib.GuiIsLocked = GuiIsLocked * * @return {undefined} */ -function GuiFade (alpha) { - return r.BindGuiFade( +function GuiSetAlpha(alpha) { + return r.BindGuiSetAlpha( alpha ) } -raylib.GuiFade = GuiFade +raylib.GuiSetAlpha = GuiSetAlpha /** * Set gui state (global state) @@ -10631,7 +11317,7 @@ raylib.GuiFade = GuiFade * * @return {undefined} */ -function GuiSetState (state) { +function GuiSetState(state) { return r.BindGuiSetState( state ) @@ -10643,7 +11329,7 @@ raylib.GuiSetState = GuiSetState * * @return {number} The resulting int. */ -function GuiGetState () { +function GuiGetState() { return r.BindGuiGetState() } raylib.GuiGetState = GuiGetState @@ -10655,7 +11341,7 @@ raylib.GuiGetState = GuiGetState * * @return {undefined} */ -function GuiSetFont (font) { +function GuiSetFont(font) { return r.BindGuiSetFont( font.baseSize, font.glyphCount, @@ -10669,51 +11355,190 @@ function GuiSetFont (font) { font.glyphs ) } -raylib.GuiSetFont = GuiSetFont +raylib.GuiSetFont = GuiSetFont + +/** + * Get gui custom font (global state) + * + * @return {Font} The resulting Font. + */ +function GuiGetFont() { + return r.BindGuiGetFont() +} +raylib.GuiGetFont = GuiGetFont + +/** + * Set one style property + * + * @param {number} control + * @param {number} property + * @param {number} value + * + * @return {undefined} + */ +function GuiSetStyle(control, property, value) { + return r.BindGuiSetStyle( + control, + property, + value + ) +} +raylib.GuiSetStyle = GuiSetStyle + +/** + * Get one style property + * + * @param {number} control + * @param {number} property + * + * @return {number} The resulting int. + */ +function GuiGetStyle(control, property) { + return r.BindGuiGetStyle( + control, + property + ) +} +raylib.GuiGetStyle = GuiGetStyle + +/** + * Load style file over global style variable (.rgs) + * + * @param {string} fileName + * + * @return {undefined} + */ +function GuiLoadStyle(fileName) { + return r.BindGuiLoadStyle( + fileName + ) +} +raylib.GuiLoadStyle = GuiLoadStyle + +/** + * Load style default over global style + * + * @return {undefined} + */ +function GuiLoadStyleDefault() { + return r.BindGuiLoadStyleDefault() +} +raylib.GuiLoadStyleDefault = GuiLoadStyleDefault + +/** + * Enable gui tooltips (global state) + * + * @return {undefined} + */ +function GuiEnableTooltip() { + return r.BindGuiEnableTooltip() +} +raylib.GuiEnableTooltip = GuiEnableTooltip + +/** + * Disable gui tooltips (global state) + * + * @return {undefined} + */ +function GuiDisableTooltip() { + return r.BindGuiDisableTooltip() +} +raylib.GuiDisableTooltip = GuiDisableTooltip + +/** + * Set tooltip string + * + * @param {string} tooltip + * + * @return {undefined} + */ +function GuiSetTooltip(tooltip) { + return r.BindGuiSetTooltip( + tooltip + ) +} +raylib.GuiSetTooltip = GuiSetTooltip + +/** + * Get text with icon id prepended (if supported) + * + * @param {number} iconId + * @param {string} text + * + * @return {string} The resulting const char *. + */ +function GuiIconText(iconId, text) { + return r.BindGuiIconText( + iconId, + text + ) +} +raylib.GuiIconText = GuiIconText + +/** + * Set default icon drawing size + * + * @param {number} scale + * + * @return {undefined} + */ +function GuiSetIconScale(scale) { + return r.BindGuiSetIconScale( + scale + ) +} +raylib.GuiSetIconScale = GuiSetIconScale /** - * Get gui custom font (global state) + * Get raygui icons data pointer * - * @return {Font} The resulting Font. + * @return {number} The resulting unsigned int *. */ -function GuiGetFont () { - return r.BindGuiGetFont() +function GuiGetIcons() { + return r.BindGuiGetIcons() } -raylib.GuiGetFont = GuiGetFont +raylib.GuiGetIcons = GuiGetIcons /** - * Set one style property + * Load raygui icons file (.rgi) into internal icons data * - * @param {number} control - * @param {number} property - * @param {number} value + * @param {string} fileName + * @param {boolean} loadIconsName * - * @return {undefined} + * @return {number} The resulting char **. */ -function GuiSetStyle (control, property, value) { - return r.BindGuiSetStyle( - control, - property, - value +function GuiLoadIcons(fileName, loadIconsName) { + return r.BindGuiLoadIcons( + fileName, + loadIconsName ) } -raylib.GuiSetStyle = GuiSetStyle +raylib.GuiLoadIcons = GuiLoadIcons /** - * Get one style property + * Draw icon using pixel size at specified position * - * @param {number} control - * @param {number} property + * @param {number} iconId + * @param {number} posX + * @param {number} posY + * @param {number} pixelSize + * @param {Color} color * - * @return {number} The resulting int. + * @return {undefined} */ -function GuiGetStyle (control, property) { - return r.BindGuiGetStyle( - control, - property +function GuiDrawIcon(iconId, posX, posY, pixelSize, color) { + return r.BindGuiDrawIcon( + iconId, + posX, + posY, + pixelSize, + color.r, + color.g, + color.b, + color.a ) } -raylib.GuiGetStyle = GuiGetStyle +raylib.GuiDrawIcon = GuiDrawIcon /** * Window Box control, shows a window that can be closed @@ -10721,9 +11546,9 @@ raylib.GuiGetStyle = GuiGetStyle * @param {Rectangle} bounds * @param {string} title * - * @return {boolean} The resulting bool. + * @return {number} The resulting int. */ -function GuiWindowBox (bounds, title) { +function GuiWindowBox(bounds, title) { return r.BindGuiWindowBox( bounds.x, bounds.y, @@ -10740,9 +11565,9 @@ raylib.GuiWindowBox = GuiWindowBox * @param {Rectangle} bounds * @param {string} text * - * @return {undefined} + * @return {number} The resulting int. */ -function GuiGroupBox (bounds, text) { +function GuiGroupBox(bounds, text) { return r.BindGuiGroupBox( bounds.x, bounds.y, @@ -10759,9 +11584,9 @@ raylib.GuiGroupBox = GuiGroupBox * @param {Rectangle} bounds * @param {string} text * - * @return {undefined} + * @return {number} The resulting int. */ -function GuiLine (bounds, text) { +function GuiLine(bounds, text) { return r.BindGuiLine( bounds.x, bounds.y, @@ -10778,9 +11603,9 @@ raylib.GuiLine = GuiLine * @param {Rectangle} bounds * @param {string} text * - * @return {undefined} + * @return {number} The resulting int. */ -function GuiPanel (bounds, text) { +function GuiPanel(bounds, text) { return r.BindGuiPanel( bounds.x, bounds.y, @@ -10801,7 +11626,7 @@ raylib.GuiPanel = GuiPanel * * @return {number} The resulting int. */ -function GuiTabBar (bounds, text, count, active) { +function GuiTabBar(bounds, text, count, active) { return r.BindGuiTabBar( bounds.x, bounds.y, @@ -10821,10 +11646,11 @@ raylib.GuiTabBar = GuiTabBar * @param {string} text * @param {Rectangle} content * @param {number} scroll + * @param {number} view * - * @return {Rectangle} The resulting Rectangle. + * @return {number} The resulting int. */ -function GuiScrollPanel (bounds, text, content, scroll) { +function GuiScrollPanel(bounds, text, content, scroll, view) { return r.BindGuiScrollPanel( bounds.x, bounds.y, @@ -10835,7 +11661,8 @@ function GuiScrollPanel (bounds, text, content, scroll) { content.y, content.width, content.height, - scroll + scroll, + view ) } raylib.GuiScrollPanel = GuiScrollPanel @@ -10846,9 +11673,9 @@ raylib.GuiScrollPanel = GuiScrollPanel * @param {Rectangle} bounds * @param {string} text * - * @return {undefined} + * @return {number} The resulting int. */ -function GuiLabel (bounds, text) { +function GuiLabel(bounds, text) { return r.BindGuiLabel( bounds.x, bounds.y, @@ -10865,9 +11692,9 @@ raylib.GuiLabel = GuiLabel * @param {Rectangle} bounds * @param {string} text * - * @return {boolean} The resulting bool. + * @return {number} The resulting int. */ -function GuiButton (bounds, text) { +function GuiButton(bounds, text) { return r.BindGuiButton( bounds.x, bounds.y, @@ -10884,9 +11711,9 @@ raylib.GuiButton = GuiButton * @param {Rectangle} bounds * @param {string} text * - * @return {boolean} The resulting bool. + * @return {number} The resulting int. */ -function GuiLabelButton (bounds, text) { +function GuiLabelButton(bounds, text) { return r.BindGuiLabelButton( bounds.x, bounds.y, @@ -10902,11 +11729,11 @@ raylib.GuiLabelButton = GuiLabelButton * * @param {Rectangle} bounds * @param {string} text - * @param {boolean} active + * @param {number} active * - * @return {boolean} The resulting bool. + * @return {number} The resulting int. */ -function GuiToggle (bounds, text, active) { +function GuiToggle(bounds, text, active) { return r.BindGuiToggle( bounds.x, bounds.y, @@ -10927,7 +11754,7 @@ raylib.GuiToggle = GuiToggle * * @return {number} The resulting int. */ -function GuiToggleGroup (bounds, text, active) { +function GuiToggleGroup(bounds, text, active) { return r.BindGuiToggleGroup( bounds.x, bounds.y, @@ -10939,16 +11766,37 @@ function GuiToggleGroup (bounds, text, active) { } raylib.GuiToggleGroup = GuiToggleGroup +/** + * Toggle Slider control, returns true when clicked + * + * @param {Rectangle} bounds + * @param {string} text + * @param {number} active + * + * @return {number} The resulting int. + */ +function GuiToggleSlider(bounds, text, active) { + return r.BindGuiToggleSlider( + bounds.x, + bounds.y, + bounds.width, + bounds.height, + text, + active + ) +} +raylib.GuiToggleSlider = GuiToggleSlider + /** * Check Box control, returns true when active * * @param {Rectangle} bounds * @param {string} text - * @param {boolean} checked + * @param {number} checked * - * @return {boolean} The resulting bool. + * @return {number} The resulting int. */ -function GuiCheckBox (bounds, text, checked) { +function GuiCheckBox(bounds, text, checked) { return r.BindGuiCheckBox( bounds.x, bounds.y, @@ -10969,7 +11817,7 @@ raylib.GuiCheckBox = GuiCheckBox * * @return {number} The resulting int. */ -function GuiComboBox (bounds, text, active) { +function GuiComboBox(bounds, text, active) { return r.BindGuiComboBox( bounds.x, bounds.y, @@ -10989,9 +11837,9 @@ raylib.GuiComboBox = GuiComboBox * @param {number} active * @param {boolean} editMode * - * @return {boolean} The resulting bool. + * @return {number} The resulting int. */ -function GuiDropdownBox (bounds, text, active, editMode) { +function GuiDropdownBox(bounds, text, active, editMode) { return r.BindGuiDropdownBox( bounds.x, bounds.y, @@ -11014,9 +11862,9 @@ raylib.GuiDropdownBox = GuiDropdownBox * @param {number} maxValue * @param {boolean} editMode * - * @return {boolean} The resulting bool. + * @return {number} The resulting int. */ -function GuiSpinner (bounds, text, value, minValue, maxValue, editMode) { +function GuiSpinner(bounds, text, value, minValue, maxValue, editMode) { return r.BindGuiSpinner( bounds.x, bounds.y, @@ -11041,9 +11889,9 @@ raylib.GuiSpinner = GuiSpinner * @param {number} maxValue * @param {boolean} editMode * - * @return {boolean} The resulting bool. + * @return {number} The resulting int. */ -function GuiValueBox (bounds, text, value, minValue, maxValue, editMode) { +function GuiValueBox(bounds, text, value, minValue, maxValue, editMode) { return r.BindGuiValueBox( bounds.x, bounds.y, @@ -11066,9 +11914,9 @@ raylib.GuiValueBox = GuiValueBox * @param {number} textSize * @param {boolean} editMode * - * @return {boolean} The resulting bool. + * @return {number} The resulting int. */ -function GuiTextBox (bounds, text, textSize, editMode) { +function GuiTextBox(bounds, text, textSize, editMode) { return r.BindGuiTextBox( bounds.x, bounds.y, @@ -11081,29 +11929,6 @@ function GuiTextBox (bounds, text, textSize, editMode) { } raylib.GuiTextBox = GuiTextBox -/** - * Text Box control with multiple lines - * - * @param {Rectangle} bounds - * @param {string} text - * @param {number} textSize - * @param {boolean} editMode - * - * @return {boolean} The resulting bool. - */ -function GuiTextBoxMulti (bounds, text, textSize, editMode) { - return r.BindGuiTextBoxMulti( - bounds.x, - bounds.y, - bounds.width, - bounds.height, - text, - textSize, - editMode - ) -} -raylib.GuiTextBoxMulti = GuiTextBoxMulti - /** * Slider control, returns selected value * @@ -11114,9 +11939,9 @@ raylib.GuiTextBoxMulti = GuiTextBoxMulti * @param {number} minValue * @param {number} maxValue * - * @return {number} The resulting float. + * @return {number} The resulting int. */ -function GuiSlider (bounds, textLeft, textRight, value, minValue, maxValue) { +function GuiSlider(bounds, textLeft, textRight, value, minValue, maxValue) { return r.BindGuiSlider( bounds.x, bounds.y, @@ -11141,9 +11966,9 @@ raylib.GuiSlider = GuiSlider * @param {number} minValue * @param {number} maxValue * - * @return {number} The resulting float. + * @return {number} The resulting int. */ -function GuiSliderBar (bounds, textLeft, textRight, value, minValue, maxValue) { +function GuiSliderBar(bounds, textLeft, textRight, value, minValue, maxValue) { return r.BindGuiSliderBar( bounds.x, bounds.y, @@ -11168,9 +11993,9 @@ raylib.GuiSliderBar = GuiSliderBar * @param {number} minValue * @param {number} maxValue * - * @return {number} The resulting float. + * @return {number} The resulting int. */ -function GuiProgressBar (bounds, textLeft, textRight, value, minValue, maxValue) { +function GuiProgressBar(bounds, textLeft, textRight, value, minValue, maxValue) { return r.BindGuiProgressBar( bounds.x, bounds.y, @@ -11191,9 +12016,9 @@ raylib.GuiProgressBar = GuiProgressBar * @param {Rectangle} bounds * @param {string} text * - * @return {undefined} + * @return {number} The resulting int. */ -function GuiStatusBar (bounds, text) { +function GuiStatusBar(bounds, text) { return r.BindGuiStatusBar( bounds.x, bounds.y, @@ -11210,9 +12035,9 @@ raylib.GuiStatusBar = GuiStatusBar * @param {Rectangle} bounds * @param {string} text * - * @return {undefined} + * @return {number} The resulting int. */ -function GuiDummyRec (bounds, text) { +function GuiDummyRec(bounds, text) { return r.BindGuiDummyRec( bounds.x, bounds.y, @@ -11230,10 +12055,11 @@ raylib.GuiDummyRec = GuiDummyRec * @param {string} text * @param {number} spacing * @param {number} subdivs + * @param {number} mouseCell * - * @return {Vector2} The resulting Vector2. + * @return {number} The resulting int. */ -function GuiGrid (bounds, text, spacing, subdivs) { +function GuiGrid(bounds, text, spacing, subdivs, mouseCell) { return r.BindGuiGrid( bounds.x, bounds.y, @@ -11241,7 +12067,8 @@ function GuiGrid (bounds, text, spacing, subdivs) { bounds.height, text, spacing, - subdivs + subdivs, + mouseCell ) } raylib.GuiGrid = GuiGrid @@ -11256,7 +12083,7 @@ raylib.GuiGrid = GuiGrid * * @return {number} The resulting int. */ -function GuiListView (bounds, text, scrollIndex, active) { +function GuiListView(bounds, text, scrollIndex, active) { return r.BindGuiListView( bounds.x, bounds.y, @@ -11275,13 +12102,13 @@ raylib.GuiListView = GuiListView * @param {Rectangle} bounds * @param {number} text * @param {number} count - * @param {number} focus * @param {number} scrollIndex * @param {number} active + * @param {number} focus * * @return {number} The resulting int. */ -function GuiListViewEx (bounds, text, count, focus, scrollIndex, active) { +function GuiListViewEx(bounds, text, count, scrollIndex, active, focus) { return r.BindGuiListViewEx( bounds.x, bounds.y, @@ -11289,9 +12116,9 @@ function GuiListViewEx (bounds, text, count, focus, scrollIndex, active) { bounds.height, text, count, - focus, scrollIndex, - active + active, + focus ) } raylib.GuiListViewEx = GuiListViewEx @@ -11306,7 +12133,7 @@ raylib.GuiListViewEx = GuiListViewEx * * @return {number} The resulting int. */ -function GuiMessageBox (bounds, title, message, buttons) { +function GuiMessageBox(bounds, title, message, buttons) { return r.BindGuiMessageBox( bounds.x, bounds.y, @@ -11332,7 +12159,7 @@ raylib.GuiMessageBox = GuiMessageBox * * @return {number} The resulting int. */ -function GuiTextInputBox (bounds, title, message, buttons, text, textMaxSize, secretViewActive) { +function GuiTextInputBox(bounds, title, message, buttons, text, textMaxSize, secretViewActive) { return r.BindGuiTextInputBox( bounds.x, bounds.y, @@ -11353,21 +12180,18 @@ raylib.GuiTextInputBox = GuiTextInputBox * * @param {Rectangle} bounds * @param {string} text - * @param {Color} color + * @param {number} color * - * @return {Color} The resulting Color. + * @return {number} The resulting int. */ -function GuiColorPicker (bounds, text, color) { +function GuiColorPicker(bounds, text, color) { return r.BindGuiColorPicker( bounds.x, bounds.y, bounds.width, bounds.height, text, - color.r, - color.g, - color.b, - color.a + color ) } raylib.GuiColorPicker = GuiColorPicker @@ -11377,194 +12201,105 @@ raylib.GuiColorPicker = GuiColorPicker * * @param {Rectangle} bounds * @param {string} text - * @param {Color} color + * @param {number} color * - * @return {Color} The resulting Color. + * @return {number} The resulting int. */ -function GuiColorPanel (bounds, text, color) { +function GuiColorPanel(bounds, text, color) { return r.BindGuiColorPanel( bounds.x, bounds.y, bounds.width, bounds.height, text, - color.r, - color.g, - color.b, - color.a - ) -} -raylib.GuiColorPanel = GuiColorPanel - -/** - * Color Bar Alpha control - * - * @param {Rectangle} bounds - * @param {string} text - * @param {number} alpha - * - * @return {number} The resulting float. - */ -function GuiColorBarAlpha (bounds, text, alpha) { - return r.BindGuiColorBarAlpha( - bounds.x, - bounds.y, - bounds.width, - bounds.height, - text, - alpha - ) -} -raylib.GuiColorBarAlpha = GuiColorBarAlpha - -/** - * Color Bar Hue control - * - * @param {Rectangle} bounds - * @param {string} text - * @param {number} value - * - * @return {number} The resulting float. - */ -function GuiColorBarHue (bounds, text, value) { - return r.BindGuiColorBarHue( - bounds.x, - bounds.y, - bounds.width, - bounds.height, - text, - value - ) -} -raylib.GuiColorBarHue = GuiColorBarHue - -/** - * Load style file over global style variable (.rgs) - * - * @param {string} fileName - * - * @return {undefined} - */ -function GuiLoadStyle (fileName) { - return r.BindGuiLoadStyle( - fileName - ) -} -raylib.GuiLoadStyle = GuiLoadStyle - -/** - * Load style default over global style - * - * @return {undefined} - */ -function GuiLoadStyleDefault () { - return r.BindGuiLoadStyleDefault() -} -raylib.GuiLoadStyleDefault = GuiLoadStyleDefault - -/** - * Enable gui tooltips (global state) - * - * @return {undefined} - */ -function GuiEnableTooltip () { - return r.BindGuiEnableTooltip() -} -raylib.GuiEnableTooltip = GuiEnableTooltip - -/** - * Disable gui tooltips (global state) - * - * @return {undefined} - */ -function GuiDisableTooltip () { - return r.BindGuiDisableTooltip() -} -raylib.GuiDisableTooltip = GuiDisableTooltip - -/** - * Set tooltip string - * - * @param {string} tooltip - * - * @return {undefined} - */ -function GuiSetTooltip (tooltip) { - return r.BindGuiSetTooltip( - tooltip - ) -} -raylib.GuiSetTooltip = GuiSetTooltip - -/** - * Get text with icon id prepended (if supported) - * - * @param {number} iconId - * @param {string} text - * - * @return {string} The resulting const char *. - */ -function GuiIconText (iconId, text) { - return r.BindGuiIconText( - iconId, - text + color ) } -raylib.GuiIconText = GuiIconText +raylib.GuiColorPanel = GuiColorPanel /** - * Get raygui icons data pointer + * Color Bar Alpha control * - * @return {number} The resulting unsigned int *. + * @param {Rectangle} bounds + * @param {string} text + * @param {number} alpha + * + * @return {number} The resulting int. */ -function GuiGetIcons () { - return r.BindGuiGetIcons() +function GuiColorBarAlpha(bounds, text, alpha) { + return r.BindGuiColorBarAlpha( + bounds.x, + bounds.y, + bounds.width, + bounds.height, + text, + alpha + ) } -raylib.GuiGetIcons = GuiGetIcons +raylib.GuiColorBarAlpha = GuiColorBarAlpha /** - * Load raygui icons file (.rgi) into internal icons data + * Color Bar Hue control * - * @param {string} fileName - * @param {boolean} loadIconsName + * @param {Rectangle} bounds + * @param {string} text + * @param {number} value * - * @return {number} The resulting char **. + * @return {number} The resulting int. */ -function GuiLoadIcons (fileName, loadIconsName) { - return r.BindGuiLoadIcons( - fileName, - loadIconsName +function GuiColorBarHue(bounds, text, value) { + return r.BindGuiColorBarHue( + bounds.x, + bounds.y, + bounds.width, + bounds.height, + text, + value ) } -raylib.GuiLoadIcons = GuiLoadIcons +raylib.GuiColorBarHue = GuiColorBarHue -function GuiDrawIcon (iconId, posX, posY, pixelSize, color) { - return r.BindGuiDrawIcon( - iconId, - posX, - posY, - pixelSize, - color.r, - color.g, - color.b, - color.a +/** + * Color Picker control that avoids conversion to RGB on each call (multiple color controls) + * + * @param {Rectangle} bounds + * @param {string} text + * @param {number} colorHsv + * + * @return {number} The resulting int. + */ +function GuiColorPickerHSV(bounds, text, colorHsv) { + return r.BindGuiColorPickerHSV( + bounds.x, + bounds.y, + bounds.width, + bounds.height, + text, + colorHsv ) } -raylib.GuiDrawIcon = GuiDrawIcon +raylib.GuiColorPickerHSV = GuiColorPickerHSV /** - * Set icon drawing size + * Color Panel control that returns HSV color value, used by GuiColorPickerHSV() * - * @param {number} scale + * @param {Rectangle} bounds + * @param {string} text + * @param {number} colorHsv * - * @return {undefined} + * @return {number} The resulting int. */ -function GuiSetIconScale (scale) { - return r.BindGuiSetIconScale( - scale +function GuiColorPanelHSV(bounds, text, colorHsv) { + return r.BindGuiColorPanelHSV( + bounds.x, + bounds.y, + bounds.width, + bounds.height, + text, + colorHsv ) } -raylib.GuiSetIconScale = GuiSetIconScale +raylib.GuiColorPanelHSV = GuiColorPanelHSV /** * Choose the current matrix to be transformed @@ -11573,7 +12308,7 @@ raylib.GuiSetIconScale = GuiSetIconScale * * @return {undefined} */ -function rlMatrixMode (mode) { +function rlMatrixMode(mode) { return r.BindrlMatrixMode( mode ) @@ -11585,7 +12320,7 @@ raylib.rlMatrixMode = rlMatrixMode * * @return {undefined} */ -function rlPushMatrix () { +function rlPushMatrix() { return r.BindrlPushMatrix() } raylib.rlPushMatrix = rlPushMatrix @@ -11595,7 +12330,7 @@ raylib.rlPushMatrix = rlPushMatrix * * @return {undefined} */ -function rlPopMatrix () { +function rlPopMatrix() { return r.BindrlPopMatrix() } raylib.rlPopMatrix = rlPopMatrix @@ -11605,7 +12340,7 @@ raylib.rlPopMatrix = rlPopMatrix * * @return {undefined} */ -function rlLoadIdentity () { +function rlLoadIdentity() { return r.BindrlLoadIdentity() } raylib.rlLoadIdentity = rlLoadIdentity @@ -11619,7 +12354,7 @@ raylib.rlLoadIdentity = rlLoadIdentity * * @return {undefined} */ -function rlTranslatef (x, y, z) { +function rlTranslatef(x, y, z) { return r.BindrlTranslatef( x, y, @@ -11638,7 +12373,7 @@ raylib.rlTranslatef = rlTranslatef * * @return {undefined} */ -function rlRotatef (angle, x, y, z) { +function rlRotatef(angle, x, y, z) { return r.BindrlRotatef( angle, x, @@ -11657,7 +12392,7 @@ raylib.rlRotatef = rlRotatef * * @return {undefined} */ -function rlScalef (x, y, z) { +function rlScalef(x, y, z) { return r.BindrlScalef( x, y, @@ -11673,14 +12408,14 @@ raylib.rlScalef = rlScalef * * @return {undefined} */ -function rlMultMatrixf (matf) { +function rlMultMatrixf(matf) { return r.BindrlMultMatrixf( matf ) } raylib.rlMultMatrixf = rlMultMatrixf -function rlFrustum (left, right, bottom, top, znear, zfar) { +function rlFrustum(left, right, bottom, top, znear, zfar) { return r.BindrlFrustum( left, right, @@ -11692,7 +12427,7 @@ function rlFrustum (left, right, bottom, top, znear, zfar) { } raylib.rlFrustum = rlFrustum -function rlOrtho (left, right, bottom, top, znear, zfar) { +function rlOrtho(left, right, bottom, top, znear, zfar) { return r.BindrlOrtho( left, right, @@ -11714,7 +12449,7 @@ raylib.rlOrtho = rlOrtho * * @return {undefined} */ -function rlViewport (x, y, width, height) { +function rlViewport(x, y, width, height) { return r.BindrlViewport( x, y, @@ -11731,7 +12466,7 @@ raylib.rlViewport = rlViewport * * @return {undefined} */ -function rlBegin (mode) { +function rlBegin(mode) { return r.BindrlBegin( mode ) @@ -11743,7 +12478,7 @@ raylib.rlBegin = rlBegin * * @return {undefined} */ -function rlEnd () { +function rlEnd() { return r.BindrlEnd() } raylib.rlEnd = rlEnd @@ -11756,7 +12491,7 @@ raylib.rlEnd = rlEnd * * @return {undefined} */ -function rlVertex2i (x, y) { +function rlVertex2i(x, y) { return r.BindrlVertex2i( x, y @@ -11772,7 +12507,7 @@ raylib.rlVertex2i = rlVertex2i * * @return {undefined} */ -function rlVertex2f (x, y) { +function rlVertex2f(x, y) { return r.BindrlVertex2f( x, y @@ -11789,7 +12524,7 @@ raylib.rlVertex2f = rlVertex2f * * @return {undefined} */ -function rlVertex3f (x, y, z) { +function rlVertex3f(x, y, z) { return r.BindrlVertex3f( x, y, @@ -11806,7 +12541,7 @@ raylib.rlVertex3f = rlVertex3f * * @return {undefined} */ -function rlTexCoord2f (x, y) { +function rlTexCoord2f(x, y) { return r.BindrlTexCoord2f( x, y @@ -11823,7 +12558,7 @@ raylib.rlTexCoord2f = rlTexCoord2f * * @return {undefined} */ -function rlNormal3f (x, y, z) { +function rlNormal3f(x, y, z) { return r.BindrlNormal3f( x, y, @@ -11842,7 +12577,7 @@ raylib.rlNormal3f = rlNormal3f * * @return {undefined} */ -function rlColor4ub (r, g, b, a) { +function rlColor4ub(r, g, b, a) { return r.BindrlColor4ub( r, g, @@ -11861,7 +12596,7 @@ raylib.rlColor4ub = rlColor4ub * * @return {undefined} */ -function rlColor3f (x, y, z) { +function rlColor3f(x, y, z) { return r.BindrlColor3f( x, y, @@ -11880,7 +12615,7 @@ raylib.rlColor3f = rlColor3f * * @return {undefined} */ -function rlColor4f (x, y, z, w) { +function rlColor4f(x, y, z, w) { return r.BindrlColor4f( x, y, @@ -11897,7 +12632,7 @@ raylib.rlColor4f = rlColor4f * * @return {boolean} The resulting bool. */ -function rlEnableVertexArray (vaoId) { +function rlEnableVertexArray(vaoId) { return r.BindrlEnableVertexArray( vaoId ) @@ -11909,7 +12644,7 @@ raylib.rlEnableVertexArray = rlEnableVertexArray * * @return {undefined} */ -function rlDisableVertexArray () { +function rlDisableVertexArray() { return r.BindrlDisableVertexArray() } raylib.rlDisableVertexArray = rlDisableVertexArray @@ -11921,7 +12656,7 @@ raylib.rlDisableVertexArray = rlDisableVertexArray * * @return {undefined} */ -function rlEnableVertexBuffer (id) { +function rlEnableVertexBuffer(id) { return r.BindrlEnableVertexBuffer( id ) @@ -11933,7 +12668,7 @@ raylib.rlEnableVertexBuffer = rlEnableVertexBuffer * * @return {undefined} */ -function rlDisableVertexBuffer () { +function rlDisableVertexBuffer() { return r.BindrlDisableVertexBuffer() } raylib.rlDisableVertexBuffer = rlDisableVertexBuffer @@ -11945,7 +12680,7 @@ raylib.rlDisableVertexBuffer = rlDisableVertexBuffer * * @return {undefined} */ -function rlEnableVertexBufferElement (id) { +function rlEnableVertexBufferElement(id) { return r.BindrlEnableVertexBufferElement( id ) @@ -11957,7 +12692,7 @@ raylib.rlEnableVertexBufferElement = rlEnableVertexBufferElement * * @return {undefined} */ -function rlDisableVertexBufferElement () { +function rlDisableVertexBufferElement() { return r.BindrlDisableVertexBufferElement() } raylib.rlDisableVertexBufferElement = rlDisableVertexBufferElement @@ -11969,7 +12704,7 @@ raylib.rlDisableVertexBufferElement = rlDisableVertexBufferElement * * @return {undefined} */ -function rlEnableVertexAttribute (index) { +function rlEnableVertexAttribute(index) { return r.BindrlEnableVertexAttribute( index ) @@ -11983,7 +12718,7 @@ raylib.rlEnableVertexAttribute = rlEnableVertexAttribute * * @return {undefined} */ -function rlDisableVertexAttribute (index) { +function rlDisableVertexAttribute(index) { return r.BindrlDisableVertexAttribute( index ) @@ -11997,7 +12732,7 @@ raylib.rlDisableVertexAttribute = rlDisableVertexAttribute * * @return {undefined} */ -function rlActiveTextureSlot (slot) { +function rlActiveTextureSlot(slot) { return r.BindrlActiveTextureSlot( slot ) @@ -12011,7 +12746,7 @@ raylib.rlActiveTextureSlot = rlActiveTextureSlot * * @return {undefined} */ -function rlEnableTexture (id) { +function rlEnableTexture(id) { return r.BindrlEnableTexture( id ) @@ -12023,7 +12758,7 @@ raylib.rlEnableTexture = rlEnableTexture * * @return {undefined} */ -function rlDisableTexture () { +function rlDisableTexture() { return r.BindrlDisableTexture() } raylib.rlDisableTexture = rlDisableTexture @@ -12035,7 +12770,7 @@ raylib.rlDisableTexture = rlDisableTexture * * @return {undefined} */ -function rlEnableTextureCubemap (id) { +function rlEnableTextureCubemap(id) { return r.BindrlEnableTextureCubemap( id ) @@ -12047,7 +12782,7 @@ raylib.rlEnableTextureCubemap = rlEnableTextureCubemap * * @return {undefined} */ -function rlDisableTextureCubemap () { +function rlDisableTextureCubemap() { return r.BindrlDisableTextureCubemap() } raylib.rlDisableTextureCubemap = rlDisableTextureCubemap @@ -12061,7 +12796,7 @@ raylib.rlDisableTextureCubemap = rlDisableTextureCubemap * * @return {undefined} */ -function rlTextureParameters (id, param, value) { +function rlTextureParameters(id, param, value) { return r.BindrlTextureParameters( id, param, @@ -12079,7 +12814,7 @@ raylib.rlTextureParameters = rlTextureParameters * * @return {undefined} */ -function rlCubemapParameters (id, param, value) { +function rlCubemapParameters(id, param, value) { return r.BindrlCubemapParameters( id, param, @@ -12095,7 +12830,7 @@ raylib.rlCubemapParameters = rlCubemapParameters * * @return {undefined} */ -function rlEnableShader (id) { +function rlEnableShader(id) { return r.BindrlEnableShader( id ) @@ -12107,7 +12842,7 @@ raylib.rlEnableShader = rlEnableShader * * @return {undefined} */ -function rlDisableShader () { +function rlDisableShader() { return r.BindrlDisableShader() } raylib.rlDisableShader = rlDisableShader @@ -12119,7 +12854,7 @@ raylib.rlDisableShader = rlDisableShader * * @return {undefined} */ -function rlEnableFramebuffer (id) { +function rlEnableFramebuffer(id) { return r.BindrlEnableFramebuffer( id ) @@ -12131,7 +12866,7 @@ raylib.rlEnableFramebuffer = rlEnableFramebuffer * * @return {undefined} */ -function rlDisableFramebuffer () { +function rlDisableFramebuffer() { return r.BindrlDisableFramebuffer() } raylib.rlDisableFramebuffer = rlDisableFramebuffer @@ -12143,19 +12878,49 @@ raylib.rlDisableFramebuffer = rlDisableFramebuffer * * @return {undefined} */ -function rlActiveDrawBuffers (count) { +function rlActiveDrawBuffers(count) { return r.BindrlActiveDrawBuffers( count ) } raylib.rlActiveDrawBuffers = rlActiveDrawBuffers +/** + * Blit active framebuffer to main framebuffer + * + * @param {number} srcX + * @param {number} srcY + * @param {number} srcWidth + * @param {number} srcHeight + * @param {number} dstX + * @param {number} dstY + * @param {number} dstWidth + * @param {number} dstHeight + * @param {number} bufferMask + * + * @return {undefined} + */ +function rlBlitFramebuffer(srcX, srcY, srcWidth, srcHeight, dstX, dstY, dstWidth, dstHeight, bufferMask) { + return r.BindrlBlitFramebuffer( + srcX, + srcY, + srcWidth, + srcHeight, + dstX, + dstY, + dstWidth, + dstHeight, + bufferMask + ) +} +raylib.rlBlitFramebuffer = rlBlitFramebuffer + /** * Enable color blending * * @return {undefined} */ -function rlEnableColorBlend () { +function rlEnableColorBlend() { return r.BindrlEnableColorBlend() } raylib.rlEnableColorBlend = rlEnableColorBlend @@ -12165,7 +12930,7 @@ raylib.rlEnableColorBlend = rlEnableColorBlend * * @return {undefined} */ -function rlDisableColorBlend () { +function rlDisableColorBlend() { return r.BindrlDisableColorBlend() } raylib.rlDisableColorBlend = rlDisableColorBlend @@ -12175,7 +12940,7 @@ raylib.rlDisableColorBlend = rlDisableColorBlend * * @return {undefined} */ -function rlEnableDepthTest () { +function rlEnableDepthTest() { return r.BindrlEnableDepthTest() } raylib.rlEnableDepthTest = rlEnableDepthTest @@ -12185,7 +12950,7 @@ raylib.rlEnableDepthTest = rlEnableDepthTest * * @return {undefined} */ -function rlDisableDepthTest () { +function rlDisableDepthTest() { return r.BindrlDisableDepthTest() } raylib.rlDisableDepthTest = rlDisableDepthTest @@ -12195,7 +12960,7 @@ raylib.rlDisableDepthTest = rlDisableDepthTest * * @return {undefined} */ -function rlEnableDepthMask () { +function rlEnableDepthMask() { return r.BindrlEnableDepthMask() } raylib.rlEnableDepthMask = rlEnableDepthMask @@ -12205,7 +12970,7 @@ raylib.rlEnableDepthMask = rlEnableDepthMask * * @return {undefined} */ -function rlDisableDepthMask () { +function rlDisableDepthMask() { return r.BindrlDisableDepthMask() } raylib.rlDisableDepthMask = rlDisableDepthMask @@ -12215,7 +12980,7 @@ raylib.rlDisableDepthMask = rlDisableDepthMask * * @return {undefined} */ -function rlEnableBackfaceCulling () { +function rlEnableBackfaceCulling() { return r.BindrlEnableBackfaceCulling() } raylib.rlEnableBackfaceCulling = rlEnableBackfaceCulling @@ -12225,7 +12990,7 @@ raylib.rlEnableBackfaceCulling = rlEnableBackfaceCulling * * @return {undefined} */ -function rlDisableBackfaceCulling () { +function rlDisableBackfaceCulling() { return r.BindrlDisableBackfaceCulling() } raylib.rlDisableBackfaceCulling = rlDisableBackfaceCulling @@ -12237,7 +13002,7 @@ raylib.rlDisableBackfaceCulling = rlDisableBackfaceCulling * * @return {undefined} */ -function rlSetCullFace (mode) { +function rlSetCullFace(mode) { return r.BindrlSetCullFace( mode ) @@ -12249,7 +13014,7 @@ raylib.rlSetCullFace = rlSetCullFace * * @return {undefined} */ -function rlEnableScissorTest () { +function rlEnableScissorTest() { return r.BindrlEnableScissorTest() } raylib.rlEnableScissorTest = rlEnableScissorTest @@ -12259,7 +13024,7 @@ raylib.rlEnableScissorTest = rlEnableScissorTest * * @return {undefined} */ -function rlDisableScissorTest () { +function rlDisableScissorTest() { return r.BindrlDisableScissorTest() } raylib.rlDisableScissorTest = rlDisableScissorTest @@ -12274,7 +13039,7 @@ raylib.rlDisableScissorTest = rlDisableScissorTest * * @return {undefined} */ -function rlScissor (x, y, width, height) { +function rlScissor(x, y, width, height) { return r.BindrlScissor( x, y, @@ -12289,17 +13054,27 @@ raylib.rlScissor = rlScissor * * @return {undefined} */ -function rlEnableWireMode () { +function rlEnableWireMode() { return r.BindrlEnableWireMode() } raylib.rlEnableWireMode = rlEnableWireMode /** - * Disable wire mode + * Enable point mode + * + * @return {undefined} + */ +function rlEnablePointMode() { + return r.BindrlEnablePointMode() +} +raylib.rlEnablePointMode = rlEnablePointMode + +/** + * Disable wire mode ( and point ) maybe rename * * @return {undefined} */ -function rlDisableWireMode () { +function rlDisableWireMode() { return r.BindrlDisableWireMode() } raylib.rlDisableWireMode = rlDisableWireMode @@ -12311,7 +13086,7 @@ raylib.rlDisableWireMode = rlDisableWireMode * * @return {undefined} */ -function rlSetLineWidth (width) { +function rlSetLineWidth(width) { return r.BindrlSetLineWidth( width ) @@ -12323,7 +13098,7 @@ raylib.rlSetLineWidth = rlSetLineWidth * * @return {number} The resulting float. */ -function rlGetLineWidth () { +function rlGetLineWidth() { return r.BindrlGetLineWidth() } raylib.rlGetLineWidth = rlGetLineWidth @@ -12333,7 +13108,7 @@ raylib.rlGetLineWidth = rlGetLineWidth * * @return {undefined} */ -function rlEnableSmoothLines () { +function rlEnableSmoothLines() { return r.BindrlEnableSmoothLines() } raylib.rlEnableSmoothLines = rlEnableSmoothLines @@ -12343,7 +13118,7 @@ raylib.rlEnableSmoothLines = rlEnableSmoothLines * * @return {undefined} */ -function rlDisableSmoothLines () { +function rlDisableSmoothLines() { return r.BindrlDisableSmoothLines() } raylib.rlDisableSmoothLines = rlDisableSmoothLines @@ -12353,7 +13128,7 @@ raylib.rlDisableSmoothLines = rlDisableSmoothLines * * @return {undefined} */ -function rlEnableStereoRender () { +function rlEnableStereoRender() { return r.BindrlEnableStereoRender() } raylib.rlEnableStereoRender = rlEnableStereoRender @@ -12363,7 +13138,7 @@ raylib.rlEnableStereoRender = rlEnableStereoRender * * @return {undefined} */ -function rlDisableStereoRender () { +function rlDisableStereoRender() { return r.BindrlDisableStereoRender() } raylib.rlDisableStereoRender = rlDisableStereoRender @@ -12373,7 +13148,7 @@ raylib.rlDisableStereoRender = rlDisableStereoRender * * @return {boolean} The resulting bool. */ -function rlIsStereoRenderEnabled () { +function rlIsStereoRenderEnabled() { return r.BindrlIsStereoRenderEnabled() } raylib.rlIsStereoRenderEnabled = rlIsStereoRenderEnabled @@ -12388,7 +13163,7 @@ raylib.rlIsStereoRenderEnabled = rlIsStereoRenderEnabled * * @return {undefined} */ -function rlClearColor (r, g, b, a) { +function rlClearColor(r, g, b, a) { return r.BindrlClearColor( r, g, @@ -12403,7 +13178,7 @@ raylib.rlClearColor = rlClearColor * * @return {undefined} */ -function rlClearScreenBuffers () { +function rlClearScreenBuffers() { return r.BindrlClearScreenBuffers() } raylib.rlClearScreenBuffers = rlClearScreenBuffers @@ -12413,7 +13188,7 @@ raylib.rlClearScreenBuffers = rlClearScreenBuffers * * @return {undefined} */ -function rlCheckErrors () { +function rlCheckErrors() { return r.BindrlCheckErrors() } raylib.rlCheckErrors = rlCheckErrors @@ -12425,7 +13200,7 @@ raylib.rlCheckErrors = rlCheckErrors * * @return {undefined} */ -function rlSetBlendMode (mode) { +function rlSetBlendMode(mode) { return r.BindrlSetBlendMode( mode ) @@ -12441,7 +13216,7 @@ raylib.rlSetBlendMode = rlSetBlendMode * * @return {undefined} */ -function rlSetBlendFactors (glSrcFactor, glDstFactor, glEquation) { +function rlSetBlendFactors(glSrcFactor, glDstFactor, glEquation) { return r.BindrlSetBlendFactors( glSrcFactor, glDstFactor, @@ -12462,7 +13237,7 @@ raylib.rlSetBlendFactors = rlSetBlendFactors * * @return {undefined} */ -function rlSetBlendFactorsSeparate (glSrcRGB, glDstRGB, glSrcAlpha, glDstAlpha, glEqRGB, glEqAlpha) { +function rlSetBlendFactorsSeparate(glSrcRGB, glDstRGB, glSrcAlpha, glDstAlpha, glEqRGB, glEqAlpha) { return r.BindrlSetBlendFactorsSeparate( glSrcRGB, glDstRGB, @@ -12482,7 +13257,7 @@ raylib.rlSetBlendFactorsSeparate = rlSetBlendFactorsSeparate * * @return {undefined} */ -function rlglInit (width, height) { +function rlglInit(width, height) { return r.BindrlglInit( width, height @@ -12495,7 +13270,7 @@ raylib.rlglInit = rlglInit * * @return {undefined} */ -function rlglClose () { +function rlglClose() { return r.BindrlglClose() } raylib.rlglClose = rlglClose @@ -12507,7 +13282,7 @@ raylib.rlglClose = rlglClose * * @return {undefined} */ -function rlLoadExtensions (loader) { +function rlLoadExtensions(loader) { return r.BindrlLoadExtensions( loader ) @@ -12519,7 +13294,7 @@ raylib.rlLoadExtensions = rlLoadExtensions * * @return {number} The resulting int. */ -function rlGetVersion () { +function rlGetVersion() { return r.BindrlGetVersion() } raylib.rlGetVersion = rlGetVersion @@ -12531,7 +13306,7 @@ raylib.rlGetVersion = rlGetVersion * * @return {undefined} */ -function rlSetFramebufferWidth (width) { +function rlSetFramebufferWidth(width) { return r.BindrlSetFramebufferWidth( width ) @@ -12543,7 +13318,7 @@ raylib.rlSetFramebufferWidth = rlSetFramebufferWidth * * @return {number} The resulting int. */ -function rlGetFramebufferWidth () { +function rlGetFramebufferWidth() { return r.BindrlGetFramebufferWidth() } raylib.rlGetFramebufferWidth = rlGetFramebufferWidth @@ -12555,7 +13330,7 @@ raylib.rlGetFramebufferWidth = rlGetFramebufferWidth * * @return {undefined} */ -function rlSetFramebufferHeight (height) { +function rlSetFramebufferHeight(height) { return r.BindrlSetFramebufferHeight( height ) @@ -12567,7 +13342,7 @@ raylib.rlSetFramebufferHeight = rlSetFramebufferHeight * * @return {number} The resulting int. */ -function rlGetFramebufferHeight () { +function rlGetFramebufferHeight() { return r.BindrlGetFramebufferHeight() } raylib.rlGetFramebufferHeight = rlGetFramebufferHeight @@ -12577,7 +13352,7 @@ raylib.rlGetFramebufferHeight = rlGetFramebufferHeight * * @return {number} The resulting unsigned int. */ -function rlGetTextureIdDefault () { +function rlGetTextureIdDefault() { return r.BindrlGetTextureIdDefault() } raylib.rlGetTextureIdDefault = rlGetTextureIdDefault @@ -12587,7 +13362,7 @@ raylib.rlGetTextureIdDefault = rlGetTextureIdDefault * * @return {number} The resulting unsigned int. */ -function rlGetShaderIdDefault () { +function rlGetShaderIdDefault() { return r.BindrlGetShaderIdDefault() } raylib.rlGetShaderIdDefault = rlGetShaderIdDefault @@ -12597,7 +13372,7 @@ raylib.rlGetShaderIdDefault = rlGetShaderIdDefault * * @return {number} The resulting int *. */ -function rlGetShaderLocsDefault () { +function rlGetShaderLocsDefault() { return r.BindrlGetShaderLocsDefault() } raylib.rlGetShaderLocsDefault = rlGetShaderLocsDefault @@ -12610,7 +13385,7 @@ raylib.rlGetShaderLocsDefault = rlGetShaderLocsDefault * * @return {rlRenderBatch} The resulting rlRenderBatch. */ -function rlLoadRenderBatch (numBuffers, bufferElements) { +function rlLoadRenderBatch(numBuffers, bufferElements) { return r.BindrlLoadRenderBatch( numBuffers, bufferElements @@ -12625,7 +13400,7 @@ raylib.rlLoadRenderBatch = rlLoadRenderBatch * * @return {undefined} */ -function rlUnloadRenderBatch (batch) { +function rlUnloadRenderBatch(batch) { return r.BindrlUnloadRenderBatch( batch.bufferCount, batch.currentBuffer, @@ -12644,7 +13419,7 @@ raylib.rlUnloadRenderBatch = rlUnloadRenderBatch * * @return {undefined} */ -function rlDrawRenderBatch (batch) { +function rlDrawRenderBatch(batch) { return r.BindrlDrawRenderBatch( batch ) @@ -12658,7 +13433,7 @@ raylib.rlDrawRenderBatch = rlDrawRenderBatch * * @return {undefined} */ -function rlSetRenderBatchActive (batch) { +function rlSetRenderBatchActive(batch) { return r.BindrlSetRenderBatchActive( batch ) @@ -12670,7 +13445,7 @@ raylib.rlSetRenderBatchActive = rlSetRenderBatchActive * * @return {undefined} */ -function rlDrawRenderBatchActive () { +function rlDrawRenderBatchActive() { return r.BindrlDrawRenderBatchActive() } raylib.rlDrawRenderBatchActive = rlDrawRenderBatchActive @@ -12682,7 +13457,7 @@ raylib.rlDrawRenderBatchActive = rlDrawRenderBatchActive * * @return {boolean} The resulting bool. */ -function rlCheckRenderBatchLimit (vCount) { +function rlCheckRenderBatchLimit(vCount) { return r.BindrlCheckRenderBatchLimit( vCount ) @@ -12696,7 +13471,7 @@ raylib.rlCheckRenderBatchLimit = rlCheckRenderBatchLimit * * @return {undefined} */ -function rlSetTexture (id) { +function rlSetTexture(id) { return r.BindrlSetTexture( id ) @@ -12708,7 +13483,7 @@ raylib.rlSetTexture = rlSetTexture * * @return {number} The resulting unsigned int. */ -function rlLoadVertexArray () { +function rlLoadVertexArray() { return r.BindrlLoadVertexArray() } raylib.rlLoadVertexArray = rlLoadVertexArray @@ -12722,7 +13497,7 @@ raylib.rlLoadVertexArray = rlLoadVertexArray * * @return {number} The resulting unsigned int. */ -function rlLoadVertexBuffer (buffer, size, dynamic) { +function rlLoadVertexBuffer(buffer, size, dynamic) { return r.BindrlLoadVertexBuffer( buffer, size, @@ -12740,7 +13515,7 @@ raylib.rlLoadVertexBuffer = rlLoadVertexBuffer * * @return {number} The resulting unsigned int. */ -function rlLoadVertexBufferElement (buffer, size, dynamic) { +function rlLoadVertexBufferElement(buffer, size, dynamic) { return r.BindrlLoadVertexBufferElement( buffer, size, @@ -12759,7 +13534,7 @@ raylib.rlLoadVertexBufferElement = rlLoadVertexBufferElement * * @return {undefined} */ -function rlUpdateVertexBuffer (bufferId, data, dataSize, offset) { +function rlUpdateVertexBuffer(bufferId, data, dataSize, offset) { return r.BindrlUpdateVertexBuffer( bufferId, data, @@ -12779,7 +13554,7 @@ raylib.rlUpdateVertexBuffer = rlUpdateVertexBuffer * * @return {undefined} */ -function rlUpdateVertexBufferElements (id, data, dataSize, offset) { +function rlUpdateVertexBufferElements(id, data, dataSize, offset) { return r.BindrlUpdateVertexBufferElements( id, data, @@ -12789,21 +13564,21 @@ function rlUpdateVertexBufferElements (id, data, dataSize, offset) { } raylib.rlUpdateVertexBufferElements = rlUpdateVertexBufferElements -function rlUnloadVertexArray (vaoId) { +function rlUnloadVertexArray(vaoId) { return r.BindrlUnloadVertexArray( vaoId ) } raylib.rlUnloadVertexArray = rlUnloadVertexArray -function rlUnloadVertexBuffer (vboId) { +function rlUnloadVertexBuffer(vboId) { return r.BindrlUnloadVertexBuffer( vboId ) } raylib.rlUnloadVertexBuffer = rlUnloadVertexBuffer -function rlSetVertexAttribute (index, compSize, type, normalized, stride, pointer) { +function rlSetVertexAttribute(index, compSize, type, normalized, stride, pointer) { return r.BindrlSetVertexAttribute( index, compSize, @@ -12815,7 +13590,7 @@ function rlSetVertexAttribute (index, compSize, type, normalized, stride, pointe } raylib.rlSetVertexAttribute = rlSetVertexAttribute -function rlSetVertexAttributeDivisor (index, divisor) { +function rlSetVertexAttributeDivisor(index, divisor) { return r.BindrlSetVertexAttributeDivisor( index, divisor @@ -12833,7 +13608,7 @@ raylib.rlSetVertexAttributeDivisor = rlSetVertexAttributeDivisor * * @return {undefined} */ -function rlSetVertexAttributeDefault (locIndex, value, attribType, count) { +function rlSetVertexAttributeDefault(locIndex, value, attribType, count) { return r.BindrlSetVertexAttributeDefault( locIndex, value, @@ -12843,7 +13618,7 @@ function rlSetVertexAttributeDefault (locIndex, value, attribType, count) { } raylib.rlSetVertexAttributeDefault = rlSetVertexAttributeDefault -function rlDrawVertexArray (offset, count) { +function rlDrawVertexArray(offset, count) { return r.BindrlDrawVertexArray( offset, count @@ -12851,7 +13626,7 @@ function rlDrawVertexArray (offset, count) { } raylib.rlDrawVertexArray = rlDrawVertexArray -function rlDrawVertexArrayElements (offset, count, buffer) { +function rlDrawVertexArrayElements(offset, count, buffer) { return r.BindrlDrawVertexArrayElements( offset, count, @@ -12860,7 +13635,7 @@ function rlDrawVertexArrayElements (offset, count, buffer) { } raylib.rlDrawVertexArrayElements = rlDrawVertexArrayElements -function rlDrawVertexArrayInstanced (offset, count, instances) { +function rlDrawVertexArrayInstanced(offset, count, instances) { return r.BindrlDrawVertexArrayInstanced( offset, count, @@ -12869,7 +13644,7 @@ function rlDrawVertexArrayInstanced (offset, count, instances) { } raylib.rlDrawVertexArrayInstanced = rlDrawVertexArrayInstanced -function rlDrawVertexArrayElementsInstanced (offset, count, buffer, instances) { +function rlDrawVertexArrayElementsInstanced(offset, count, buffer, instances) { return r.BindrlDrawVertexArrayElementsInstanced( offset, count, @@ -12890,7 +13665,7 @@ raylib.rlDrawVertexArrayElementsInstanced = rlDrawVertexArrayElementsInstanced * * @return {number} The resulting unsigned int. */ -function rlLoadTexture (data, width, height, format, mipmapCount) { +function rlLoadTexture(data, width, height, format, mipmapCount) { return r.BindrlLoadTexture( data, width, @@ -12910,7 +13685,7 @@ raylib.rlLoadTexture = rlLoadTexture * * @return {number} The resulting unsigned int. */ -function rlLoadTextureDepth (width, height, useRenderBuffer) { +function rlLoadTextureDepth(width, height, useRenderBuffer) { return r.BindrlLoadTextureDepth( width, height, @@ -12928,7 +13703,7 @@ raylib.rlLoadTextureDepth = rlLoadTextureDepth * * @return {number} The resulting unsigned int. */ -function rlLoadTextureCubemap (data, size, format) { +function rlLoadTextureCubemap(data, size, format) { return r.BindrlLoadTextureCubemap( data, size, @@ -12950,7 +13725,7 @@ raylib.rlLoadTextureCubemap = rlLoadTextureCubemap * * @return {undefined} */ -function rlUpdateTexture (id, offsetX, offsetY, width, height, format, data) { +function rlUpdateTexture(id, offsetX, offsetY, width, height, format, data) { return r.BindrlUpdateTexture( id, offsetX, @@ -12973,7 +13748,7 @@ raylib.rlUpdateTexture = rlUpdateTexture * * @return {undefined} */ -function rlGetGlTextureFormats (format, glInternalFormat, glFormat, glType) { +function rlGetGlTextureFormats(format, glInternalFormat, glFormat, glType) { return r.BindrlGetGlTextureFormats( format, glInternalFormat, @@ -12990,7 +13765,7 @@ raylib.rlGetGlTextureFormats = rlGetGlTextureFormats * * @return {string} The resulting const char *. */ -function rlGetPixelFormatName (format) { +function rlGetPixelFormatName(format) { return r.BindrlGetPixelFormatName( format ) @@ -13004,7 +13779,7 @@ raylib.rlGetPixelFormatName = rlGetPixelFormatName * * @return {undefined} */ -function rlUnloadTexture (id) { +function rlUnloadTexture(id) { return r.BindrlUnloadTexture( id ) @@ -13022,7 +13797,7 @@ raylib.rlUnloadTexture = rlUnloadTexture * * @return {undefined} */ -function rlGenTextureMipmaps (id, width, height, format, mipmaps) { +function rlGenTextureMipmaps(id, width, height, format, mipmaps) { return r.BindrlGenTextureMipmaps( id, width, @@ -13043,7 +13818,7 @@ raylib.rlGenTextureMipmaps = rlGenTextureMipmaps * * @return {number} The resulting void *. */ -function rlReadTexturePixels (id, width, height, format) { +function rlReadTexturePixels(id, width, height, format) { return r.BindrlReadTexturePixels( id, width, @@ -13061,7 +13836,7 @@ raylib.rlReadTexturePixels = rlReadTexturePixels * * @return {Buffer} The resulting unsigned char *. */ -function rlReadScreenPixels (width, height) { +function rlReadScreenPixels(width, height) { return r.BindrlReadScreenPixels( width, height @@ -13077,7 +13852,7 @@ raylib.rlReadScreenPixels = rlReadScreenPixels * * @return {number} The resulting unsigned int. */ -function rlLoadFramebuffer (width, height) { +function rlLoadFramebuffer(width, height) { return r.BindrlLoadFramebuffer( width, height @@ -13096,7 +13871,7 @@ raylib.rlLoadFramebuffer = rlLoadFramebuffer * * @return {undefined} */ -function rlFramebufferAttach (fboId, texId, attachType, texType, mipLevel) { +function rlFramebufferAttach(fboId, texId, attachType, texType, mipLevel) { return r.BindrlFramebufferAttach( fboId, texId, @@ -13114,7 +13889,7 @@ raylib.rlFramebufferAttach = rlFramebufferAttach * * @return {boolean} The resulting bool. */ -function rlFramebufferComplete (id) { +function rlFramebufferComplete(id) { return r.BindrlFramebufferComplete( id ) @@ -13128,7 +13903,7 @@ raylib.rlFramebufferComplete = rlFramebufferComplete * * @return {undefined} */ -function rlUnloadFramebuffer (id) { +function rlUnloadFramebuffer(id) { return r.BindrlUnloadFramebuffer( id ) @@ -13143,7 +13918,7 @@ raylib.rlUnloadFramebuffer = rlUnloadFramebuffer * * @return {number} The resulting unsigned int. */ -function rlLoadShaderCode (vsCode, fsCode) { +function rlLoadShaderCode(vsCode, fsCode) { return r.BindrlLoadShaderCode( vsCode, fsCode @@ -13159,7 +13934,7 @@ raylib.rlLoadShaderCode = rlLoadShaderCode * * @return {number} The resulting unsigned int. */ -function rlCompileShader (shaderCode, type) { +function rlCompileShader(shaderCode, type) { return r.BindrlCompileShader( shaderCode, type @@ -13175,7 +13950,7 @@ raylib.rlCompileShader = rlCompileShader * * @return {number} The resulting unsigned int. */ -function rlLoadShaderProgram (vShaderId, fShaderId) { +function rlLoadShaderProgram(vShaderId, fShaderId) { return r.BindrlLoadShaderProgram( vShaderId, fShaderId @@ -13190,7 +13965,7 @@ raylib.rlLoadShaderProgram = rlLoadShaderProgram * * @return {undefined} */ -function rlUnloadShaderProgram (id) { +function rlUnloadShaderProgram(id) { return r.BindrlUnloadShaderProgram( id ) @@ -13205,7 +13980,7 @@ raylib.rlUnloadShaderProgram = rlUnloadShaderProgram * * @return {number} The resulting int. */ -function rlGetLocationUniform (shaderId, uniformName) { +function rlGetLocationUniform(shaderId, uniformName) { return r.BindrlGetLocationUniform( shaderId, uniformName @@ -13221,7 +13996,7 @@ raylib.rlGetLocationUniform = rlGetLocationUniform * * @return {number} The resulting int. */ -function rlGetLocationAttrib (shaderId, attribName) { +function rlGetLocationAttrib(shaderId, attribName) { return r.BindrlGetLocationAttrib( shaderId, attribName @@ -13239,7 +14014,7 @@ raylib.rlGetLocationAttrib = rlGetLocationAttrib * * @return {undefined} */ -function rlSetUniform (locIndex, value, uniformType, count) { +function rlSetUniform(locIndex, value, uniformType, count) { return r.BindrlSetUniform( locIndex, value, @@ -13257,7 +14032,7 @@ raylib.rlSetUniform = rlSetUniform * * @return {undefined} */ -function rlSetUniformMatrix (locIndex, mat) { +function rlSetUniformMatrix(locIndex, mat) { return r.BindrlSetUniformMatrix( locIndex, mat.m0, @@ -13288,7 +14063,7 @@ raylib.rlSetUniformMatrix = rlSetUniformMatrix * * @return {undefined} */ -function rlSetUniformSampler (locIndex, textureId) { +function rlSetUniformSampler(locIndex, textureId) { return r.BindrlSetUniformSampler( locIndex, textureId @@ -13304,7 +14079,7 @@ raylib.rlSetUniformSampler = rlSetUniformSampler * * @return {undefined} */ -function rlSetShader (id, locs) { +function rlSetShader(id, locs) { return r.BindrlSetShader( id, locs @@ -13319,7 +14094,7 @@ raylib.rlSetShader = rlSetShader * * @return {number} The resulting unsigned int. */ -function rlLoadComputeShaderProgram (shaderId) { +function rlLoadComputeShaderProgram(shaderId) { return r.BindrlLoadComputeShaderProgram( shaderId ) @@ -13335,7 +14110,7 @@ raylib.rlLoadComputeShaderProgram = rlLoadComputeShaderProgram * * @return {undefined} */ -function rlComputeShaderDispatch (groupX, groupY, groupZ) { +function rlComputeShaderDispatch(groupX, groupY, groupZ) { return r.BindrlComputeShaderDispatch( groupX, groupY, @@ -13353,7 +14128,7 @@ raylib.rlComputeShaderDispatch = rlComputeShaderDispatch * * @return {number} The resulting unsigned int. */ -function rlLoadShaderBuffer (size, data, usageHint) { +function rlLoadShaderBuffer(size, data, usageHint) { return r.BindrlLoadShaderBuffer( size, data, @@ -13369,7 +14144,7 @@ raylib.rlLoadShaderBuffer = rlLoadShaderBuffer * * @return {undefined} */ -function rlUnloadShaderBuffer (ssboId) { +function rlUnloadShaderBuffer(ssboId) { return r.BindrlUnloadShaderBuffer( ssboId ) @@ -13386,7 +14161,7 @@ raylib.rlUnloadShaderBuffer = rlUnloadShaderBuffer * * @return {undefined} */ -function rlUpdateShaderBuffer (id, data, dataSize, offset) { +function rlUpdateShaderBuffer(id, data, dataSize, offset) { return r.BindrlUpdateShaderBuffer( id, data, @@ -13404,7 +14179,7 @@ raylib.rlUpdateShaderBuffer = rlUpdateShaderBuffer * * @return {undefined} */ -function rlBindShaderBuffer (id, index) { +function rlBindShaderBuffer(id, index) { return r.BindrlBindShaderBuffer( id, index @@ -13422,7 +14197,7 @@ raylib.rlBindShaderBuffer = rlBindShaderBuffer * * @return {undefined} */ -function rlReadShaderBuffer (id, dest, count, offset) { +function rlReadShaderBuffer(id, dest, count, offset) { return r.BindrlReadShaderBuffer( id, dest, @@ -13443,7 +14218,7 @@ raylib.rlReadShaderBuffer = rlReadShaderBuffer * * @return {undefined} */ -function rlCopyShaderBuffer (destId, srcId, destOffset, srcOffset, count) { +function rlCopyShaderBuffer(destId, srcId, destOffset, srcOffset, count) { return r.BindrlCopyShaderBuffer( destId, srcId, @@ -13461,7 +14236,7 @@ raylib.rlCopyShaderBuffer = rlCopyShaderBuffer * * @return {number} The resulting unsigned int. */ -function rlGetShaderBufferSize (id) { +function rlGetShaderBufferSize(id) { return r.BindrlGetShaderBufferSize( id ) @@ -13478,7 +14253,7 @@ raylib.rlGetShaderBufferSize = rlGetShaderBufferSize * * @return {undefined} */ -function rlBindImageTexture (id, index, format, readonly) { +function rlBindImageTexture(id, index, format, readonly) { return r.BindrlBindImageTexture( id, index, @@ -13493,7 +14268,7 @@ raylib.rlBindImageTexture = rlBindImageTexture * * @return {Matrix} The resulting Matrix. */ -function rlGetMatrixModelview () { +function rlGetMatrixModelview() { return r.BindrlGetMatrixModelview() } raylib.rlGetMatrixModelview = rlGetMatrixModelview @@ -13503,7 +14278,7 @@ raylib.rlGetMatrixModelview = rlGetMatrixModelview * * @return {Matrix} The resulting Matrix. */ -function rlGetMatrixProjection () { +function rlGetMatrixProjection() { return r.BindrlGetMatrixProjection() } raylib.rlGetMatrixProjection = rlGetMatrixProjection @@ -13513,7 +14288,7 @@ raylib.rlGetMatrixProjection = rlGetMatrixProjection * * @return {Matrix} The resulting Matrix. */ -function rlGetMatrixTransform () { +function rlGetMatrixTransform() { return r.BindrlGetMatrixTransform() } raylib.rlGetMatrixTransform = rlGetMatrixTransform @@ -13525,7 +14300,7 @@ raylib.rlGetMatrixTransform = rlGetMatrixTransform * * @return {Matrix} The resulting Matrix. */ -function rlGetMatrixProjectionStereo (eye) { +function rlGetMatrixProjectionStereo(eye) { return r.BindrlGetMatrixProjectionStereo( eye ) @@ -13539,7 +14314,7 @@ raylib.rlGetMatrixProjectionStereo = rlGetMatrixProjectionStereo * * @return {Matrix} The resulting Matrix. */ -function rlGetMatrixViewOffsetStereo (eye) { +function rlGetMatrixViewOffsetStereo(eye) { return r.BindrlGetMatrixViewOffsetStereo( eye ) @@ -13553,7 +14328,7 @@ raylib.rlGetMatrixViewOffsetStereo = rlGetMatrixViewOffsetStereo * * @return {undefined} */ -function rlSetMatrixProjection (proj) { +function rlSetMatrixProjection(proj) { return r.BindrlSetMatrixProjection( proj.m0, proj.m4, @@ -13582,7 +14357,7 @@ raylib.rlSetMatrixProjection = rlSetMatrixProjection * * @return {undefined} */ -function rlSetMatrixModelview (view) { +function rlSetMatrixModelview(view) { return r.BindrlSetMatrixModelview( view.m0, view.m4, @@ -13612,7 +14387,7 @@ raylib.rlSetMatrixModelview = rlSetMatrixModelview * * @return {undefined} */ -function rlSetMatrixProjectionStereo (right, left) { +function rlSetMatrixProjectionStereo(right, left) { return r.BindrlSetMatrixProjectionStereo( right.m0, right.m4, @@ -13658,7 +14433,7 @@ raylib.rlSetMatrixProjectionStereo = rlSetMatrixProjectionStereo * * @return {undefined} */ -function rlSetMatrixViewOffsetStereo (right, left) { +function rlSetMatrixViewOffsetStereo(right, left) { return r.BindrlSetMatrixViewOffsetStereo( right.m0, right.m4, @@ -13701,7 +14476,7 @@ raylib.rlSetMatrixViewOffsetStereo = rlSetMatrixViewOffsetStereo * * @return {undefined} */ -function rlLoadDrawCube () { +function rlLoadDrawCube() { return r.BindrlLoadDrawCube() } raylib.rlLoadDrawCube = rlLoadDrawCube @@ -13711,7 +14486,7 @@ raylib.rlLoadDrawCube = rlLoadDrawCube * * @return {undefined} */ -function rlLoadDrawQuad () { +function rlLoadDrawQuad() { return r.BindrlLoadDrawQuad() } raylib.rlLoadDrawQuad = rlLoadDrawQuad @@ -13724,7 +14499,7 @@ raylib.rlLoadDrawQuad = rlLoadDrawQuad * * @return {undefined} */ -function UpdateCamera (camera, mode) { +function UpdateCamera(camera, mode) { const obj = r.BindUpdateCamera( camera.position.x, camera.position.y, @@ -13755,7 +14530,7 @@ raylib.UpdateCamera = UpdateCamera * * @return {undefined} */ -function ImageFormat (image, newFormat) { +function ImageFormat(image, newFormat) { const obj = r.BindImageFormat( image.data, image.width, @@ -13780,7 +14555,7 @@ raylib.ImageFormat = ImageFormat * * @return {undefined} */ -function ImageToPOT (image, fill) { +function ImageToPOT(image, fill) { const obj = r.BindImageToPOT( image.data, image.width, @@ -13808,7 +14583,7 @@ raylib.ImageToPOT = ImageToPOT * * @return {undefined} */ -function ImageCrop (image, crop) { +function ImageCrop(image, crop) { const obj = r.BindImageCrop( image.data, image.width, @@ -13836,7 +14611,7 @@ raylib.ImageCrop = ImageCrop * * @return {undefined} */ -function ImageAlphaCrop (image, threshold) { +function ImageAlphaCrop(image, threshold) { const obj = r.BindImageAlphaCrop( image.data, image.width, @@ -13862,7 +14637,7 @@ raylib.ImageAlphaCrop = ImageAlphaCrop * * @return {undefined} */ -function ImageAlphaClear (image, color, threshold) { +function ImageAlphaClear(image, color, threshold) { const obj = r.BindImageAlphaClear( image.data, image.width, @@ -13891,7 +14666,7 @@ raylib.ImageAlphaClear = ImageAlphaClear * * @return {undefined} */ -function ImageAlphaMask (image, alphaMask) { +function ImageAlphaMask(image, alphaMask) { const obj = r.BindImageAlphaMask( image.data, image.width, @@ -13919,7 +14694,7 @@ raylib.ImageAlphaMask = ImageAlphaMask * * @return {undefined} */ -function ImageAlphaPremultiply (image) { +function ImageAlphaPremultiply(image) { const obj = r.BindImageAlphaPremultiply( image.data, image.width, @@ -13944,7 +14719,7 @@ raylib.ImageAlphaPremultiply = ImageAlphaPremultiply * * @return {undefined} */ -function ImageResize (image, newWidth, newHeight) { +function ImageResize(image, newWidth, newHeight) { const obj = r.BindImageResize( image.data, image.width, @@ -13971,7 +14746,7 @@ raylib.ImageResize = ImageResize * * @return {undefined} */ -function ImageResizeNN (image, newWidth, newHeight) { +function ImageResizeNN(image, newWidth, newHeight) { const obj = r.BindImageResizeNN( image.data, image.width, @@ -14001,7 +14776,7 @@ raylib.ImageResizeNN = ImageResizeNN * * @return {undefined} */ -function ImageResizeCanvas (image, newWidth, newHeight, offsetX, offsetY, fill) { +function ImageResizeCanvas(image, newWidth, newHeight, offsetX, offsetY, fill) { const obj = r.BindImageResizeCanvas( image.data, image.width, @@ -14032,7 +14807,7 @@ raylib.ImageResizeCanvas = ImageResizeCanvas * * @return {undefined} */ -function ImageMipmaps (image) { +function ImageMipmaps(image) { const obj = r.BindImageMipmaps( image.data, image.width, @@ -14059,7 +14834,7 @@ raylib.ImageMipmaps = ImageMipmaps * * @return {undefined} */ -function ImageDither (image, rBpp, gBpp, bBpp, aBpp) { +function ImageDither(image, rBpp, gBpp, bBpp, aBpp) { const obj = r.BindImageDither( image.data, image.width, @@ -14086,7 +14861,7 @@ raylib.ImageDither = ImageDither * * @return {undefined} */ -function ImageFlipVertical (image) { +function ImageFlipVertical(image) { const obj = r.BindImageFlipVertical( image.data, image.width, @@ -14109,7 +14884,7 @@ raylib.ImageFlipVertical = ImageFlipVertical * * @return {undefined} */ -function ImageFlipHorizontal (image) { +function ImageFlipHorizontal(image) { const obj = r.BindImageFlipHorizontal( image.data, image.width, @@ -14132,7 +14907,7 @@ raylib.ImageFlipHorizontal = ImageFlipHorizontal * * @return {undefined} */ -function ImageRotateCW (image) { +function ImageRotateCW(image) { const obj = r.BindImageRotateCW( image.data, image.width, @@ -14155,7 +14930,7 @@ raylib.ImageRotateCW = ImageRotateCW * * @return {undefined} */ -function ImageRotateCCW (image) { +function ImageRotateCCW(image) { const obj = r.BindImageRotateCCW( image.data, image.width, @@ -14179,7 +14954,7 @@ raylib.ImageRotateCCW = ImageRotateCCW * * @return {undefined} */ -function ImageColorTint (image, color) { +function ImageColorTint(image, color) { const obj = r.BindImageColorTint( image.data, image.width, @@ -14206,7 +14981,7 @@ raylib.ImageColorTint = ImageColorTint * * @return {undefined} */ -function ImageColorInvert (image) { +function ImageColorInvert(image) { const obj = r.BindImageColorInvert( image.data, image.width, @@ -14229,7 +15004,7 @@ raylib.ImageColorInvert = ImageColorInvert * * @return {undefined} */ -function ImageColorGrayscale (image) { +function ImageColorGrayscale(image) { const obj = r.BindImageColorGrayscale( image.data, image.width, @@ -14253,7 +15028,7 @@ raylib.ImageColorGrayscale = ImageColorGrayscale * * @return {undefined} */ -function ImageColorContrast (image, contrast) { +function ImageColorContrast(image, contrast) { const obj = r.BindImageColorContrast( image.data, image.width, @@ -14278,7 +15053,7 @@ raylib.ImageColorContrast = ImageColorContrast * * @return {undefined} */ -function ImageColorBrightness (image, brightness) { +function ImageColorBrightness(image, brightness) { const obj = r.BindImageColorBrightness( image.data, image.width, @@ -14304,7 +15079,7 @@ raylib.ImageColorBrightness = ImageColorBrightness * * @return {undefined} */ -function ImageColorReplace (image, color, replace) { +function ImageColorReplace(image, color, replace) { const obj = r.BindImageColorReplace( image.data, image.width, @@ -14336,7 +15111,7 @@ raylib.ImageColorReplace = ImageColorReplace * * @return {undefined} */ -function ImageClearBackground (dst, color) { +function ImageClearBackground(dst, color) { const obj = r.BindImageClearBackground( dst.data, dst.width, @@ -14366,7 +15141,7 @@ raylib.ImageClearBackground = ImageClearBackground * * @return {undefined} */ -function ImageDrawPixel (dst, posX, posY, color) { +function ImageDrawPixel(dst, posX, posY, color) { const obj = r.BindImageDrawPixel( dst.data, dst.width, @@ -14397,7 +15172,7 @@ raylib.ImageDrawPixel = ImageDrawPixel * * @return {undefined} */ -function ImageDrawPixelV (dst, position, color) { +function ImageDrawPixelV(dst, position, color) { const obj = r.BindImageDrawPixelV( dst.data, dst.width, @@ -14431,7 +15206,7 @@ raylib.ImageDrawPixelV = ImageDrawPixelV * * @return {undefined} */ -function ImageDrawLine (dst, startPosX, startPosY, endPosX, endPosY, color) { +function ImageDrawLine(dst, startPosX, startPosY, endPosX, endPosY, color) { const obj = r.BindImageDrawLine( dst.data, dst.width, @@ -14465,7 +15240,7 @@ raylib.ImageDrawLine = ImageDrawLine * * @return {undefined} */ -function ImageDrawLineV (dst, start, end, color) { +function ImageDrawLineV(dst, start, end, color) { const obj = r.BindImageDrawLineV( dst.data, dst.width, @@ -14500,7 +15275,7 @@ raylib.ImageDrawLineV = ImageDrawLineV * * @return {undefined} */ -function ImageDrawCircle (dst, centerX, centerY, radius, color) { +function ImageDrawCircle(dst, centerX, centerY, radius, color) { const obj = r.BindImageDrawCircle( dst.data, dst.width, @@ -14533,7 +15308,7 @@ raylib.ImageDrawCircle = ImageDrawCircle * * @return {undefined} */ -function ImageDrawCircleV (dst, center, radius, color) { +function ImageDrawCircleV(dst, center, radius, color) { const obj = r.BindImageDrawCircleV( dst.data, dst.width, @@ -14568,7 +15343,7 @@ raylib.ImageDrawCircleV = ImageDrawCircleV * * @return {undefined} */ -function ImageDrawRectangle (dst, posX, posY, width, height, color) { +function ImageDrawRectangle(dst, posX, posY, width, height, color) { const obj = r.BindImageDrawRectangle( dst.data, dst.width, @@ -14602,7 +15377,7 @@ raylib.ImageDrawRectangle = ImageDrawRectangle * * @return {undefined} */ -function ImageDrawRectangleV (dst, position, size, color) { +function ImageDrawRectangleV(dst, position, size, color) { const obj = r.BindImageDrawRectangleV( dst.data, dst.width, @@ -14635,7 +15410,7 @@ raylib.ImageDrawRectangleV = ImageDrawRectangleV * * @return {undefined} */ -function ImageDrawRectangleRec (dst, rec, color) { +function ImageDrawRectangleRec(dst, rec, color) { const obj = r.BindImageDrawRectangleRec( dst.data, dst.width, @@ -14669,7 +15444,7 @@ raylib.ImageDrawRectangleRec = ImageDrawRectangleRec * * @return {undefined} */ -function ImageDrawRectangleLines (dst, rec, thick, color) { +function ImageDrawRectangleLines(dst, rec, thick, color) { const obj = r.BindImageDrawRectangleLines( dst.data, dst.width, @@ -14705,7 +15480,7 @@ raylib.ImageDrawRectangleLines = ImageDrawRectangleLines * * @return {undefined} */ -function ImageDraw (dst, src, srcRec, dstRec, tint) { +function ImageDraw(dst, src, srcRec, dstRec, tint) { const obj = r.BindImageDraw( dst.data, dst.width, @@ -14750,7 +15525,7 @@ raylib.ImageDraw = ImageDraw * * @return {undefined} */ -function ImageDrawText (dst, text, posX, posY, fontSize, color) { +function ImageDrawText(dst, text, posX, posY, fontSize, color) { const obj = r.BindImageDrawText( dst.data, dst.width, @@ -14787,7 +15562,7 @@ raylib.ImageDrawText = ImageDrawText * * @return {undefined} */ -function ImageDrawTextEx (dst, font, text, position, fontSize, spacing, tint) { +function ImageDrawTextEx(dst, font, text, position, fontSize, spacing, tint) { const obj = r.BindImageDrawTextEx( dst.data, dst.width, @@ -14829,7 +15604,7 @@ raylib.ImageDrawTextEx = ImageDrawTextEx * * @return {undefined} */ -function GenTextureMipmaps (texture) { +function GenTextureMipmaps(texture) { const obj = r.BindGenTextureMipmaps( texture.id, texture.width, @@ -14853,7 +15628,7 @@ raylib.GenTextureMipmaps = GenTextureMipmaps * * @return {undefined} */ -function UploadMesh (mesh, dynamic) { +function UploadMesh(mesh, dynamic) { const obj = r.BindUploadMesh( mesh.vertexCount, mesh.triangleCount, @@ -14887,7 +15662,7 @@ raylib.UploadMesh = UploadMesh * * @return {undefined} */ -function GenMeshTangents (mesh) { +function GenMeshTangents(mesh) { const obj = r.BindGenMeshTangents( mesh.vertexCount, mesh.triangleCount, @@ -14922,7 +15697,7 @@ raylib.GenMeshTangents = GenMeshTangents * * @return {undefined} */ -function SetModelMeshMaterial (model, meshId, materialId) { +function SetModelMeshMaterial(model, meshId, materialId) { const obj = r.BindSetModelMeshMaterial( model.transform.m0, model.transform.m4, @@ -14968,7 +15743,7 @@ raylib.SetModelMeshMaterial = SetModelMeshMaterial * * @return {undefined} */ -function WaveCrop (wave, initSample, finalSample) { +function WaveCrop(wave, initSample, finalSample) { const obj = r.BindWaveCrop( wave.frameCount, wave.sampleRate, @@ -14996,7 +15771,7 @@ raylib.WaveCrop = WaveCrop * * @return {undefined} */ -function WaveFormat (wave, sampleRate, sampleSize, channels) { +function WaveFormat(wave, sampleRate, sampleSize, channels) { const obj = r.BindWaveFormat( wave.frameCount, wave.sampleRate, @@ -15025,8 +15800,8 @@ raylib.WaveFormat = WaveFormat * * @return {Color} The new Color. */ -function Color (r, g, b, a) { - return { r, g, b, a } +function Color(r,g,b,a) { + return {r,g,b,a} } raylib.Color = Color @@ -15038,8 +15813,8 @@ raylib.Color = Color * * @return {Vector2} The new Vector2. */ -function Vector2 (x, y) { - return { x, y } +function Vector2(x,y) { + return {x,y} } raylib.Vector2 = Vector2 @@ -15052,8 +15827,8 @@ raylib.Vector2 = Vector2 * * @return {Vector3} The new Vector3. */ -function Vector3 (x, y, z) { - return { x, y, z } +function Vector3(x,y,z) { + return {x,y,z} } raylib.Vector3 = Vector3 @@ -15067,8 +15842,8 @@ raylib.Vector3 = Vector3 * * @return {Vector4} The new Vector4. */ -function Vector4 (x, y, z, w) { - return { x, y, z, w } +function Vector4(x,y,z,w) { + return {x,y,z,w} } raylib.Vector4 = Vector4 @@ -15082,8 +15857,8 @@ raylib.Vector4 = Vector4 * * @return {Rectangle} The new Rectangle. */ -function Rectangle (x, y, width, height) { - return { x, y, width, height } +function Rectangle(x,y,width,height) { + return {x,y,width,height} } raylib.Rectangle = Rectangle @@ -15097,8 +15872,8 @@ raylib.Rectangle = Rectangle * * @return {Camera2D} The new Camera2D. */ -function Camera2D (offset, target, rotation, zoom) { - return { offset, target, rotation, zoom } +function Camera2D(offset,target,rotation,zoom) { + return {offset,target,rotation,zoom} } raylib.Camera2D = Camera2D @@ -15113,8 +15888,8 @@ raylib.Camera2D = Camera2D * * @return {Camera3D} The new Camera3D. */ -function Camera3D (position, target, up, fovy, projection) { - return { position, target, up, fovy, projection } +function Camera3D(position,target,up,fovy,projection) { + return {position,target,up,fovy,projection} } raylib.Camera3D = Camera3D raylib.Camera = raylib.Camera3D @@ -15123,14 +15898,14 @@ raylib.Camera = raylib.Camera3D /** * Set shader uniform value float - * + * * @param {Shader} shader * @param {number} locIndex * @param {number} value - * + * * @returns {undefined} */ -function SetShaderFloat (shader, locIndex, value) { +function SetShaderFloat(shader, locIndex, value) { return r.BindSetShaderFloat( shader.id, shader.locs, @@ -15142,14 +15917,14 @@ raylib.SetShaderFloat = SetShaderFloat /** * Set shader uniform value float - * + * * @param {Shader} shader * @param {number} locIndex * @param {number} value - * + * * @returns {undefined} */ -function SetShaderInt (shader, locIndex, value) { +function SetShaderInt(shader, locIndex, value) { return r.BindSetShaderInt( shader.id, shader.locs, @@ -15161,14 +15936,14 @@ raylib.SetShaderInt = SetShaderInt /** * Set shader uniform value vector2 - * + * * @param {Shader} shader * @param {number} locIndex * @param {Vector2} value - * + * * @returns {undefined} */ -function SetShaderVec2 (shader, locIndex, value) { +function SetShaderVec2(shader, locIndex, value) { return r.BindSetShaderVec2( shader.id, shader.locs, @@ -15181,14 +15956,14 @@ raylib.SetShaderVec2 = SetShaderVec2 /** * Set shader uniform value vector3 - * + * * @param {Shader} shader * @param {number} locIndex * @param {Vector3} value - * + * * @returns {undefined} */ -function SetShaderVec3 (shader, locIndex, value) { +function SetShaderVec3(shader, locIndex, value) { return r.BindSetShaderVec3( shader.id, shader.locs, @@ -15202,14 +15977,14 @@ raylib.SetShaderVec3 = SetShaderVec3 /** * Set shader uniform value vector4 - * + * * @param {Shader} shader * @param {number} locIndex * @param {Vector4} value - * + * * @returns {undefined} */ -function SetShaderVec4 (shader, locIndex, value) { +function SetShaderVec4(shader, locIndex, value) { return r.BindSetShaderVec4( shader.id, shader.locs, @@ -15326,6 +16101,14 @@ raylib.FLAG_WINDOW_HIGHDPI = 8192 */ raylib.FLAG_WINDOW_MOUSE_PASSTHROUGH = 16384 +/** + * Set to run program in borderless windowed mode + * + * @type {number} + * @constant + */ +raylib.FLAG_BORDERLESS_WINDOWED_MODE = 32768 + /** * Set to try enabling MSAA 4X * @@ -17102,13 +17885,37 @@ raylib.PIXELFORMAT_UNCOMPRESSED_R32G32B32 = 9 */ raylib.PIXELFORMAT_UNCOMPRESSED_R32G32B32A32 = 10 +/** + * 16 bpp (1 channel - half float) + * + * @type {number} + * @constant + */ +raylib.PIXELFORMAT_UNCOMPRESSED_R16 = 11 + +/** + * 16*3 bpp (3 channels - half float) + * + * @type {number} + * @constant + */ +raylib.PIXELFORMAT_UNCOMPRESSED_R16G16B16 = 12 + +/** + * 16*4 bpp (4 channels - half float) + * + * @type {number} + * @constant + */ +raylib.PIXELFORMAT_UNCOMPRESSED_R16G16B16A16 = 13 + /** * 4 bpp (no alpha) * * @type {number} * @constant */ -raylib.PIXELFORMAT_COMPRESSED_DXT1_RGB = 11 +raylib.PIXELFORMAT_COMPRESSED_DXT1_RGB = 14 /** * 4 bpp (1 bit alpha) @@ -17116,7 +17923,7 @@ raylib.PIXELFORMAT_COMPRESSED_DXT1_RGB = 11 * @type {number} * @constant */ -raylib.PIXELFORMAT_COMPRESSED_DXT1_RGBA = 12 +raylib.PIXELFORMAT_COMPRESSED_DXT1_RGBA = 15 /** * 8 bpp @@ -17124,7 +17931,7 @@ raylib.PIXELFORMAT_COMPRESSED_DXT1_RGBA = 12 * @type {number} * @constant */ -raylib.PIXELFORMAT_COMPRESSED_DXT3_RGBA = 13 +raylib.PIXELFORMAT_COMPRESSED_DXT3_RGBA = 16 /** * 8 bpp @@ -17132,7 +17939,7 @@ raylib.PIXELFORMAT_COMPRESSED_DXT3_RGBA = 13 * @type {number} * @constant */ -raylib.PIXELFORMAT_COMPRESSED_DXT5_RGBA = 14 +raylib.PIXELFORMAT_COMPRESSED_DXT5_RGBA = 17 /** * 4 bpp @@ -17140,7 +17947,7 @@ raylib.PIXELFORMAT_COMPRESSED_DXT5_RGBA = 14 * @type {number} * @constant */ -raylib.PIXELFORMAT_COMPRESSED_ETC1_RGB = 15 +raylib.PIXELFORMAT_COMPRESSED_ETC1_RGB = 18 /** * 4 bpp @@ -17148,7 +17955,7 @@ raylib.PIXELFORMAT_COMPRESSED_ETC1_RGB = 15 * @type {number} * @constant */ -raylib.PIXELFORMAT_COMPRESSED_ETC2_RGB = 16 +raylib.PIXELFORMAT_COMPRESSED_ETC2_RGB = 19 /** * 8 bpp @@ -17156,7 +17963,7 @@ raylib.PIXELFORMAT_COMPRESSED_ETC2_RGB = 16 * @type {number} * @constant */ -raylib.PIXELFORMAT_COMPRESSED_ETC2_EAC_RGBA = 17 +raylib.PIXELFORMAT_COMPRESSED_ETC2_EAC_RGBA = 20 /** * 4 bpp @@ -17164,7 +17971,7 @@ raylib.PIXELFORMAT_COMPRESSED_ETC2_EAC_RGBA = 17 * @type {number} * @constant */ -raylib.PIXELFORMAT_COMPRESSED_PVRT_RGB = 18 +raylib.PIXELFORMAT_COMPRESSED_PVRT_RGB = 21 /** * 4 bpp @@ -17172,7 +17979,7 @@ raylib.PIXELFORMAT_COMPRESSED_PVRT_RGB = 18 * @type {number} * @constant */ -raylib.PIXELFORMAT_COMPRESSED_PVRT_RGBA = 19 +raylib.PIXELFORMAT_COMPRESSED_PVRT_RGBA = 22 /** * 8 bpp @@ -17180,7 +17987,7 @@ raylib.PIXELFORMAT_COMPRESSED_PVRT_RGBA = 19 * @type {number} * @constant */ -raylib.PIXELFORMAT_COMPRESSED_ASTC_4x4_RGBA = 20 +raylib.PIXELFORMAT_COMPRESSED_ASTC_4x4_RGBA = 23 /** * 2 bpp @@ -17188,7 +17995,7 @@ raylib.PIXELFORMAT_COMPRESSED_ASTC_4x4_RGBA = 20 * @type {number} * @constant */ -raylib.PIXELFORMAT_COMPRESSED_ASTC_8x8_RGBA = 21 +raylib.PIXELFORMAT_COMPRESSED_ASTC_8x8_RGBA = 24 /** * No filter, just pixel approximation @@ -17575,7 +18382,7 @@ raylib.NPATCH_THREE_PATCH_VERTICAL = 1 raylib.NPATCH_THREE_PATCH_HORIZONTAL = 2 /** - * + * * * @type {number} * @constant @@ -17583,7 +18390,7 @@ raylib.NPATCH_THREE_PATCH_HORIZONTAL = 2 raylib.STATE_NORMAL = 0 /** - * + * * * @type {number} * @constant @@ -17591,7 +18398,7 @@ raylib.STATE_NORMAL = 0 raylib.STATE_FOCUSED = 1 /** - * + * * * @type {number} * @constant @@ -17599,7 +18406,7 @@ raylib.STATE_FOCUSED = 1 raylib.STATE_PRESSED = 2 /** - * + * * * @type {number} * @constant @@ -17607,7 +18414,7 @@ raylib.STATE_PRESSED = 2 raylib.STATE_DISABLED = 3 /** - * + * * * @type {number} * @constant @@ -17615,7 +18422,7 @@ raylib.STATE_DISABLED = 3 raylib.TEXT_ALIGN_LEFT = 0 /** - * + * * * @type {number} * @constant @@ -17623,7 +18430,7 @@ raylib.TEXT_ALIGN_LEFT = 0 raylib.TEXT_ALIGN_CENTER = 1 /** - * + * * * @type {number} * @constant @@ -17631,7 +18438,55 @@ raylib.TEXT_ALIGN_CENTER = 1 raylib.TEXT_ALIGN_RIGHT = 2 /** + * + * + * @type {number} + * @constant + */ +raylib.TEXT_ALIGN_TOP = 0 + +/** + * + * + * @type {number} + * @constant + */ +raylib.TEXT_ALIGN_MIDDLE = 1 + +/** + * + * + * @type {number} + * @constant + */ +raylib.TEXT_ALIGN_BOTTOM = 2 + +/** + * + * + * @type {number} + * @constant + */ +raylib.TEXT_WRAP_NONE = 0 + +/** + * + * + * @type {number} + * @constant + */ +raylib.TEXT_WRAP_CHAR = 1 + +/** + * * + * @type {number} + * @constant + */ +raylib.TEXT_WRAP_WORD = 2 + +/** + * * * @type {number} * @constant @@ -17647,7 +18502,7 @@ raylib.DEFAULT = 0 raylib.LABEL = 1 /** - * + * * * @type {number} * @constant @@ -17663,7 +18518,7 @@ raylib.BUTTON = 2 raylib.TOGGLE = 3 /** - * Used also for: SLIDERBAR + * Used also for: SLIDERBAR, TOGGLESLIDER * * @type {number} * @constant @@ -17671,7 +18526,7 @@ raylib.TOGGLE = 3 raylib.SLIDER = 4 /** - * + * * * @type {number} * @constant @@ -17679,7 +18534,7 @@ raylib.SLIDER = 4 raylib.PROGRESSBAR = 5 /** - * + * * * @type {number} * @constant @@ -17687,7 +18542,7 @@ raylib.PROGRESSBAR = 5 raylib.CHECKBOX = 6 /** - * + * * * @type {number} * @constant @@ -17695,7 +18550,7 @@ raylib.CHECKBOX = 6 raylib.COMBOBOX = 7 /** - * + * * * @type {number} * @constant @@ -17711,7 +18566,7 @@ raylib.DROPDOWNBOX = 8 raylib.TEXTBOX = 9 /** - * + * * * @type {number} * @constant @@ -17727,7 +18582,7 @@ raylib.VALUEBOX = 10 raylib.SPINNER = 11 /** - * + * * * @type {number} * @constant @@ -17735,7 +18590,7 @@ raylib.SPINNER = 11 raylib.LISTVIEW = 12 /** - * + * * * @type {number} * @constant @@ -17743,7 +18598,7 @@ raylib.LISTVIEW = 12 raylib.COLORPICKER = 13 /** - * + * * * @type {number} * @constant @@ -17751,7 +18606,7 @@ raylib.COLORPICKER = 13 raylib.SCROLLBAR = 14 /** - * + * * * @type {number} * @constant @@ -17759,7 +18614,7 @@ raylib.SCROLLBAR = 14 raylib.STATUSBAR = 15 /** - * + * Control border color in STATE_NORMAL * * @type {number} * @constant @@ -17767,7 +18622,7 @@ raylib.STATUSBAR = 15 raylib.BORDER_COLOR_NORMAL = 0 /** - * + * Control base color in STATE_NORMAL * * @type {number} * @constant @@ -17775,7 +18630,7 @@ raylib.BORDER_COLOR_NORMAL = 0 raylib.BASE_COLOR_NORMAL = 1 /** - * + * Control text color in STATE_NORMAL * * @type {number} * @constant @@ -17783,7 +18638,7 @@ raylib.BASE_COLOR_NORMAL = 1 raylib.TEXT_COLOR_NORMAL = 2 /** - * + * Control border color in STATE_FOCUSED * * @type {number} * @constant @@ -17791,7 +18646,7 @@ raylib.TEXT_COLOR_NORMAL = 2 raylib.BORDER_COLOR_FOCUSED = 3 /** - * + * Control base color in STATE_FOCUSED * * @type {number} * @constant @@ -17799,7 +18654,7 @@ raylib.BORDER_COLOR_FOCUSED = 3 raylib.BASE_COLOR_FOCUSED = 4 /** - * + * Control text color in STATE_FOCUSED * * @type {number} * @constant @@ -17807,7 +18662,7 @@ raylib.BASE_COLOR_FOCUSED = 4 raylib.TEXT_COLOR_FOCUSED = 5 /** - * + * Control border color in STATE_PRESSED * * @type {number} * @constant @@ -17815,7 +18670,7 @@ raylib.TEXT_COLOR_FOCUSED = 5 raylib.BORDER_COLOR_PRESSED = 6 /** - * + * Control base color in STATE_PRESSED * * @type {number} * @constant @@ -17823,7 +18678,7 @@ raylib.BORDER_COLOR_PRESSED = 6 raylib.BASE_COLOR_PRESSED = 7 /** - * + * Control text color in STATE_PRESSED * * @type {number} * @constant @@ -17831,7 +18686,7 @@ raylib.BASE_COLOR_PRESSED = 7 raylib.TEXT_COLOR_PRESSED = 8 /** - * + * Control border color in STATE_DISABLED * * @type {number} * @constant @@ -17839,7 +18694,7 @@ raylib.TEXT_COLOR_PRESSED = 8 raylib.BORDER_COLOR_DISABLED = 9 /** - * + * Control base color in STATE_DISABLED * * @type {number} * @constant @@ -17847,7 +18702,7 @@ raylib.BORDER_COLOR_DISABLED = 9 raylib.BASE_COLOR_DISABLED = 10 /** - * + * Control text color in STATE_DISABLED * * @type {number} * @constant @@ -17855,7 +18710,7 @@ raylib.BASE_COLOR_DISABLED = 10 raylib.TEXT_COLOR_DISABLED = 11 /** - * + * Control border size, 0 for no border * * @type {number} * @constant @@ -17863,7 +18718,7 @@ raylib.TEXT_COLOR_DISABLED = 11 raylib.BORDER_WIDTH = 12 /** - * + * Control text padding, not considering border * * @type {number} * @constant @@ -17871,21 +18726,13 @@ raylib.BORDER_WIDTH = 12 raylib.TEXT_PADDING = 13 /** - * + * Control text horizontal alignment inside control text bound (after border and padding) * * @type {number} * @constant */ raylib.TEXT_ALIGNMENT = 14 -/** - * - * - * @type {number} - * @constant - */ -raylib.RESERVED = 15 - /** * Text size (glyphs max height) * @@ -17918,6 +18765,30 @@ raylib.LINE_COLOR = 18 */ raylib.BACKGROUND_COLOR = 19 +/** + * Text spacing between lines + * + * @type {number} + * @constant + */ +raylib.TEXT_LINE_SPACING = 20 + +/** + * Text vertical alignment inside text bounds (after border and padding) + * + * @type {number} + * @constant + */ +raylib.TEXT_ALIGNMENT_VERTICAL = 21 + +/** + * Text wrap-mode inside text bounds + * + * @type {number} + * @constant + */ +raylib.TEXT_WRAP_MODE = 22 + /** * ToggleGroup separation between toggles * @@ -17951,7 +18822,7 @@ raylib.SLIDER_PADDING = 17 raylib.PROGRESS_PADDING = 16 /** - * + * ScrollBar arrows size * * @type {number} * @constant @@ -17959,7 +18830,7 @@ raylib.PROGRESS_PADDING = 16 raylib.ARROWS_SIZE = 16 /** - * + * ScrollBar arrows visible * * @type {number} * @constant @@ -17967,7 +18838,7 @@ raylib.ARROWS_SIZE = 16 raylib.ARROWS_VISIBLE = 17 /** - * (SLIDERBAR, SLIDER_PADDING) + * ScrollBar slider internal padding * * @type {number} * @constant @@ -17975,7 +18846,7 @@ raylib.ARROWS_VISIBLE = 17 raylib.SCROLL_SLIDER_PADDING = 18 /** - * + * ScrollBar slider size * * @type {number} * @constant @@ -17983,7 +18854,7 @@ raylib.SCROLL_SLIDER_PADDING = 18 raylib.SCROLL_SLIDER_SIZE = 19 /** - * + * ScrollBar scroll padding from arrows * * @type {number} * @constant @@ -17991,7 +18862,7 @@ raylib.SCROLL_SLIDER_SIZE = 19 raylib.SCROLL_PADDING = 20 /** - * + * ScrollBar scrolling speed * * @type {number} * @constant @@ -18039,20 +18910,12 @@ raylib.ARROW_PADDING = 16 raylib.DROPDOWN_ITEMS_SPACING = 17 /** - * TextBox/TextBoxMulti/ValueBox/Spinner inner text padding - * - * @type {number} - * @constant - */ -raylib.TEXT_INNER_PADDING = 16 - -/** - * TextBoxMulti lines separation + * TextBox in read-only mode: 0-text editable, 1-text no-editable * * @type {number} * @constant */ -raylib.TEXT_LINES_SPACING = 17 +raylib.TEXT_READONLY = 16 /** * Spinner left/right buttons width @@ -18095,7 +18958,7 @@ raylib.LIST_ITEMS_SPACING = 17 raylib.SCROLLBAR_WIDTH = 18 /** - * ListView scrollbar side (0-left, 1-right) + * ListView scrollbar side (0-SCROLLBAR_LEFT_SIDE, 1-SCROLLBAR_RIGHT_SIDE) * * @type {number} * @constant @@ -18103,7 +18966,7 @@ raylib.SCROLLBAR_WIDTH = 18 raylib.SCROLLBAR_SIDE = 19 /** - * + * * * @type {number} * @constant @@ -18143,7 +19006,7 @@ raylib.HUEBAR_SELECTOR_HEIGHT = 19 raylib.HUEBAR_SELECTOR_OVERFLOW = 20 /** - * + * * * @type {number} * @constant @@ -18151,7 +19014,7 @@ raylib.HUEBAR_SELECTOR_OVERFLOW = 20 raylib.ICON_NONE = 0 /** - * + * * * @type {number} * @constant @@ -18159,7 +19022,7 @@ raylib.ICON_NONE = 0 raylib.ICON_FOLDER_FILE_OPEN = 1 /** - * + * * * @type {number} * @constant @@ -18167,7 +19030,7 @@ raylib.ICON_FOLDER_FILE_OPEN = 1 raylib.ICON_FILE_SAVE_CLASSIC = 2 /** - * + * * * @type {number} * @constant @@ -18175,7 +19038,7 @@ raylib.ICON_FILE_SAVE_CLASSIC = 2 raylib.ICON_FOLDER_OPEN = 3 /** - * + * * * @type {number} * @constant @@ -18183,7 +19046,7 @@ raylib.ICON_FOLDER_OPEN = 3 raylib.ICON_FOLDER_SAVE = 4 /** - * + * * * @type {number} * @constant @@ -18191,7 +19054,7 @@ raylib.ICON_FOLDER_SAVE = 4 raylib.ICON_FILE_OPEN = 5 /** - * + * * * @type {number} * @constant @@ -18199,7 +19062,7 @@ raylib.ICON_FILE_OPEN = 5 raylib.ICON_FILE_SAVE = 6 /** - * + * * * @type {number} * @constant @@ -18207,7 +19070,7 @@ raylib.ICON_FILE_SAVE = 6 raylib.ICON_FILE_EXPORT = 7 /** - * + * * * @type {number} * @constant @@ -18215,7 +19078,7 @@ raylib.ICON_FILE_EXPORT = 7 raylib.ICON_FILE_ADD = 8 /** - * + * * * @type {number} * @constant @@ -18223,7 +19086,7 @@ raylib.ICON_FILE_ADD = 8 raylib.ICON_FILE_DELETE = 9 /** - * + * * * @type {number} * @constant @@ -18231,7 +19094,7 @@ raylib.ICON_FILE_DELETE = 9 raylib.ICON_FILETYPE_TEXT = 10 /** - * + * * * @type {number} * @constant @@ -18239,7 +19102,7 @@ raylib.ICON_FILETYPE_TEXT = 10 raylib.ICON_FILETYPE_AUDIO = 11 /** - * + * * * @type {number} * @constant @@ -18247,7 +19110,7 @@ raylib.ICON_FILETYPE_AUDIO = 11 raylib.ICON_FILETYPE_IMAGE = 12 /** - * + * * * @type {number} * @constant @@ -18255,7 +19118,7 @@ raylib.ICON_FILETYPE_IMAGE = 12 raylib.ICON_FILETYPE_PLAY = 13 /** - * + * * * @type {number} * @constant @@ -18263,7 +19126,7 @@ raylib.ICON_FILETYPE_PLAY = 13 raylib.ICON_FILETYPE_VIDEO = 14 /** - * + * * * @type {number} * @constant @@ -18271,7 +19134,7 @@ raylib.ICON_FILETYPE_VIDEO = 14 raylib.ICON_FILETYPE_INFO = 15 /** - * + * * * @type {number} * @constant @@ -18279,7 +19142,7 @@ raylib.ICON_FILETYPE_INFO = 15 raylib.ICON_FILE_COPY = 16 /** - * + * * * @type {number} * @constant @@ -18287,7 +19150,7 @@ raylib.ICON_FILE_COPY = 16 raylib.ICON_FILE_CUT = 17 /** - * + * * * @type {number} * @constant @@ -18295,7 +19158,7 @@ raylib.ICON_FILE_CUT = 17 raylib.ICON_FILE_PASTE = 18 /** - * + * * * @type {number} * @constant @@ -18303,7 +19166,7 @@ raylib.ICON_FILE_PASTE = 18 raylib.ICON_CURSOR_HAND = 19 /** - * + * * * @type {number} * @constant @@ -18311,7 +19174,7 @@ raylib.ICON_CURSOR_HAND = 19 raylib.ICON_CURSOR_POINTER = 20 /** - * + * * * @type {number} * @constant @@ -18319,7 +19182,7 @@ raylib.ICON_CURSOR_POINTER = 20 raylib.ICON_CURSOR_CLASSIC = 21 /** - * + * * * @type {number} * @constant @@ -18327,7 +19190,7 @@ raylib.ICON_CURSOR_CLASSIC = 21 raylib.ICON_PENCIL = 22 /** - * + * * * @type {number} * @constant @@ -18335,7 +19198,7 @@ raylib.ICON_PENCIL = 22 raylib.ICON_PENCIL_BIG = 23 /** - * + * * * @type {number} * @constant @@ -18343,7 +19206,7 @@ raylib.ICON_PENCIL_BIG = 23 raylib.ICON_BRUSH_CLASSIC = 24 /** - * + * * * @type {number} * @constant @@ -18351,7 +19214,7 @@ raylib.ICON_BRUSH_CLASSIC = 24 raylib.ICON_BRUSH_PAINTER = 25 /** - * + * * * @type {number} * @constant @@ -18359,7 +19222,7 @@ raylib.ICON_BRUSH_PAINTER = 25 raylib.ICON_WATER_DROP = 26 /** - * + * * * @type {number} * @constant @@ -18367,7 +19230,7 @@ raylib.ICON_WATER_DROP = 26 raylib.ICON_COLOR_PICKER = 27 /** - * + * * * @type {number} * @constant @@ -18375,7 +19238,7 @@ raylib.ICON_COLOR_PICKER = 27 raylib.ICON_RUBBER = 28 /** - * + * * * @type {number} * @constant @@ -18383,7 +19246,7 @@ raylib.ICON_RUBBER = 28 raylib.ICON_COLOR_BUCKET = 29 /** - * + * * * @type {number} * @constant @@ -18391,7 +19254,7 @@ raylib.ICON_COLOR_BUCKET = 29 raylib.ICON_TEXT_T = 30 /** - * + * * * @type {number} * @constant @@ -18399,7 +19262,7 @@ raylib.ICON_TEXT_T = 30 raylib.ICON_TEXT_A = 31 /** - * + * * * @type {number} * @constant @@ -18407,7 +19270,7 @@ raylib.ICON_TEXT_A = 31 raylib.ICON_SCALE = 32 /** - * + * * * @type {number} * @constant @@ -18415,7 +19278,7 @@ raylib.ICON_SCALE = 32 raylib.ICON_RESIZE = 33 /** - * + * * * @type {number} * @constant @@ -18423,7 +19286,7 @@ raylib.ICON_RESIZE = 33 raylib.ICON_FILTER_POINT = 34 /** - * + * * * @type {number} * @constant @@ -18431,7 +19294,7 @@ raylib.ICON_FILTER_POINT = 34 raylib.ICON_FILTER_BILINEAR = 35 /** - * + * * * @type {number} * @constant @@ -18439,7 +19302,7 @@ raylib.ICON_FILTER_BILINEAR = 35 raylib.ICON_CROP = 36 /** - * + * * * @type {number} * @constant @@ -18447,7 +19310,7 @@ raylib.ICON_CROP = 36 raylib.ICON_CROP_ALPHA = 37 /** - * + * * * @type {number} * @constant @@ -18455,7 +19318,7 @@ raylib.ICON_CROP_ALPHA = 37 raylib.ICON_SQUARE_TOGGLE = 38 /** - * + * * * @type {number} * @constant @@ -18463,7 +19326,7 @@ raylib.ICON_SQUARE_TOGGLE = 38 raylib.ICON_SYMMETRY = 39 /** - * + * * * @type {number} * @constant @@ -18471,7 +19334,7 @@ raylib.ICON_SYMMETRY = 39 raylib.ICON_SYMMETRY_HORIZONTAL = 40 /** - * + * * * @type {number} * @constant @@ -18479,7 +19342,7 @@ raylib.ICON_SYMMETRY_HORIZONTAL = 40 raylib.ICON_SYMMETRY_VERTICAL = 41 /** - * + * * * @type {number} * @constant @@ -18487,7 +19350,7 @@ raylib.ICON_SYMMETRY_VERTICAL = 41 raylib.ICON_LENS = 42 /** - * + * * * @type {number} * @constant @@ -18495,7 +19358,7 @@ raylib.ICON_LENS = 42 raylib.ICON_LENS_BIG = 43 /** - * + * * * @type {number} * @constant @@ -18503,7 +19366,7 @@ raylib.ICON_LENS_BIG = 43 raylib.ICON_EYE_ON = 44 /** - * + * * * @type {number} * @constant @@ -18511,7 +19374,7 @@ raylib.ICON_EYE_ON = 44 raylib.ICON_EYE_OFF = 45 /** - * + * * * @type {number} * @constant @@ -18519,7 +19382,7 @@ raylib.ICON_EYE_OFF = 45 raylib.ICON_FILTER_TOP = 46 /** - * + * * * @type {number} * @constant @@ -18527,7 +19390,7 @@ raylib.ICON_FILTER_TOP = 46 raylib.ICON_FILTER = 47 /** - * + * * * @type {number} * @constant @@ -18535,7 +19398,7 @@ raylib.ICON_FILTER = 47 raylib.ICON_TARGET_POINT = 48 /** - * + * * * @type {number} * @constant @@ -18543,7 +19406,7 @@ raylib.ICON_TARGET_POINT = 48 raylib.ICON_TARGET_SMALL = 49 /** - * + * * * @type {number} * @constant @@ -18551,7 +19414,7 @@ raylib.ICON_TARGET_SMALL = 49 raylib.ICON_TARGET_BIG = 50 /** - * + * * * @type {number} * @constant @@ -18559,7 +19422,7 @@ raylib.ICON_TARGET_BIG = 50 raylib.ICON_TARGET_MOVE = 51 /** - * + * * * @type {number} * @constant @@ -18567,7 +19430,7 @@ raylib.ICON_TARGET_MOVE = 51 raylib.ICON_CURSOR_MOVE = 52 /** - * + * * * @type {number} * @constant @@ -18575,7 +19438,7 @@ raylib.ICON_CURSOR_MOVE = 52 raylib.ICON_CURSOR_SCALE = 53 /** - * + * * * @type {number} * @constant @@ -18583,7 +19446,7 @@ raylib.ICON_CURSOR_SCALE = 53 raylib.ICON_CURSOR_SCALE_RIGHT = 54 /** - * + * * * @type {number} * @constant @@ -18591,7 +19454,7 @@ raylib.ICON_CURSOR_SCALE_RIGHT = 54 raylib.ICON_CURSOR_SCALE_LEFT = 55 /** - * + * * * @type {number} * @constant @@ -18599,7 +19462,7 @@ raylib.ICON_CURSOR_SCALE_LEFT = 55 raylib.ICON_UNDO = 56 /** - * + * * * @type {number} * @constant @@ -18607,7 +19470,7 @@ raylib.ICON_UNDO = 56 raylib.ICON_REDO = 57 /** - * + * * * @type {number} * @constant @@ -18615,7 +19478,7 @@ raylib.ICON_REDO = 57 raylib.ICON_REREDO = 58 /** - * + * * * @type {number} * @constant @@ -18623,7 +19486,7 @@ raylib.ICON_REREDO = 58 raylib.ICON_MUTATE = 59 /** - * + * * * @type {number} * @constant @@ -18631,7 +19494,7 @@ raylib.ICON_MUTATE = 59 raylib.ICON_ROTATE = 60 /** - * + * * * @type {number} * @constant @@ -18639,7 +19502,7 @@ raylib.ICON_ROTATE = 60 raylib.ICON_REPEAT = 61 /** - * + * * * @type {number} * @constant @@ -18647,7 +19510,7 @@ raylib.ICON_REPEAT = 61 raylib.ICON_SHUFFLE = 62 /** - * + * * * @type {number} * @constant @@ -18655,7 +19518,7 @@ raylib.ICON_SHUFFLE = 62 raylib.ICON_EMPTYBOX = 63 /** - * + * * * @type {number} * @constant @@ -18663,7 +19526,7 @@ raylib.ICON_EMPTYBOX = 63 raylib.ICON_TARGET = 64 /** - * + * * * @type {number} * @constant @@ -18671,7 +19534,7 @@ raylib.ICON_TARGET = 64 raylib.ICON_TARGET_SMALL_FILL = 65 /** - * + * * * @type {number} * @constant @@ -18679,7 +19542,7 @@ raylib.ICON_TARGET_SMALL_FILL = 65 raylib.ICON_TARGET_BIG_FILL = 66 /** - * + * * * @type {number} * @constant @@ -18687,7 +19550,7 @@ raylib.ICON_TARGET_BIG_FILL = 66 raylib.ICON_TARGET_MOVE_FILL = 67 /** - * + * * * @type {number} * @constant @@ -18695,7 +19558,7 @@ raylib.ICON_TARGET_MOVE_FILL = 67 raylib.ICON_CURSOR_MOVE_FILL = 68 /** - * + * * * @type {number} * @constant @@ -18703,7 +19566,7 @@ raylib.ICON_CURSOR_MOVE_FILL = 68 raylib.ICON_CURSOR_SCALE_FILL = 69 /** - * + * * * @type {number} * @constant @@ -18711,7 +19574,7 @@ raylib.ICON_CURSOR_SCALE_FILL = 69 raylib.ICON_CURSOR_SCALE_RIGHT_FILL = 70 /** - * + * * * @type {number} * @constant @@ -18719,7 +19582,7 @@ raylib.ICON_CURSOR_SCALE_RIGHT_FILL = 70 raylib.ICON_CURSOR_SCALE_LEFT_FILL = 71 /** - * + * * * @type {number} * @constant @@ -18727,7 +19590,7 @@ raylib.ICON_CURSOR_SCALE_LEFT_FILL = 71 raylib.ICON_UNDO_FILL = 72 /** - * + * * * @type {number} * @constant @@ -18735,7 +19598,7 @@ raylib.ICON_UNDO_FILL = 72 raylib.ICON_REDO_FILL = 73 /** - * + * * * @type {number} * @constant @@ -18743,7 +19606,7 @@ raylib.ICON_REDO_FILL = 73 raylib.ICON_REREDO_FILL = 74 /** - * + * * * @type {number} * @constant @@ -18751,7 +19614,7 @@ raylib.ICON_REREDO_FILL = 74 raylib.ICON_MUTATE_FILL = 75 /** - * + * * * @type {number} * @constant @@ -18759,7 +19622,7 @@ raylib.ICON_MUTATE_FILL = 75 raylib.ICON_ROTATE_FILL = 76 /** - * + * * * @type {number} * @constant @@ -18767,7 +19630,7 @@ raylib.ICON_ROTATE_FILL = 76 raylib.ICON_REPEAT_FILL = 77 /** - * + * * * @type {number} * @constant @@ -18775,7 +19638,7 @@ raylib.ICON_REPEAT_FILL = 77 raylib.ICON_SHUFFLE_FILL = 78 /** - * + * * * @type {number} * @constant @@ -18783,7 +19646,7 @@ raylib.ICON_SHUFFLE_FILL = 78 raylib.ICON_EMPTYBOX_SMALL = 79 /** - * + * * * @type {number} * @constant @@ -18791,7 +19654,7 @@ raylib.ICON_EMPTYBOX_SMALL = 79 raylib.ICON_BOX = 80 /** - * + * * * @type {number} * @constant @@ -18799,7 +19662,7 @@ raylib.ICON_BOX = 80 raylib.ICON_BOX_TOP = 81 /** - * + * * * @type {number} * @constant @@ -18807,7 +19670,7 @@ raylib.ICON_BOX_TOP = 81 raylib.ICON_BOX_TOP_RIGHT = 82 /** - * + * * * @type {number} * @constant @@ -18815,7 +19678,7 @@ raylib.ICON_BOX_TOP_RIGHT = 82 raylib.ICON_BOX_RIGHT = 83 /** - * + * * * @type {number} * @constant @@ -18823,7 +19686,7 @@ raylib.ICON_BOX_RIGHT = 83 raylib.ICON_BOX_BOTTOM_RIGHT = 84 /** - * + * * * @type {number} * @constant @@ -18831,7 +19694,7 @@ raylib.ICON_BOX_BOTTOM_RIGHT = 84 raylib.ICON_BOX_BOTTOM = 85 /** - * + * * * @type {number} * @constant @@ -18839,7 +19702,7 @@ raylib.ICON_BOX_BOTTOM = 85 raylib.ICON_BOX_BOTTOM_LEFT = 86 /** - * + * * * @type {number} * @constant @@ -18847,7 +19710,7 @@ raylib.ICON_BOX_BOTTOM_LEFT = 86 raylib.ICON_BOX_LEFT = 87 /** - * + * * * @type {number} * @constant @@ -18855,7 +19718,7 @@ raylib.ICON_BOX_LEFT = 87 raylib.ICON_BOX_TOP_LEFT = 88 /** - * + * * * @type {number} * @constant @@ -18863,7 +19726,7 @@ raylib.ICON_BOX_TOP_LEFT = 88 raylib.ICON_BOX_CENTER = 89 /** - * + * * * @type {number} * @constant @@ -18871,7 +19734,7 @@ raylib.ICON_BOX_CENTER = 89 raylib.ICON_BOX_CIRCLE_MASK = 90 /** - * + * * * @type {number} * @constant @@ -18879,7 +19742,7 @@ raylib.ICON_BOX_CIRCLE_MASK = 90 raylib.ICON_POT = 91 /** - * + * * * @type {number} * @constant @@ -18887,7 +19750,7 @@ raylib.ICON_POT = 91 raylib.ICON_ALPHA_MULTIPLY = 92 /** - * + * * * @type {number} * @constant @@ -18895,7 +19758,7 @@ raylib.ICON_ALPHA_MULTIPLY = 92 raylib.ICON_ALPHA_CLEAR = 93 /** - * + * * * @type {number} * @constant @@ -18903,7 +19766,7 @@ raylib.ICON_ALPHA_CLEAR = 93 raylib.ICON_DITHERING = 94 /** - * + * * * @type {number} * @constant @@ -18911,7 +19774,7 @@ raylib.ICON_DITHERING = 94 raylib.ICON_MIPMAPS = 95 /** - * + * * * @type {number} * @constant @@ -18919,7 +19782,7 @@ raylib.ICON_MIPMAPS = 95 raylib.ICON_BOX_GRID = 96 /** - * + * * * @type {number} * @constant @@ -18927,7 +19790,7 @@ raylib.ICON_BOX_GRID = 96 raylib.ICON_GRID = 97 /** - * + * * * @type {number} * @constant @@ -18935,7 +19798,7 @@ raylib.ICON_GRID = 97 raylib.ICON_BOX_CORNERS_SMALL = 98 /** - * + * * * @type {number} * @constant @@ -18943,7 +19806,7 @@ raylib.ICON_BOX_CORNERS_SMALL = 98 raylib.ICON_BOX_CORNERS_BIG = 99 /** - * + * * * @type {number} * @constant @@ -18951,7 +19814,7 @@ raylib.ICON_BOX_CORNERS_BIG = 99 raylib.ICON_FOUR_BOXES = 100 /** - * + * * * @type {number} * @constant @@ -18959,7 +19822,7 @@ raylib.ICON_FOUR_BOXES = 100 raylib.ICON_GRID_FILL = 101 /** - * + * * * @type {number} * @constant @@ -18967,7 +19830,7 @@ raylib.ICON_GRID_FILL = 101 raylib.ICON_BOX_MULTISIZE = 102 /** - * + * * * @type {number} * @constant @@ -18975,7 +19838,7 @@ raylib.ICON_BOX_MULTISIZE = 102 raylib.ICON_ZOOM_SMALL = 103 /** - * + * * * @type {number} * @constant @@ -18983,7 +19846,7 @@ raylib.ICON_ZOOM_SMALL = 103 raylib.ICON_ZOOM_MEDIUM = 104 /** - * + * * * @type {number} * @constant @@ -18991,7 +19854,7 @@ raylib.ICON_ZOOM_MEDIUM = 104 raylib.ICON_ZOOM_BIG = 105 /** - * + * * * @type {number} * @constant @@ -18999,7 +19862,7 @@ raylib.ICON_ZOOM_BIG = 105 raylib.ICON_ZOOM_ALL = 106 /** - * + * * * @type {number} * @constant @@ -19007,7 +19870,7 @@ raylib.ICON_ZOOM_ALL = 106 raylib.ICON_ZOOM_CENTER = 107 /** - * + * * * @type {number} * @constant @@ -19015,7 +19878,7 @@ raylib.ICON_ZOOM_CENTER = 107 raylib.ICON_BOX_DOTS_SMALL = 108 /** - * + * * * @type {number} * @constant @@ -19023,7 +19886,7 @@ raylib.ICON_BOX_DOTS_SMALL = 108 raylib.ICON_BOX_DOTS_BIG = 109 /** - * + * * * @type {number} * @constant @@ -19031,7 +19894,7 @@ raylib.ICON_BOX_DOTS_BIG = 109 raylib.ICON_BOX_CONCENTRIC = 110 /** - * + * * * @type {number} * @constant @@ -19039,7 +19902,7 @@ raylib.ICON_BOX_CONCENTRIC = 110 raylib.ICON_BOX_GRID_BIG = 111 /** - * + * * * @type {number} * @constant @@ -19047,7 +19910,7 @@ raylib.ICON_BOX_GRID_BIG = 111 raylib.ICON_OK_TICK = 112 /** - * + * * * @type {number} * @constant @@ -19055,7 +19918,7 @@ raylib.ICON_OK_TICK = 112 raylib.ICON_CROSS = 113 /** - * + * * * @type {number} * @constant @@ -19063,7 +19926,7 @@ raylib.ICON_CROSS = 113 raylib.ICON_ARROW_LEFT = 114 /** - * + * * * @type {number} * @constant @@ -19071,7 +19934,7 @@ raylib.ICON_ARROW_LEFT = 114 raylib.ICON_ARROW_RIGHT = 115 /** - * + * * * @type {number} * @constant @@ -19079,7 +19942,7 @@ raylib.ICON_ARROW_RIGHT = 115 raylib.ICON_ARROW_DOWN = 116 /** - * + * * * @type {number} * @constant @@ -19087,7 +19950,7 @@ raylib.ICON_ARROW_DOWN = 116 raylib.ICON_ARROW_UP = 117 /** - * + * * * @type {number} * @constant @@ -19095,7 +19958,7 @@ raylib.ICON_ARROW_UP = 117 raylib.ICON_ARROW_LEFT_FILL = 118 /** - * + * * * @type {number} * @constant @@ -19103,7 +19966,7 @@ raylib.ICON_ARROW_LEFT_FILL = 118 raylib.ICON_ARROW_RIGHT_FILL = 119 /** - * + * * * @type {number} * @constant @@ -19111,7 +19974,7 @@ raylib.ICON_ARROW_RIGHT_FILL = 119 raylib.ICON_ARROW_DOWN_FILL = 120 /** - * + * * * @type {number} * @constant @@ -19119,7 +19982,7 @@ raylib.ICON_ARROW_DOWN_FILL = 120 raylib.ICON_ARROW_UP_FILL = 121 /** - * + * * * @type {number} * @constant @@ -19127,7 +19990,7 @@ raylib.ICON_ARROW_UP_FILL = 121 raylib.ICON_AUDIO = 122 /** - * + * * * @type {number} * @constant @@ -19135,7 +19998,7 @@ raylib.ICON_AUDIO = 122 raylib.ICON_FX = 123 /** - * + * * * @type {number} * @constant @@ -19143,7 +20006,7 @@ raylib.ICON_FX = 123 raylib.ICON_WAVE = 124 /** - * + * * * @type {number} * @constant @@ -19151,7 +20014,7 @@ raylib.ICON_WAVE = 124 raylib.ICON_WAVE_SINUS = 125 /** - * + * * * @type {number} * @constant @@ -19159,7 +20022,7 @@ raylib.ICON_WAVE_SINUS = 125 raylib.ICON_WAVE_SQUARE = 126 /** - * + * * * @type {number} * @constant @@ -19167,7 +20030,7 @@ raylib.ICON_WAVE_SQUARE = 126 raylib.ICON_WAVE_TRIANGULAR = 127 /** - * + * * * @type {number} * @constant @@ -19175,7 +20038,7 @@ raylib.ICON_WAVE_TRIANGULAR = 127 raylib.ICON_CROSS_SMALL = 128 /** - * + * * * @type {number} * @constant @@ -19183,7 +20046,7 @@ raylib.ICON_CROSS_SMALL = 128 raylib.ICON_PLAYER_PREVIOUS = 129 /** - * + * * * @type {number} * @constant @@ -19191,7 +20054,7 @@ raylib.ICON_PLAYER_PREVIOUS = 129 raylib.ICON_PLAYER_PLAY_BACK = 130 /** - * + * * * @type {number} * @constant @@ -19199,7 +20062,7 @@ raylib.ICON_PLAYER_PLAY_BACK = 130 raylib.ICON_PLAYER_PLAY = 131 /** - * + * * * @type {number} * @constant @@ -19207,7 +20070,7 @@ raylib.ICON_PLAYER_PLAY = 131 raylib.ICON_PLAYER_PAUSE = 132 /** - * + * * * @type {number} * @constant @@ -19215,7 +20078,7 @@ raylib.ICON_PLAYER_PAUSE = 132 raylib.ICON_PLAYER_STOP = 133 /** - * + * * * @type {number} * @constant @@ -19223,7 +20086,7 @@ raylib.ICON_PLAYER_STOP = 133 raylib.ICON_PLAYER_NEXT = 134 /** - * + * * * @type {number} * @constant @@ -19231,7 +20094,7 @@ raylib.ICON_PLAYER_NEXT = 134 raylib.ICON_PLAYER_RECORD = 135 /** - * + * * * @type {number} * @constant @@ -19239,7 +20102,7 @@ raylib.ICON_PLAYER_RECORD = 135 raylib.ICON_MAGNET = 136 /** - * + * * * @type {number} * @constant @@ -19247,7 +20110,7 @@ raylib.ICON_MAGNET = 136 raylib.ICON_LOCK_CLOSE = 137 /** - * + * * * @type {number} * @constant @@ -19255,7 +20118,7 @@ raylib.ICON_LOCK_CLOSE = 137 raylib.ICON_LOCK_OPEN = 138 /** - * + * * * @type {number} * @constant @@ -19263,7 +20126,7 @@ raylib.ICON_LOCK_OPEN = 138 raylib.ICON_CLOCK = 139 /** - * + * * * @type {number} * @constant @@ -19271,7 +20134,7 @@ raylib.ICON_CLOCK = 139 raylib.ICON_TOOLS = 140 /** - * + * * * @type {number} * @constant @@ -19279,7 +20142,7 @@ raylib.ICON_TOOLS = 140 raylib.ICON_GEAR = 141 /** - * + * * * @type {number} * @constant @@ -19287,7 +20150,7 @@ raylib.ICON_GEAR = 141 raylib.ICON_GEAR_BIG = 142 /** - * + * * * @type {number} * @constant @@ -19295,7 +20158,7 @@ raylib.ICON_GEAR_BIG = 142 raylib.ICON_BIN = 143 /** - * + * * * @type {number} * @constant @@ -19303,7 +20166,7 @@ raylib.ICON_BIN = 143 raylib.ICON_HAND_POINTER = 144 /** - * + * * * @type {number} * @constant @@ -19311,7 +20174,7 @@ raylib.ICON_HAND_POINTER = 144 raylib.ICON_LASER = 145 /** - * + * * * @type {number} * @constant @@ -19319,7 +20182,7 @@ raylib.ICON_LASER = 145 raylib.ICON_COIN = 146 /** - * + * * * @type {number} * @constant @@ -19327,7 +20190,7 @@ raylib.ICON_COIN = 146 raylib.ICON_EXPLOSION = 147 /** - * + * * * @type {number} * @constant @@ -19335,7 +20198,7 @@ raylib.ICON_EXPLOSION = 147 raylib.ICON_1UP = 148 /** - * + * * * @type {number} * @constant @@ -19343,7 +20206,7 @@ raylib.ICON_1UP = 148 raylib.ICON_PLAYER = 149 /** - * + * * * @type {number} * @constant @@ -19351,7 +20214,7 @@ raylib.ICON_PLAYER = 149 raylib.ICON_PLAYER_JUMP = 150 /** - * + * * * @type {number} * @constant @@ -19359,7 +20222,7 @@ raylib.ICON_PLAYER_JUMP = 150 raylib.ICON_KEY = 151 /** - * + * * * @type {number} * @constant @@ -19367,7 +20230,7 @@ raylib.ICON_KEY = 151 raylib.ICON_DEMON = 152 /** - * + * * * @type {number} * @constant @@ -19375,7 +20238,7 @@ raylib.ICON_DEMON = 152 raylib.ICON_TEXT_POPUP = 153 /** - * + * * * @type {number} * @constant @@ -19383,7 +20246,7 @@ raylib.ICON_TEXT_POPUP = 153 raylib.ICON_GEAR_EX = 154 /** - * + * * * @type {number} * @constant @@ -19391,7 +20254,7 @@ raylib.ICON_GEAR_EX = 154 raylib.ICON_CRACK = 155 /** - * + * * * @type {number} * @constant @@ -19399,7 +20262,7 @@ raylib.ICON_CRACK = 155 raylib.ICON_CRACK_POINTS = 156 /** - * + * * * @type {number} * @constant @@ -19407,7 +20270,7 @@ raylib.ICON_CRACK_POINTS = 156 raylib.ICON_STAR = 157 /** - * + * * * @type {number} * @constant @@ -19415,7 +20278,7 @@ raylib.ICON_STAR = 157 raylib.ICON_DOOR = 158 /** - * + * * * @type {number} * @constant @@ -19423,7 +20286,7 @@ raylib.ICON_DOOR = 158 raylib.ICON_EXIT = 159 /** - * + * * * @type {number} * @constant @@ -19431,7 +20294,7 @@ raylib.ICON_EXIT = 159 raylib.ICON_MODE_2D = 160 /** - * + * * * @type {number} * @constant @@ -19439,7 +20302,7 @@ raylib.ICON_MODE_2D = 160 raylib.ICON_MODE_3D = 161 /** - * + * * * @type {number} * @constant @@ -19447,7 +20310,7 @@ raylib.ICON_MODE_3D = 161 raylib.ICON_CUBE = 162 /** - * + * * * @type {number} * @constant @@ -19455,7 +20318,7 @@ raylib.ICON_CUBE = 162 raylib.ICON_CUBE_FACE_TOP = 163 /** - * + * * * @type {number} * @constant @@ -19463,7 +20326,7 @@ raylib.ICON_CUBE_FACE_TOP = 163 raylib.ICON_CUBE_FACE_LEFT = 164 /** - * + * * * @type {number} * @constant @@ -19471,7 +20334,7 @@ raylib.ICON_CUBE_FACE_LEFT = 164 raylib.ICON_CUBE_FACE_FRONT = 165 /** - * + * * * @type {number} * @constant @@ -19479,7 +20342,7 @@ raylib.ICON_CUBE_FACE_FRONT = 165 raylib.ICON_CUBE_FACE_BOTTOM = 166 /** - * + * * * @type {number} * @constant @@ -19487,7 +20350,7 @@ raylib.ICON_CUBE_FACE_BOTTOM = 166 raylib.ICON_CUBE_FACE_RIGHT = 167 /** - * + * * * @type {number} * @constant @@ -19495,7 +20358,7 @@ raylib.ICON_CUBE_FACE_RIGHT = 167 raylib.ICON_CUBE_FACE_BACK = 168 /** - * + * * * @type {number} * @constant @@ -19503,7 +20366,7 @@ raylib.ICON_CUBE_FACE_BACK = 168 raylib.ICON_CAMERA = 169 /** - * + * * * @type {number} * @constant @@ -19511,7 +20374,7 @@ raylib.ICON_CAMERA = 169 raylib.ICON_SPECIAL = 170 /** - * + * * * @type {number} * @constant @@ -19519,7 +20382,7 @@ raylib.ICON_SPECIAL = 170 raylib.ICON_LINK_NET = 171 /** - * + * * * @type {number} * @constant @@ -19527,7 +20390,7 @@ raylib.ICON_LINK_NET = 171 raylib.ICON_LINK_BOXES = 172 /** - * + * * * @type {number} * @constant @@ -19535,7 +20398,7 @@ raylib.ICON_LINK_BOXES = 172 raylib.ICON_LINK_MULTI = 173 /** - * + * * * @type {number} * @constant @@ -19543,7 +20406,7 @@ raylib.ICON_LINK_MULTI = 173 raylib.ICON_LINK = 174 /** - * + * * * @type {number} * @constant @@ -19551,7 +20414,7 @@ raylib.ICON_LINK = 174 raylib.ICON_LINK_BROKE = 175 /** - * + * * * @type {number} * @constant @@ -19559,7 +20422,7 @@ raylib.ICON_LINK_BROKE = 175 raylib.ICON_TEXT_NOTES = 176 /** - * + * * * @type {number} * @constant @@ -19567,7 +20430,7 @@ raylib.ICON_TEXT_NOTES = 176 raylib.ICON_NOTEBOOK = 177 /** - * + * * * @type {number} * @constant @@ -19575,7 +20438,7 @@ raylib.ICON_NOTEBOOK = 177 raylib.ICON_SUITCASE = 178 /** - * + * * * @type {number} * @constant @@ -19583,7 +20446,7 @@ raylib.ICON_SUITCASE = 178 raylib.ICON_SUITCASE_ZIP = 179 /** - * + * * * @type {number} * @constant @@ -19591,7 +20454,7 @@ raylib.ICON_SUITCASE_ZIP = 179 raylib.ICON_MAILBOX = 180 /** - * + * * * @type {number} * @constant @@ -19599,7 +20462,7 @@ raylib.ICON_MAILBOX = 180 raylib.ICON_MONITOR = 181 /** - * + * * * @type {number} * @constant @@ -19607,7 +20470,7 @@ raylib.ICON_MONITOR = 181 raylib.ICON_PRINTER = 182 /** - * + * * * @type {number} * @constant @@ -19615,7 +20478,7 @@ raylib.ICON_PRINTER = 182 raylib.ICON_PHOTO_CAMERA = 183 /** - * + * * * @type {number} * @constant @@ -19623,7 +20486,7 @@ raylib.ICON_PHOTO_CAMERA = 183 raylib.ICON_PHOTO_CAMERA_FLASH = 184 /** - * + * * * @type {number} * @constant @@ -19631,7 +20494,7 @@ raylib.ICON_PHOTO_CAMERA_FLASH = 184 raylib.ICON_HOUSE = 185 /** - * + * * * @type {number} * @constant @@ -19639,7 +20502,7 @@ raylib.ICON_HOUSE = 185 raylib.ICON_HEART = 186 /** - * + * * * @type {number} * @constant @@ -19647,7 +20510,7 @@ raylib.ICON_HEART = 186 raylib.ICON_CORNER = 187 /** - * + * * * @type {number} * @constant @@ -19655,7 +20518,7 @@ raylib.ICON_CORNER = 187 raylib.ICON_VERTICAL_BARS = 188 /** - * + * * * @type {number} * @constant @@ -19663,7 +20526,7 @@ raylib.ICON_VERTICAL_BARS = 188 raylib.ICON_VERTICAL_BARS_FILL = 189 /** - * + * * * @type {number} * @constant @@ -19671,7 +20534,7 @@ raylib.ICON_VERTICAL_BARS_FILL = 189 raylib.ICON_LIFE_BARS = 190 /** - * + * * * @type {number} * @constant @@ -19679,7 +20542,7 @@ raylib.ICON_LIFE_BARS = 190 raylib.ICON_INFO = 191 /** - * + * * * @type {number} * @constant @@ -19687,7 +20550,7 @@ raylib.ICON_INFO = 191 raylib.ICON_CROSSLINE = 192 /** - * + * * * @type {number} * @constant @@ -19695,7 +20558,7 @@ raylib.ICON_CROSSLINE = 192 raylib.ICON_HELP = 193 /** - * + * * * @type {number} * @constant @@ -19703,7 +20566,7 @@ raylib.ICON_HELP = 193 raylib.ICON_FILETYPE_ALPHA = 194 /** - * + * * * @type {number} * @constant @@ -19711,7 +20574,7 @@ raylib.ICON_FILETYPE_ALPHA = 194 raylib.ICON_FILETYPE_HOME = 195 /** - * + * * * @type {number} * @constant @@ -19719,7 +20582,7 @@ raylib.ICON_FILETYPE_HOME = 195 raylib.ICON_LAYERS_VISIBLE = 196 /** - * + * * * @type {number} * @constant @@ -19727,7 +20590,7 @@ raylib.ICON_LAYERS_VISIBLE = 196 raylib.ICON_LAYERS = 197 /** - * + * * * @type {number} * @constant @@ -19735,7 +20598,7 @@ raylib.ICON_LAYERS = 197 raylib.ICON_WINDOW = 198 /** - * + * * * @type {number} * @constant @@ -19743,7 +20606,7 @@ raylib.ICON_WINDOW = 198 raylib.ICON_HIDPI = 199 /** - * + * * * @type {number} * @constant @@ -19751,7 +20614,7 @@ raylib.ICON_HIDPI = 199 raylib.ICON_FILETYPE_BINARY = 200 /** - * + * * * @type {number} * @constant @@ -19759,7 +20622,7 @@ raylib.ICON_FILETYPE_BINARY = 200 raylib.ICON_HEX = 201 /** - * + * * * @type {number} * @constant @@ -19767,7 +20630,7 @@ raylib.ICON_HEX = 201 raylib.ICON_SHIELD = 202 /** - * + * * * @type {number} * @constant @@ -19775,7 +20638,7 @@ raylib.ICON_SHIELD = 202 raylib.ICON_FILE_NEW = 203 /** - * + * * * @type {number} * @constant @@ -19783,7 +20646,7 @@ raylib.ICON_FILE_NEW = 203 raylib.ICON_FOLDER_ADD = 204 /** - * + * * * @type {number} * @constant @@ -19791,7 +20654,7 @@ raylib.ICON_FOLDER_ADD = 204 raylib.ICON_ALARM = 205 /** - * + * * * @type {number} * @constant @@ -19799,7 +20662,7 @@ raylib.ICON_ALARM = 205 raylib.ICON_CPU = 206 /** - * + * * * @type {number} * @constant @@ -19807,7 +20670,7 @@ raylib.ICON_CPU = 206 raylib.ICON_ROM = 207 /** - * + * * * @type {number} * @constant @@ -19815,7 +20678,7 @@ raylib.ICON_ROM = 207 raylib.ICON_STEP_OVER = 208 /** - * + * * * @type {number} * @constant @@ -19823,7 +20686,7 @@ raylib.ICON_STEP_OVER = 208 raylib.ICON_STEP_INTO = 209 /** - * + * * * @type {number} * @constant @@ -19831,7 +20694,7 @@ raylib.ICON_STEP_INTO = 209 raylib.ICON_STEP_OUT = 210 /** - * + * * * @type {number} * @constant @@ -19839,7 +20702,7 @@ raylib.ICON_STEP_OUT = 210 raylib.ICON_RESTART = 211 /** - * + * * * @type {number} * @constant @@ -19847,7 +20710,7 @@ raylib.ICON_RESTART = 211 raylib.ICON_BREAKPOINT_ON = 212 /** - * + * * * @type {number} * @constant @@ -19855,7 +20718,7 @@ raylib.ICON_BREAKPOINT_ON = 212 raylib.ICON_BREAKPOINT_OFF = 213 /** - * + * * * @type {number} * @constant @@ -19863,7 +20726,7 @@ raylib.ICON_BREAKPOINT_OFF = 213 raylib.ICON_BURGER_MENU = 214 /** - * + * * * @type {number} * @constant @@ -19871,7 +20734,7 @@ raylib.ICON_BURGER_MENU = 214 raylib.ICON_CASE_SENSITIVE = 215 /** - * + * * * @type {number} * @constant @@ -19879,7 +20742,7 @@ raylib.ICON_CASE_SENSITIVE = 215 raylib.ICON_REG_EXP = 216 /** - * + * * * @type {number} * @constant @@ -19887,7 +20750,7 @@ raylib.ICON_REG_EXP = 216 raylib.ICON_FOLDER = 217 /** - * + * * * @type {number} * @constant @@ -19895,15 +20758,15 @@ raylib.ICON_FOLDER = 217 raylib.ICON_FILE = 218 /** - * + * * * @type {number} * @constant */ -raylib.ICON_219 = 219 +raylib.ICON_SAND_TIMER = 219 /** - * + * * * @type {number} * @constant @@ -19911,7 +20774,7 @@ raylib.ICON_219 = 219 raylib.ICON_220 = 220 /** - * + * * * @type {number} * @constant @@ -19919,7 +20782,7 @@ raylib.ICON_220 = 220 raylib.ICON_221 = 221 /** - * + * * * @type {number} * @constant @@ -19927,7 +20790,7 @@ raylib.ICON_221 = 221 raylib.ICON_222 = 222 /** - * + * * * @type {number} * @constant @@ -19935,7 +20798,7 @@ raylib.ICON_222 = 222 raylib.ICON_223 = 223 /** - * + * * * @type {number} * @constant @@ -19943,7 +20806,7 @@ raylib.ICON_223 = 223 raylib.ICON_224 = 224 /** - * + * * * @type {number} * @constant @@ -19951,7 +20814,7 @@ raylib.ICON_224 = 224 raylib.ICON_225 = 225 /** - * + * * * @type {number} * @constant @@ -19959,7 +20822,7 @@ raylib.ICON_225 = 225 raylib.ICON_226 = 226 /** - * + * * * @type {number} * @constant @@ -19967,7 +20830,7 @@ raylib.ICON_226 = 226 raylib.ICON_227 = 227 /** - * + * * * @type {number} * @constant @@ -19975,7 +20838,7 @@ raylib.ICON_227 = 227 raylib.ICON_228 = 228 /** - * + * * * @type {number} * @constant @@ -19983,7 +20846,7 @@ raylib.ICON_228 = 228 raylib.ICON_229 = 229 /** - * + * * * @type {number} * @constant @@ -19991,7 +20854,7 @@ raylib.ICON_229 = 229 raylib.ICON_230 = 230 /** - * + * * * @type {number} * @constant @@ -19999,7 +20862,7 @@ raylib.ICON_230 = 230 raylib.ICON_231 = 231 /** - * + * * * @type {number} * @constant @@ -20007,7 +20870,7 @@ raylib.ICON_231 = 231 raylib.ICON_232 = 232 /** - * + * * * @type {number} * @constant @@ -20015,7 +20878,7 @@ raylib.ICON_232 = 232 raylib.ICON_233 = 233 /** - * + * * * @type {number} * @constant @@ -20023,7 +20886,7 @@ raylib.ICON_233 = 233 raylib.ICON_234 = 234 /** - * + * * * @type {number} * @constant @@ -20031,7 +20894,7 @@ raylib.ICON_234 = 234 raylib.ICON_235 = 235 /** - * + * * * @type {number} * @constant @@ -20039,7 +20902,7 @@ raylib.ICON_235 = 235 raylib.ICON_236 = 236 /** - * + * * * @type {number} * @constant @@ -20047,7 +20910,7 @@ raylib.ICON_236 = 236 raylib.ICON_237 = 237 /** - * + * * * @type {number} * @constant @@ -20055,7 +20918,7 @@ raylib.ICON_237 = 237 raylib.ICON_238 = 238 /** - * + * * * @type {number} * @constant @@ -20063,7 +20926,7 @@ raylib.ICON_238 = 238 raylib.ICON_239 = 239 /** - * + * * * @type {number} * @constant @@ -20071,7 +20934,7 @@ raylib.ICON_239 = 239 raylib.ICON_240 = 240 /** - * + * * * @type {number} * @constant @@ -20079,7 +20942,7 @@ raylib.ICON_240 = 240 raylib.ICON_241 = 241 /** - * + * * * @type {number} * @constant @@ -20087,7 +20950,7 @@ raylib.ICON_241 = 241 raylib.ICON_242 = 242 /** - * + * * * @type {number} * @constant @@ -20095,7 +20958,7 @@ raylib.ICON_242 = 242 raylib.ICON_243 = 243 /** - * + * * * @type {number} * @constant @@ -20103,7 +20966,7 @@ raylib.ICON_243 = 243 raylib.ICON_244 = 244 /** - * + * * * @type {number} * @constant @@ -20111,7 +20974,7 @@ raylib.ICON_244 = 244 raylib.ICON_245 = 245 /** - * + * * * @type {number} * @constant @@ -20119,7 +20982,7 @@ raylib.ICON_245 = 245 raylib.ICON_246 = 246 /** - * + * * * @type {number} * @constant @@ -20127,7 +20990,7 @@ raylib.ICON_246 = 246 raylib.ICON_247 = 247 /** - * + * * * @type {number} * @constant @@ -20135,7 +20998,7 @@ raylib.ICON_247 = 247 raylib.ICON_248 = 248 /** - * + * * * @type {number} * @constant @@ -20143,7 +21006,7 @@ raylib.ICON_248 = 248 raylib.ICON_249 = 249 /** - * + * * * @type {number} * @constant @@ -20151,7 +21014,7 @@ raylib.ICON_249 = 249 raylib.ICON_250 = 250 /** - * + * * * @type {number} * @constant @@ -20159,7 +21022,7 @@ raylib.ICON_250 = 250 raylib.ICON_251 = 251 /** - * + * * * @type {number} * @constant @@ -20167,7 +21030,7 @@ raylib.ICON_251 = 251 raylib.ICON_252 = 252 /** - * + * * * @type {number} * @constant @@ -20175,7 +21038,7 @@ raylib.ICON_252 = 252 raylib.ICON_253 = 253 /** - * + * * * @type {number} * @constant @@ -20183,7 +21046,7 @@ raylib.ICON_253 = 253 raylib.ICON_254 = 254 /** - * + * * * @type {number} * @constant @@ -20230,6 +21093,14 @@ raylib.RL_OPENGL_43 = 4 */ raylib.RL_OPENGL_ES_20 = 5 +/** + * OpenGL ES 3.0 (GLSL 300 es) + * + * @type {number} + * @constant + */ +raylib.RL_OPENGL_ES_30 = 6 + /** * Display all logs * @@ -20374,13 +21245,37 @@ raylib.RL_PIXELFORMAT_UNCOMPRESSED_R32G32B32 = 9 */ raylib.RL_PIXELFORMAT_UNCOMPRESSED_R32G32B32A32 = 10 +/** + * 16 bpp (1 channel - half float) + * + * @type {number} + * @constant + */ +raylib.RL_PIXELFORMAT_UNCOMPRESSED_R16 = 11 + +/** + * 16*3 bpp (3 channels - half float) + * + * @type {number} + * @constant + */ +raylib.RL_PIXELFORMAT_UNCOMPRESSED_R16G16B16 = 12 + +/** + * 16*4 bpp (4 channels - half float) + * + * @type {number} + * @constant + */ +raylib.RL_PIXELFORMAT_UNCOMPRESSED_R16G16B16A16 = 13 + /** * 4 bpp (no alpha) * * @type {number} * @constant */ -raylib.RL_PIXELFORMAT_COMPRESSED_DXT1_RGB = 11 +raylib.RL_PIXELFORMAT_COMPRESSED_DXT1_RGB = 14 /** * 4 bpp (1 bit alpha) @@ -20388,7 +21283,7 @@ raylib.RL_PIXELFORMAT_COMPRESSED_DXT1_RGB = 11 * @type {number} * @constant */ -raylib.RL_PIXELFORMAT_COMPRESSED_DXT1_RGBA = 12 +raylib.RL_PIXELFORMAT_COMPRESSED_DXT1_RGBA = 15 /** * 8 bpp @@ -20396,7 +21291,7 @@ raylib.RL_PIXELFORMAT_COMPRESSED_DXT1_RGBA = 12 * @type {number} * @constant */ -raylib.RL_PIXELFORMAT_COMPRESSED_DXT3_RGBA = 13 +raylib.RL_PIXELFORMAT_COMPRESSED_DXT3_RGBA = 16 /** * 8 bpp @@ -20404,7 +21299,7 @@ raylib.RL_PIXELFORMAT_COMPRESSED_DXT3_RGBA = 13 * @type {number} * @constant */ -raylib.RL_PIXELFORMAT_COMPRESSED_DXT5_RGBA = 14 +raylib.RL_PIXELFORMAT_COMPRESSED_DXT5_RGBA = 17 /** * 4 bpp @@ -20412,7 +21307,7 @@ raylib.RL_PIXELFORMAT_COMPRESSED_DXT5_RGBA = 14 * @type {number} * @constant */ -raylib.RL_PIXELFORMAT_COMPRESSED_ETC1_RGB = 15 +raylib.RL_PIXELFORMAT_COMPRESSED_ETC1_RGB = 18 /** * 4 bpp @@ -20420,7 +21315,7 @@ raylib.RL_PIXELFORMAT_COMPRESSED_ETC1_RGB = 15 * @type {number} * @constant */ -raylib.RL_PIXELFORMAT_COMPRESSED_ETC2_RGB = 16 +raylib.RL_PIXELFORMAT_COMPRESSED_ETC2_RGB = 19 /** * 8 bpp @@ -20428,7 +21323,7 @@ raylib.RL_PIXELFORMAT_COMPRESSED_ETC2_RGB = 16 * @type {number} * @constant */ -raylib.RL_PIXELFORMAT_COMPRESSED_ETC2_EAC_RGBA = 17 +raylib.RL_PIXELFORMAT_COMPRESSED_ETC2_EAC_RGBA = 20 /** * 4 bpp @@ -20436,7 +21331,7 @@ raylib.RL_PIXELFORMAT_COMPRESSED_ETC2_EAC_RGBA = 17 * @type {number} * @constant */ -raylib.RL_PIXELFORMAT_COMPRESSED_PVRT_RGB = 18 +raylib.RL_PIXELFORMAT_COMPRESSED_PVRT_RGB = 21 /** * 4 bpp @@ -20444,7 +21339,7 @@ raylib.RL_PIXELFORMAT_COMPRESSED_PVRT_RGB = 18 * @type {number} * @constant */ -raylib.RL_PIXELFORMAT_COMPRESSED_PVRT_RGBA = 19 +raylib.RL_PIXELFORMAT_COMPRESSED_PVRT_RGBA = 22 /** * 8 bpp @@ -20452,7 +21347,7 @@ raylib.RL_PIXELFORMAT_COMPRESSED_PVRT_RGBA = 19 * @type {number} * @constant */ -raylib.RL_PIXELFORMAT_COMPRESSED_ASTC_4x4_RGBA = 20 +raylib.RL_PIXELFORMAT_COMPRESSED_ASTC_4x4_RGBA = 23 /** * 2 bpp @@ -20460,7 +21355,7 @@ raylib.RL_PIXELFORMAT_COMPRESSED_ASTC_4x4_RGBA = 20 * @type {number} * @constant */ -raylib.RL_PIXELFORMAT_COMPRESSED_ASTC_8x8_RGBA = 21 +raylib.RL_PIXELFORMAT_COMPRESSED_ASTC_8x8_RGBA = 24 /** * No filter, just pixel approximation @@ -21031,7 +21926,7 @@ raylib.RL_ATTACHMENT_TEXTURE2D = 100 raylib.RL_ATTACHMENT_RENDERBUFFER = 200 /** - * + * * * @type {number} * @constant @@ -21039,7 +21934,7 @@ raylib.RL_ATTACHMENT_RENDERBUFFER = 200 raylib.RL_CULL_FACE_FRONT = 0 /** - * + * * * @type {number} * @constant @@ -21047,7 +21942,7 @@ raylib.RL_CULL_FACE_FRONT = 0 raylib.RL_CULL_FACE_BACK = 1 /** - * + * * * @type {number} * @constant diff --git a/test/node-raylib.test.js b/test/node-raylib.test.js index 38298df..23dc306 100644 --- a/test/node-raylib.test.js +++ b/test/node-raylib.test.js @@ -44,7 +44,7 @@ describe('raylib', () => { expect(r.KEY_A).toBe(65) }) it('PIXELFORMAT_COMPRESSED_ASTC_4x4_RGBA', () => { - expect(r.PIXELFORMAT_COMPRESSED_ASTC_4x4_RGBA).toBe(20) + expect(r.PIXELFORMAT_COMPRESSED_ASTC_4x4_RGBA).toBe(23) }) }) diff --git a/tools/generate_templates/node-raylib-bindings.js b/tools/generate_templates/node-raylib-bindings.js index 68f90c9..1e92364 100644 --- a/tools/generate_templates/node-raylib-bindings.js +++ b/tools/generate_templates/node-raylib-bindings.js @@ -20,6 +20,9 @@ const SanitizeTypeName = name => { if (name === 'unsigned int[4]') { return '(unsigned int) pointer' } + if (name === 'int[4]') { + return 'pointer' + } if (name === 'Matrix[2]') { return 'pointer' }