Browse Source

Shader:sendImage missing Texture arg;

bjorn 4 years ago
parent
commit
f4a12c8b50
2 changed files with 68 additions and 11 deletions
  1. 62 8
      api/init.lua
  2. 6 3
      api/lovr/graphics/Shader/sendImage.lua

+ 62 - 8
api/init.lua

@@ -13815,6 +13815,11 @@ return {
                       type = "string",
                       type = "string",
                       description = "The name of the image uniform."
                       description = "The name of the image uniform."
                     },
                     },
+                    {
+                      name = "texture",
+                      type = "Texture",
+                      description = "The Texture to assign."
+                    },
                     {
                     {
                       name = "slice",
                       name = "slice",
                       type = "number",
                       type = "number",
@@ -13848,6 +13853,11 @@ return {
                       type = "number",
                       type = "number",
                       description = "The array index to set."
                       description = "The array index to set."
                     },
                     },
+                    {
+                      name = "texture",
+                      type = "Texture",
+                      description = "The Texture to assign."
+                    },
                     {
                     {
                       name = "slice",
                       name = "slice",
                       type = "number",
                       type = "number",
@@ -20811,7 +20821,7 @@ return {
             {
             {
               name = "getAngularDamping",
               name = "getAngularDamping",
               summary = "Get the angular damping of the Collider.",
               summary = "Get the angular damping of the Collider.",
-              description = "Returns the angular damping of the Collider.  Angular damping makes things less \"spinny\", causing them them slow down their angular velocity over time.",
+              description = "Returns the angular damping parameters of the Collider.  Angular damping makes things less \"spinny\", making them slow down their angular velocity over time.",
               key = "Collider:getAngularDamping",
               key = "Collider:getAngularDamping",
               module = "lovr.physics",
               module = "lovr.physics",
               related = {
               related = {
@@ -20826,6 +20836,11 @@ return {
                       name = "damping",
                       name = "damping",
                       type = "number",
                       type = "number",
                       description = "The angular damping."
                       description = "The angular damping."
+                    },
+                    {
+                      name = "threshold",
+                      type = "number",
+                      description = "Velocity limit below which the damping is not applied."
                     }
                     }
                   }
                   }
                 }
                 }
@@ -20917,7 +20932,7 @@ return {
             {
             {
               name = "getLinearDamping",
               name = "getLinearDamping",
               summary = "Get the linear damping of the Collider.",
               summary = "Get the linear damping of the Collider.",
-              description = "Returns the Collider's linear damping parameter.  Linear damping is similar to drag or air resistance, slowing the Collider down over time.",
+              description = "Returns the Collider's linear damping parameters.  Linear damping is similar to drag or air resistance, slowing the Collider down over time.",
               key = "Collider:getLinearDamping",
               key = "Collider:getLinearDamping",
               module = "lovr.physics",
               module = "lovr.physics",
               related = {
               related = {
@@ -20932,6 +20947,11 @@ return {
                       name = "damping",
                       name = "damping",
                       type = "number",
                       type = "number",
                       description = "The linear damping."
                       description = "The linear damping."
+                    },
+                    {
+                      name = "threshold",
+                      type = "number",
+                      description = "Velocity limit below which the damping is not applied."
                     }
                     }
                   }
                   }
                 }
                 }
@@ -21745,7 +21765,7 @@ return {
             {
             {
               name = "setAngularDamping",
               name = "setAngularDamping",
               summary = "Set the angular damping of the Collider.",
               summary = "Set the angular damping of the Collider.",
-              description = "Sets the angular damping of the Collider.  Angular damping makes things less \"spinny\", causing them them slow down their angular velocity over time.",
+              description = "Sets the angular damping of the Collider.  Angular damping makes things less \"spinny\", causing them to slow down their angular velocity over time. Damping is only applied when angular velocity is over the threshold value.",
               key = "Collider:setAngularDamping",
               key = "Collider:setAngularDamping",
               module = "lovr.physics",
               module = "lovr.physics",
               related = {
               related = {
@@ -21759,6 +21779,12 @@ return {
                       name = "damping",
                       name = "damping",
                       type = "number",
                       type = "number",
                       description = "The angular damping."
                       description = "The angular damping."
+                    },
+                    {
+                      name = "threshold",
+                      type = "number",
+                      description = "Velocity limit below which the damping is not applied.",
+                      default = "0"
                     }
                     }
                   },
                   },
                   returns = {}
                   returns = {}
@@ -21893,7 +21919,7 @@ return {
             {
             {
               name = "setLinearDamping",
               name = "setLinearDamping",
               summary = "Set the linear damping of the Collider.",
               summary = "Set the linear damping of the Collider.",
-              description = "Sets the Collider's linear damping parameter.  Linear damping is similar to drag or air resistance, slowing the Collider down over time.",
+              description = "Sets the Collider's linear damping parameter.  Linear damping is similar to drag or air resistance, slowing the Collider down over time. Damping is only applied when linear velocity is over the threshold value.",
               key = "Collider:setLinearDamping",
               key = "Collider:setLinearDamping",
               module = "lovr.physics",
               module = "lovr.physics",
               related = {
               related = {
@@ -21907,6 +21933,12 @@ return {
                       name = "damping",
                       name = "damping",
                       type = "number",
                       type = "number",
                       description = "The linear damping."
                       description = "The linear damping."
+                    },
+                    {
+                      name = "threshold",
+                      type = "number",
+                      description = "Velocity limit below which the damping is not applied.",
+                      default = "0"
                     }
                     }
                   },
                   },
                   returns = {}
                   returns = {}
@@ -23980,7 +24012,7 @@ return {
               name = "getAngularDamping",
               name = "getAngularDamping",
               tag = "worldProperties",
               tag = "worldProperties",
               summary = "Get the angular damping of the World.",
               summary = "Get the angular damping of the World.",
-              description = "Returns the angular damping of the World.  Angular damping makes things less \"spinny\", making them slow down their angular velocity over time.",
+              description = "Returns the angular damping parameters of the World.  Angular damping makes things less \"spinny\", making them slow down their angular velocity over time.",
               key = "World:getAngularDamping",
               key = "World:getAngularDamping",
               module = "lovr.physics",
               module = "lovr.physics",
               variants = {
               variants = {
@@ -23991,6 +24023,11 @@ return {
                       name = "damping",
                       name = "damping",
                       type = "number",
                       type = "number",
                       description = "The angular damping."
                       description = "The angular damping."
+                    },
+                    {
+                      name = "threshold",
+                      type = "number",
+                      description = "Velocity limit below which the damping is not applied."
                     }
                     }
                   }
                   }
                 }
                 }
@@ -24071,7 +24108,7 @@ return {
               name = "getLinearDamping",
               name = "getLinearDamping",
               tag = "worldProperties",
               tag = "worldProperties",
               summary = "Get the linear damping of the World.",
               summary = "Get the linear damping of the World.",
-              description = "Returns the linear damping of the World.  Linear damping is similar to drag or air resistance, slowing down colliders over time as they move.",
+              description = "Returns the linear damping parameters of the World.  Linear damping is similar to drag or air resistance, slowing down colliders over time as they move.",
               key = "World:getLinearDamping",
               key = "World:getLinearDamping",
               module = "lovr.physics",
               module = "lovr.physics",
               variants = {
               variants = {
@@ -24082,6 +24119,11 @@ return {
                       name = "damping",
                       name = "damping",
                       type = "number",
                       type = "number",
                       description = "The linear damping."
                       description = "The linear damping."
+                    },
+                    {
+                      name = "threshold",
+                      type = "number",
+                      description = "Velocity limit below which the damping is not applied."
                     }
                     }
                   }
                   }
                 }
                 }
@@ -24666,7 +24708,7 @@ return {
               name = "setAngularDamping",
               name = "setAngularDamping",
               tag = "worldProperties",
               tag = "worldProperties",
               summary = "Set the angular damping of the World.",
               summary = "Set the angular damping of the World.",
-              description = "Sets the angular damping of the World.  Angular damping makes things less \"spinny\", making them slow down their angular velocity over time.",
+              description = "Sets the angular damping of the World.  Angular damping makes things less \"spinny\", making them slow down their angular velocity over time. Damping is only applied when angular velocity is over the threshold value.",
               key = "World:setAngularDamping",
               key = "World:setAngularDamping",
               module = "lovr.physics",
               module = "lovr.physics",
               variants = {
               variants = {
@@ -24676,6 +24718,12 @@ return {
                       name = "damping",
                       name = "damping",
                       type = "number",
                       type = "number",
                       description = "The angular damping."
                       description = "The angular damping."
+                    },
+                    {
+                      name = "threshold",
+                      type = "number",
+                      description = "Velocity limit below which the damping is not applied.",
+                      default = "0"
                     }
                     }
                   },
                   },
                   returns = {}
                   returns = {}
@@ -24721,7 +24769,7 @@ return {
               name = "setLinearDamping",
               name = "setLinearDamping",
               tag = "worldProperties",
               tag = "worldProperties",
               summary = "Set the linear damping of the World.",
               summary = "Set the linear damping of the World.",
-              description = "Sets the linear damping of the World.  Linear damping is similar to drag or air resistance, slowing down colliders over time as they move.",
+              description = "Sets the linear damping of the World.  Linear damping is similar to drag or air resistance, slowing down colliders over time as they move. Damping is only applied when linear velocity is over the threshold value.",
               key = "World:setLinearDamping",
               key = "World:setLinearDamping",
               module = "lovr.physics",
               module = "lovr.physics",
               variants = {
               variants = {
@@ -24731,6 +24779,12 @@ return {
                       name = "damping",
                       name = "damping",
                       type = "number",
                       type = "number",
                       description = "The linear damping."
                       description = "The linear damping."
+                    },
+                    {
+                      name = "threshold",
+                      type = "number",
+                      description = "Velocity limit below which the damping is not applied.",
+                      default = "0"
                     }
                     }
                   },
                   },
                   returns = {}
                   returns = {}

+ 6 - 3
api/lovr/graphics/Shader/sendImage.lua

@@ -7,7 +7,6 @@ return {
   ]],
   ]],
   arguments = {
   arguments = {
     name = {
     name = {
-      name = 'name',
       type = 'string',
       type = 'string',
       description = 'The name of the image uniform.'
       description = 'The name of the image uniform.'
     },
     },
@@ -15,6 +14,10 @@ return {
       type = 'number',
       type = 'number',
       description = 'The array index to set.'
       description = 'The array index to set.'
     },
     },
+    texture = {
+      type = 'Texture',
+      description = 'The Texture to assign.'
+    },
     slice = {
     slice = {
       type = 'number',
       type = 'number',
       default = 'nil',
       default = 'nil',
@@ -34,11 +37,11 @@ return {
   returns = {},
   returns = {},
   variants = {
   variants = {
     {
     {
-      arguments = { 'name', 'slice', 'mipmap', 'access' },
+      arguments = { 'name', 'texture', 'slice', 'mipmap', 'access' },
       returns = {}
       returns = {}
     },
     },
     {
     {
-      arguments = { 'name', 'index', 'slice', 'mipmap', 'access' },
+      arguments = { 'name', 'index', 'texture', 'slice', 'mipmap', 'access' },
       returns = {}
       returns = {}
     }
     }
   },
   },