Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/BabylonJS/Babylon.js into…
Browse files Browse the repository at this point in the history
… webgpu-fastpath
  • Loading branch information
Popov72 committed Oct 21, 2021
2 parents 8ff30c1 + 928abf4 commit 4923ae2
Show file tree
Hide file tree
Showing 82 changed files with 2,977 additions and 1,923 deletions.
55 changes: 50 additions & 5 deletions dist/preview release/babylon.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -798,9 +798,7 @@ declare module BABYLON {
/** Delta X */
DeltaHorizontal = 10,
/** Delta Y */
DeltaVertical = 11,
/** MoveBeing Hijack for simultaneous buttons pressed for instance */
FakeMove = 12
DeltaVertical = 11
}
/**
* Enum for Dual Shock Gamepad
Expand Down Expand Up @@ -21435,6 +21433,22 @@ declare module BABYLON {
* Block used to create a Vector2/3/4 out of individual inputs (one for each component)
*/
export class VectorMergerBlock extends NodeMaterialBlock {
/**
* Gets or sets the swizzle for x (meaning which compoent to affect to the output.x)
*/
xSwizzle: "x" | "y" | "z" | "w";
/**
* Gets or sets the swizzle for y (meaning which compoent to affect to the output.y)
*/
ySwizzle: "x" | "y" | "z" | "w";
/**
* Gets or sets the swizzle for z (meaning which compoent to affect to the output.z)
*/
zSwizzle: "x" | "y" | "z" | "w";
/**
* Gets or sets the swizzle for w (meaning which compoent to affect to the output.w)
*/
wSwizzle: "x" | "y" | "z" | "w";
/**
* Create a new VectorMergerBlock
* @param name defines the block name
Expand All @@ -21445,6 +21459,10 @@ declare module BABYLON {
* @returns the class name
*/
getClassName(): string;
/**
* Gets the xyzw component (input)
*/
get xyzwIn(): NodeMaterialConnectionPoint;
/**
* Gets the xyz component (input)
*/
Expand Down Expand Up @@ -21500,7 +21518,11 @@ declare module BABYLON {
*/
get xyz(): NodeMaterialConnectionPoint;
protected _inputRename(name: string): string;
private _buildSwizzle;
protected _buildBlock(state: NodeMaterialBuildState): this;
serialize(): any;
_deserialize(serializationObject: any, scene: Scene, rootUrl: string): void;
protected _dumpPropertiesCode(): string;
}
}
declare module BABYLON {
Expand Down Expand Up @@ -22779,7 +22801,6 @@ declare module BABYLON {
*/
_allowCameraRotation: boolean;
private _currentActiveButton;
private _usingSafari;
/**
* Manage the mouse inputs to control the movement of a free camera.
* @see https://doc.babylonjs.com/how_to/customizing_camera_inputs
Expand Down Expand Up @@ -45175,6 +45196,7 @@ declare module BABYLON {
private _pointerActive;
private _elementToAttachTo;
private _engine;
private _usingSafari;
private _keyboardDownEvent;
private _keyboardUpEvent;
private _keyboardBlurEvent;
Expand Down Expand Up @@ -49781,7 +49803,6 @@ declare module BABYLON {
*/
protected _buttonsPressed: number;
private _currentActiveButton;
private _usingSafari;
/**
* Defines the buttons associated with the input to handle camera move.
*/
Expand Down Expand Up @@ -76107,6 +76128,22 @@ declare module BABYLON {
* Block used to create a Color3/4 out of individual inputs (one for each component)
*/
export class ColorMergerBlock extends NodeMaterialBlock {
/**
* Gets or sets the swizzle for r (meaning which compoent to affect to the output.r)
*/
rSwizzle: "r" | "g" | "b" | "a";
/**
* Gets or sets the swizzle for g (meaning which compoent to affect to the output.g)
*/
gSwizzle: "r" | "g" | "b" | "a";
/**
* Gets or sets the swizzle for b (meaning which compoent to affect to the output.b)
*/
bSwizzle: "r" | "g" | "b" | "a";
/**
* Gets or sets the swizzle for a (meaning which compoent to affect to the output.a)
*/
aSwizzle: "r" | "g" | "b" | "a";
/**
* Create a new ColorMergerBlock
* @param name defines the block name
Expand Down Expand Up @@ -76151,7 +76188,11 @@ declare module BABYLON {
*/
get rgb(): NodeMaterialConnectionPoint;
protected _inputRename(name: string): string;
private _buildSwizzle;
protected _buildBlock(state: NodeMaterialBuildState): this;
serialize(): any;
_deserialize(serializationObject: any, scene: Scene, rootUrl: string): void;
protected _dumpPropertiesCode(): string;
}
}
declare module BABYLON {
Expand Down Expand Up @@ -77958,6 +77999,10 @@ declare module BABYLON {
* Gets the seed input component
*/
get seed(): NodeMaterialConnectionPoint;
/**
* Gets the chaos input component
*/
get chaos(): NodeMaterialConnectionPoint;
/**
* Gets the offset X input component
*/
Expand Down
4 changes: 2 additions & 2 deletions dist/preview release/babylon.js

Large diffs are not rendered by default.

Loading

0 comments on commit 4923ae2

Please sign in to comment.