Merge branch 'raysan5:master' into master

raysan5 · Oct 1, 2024 · 13c3b4e · 13c3b4e
2 parents 3325813 + 282d647
commit 13c3b4e
Show file tree

Hide file tree

Showing 11 changed files with 466 additions and 29 deletions.
diff --git a/examples/models/models_gpu_skinning.c b/examples/models/models_gpu_skinning.c
@@ -10,6 +10,8 @@
 * BSD-like license that allows static linking with closed source software
 *
 * Copyright (c) 2024 Daniel Holden (@orangeduck)
+* 
+* Note: Due to limitations in the Apple OpenGL driver, this feature does not work on MacOS
 *
 ********************************************************************************************/
 

diff --git a/parser/output/raylib_api.json b/parser/output/raylib_api.json
@@ -5274,7 +5274,7 @@
  },
  {
  "name": "DrawPixel",
- "description": "Draw a pixel",
+ "description": "Draw a pixel using geometry [Can be slow, use with care]",
  "returnType": "void",
  "params": [
  {
@@ -5293,7 +5293,7 @@
  },
  {
  "name": "DrawPixelV",
- "description": "Draw a pixel (Vector version)",
+ "description": "Draw a pixel using geometry (Vector version) [Can be slow, use with care]",
  "returnType": "void",
  "params": [
  {
@@ -11104,7 +11104,7 @@
  },
  {
  "name": "UpdateModelAnimationBoneMatrices",
- "description": "Update model animation mesh bone matrices",
+ "description": "Update model animation mesh bone matrices (Note GPU skinning does not work on Mac)",
  "returnType": "void",
  "params": [
  {

diff --git a/parser/output/raylib_api.lua b/parser/output/raylib_api.lua
@@ -4614,7 +4614,7 @@ return {
  },
  {
  name = "DrawPixel",
- description = "Draw a pixel",
+ description = "Draw a pixel using geometry [Can be slow, use with care]",
  returnType = "void",
  params = {
  {type = "int", name = "posX"},
@@ -4624,7 +4624,7 @@ return {
  },
  {
  name = "DrawPixelV",
- description = "Draw a pixel (Vector version)",
+ description = "Draw a pixel using geometry (Vector version) [Can be slow, use with care]",
  returnType = "void",
  params = {
  {type = "Vector2", name = "position"},
@@ -7621,7 +7621,7 @@ return {
  },
  {
  name = "UpdateModelAnimationBoneMatrices",
- description = "Update model animation mesh bone matrices",
+ description = "Update model animation mesh bone matrices (Note GPU skinning does not work on Mac)",
  returnType = "void",
  params = {
  {type = "Model", name = "model"},

diff --git a/parser/output/raylib_api.txt b/parser/output/raylib_api.txt
@@ -2102,14 +2102,14 @@ Function 207: GetShapesTextureRectangle() (0 input parameters)
 Function 208: DrawPixel() (3 input parameters)
  Name: DrawPixel
  Return type: void
- Description: Draw a pixel
+ Description: Draw a pixel using geometry [Can be slow, use with care]
  Param[1]: posX (type: int)
  Param[2]: posY (type: int)
  Param[3]: color (type: Color)
 Function 209: DrawPixelV() (2 input parameters)
  Name: DrawPixelV
  Return type: void
- Description: Draw a pixel (Vector version)
+ Description: Draw a pixel using geometry (Vector version) [Can be slow, use with care]
  Param[1]: position (type: Vector2)
  Param[2]: color (type: Color)
 Function 210: DrawLine() (5 input parameters)
@@ -4230,7 +4230,7 @@ Function 503: IsModelAnimationValid() (2 input parameters)
 Function 504: UpdateModelAnimationBoneMatrices() (3 input parameters)
  Name: UpdateModelAnimationBoneMatrices
  Return type: void
- Description: Update model animation mesh bone matrices
+ Description: Update model animation mesh bone matrices (Note GPU skinning does not work on Mac)
  Param[1]: model (type: Model)
  Param[2]: anim (type: ModelAnimation)
  Param[3]: frame (type: int)

diff --git a/parser/output/raylib_api.xml b/parser/output/raylib_api.xml
@@ -1297,12 +1297,12 @@
  </Function>
  <Function name="GetShapesTextureRectangle" retType="Rectangle" paramCount="0" desc="Get texture source rectangle that is used for shapes drawing">
  </Function>
- <Function name="DrawPixel" retType="void" paramCount="3" desc="Draw a pixel">
+ <Function name="DrawPixel" retType="void" paramCount="3" desc="Draw a pixel using geometry [Can be slow, use with care]">
  <Param type="int" name="posX" desc="" />
  <Param type="int" name="posY" desc="" />
  <Param type="Color" name="color" desc="" />
  </Function>
- <Function name="DrawPixelV" retType="void" paramCount="2" desc="Draw a pixel (Vector version)">
+ <Function name="DrawPixelV" retType="void" paramCount="2" desc="Draw a pixel using geometry (Vector version) [Can be slow, use with care]">
  <Param type="Vector2" name="position" desc="" />
  <Param type="Color" name="color" desc="" />
  </Function>
@@ -2830,7 +2830,7 @@
  <Param type="Model" name="model" desc="" />
  <Param type="ModelAnimation" name="anim" desc="" />
  </Function>
- <Function name="UpdateModelAnimationBoneMatrices" retType="void" paramCount="3" desc="Update model animation mesh bone matrices">
+ <Function name="UpdateModelAnimationBoneMatrices" retType="void" paramCount="3" desc="Update model animation mesh bone matrices (Note GPU skinning does not work on Mac)">
  <Param type="Model" name="model" desc="" />
  <Param type="ModelAnimation" name="anim" desc="" />
  <Param type="int" name="frame" desc="" />