Skip to content

Commit

Permalink
Merge pull request #1 from BabylonJS/master
Browse files Browse the repository at this point in the history
update fork
  • Loading branch information
mauricedoepke committed Mar 30, 2019
2 parents a6aeeaa + a001298 commit d9fdd0e
Show file tree
Hide file tree
Showing 76 changed files with 1,092 additions and 346 deletions.
2 changes: 1 addition & 1 deletion Playground/babylon.d.txt
Original file line number Diff line number Diff line change
Expand Up @@ -48683,7 +48683,7 @@ declare module BABYLON {
* @param attributes A map of attributes from vertex buffer kinds to Draco unique ids
* @returns A promise that resolves with the decoded vertex data
*/
decodeMeshAsync(data: ArrayBuffer | ArrayBufferView, attributes: {
decodeMeshAsync(data: ArrayBuffer | ArrayBufferView, attributes?: {
[kind: string]: number;
}): Promise<VertexData>;
/**
Expand Down
3 changes: 0 additions & 3 deletions Tools/Gulp/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,5 @@
"install": "cd ../../ && npm install && cd Playground/ && npm install && cd ../Viewer && npm install && cd ../Tools/Gulp/",
"build": "gulp --max-old-space-size=8192 --tsLintFix",
"start": "gulp run --max-old-space-size=8192"
},
"dependencies": {
"typescript": "^3.3.3333"
}
}
2 changes: 1 addition & 1 deletion dist/preview release/babylon.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -49379,7 +49379,7 @@ declare module BABYLON {
* @param attributes A map of attributes from vertex buffer kinds to Draco unique ids
* @returns A promise that resolves with the decoded vertex data
*/
decodeMeshAsync(data: ArrayBuffer | ArrayBufferView, attributes: {
decodeMeshAsync(data: ArrayBuffer | ArrayBufferView, attributes?: {
[kind: string]: number;
}): Promise<VertexData>;
/**
Expand Down
2 changes: 1 addition & 1 deletion dist/preview release/babylon.js

Large diffs are not rendered by default.

67 changes: 41 additions & 26 deletions dist/preview release/babylon.max.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/preview release/babylon.max.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/preview release/babylon.module.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -51533,7 +51533,7 @@ declare module "babylonjs/Meshes/Compression/dracoCompression" {
* @param attributes A map of attributes from vertex buffer kinds to Draco unique ids
* @returns A promise that resolves with the decoded vertex data
*/
decodeMeshAsync(data: ArrayBuffer | ArrayBufferView, attributes: {
decodeMeshAsync(data: ArrayBuffer | ArrayBufferView, attributes?: {
[kind: string]: number;
}): Promise<VertexData>;
/**
Expand Down Expand Up @@ -108866,7 +108866,7 @@ declare module BABYLON {
* @param attributes A map of attributes from vertex buffer kinds to Draco unique ids
* @returns A promise that resolves with the decoded vertex data
*/
decodeMeshAsync(data: ArrayBuffer | ArrayBufferView, attributes: {
decodeMeshAsync(data: ArrayBuffer | ArrayBufferView, attributes?: {
[kind: string]: number;
}): Promise<VertexData>;
/**
Expand Down
2 changes: 1 addition & 1 deletion dist/preview release/inspector/babylon.inspector.bundle.js

Large diffs are not rendered by default.

21 changes: 9 additions & 12 deletions dist/preview release/inspector/babylon.inspector.bundle.max.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions dist/preview release/inspector/babylon.inspector.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -319,6 +319,7 @@ declare module INSPECTOR {
}): boolean;
switchExpandState(): void;
raiseOnPropertyChanged(previousValue: BABYLON.Vector3): void;
updateVector3(): void;
updateStateX(value: number): void;
updateStateY(value: number): void;
updateStateZ(value: number): void;
Expand Down
2 changes: 2 additions & 0 deletions dist/preview release/inspector/babylon.inspector.module.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -365,6 +365,7 @@ declare module "babylonjs-inspector/components/actionTabs/lines/vector3LineCompo
}): boolean;
switchExpandState(): void;
raiseOnPropertyChanged(previousValue: Vector3): void;
updateVector3(): void;
updateStateX(value: number): void;
updateStateY(value: number): void;
updateStateZ(value: number): void;
Expand Down Expand Up @@ -2515,6 +2516,7 @@ declare module INSPECTOR {
}): boolean;
switchExpandState(): void;
raiseOnPropertyChanged(previousValue: BABYLON.Vector3): void;
updateVector3(): void;
updateStateX(value: number): void;
updateStateY(value: number): void;
updateStateZ(value: number): void;
Expand Down
12 changes: 6 additions & 6 deletions dist/preview release/materialsLibrary/babylon.cellMaterial.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions dist/preview release/materialsLibrary/babylon.customMaterial.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions dist/preview release/materialsLibrary/babylon.fireMaterial.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Large diffs are not rendered by default.

Loading

0 comments on commit d9fdd0e

Please sign in to comment.